Imported Upstream version 2.3.2upstream/2.3.2

246 files changed, 46806 insertions, 44671 deletions

diff --git a/ChangeLog b/ChangeLog
index 0a9c775..48a73d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,1058 @@
+2021-08-24  Werner Koch  <wk@gnupg.org>
+
+	Release 2.3.2.
+	+ commit 3bf8d7e1b7e0482f698b54a6975bdd9aa354244e
+
+
+	dirmngr: Change the default keyserver.
+	+ commit 55b5928099bafbd5409d3377a42259c11e394cd0
+	* configure.ac (DIRMNGR_DEFAULT_KEYSERVER): Change to
+	keyserver.ubuntu.com.
+
+	* dirmngr/certcache.c (cert_cache_init): Disable default pool cert.
+	* dirmngr/http-ntbtls.c (gnupg_http_tls_verify_cb): Ditto.
+	* dirmngr/http.c (http_session_new): Ditto.
+
+	* dirmngr/server.c (make_keyserver_item): Use a different mapping for
+	the gnupg.net names.
+
+2021-08-24  NIIBE Yutaka  <gniibe@fsij.org>
+
+	gpg: Report the status of NO_SECKEY for decryption.
+	+ commit 3ed5f566fc057975d0158bb637c72bd118aba7f8
+	* g10/mainproc.c (proc_encrypted): Fix the condition to report
+	NO_SECKEY even when the key was not considered by get_session_key.
+
+2021-08-20  Werner Koch  <wk@gnupg.org>
+
+	wkd: Properly unescape the user-id from a key listing.
+	+ commit 87d238de3d9d537cacc9dd3c6d954845203ea2cb
+	* tools/wks-util.c (append_to_uidinfo_list): Unescape UID.
+
+	wkd: Fix client issue with leading or trailing spaces in user-ids.
+	+ commit b4345f7521cb4c3f4af7894f5d6d840fda85e82f
+	* common/recsel.c (recsel_parse_expr): Add flag -t.
+	* common/stringhelp.c: Remove assert.h.
+	(strtokenize): Factor code out to do_strtokenize.
+	(strtokenize_nt): New.
+	(do_strtokenize): Add arg trim to support the strtokenize_nt.
+	* common/t-stringhelp.c (test_strtokenize_nt): New test cases.
+
+	* tools/wks-util.c (wks_list_key): Use strtokenize_nt and the recsel
+	flag -t.
+
+2021-08-20  NIIBE Yutaka  <gniibe@fsij.org>
+
+	scd: Don't release the context until list_finish for PC/SC.
+	+ commit 1565baa93ae39a81c5b00ca4558cd24838b4ce54
+	* scd/apdu.c (apdu_dev_list_start): Increment PCSC.COUNT here.
+	(apdu_dev_list_finish): Decrement PCSC.COUNT.
+
+2021-08-19  Werner Koch  <wk@gnupg.org>
+
+	gpg: Return SUCCESS/FAILURE status also for --card-edit/name.
+	+ commit c1a23c3664753656bd4d22aafe0fb89d9bac5147
+	* g10/card-util.c (change_name): Call write_sc_op_status.
+
+2021-08-18  Werner Koch  <wk@gnupg.org>
+
+	agent: Use the sysconfdir for a pattern file.
+	+ commit 661c2ae96699e135294cfd98e1fbc385d35f5f0e
+	* agent/genkey.c (do_check_passphrase_pattern): Use make_filename.
+
+	agent: Ignore passphrase constraints for a generated passphrase.
+	+ commit b89b1f35c29ceaebe39b31444936aa66c9297f2c
+	* agent/agent.h (PINENTRY_STATUS_PASSWORD_GENERATED): New.
+	(MAX_GENPIN_TRIES): Remove.
+	* agent/call-pinentry.c (struct entry_parm_s):
+	(struct inq_cb_parm_s): Add genpinhash and genpinhas_valid.
+	(is_generated_pin): New.
+	(inq_cb): Suppress constraints checking for a generated passphrase.
+	No more need for several tries to generate the passphrase.
+	(do_getpin): Store a generated passphrase/pin in the status field.
+	(agent_askpin): Suppress constraints checking for a generated
+	passphrase.
+	(agent_get_passphrase): Ditto.
+	* agent/command.c (cmd_get_passphrase): Ditto.
+
+	agent: Improve the GENPIN callback.
+	+ commit 8ed79103474c17d8dce20c740fc9813ada5f79ac
+	* agent/call-pinentry.c (DEFAULT_GENPIN_BYTES): Replace by  ...
+	(DEFAULT_GENPIN_BITS): this and increase to 150.
+	(generate_pin): Make sure that we use at least 128 bits.
+
+	agent: Fix for zero length help string in pinentry hints.
+	+ commit 9fb646660258c2842edd6662688eafbc8d751ba7
+	* agent/call-pinentry.c: Remove unused assert.h.
+	(inq_cb): Fix use use of assuan_end_confidential in case of nested
+	use.
+	(do_getpin): Ditto.
+	(setup_formatted_passphrase): Escape the help string.
+	(setup_enforced_constraints): Ignore empty help strings.
+
+	common,w32: Replace log_debug by log_info for InProcessJobs.
+	+ commit 629f4a5cffb737454aaf6a5965cfb6d7b03796fc
+	* common/exechelp-w32.c (gnupg_spawn_process_detached): Use log_info.
+
+2021-08-13  Werner Koch  <wk@gnupg.org>
+
+	agent: Make QT_QPA_PLATFORMTHEME=qt5ct work for the pient.
+	+ commit 1305baf0994059f458b1d5ca28a355c12932fab3
+	* agent/call-pinentry.c (atfork_core): Pass DISPLAY.
+
+	agent: New option --check-sym-passphrase-pattern.
+	+ commit 7c45a69eb988e9c0329d75900af0c5b1e47291b7
+	* agent/gpg-agent.c (oCheckSymPassphrasePattern): New.
+	(opts): Add --check-sym-passphrase-pattern.
+	(parse_rereadable_options): Set option.
+	(main): Return option info.
+	* tools/gpgconf-comp.c: Add new option.
+	* agent/agent.h (opt): Add var check_sym_passphrase_pattern.
+	(struct pin_entry_info_s): Add var constraints_flags.
+	(CHECK_CONSTRAINTS_NOT_EMPTY): New to replace a hardwired 1.
+	(CHECK_CONSTRAINTS_NEW_SYMKEY): New.
+	* agent/genkey.c (check_passphrase_pattern): Rename to ...
+	(do_check_passphrase_pattern): this to make code reading
+	easier. Handle the --check-sym-passphrase-pattern option.
+	(check_passphrase_constraints): Replace arg no_empty by a generic
+	flags arg.  Also handle --check-sym-passphrase-pattern here.
+	* agent/command.c (cmd_get_passphrase): In --newsymkey mode pass
+	CHECK_CONSTRAINTS_NEW_SYMKEY flag.
+	* agent/call-pinentry.c (struct entry_parm_s): Add constraints_flags.
+	(struct inq_cb_parm_s): New.
+	(inq_cb): Use new struct for parameter passing.  Pass flags to teh
+	constraints checking.
+	(do_getpin): Pass constraints flag down.
+	(agent_askpin): Take constrainst flag from the supplied pinentry
+	struct.
+
+2021-08-12  Ingo Klöcker  <dev@ingo-kloecker.de>
+
+	agent: Make --pinentry-formatted-passphrase a simple flag.
+	+ commit 99601778f4a9dc1c9fee792361c959f5e0732cfd
+	* agent/agent.h (opt): Change type of pinentry_formatted_passphrase
+	to int (as for other flags).
+	* agent/call-pinentry.c (setup_formatted_passphrase): Remove no longer
+	needed translated strings. Write option without value to Assuan
+	connection.
+	* agent/gpg-agent.c (opts): Use ARGPARSE_s_n for
+	oPinentryFormattedPassphrase.
+	(parse_rereadable_options): Set option to 1.
+
+2021-08-11  Werner Koch  <wk@gnupg.org>
+
+	w32: Move socketdir to LCOAL_APPDATA.
+	+ commit 0802cbb59b21e06e16b4fd8596934c5565e7f659
+	* common/homedir.c (is_gnupg_default_homedir): Use standard_homedir
+	instead of the constant which makes a difference on Windows.
+	(_gnupg_socketdir_internal) [W32]: Move the directory to LOCAL_APPDATA.
+	(gnupg_cachedir): Remove unsued function.
+
+	* common/sysutils.c (gnupg_rmdir): New.
+	* tools/gpgconf.c (main): s/rmdir/gnupg_rmdir/.
+
+	gpgconf,w32: Print more registry diagnostics with --list-dirs.
+	+ commit 4cc534020669fa038f6a2107a55fe3b42fc065dc
+	* tools/gpgconf.c (list_dirs): Figure out classes with the key.
+
+2021-08-10  Ingo Klöcker  <dev@ingo-kloecker.de>
+
+	agent: Add checkpin inquiry for pinentry.
+	+ commit 5976d293ef9bd953b6e9c61a45ad1f4e85a2743c
+	* agent/call-pinentry.c (inq_cb): Handle checkpin inquiry.
+	(setup_enforced_constraints): New.
+	(agent_get_passphrase): Call setup_enforced_constraints if new
+	passphrase is requested.
+
+	agent: New option --pinentry-formatted-passphrase.
+	+ commit bf20a80f68449cc83b67c53ba9a0a84c45827ac4
+	* agent/agent.h (opt): Add field pinentry_formatted_passphrase.
+	* agent/call-pinentry.c (setup_formatted_passphrase): New.
+	(agent_get_passphrase): Pass option to pinentry.
+	* agent/gpg-agent.c (oPinentryFormattedPassphrase): New.
+	(opts): Add option.
+	(parse_rereadable_options): Set option.
+
+2021-08-05  NIIBE Yutaka  <gniibe@fsij.org>
+
+	build: Simplify for string.h and getopt.h.
+	+ commit 29d58e9de7838bcf32e358602abd4ed4498566f8
+	* configure.ac (AC_CHECK_HEADERS): Remove string.h and getopt.h.
+	* dirmngr/ks-engine-ldap.c: Remove including getopt.h.
+	* tools/make-dns-cert.c: Likewise.
+
+	sm: Fix pwri.
+	+ commit 100c954ab0d6df509df582cb22ef515171462654
+	* sm/decrypt.c (pwri_parse_pbkdf2): Use int for digest algo.
+	(pwri_decrypt): Use int for cipher algo and digest algo.
+
+	build: Remove duplication of AC_HEADER_TIME.
+	+ commit 3f33c7ffcca09d4252d0418fdc2d31c0c8e486f4
+	* configure.ac: Have a single AC_HEADER_TIME.
+
+	build: Update checking headers.
+	+ commit a89f13726d08413d4bddcb6afed402de1de9e4fd
+	* configure.ac (AC_CHECK_HEADERS): Remove pty.h utmp.h, util.h,
+	and libutil.h.
+
+2021-08-02  Ingo Klöcker  <dev@ingo-kloecker.de>
+
+	common: Pass XDG_SESSION_TYPE and QT_QPA_PLATFORM envvars to pinentry.
+	+ commit 94d18320b2b0bb5e3fa2023df8ac57078b2f6ecb
+	* common/session-env.c (stdenvnames): Add XDG_SESSION_TYPE and
+	QT_QPA_PLATFORM.
+
+2021-07-29  Werner Koch  <wk@gnupg.org>
+
+	sm,w32: Fix Unicode problem on key box creation.
+	+ commit 7cdd06af479298748c79357dcb36ca1ba4d36bb1
+	* sm/keydb.c (maybe_create_keybox): Replace access by gnupg_access
+
+	tools: Extend gpg-check-pattern.
+	+ commit 73c03e02322880c740310207dd2151cfd843792e
+	* tools/gpg-check-pattern.c: Major rewrite.
+
+2021-07-22  NIIBE Yutaka  <gniibe@fsij.org>
+
+	scd: Small clean up for card access.
+	+ commit 5c8124b8b9554c7843feccf408648c9689bce243
+	* scd/app.c (app_get_challenge): Remove the check to ref_count.
+	* scd/command.c (send_client_notifications): Update comments.
+
+	scd: Fix direct use of card with no ctrl->card_ctx.
+	+ commit 50ad29f9a72f5454067bd0ca34fc1a71ac06b831
+	* scd/app.c (maybe_switch_app): Remove check of ref_count.
+
+2021-07-21  Ingo Klöcker  <dev@ingo-kloecker.de>
+
+	agent: Add translatable text for Caps Lock hint.
+	+ commit b2a6e5b5169602052ae87d38588bdd3bd76fddad
+	* agent/call-pinentry.c (start_pinentry): Add new default text.
+
+2021-07-21  NIIBE Yutaka  <gniibe@fsij.org>
+
+	scd: Fix access to list of cards (3/3).
+	+ commit 0d6b4210cf31d1c3ca0e8b034537a158fe3caca8
+	* scd/app-common.h (card_reset): Simplify more.
+	(select_additional_application): Supply CARD.
+	(card_ref, card_unref): Remove.
+	(card_get, card_put): New.
+	* scd/app.c (card_reset): No locking/unlocking inside.
+	(app_switch_current_card): Fix comment.
+	(select_additional_application): No locking/unlocking inside.
+	(do_with_keygrip): New, unlocked version.
+	(card_get): New, with support of KEYGRIP.
+	(card_unref): Remove.
+	(card_put): New.
+	(app_write_learn_status, app_readcert: No locking/unlocking inside.
+	(app_readkey, app_getattr, app_setattr, app_sign, app_auth): Likewise.
+	(app_decipher, app_writecert, app_writekey): Likewise.
+	(app_genkey, app_get_challenge, app_change_pin): Likewise.
+	(app_check_pin, app_switch_active_app): Likewise.
+	* scd/command.c (do_reset): Use card_get/card_put.
+	(open_card_with_request): Use card_get/card_put, return CARD locked.
+	(cmd_serialno): Follow the change of open_card_with_request.
+	(cmd_switchapp): Use card_get/card_put.
+	(cmd_learn, cmd_readcert, cmd_readkey, cmd_pksign): Likewise.
+	(cmd_pkauth, cmd_pkdecrypt, cmd_getattr): Likewise.
+	(cmd_setattr, cmd_writecert, cmd_writekey): Likewise.
+	(cmd_genkey, cmd_random, cmd_passwd): Likewise.
+	(cmd_checkpin, cmd_getinfo, cmd_restart): Likewise.
+	(cmd_disconnect, cmd_apdu, cmd_devinfo): Likewise.
+
+	scd: Fix access to list of cards (2/3).
+	+ commit b436fb6766b400167e5d57ff1116600bb496b04f
+	* scd/app-common.h (card_reset, select_application): Simplify.
+	* scd/app.c (card_reset, select_application): Simplify.
+	* scd/command.c (do_reset): Follow the change.
+	(open_card, open_card_with_request): Follow the change.
+
+	scd: Fix access to list of cards (1/3).
+	+ commit 216945a80e7b6b9d366493fa43fc7e99c830d81c
+	* scd/app.c (card_list_lock): Use MRSW lock.
+	(lock_r_card_list, unlock_r_card_list): New.
+	(lock_w_card_list, unlock_w_card_list): New.
+	(app_dump_state, app_send_devinfo): Use the MRSW lock.
+	(select_application, app_switch_current_card): Likewise.
+	(scd_update_reader_status_file): Likewise.
+	(initialize_module_command, send_card_and_app_list): Likewise.
+	(app_do_with_keygrip, app_wait): Likewise.
+
+2021-07-08  Werner Koch  <wk@gnupg.org>
+
+	kbx: Improve debugging of the search descriptions in keyboxd.
+	+ commit b871824fefa114db931762243537663cc1095cfa
+	* kbx/frontend.c (dump_search_desc): New.
+	(kbxd_search): Actually log the search descriptions.
+
+	kbx: Fix keyboxd searching with multiple patterns.
+	+ commit 101ba4f18aceb39c4d5f0e0a7e16e66827f8e612
+	* kbx/keybox-search-desc.h (struct keydb_search_desc): New flag
+	name_used.
+	* common/userids.c (classify_user_id): Set flag.
+	* kbx/kbxserver.c (struct search_backing_store_s): New.
+	(cmd_search): use a backing store for the const pointers.
+	(kbxd_start_command_handler): Release the backing store.
+
+2021-07-06  NIIBE Yutaka  <gniibe@fsij.org>
+
+	scd: Detect external interference when PCSC_SHARED.
+	+ commit 044e5a3c3801fde7fa3b26986825377016e73103
+	* scd/app-common.h (check_aid): New method.
+	* scd/app-openpgp.c (do_check_aid): New.
+	* scd/app-piv.c (do_check_aid): New.
+	* scd/app.c (check_external_interference): New.
+	(maybe_switch_app): Check interference to determine switching is
+	needed.
+
+2021-06-29  Werner Koch  <wk@gnupg.org>
+
+	artwork: Explain the license for the logo.
+	+ commit 5f78ae696c10df43c2b2fc29765e28b85caf5376
+
+
+2021-06-25  Werner Koch  <wk@gnupg.org>
+
+	agent: Fix regression in agent_get_shadow_info_type.
+	+ commit a6efde307f7beb199b543f78b61c317fa2708202
+	* agent/protect.c (agent_get_shadow_info_type): Return the correct
+	value.
+
+	gpg: Let --fetch-key return an exit code on failure.
+	+ commit 9579c7786278b75d9c58b7c21b2f3c8bc7849810
+	* g10/keyserver.c (keyserver_fetch): Return an error code.
+	* g10/gpg.c (main) <aFetchKeys>: Return 1 in case of no data.
+
+2021-06-23  NIIBE Yutaka  <gniibe@fsij.org>
+
+	scd:ccid: Handle LIBUSB_TRANSFER_OVERFLOW interrupt transfer.
+	+ commit 25ae80b8eb6e9011049d76440ad7d250c1d02f7c
+	* scd/ccid-driver.c (intr_cb): Ignore LIBUSB_TRANSFER_OVERFLOW.
+
+2021-06-22  Werner Koch  <wk@gnupg.org>
+
+	tools: Extend ccidmon to print T=1 APDUs.
+	+ commit 2c6b62b3572fe43cb6b89ec5fb0bc62385a4b230
+	* tools/ccidmon.c (print_as_ascii): New.
+	(print_t1_block): New.
+	(print_p2r_xfrblock): Print APDUs
+	(print_r2p_datablock): Ditto.
+
+	tests: Cope with broken Libgcrypt versions.
+	+ commit 5df658233a3a0c05fac0b4d4889f033ea0d0e034
+	* common/t-sexputil.c (test_ecc_uncompress): Ignore unknwon curve
+	errors.
+
+	w32: Add fallback in case the Windows console can't cope with Unicode.
+	+ commit edfe9453be5f8ba374da0ab860be863d66965c56
+	* common/ttyio.c (w32_write_console): Fallback to WriteConsoleA on
+	error.
+
+	scd:p15: Prepare AODF parsing for other authentication types.
+	+ commit e387cc97c82313457e4f79729a137e5871891bc1
+	* scd/app-p15.c (auth_type_t): New.
+	(struct aodf_object_s): Add field auth_type.
+	(read_ef_aodf): Distinguish between pin and authkey types.  Include
+	the authtype in the verbose mode diags.
+
+2021-06-21  Werner Koch  <wk@gnupg.org>
+
+	dirmngr: Fix regression in KS_GET for mail address pattern.
+	+ commit d5126efd895bc2af0a7e63dbf4aa782ce47ecc40
+	* dirmngr/ks-engine-hkp.c (ks_hkp_search): Munge mail address pattern.
+	(ks_hkp_get): Allow for mail addresses.
+	-
+
+	Before the keyserver changes in 2.2.28 gpg passed dirmngr a pail
+	address as an exact pattern (e.g. "=foo@example.org").  Since 2.2.28
+	the mail address is detected gpg gpg and we see for example
+	"<foo@example.org>".  This patch fixes this to turn a mail address
+	into an exact match again.
+
+2021-06-18  Werner Koch  <wk@gnupg.org>
+
+	scd:p15: Add pre-check for ascii-numeric PINs.
+	+ commit 029924a46e08ffcda038d89f06abfb41c980a9ad
+	* scd/app-p15.c (verify_pin): acii-numerix is different than BCD.
+
+	scd:p15: Add basic support for AET JCOP cards.
+	+ commit 544ec7872aed24c296ea34fac777eca287f7bb47
+	* scd/app-p15.c (CARD_TYPE_AET): New.
+	(cardtype2str): Add string.
+	(card_atr_list): Add corresponding ATR.
+	(app_local_s): New flag no_extended_mode.  Turn two other flags into
+	bit flags.
+	(select_ef_by_path): Hack to handle the 3FFF thing.
+	(readcert_by_cdf): Do not use etxended mode for AET.
+	(app_select_p15): Set no_extended_mode.
+
+	scd:p15: Handle cards with bad encoded path objects.
+	+ commit 7a8545c91b09277b0833dc0e5881ba5d1c8dbca3
+	* scd/app-p15.c (read_ef_prkdf, read_ef_pukdf)
+	(read_ef_cdf, read_ef_aodf): Allow for a zero length path and
+	correctly skip unsupported auth types.
+
+	scd: Improve reading of binary records.
+	+ commit 44f977d0e332e77fb8a775c4837c00118bbe08cb
+	* scd/iso7816.c (iso7816_read_binary_ext): Handle the 0x6a86 SW the
+	same as 6b00.
+	* scd/apdu.c (apdu_get_atr): Modify debug messages.
+	* scd/app-p15.c (app_select_p15): Print FCI on error.
+	(read_p15_info): Clean up diag in presence of debug options.
+
+2021-06-17  NIIBE Yutaka  <gniibe@fsij.org>
+
+	scd: Fix RESET handling.
+	+ commit 7718244168c948171ffd37d7e964cbcd172661c6
+	* scd/app.c (scd_update_reader_status_file): Clear ->reset_requested.
+
+2021-06-16  NIIBE Yutaka  <gniibe@fsij.org>
+
+	dirmngr: Fix build with --disable-ldap.
+	+ commit c6900f5723b4edc899aaea267ed599b5ad724142
+	* dirmngr/dirmngr.c (parse_rereadable_options) [USE_LDAP]:
+	Conditionalize.
+
+2021-06-16  Werner Koch  <wk@gnupg.org>
+
+	sm: New option --ldapserver as an alias for --keyserver.
+	+ commit 89df86157e3580aae7e391382f4a5451a192fc68
+	* sm/gpgsm.c (opts): Add option --ldapserver and make --keyserver an
+	alias.
+
+	dirmngr: Allow to pass no filter args to dirmngr_ldap.
+	+ commit 14528ec66bd7dce28c7540fa9a34f35de54261c1
+	* dirmngr/dirmngr_ldap.c (main): Handle no args case.
+
+	dirmngr: Rewrite the LDAP wrapper tool.
+	+ commit 864ea251983977b91a7f6ff5964e497cf4b208dc
+	* dirmngr/ldap-misc.c: New.
+	* dirmngr/ldap-misc.h: New.
+	* dirmngr/ks-engine-ldap.c: Include ldap-misc.h.
+	(ldap_err_to_gpg_err, ldap_to_gpg_err): Move to ldap-misc.c.
+	* dirmngr/ldap-wrapper.c (ldap_wrapper): Print list of args in debug
+	mode.
+	* dirmngr/server.c (lookup_cert_by_pattern): Handle GPG_ERR_NOT_FOUND
+	the saqme as GPG_ERR_NO_DATA.
+	* dirmngr/ldap.c (run_ldap_wrapper): Add args tls_mode and ntds.
+	Remove arg url.  Adjust for changes in dirmngr_ldap.
+	(url_fetch_ldap): Remove args host and port.  Parse the URL and use
+	these values to call run_ldap_wrapper.
+	(attr_fetch_ldap): Pass tls flags to run_ldap_wrapper.
+	(rfc2254_need_escape, rfc2254_escape): New.
+	(extfilt_need_escape, extfilt_escape): New.
+	(parse_one_pattern): Rename to ...
+	(make_one_filter): this.  Change for new dirmngr_ldap calling
+	convention.  Make issuer DN searching partly work.
+	(escape4url, make_url): Remove.
+	(start_cert_fetch_ldap): Change for new dirmngr_ldap calling
+	convention.
+	* dirmngr/dirmngr_ldap.c: Major rewrite.
+
+	* dirmngr/t-ldap-misc.c: New.
+	* dirmngr/t-support.h (DIM, DIMof): New.
+	* dirmngr/Makefile.am (dirmngr_ldap_SOURCES): Add ldap-misc.c
+	(module_tests) [USE_LDAP]: Add t-ldap-misc.
+	(t_ldap_parse_uri_SOURCES): Ditto.
+	(t_ldap_misc_SOURCES): New.
+
+	dirmngr: Remove useless code.
+	+ commit bcb99315627ec38aa5c9fe097075a82bdc8a2043
+	* dirmngr/ks-engine-ldap.c (my_ldap_connect): Remove the
+	password_param thing because we set the password directly without an
+	intermediate var.
+
+	dirmngr: Fix default port for our redefinition of ldaps.
+	+ commit 58e4c82512a4b0828f78fc9f03dbcdbf77760b5c
+	* dirmngr/server.c (make_keyserver_item): Fix default port for ldaps.
+	Move a tmpstr out of the blocks.
+	* dirmngr/ks-engine-ldap.c (my_ldap_connect): Improve diagnostics.
+
+	dirmngr: Use --ldaptimeout for OpenPGP LDAP keyservers.
+	+ commit 3e05f99e8db5c4039d352d5bd9dde01ed9653f2f
+	* dirmngr/ks-engine-ldap.c (my_ldap_connect): Use LDAP_OPT_TIMEOUT.
+
+	* dirmngr/dirmngr.c (main): Move --ldaptimeout setting to ...
+	(parse_rereadable_options): here.
+
+	dirmngr: New option --ldapserver.
+	+ commit 52cf32ce2f904b2e6f53f406a90458f6ef148af9
+	* dirmngr/dirmngr.c (opts): Add option --ldapserver.
+	(ldapserver_list_needs_reset): New var.
+	(parse_rereadable_options): Implement option.
+	(main): Ignore dirmngr_ldapservers.conf if no --ldapserver is used.
+
+	* dirmngr/server.c (cmd_ldapserver): Add option --clear and list
+	configured servers if none are given.
+
+	dirmngr: Allow for non-URL specified ldap keyservers.
+	+ commit eb3a629154de10a5414a5d2c2b9941ef8bf1eeaf
+	* dirmngr/server.c (cmd_ldapserver): Strip an optional prefix.
+	(make_keyserver_item): Handle non-URL ldap specs.
+	* dirmngr/dirmngr.h (struct ldap_server_s): Add fields starttls,
+	ldap_over_tls, and ntds.
+
+	* dirmngr/ldapserver.c (ldapserver_parse_one): Add for an empty host
+	string.  Improve error messages for the non-file case.  Support flags.
+	* dirmngr/ks-action.c (ks_action_help): Handle non-URL ldap specs.
+	(ks_action_search, ks_action_get, ks_action_put): Ditto.
+	* dirmngr/ks-engine-ldap.c: Include ldapserver.h.
+	(ks_ldap_help): Handle non-URL ldap specs.
+	(my_ldap_connect): Add args r_host and r_use_tls.  Rewrite to support
+	URLs and non-URL specified keyservers.
+	(ks_ldap_get): Adjust for changes in my_ldap_connect.
+	(ks_ldap_search): Ditto.
+	(ks_ldap_put): Ditto.
+
+	gpg,sm: Simplify keyserver spec parsing.
+	+ commit bebc71d2291e93afb76792c5e210836857103c36
+	* common/keyserver.h: Remove.
+	* sm/gpgsm.h (struct keyserver_spec): Remove.
+	(opt): Change keyserver to a strlist_t.
+	* sm/gpgsm.c (keyserver_list_free): Remove.
+	(parse_keyserver_line): Remove.
+	(main): Store keyserver in an strlist.
+	* sm/call-dirmngr.c (prepare_dirmngr): Adjust for the strlist.  Avoid
+	an ambiguity in dirmngr by adding a prefix if needed.
+
+	* g10/options.h (struct keyserver_spec): Move definition from
+	keyserver.h to here.  Remove most fields.
+	* g10/keyserver.c (free_keyserver_spec): Adjust.
+	(cmp_keyserver_spec): Adjust.
+	(parse_keyserver_uri): Simplify.
+	(keyidlist): Remove fakev3 arg which does not make any sense because
+	we don't even support v3 keys.
+
+	dirmngr: Support pseudo URI scheme "opaque".
+	+ commit 1c96f4d663c020167ed3d39e513751641dfc3567
+	* dirmngr/http.h (HTTP_PARSE_NO_SCHEME_CHECK): New.
+	* dirmngr/http.c (http_parse_uri): Use this flag.  Change all callers
+	to use the new macro for better readability.
+	(do_parse_uri): Add pseudo scheme "opaque".
+	(uri_query_value): New.
+
+2021-06-11  Werner Koch  <wk@gnupg.org>
+
+	sm: Fix finding of issuer in use-keyboxd mode.
+	+ commit 6b76693ff54297456b724ba53f7e6283e2a5a126
+	* sm/keydb.c (struct keydb_local_s): Add field saved_search_result.
+	(keydb_push_found_state): Implement for keyboxd.
+	(keydb_pop_found_state): Ditto.
+	(keydb_get_cert): Do not release the cert so that the function can be
+	used again to get the same cert.  This is the same behaviour as in
+	pubring.kbx mode.
+
+	* sm/certchain.c, sm/import.c: Improve some error messages.
+
+2021-06-11  NIIBE Yutaka  <gniibe@fsij.org>
+
+	scd: Support clearing of Reset Code by ''.
+	+ commit 4e02db75e3a1da9012176f2cfe1638c8c0129f6f
+	* scd/app-openpgp.c (do_change_pin): Allow null-string.
+
+2021-06-09  Werner Koch  <wk@gnupg.org>
+
+	gpgtar,w32: Fix file size computation.
+	+ commit 14e36bdbe1c39bc23e70db775e05319367ee8adb
+	* tools/gpgtar-create.c (fillup_entry_w32): Move parentheses.
+
+2021-06-09  NIIBE Yutaka  <gniibe@fsij.org>
+
+	agent: Fix importing protected secret key.
+	+ commit 7a80004d5407c6c48b21d57ba6edb8e5a2db4995
+	* agent/cvt-openpgp.c (do_unprotect): Only modify SKEY when it is
+	correctly decrypted.
+
+2021-06-08  NIIBE Yutaka  <gniibe@fsij.org>
+
+	scd: Fix serial number detection for Yubikey 5.
+	+ commit c3a9ee0b658887ca9baa4514187b17857fdf6586
+	* scd/app.c (app_new_register): Handle serial number correctly.
+
+2021-06-07  NIIBE Yutaka  <gniibe@fsij.org>
+
+	scd: Fix READER-PORT option handling for PC/SC.
+	+ commit ee5b6af370fbee1b08136e5dc384cf7996bcfc4c
+	* scd/apdu.c (apdu_open_reader): READERNO should be -1 when
+	READER-PORT is specified for PC/SC.
+
+2021-06-04  NIIBE Yutaka  <gniibe@fsij.org>
+
+	agent: Appropriate error code for importing key with no passwd.
+	+ commit 21ef425e222ddfa460b37dece63adb67ff2e4dd1
+	* agent/cvt-openpgp.c (convert_from_openpgp_main): Return
+	GPG_ERR_BAD_SECKEY.
+
+2021-06-03  NIIBE Yutaka  <gniibe@fsij.org>
+
+	gpg: Support KEYGRIP search with traditional keyring.
+	+ commit 9668ee097a1474299b8debecb1ee38620a327082
+	* g10/keyring.c (keyring_search): Handle KEYDB_SEARCH_MODE_KEYGRIP.
+
+2021-06-02  Werner Koch  <wk@gnupg.org>
+
+	common: Allow for GCM decryption in de-vs mode.
+	+ commit c17dac5ac3ccb374e5a1276d4bc9b444c390a4c5
+	* common/compliance.c (gnupg_cipher_is_allowed): Allow GCM for gpgsm
+	in decrypt mode.
+
+	* tests/cms/samplemsgs/pwri-sample.gcm.p7m: Remove duplicated authtag
+
+	sm: Support AES-GCM decryption.
+	+ commit 4980fb3c6dde8c1dda975e8a36d6086c8456a631
+	* tests/cms/samplemsgs/: Add sample messages.
+	* sm/gpgsm.c (main): Use gpgrt_fcancel on decryption error.
+	* sm/decrypt.c (decrypt_gcm_filter): New.
+	(gpgsm_decrypt): Use this filter if requested.  Check authtag.
+
+2021-05-28  Werner Koch  <wk@gnupg.org>
+
+	gpgconf: Make runtime changes with different homedir work.
+	+ commit 31c0aa2ff37f662c6391885d61ffd46ec3062e5a
+	* tools/gpgconf-comp.c (dirmngr_runtime_change): Pass --homedir first.
+
+2021-05-28  NIIBE Yutaka  <gniibe@fsij.org>
+
+	agent: Fix calling handle_pincache_put.
+	+ commit 36f50b259cae0428264f4b7d60b82209e3dd8725
+	* agent/call-scd.c (padding_info_cb): Fix the argument.
+
+	scd: Fix zero-byte handling in ECC.
+	+ commit 5b1806454c03b3b493222f405ffced80a5d430ad
+	* scd/app-openpgp.c (ecc_writekey): Don't remove zero-byte.
+
+2021-05-27  NIIBE Yutaka  <gniibe@fsij.org>
+
+	gpg: Ed448 and X448 are only for v5 for --full-gen-key.
+	+ commit 2b50f942672d9a2c325a818f21f69d3ee69255d3
+	* g10/keygen.c (generate_keypair): Set pVERSION = 5, pSUBVERSION = 5,
+	when it's Ed448 or X448.
+
+	build: _DARWIN_C_SOURCE should be 1.
+	+ commit be81941e1aca75d9e1d0dd2e2b234ae6df53c05a
+	* configure.ac (*-apple-darwin*): Set _DARWIN_C_SOURCE 1.
+
+2021-05-25  Werner Koch  <wk@gnupg.org>
+
+	gpg: Partial fix for Unicode problem in output files.
+	+ commit 30563ea29705016b08ff04fd8a833940ea94e4e8
+	* g10/openfile.c (overwrite_filep): Use gnupg_access.
+
+2021-05-21  Werner Koch  <wk@gnupg.org>
+
+	common: Annotate leaked memory in homedir.c.
+	+ commit 260bbb4ab27eab0a8d4fb68592b0d1c20d80179c
+	* g10/trustdb.c (how_to_fix_the_trustdb): Use gnupg_homedir.
+	* common/homedir.c (standard_homedir): Annotate leaked memory.
+	(gnupg_daemon_rootdir): Ditto.
+	(gnupg_socketdir): Ditto.
+	(gnupg_sysconfdir): Ditto.
+	(gnupg_bindir): Ditto.
+	(gnupg_libdir): Ditto.
+	(gnupg_datadir): Ditto.
+	(gnupg_localedir): Ditto.
+	(gnupg_cachedir): Ditto.
+	(gpg_agent_socket_name): Ditto.
+	(dirmngr_socket_name): Ditto.
+	(keyboxd_socket_name): Ditto.
+	(get_default_pinentry_name): Ditto.
+	(gnupg_module_name): Ditto.
+	(default_homedir): Ditto.  Make static.
+
+2021-05-20  Werner Koch  <wk@gnupg.org>
+
+	sm: Let --dump-cert --show-cert also print an OpenPGP fingerprint.
+	+ commit 52bbdc731fd54ff6d2744d7aca8e48e2c2389cc9
+	* sm/keylist.c (list_cert_raw): Print the OpenPGP fpr.
+
+2021-05-20  Jakub Jelen  <jjelen@redhat.com>
+
+	card: Intialize pointer to avoid double free.
+	+ commit 98c52aeb31f4bf2604727aacad982fb51c04063f
+	* tools/gpg-card.c (cmd_salut): Initialize data pointer
+
+	scd: avoid memory leaks.
+	+ commit 27e7bde12ee2b67425ae7011d976d2544c90fd9a
+	* scd/app-p15.c (send_certinfo): free labelbuf
+	  (do_sign): goto leave instead of return
+	* scd/app-piv.c (do_sign): goto leave instead of return, fix typo in
+	  variable name, avoid using uninitialized variables
+	* scd/command.c (cmd_genkey): goto leave instead of return
+
+	kbx: Avoid uninitialized read.
+	+ commit fc5fac83b778f0ff61608c286448ab7fa14ccb2d
+	* kbx/kbx-client-util.c (datastream_thread): Initialize pointer
+	* kbx/keybox-dump.c (_keybox_dump_cut_records): free blob
+	* kbx/kbxserver.c (kbxd_start_command_handler): do not free passed ctrl
+	* kbx/keyboxd.c (check_own_socket): free sockname
+
+	g10: Avoid memory leaks.
+	+ commit fa0771f609b5fcb104c64a11aefc501b7a91696d
+	* g10/call-agent.c (card_keyinfo_cb): free keyinfo.  Restructure to
+	avoid backward gotos.
+	* g10/keyedit.c (menu_set_keyserver_url): properly enclose the block
+	* g10/keygen.c (gen_card_key): free pk and pkt
+
+	dirmgr: Avoid double free.
+	+ commit 25aa353bf833fdae1a96158b49daf7588ae3b109
+	* dirmgr/http.c (http_prepare_redirect): Avoid double free
+	* dirmgr/ocsp.c (check_signature): Initialize pointer
+
+	common: Avoid double-free.
+	+ commit 4704d1ce4e1e2ba9f986fb221346eda5c97f947b
+	* common/name-value.c (do_nvc_parse): reset to null after ownership
+	change
+
+	agent: Fix memory leaks.
+	+ commit 33a2362e566c0e0d7011abf2e5fa5704d7cb4206
+	* agent/call-daemon.c (daemon_start): free wctp
+	* agent/call-scd.c (agent_card_pksign): return error instead of noop
+	(card_keyinfo_cb): free keyinfo.  Restructure to avoid a goto backwards.
+	* agent/protect.c (agent_get_shadow_info_type): allocate only as a last
+	action.  Catch xtrymalloc failure.
+	(agent_is_tpm2_key): Free buf.
+
+	sm: Avoid memory leaks and double double-free.
+	+ commit e6132bc9f41727ea1abe2d6298610223c11639a2
+	* sm/certcheck.c (extract_pss_params): Avoid double free
+	* sm/decrypt.c (gpgsm_decrypt): goto leave instead of return
+	* sm/encrypt.c (encrypt_dek): release s_pkey
+	* sm/server.c (cmd_export): free list
+	(do_listkeys): free lists
+
+	g10: Fix memory leaks.
+	+ commit 2af7bb2295cda5377546cedd0c906a3cff4d2427
+	* g10/card-util.c (change_pin): free answer on errors
+	  (ask_card_keyattr): free answer on error
+	* g10/cpr.c (do_get_from_fd): free string
+	* g10/gpg.c (check_permissions): free dir on weird error
+	* g10/import.c (append_new_uid): release knode
+	* g10/keyedit.c (menu_set_keyserver_url): free answer
+	  (menu_set_keyserver_url): free user
+	* g10/keygen.c (print_status_key_not_created): move allocation after
+	  sanity check
+	  (ask_expire_interval): free answer
+	  (card_store_key_with_backup): goto leave instaed of return
+	* g10/keyserver.c (parse_keyserver_uri): goto fail instead of return
+	* g10/revoke.c (gen_desig_revoke): release kdbhd
+	  (gen_desig_revoke): free answer
+	* g10/tofu.c (ask_about_binding): free sqerr and response
+	* g10/trustdb.c (ask_ownertrust): free pk
+
+	dirmgr: clean up memory on error code paths.
+	+ commit 0d2c1e9046faf102809bc65329c22b6cf8d62ea0
+	* dirmgr/crlcache.c (finish_sig_check): goto leave instead of return
+	* dirmgr/http.c (send_request): free authstr and proxy_authstr
+	* dirmgr/ldap.c (start_cert_fetch_ldap): free proxy
+	* dirmgr/ocsp.c (check_signature): release s_hash
+
+	agent: Avoid memory leaks in error code paths.
+	+ commit a95ddffdcd58383cce93677be5e7e11c5c229a98
+	* agent/command.c (cmd_genkey): Use goto instead of return.
+	* agent/cvt-openpgp.c (convert_from_openpgp_main): Ditto.
+	* agent/genkey.c (agent_ask_new_passphrase): Fix typo to free correct
+	pointer
+	(agent_genkey): Release memory
+	* agent/gpg-agent.c (check_own_socket): Free sockname
+	* agent/protect-tool.c (read_key): Free buf.
+	(agent_askpin): Free passphrase
+
+2021-05-19  Werner Koch  <wk@gnupg.org>
+
+	dirmngr: For KS_SEARCH return the fingerprint also with LDAP.
+	+ commit a660e1060630e8d75ecb43abf69dbb73378c1df9
+	* dirmngr/ks-engine-ldap.c (extract_keys): Return the fingerprint if
+	available.
+	(ks_ldap_search): Ditto.
+	(extract_keys): Make sure to free the ldap values also in corner
+	cases.
+	(my_ldap_value_free): New.
+	(ks_ldap_get): Ditto.
+	(ks_ldap_search): Ditto.
+	(my_ldap_connect): Ditto.
+
+	gpg: Improve speed of secret key listing.
+	+ commit 40da61b89b62dcb77847dc79eb159e885f52f817
+	* agent/command.c (cmd_keyinfo): Factor some code out to ...
+	(get_keyinfo_on_cards): ... new.
+	(cmd_havekey): Add --list mode.
+	* g10/gpg.h (struct server_control_s): Add new caching vars.
+	* g10/gpg.c (gpg_deinit_default_ctrl): Release cache.
+	* g10/call-agent.c (agent_probe_any_secret_key): Init and try to use
+	the keygrip cache.
+	(agent_genkey): Clear the cache.
+	(agent_import_key): Ditto.
+
+	* g10/keylist.c (list_all, list_one): Pass ctrl to
+	agent_probe_any_secret_key.
+	* g10/getkey.c (lookup): Ditto.
+
+2021-05-18  Werner Koch  <wk@gnupg.org>
+
+	gpg: Fix sending an OpenPGP key with umlaut to an LDAP keyserver.
+	+ commit b8e6e485ee0b3389992f5de4d717e2e9cca92a9e
+	* g10/call-dirmngr.c (record_output): Rewrite.
+
+2021-05-18  Ingo Klöcker  <dev@ingo-kloecker.de>
+
+	scd:p15: Fix logic for appending product name to MANUFACTURER.
+	+ commit 65bc5ea95e608869fe57dae43e201ed47b98f9fe
+	* scd/app-p15.c (do_getattr): Append product name to MANUFACTURER if
+	manufacturer_id does not already contain a bracket and if we have a
+	product name.
+
+2021-05-17  Werner Koch  <wk@gnupg.org>
+
+	gpg: Use a more descriptive prompt for symmetric decryption.
+	+ commit 6dfae2f402a702ccd7f2c585b28cb356e9f26a26
+	* g10/keydb.h (GETPASSWORD_FLAG_SYMDECRYPT): New.
+	(passphrase_to_dek_ext): Remove this obsolete prototype.
+	* g10/passphrase.c (passphrase_get): Add arg flags.  Use new flag
+	value.
+	(passphrase_to_dek): Add arg flags and pass it on.
+	* g10/mainproc.c (proc_symkey_enc): Use new flag.
+
+	* sm/decrypt.c (pwri_decrypt): Use "passphrase".
+
+	dirmngr: LDAP search by a mailbox now ignores revoked keys.
+	+ commit 1406f551f1e00a03eabf5b8bd3011bf6393ce318
+	* dirmngr/ks-engine-ldap.c (keyspec_to_ldap_filter): Ignore revoked
+	and disable keys in mail mode.
+
+	sm: Ask for the password for password based decryption (pwri)
+	+ commit eeb65d3bbd7d461694d30009631739735a2b9bad
+	* sm/decrypt.c (pwri_decrypt): Add arg ctrl.  Ask for passphrase.
+
+	* sm/export.c (export_p12): Mark string as translatable.
+	* sm/import.c (parse_p12): Ditto.
+
+2021-05-14  Werner Koch  <wk@gnupg.org>
+
+	sm: Support decryption of password based encryption (pwri)
+	+ commit 02029f9eab87e9fd667829dfb083846275576398
+	* sm/decrypt.c (pwri_parse_pbkdf2): New.
+	(pwri_decrypt): New.
+	(prepare_decryption): Support pwri.
+	(gpgsm_decrypt): Test for PWRI.  Move IS_DE_VS flag to DFPARM.
+
+2021-05-14  NIIBE Yutaka  <gniibe@fsij.org>
+
+	scd: Remove wrong assertion and add protection to PCSC.COUNT.
+	+ commit 58b330e935b9225d5a389c5d858a0e7304f573ad
+	* scd/apdu.c (apdu_dev_list_finish): Fix for calling
+	release_pcsc_context.
+
+2021-05-12  Werner Koch  <wk@gnupg.org>
+	    Jakub Jelen  <jjelen@redhat.com>
+
+	agent: Use SHA-256 for SSH fingerprint by default.
+	+ commit 310b064f5271fe8566ebc996702ea1422875f425
+	* agent/gpg-agent.c (parse_rereadable_options): Change default ssh
+	fingerprint digest.
+	(main): Ditto.
+
+2021-05-11  Werner Koch  <wk@gnupg.org>
+
+	A few minor code cleanups and typo fixes.
+	+ commit 965bb0693c0df04e6dbd57a8b471944367cf6c4e
+	* agent/command-ssh.c (ssh_handler_request_identities): Remove double
+	check of ERR.
+	* g10/getkey.c (get_pubkey_byname): Remove double use of break.
+	* g10/pkglue.c (pk_encrypt): Handle possible NULL-ptr access due to
+	failed malloc.
+
+2021-05-11  NIIBE Yutaka  <gniibe@fsij.org>
+
+	gpg: Fix allocation for EXTRAHASH.
+	+ commit ac731dbbbd21f53d2f6bf69343e6bf553ebc9dad
+	* g10/sign.c (clearsign_file): Fix the size to allocate.
+
+	scd: Serialize READER_TABLE access for PC/SC.
+	+ commit 32baa9acfb153004bdb2509f9516482b78f256a4
+	* scd/apdu.c (apdu_dev_list_start): Remove locking READER_TABLE_LOCK.
+	Don't increment PCSC.COUNT here.
+	(apdu_dev_list_finish): Don't decrement PCSC.COUNT here.
+	(apdu_open_reader): Protect access with READER_TABLE_LOCK.
+
+2021-05-10  NIIBE Yutaka  <gniibe@fsij.org>
+
+	scd: Fix close_pcsc_reader.
+	+ commit ec5591dc4e1f1b0340b9043a410dc62b63a90416
+	* scd/apdu.c (close_pcsc_reader): Don't touch .RDRNAME field.
+	(apdu_dev_list_finish): Clear .RDRNAME field and replace call of
+	close_pcsc_reader by release_pcsc_context.  Add assertion.
+
+	scd: Make sure releasing PC/SC context.
+	+ commit cccc9bd5db1f00c35dff192935e91d46cafb259f
+	* scd/apdu.c (release_pcsc_context): New.
+	(close_pcsc_reader): Use release_pcsc_context.  Add assertion.
+	(apdu_dev_list_start): Replace call of close_pcsc_reader
+	into release_pcsc_context, add condition.
+
+2021-05-07  NIIBE Yutaka  <gniibe@fsij.org>
+
+	scd: Increment PCSC.COUNT correctly.
+	+ commit 0498ea8fbd57d0df3093301d551db6b287ccf622
+	* scd/apdu.c (open_pcsc_reader): PCSC.COUNT should
+	be incremented before possible call of close_pcsc_reader.
+
+	scd: Fix memory leak for RDRNAME and serialize access.
+	+ commit 5d1b41310682a599a16bcb95e18f56e62299059e
+	* scd/apdu.c (close_pcsc_reader): Move locking to...
+	(apdu_close_reader): ... here, as it's also needed for CCID driver.
+	Free RDRNAME when closed.
+
+	scd: Fix declarations for PC/SC access.
+	+ commit 039aed9d401f3875eee0251d34be74de7a1daf84
+	* scd/apdu.c (pcsc_begin_transaction, pcsc_transmit): Use HANDLE.
+
+2021-05-06  NIIBE Yutaka  <gniibe@fsij.org>
+
+	scd: Recover the partial match for PORTSTR for PC/SC.
+	+ commit 53bdc6288f9b474e53f06088130e304cee41b12d
+	* scd/apdu.c (apdu_open_reader): Allow partial match of
+	PORTSTR again just like 2.2 does.
+
+	scd: When reader is specified, make sure only open once.
+	+ commit d6fe82d3d1699eb417f87b487048f95fee91e2cd
+	* scd/apdu.c (apdu_open_reader): Make sure not to try multiple times,
+	when PORTSTR is specified.
+
+2021-04-29  Werner Koch  <wk@gnupg.org>
+
+	scd: Fix PC/SC removed card problem.
+	+ commit 8d81fd7c01e8dfacc719ff190f8e364014e32fdf
+	* scd/apdu.c (pcsc_cancel): New.
+	(pcsc_init): Load new function.
+	(connect_pcsc_card): Use it after a removed card error.
+
+2021-04-28  Werner Koch  <wk@gnupg.org>
+
+	scd: Fix problem with reader list becoming empty.
+	+ commit bb8e3996e44f4f057f0771b9b72c89feae00f1b1
+	* scd/apdu.c (close_pcsc_reader): Do not decrement refcount if already
+	zero.  Always release context if or becomes zero.
+	(apdu_dev_list_start): Unlock prior to close_pcsc_reader.  For PC/SC
+	increment the count.  Always release the lock.
+	(apdu_dev_list_finish): No more unlocking.  Use close_pcsc_reader
+	instead of code duplication.
+
+	* scd/apdu.c (pcsc_error_string): Add an error code.
+	* scd/scdaemon.c (scd_kick_the_loop): Fix a diagnostic.
+
+2021-04-27  Kirill Elagin  <kirelagin@gmail.com>
+
+	scd: Fix unblock PIN by a Reset Code with KDF.
+	+ commit f209d7d2db0e963a6ad1fa8c4f0c034ba0297842
+	* scd/app-openpgp.c (do_change_pin): Use correct CHVNO=1 for
+	pin2hash_if_kdf, for user's PIN.
+
+2021-04-26  Werner Koch  <wk@gnupg.org>
+
+	gpg: Fix mailbox based search via AKL keyserver method.
+	+ commit 4fcfac6feb2a6c2b14883ba406afc917e8d4be42
+	* g10/keyserver.c (keyserver_import_name): Rename to ...
+	(keyserver_import_mbox): this.  And use mail search mode.
+	* g10/getkey.c (get_pubkey_byname): Change the two callers.
+
+	gpg: Do not use import-clean for LDAP keyserver imports.
+	+ commit 99db4b0c7fd128ea5b2e251fe854bd57f6322238
+	* g10/options.h (opts): New field expl_import_only.
+	* g10/import.c (parse_import_options): Set it.
+	* g10/keyserver.c (keyserver_get_chunk): Add special options for LDAP.
+
+2021-04-25  Werner Koch  <wk@gnupg.org>
+
+	gpg: Auto import keys specified with --trusted-keys.
+	+ commit 100037ac0f558e8959fc065d4703c85c2962489e
+	* g10/getkey.c (get_pubkey_with_ldap_fallback): New.
+	* g10/trustdb.c (verify_own_keys): Use it.
+
+	scd:p15: Fix last commit and improve D-TRUST detection.
+	+ commit cc5aa68b6310bdeaa1102bb0d6a33420920648e7
+	* scd/app-p15.c (read_p15_info): Improve D-TRUST card detection.
+	(do_getattr): Fix faulty code for the last commit.  Append the product
+	name to MANUFACTURER.
+
+	scd:p15: Shorten the displayed s/n of RSCS cards.
+	+ commit 21e3f750bd7dde2ae9ece01b1abdd1b47ba4fb04
+	* scd/app-p15.c (get_dispserialno): Add dedicated handling for RSCS.
+
+2021-04-23  Werner Koch  <wk@gnupg.org>
+
+	gpg: Replace an obsolete trustdb function.
+	+ commit 3cbc66410d62ad2f7e559095753a2385fe644d07
+	* g10/trustdb.c (tdb_register_trusted_keyid): Make static.
+	(tdb_register_trusted_key): Replace register_trusted_keyid by
+	tdb_register_trusted_key.
+	* g10/keygen.c (do_generate_keypair): Ditto.
+	* g10/trust.c (register_trusted_keyid): Remove.
+
+	gpg: Allow decryption w/o public key but with correct card inserted.
+	+ commit 50293ec2ebf2a997dbad9a47166d694efcc0709a
+	* agent/command.c (cmd_readkey): Add option --no-data and special
+	handling for $SIGNKEYID and $AUTHKEYID.
+	* g10/call-agent.c (agent_scd_getattr): Create shadow keys for KEY-FPR
+	output.
+	* g10/skclist.c (enum_secret_keys): Automagically get a missing public
+	key for the current card.
+
+	agent: Require verbose level 2 for handler started/terminated notices.
+	+ commit 84c2d97cca76045bbe9d0598a10623d5d91e6530
+	* agent/gpg-agent.c (do_start_connection_thread): Silence diags even
+	more.
+
+2021-04-23  NIIBE Yutaka  <gniibe@fsij.org>
+
+	tools: Fix for --disable-tpm2d.
+	+ commit 97ba94e52b2390f43fc1ac7db98e8ee7a37ddfb1
+	* tools/gpgconf-comp.c: Conditionalize with BUILD_WITH_TPM2D.
+
+2021-04-22  Werner Koch  <wk@gnupg.org>
+
+	scd: Fix PSO_CSV for 512 bit curves.
+	+ commit 9e24f2a45ce8038f662ec1a9893669e1d5604ec7
+	* scd/iso7816.c (iso7816_pso_csv): Use BER-TLV instead of SIMPLE-TLV
+
+	tests: Make sure that the build keyboxd is used.
+	+ commit d36c4dc95b72b780375d57311bdf4ae842fd54fa
+	* tests/openpgp/defs.scm (create-gpghome): Add keyboxd-program.
+
+2021-04-21  Werner Koch  <wk@gnupg.org>
+
+	card: New option --shadow for command list.
+	+ commit 2fce99d73a6afc1a1a29041722a934bb81c7d739
+	* tools/card-call-scd.c (scd_readkey): Add arg create_shadow.
+	* tools/gpg-card.c (list_one_kinfo): Add arg create_shadow and pass it
+	down to scd-readkey.  Change all callers to convey this arg.
+	(cmd_list): Add option --shadow.
+
+	agent: Silence error messages for READKEY --card.
+	+ commit 8f2c9cb73538baab7da8107f2cceb2f6fc49642a
+	* agent/command.c (cmd_readkey): Test for shadow key before creating
+	it.
+
+	gpg: Allow fingerprint based lookup with --locate-external-key.
+	+ commit ec36eca08cdbf6653e7362e8e0e6c5f2c75b4a60
+	* g10/keyserver.c (keyserver_import_fprint_ntds): New.
+	* g10/getkey.c (get_pubkey_byname): Detect an attempt to search by
+	fingerprint in no_local mode.
+
+	keyboxd: Fix searching for exact mail addresses.
+	+ commit f79e9540ca643b5cb912e7bfca2af56be428efed
+	* kbx/kbxserver.c (cmd_search): Use the openpgp hack for calling
+	classify_user_id.
+	* kbx/backend-sqlite.c (run_select_statement): Remove angle brackets
+	in exact addrspec mode.
+	* g10/call-keyboxd.c (keydb_search): Do not duplicate the left angle
+	bracket.
+	* sm/keydb.c (keydb_search): Ditto.
+
+	gpg,sm: Ignore the log-file option from common.conf.
+	+ commit d153e4936e05ab3b15df3c092024d83ac9d6ca46
+	* g10/gpg.c (main): Don't use the default log file from common.conf.
+	* sm/gpgsm.c (main): Ditto.
+
 2021-04-20  Werner Koch  <wk@gnupg.org>
 
 	Release 2.3.1.
diff --git a/Makefile.am b/Makefile.am
index 06a9a66..145e5b0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -213,7 +213,7 @@ release:
 
 sign-release:
 	 +(set -e; \
-	  cd dist; \
+	  test $$(pwd | sed 's,.*/,,') = dist || cd dist; \
 	  x=$$(grep '^RELEASE_ARCHIVE=' $$HOME/.gnupg-autogen.rc|cut -d= -f2);\
           if [ -z "$$x" ]; then \
              echo "error: RELEASE_ARCHIVE missing in ~/.gnupg-autogen.rc">&2; \
diff --git a/Makefile.in b/Makefile.in
index 53bc832..6e4c501 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1134,7 +1134,7 @@ release:
 
 sign-release:
 	 +(set -e; \
-	  cd dist; \
+	  test $$(pwd | sed 's,.*/,,') = dist || cd dist; \
 	  x=$$(grep '^RELEASE_ARCHIVE=' $$HOME/.gnupg-autogen.rc|cut -d= -f2);\
           if [ -z "$$x" ]; then \
              echo "error: RELEASE_ARCHIVE missing in ~/.gnupg-autogen.rc">&2; \
diff --git a/NEWS b/NEWS
index e3a8bef..1bda4ac 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,138 @@
+Noteworthy changes in version 2.3.2 (2021-08-24)
+------------------------------------------------
+
+  * gpg: Allow fingerprint based lookup with --locate-external-key.
+    [ec36eca08c]
+
+  * gpg: Allow decryption w/o public key but with correct card
+    inserted.  [50293ec2eb]
+
+  * gpg: Auto import keys specified with --trusted-keys.  [100037ac0f]
+
+  * gpg: Do not use import-clean for LDAP keyserver imports.  [#5387]
+
+  * gpg: Fix mailbox based search via AKL keyserver method.  [4fcfac6feb]
+
+  * gpg: Fix memory corruption with --clearsign introduced with 2.3.1.
+    [#5430]
+
+  * gpg: Use a more descriptive prompt for symmetric decryption.
+    [6dfae2f402]
+
+  * gpg: Improve speed of secret key listing.  [40da61b89b]
+
+  * gpg: Support keygrip search with traditional keyring.  [#5469]
+
+  * gpg: Let --fetch-key return an exit code on failure.  [#5376]
+
+  * gpg: Emit the NO_SECKEY status again for decryption.  [#5562]
+
+  * gpgsm: Support decryption of password based encryption (pwri).
+    [eeb65d3bbd]
+
+  * gpgsm: Support AES-GCM decryption.  [4980fb3c6d]
+
+  * gpgsm: Let --dump-cert --show-cert also print an OpenPGP
+    fingerprint.  [52bbdc731f]
+
+  * gpgsm: Fix finding of issuer in use-keyboxd mode.  [6b76693ff5]
+
+  * gpgsm: New option --ldapserver as an alias for --keyserver.
+    [89df86157e]
+
+  * agent: Use SHA-256 for SSH fingerprint by default.  [#5434]
+
+  * agent: Fix calling handle_pincache_put.  [#5436]
+
+  * agent: Fix importing protected secret key.  [#5122]
+
+  * agent: Fix a regression in agent_get_shadow_info_type.  [#5393]
+
+  * agent: Add translatable text for Caps Lock hint.  [#4950]
+
+  * agent: New option --pinentry-formatted-passphrase.  [#5517]
+
+  * agent: Add checkpin inquiry for pinentry.  [#5517,#5532]
+
+  * agent: New option --check-sym-passphrase-pattern.  [#5517]
+
+  * agent: Use the sysconfdir for a pattern file.
+
+  * agent: Make QT_QPA_PLATFORMTHEME=qt5ct work for the pinentry.
+    [1305baf099]
+
+  * dirmngr: LDAP search by a mailbox now ignores revoked keys.
+    [1406f551f1]
+
+  * dirmngr: For KS_SEARCH return the fingerprint also with LDAP.
+    [#5441]
+
+  * dirmngr: Allow for non-URL specified ldap keyservers.  [#5405,#5452]
+
+  * dirmngr: New option --ldapserver.  [52cf32ce2f]
+
+  * dirmngr: Fix regression in KS_GET for mail address pattern.
+    [#5497]
+
+  * card: New option --shadow for the list command.  [2fce99d73a]
+
+  * tests: Make sure the built keyboxd is used.  [#5406]
+
+  * scd: Fix computing shared secrets for 512 bit curves.
+    [9e24f2a45c]
+
+  * scd: Fix unblock PIN by a Reset Code with KDF.  [#5413]
+
+  * scd: Fix PC/SC removed card problem.  [8d81fd7c01]
+
+  * scd: Recover the partial match for PORTSTR for PC/SC.
+   [53bdc6288f]
+
+  * scd: Make sure to release the PC/SC context.  [#5416]
+
+  * scd: Fix zero-byte handling in ECC.  [#5163]
+
+  * scd: Fix serial number detection for Yubikey 5.  [#5442]
+
+  * scd: Add basic support for AET JCOP cards.  [544ec7872a]
+
+  * scd: Detect external interference when --pcsc-shared is in use.
+    [#5484]
+
+  * scd: Fix access to the list of cards.  [#5524]
+
+  * gpgconf: Do not list a disabled tpm2d.  [#5408]
+
+  * gpgconf: Make runtime changes with different homedir work.
+    [31c0aa2ff3]
+
+  * keyboxd: Fix searching for exact mail adddress.  [f79e9540ca]
+
+  * keyboxd: Fix searching with multiple patterns.  [101ba4f18a]
+
+  * gpgtar: Fix file size computation under Windows.  [14e36bdbe1]
+
+  * tools: Extend gpg-check-pattern.  [73c03e0232]
+
+  * wkd: Fix client issue with leading or trailing spaces in
+    user-ids.  [b4345f7521]
+
+  * Under Windows add a fallback in case the console can't cope with
+    Unicode.  [#5491]
+
+  * Under Windows use LOCAL_APPDATA for the socket directory.  [#5537]
+
+  * Pass XDG_SESSION_TYPE and QT_QPA_PLATFORM envvars to Pinentry.
+    [#3659]
+
+  * Change the default keyserver to keyserver.ubuntu.com.  This is a
+    temporary change due to the shutdown of the SKS keyserver pools.
+    [55b5928099]
+
+  Release-info: https://dev.gnupg.org/T5405
+  See-also: gnupg-announce/2021q3/000462.html
+
+
 Noteworthy changes in version 2.3.1 (2021-04-20)
 ------------------------------------------------
 
@@ -953,6 +1088,8 @@ Noteworthy changes in version 2.3.0 (2021-04-07)
 Release dates of 2.2 versions
 -----------------------------
 
+Version 2.2.29 (2021-07-04) https://dev.gnupg.org/T5498
+Version 2.2.28 (2021-06-10) https://dev.gnupg.org/T5482
 Version 2.2.27 (2021-01-11) https://dev.gnupg.org/T5234
 Version 2.2.26 (2020-12-21) https://dev.gnupg.org/T5153
 Version 2.2.25 (2020-11-23) https://dev.gnupg.org/T5140
diff --git a/README b/README
index d21089c..e1426d8 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
                        The GNU Privacy Guard 2
                       =========================
-                         Version 2.3 (devel)
+                            Version 2.3
 
           Copyright 1997-2019 Werner Koch
           Copyright 1998-2021 Free Software Foundation, Inc.
@@ -180,13 +180,7 @@
                                 Do not post to this list.
 
      gnupg-users@gnupg.org      For general user discussion and
-                                help (English).
-
-     gnupg-de@gnupg.org         German speaking counterpart of
-                                gnupg-users.
-
-     gnupg-ru@gnupg.org         Russian speaking counterpart of
-                                gnupg-users.
+                                help.
 
      gnupg-devel@gnupg.org      GnuPG developers main forum.
 
diff --git a/VERSION b/VERSION
index 2bf1c1c..f90b1af 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.3.1
+2.3.2
diff --git a/agent/agent.h b/agent/agent.h
index 064b7be..6004f2d 100644
--- a/agent/agent.h
+++ b/agent/agent.h
@@ -108,6 +108,9 @@ struct
      upon this timeout value.  */
   unsigned long pinentry_timeout;
 
+  /* If set, then passphrase formatting is enabled in pinentry.  */
+  int pinentry_formatted_passphrase;
+
   /* The default and maximum TTL of cache entries. */
   unsigned long def_cache_ttl;     /* Default. */
   unsigned long def_cache_ttl_ssh; /* for SSH. */
@@ -123,8 +126,11 @@ struct
   /* The minimum number of non-alpha characters in a passphrase.  */
   unsigned int min_passphrase_nonalpha;
 
-  /* File name with a patternfile or NULL if not enabled.  */
+  /* File name with a patternfile or NULL if not enabled.  If the
+   * second one is set, it is used for symmetric only encryption
+   * instead of the former. */
   const char *check_passphrase_pattern;
+  const char *check_sym_passphrase_pattern;
 
   /* If not 0 the user is asked to change his passphrase after these
      number of days.  */
@@ -290,7 +296,8 @@ enum
   {
     PINENTRY_STATUS_CLOSE_BUTTON = 1 << 0,
     PINENTRY_STATUS_PIN_REPEATED = 1 << 8,
-    PINENTRY_STATUS_PASSWORD_FROM_CACHE = 1 << 9
+    PINENTRY_STATUS_PASSWORD_FROM_CACHE = 1 << 9,
+    PINENTRY_STATUS_PASSWORD_GENERATED = 1 << 10
   };
 
 /* Information pertaining to pinentry requests.  */
@@ -299,6 +306,7 @@ struct pin_entry_info_s
   int min_digits; /* min. number of digits required or 0 for freeform entry */
   int max_digits; /* max. number of allowed digits allowed*/
   int max_tries;  /* max. number of allowed tries.  */
+  unsigned int constraints_flags;  /* CHECK_CONSTRAINTS_... */
   int failed_tries; /* Number of tries so far failed.  */
   int with_qualitybar; /* Set if the quality bar should be displayed.  */
   int with_repeat;  /* Request repetition of the passphrase.  */
@@ -521,7 +529,11 @@ gpg_error_t agent_pkdecrypt (ctrl_t ctrl, const char *desc_text,
                              membuf_t *outbuf, int *r_padding);
 
 /*-- genkey.c --*/
-int check_passphrase_constraints (ctrl_t ctrl, const char *pw, int no_empty,
+#define CHECK_CONSTRAINTS_NOT_EMPTY  1
+#define CHECK_CONSTRAINTS_NEW_SYMKEY 2
+
+int check_passphrase_constraints (ctrl_t ctrl, const char *pw,
+                                  unsigned int flags,
 				  char **failed_constraint);
 gpg_error_t agent_ask_new_passphrase (ctrl_t ctrl, const char *prompt,
                                       char **r_passphrase);
diff --git a/agent/call-daemon.c b/agent/call-daemon.c
index 1444008..3bf6bb7 100644
--- a/agent/call-daemon.c
+++ b/agent/call-daemon.c
@@ -512,6 +512,8 @@ daemon_start (enum daemon_type type, ctrl_t ctrl)
           log_error ("error spawning wait_child_thread: %s\n", strerror (err));
         npth_attr_destroy (&tattr);
       }
+    else
+      xfree (wctp);
   }
 
  leave:
diff --git a/agent/call-pinentry.c b/agent/call-pinentry.c
index dd60c2e..45ec1b5 100644
--- a/agent/call-pinentry.c
+++ b/agent/call-pinentry.c
@@ -53,10 +53,12 @@
    time. */
 #define LOCK_TIMEOUT  (1*60)
 
-/* Define the maximum tries to generate a pin for the GENPIN inquire */
-#define MAX_GENPIN_TRIES 10
-/* Define the number of characters to use for a generated pin */
-#define DEFAULT_GENPIN_BYTES (128 / 8)
+/* Define the number of bits to use for a generated pin.  The
+ * 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. */
+#define DEFAULT_GENPIN_BITS 150
 
 /* The assuan context of the current pinentry. */
 static assuan_context_t entry_ctx;
@@ -91,6 +93,7 @@ struct entry_parm_s
   size_t size;
   unsigned char *buffer;
   int status;
+  unsigned int constraints_flags;
 };
 
 
@@ -198,7 +201,7 @@ unlock_pinentry (ctrl_t ctrl, gpg_error_t rc)
 
 
 /* Helper for at_fork_cb which can also be called by the parent to
- * show shich envvars will be set.  */
+ * show which envvars will be set.  */
 static void
 atfork_core (ctrl_t ctrl, int debug_mode)
 {
@@ -210,8 +213,15 @@ atfork_core (ctrl_t ctrl, int debug_mode)
       /* For all new envvars (!ASSNAME) and the two medium old ones
        * which do have an assuan name but are conveyed using
        * environment variables, update the environment of the forked
-       * process.  */
+       * process.  We also pass DISPLAY despite that --display is also
+       * used when exec-ing the pinentry.  The reason is that for
+       * example the qt5ct tool does not have any arguments and thus
+       * relies on the DISPLAY envvar.  The use case here is a global
+       * envvar like "QT_QPA_PLATFORMTHEME=qt5ct" which for example is
+       * useful when using the Qt pinentry under GNOME or XFCE.
+       */
       if (!assname
+          || (!opt.keep_display && !strcmp (name, "DISPLAY"))
           || !strcmp (name, "XAUTHORITY")
           || !strcmp (name, "PINENTRY_USER_DATA"))
         {
@@ -426,7 +436,7 @@ start_pinentry (ctrl_t ctrl)
     log_debug ("connection to PIN entry established\n");
 
   if (opt.debug_pinentry)
-    atfork_core (ctrl, 1);
+    atfork_core (ctrl, 1); /* Just show the envvars set after the fork.  */
 
   value = session_env_getenv (ctrl->session_env, "PINENTRY_USER_DATA");
   if (value != NULL)
@@ -553,6 +563,7 @@ start_pinentry (ctrl_t ctrl)
                      "passphrase visible on the screen?") },
       { "tt-visi",N_("|pinentry-tt|Make passphrase visible") },
       { "tt-hide",N_("|pinentry-tt|Hide passphrase") },
+      { "capshint", N_("Caps Lock is on") },
       { NULL, NULL}
     };
     char *optstr;
@@ -837,18 +848,19 @@ estimate_passphrase_quality (const char *pw)
 
 
 /* Generate a random passphrase in zBase32 encoding (RFC-6189) to be
- * used by pinetry to suggest a passphrase.  */
+ * used by Pinentry to suggest a passphrase.  */
 static char *
 generate_pin (void)
 {
-  size_t nbytes = opt.min_passphrase_len;
+  unsigned int nbits = opt.min_passphrase_len * 8;
+  size_t nbytes;
   void *rand;
   char *generated;
 
-  if (nbytes < 8)
-    {
-      nbytes = DEFAULT_GENPIN_BYTES;
-    }
+  if (nbits < 128)
+    nbits = DEFAULT_GENPIN_BITS;
+
+  nbytes = (nbits + 7) / 8;
 
   rand = gcry_random_bytes_secure (nbytes, GCRY_STRONG_RANDOM);
   if (!rand)
@@ -857,17 +869,47 @@ generate_pin (void)
       return NULL;
     }
 
-  generated = zb32_encode (rand, nbytes * 8);
+  generated = zb32_encode (rand, nbits);
   gcry_free (rand);
   return generated;
 }
 
 
 /* Handle inquiries. */
+struct inq_cb_parm_s
+{
+  assuan_context_t ctx;
+  unsigned int flags;  /* CHECK_CONSTRAINTS_... */
+  int genpinhash_valid;
+  char genpinhash[32]; /* Hash of the last generated pin.  */
+};
+
+
+/* Return true if PIN is indentical to the last generated pin.  */
+static int
+is_generated_pin (struct inq_cb_parm_s *parm, const char *pin)
+{
+  char hashbuf[32];
+
+  if (!parm->genpinhash_valid)
+    return 0;
+  if (!*pin)
+    return 0;
+  /* Note that we compare the hash so that we do not need to save the
+   * generated PIN longer than needed. */
+  gcry_md_hash_buffer (GCRY_MD_SHA256, hashbuf, pin, strlen (pin));
+
+  if (!memcmp (hashbuf, parm->genpinhash, 32))
+    return 1; /* yes, it is the same.  */
+
+  return 0;
+}
+
+
 static gpg_error_t
 inq_cb (void *opaque, const char *line)
 {
-  assuan_context_t ctx = opaque;
+  struct inq_cb_parm_s *parm = opaque;
   gpg_error_t err;
   const char *s;
   char *pin;
@@ -883,39 +925,75 @@ inq_cb (void *opaque, const char *line)
       else
         {
           percent = estimate_passphrase_quality (pin);
-          if (check_passphrase_constraints (NULL, pin, 0, NULL))
+          if (check_passphrase_constraints (NULL, pin, parm->flags, NULL))
             percent = -percent;
           snprintf (numbuf, sizeof numbuf, "%d", percent);
-          err = assuan_send_data (ctx, numbuf, strlen (numbuf));
+          err = assuan_send_data (parm->ctx, numbuf, strlen (numbuf));
           xfree (pin);
         }
     }
-  else if ((s = has_leading_keyword (line, "GENPIN")))
+  else if ((s = has_leading_keyword (line, "CHECKPIN")))
     {
-      int tries;
+      char *errtext = NULL;
+      size_t errtextlen;
+
+      if (!opt.enforce_passphrase_constraints)
+        {
+          log_error ("unexpected inquiry 'CHECKPIN' without enforced "
+                     "passphrase constraints\n");
+          err = gpg_error (GPG_ERR_ASS_UNEXPECTED_CMD);
+          goto leave;
+        }
 
-      for (tries = 0; tries < MAX_GENPIN_TRIES; tries ++)
+      pin = unescape_passphrase_string (s);
+      if (!pin)
+        err = gpg_error_from_syserror ();
+      else
         {
-          pin = generate_pin ();
-          if (!pin)
+          if (!is_generated_pin (parm, pin)
+              && check_passphrase_constraints (NULL, pin,parm->flags, &errtext))
             {
-              log_error ("failed to generate a passphrase\n");
-              err = gpg_error (GPG_ERR_GENERAL);
-              goto leave;
+              if (errtext)
+                {
+                  /* Unescape the percent-escaped errtext because
+                     assuan_send_data escapes it again. */
+                  errtextlen = percent_unescape_inplace (errtext, 0);
+                  err = assuan_send_data (parm->ctx, errtext, errtextlen);
+                }
+              else
+                {
+                  log_error ("passphrase check failed without error text\n");
+                  err = gpg_error (GPG_ERR_GENERAL);
+                }
             }
-          if (!check_passphrase_constraints (NULL, pin, 0, NULL))
+          else
             {
-              assuan_begin_confidential (ctx);
-              err = assuan_send_data (ctx, pin, strlen (pin));
-              assuan_end_confidential (ctx);
-              xfree (pin);
-              goto leave;
+              err = assuan_send_data (parm->ctx, NULL, 0);
             }
+          xfree (errtext);
           xfree (pin);
         }
-      log_error ("failed to generate a passphrase after %i tries\n",
-                 MAX_GENPIN_TRIES);
-      err = gpg_error (GPG_ERR_GENERAL);
+    }
+  else if ((s = has_leading_keyword (line, "GENPIN")))
+    {
+      int wasconf;
+
+      parm->genpinhash_valid = 0;
+      pin = generate_pin ();
+      if (!pin)
+        {
+          log_error ("failed to generate a passphrase\n");
+          err = gpg_error (GPG_ERR_GENERAL);
+          goto leave;
+        }
+      wasconf = assuan_get_flag (entry_ctx, ASSUAN_CONFIDENTIAL);
+      assuan_begin_confidential (parm->ctx);
+      err = assuan_send_data (parm->ctx, pin, strlen (pin));
+      if (!wasconf)
+        assuan_end_confidential (parm->ctx);
+      gcry_md_hash_buffer (GCRY_MD_SHA256, parm->genpinhash, pin, strlen (pin));
+      parm->genpinhash_valid = 1;
+      xfree (pin);
     }
   else
     {
@@ -982,6 +1060,128 @@ setup_genpin (ctrl_t ctrl)
 }
 
 
+/* Helper to setup pinentry for formatted passphrase. */
+static gpg_error_t
+setup_formatted_passphrase (ctrl_t ctrl)
+{
+  static const struct { const char *key, *help_id, *value; } tbl[] = {
+    /* TRANSLATORS: This is a text shown by pinentry if the option
+        for formatted passphrase is enabled.  The length is
+        limited to about 900 characters.  */
+    { "hint",  "pinentry.formatted_passphrase.hint",
+      N_("Note: The blanks are not part of the passphrase.") },
+    { NULL, NULL }
+  };
+
+  gpg_error_t rc;
+  char line[ASSUAN_LINELENGTH];
+  int idx;
+  char *tmpstr;
+  const char *s;
+  char *escapedstr;
+
+  (void)ctrl;
+
+  if (opt.pinentry_formatted_passphrase)
+    {
+      snprintf (line, DIM(line), "OPTION formatted-passphrase");
+      rc = assuan_transact (entry_ctx, line, NULL, NULL, NULL, NULL, NULL,
+                            NULL);
+      if (rc && gpg_err_code (rc) != GPG_ERR_UNKNOWN_OPTION)
+        return rc;
+
+      for (idx=0; tbl[idx].key; idx++)
+        {
+          tmpstr = gnupg_get_help_string (tbl[idx].help_id, 0);
+          if (tmpstr)
+            s = tmpstr;
+          else
+            s = L_(tbl[idx].value);
+          escapedstr = try_percent_escape (s, "\t\r\n\f\v");
+          xfree (tmpstr);
+          if (escapedstr && *escapedstr)
+            {
+              snprintf (line, DIM(line), "OPTION formatted-passphrase-%s=%s",
+                        tbl[idx].key, escapedstr);
+              rc = assuan_transact (entry_ctx, line,
+                                    NULL, NULL, NULL, NULL, NULL, NULL);
+            }
+          else
+            rc = 0;
+          xfree (escapedstr);
+          if (rc && gpg_err_code (rc) != GPG_ERR_UNKNOWN_OPTION)
+            return rc;
+        }
+    }
+
+  return 0;
+}
+
+
+/* Helper to setup pinentry for enforced passphrase constraints. */
+static gpg_error_t
+setup_enforced_constraints (ctrl_t ctrl)
+{
+  static const struct { const char *key, *help_id, *value; } tbl[] = {
+    { "hint-short", "pinentry.constraints.hint.short", NULL },
+    { "hint-long",  "pinentry.constraints.hint.long", NULL },
+    /* 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. */
+    { "error-title", NULL, N_("Passphrase Not Allowed") },
+    { NULL, NULL }
+  };
+
+  gpg_error_t rc;
+  char line[ASSUAN_LINELENGTH];
+  int idx;
+  char *tmpstr;
+  const char *s;
+  char *escapedstr;
+
+  (void)ctrl;
+
+  if (opt.enforce_passphrase_constraints)
+    {
+      snprintf (line, DIM(line), "OPTION constraints-enforce");
+      rc = assuan_transact (entry_ctx, line, NULL, NULL, NULL, NULL, NULL,
+                            NULL);
+      if (rc && gpg_err_code (rc) != GPG_ERR_UNKNOWN_OPTION)
+        return rc;
+
+      for (idx=0; tbl[idx].key; idx++)
+        {
+          tmpstr = gnupg_get_help_string (tbl[idx].help_id, 0);
+          if (tmpstr)
+            s = tmpstr;
+          else if (tbl[idx].value)
+            s = L_(tbl[idx].value);
+          else
+            {
+              log_error ("no help string found for %s\n", tbl[idx].help_id);
+              continue;
+            }
+          escapedstr = try_percent_escape (s, "\t\r\n\f\v");
+          xfree (tmpstr);
+          if (escapedstr && *escapedstr)
+            {
+              snprintf (line, DIM(line), "OPTION constraints-%s=%s",
+                        tbl[idx].key, escapedstr);
+              rc = assuan_transact (entry_ctx, line,
+                                    NULL, NULL, NULL, NULL, NULL, NULL);
+            }
+          else
+            rc = 0;  /* Ignore an empty string (would give an IPC error).  */
+          xfree (escapedstr);
+          if (rc && gpg_err_code (rc) != GPG_ERR_UNKNOWN_OPTION)
+            return rc;
+        }
+    }
+
+  return 0;
+}
+
+
 /* Helper for agent_askpin and agent_get_passphrase.  */
 static gpg_error_t
 setup_qualitybar (ctrl_t ctrl)
@@ -1179,19 +1379,32 @@ static gpg_error_t
 do_getpin (ctrl_t ctrl, struct entry_parm_s *parm)
 {
   gpg_error_t rc;
-  int saveflag = assuan_get_flag (entry_ctx, ASSUAN_CONFIDENTIAL);
   gnupg_fd_t sock_watched = ctrl->thread_startup.fd;
   npth_t thread;
+  int wasconf;
+  struct inq_cb_parm_s inq_cb_parm;
 
   rc = watch_sock_start (&sock_watched, &thread);
   if (rc)
     return rc;
 
+  inq_cb_parm.ctx = entry_ctx;
+  inq_cb_parm.flags = parm->constraints_flags;
+  inq_cb_parm.genpinhash_valid = 0;
+
+  wasconf = assuan_get_flag (entry_ctx, ASSUAN_CONFIDENTIAL);
   assuan_begin_confidential (entry_ctx);
   rc = assuan_transact (entry_ctx, "GETPIN", getpin_cb, parm,
-                        inq_cb, entry_ctx,
+                        inq_cb, &inq_cb_parm,
                         pinentry_status_cb, &parm->status);
-  assuan_set_flag (entry_ctx, ASSUAN_CONFIDENTIAL, saveflag);
+  if (!wasconf)
+    assuan_end_confidential (entry_ctx);
+
+  if (!rc && parm->buffer && is_generated_pin (&inq_cb_parm, parm->buffer))
+    parm->status |= PINENTRY_STATUS_PASSWORD_GENERATED;
+  else
+    parm->status &= ~PINENTRY_STATUS_PASSWORD_GENERATED;
+
   /* Most pinentries out in the wild return the old Assuan error code
      for canceled which gets translated to an assuan Cancel error and
      not to the code for a user cancel.  Fix this here. */
@@ -1224,6 +1437,7 @@ agent_askpin (ctrl_t ctrl,
   struct entry_parm_s parm;
   const char *errtext = NULL;
   int is_pin = 0;
+  int is_generated;
 
   if (opt.batch)
     return 0; /* fixme: we should return BAD PIN */
@@ -1342,6 +1556,7 @@ agent_askpin (ctrl_t ctrl,
       parm.size = pininfo->max_length;
       *pininfo->pin = 0; /* Reset the PIN. */
       parm.buffer = (unsigned char*)pininfo->pin;
+      parm.constraints_flags = pininfo->constraints_flags;
 
       if (errtext)
         {
@@ -1368,13 +1583,15 @@ agent_askpin (ctrl_t ctrl,
 
       rc = do_getpin (ctrl, &parm);
       pininfo->status = parm.status;
+      is_generated = !!(parm.status & PINENTRY_STATUS_PASSWORD_GENERATED);
+
       if (gpg_err_code (rc) == GPG_ERR_ASS_TOO_MUCH_DATA)
         errtext = is_pin? L_("PIN too long")
                         : L_("Passphrase too long");
       else if (rc)
         return unlock_pinentry (ctrl, rc);
 
-      if (!errtext && pininfo->min_digits)
+      if (!errtext && pininfo->min_digits && !is_generated)
         {
           /* do some basic checks on the entered PIN. */
           if (!all_digitsp (pininfo->pin))
@@ -1386,7 +1603,7 @@ agent_askpin (ctrl_t ctrl,
             errtext = L_("PIN too short");
         }
 
-      if (!errtext && pininfo->check_cb)
+      if (!errtext && pininfo->check_cb && !is_generated)
         {
           /* More checks by utilizing the optional callback. */
           pininfo->cb_errtext = NULL;
@@ -1445,6 +1662,7 @@ agent_get_passphrase (ctrl_t ctrl,
 {
   int rc;
   int is_pin;
+  int is_generated;
   char line[ASSUAN_LINELENGTH];
   struct entry_parm_s parm;
 
@@ -1555,6 +1773,10 @@ agent_get_passphrase (ctrl_t ctrl,
         return unlock_pinentry (ctrl, rc);
     }
 
+  rc = setup_formatted_passphrase (ctrl);
+  if (rc)
+    return unlock_pinentry (ctrl, rc);
+
   if (!pininfo)
     {
       /* Legacy method without PININFO.  */
@@ -1584,6 +1806,10 @@ agent_get_passphrase (ctrl_t ctrl,
         pininfo->with_repeat = 0; /* Pinentry does not support it.  */
 
       (void)setup_genpin (ctrl);
+
+      rc = setup_enforced_constraints (ctrl);
+      if (rc)
+        return unlock_pinentry (ctrl, rc);
     }
   pininfo->repeat_okay = 0;
   pininfo->status = 0;
@@ -1591,6 +1817,7 @@ agent_get_passphrase (ctrl_t ctrl,
   for (;pininfo->failed_tries < pininfo->max_tries; pininfo->failed_tries++)
     {
       memset (&parm, 0, sizeof parm);
+      parm.constraints_flags = pininfo->constraints_flags;
       parm.size = pininfo->max_length;
       parm.buffer = (unsigned char*)pininfo->pin;
       *pininfo->pin = 0; /* Reset the PIN. */
@@ -1620,13 +1847,15 @@ agent_get_passphrase (ctrl_t ctrl,
 
       rc = do_getpin (ctrl, &parm);
       pininfo->status = parm.status;
+      is_generated = !!(parm.status & PINENTRY_STATUS_PASSWORD_GENERATED);
+
       if (gpg_err_code (rc) == GPG_ERR_ASS_TOO_MUCH_DATA)
         errtext = is_pin? L_("PIN too long")
                         : L_("Passphrase too long");
       else if (rc)
         return unlock_pinentry (ctrl, rc);
 
-      if (!errtext && pininfo->min_digits)
+      if (!errtext && pininfo->min_digits && !is_generated)
         {
           /* do some basic checks on the entered PIN. */
           if (!all_digitsp (pininfo->pin))
@@ -1638,7 +1867,7 @@ agent_get_passphrase (ctrl_t ctrl,
             errtext = L_("PIN too short");
         }
 
-      if (!errtext && pininfo->check_cb)
+      if (!errtext && pininfo->check_cb && !is_generated)
         {
           /* More checks by utilizing the optional callback. */
           pininfo->cb_errtext = NULL;
diff --git a/agent/call-scd.c b/agent/call-scd.c
index 3ede33c..154ea34 100644
--- a/agent/call-scd.c
+++ b/agent/call-scd.c
@@ -487,7 +487,7 @@ agent_card_pksign (ctrl_t ctrl,
   /* FIXME: In the mdalgo case (INDATA,INDATALEN) might be long and
    * thus we can't convey it on a single Assuan line.  */
   if (!mdalgo)
-    gpg_error (GPG_ERR_NOT_IMPLEMENTED);
+    return gpg_error (GPG_ERR_NOT_IMPLEMENTED);
 
   if (indatalen*2 + 50 > DIM(line))
     return unlock_scd (ctrl, gpg_error (GPG_ERR_GENERAL));
@@ -546,7 +546,7 @@ padding_info_cb (void *opaque, const char *line)
       *r_padding = atoi (s);
     }
   else if ((s=has_leading_keyword (line, "PINCACHE_PUT")))
-    err = handle_pincache_put (line);
+    err = handle_pincache_put (s);
 
   return err;
 }
@@ -921,6 +921,7 @@ card_keyinfo_cb (void *opaque, const char *line)
   struct card_keyinfo_parm_s *parm = opaque;
   const char *keyword = line;
   int keywordlen;
+  struct card_key_info_s *keyinfo = NULL;
 
   for (keywordlen=0; *line && !spacep (line); line++, keywordlen++)
     ;
@@ -931,7 +932,6 @@ card_keyinfo_cb (void *opaque, const char *line)
     {
       const char *s;
       int n;
-      struct card_key_info_s *keyinfo;
       struct card_key_info_s **l_p = &parm->list;
 
       while ((*l_p))
@@ -939,23 +939,13 @@ card_keyinfo_cb (void *opaque, const char *line)
 
       keyinfo = xtrycalloc (1, sizeof *keyinfo);
       if (!keyinfo)
-        {
-        alloc_error:
-          if (!parm->error)
-            parm->error = gpg_error_from_syserror ();
-          return 0;
-        }
+        goto alloc_error;
 
       for (n=0,s=line; hexdigitp (s); s++, n++)
         ;
 
       if (n != 40)
-        {
-        parm_error:
-          if (!parm->error)
-            parm->error = gpg_error (GPG_ERR_ASS_PARAMETER);
-          return 0;
-        }
+        goto parm_error;
 
       memcpy (keyinfo->keygrip, line, 40);
       keyinfo->keygrip[40] = 0;
@@ -1011,6 +1001,18 @@ card_keyinfo_cb (void *opaque, const char *line)
     err = handle_pincache_put (line);
 
   return err;
+
+ alloc_error:
+  xfree (keyinfo);
+  if (!parm->error)
+    parm->error = gpg_error_from_syserror ();
+  return 0;
+
+ parm_error:
+  xfree (keyinfo);
+  if (!parm->error)
+    parm->error = gpg_error (GPG_ERR_ASS_PARAMETER);
+  return 0;
 }
 
 
diff --git a/agent/command-ssh.c b/agent/command-ssh.c
index 73f98e9..d5720cc 100644
--- a/agent/command-ssh.c
+++ b/agent/command-ssh.c
@@ -2518,7 +2518,7 @@ ssh_handler_request_identities (ctrl_t ctrl,
           xfree (cardsn);
           if (err)
             {
-              if (err && opt.verbose)
+              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)
diff --git a/agent/command.c b/agent/command.c
index 095f38b..5e2dbc8 100644
--- a/agent/command.c
+++ b/agent/command.c
@@ -1,7 +1,7 @@
 /* command.c - gpg-agent command handler
  * Copyright (C) 2001-2011 Free Software Foundation, Inc.
  * Copyright (C) 2001-2013 Werner Koch
- * Copyright (C) 2015 g10 Code GmbH.
+ * Copyright (C) 2015-2021 g10 Code GmbH.
  *
  * This file is part of GnuPG.
  *
@@ -442,6 +442,34 @@ 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 *
+get_keyinfo_on_cards (ctrl_t ctrl)
+{
+  struct card_key_info_s *keyinfo_on_cards;
+
+  if (ctrl->server_local->last_card_keyinfo.ki
+      && ctrl->server_local->last_card_keyinfo.eventno == eventcounter.card
+      && (ctrl->server_local->last_card_keyinfo.maybe_key_change
+          == eventcounter.maybe_key_change))
+    {
+      keyinfo_on_cards = ctrl->server_local->last_card_keyinfo.ki;
+    }
+  else if (!agent_card_keyinfo (ctrl, NULL, 0, &keyinfo_on_cards))
+    {
+      agent_card_free_keyinfo (ctrl->server_local->last_card_keyinfo.ki);
+      ctrl->server_local->last_card_keyinfo.ki = keyinfo_on_cards;
+      ctrl->server_local->last_card_keyinfo.eventno = eventcounter.card;
+      ctrl->server_local->last_card_keyinfo.maybe_key_change
+        = eventcounter.maybe_key_change;
+    }
+
+  return keyinfo_on_cards;
+}
+
+
 
 static const char hlp_geteventcounter[] =
   "GETEVENTCOUNTER\n"
@@ -602,34 +630,132 @@ cmd_marktrusted (assuan_context_t ctx, char *line)
 
 static const char hlp_havekey[] =
   "HAVEKEY <hexstrings_with_keygrips>\n"
+  "HAVEKEY --list[=<limit>]\n"
   "\n"
   "Return success if at least one of the secret keys with the given\n"
-  "keygrips is available.";
+  "keygrips is available.  With --list return all availabale keygrips\n"
+  "as binary data; with <limit> bail out at this number of keygrips";
 static gpg_error_t
 cmd_havekey (assuan_context_t ctx, char *line)
 {
+  ctrl_t ctrl;
   gpg_error_t err;
-  unsigned char buf[20];
+  unsigned char grip[20];
+  char *p;
+  int list_mode;  /* Less than 0 for no limit.  */
+  int counter;
+  char *dirname;
+  gnupg_dir_t dir;
+  gnupg_dirent_t dir_entry;
+  char hexgrip[41];
+  struct card_key_info_s *keyinfo_on_cards, *l;
+
+  if (has_option_name (line, "--list"))
+    {
+      if ((p = option_value (line, "--list")))
+	list_mode = atoi (p);
+      else
+	list_mode = -1;
+    }
+  else
+    list_mode = 0;
+
+
+  if (!list_mode)
+    {
+      do
+        {
+          err = parse_keygrip (ctx, line, grip);
+          if (err)
+            return err;
+
+          if (!agent_key_available (grip))
+            return 0; /* Found.  */
+
+          while (*line && *line != ' ' && *line != '\t')
+            line++;
+          while (*line == ' ' || *line == '\t')
+            line++;
+        }
+      while (*line);
+
+      /* No leave_cmd() here because errors are expected and would clutter
+       * the log.  */
+      return gpg_error (GPG_ERR_NO_SECKEY);
+    }
+
+  /* List mode.  */
+  dir = NULL;
+  dirname = NULL;
+  ctrl = assuan_get_pointer (ctx);
+
+  if (ctrl->restricted)
+    {
+      err = gpg_error (GPG_ERR_FORBIDDEN);
+      goto leave;
+    }
+
+  dirname = make_filename_try (gnupg_homedir (),
+                               GNUPG_PRIVATE_KEYS_DIR, NULL);
+  if (!dirname)
+    {
+      err = gpg_error_from_syserror ();
+      goto leave;
+    }
+  dir = gnupg_opendir (dirname);
+  if (!dir)
+    {
+      err = gpg_error_from_syserror ();
+      goto leave;
+    }
 
-  do
+  counter = 0;
+  while ((dir_entry = gnupg_readdir (dir)))
     {
-      err = parse_keygrip (ctx, line, buf);
+      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.  */
+
+      if (list_mode > 0 && ++counter > list_mode)
+        {
+          err = gpg_error (GPG_ERR_TRUNCATED);
+          goto leave;
+        }
+
+      err = assuan_send_data (ctx, grip, 20);
       if (err)
-        return err;
+        goto leave;
+    }
 
-      if (!agent_key_available (buf))
-        return 0; /* Found.  */
+  /* And now the keys from the current cards.  If they already got a
+   * stub, they are listed twice but we don't care.  */
+  keyinfo_on_cards = get_keyinfo_on_cards (ctrl);
+  for (l = keyinfo_on_cards; l; l = l->next)
+    {
+      if ( hex2bin (l->keygrip, grip, 20) < 0 )
+        continue; /* Bad hex string.  */
 
-      while (*line && *line != ' ' && *line != '\t')
-        line++;
-      while (*line == ' ' || *line == '\t')
-        line++;
+      if (list_mode > 0 && ++counter > list_mode)
+        {
+          err = gpg_error (GPG_ERR_TRUNCATED);
+          goto leave;
+        }
+
+      err = assuan_send_data (ctx, grip, 20);
+      if (err)
+        goto leave;
     }
-  while (*line);
+  err = 0;
 
-  /* No leave_cmd() here because errors are expected and would clutter
-     the log.  */
-  return gpg_error (GPG_ERR_NO_SECKEY);
+ leave:
+  gnupg_closedir (dir);
+  xfree (dirname);
+  return leave_cmd (ctx, err);
 }
 
 
@@ -1018,10 +1144,11 @@ cmd_genkey (assuan_context_t ctx, char *line)
 
   /* First inquire the parameters */
   rc = print_assuan_status (ctx, "INQUIRE_MAXLEN", "%u", MAXLEN_KEYPARAM);
-  if (!rc)
-    rc = assuan_inquire (ctx, "KEYPARAM", &value, &valuelen, MAXLEN_KEYPARAM);
   if (rc)
-    return rc;
+    goto leave;
+  rc = assuan_inquire (ctx, "KEYPARAM", &value, &valuelen, MAXLEN_KEYPARAM);
+  if (rc)
+    goto leave;
 
   init_membuf (&outbuf, 512);
 
@@ -1073,8 +1200,8 @@ cmd_genkey (assuan_context_t ctx, char *line)
 
 
 static const char hlp_readkey[] =
-  "READKEY <hexstring_with_keygrip>\n"
-  "        --card <keyid>\n"
+  "READKEY [--no-data] <hexstring_with_keygrip>\n"
+  "                    --card <keyid>\n"
   "\n"
   "Return the public key for the given keygrip or keyid.\n"
   "With --card, private key file with card information will be created.";
@@ -1087,12 +1214,14 @@ cmd_readkey (assuan_context_t ctx, char *line)
   gcry_sexp_t s_pkey = NULL;
   unsigned char *pkbuf = NULL;
   char *serialno = NULL;
+  char *keyidbuf = NULL;
   size_t pkbuflen;
-  int opt_card;
+  int opt_card, opt_no_data;
 
   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");
   line = skip_options (line);
 
@@ -1108,6 +1237,11 @@ cmd_readkey (assuan_context_t ctx, char *line)
           goto leave;
         }
 
+      /* Hack to create the shadow key for the OpenPGP standard keys.  */
+      if ((!strcmp (keyid, "$SIGNKEYID") || !strcmp (keyid, "$ENCRKEYID"))
+          && !agent_card_getattr (ctrl, keyid, &keyidbuf, NULL))
+        keyid = keyidbuf;
+
       rc = agent_card_readkey (ctrl, keyid, &pkbuf, NULL);
       if (rc)
         goto leave;
@@ -1125,11 +1259,15 @@ cmd_readkey (assuan_context_t ctx, char *line)
           goto leave;
         }
 
-      rc = agent_write_shadow_key (grip, serialno, keyid, pkbuf, 0);
-      if (rc)
-        goto leave;
+      if (agent_key_available (grip))
+        {
+          /* (Shadow)-key is not available in our key storage.  */
+          rc = agent_write_shadow_key (grip, serialno, keyid, pkbuf, 0);
+          if (rc)
+            goto leave;
+        }
 
-      rc = assuan_send_data (ctx, pkbuf, pkbuflen);
+        rc = opt_no_data? 0 : assuan_send_data (ctx, pkbuf, pkbuflen);
     }
   else
     {
@@ -1149,12 +1287,13 @@ cmd_readkey (assuan_context_t ctx, char *line)
             {
               pkbuflen = gcry_sexp_sprint (s_pkey, GCRYSEXP_FMT_CANON,
                                            pkbuf, pkbuflen);
-              rc = 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);
@@ -1411,24 +1550,7 @@ cmd_keyinfo (assuan_context_t ctx, char *line)
   if (opt_with_ssh || list_mode == 2)
     cf = ssh_open_control_file ();
 
-  /* 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. */
-  if (ctrl->server_local->last_card_keyinfo.ki
-      && ctrl->server_local->last_card_keyinfo.eventno == eventcounter.card
-      && (ctrl->server_local->last_card_keyinfo.maybe_key_change
-          == eventcounter.maybe_key_change))
-    {
-      keyinfo_on_cards = ctrl->server_local->last_card_keyinfo.ki;
-    }
-  else if (!agent_card_keyinfo (ctrl, NULL, 0, &keyinfo_on_cards))
-    {
-      agent_card_free_keyinfo (ctrl->server_local->last_card_keyinfo.ki);
-      ctrl->server_local->last_card_keyinfo.ki = keyinfo_on_cards;
-      ctrl->server_local->last_card_keyinfo.eventno = eventcounter.card;
-      ctrl->server_local->last_card_keyinfo.maybe_key_change
-        = eventcounter.maybe_key_change;
-    }
+  keyinfo_on_cards = get_keyinfo_on_cards (ctrl);
 
   if (list_mode == 2)
     {
@@ -1638,6 +1760,7 @@ cmd_get_passphrase (assuan_context_t ctx, char *line)
   char *entry_errtext = NULL;
   struct pin_entry_info_s *pi = NULL;
   struct pin_entry_info_s *pi2 = NULL;
+  int is_generated;
 
   if (ctrl->restricted)
     return leave_cmd (ctx, gpg_error (GPG_ERR_FORBIDDEN));
@@ -1749,6 +1872,8 @@ cmd_get_passphrase (assuan_context_t ctx, char *line)
       pi->max_tries = 3;
       pi->with_qualitybar = opt_qualbar;
       pi->with_repeat = opt_repeat;
+      pi->constraints_flags = (CHECK_CONSTRAINTS_NOT_EMPTY
+                               | CHECK_CONSTRAINTS_NEW_SYMKEY);
       pi2->max_length = MAX_PASSPHRASE_LEN + 1;
       pi2->max_tries = 3;
       pi2->check_cb = reenter_passphrase_cmp_cb;
@@ -1768,8 +1893,13 @@ cmd_get_passphrase (assuan_context_t ctx, char *line)
             goto leave;
           xfree (entry_errtext);
           entry_errtext = NULL;
+          is_generated = !!(pi->status & PINENTRY_STATUS_PASSWORD_GENERATED);
+
           /* We don't allow an empty passpharse in this mode.  */
-          if (check_passphrase_constraints (ctrl, pi->pin, 1, &entry_errtext))
+          if (!is_generated
+              && check_passphrase_constraints (ctrl, pi->pin,
+                                               pi->constraints_flags,
+                                               &entry_errtext))
             {
               pi->failed_tries = 0;
               pi2->failed_tries = 0;
@@ -1825,12 +1955,18 @@ cmd_get_passphrase (assuan_context_t ctx, char *line)
                                  opt_qualbar, cacheid, CACHE_MODE_USER, NULL);
       xfree (entry_errtext);
       entry_errtext = NULL;
+      is_generated = !!(pi->status & PINENTRY_STATUS_PASSWORD_GENERATED);
+
       if (!rc)
         {
           int i;
 
           if (opt_check
-	      && check_passphrase_constraints (ctrl, response,0,&entry_errtext))
+              && !is_generated
+	      && check_passphrase_constraints
+              (ctrl, response,
+               (opt_newsymkey? CHECK_CONSTRAINTS_NEW_SYMKEY:0),
+               &entry_errtext))
             {
               goto next_try;
             }
@@ -3968,9 +4104,14 @@ start_command_handler (ctrl_t ctrl, gnupg_fd_t listen_fd, gnupg_fd_t fd)
       rc = assuan_get_peercred (ctx, &client_creds);
       if (rc)
         {
-
+          /* Note that on Windows we don't get the peer credentials
+           * and thus we silence the error.  */
           if (listen_fd == GNUPG_INVALID_FD && fd == GNUPG_INVALID_FD)
             ;
+#ifdef HAVE_W32_SYSTEM
+          else if (gpg_err_code (rc) == GPG_ERR_ASS_GENERAL)
+            ;
+#endif
           else
             log_info ("Assuan get_peercred failed: %s\n", gpg_strerror (rc));
           pid = assuan_get_pid (ctx);
diff --git a/agent/cvt-openpgp.c b/agent/cvt-openpgp.c
index 3da553f..76932a7 100644
--- a/agent/cvt-openpgp.c
+++ b/agent/cvt-openpgp.c
@@ -532,13 +532,14 @@ do_unprotect (const char *passphrase,
       const unsigned char *p;
       unsigned char *data;
       u16 csum_pgp7 = 0;
+      gcry_mpi_t skey_encrypted = skey[npkey];
 
-      if (!gcry_mpi_get_flag (skey[npkey], GCRYMPI_FLAG_USER1))
+      if (!gcry_mpi_get_flag (skey_encrypted, GCRYMPI_FLAG_USER1))
         {
           gcry_cipher_close (cipher_hd);
           return gpg_error (GPG_ERR_BAD_SECKEY);
         }
-      p = gcry_mpi_get_opaque (skey[npkey], &ndatabits);
+      p = gcry_mpi_get_opaque (skey_encrypted, &ndatabits);
       ndata = (ndatabits+7)/8;
 
       if (ndata > 1)
@@ -600,33 +601,48 @@ do_unprotect (const char *passphrase,
          because the length may have an arbitrary value.  */
       if (desired_csum == actual_csum)
         {
-          for (i=npkey; i < nskey; i++ )
+          for (i = npkey; i < nskey; i++)
             {
               if (scan_pgp_format (&tmpmpi, pubkey_algo, p, ndata, &nbytes))
-                {
-                  /* Checksum was okay, but not correctly decrypted.  */
-                  desired_csum = 0;
-                  actual_csum = 1;   /* Mark checksum bad.  */
-                  break;
-                }
-              gcry_mpi_release (skey[i]);
+                break;
               skey[i] = tmpmpi;
               ndata -= nbytes;
               p += nbytes;
             }
-          skey[i] = NULL;
-          skeylen = i;
-          log_assert (skeylen <= skeysize);
 
-          /* Note: at this point NDATA should be 2 for a simple
-             checksum or 20 for the sha1 digest.  */
+          if (i == nskey)
+            {
+              skey[nskey] = NULL;
+              skeylen = nskey;
+              gcry_mpi_release (skey_encrypted);
+
+              log_assert (skeylen <= skeysize);
+              /* Note: at this point NDATA should be 2 for a simple
+                 checksum or 20 for the sha1 digest.  */
+            }
+          else
+            {
+              /* Checksum was okay, but not correctly decrypted.  */
+              desired_csum = 0;
+              actual_csum = 1;   /* Mark checksum bad.  */
+
+              /* Recover encrypted SKEY.  */
+              for (--i; i >= npkey; i--)
+                {
+                  gcry_mpi_release (skey[i]);
+                  skey[i] = NULL;
+                }
+              skey[npkey] = skey_encrypted;
+            }
         }
       xfree(data);
     }
   else /* Packet version <= 3.  */
     {
       unsigned char *buffer;
+      gcry_mpi_t skey_tmpmpi[10];
 
+      log_assert (nskey - npkey <= 10);
       for (i = npkey; i < nskey; i++)
         {
           const unsigned char *p;
@@ -663,14 +679,26 @@ do_unprotect (const char *passphrase,
           err = scan_pgp_format (&tmpmpi, pubkey_algo, buffer, ndata, &nbytes);
           xfree (buffer);
           if (err)
+            break;
+          skey_tmpmpi[i - npkey] = tmpmpi;
+        }
+
+      if (i == nskey)
+        {
+          for (i = npkey; i < nskey; i++)
             {
-              /* Checksum was okay, but not correctly decrypted.  */
-              desired_csum = 0;
-              actual_csum = 1;   /* Mark checksum bad.  */
-              break;
+              gcry_mpi_release (skey[i]);
+              skey[i] = skey_tmpmpi[i - npkey];
             }
-          gcry_mpi_release (skey[i]);
-          skey[i] = tmpmpi;
+        }
+      else
+        {
+          /* Checksum was okay, but not correctly decrypted.  */
+          desired_csum = 0;
+          actual_csum = 1;   /* Mark checksum bad.  */
+
+          for (--i; i >= npkey; i--)
+            gcry_mpi_release (skey_tmpmpi[i - npkey]);
         }
     }
   gcry_cipher_close (cipher_hd);
@@ -964,7 +992,10 @@ convert_from_openpgp_main (ctrl_t ctrl, gcry_sexp_t s_pgp, int dontcare_exist,
 
       pi = xtrycalloc_secure (1, sizeof (*pi) + MAX_PASSPHRASE_LEN + 1);
       if (!pi)
-        return gpg_error_from_syserror ();
+        {
+          err = gpg_error_from_syserror ();
+          goto leave;
+        }
       pi->max_length = MAX_PASSPHRASE_LEN + 1;
       pi->min_digits = 0;  /* We want a real passphrase.  */
       pi->max_digits = 16;
@@ -992,6 +1023,8 @@ convert_from_openpgp_main (ctrl_t ctrl, gcry_sexp_t s_pgp, int dontcare_exist,
       if (!is_protected)
         {
           err = try_do_unprotect_cb (pi);
+          if (gpg_err_code (err) == GPG_ERR_BAD_PASSPHRASE)
+            err = gpg_error (GPG_ERR_BAD_SECKEY);
         }
       else if (cache_nonce)
         {
diff --git a/agent/genkey.c b/agent/genkey.c
index 9b47f0f..0c91ab4 100644
--- a/agent/genkey.c
+++ b/agent/genkey.c
@@ -89,9 +89,11 @@ nonalpha_count (const char *s)
 
 
 /* Check PW against a list of pattern.  Return 0 if PW does not match
-   these pattern.  */
+   these pattern.  If CHECK_CONSTRAINTS_NEW_SYMKEY is set in flags and
+   --check-sym-passphrase-pattern has been configured, use the pattern
+   file from that option.  */
 static int
-check_passphrase_pattern (ctrl_t ctrl, const char *pw)
+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);
@@ -99,14 +101,46 @@ check_passphrase_pattern (ctrl_t ctrl, const char *pw)
   const char *argv[10];
   pid_t pid;
   int result, i;
+  const char *pattern;
+  char *patternfname;
 
   (void)ctrl;
 
+  pattern = opt.check_passphrase_pattern;
+  if ((flags & CHECK_CONSTRAINTS_NEW_SYMKEY)
+      && opt.check_sym_passphrase_pattern)
+    pattern = opt.check_sym_passphrase_pattern;
+  if (!pattern)
+    return 1; /* Oops - Assume password should not be used  */
+
+  if (strchr (pattern, '/') || strchr (pattern, '\\')
+      || (*pattern == '~' && pattern[1] == '/'))
+    patternfname = make_absfilename_try (pattern, NULL);
+  else
+    patternfname = make_filename_try (gnupg_sysconfdir (), pattern, NULL);
+  if (!patternfname)
+    {
+      log_error ("error making filename from '%s': %s\n",
+                 pattern, gpg_strerror (gpg_error_from_syserror ()));
+      return 1; /* Do not pass the check.  */
+    }
+
+  /* Make debugging a broken config easier by printing a useful error
+   * message.  */
+  if (gnupg_access (patternfname, F_OK))
+    {
+      log_error ("error accessing '%s': %s\n",
+                 patternfname, gpg_strerror (gpg_error_from_syserror ()));
+      xfree (patternfname);
+      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.  */
     }
 
@@ -116,6 +150,7 @@ check_passphrase_pattern (ctrl_t ctrl, const char *pw)
       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);
@@ -124,7 +159,7 @@ check_passphrase_pattern (ctrl_t ctrl, const char *pw)
   i = 0;
   argv[i++] = "--null";
   argv[i++] = "--",
-  argv[i++] = opt.check_passphrase_pattern,
+  argv[i++] = patternfname,
   argv[i] = NULL;
   log_assert (i < sizeof argv);
 
@@ -143,6 +178,8 @@ check_passphrase_pattern (ctrl_t ctrl, const char *pw)
     putc ('\xff', infp);
   fflush (infp);
   fclose (infp);
+
+  xfree (patternfname);
   return result;
 }
 
@@ -156,12 +193,17 @@ take_this_one_anyway (ctrl_t ctrl, const char *desc, const char *anyway_btn)
 
 
 /* Check whether the passphrase PW is suitable. Returns 0 if the
-   passphrase is suitable and true if it is not and the user should be
-   asked to provide a different one.  If FAILED_CONSTRAINT is set, a
-   message describing the problem is returned in
-   *FAILED_CONSTRAINT.  */
+ * passphrase is suitable and true if it is not and the user should be
+ * asked to provide a different one.  If FAILED_CONSTRAINT is set, a
+ * message describing the problem is returned at FAILED_CONSTRAINT.
+ * The FLAGS are:
+ *   CHECK_CONSTRAINTS_NOT_EMPTY
+ *       Do not allow an empty passphrase
+ *   CHECK_CONSTRAINTS_NEW_SYMKEY
+ *       Hint that the passphrase is used for a new symmetric key.
+ */
 int
-check_passphrase_constraints (ctrl_t ctrl, const char *pw, int no_empty,
+check_passphrase_constraints (ctrl_t ctrl, const char *pw, unsigned int flags,
 			      char **failed_constraint)
 {
   gpg_error_t err = 0;
@@ -170,6 +212,7 @@ check_passphrase_constraints (ctrl_t ctrl, const char *pw, int no_empty,
   char *msg1 = NULL;
   char *msg2 = NULL;
   char *msg3 = NULL;
+  int no_empty = !!(flags & CHECK_CONSTRAINTS_NOT_EMPTY);
 
   if (ctrl && ctrl->pinentry_mode == PINENTRY_MODE_LOOPBACK)
     return 0;
@@ -247,8 +290,9 @@ check_passphrase_constraints (ctrl_t ctrl, const char *pw, int no_empty,
      and pattern.  The actual test is done by an external program.
      The warning message is generic to give the user no hint on how to
      circumvent this list.  */
-  if (*pw && opt.check_passphrase_pattern &&
-      check_passphrase_pattern (ctrl, pw))
+  if (*pw
+      && (opt.check_passphrase_pattern || opt.check_sym_passphrase_pattern)
+      && do_check_passphrase_pattern (ctrl, pw, flags))
     {
       if (!failed_constraint)
         {
@@ -363,7 +407,7 @@ agent_ask_new_passphrase (ctrl_t ctrl, const char *prompt,
   if (!pi2)
     {
       err = gpg_error_from_syserror ();
-      xfree (pi2);
+      xfree (pi);
       return err;
     }
   pi->max_length = MAX_PASSPHRASE_LEN + 1;
@@ -465,7 +509,10 @@ agent_genkey (ctrl_t ctrl, const char *cache_nonce, time_t timestamp,
                                         "protect your new key"),
                                      &passphrase_buffer);
       if (rc)
-        return rc;
+        {
+          gcry_sexp_release (s_keyparam);
+          return rc;
+        }
       passphrase = passphrase_buffer;
     }
 
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index 0a9e903..dd60847 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -96,6 +96,7 @@ enum cmd_and_opt_values
   oPinentryTouchFile,
   oPinentryInvisibleChar,
   oPinentryTimeout,
+  oPinentryFormattedPassphrase,
   oDisplay,
   oTTYname,
   oTTYtype,
@@ -112,6 +113,7 @@ enum cmd_and_opt_values
   oMinPassphraseLen,
   oMinPassphraseNonalpha,
   oCheckPassphrasePattern,
+  oCheckSymPassphrasePattern,
   oMaxPassphraseDays,
   oEnablePassphraseHistory,
   oDisableExtendedKeyFormat,
@@ -264,6 +266,8 @@ static gpgrt_opt_t opts[] = {
                    " characters for a new passphrase")),
   ARGPARSE_s_s (oCheckPassphrasePattern,  "check-passphrase-pattern",
                 N_("|FILE|check new passphrases against pattern in FILE")),
+  ARGPARSE_s_s (oCheckSymPassphrasePattern,  "check-sym-passphrase-pattern",
+                "@"),
   ARGPARSE_s_u (oMaxPassphraseDays,       "max-passphrase-days",
                 N_("|N|expire the passphrase after N days")),
   ARGPARSE_s_n (oEnablePassphraseHistory, "enable-passphrase-history",
@@ -284,6 +288,8 @@ static gpgrt_opt_t opts[] = {
   ARGPARSE_s_s (oPinentryInvisibleChar, "pinentry-invisible-char", "@"),
   ARGPARSE_s_u (oPinentryTimeout, "pinentry-timeout",
                 N_("|N|set the Pinentry timeout to N seconds")),
+  ARGPARSE_s_n (oPinentryFormattedPassphrase, "pinentry-formatted-passphrase",
+                "@"),
   ARGPARSE_s_n (oAllowEmacsPinentry,  "allow-emacs-pinentry",
                 N_("allow passphrase to be prompted through Emacs")),
 
@@ -849,6 +855,7 @@ parse_rereadable_options (gpgrt_argparse_t *pargs, int reread)
       xfree (opt.pinentry_invisible_char);
       opt.pinentry_invisible_char = NULL;
       opt.pinentry_timeout = 0;
+      opt.pinentry_formatted_passphrase = 0;
       memset (opt.daemon_program, 0, sizeof opt.daemon_program);
       opt.def_cache_ttl = DEFAULT_CACHE_TTL;
       opt.def_cache_ttl_ssh = DEFAULT_CACHE_TTL_SSH;
@@ -858,6 +865,7 @@ parse_rereadable_options (gpgrt_argparse_t *pargs, int reread)
       opt.min_passphrase_len = MIN_PASSPHRASE_LEN;
       opt.min_passphrase_nonalpha = MIN_PASSPHRASE_NONALPHA;
       opt.check_passphrase_pattern = NULL;
+      opt.check_sym_passphrase_pattern = NULL;
       opt.max_passphrase_days = MAX_PASSPHRASE_DAYS;
       opt.enable_passphrase_history = 0;
       opt.enable_extended_key_format = 1;
@@ -869,7 +877,7 @@ parse_rereadable_options (gpgrt_argparse_t *pargs, int reread)
       memset (opt.disable_daemon, 0, sizeof opt.disable_daemon);
       disable_check_own_socket = 0;
       /* Note: When changing the next line, change also gpgconf_list.  */
-      opt.ssh_fingerprint_digest = GCRY_MD_MD5;
+      opt.ssh_fingerprint_digest = GCRY_MD_SHA256;
       opt.s2k_count = 0;
       set_s2k_calibration_time (0);  /* Set to default.  */
       return 1;
@@ -909,6 +917,9 @@ parse_rereadable_options (gpgrt_argparse_t *pargs, int reread)
       opt.pinentry_invisible_char = xtrystrdup (pargs->r.ret_str); break;
       break;
     case oPinentryTimeout: opt.pinentry_timeout = pargs->r.ret_ulong; break;
+    case oPinentryFormattedPassphrase:
+      opt.pinentry_formatted_passphrase = 1;
+      break;
 
     case oTpm2daemonProgram:
       opt.daemon_program[DAEMON_TPM2D] = pargs->r.ret_str;
@@ -935,6 +946,9 @@ parse_rereadable_options (gpgrt_argparse_t *pargs, int reread)
     case oCheckPassphrasePattern:
       opt.check_passphrase_pattern = pargs->r.ret_str;
       break;
+    case oCheckSymPassphrasePattern:
+      opt.check_sym_passphrase_pattern = pargs->r.ret_str;
+      break;
     case oMaxPassphraseDays:
       opt.max_passphrase_days = pargs->r.ret_ulong;
       break;
@@ -1433,10 +1447,12 @@ main (int argc, char **argv)
                  GC_OPT_FLAG_DEFAULT, MIN_PASSPHRASE_NONALPHA);
       es_printf ("check-passphrase-pattern:%lu:\n",
                  GC_OPT_FLAG_DEFAULT);
+      es_printf ("check-sym-passphrase-pattern:%lu:\n",
+                 GC_OPT_FLAG_DEFAULT);
       es_printf ("max-passphrase-days:%lu:%d:\n",
                  GC_OPT_FLAG_DEFAULT, MAX_PASSPHRASE_DAYS);
       es_printf ("ssh-fingerprint-digest:%lu:\"%s:\n",
-                 GC_OPT_FLAG_DEFAULT, "md5");
+                 GC_OPT_FLAG_DEFAULT, "sha256");
 
       agent_exit (0);
     }
@@ -2715,12 +2731,12 @@ do_start_connection_thread (ctrl_t ctrl)
 {
   active_connections++;
   agent_init_default_ctrl (ctrl);
-  if (opt.verbose && !DBG_IPC)
+  if (opt.verbose > 1 && !DBG_IPC)
     log_info (_("handler 0x%lx for fd %d started\n"),
               (unsigned long) npth_self(), FD2INT(ctrl->thread_startup.fd));
 
   start_command_handler (ctrl, GNUPG_INVALID_FD, ctrl->thread_startup.fd);
-  if (opt.verbose && !DBG_IPC)
+  if (opt.verbose > 1 && !DBG_IPC)
     log_info (_("handler 0x%lx for fd %d terminated\n"),
               (unsigned long) npth_self(), FD2INT(ctrl->thread_startup.fd));
 
@@ -3218,7 +3234,10 @@ check_own_socket (void)
 
   err = npth_attr_init (&tattr);
   if (err)
-    return;
+    {
+      xfree (sockname);
+      return;
+    }
   npth_attr_setdetachstate (&tattr, NPTH_CREATE_DETACHED);
   err = npth_create (&thread, &tattr, check_own_socket_thread, sockname);
   if (err)
diff --git a/agent/protect-tool.c b/agent/protect-tool.c
index 1fcbd11..bb17033 100644
--- a/agent/protect-tool.c
+++ b/agent/protect-tool.c
@@ -319,6 +319,7 @@ read_key (const char *fname)
   if (buflen >= 4 && !memcmp (buf, "Key:", 4))
     {
       log_error ("Extended key format is not supported by this tool\n");
+      xfree (buf);
       return NULL;
     }
   key = make_canonical (fname, buf, buflen);
@@ -793,7 +794,10 @@ agent_askpin (ctrl_t ctrl,
   passphrase = get_passphrase (0);
   size = strlen (passphrase);
   if (size >= pininfo->max_length)
-    return gpg_error (GPG_ERR_TOO_LARGE);
+    {
+      xfree (passphrase);
+      return gpg_error (GPG_ERR_TOO_LARGE);
+    }
 
   memcpy (&pininfo->pin, passphrase, size);
   xfree (passphrase);
diff --git a/agent/protect.c b/agent/protect.c
index 76ead44..7ae067e 100644
--- a/agent/protect.c
+++ b/agent/protect.c
@@ -1610,8 +1610,8 @@ agent_get_shadow_info_type (const unsigned char *shadowkey,
                             unsigned char const **shadow_info,
                             unsigned char **shadow_type)
 {
-  const unsigned char *s;
-  size_t n;
+  const unsigned char *s, *saved_s;
+  size_t n, saved_n;
   int depth = 0;
 
   s = shadowkey;
@@ -1660,13 +1660,8 @@ agent_get_shadow_info_type (const unsigned char *shadowkey,
   n = snext (&s);
   if (!n)
     return gpg_error (GPG_ERR_INV_SEXP);
-  if (shadow_type) {
-    char *buf = xtrymalloc(n+1);
-    memcpy(buf, s, n);
-    buf[n] = '\0';
-    *shadow_type = buf;
-  }
-
+  saved_s = s;
+  saved_n = n;
   if (smatch (&s, n, "t1-v1") || smatch(&s, n, "tpm2-v1"))
     {
       if (*s != '(')
@@ -1676,6 +1671,19 @@ agent_get_shadow_info_type (const unsigned char *shadowkey,
     }
   else
     return gpg_error (GPG_ERR_UNSUPPORTED_PROTOCOL);
+  s = saved_s;
+  n = saved_n;
+
+  if (shadow_type)
+    {
+      char *buf = xtrymalloc(n+1);
+      if (!buf)
+        return gpg_error_from_syserror ();
+      memcpy (buf, s, n);
+      buf[n] = '\0';
+      *shadow_type = buf;
+    }
+
   return 0;
 }
 
@@ -1701,9 +1709,9 @@ agent_is_tpm2_key (gcry_sexp_t s_skey)
     return 0;
 
   err = agent_get_shadow_info_type (buf, NULL, &type);
+  xfree (buf);
   if (err)
     return 0;
-  xfree (buf);
 
   err = strcmp (type, "tpm2-v1") == 0;
   xfree (type);
diff --git a/build-aux/speedo.mk b/build-aux/speedo.mk
index fb1c23b..7ade2c7 100644
--- a/build-aux/speedo.mk
+++ b/build-aux/speedo.mk
@@ -1430,7 +1430,7 @@ define AUTHENTICODE_sign
      echo "speedo: Signing via host $(AUTHENTICODE_SIGNHOST)";\
      scp $(1) "$(AUTHENTICODE_SIGNHOST):a.exe" ;\
      ssh "$(AUTHENTICODE_SIGNHOST)" '$(AUTHENTICODE_TOOL)' sign \
-        /n '"g10 Code GmbH"' \
+        /a /n '"g10 Code GmbH"' \
         /tr 'http://rfc3161timestamp.globalsign.com/advanced' /td sha256 \
         /fd sha256 /du https://gnupg.org a.exe ;\
      scp "$(AUTHENTICODE_SIGNHOST):a.exe" $(2);\
diff --git a/common/Makefile.am b/common/Makefile.am
index 62bc9c9..d8368fc 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -59,7 +59,6 @@ common_sources = \
 	shareddefs.h \
 	openpgpdefs.h \
 	gc-opt-flags.h \
-	keyserver.h \
 	sexp-parse.h \
 	tlv.c tlv.h tlv-builder.c \
 	init.c init.h \
diff --git a/common/Makefile.in b/common/Makefile.in
index 923673d..3e49c78 100644
--- a/common/Makefile.in
+++ b/common/Makefile.in
@@ -204,18 +204,17 @@ am__libcommon_a_SOURCES_DIST = common-defs.h util.h utilproto.h \
 	mapstrings.c stringhelp.c stringhelp.h strlist.c strlist.h \
 	utf8conv.c utf8conv.h logging.h dotlock.c dotlock.h mischelp.c \
 	mischelp.h status.c status.h shareddefs.h openpgpdefs.h \
-	gc-opt-flags.h keyserver.h sexp-parse.h tlv.c tlv.h \
-	tlv-builder.c init.c init.h sexputil.c sysutils.c sysutils.h \
-	homedir.c gettime.c gettime.h yesno.c b64enc.c b64dec.c zb32.c \
-	zb32.h convert.c percent.c mbox-util.c mbox-util.h \
-	miscellaneous.c xasprintf.c xreadline.c membuf.c membuf.h \
-	ccparray.c ccparray.h iobuf.c iobuf.h ttyio.c ttyio.h \
-	asshelp.c asshelp2.c asshelp.h exechelp.h signal.c audit.c \
-	audit.h localename.c session-env.c session-env.h userids.c \
-	userids.h openpgp-oid.c openpgp-s2k.c ssh-utils.c ssh-utils.h \
-	agent-opt.c helpfile.c mkdir_p.c mkdir_p.h exectool.c \
-	exectool.h server-help.c server-help.h name-value.c \
-	name-value.h recsel.c recsel.h ksba-io-support.c \
+	gc-opt-flags.h sexp-parse.h tlv.c tlv.h tlv-builder.c init.c \
+	init.h sexputil.c sysutils.c sysutils.h homedir.c gettime.c \
+	gettime.h yesno.c b64enc.c b64dec.c zb32.c zb32.h convert.c \
+	percent.c mbox-util.c mbox-util.h miscellaneous.c xasprintf.c \
+	xreadline.c membuf.c membuf.h ccparray.c ccparray.h iobuf.c \
+	iobuf.h ttyio.c ttyio.h asshelp.c asshelp2.c asshelp.h \
+	exechelp.h signal.c audit.c audit.h localename.c session-env.c \
+	session-env.h userids.c userids.h openpgp-oid.c openpgp-s2k.c \
+	ssh-utils.c ssh-utils.h agent-opt.c helpfile.c mkdir_p.c \
+	mkdir_p.h exectool.c exectool.h server-help.c server-help.h \
+	name-value.c name-value.h recsel.c recsel.h ksba-io-support.c \
 	ksba-io-support.h openpgp-fpr.c comopt.c comopt.h compliance.c \
 	compliance.h pkscreening.c pkscreening.h w32-reg.c \
 	w32-cmdline.c exechelp-w32ce.c exechelp-w32.c exechelp-posix.c \
@@ -270,18 +269,17 @@ am__libcommonpth_a_SOURCES_DIST = common-defs.h util.h utilproto.h \
 	mapstrings.c stringhelp.c stringhelp.h strlist.c strlist.h \
 	utf8conv.c utf8conv.h logging.h dotlock.c dotlock.h mischelp.c \
 	mischelp.h status.c status.h shareddefs.h openpgpdefs.h \
-	gc-opt-flags.h keyserver.h sexp-parse.h tlv.c tlv.h \
-	tlv-builder.c init.c init.h sexputil.c sysutils.c sysutils.h \
-	homedir.c gettime.c gettime.h yesno.c b64enc.c b64dec.c zb32.c \
-	zb32.h convert.c percent.c mbox-util.c mbox-util.h \
-	miscellaneous.c xasprintf.c xreadline.c membuf.c membuf.h \
-	ccparray.c ccparray.h iobuf.c iobuf.h ttyio.c ttyio.h \
-	asshelp.c asshelp2.c asshelp.h exechelp.h signal.c audit.c \
-	audit.h localename.c session-env.c session-env.h userids.c \
-	userids.h openpgp-oid.c openpgp-s2k.c ssh-utils.c ssh-utils.h \
-	agent-opt.c helpfile.c mkdir_p.c mkdir_p.h exectool.c \
-	exectool.h server-help.c server-help.h name-value.c \
-	name-value.h recsel.c recsel.h ksba-io-support.c \
+	gc-opt-flags.h sexp-parse.h tlv.c tlv.h tlv-builder.c init.c \
+	init.h sexputil.c sysutils.c sysutils.h homedir.c gettime.c \
+	gettime.h yesno.c b64enc.c b64dec.c zb32.c zb32.h convert.c \
+	percent.c mbox-util.c mbox-util.h miscellaneous.c xasprintf.c \
+	xreadline.c membuf.c membuf.h ccparray.c ccparray.h iobuf.c \
+	iobuf.h ttyio.c ttyio.h asshelp.c asshelp2.c asshelp.h \
+	exechelp.h signal.c audit.c audit.h localename.c session-env.c \
+	session-env.h userids.c userids.h openpgp-oid.c openpgp-s2k.c \
+	ssh-utils.c ssh-utils.h agent-opt.c helpfile.c mkdir_p.c \
+	mkdir_p.h exectool.c exectool.h server-help.c server-help.h \
+	name-value.c name-value.h recsel.c recsel.h ksba-io-support.c \
 	ksba-io-support.h openpgp-fpr.c comopt.c comopt.h compliance.c \
 	compliance.h pkscreening.c pkscreening.h w32-reg.c \
 	w32-cmdline.c exechelp-w32ce.c exechelp-w32.c exechelp-posix.c \
@@ -896,10 +894,10 @@ common_sources = common-defs.h util.h utilproto.h fwddecl.h i18n.c \
 	stringhelp.c stringhelp.h strlist.c strlist.h utf8conv.c \
 	utf8conv.h logging.h dotlock.c dotlock.h mischelp.c mischelp.h \
 	status.c status.h shareddefs.h openpgpdefs.h gc-opt-flags.h \
-	keyserver.h sexp-parse.h tlv.c tlv.h tlv-builder.c init.c \
-	init.h sexputil.c sysutils.c sysutils.h homedir.c gettime.c \
-	gettime.h yesno.c b64enc.c b64dec.c zb32.c zb32.h convert.c \
-	percent.c mbox-util.c mbox-util.h miscellaneous.c xasprintf.c \
+	sexp-parse.h tlv.c tlv.h tlv-builder.c init.c init.h \
+	sexputil.c sysutils.c sysutils.h homedir.c gettime.c gettime.h \
+	yesno.c b64enc.c b64dec.c zb32.c zb32.h convert.c percent.c \
+	mbox-util.c mbox-util.h miscellaneous.c xasprintf.c \
 	xreadline.c membuf.c membuf.h ccparray.c ccparray.h iobuf.c \
 	iobuf.h ttyio.c ttyio.h asshelp.c asshelp2.c asshelp.h \
 	exechelp.h signal.c audit.c audit.h localename.c session-env.c \
diff --git a/common/compliance.c b/common/compliance.c
index 217ed09..6c2fcd5 100644
--- a/common/compliance.c
+++ b/common/compliance.c
@@ -416,7 +416,8 @@ gnupg_cipher_is_allowed (enum gnupg_compliance_mode compliance, int producer,
                       || mode == GCRY_CIPHER_MODE_CFB);
 	    case GNUPG_MODULE_NAME_GPGSM:
 	      return (mode == GCRY_CIPHER_MODE_NONE
-                      || mode == GCRY_CIPHER_MODE_CBC);
+                      || mode == GCRY_CIPHER_MODE_CBC
+                      || (mode == GCRY_CIPHER_MODE_GCM && !producer));
 	    }
 	  log_assert (!"reached");
 
diff --git a/common/exechelp-w32.c b/common/exechelp-w32.c
index 0988b90..2a3a550 100644
--- a/common/exechelp-w32.c
+++ b/common/exechelp-w32.c
@@ -955,14 +955,14 @@ gnupg_spawn_process_detached (const char *pgmname, const char *argv[],
       else if ((info.BasicLimitInformation.LimitFlags &
                 JOB_OBJECT_LIMIT_BREAKAWAY_OK))
         {
-          log_debug ("Using CREATE_BREAKAWAY_FROM_JOB flag\n");
+          log_info ("Using CREATE_BREAKAWAY_FROM_JOB flag\n");
           cr_flags |= CREATE_BREAKAWAY_FROM_JOB;
         }
       else if ((info.BasicLimitInformation.LimitFlags &
                 JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK))
         {
           /* The child process should automatically detach from the job. */
-          log_debug ("Not using CREATE_BREAKAWAY_FROM_JOB flag; "
+          log_info ("Not using CREATE_BREAKAWAY_FROM_JOB flag; "
                      "JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK is set\n");
         }
       else
@@ -970,7 +970,7 @@ gnupg_spawn_process_detached (const char *pgmname, const char *argv[],
           /* It seems that the child process must remain in the job.
            * This is not necessarily an error, although it can cause premature
            * termination of the child process when the job is closed. */
-          log_debug ("Not using CREATE_BREAKAWAY_FROM_JOB flag\n");
+          log_info ("Not using CREATE_BREAKAWAY_FROM_JOB flag\n");
         }
     }
 
diff --git a/common/homedir.c b/common/homedir.c
index 8b54f9d..7969a2c 100644
--- a/common/homedir.c
+++ b/common/homedir.c
@@ -1,6 +1,7 @@
 /* homedir.c - Setup the home directory.
  * Copyright (C) 2004, 2006, 2007, 2010 Free Software Foundation, Inc.
  * Copyright (C) 2013, 2016 Werner Koch
+ * Copyright (C) 2021 g10 Code GmbH
  *
  * This file is part of GnuPG.
  *
@@ -26,6 +27,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: (LGPL-3.0-or-later OR GPL-2.0-or-later)
  */
 
 #include <config.h>
@@ -74,15 +76,15 @@ static byte non_default_homedir;
 
 #ifdef HAVE_W32_SYSTEM
 /* A flag used to indicate that a control file for gpgconf has been
-   detected.  Under Windows the presence of this file indicates a
-   portable installations and triggers several changes:
-
-   - The GNUGHOME directory is fixed relative to installation
-     directory.  All other means to set the home directory are ignore.
-
-   - All registry variables will be ignored.
-
-   This flag is not used on Unix systems.
+ * detected.  Under Windows the presence of this file indicates a
+ * portable installations and triggers several changes:
+ *
+ * - The GNUGHOME directory is fixed relative to installation
+ *   directory.  All other means to set the home directory are ignored.
+ *
+ * - All registry variables will be ignored.
+ *
+ * This flag is not used on Unix systems.
  */
 static byte w32_portable_app;
 #endif /*HAVE_W32_SYSTEM*/
@@ -166,7 +168,7 @@ is_gnupg_default_homedir (const char *dir)
 {
   int result;
   char *a = make_absfilename (dir, NULL);
-  char *b = make_absfilename (GNUPG_DEFAULT_HOMEDIR, NULL);
+  char *b = make_absfilename (standard_homedir (), NULL);
   result = !compare_filenames (a, b);
   xfree (b);
   xfree (a);
@@ -233,7 +235,7 @@ copy_dir_with_fixup (const char *newdir)
 /* Get the standard home directory.  In general this function should
    not be used as it does not consider a registry value (under W32) or
    the GNUPGHOME environment variable.  It is better to use
-   default_homedir(). */
+   gnupg_homedir(). */
 const char *
 standard_homedir (void)
 {
@@ -248,6 +250,7 @@ standard_homedir (void)
       if (w32_portable_app)
         {
           dir = xstrconcat (rdir, DIRSEP_S "home", NULL);
+          gpgrt_annotate_leaked_object (dir);
         }
       else
         {
@@ -259,6 +262,7 @@ standard_homedir (void)
             {
               dir = xstrconcat (path, "\\gnupg", NULL);
               xfree (path);
+              gpgrt_annotate_leaked_object (dir);
 
               /* Try to create the directory if it does not yet exists.  */
               if (gnupg_access (dir, F_OK))
@@ -276,7 +280,7 @@ standard_homedir (void)
 
 /* Set up the default home directory.  The usual --homedir option
    should be parsed later. */
-const char *
+static const char *
 default_homedir (void)
 {
   const char *dir;
@@ -336,7 +340,18 @@ default_homedir (void)
 
       p = copy_dir_with_fixup (dir);
       if (p)
-        dir = p;
+        {
+          /* A new buffer has been allocated with proper semantics.
+           * Assign this to DIR.  If DIR is passed again to
+           * copy_dir_with_fixup there will be no need for a fix up
+           * and the function returns NULL.  Thus we leak only once.
+           * Setting the homedir is usually a one-off task but might
+           * be called a second time.  We also ignore such extra leaks
+           * because we don't know who still references the former
+           * string.  */
+          gpgrt_annotate_leaked_object (p);
+          dir = p;
+        }
 
       if (!is_gnupg_default_homedir (dir))
         non_default_homedir = 1;
@@ -458,6 +473,7 @@ w32_commondir (void)
            * version.  Use the installation directory instead.  */
           dir = xstrdup (rdir);
         }
+      gpgrt_annotate_leaked_object (dir);
     }
 
   return dir;
@@ -487,6 +503,10 @@ gnupg_set_homedir (const char *newdir)
   xfree (the_gnupg_homedir);
   the_gnupg_homedir = make_absfilename (newdir, NULL);;
   xfree (tmp);
+  /* Fixme: Should we use
+   *   gpgrt_annotate_leaked_object(the_gnupg_homedir)
+   * despite that we may free and allocate a new one in some
+   * cases?  */
 }
 
 
@@ -561,6 +581,7 @@ gnupg_daemon_rootdir (void)
         name = xstrdup ("/"); /* Error - use the curret top dir instead.  */
       else
         name = xstrdup (path);
+      gpgrt_annotate_leaked_object (name);
     }
 
   return name;
@@ -590,8 +611,117 @@ gnupg_daemon_rootdir (void)
 char *
 _gnupg_socketdir_internal (int skip_checks, unsigned *r_info)
 {
-#if defined(HAVE_W32_SYSTEM) || !defined(HAVE_STAT)
+#if defined(HAVE_W32_SYSTEM)
+  char *name;
+
+  (void)skip_checks;
+
+  *r_info = 0;
+
+  /* First make sure that non_default_homedir and w32_portable_app can
+   * be set.  */
+  gnupg_homedir ();
+
+  if (w32_portable_app)
+    {
+      name = xstrconcat (w32_rootdir (), DIRSEP_S, "gnupg", NULL);
+    }
+  else
+    {
+      char *path;
+
+      path = w32_shgetfolderpath (NULL,
+                                  CSIDL_LOCAL_APPDATA|CSIDL_FLAG_CREATE,
+                                  NULL, 0);
+      if (path)
+        {
+          name = xstrconcat (path, "\\gnupg", NULL);
+          xfree (path);
+          if (gnupg_access (name, F_OK))
+            w32_try_mkdir (name);
+        }
+      else
+        {
+          name = xstrdup (gnupg_homedir ());
+        }
+    }
+
+  /* If a non default homedir is used, we check whether an
+   * corresponding sub directory below the socket dir is available
+   * and use that.  We hash the non default homedir to keep the new
+   * subdir short enough.  */
+  if (non_default_homedir)
+    {
+      char sha1buf[20];
+      struct stat sb;
+      char *suffix;
+      char *p;
+
+      *r_info |= 32; /* Testing subdir.  */
+
+      /* Canonicalize the name to avoid problems with mixed case
+       * names.  Note that we use only 10 bytes of the hash because on
+       * Windows the account name is also part of the name.  */
+      suffix = ascii_strlwr (xstrdup (gnupg_homedir ()));
+      for (p=suffix; *p; p++)
+        if ( *p == '\\')
+          *p = '/';
+      gcry_md_hash_buffer (GCRY_MD_SHA1, sha1buf, suffix, strlen (suffix));
+      xfree (suffix);
+      suffix = zb32_encode (sha1buf, 8*10);
+      if (!suffix)
+        {
+          *r_info |= 1; /* Out of core etc. */
+          goto leave_w32;
+        }
+      p = xstrconcat (name, "\\d.", suffix, NULL);
+      xfree (suffix);
+      xfree (name);
+      name = p;
 
+      /* Stat that directory and check constraints.
+       * The command
+       *    gpgconf --remove-socketdir
+       * can be used to remove that directory.  */
+      if (gnupg_stat (name, &sb))
+        {
+          if (errno != ENOENT)
+            *r_info |= 1; /* stat failed. */
+          else if (!skip_checks)
+            {
+              /* Try to create the directory and check again.  */
+              if (gnupg_mkdir (name, "-rwx"))
+                *r_info |= 16; /* mkdir failed.  */
+              else if (gnupg_stat (name, &sb))
+                {
+                  if (errno != ENOENT)
+                    *r_info |= 1; /* stat failed. */
+                  else
+                    *r_info |= 64; /* Subdir does not exist.  */
+                }
+              else
+                goto leave_w32; /* Success!  */
+            }
+          else
+            *r_info |= 64; /* Subdir does not exist.  */
+          if (!skip_checks)
+            {
+              xfree (name);
+              name = NULL;
+              goto leave_w32;
+            }
+        }
+    }
+
+ leave_w32:
+  /* If nothing works - fall back to the homedir.  */
+  if (!name)
+    {
+      *r_info |= 128; /* Fallback.  */
+      name = xstrdup (gnupg_homedir ());
+    }
+
+#elif !defined(HAVE_STAT)
   char *name;
 
   (void)skip_checks;
@@ -789,6 +919,7 @@ gnupg_socketdir (void)
     {
       unsigned int dummy;
       name = _gnupg_socketdir_internal (0, &dummy);
+      gpgrt_annotate_leaked_object (name);
     }
 
   return name;
@@ -811,6 +942,7 @@ gnupg_sysconfdir (void)
       s2 = DIRSEP_S "etc" DIRSEP_S "gnupg";
       name = xmalloc (strlen (s1) + strlen (s2) + 1);
       strcpy (stpcpy (name, s1), s2);
+      gpgrt_annotate_leaked_object (name);
     }
   return name;
 #else /*!HAVE_W32_SYSTEM*/
@@ -837,7 +969,10 @@ gnupg_bindir (void)
       static char *name;
 
       if (!name)
-        name = xstrconcat (rdir, DIRSEP_S "bin", NULL);
+        {
+          name = xstrconcat (rdir, DIRSEP_S "bin", NULL);
+          gpgrt_annotate_leaked_object (name);
+        }
       return name;
     }
   else
@@ -867,7 +1002,10 @@ gnupg_libdir (void)
   static char *name;
 
   if (!name)
-    name = xstrconcat (w32_rootdir (), DIRSEP_S "lib" DIRSEP_S "gnupg", NULL);
+    {
+      name = xstrconcat (w32_rootdir (), DIRSEP_S "lib" DIRSEP_S "gnupg", NULL);
+      gpgrt_annotate_leaked_object (name);
+    }
   return name;
 #else /*!HAVE_W32_SYSTEM*/
   return GNUPG_LIBDIR;
@@ -881,7 +1019,11 @@ gnupg_datadir (void)
   static char *name;
 
   if (!name)
-    name = xstrconcat (w32_rootdir (), DIRSEP_S "share" DIRSEP_S "gnupg", NULL);
+    {
+      name = xstrconcat (w32_rootdir (), DIRSEP_S "share" DIRSEP_S "gnupg",
+                         NULL);
+      gpgrt_annotate_leaked_object (name);
+    }
   return name;
 #else /*!HAVE_W32_SYSTEM*/
   return GNUPG_DATADIR;
@@ -896,82 +1038,14 @@ gnupg_localedir (void)
   static char *name;
 
   if (!name)
-    name = xstrconcat (w32_rootdir (), DIRSEP_S "share" DIRSEP_S "locale",
-                       NULL);
-  return name;
-#else /*!HAVE_W32_SYSTEM*/
-  return LOCALEDIR;
-#endif /*!HAVE_W32_SYSTEM*/
-}
-
-
-/* Return the name of the cache directory.  The name is allocated in a
-   static area on the first use.  Windows only: If the directory does
-   not exist it is created.  */
-const char *
-gnupg_cachedir (void)
-{
-#ifdef HAVE_W32_SYSTEM
-  static const char *dir;
-
-  if (!dir)
     {
-      const char *rdir;
-
-      rdir = w32_rootdir ();
-      if (w32_portable_app)
-        {
-          dir = xstrconcat (rdir,
-                            DIRSEP_S, "var",
-                            DIRSEP_S, "cache",
-                            DIRSEP_S, "gnupg", NULL);
-        }
-      else
-        {
-          char *path;
-          const char *s1[] = { "GNU", "cache", "gnupg", NULL };
-          int s1_len;
-          const char **comp;
-
-          s1_len = 0;
-          for (comp = s1; *comp; comp++)
-            s1_len += 1 + strlen (*comp);
-
-          path = w32_shgetfolderpath (NULL,
-                                      CSIDL_LOCAL_APPDATA|CSIDL_FLAG_CREATE,
-                                      NULL, 0);
-          if (path)
-            {
-              char *tmp = xmalloc (strlen (path) + s1_len + 1);
-              char *p;
-
-              p = stpcpy (tmp, path);
-              for (comp = s1; *comp; comp++)
-                {
-                  p = stpcpy (p, "\\");
-                  p = stpcpy (p, *comp);
-
-                  if (gnupg_access (tmp, F_OK))
-                    w32_try_mkdir (tmp);
-                }
-
-              dir = tmp;
-              xfree (path);
-            }
-          else
-            {
-              dir = "c:\\temp\\cache\\gnupg";
-#ifdef HAVE_W32CE_SYSTEM
-              dir += 2;
-              w32_try_mkdir ("\\temp\\cache");
-              w32_try_mkdir ("\\temp\\cache\\gnupg");
-#endif
-            }
-        }
+      name = xstrconcat (w32_rootdir (), DIRSEP_S "share" DIRSEP_S "locale",
+                         NULL);
+      gpgrt_annotate_leaked_object (name);
     }
-  return dir;
+  return name;
 #else /*!HAVE_W32_SYSTEM*/
-  return GNUPG_LOCALSTATEDIR "/cache/" PACKAGE_NAME;
+  return LOCALEDIR;
 #endif /*!HAVE_W32_SYSTEM*/
 }
 
@@ -983,7 +1057,10 @@ gpg_agent_socket_name (void)
   static char *name;
 
   if (!name)
-    name = make_filename (gnupg_socketdir (), GPG_AGENT_SOCK_NAME, NULL);
+    {
+      name = make_filename (gnupg_socketdir (), GPG_AGENT_SOCK_NAME, NULL);
+      gpgrt_annotate_leaked_object (name);
+    }
   return name;
 }
 
@@ -994,7 +1071,10 @@ dirmngr_socket_name (void)
   static char *name;
 
   if (!name)
-    name = make_filename (gnupg_socketdir (), DIRMNGR_SOCK_NAME, NULL);
+    {
+      name = make_filename (gnupg_socketdir (), DIRMNGR_SOCK_NAME, NULL);
+      gpgrt_annotate_leaked_object (name);
+    }
   return name;
 }
 
@@ -1006,7 +1086,10 @@ keyboxd_socket_name (void)
   static char *name;
 
   if (!name)
-    name = make_filename (gnupg_socketdir (), KEYBOXD_SOCK_NAME, NULL);
+    {
+      name = make_filename (gnupg_socketdir (), KEYBOXD_SOCK_NAME, NULL);
+      gpgrt_annotate_leaked_object (name);
+    }
   return name;
 }
 
@@ -1067,6 +1150,8 @@ get_default_pinentry_name (int reset)
           else
             xfree (name2);
         }
+      if (name)
+        gpgrt_annotate_leaked_object (name);
     }
 
   return name;
@@ -1122,11 +1207,13 @@ gnupg_module_name (int which)
 
 #define X(a,b,c) do {                                                   \
     static char *name;                                                  \
-    if (!name)                                                          \
+    if (!name) {                                                        \
       name = gnupg_build_directory                                      \
         ? xstrconcat (gnupg_build_directory,                            \
                       DIRSEP_S b DIRSEP_S c EXEEXT_S, NULL)             \
         : xstrconcat (gnupg_ ## a (), DIRSEP_S c EXEEXT_S, NULL);       \
+      gpgrt_annotate_leaked_object (name);                              \
+    }                                                                   \
     return name;                                                        \
   } while (0)
 
diff --git a/common/keyserver.h b/common/keyserver.h
deleted file mode 100644
index 850798e..0000000
--- a/common/keyserver.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* keyserver.h - Public definitions for gpg keyserver helpers.
- * Copyright (C) 2001, 2002, 2011 Free Software Foundation, Inc.
- *
- * This file is part of GnuPG.
- *
- * This file is free software; you can redistribute it and/or modify
- * it under the terms of either
- *
- *   - the GNU Lesser General Public License as published by the Free
- *     Software Foundation; either version 3 of the License, or (at
- *     your option) any later version.
- *
- * or
- *
- *   - the GNU General Public License as published by the Free
- *     Software Foundation; either version 2 of the License, or (at
- *     your option) any later version.
- *
- * or both in parallel, as here.
- *
- * This file is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <https://www.gnu.org/licenses/>.
- */
-
-#ifndef GNUPG_COMMON_KEYSERVER_H
-#define GNUPG_COMMON_KEYSERVER_H
-
-#define KEYSERVER_PROTO_VERSION    1
-
-/* These are usable for return codes for the gpgkeys_ process, and
-   also KEY FAILED codes. */
-#define KEYSERVER_OK               0 /* not an error */
-#define KEYSERVER_INTERNAL_ERROR   1 /* gpgkeys_ internal error */
-#define KEYSERVER_NOT_SUPPORTED    2 /* operation not supported */
-#define KEYSERVER_VERSION_ERROR    3 /* VERSION mismatch */
-#define KEYSERVER_GENERAL_ERROR    4 /* keyserver internal error */
-#define KEYSERVER_NO_MEMORY        5 /* out of memory */
-#define KEYSERVER_KEY_NOT_FOUND    6 /* key not found */
-#define KEYSERVER_KEY_EXISTS       7 /* key already exists */
-#define KEYSERVER_KEY_INCOMPLETE   8 /* key incomplete (EOF) */
-#define KEYSERVER_UNREACHABLE      9 /* unable to contact keyserver */
-
-/* Must be 127 due to shell internal magic. */
-#define KEYSERVER_SCHEME_NOT_FOUND 127
-
-/* Object to hold information pertaining to a keyserver; it also
-   allows building a list of keyservers.  Note that g10/options.h has
-   a typedef for this.  FIXME: We should make use of the
-   parse_uri_t. */
-struct keyserver_spec
-{
-  struct keyserver_spec *next;
-  char *uri;
-  char *scheme;
-  char *auth;
-  char *host;
-  char *port;
-  char *path;
-  char *opaque;
-  strlist_t options;
-  struct
-  {
-    unsigned int direct_uri:1;
-  } flags;
-};
-
-
-#endif /*GNUPG_COMMON_KEYSERVER_H*/
diff --git a/common/name-value.c b/common/name-value.c
index 0bd205b..39c3244 100644
--- a/common/name-value.c
+++ b/common/name-value.c
@@ -724,6 +724,7 @@ do_nvc_parse (nvc_t *result, int *errlinep, estream_t stream,
       if (raw_value)
 	{
 	  err = _nvc_add (*result, name, NULL, raw_value, 1);
+          name = NULL;
 	  if (err)
 	    goto leave;
 	}
diff --git a/common/openpgp-fpr.c b/common/openpgp-fpr.c
index de28c25..7b11008 100644
--- a/common/openpgp-fpr.c
+++ b/common/openpgp-fpr.c
@@ -265,7 +265,7 @@ compute_openpgp_fpr_ecc (int keyversion, unsigned long timestamp,
     {
       if (!kdf || !kdflen || !kdf[0])
         {
-          /* No KDF givem - use the default.  */
+          /* No KDF given - use the default.  */
           kdflen = 4;
           kdf = default_ecdh_params (curvebits);
         }
diff --git a/common/recsel.c b/common/recsel.c
index 95c104f..60da4d3 100644
--- a/common/recsel.c
+++ b/common/recsel.c
@@ -172,6 +172,8 @@ find_next_lc (char *string)
  *
  *   --  VALUE spans to the end of the expression.
  *   -c  The string match in this part is done case-sensitive.
+ *   -t  Do not trim leading and trailing spaces from VALUE.
+ *       Note that a space after <op> is here required.
  *
  * For example four calls to recsel_parse_expr() with these values for
  * EXPR
@@ -203,6 +205,7 @@ recsel_parse_expr (recsel_expr_t *selector, const char *expression)
   char *s0, *s;
   int toend = 0;
   int xcase = 0;
+  int notrim = 0;
   int disjun = 0;
   char *next_lc = NULL;
 
@@ -232,6 +235,7 @@ recsel_parse_expr (recsel_expr_t *selector, const char *expression)
         {
         case '-': toend = 1; break;
         case 'c': xcase = 1; break;
+        case 't': notrim = 1; break;
         default:
           log_error ("invalid flag '-%c' in expression\n", *expr);
           recsel_release (se_head);
@@ -397,8 +401,11 @@ recsel_parse_expr (recsel_expr_t *selector, const char *expression)
       return my_error (GPG_ERR_INV_OP);
     }
 
-  while (*s == ' ' || *s == '\t')
+  if (*s == ' ' || *s == '\t')
     s++;
+  if (!notrim)
+    while (*s == ' ' || *s == '\t')
+      s++;
 
   if (se->op == SELECT_NONEMPTY || se->op == SELECT_ISTRUE)
     {
@@ -431,7 +438,8 @@ recsel_parse_expr (recsel_expr_t *selector, const char *expression)
       return my_error (GPG_ERR_NO_NAME);
     }
 
-  trim_spaces (se->name + (s - expr));
+  if (!notrim)
+    trim_spaces (se->name + (s - expr));
   se->value = se->name + (s - expr);
   if (!se->value[0] && !(se->op == SELECT_NONEMPTY || se->op == SELECT_ISTRUE))
     {
diff --git a/common/session-env.c b/common/session-env.c
index 5d6b66d..f07d9d1 100644
--- a/common/session-env.c
+++ b/common/session-env.c
@@ -71,6 +71,11 @@ static struct
   { "XMODIFIERS" },              /* Used by Xlib to select X input
                                       modules (eg "@im=SCIM").  */
   { "WAYLAND_DISPLAY" },         /* For the Wayland display engine.  */
+  { "XDG_SESSION_TYPE" },        /* Used by Qt and other non-GTK toolkits
+                                    to check for x11 or wayland.  */
+  { "QT_QPA_PLATFORM" },         /* Used by Qt to explicitly request
+                                    x11 or wayland; in particular, needed
+                                    to make Qt use Wayland on Gnome.  */
   { "GTK_IM_MODULE" },           /* Used by gtk to select gtk input
                                     modules (eg "scim-bridge").  */
   { "DBUS_SESSION_BUS_ADDRESS" },/* Used by GNOME3 to talk to gcr over
diff --git a/common/stringhelp.c b/common/stringhelp.c
index 24524e8..4dc1797 100644
--- a/common/stringhelp.c
+++ b/common/stringhelp.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007,
  *               2008, 2009, 2010  Free Software Foundation, Inc.
  * Copyright (C) 2014 Werner Koch
- * Copyright (C) 2015  g10 Code GmbH
+ * Copyright (C) 2015, 2021  g10 Code GmbH
  *
  * This file is part of GnuPG.
  *
@@ -29,6 +29,7 @@
  * You should have received a copies of the GNU General Public License
  * and the GNU Lesser General Public License along with this program;
  * if not, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: (LGPL-3.0-or-later OR GPL-2.0-or-later)
  */
 
 #include <config.h>
@@ -48,7 +49,6 @@
 # endif
 # include <windows.h>
 #endif
-#include <assert.h>
 #include <limits.h>
 
 #include "util.h"
@@ -216,7 +216,7 @@ trim_spaces( char *str )
 }
 
 
-/* Same as trim_spaces but only condider, space, tab, cr and lf as space.  */
+/* Same as trim_spaces but only consider, space, tab, cr and lf as space.  */
 char *
 ascii_trim_spaces (char *str)
 {
@@ -1293,8 +1293,8 @@ strsplit (char *string, char delim, char replacement, int *count)
  * Returns: A malloced and NULL delimited array with the tokens.  On
  *          memory error NULL is returned and ERRNO is set.
  */
-char **
-strtokenize (const char *string, const char *delim)
+static char **
+do_strtokenize (const char *string, const char *delim, int trim)
 {
   const char *s;
   size_t fields;
@@ -1333,24 +1333,51 @@ strtokenize (const char *string, const char *delim)
   for (n = 0, p = buffer; (pend = strpbrk (p, delim)); p = pend + 1)
     {
       *pend = 0;
+      if (trim)
+        {
+          while (spacep (p))
+            p++;
+          for (px = pend - 1; px >= p && spacep (px); px--)
+            *px = 0;
+        }
+      result[n++] = p;
+    }
+  if (trim)
+    {
       while (spacep (p))
         p++;
-      for (px = pend - 1; px >= p && spacep (px); px--)
+      for (px = p + strlen (p) - 1; px >= p && spacep (px); px--)
         *px = 0;
-      result[n++] = p;
     }
-  while (spacep (p))
-    p++;
-  for (px = p + strlen (p) - 1; px >= p && spacep (px); px--)
-    *px = 0;
   result[n++] = p;
   result[n] = NULL;
 
-  assert ((char*)(result + n + 1) == buffer);
+  log_assert ((char*)(result + n + 1) == buffer);
 
   return result;
 }
 
+/* Tokenize STRING using the set of delimiters in DELIM.  Leading
+ * spaces and tabs are removed from all tokens.  The caller must xfree
+ * the result.
+ *
+ * Returns: A malloced and NULL delimited array with the tokens.  On
+ *          memory error NULL is returned and ERRNO is set.
+ */
+char **
+strtokenize (const char *string, const char *delim)
+{
+  return do_strtokenize (string, delim, 1);
+}
+
+/* Same as strtokenize but does not trim leading and trailing spaces
+ * from the fields.  */
+char **
+strtokenize_nt (const char *string, const char *delim)
+{
+  return do_strtokenize (string, delim, 0);
+}
+
 
 /* Split a string into space delimited fields and remove leading and
  * trailing spaces from each field.  A pointer to each field is stored
diff --git a/common/stringhelp.h b/common/stringhelp.h
index c5f252b..598f698 100644
--- a/common/stringhelp.h
+++ b/common/stringhelp.h
@@ -148,6 +148,9 @@ char **strsplit (char *string, char delim, char replacement, int *count);
 
 /* Tokenize STRING using the set of delimiters in DELIM.  */
 char **strtokenize (const char *string, const char *delim);
+/* Tokenize STRING using the set of delimiters in DELIM but do not
+ * trim the tokens.  */
+char **strtokenize_nt (const char *string, const char *delim);
 
 /* Split STRING into space delimited fields and store them in the
  * provided ARRAY.  */
diff --git a/common/sysutils.c b/common/sysutils.c
index 8b2d701..1342d10 100644
--- a/common/sysutils.c
+++ b/common/sysutils.c
@@ -1004,6 +1004,33 @@ gnupg_chdir (const char *name)
 }
 
 
+/* A wrapper around rmdir.  NAME is expected to be utf8 encoded.  */
+int
+gnupg_rmdir (const char *name)
+{
+#ifdef HAVE_W32_SYSTEM
+  int rc;
+  wchar_t *wfname;
+
+  wfname = utf8_to_wchar (name);
+  if (!wfname)
+    rc = 0;
+  else
+    {
+      rc = RemoveDirectoryW (wfname);
+      if (!rc)
+        gnupg_w32_set_errno (-1);
+      xfree (wfname);
+    }
+  if (!rc)
+    return -1;
+  return 0;
+#else
+  return rmdir (name);
+#endif
+}
+
+
 /* A wrapper around chmod which takes a string for the mode argument.
    This makes it easier to handle the mode argument which is not
    defined on all systems.  The format of the modestring is the same
diff --git a/common/sysutils.h b/common/sysutils.h
index 9f2920b..7063da0 100644
--- a/common/sysutils.h
+++ b/common/sysutils.h
@@ -84,6 +84,7 @@ gpg_error_t gnupg_rename_file (const char *oldname, const char *newname,
                                int *block_signals);
 int gnupg_mkdir (const char *name, const char *modestr);
 int gnupg_chdir (const char *name);
+int gnupg_rmdir (const char *name);
 int gnupg_chmod (const char *name, const char *modestr);
 char *gnupg_mkdtemp (char *template);
 int  gnupg_setenv (const char *name, const char *value, int overwrite);
diff --git a/common/t-sexputil.c b/common/t-sexputil.c
index d75090c..d6cf335 100644
--- a/common/t-sexputil.c
+++ b/common/t-sexputil.c
@@ -461,17 +461,33 @@ test_ecc_uncompress (void)
       if (bbuf)
         {
           err = uncompress_ecc_q_in_canon_sexp (bbuf, bbuflen, &rbuf, &rbuflen);
-          if (err)
-            fail2 (idx,err);
-          if (!rbuf)
-            fail (idx);  /* Not converted despite a need for it. */
-
-          /* log_printcanon ("  orig:", abuf, abuflen); */
-          /* log_printcanon ("  comp:", bbuf, bbuflen); */
-          /* log_printcanon ("uncomp:", rbuf, rbuflen); */
-
-          if (rbuflen != abuflen || memcmp (rbuf, abuf, abuflen))
-            fail (idx);
+          if (gpg_err_code (err) == GPG_ERR_UNKNOWN_CURVE)
+            {
+              static int shown;
+              fprintf (stderr, "%s:%d: test %d failed: %s - ignored\n",
+                       __FILE__,__LINE__, idx, gpg_strerror (err));
+              if (!shown)
+                {
+                  shown = 1;
+                  fprintf (stderr, "This is likely due to a patched"
+                           " version of Libgcrypt with removed support"
+                           " for Brainpool curves\n");
+                }
+            }
+          else
+            {
+              if (err)
+                fail2 (idx,err);
+              if (!rbuf)
+                fail (idx);  /* Not converted despite a need for it. */
+
+              /* log_printcanon ("  orig:", abuf, abuflen); */
+              /* log_printcanon ("  comp:", bbuf, bbuflen); */
+              /* log_printcanon ("uncomp:", rbuf, rbuflen); */
+
+              if (rbuflen != abuflen || memcmp (rbuf, abuf, abuflen))
+                fail (idx);
+            }
         }
 
       xfree (abuf);
diff --git a/common/t-stringhelp.c b/common/t-stringhelp.c
index 6f7f6f7..5eca5a0 100644
--- a/common/t-stringhelp.c
+++ b/common/t-stringhelp.c
@@ -1,6 +1,6 @@
 /* t-stringhelp.c - Regression tests for stringhelp.c
  * Copyright (C) 2007 Free Software Foundation, Inc.
- *               2015  g10 Code GmbH
+ *               2015, 2021  g10 Code GmbH
  *
  * This file is part of GnuPG.
  *
@@ -27,6 +27,7 @@
  * You should have received a copies of the GNU General Public License
  * and the GNU Lesser General Public License along with this program;
  * if not, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: (LGPL-3.0-or-later OR GPL-2.0-or-later)
  */
 
 #include <config.h>
@@ -34,7 +35,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include <assert.h>
 #ifdef HAVE_PWD_H
 # include <pwd.h>
 #endif
@@ -687,6 +687,144 @@ test_strtokenize (void)
 
 
 static void
+test_strtokenize_nt (void)
+{
+  struct {
+    const char *s;
+    const char *delim;
+    const char *fields_expected[10];
+  } tv[] = {
+    {
+      "", ":",
+      { "", NULL }
+    },
+    {
+      "a", ":",
+      { "a", NULL }
+    },
+    {
+      ":", ":",
+      { "", "", NULL }
+    },
+    {
+      "::", ":",
+      { "", "", "", NULL }
+    },
+    {
+      "a:b:c", ":",
+      { "a", "b", "c", NULL }
+    },
+    {
+      "a:b:", ":",
+      { "a", "b", "", NULL }
+    },
+    {
+      "a:b", ":",
+      { "a", "b", NULL }
+    },
+    {
+      "aa:b:cd", ":",
+      { "aa", "b", "cd", NULL }
+    },
+    {
+      "aa::b:cd", ":",
+      { "aa", "", "b", "cd", NULL }
+    },
+    {
+      "::b:cd", ":",
+      { "", "", "b", "cd", NULL }
+    },
+    {
+      "aa:   : b:cd ", ":",
+      { "aa", "   ", " b", "cd ", NULL }
+    },
+    {
+      "  aa:   : b:  cd ", ":",
+      { "  aa", "   ", " b", "  cd ", NULL }
+    },
+    {
+      "  ", ":",
+      { "  ", NULL }
+    },
+    {
+      "  :", ":",
+      { "  ", "", NULL }
+    },
+    {
+      "  : ", ":",
+      { "  ", " ", NULL }
+    },
+    {
+      ": ", ":",
+      { "", " ", NULL }
+    },
+    {
+      ": x ", ":",
+      { "", " x ", NULL }
+    },
+    {
+      "a:bc:cde:fghi:jklmn::foo:", ":",
+      { "a", "bc", "cde", "fghi", "jklmn", "", "foo", "", NULL }
+    },
+    {
+      ",a,bc,,def,", ",",
+      { "", "a", "bc", "", "def", "", NULL }
+    },
+    {
+      " a ", " ",
+      { "", "a", "", NULL }
+    },
+    {
+      " ", " ",
+      { "", "", NULL }
+    },
+    {
+      "", " ",
+      { "", NULL }
+    }
+  };
+
+  int tidx;
+
+  for (tidx = 0; tidx < DIM(tv); tidx++)
+    {
+      char **fields;
+      int field_count;
+      int field_count_expected;
+      int i;
+
+      for (field_count_expected = 0;
+           tv[tidx].fields_expected[field_count_expected];
+           field_count_expected ++)
+        ;
+
+      fields = strtokenize_nt (tv[tidx].s, tv[tidx].delim);
+      if (!fields)
+        fail (tidx * 1000);
+      else
+        {
+          for (field_count = 0; fields[field_count]; field_count++)
+            ;
+          if (field_count != field_count_expected)
+            fail (tidx * 1000);
+          else
+            {
+              for (i = 0; i < field_count_expected; i++)
+                if (strcmp (tv[tidx].fields_expected[i], fields[i]))
+                  {
+                    printf ("For field %d, expected '%s', but got '%s'\n",
+                            i, tv[tidx].fields_expected[i], fields[i]);
+                    fail (tidx * 1000 + i + 1);
+                  }
+            }
+          }
+
+      xfree (fields);
+    }
+}
+
+
+static void
 test_split_fields (void)
 {
   struct {
@@ -724,7 +862,7 @@ test_split_fields (void)
   for (tidx = 0; tidx < DIM(tv); tidx++)
     {
       nfields = tv[tidx].nfields;
-      assert (nfields <= DIM (fields));
+      log_assert (nfields <= DIM (fields));
 
       /* Count the fields.  */
       for (field_count_expected = 0;
@@ -799,7 +937,7 @@ test_split_fields_colon (void)
   for (tidx = 0; tidx < DIM(tv); tidx++)
     {
       nfields = tv[tidx].nfields;
-      assert (nfields <= DIM (fields));
+      log_assert (nfields <= DIM (fields));
 
       /* Count the fields.  */
       for (field_count_expected = 0;
@@ -1070,6 +1208,7 @@ main (int argc, char **argv)
   test_make_absfilename_try ();
   test_strsplit ();
   test_strtokenize ();
+  test_strtokenize_nt ();
   test_split_fields ();
   test_split_fields_colon ();
   test_compare_version_strings ();
diff --git a/common/tlv-builder.c b/common/tlv-builder.c
index 3b644ca..59e2691 100644
--- a/common/tlv-builder.c
+++ b/common/tlv-builder.c
@@ -350,6 +350,7 @@ get_tlv_length (int class, int tag, int constructed, size_t length)
 
   (void)constructed;  /* Not used, but passed for uniformity of such calls.  */
 
+  /* coverity[identical_branches] */
   if (tag < 0x1f)
     {
       buflen++;
diff --git a/common/ttyio.c b/common/ttyio.c
index 15f7a02..f77c053 100644
--- a/common/ttyio.c
+++ b/common/ttyio.c
@@ -236,10 +236,24 @@ w32_write_console (const char *string)
   n = wcslen (wstring);
 
   if (!WriteConsoleW (con.out, wstring, n, &nwritten, NULL))
-    log_fatal ("WriteConsole failed: %s", w32_strerror (-1));
-  if (n != nwritten)
-    log_fatal ("WriteConsole failed: %lu != %lu\n",
-               (unsigned long)n, (unsigned long)nwritten);
+    {
+      static int shown;
+      if (!shown)
+        {
+          shown = 1;
+          log_info ("WriteConsole failed: %s", w32_strerror (-1));
+          log_info ("Please configure a suitable font for the console\n");
+        }
+      n = strlen (string);
+      if (!WriteConsoleA (con.out, string, n , &nwritten, NULL))
+        log_fatal ("WriteConsole fallback failed: %s", w32_strerror (-1));
+    }
+  else
+    {
+      if (n != nwritten)
+        log_fatal ("WriteConsole failed: %lu != %lu\n",
+                   (unsigned long)n, (unsigned long)nwritten);
+    }
   last_prompt_len += n;
   xfree (wstring);
 }
diff --git a/common/userids.c b/common/userids.c
index 0f03896..9d866d5 100644
--- a/common/userids.c
+++ b/common/userids.c
@@ -115,6 +115,7 @@ classify_user_id (const char *name, KEYDB_SEARCH_DESC *desc, int openpgp_hack)
       mode = KEYDB_SEARCH_MODE_MAILEND;
       s++;
       desc->u.name = s;
+      desc->name_used = 1;
       break;
 
     case '<': /* An email address.  */
@@ -126,24 +127,28 @@ classify_user_id (const char *name, KEYDB_SEARCH_DESC *desc, int openpgp_hack)
       if (!openpgp_hack)
         s++;
       desc->u.name = s;
+      desc->name_used = 1;
       break;
 
     case '@':  /* Part of an email address.  */
       mode = KEYDB_SEARCH_MODE_MAILSUB;
       s++;
       desc->u.name = s;
+      desc->name_used = 1;
       break;
 
     case '=':  /* Exact compare.  */
       mode = KEYDB_SEARCH_MODE_EXACT;
       s++;
       desc->u.name = s;
+      desc->name_used = 1;
       break;
 
     case '*':  /* Case insensitive substring search.  */
       mode = KEYDB_SEARCH_MODE_SUBSTR;
       s++;
       desc->u.name = s;
+      desc->name_used = 1;
       break;
 
     case '+':  /* Compare individual words.  Note that this has not
@@ -151,6 +156,7 @@ classify_user_id (const char *name, KEYDB_SEARCH_DESC *desc, int openpgp_hack)
       mode = KEYDB_SEARCH_MODE_WORDS;
       s++;
       desc->u.name = s;
+      desc->name_used = 1;
       break;
 
     case '/': /* Subject's DN.  */
@@ -161,6 +167,7 @@ classify_user_id (const char *name, KEYDB_SEARCH_DESC *desc, int openpgp_hack)
           goto out;
         }
       desc->u.name = s;
+      desc->name_used = 1;
       mode = KEYDB_SEARCH_MODE_SUBJECT;
       break;
 
@@ -178,6 +185,7 @@ classify_user_id (const char *name, KEYDB_SEARCH_DESC *desc, int openpgp_hack)
                 goto out;
               }
             desc->u.name = s;
+            desc->name_used = 1;
             mode = KEYDB_SEARCH_MODE_ISSUER;
           }
         else
@@ -205,6 +213,7 @@ classify_user_id (const char *name, KEYDB_SEARCH_DESC *desc, int openpgp_hack)
                     goto out;
                   }
                 desc->u.name = s;
+                desc->name_used = 1;
                 mode = KEYDB_SEARCH_MODE_ISSUER_SN;
               }
           }
@@ -472,6 +481,7 @@ classify_user_id (const char *name, KEYDB_SEARCH_DESC *desc, int openpgp_hack)
           if (!mode) /* Default to substring search.  */
             {
               desc->u.name = s;
+              desc->name_used = 1;
               mode = KEYDB_SEARCH_MODE_SUBSTR;
             }
         }
diff --git a/common/util.h b/common/util.h
index 0427bc8..4e12377 100644
--- a/common/util.h
+++ b/common/util.h
@@ -263,7 +263,6 @@ const char *get_keyalgo_string (enum gcry_pk_algos algo,
 
 /*-- homedir.c --*/
 const char *standard_homedir (void);
-const char *default_homedir (void);
 void gnupg_set_homedir (const char *newdir);
 void gnupg_maybe_make_homedir (const char *fname, int quiet);
 const char *gnupg_homedir (void);
@@ -276,7 +275,6 @@ const char *gnupg_libexecdir (void);
 const char *gnupg_libdir (void);
 const char *gnupg_datadir (void);
 const char *gnupg_localedir (void);
-const char *gnupg_cachedir (void);
 const char *gpg_agent_socket_name (void);
 const char *dirmngr_socket_name (void);
 const char *keyboxd_socket_name (void);
diff --git a/config.h.in b/config.h.in
index 0ea55d1..64e34b2 100644
--- a/config.h.in
+++ b/config.h.in
@@ -298,9 +298,6 @@
 /* Define to 1 if you have the `getenv' function. */
 #undef HAVE_GETENV
 
-/* Define to 1 if you have the <getopt.h> header file. */
-#undef HAVE_GETOPT_H
-
 /* Define to 1 if you have the `getpagesize' function. */
 #undef HAVE_GETPAGESIZE
 
@@ -388,9 +385,6 @@
 /* defined if libusb is available */
 #undef HAVE_LIBUSB
 
-/* Define to 1 if you have the <libutil.h> header file. */
-#undef HAVE_LIBUTIL_H
-
 /* Define to 1 if you have the <locale.h> header file. */
 #undef HAVE_LOCALE_H
 
@@ -429,9 +423,6 @@
    instead. */
 #undef HAVE_PSELECT_NO_EINTR
 
-/* Define to 1 if you have the <pty.h> header file. */
-#undef HAVE_PTY_H
-
 /* Define to 1 if you have the <pwd.h> header file. */
 #undef HAVE_PWD_H
 
@@ -594,12 +585,6 @@
 /* Define to 1 if the system has the type `ushort'. */
 #undef HAVE_USHORT
 
-/* Define to 1 if you have the <util.h> header file. */
-#undef HAVE_UTIL_H
-
-/* Define to 1 if you have the <utmp.h> header file. */
-#undef HAVE_UTMP_H
-
 /* Define to 1 if you have the `vfork' function. */
 #undef HAVE_VFORK
 
diff --git a/configure b/configure
index 9bea53c..41d41b6 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.1.
+# Generated by GNU Autoconf 2.69 for gnupg 2.3.2.
 #
 # 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.1'
-PACKAGE_STRING='gnupg 2.3.1'
+PACKAGE_VERSION='2.3.2'
+PACKAGE_STRING='gnupg 2.3.2'
 PACKAGE_BUGREPORT='https://bugs.gnupg.org'
 PACKAGE_URL=''
 
@@ -1558,7 +1558,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.1 to adapt to many kinds of systems.
+\`configure' configures gnupg 2.3.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1629,7 +1629,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of gnupg 2.3.1:";;
+     short | recursive ) echo "Configuration of gnupg 2.3.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1851,7 +1851,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-gnupg configure 2.3.1
+gnupg configure 2.3.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2560,7 +2560,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.1, which was
+It was created by gnupg $as_me 2.3.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3459,7 +3459,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='gnupg'
- VERSION='2.3.1'
+ VERSION='2.3.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -8211,7 +8211,7 @@ $as_echo "#define HAVE_DRIVE_LETTERS 1" >>confdefs.h
         ;;
     *-apple-darwin*)
 
-$as_echo "#define _DARWIN_C_SOURCE 900000L" >>confdefs.h
+$as_echo "#define _DARWIN_C_SOURCE 1" >>confdefs.h
 
         ;;
     *-*-netbsd*)
@@ -13741,23 +13741,6 @@ $as_echo "#define STDC_HEADERS 1" >>confdefs.h
 
 fi
 
-for ac_header in string.h unistd.h langinfo.h termio.h locale.h getopt.h \
-                  pty.h utmp.h pwd.h inttypes.h signal.h sys/select.h     \
-                  stdint.h signal.h util.h libutil.h termios.h \
-                  ucred.h sys/ucred.h sys/sysmacros.h sys/mkdev.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
 $as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
 if ${ac_cv_header_time+:} false; then :
@@ -13793,6 +13776,22 @@ $as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
 
 fi
 
+for ac_header in unistd.h langinfo.h termio.h locale.h \
+                  pwd.h inttypes.h signal.h sys/select.h     \
+                  stdint.h signal.h termios.h \
+                  ucred.h sys/ucred.h sys/sysmacros.h sys/mkdev.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
 
 
 #
@@ -14501,41 +14500,6 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
-$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
-if ${ac_cv_header_time+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <sys/time.h>
-#include <time.h>
-
-int
-main ()
-{
-if ((struct tm *) 0)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_time=yes
-else
-  ac_cv_header_time=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5
-$as_echo "$ac_cv_header_time" >&6; }
-if test $ac_cv_header_time = yes; then
-
-$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
-
-fi
-
 # The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
@@ -16703,7 +16667,7 @@ _ACEOF
 
 
 cat >>confdefs.h <<_ACEOF
-#define DIRMNGR_DEFAULT_KEYSERVER "hkps://hkps.pool.sks-keyservers.net"
+#define DIRMNGR_DEFAULT_KEYSERVER "hkps://keyserver.ubuntu.com"
 _ACEOF
 
 
@@ -16725,7 +16689,7 @@ fi
 #
 # Provide information about the build.
 #
-BUILD_REVISION="cbbdb8862"
+BUILD_REVISION="3bf8d7e1b"
 
 
 cat >>confdefs.h <<_ACEOF
@@ -16734,7 +16698,7 @@ _ACEOF
 
 
 BUILD_VERSION=`echo "$VERSION" | sed 's/\([0-9.]*\).*/\1./'`
-BUILD_VERSION="${BUILD_VERSION}52157"
+BUILD_VERSION="${BUILD_VERSION}15352"
 BUILD_FILEVERSION=`echo "${BUILD_VERSION}" | tr . ,`
 
 
@@ -16916,7 +16880,7 @@ fi
 
 
 
-ac_config_files="$ac_config_files m4/Makefile Makefile po/Makefile.in common/Makefile common/w32info-rc.h regexp/Makefile kbx/Makefile g10/Makefile sm/Makefile agent/Makefile scd/Makefile tpm2d/Makefile g13/Makefile dirmngr/Makefile tools/Makefile doc/Makefile tests/Makefile tests/gpgscm/Makefile tests/openpgp/Makefile tests/tpm2dtests/Makefile tests/migrations/Makefile tests/gpgsm/Makefile tests/gpgme/Makefile tests/pkits/Makefile g10/gpg.w32-manifest tools/gpg-connect-agent.w32-manifest tools/gpgconf.w32-manifest tools/gpgtar.w32-manifest tools/gpg-check-pattern.w32-manifest tools/gpg-wks-client.w32-manifest tools/gpg-card.w32-manifest"
+ac_config_files="$ac_config_files m4/Makefile Makefile po/Makefile.in common/Makefile common/w32info-rc.h regexp/Makefile kbx/Makefile g10/Makefile sm/Makefile agent/Makefile scd/Makefile tpm2d/Makefile g13/Makefile dirmngr/Makefile tools/Makefile doc/Makefile tests/Makefile tests/gpgscm/Makefile tests/openpgp/Makefile tests/cms/Makefile tests/migrations/Makefile tests/tpm2dtests/Makefile tests/gpgme/Makefile tests/pkits/Makefile g10/gpg.w32-manifest tools/gpg-connect-agent.w32-manifest tools/gpgconf.w32-manifest tools/gpgtar.w32-manifest tools/gpg-check-pattern.w32-manifest tools/gpg-wks-client.w32-manifest tools/gpg-card.w32-manifest"
 
 
 
@@ -17614,7 +17578,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.1, which was
+This file was extended by gnupg $as_me 2.3.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17680,7 +17644,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.1
+gnupg config.status 2.3.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -17838,9 +17802,9 @@ do
     "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
     "tests/gpgscm/Makefile") CONFIG_FILES="$CONFIG_FILES tests/gpgscm/Makefile" ;;
     "tests/openpgp/Makefile") CONFIG_FILES="$CONFIG_FILES tests/openpgp/Makefile" ;;
-    "tests/tpm2dtests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/tpm2dtests/Makefile" ;;
+    "tests/cms/Makefile") CONFIG_FILES="$CONFIG_FILES tests/cms/Makefile" ;;
     "tests/migrations/Makefile") CONFIG_FILES="$CONFIG_FILES tests/migrations/Makefile" ;;
-    "tests/gpgsm/Makefile") CONFIG_FILES="$CONFIG_FILES tests/gpgsm/Makefile" ;;
+    "tests/tpm2dtests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/tpm2dtests/Makefile" ;;
     "tests/gpgme/Makefile") CONFIG_FILES="$CONFIG_FILES tests/gpgme/Makefile" ;;
     "tests/pkits/Makefile") CONFIG_FILES="$CONFIG_FILES tests/pkits/Makefile" ;;
     "g10/gpg.w32-manifest") CONFIG_FILES="$CONFIG_FILES g10/gpg.w32-manifest" ;;
@@ -18701,7 +18665,7 @@ fi
 echo "
         GnuPG v${VERSION} has been configured as follows:
 
-        Revision:  cbbdb8862  (52157)
+        Revision:  3bf8d7e1b  (15352)
         Platform:  $PRINTABLE_OS_NAME ($host)
 
         OpenPGP:   $build_gpg
diff --git a/configure.ac b/configure.ac
index 3752acd..d03ea3b 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], [1])
+m4_define([mym4_micro], [2])
 
 # 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
@@ -773,7 +773,7 @@ case "${host}" in
         build_wks_tools=no
         ;;
     *-apple-darwin*)
-        AC_DEFINE(_DARWIN_C_SOURCE, 900000L,
+        AC_DEFINE(_DARWIN_C_SOURCE, 1,
                   Expose all libc features (__DARWIN_C_FULL).)
         ;;
     *-*-netbsd*)
@@ -1357,12 +1357,11 @@ fi
 #
 AC_MSG_NOTICE([checking for header files])
 AC_HEADER_STDC
-AC_CHECK_HEADERS([string.h unistd.h langinfo.h termio.h locale.h getopt.h \
-                  pty.h utmp.h pwd.h inttypes.h signal.h sys/select.h     \
-                  stdint.h signal.h util.h libutil.h termios.h \
-                  ucred.h sys/ucred.h sys/sysmacros.h sys/mkdev.h])
-
 AC_HEADER_TIME
+AC_CHECK_HEADERS([unistd.h langinfo.h termio.h locale.h \
+                  pwd.h inttypes.h signal.h sys/select.h     \
+                  stdint.h signal.h termios.h \
+                  ucred.h sys/ucred.h sys/sysmacros.h sys/mkdev.h])
 
 
 #
@@ -1403,7 +1402,6 @@ AC_CHECK_SIZEOF(unsigned int)
 AC_CHECK_SIZEOF(unsigned long)
 AC_CHECK_SIZEOF(unsigned long long)
 AC_CHECK_SIZEOF(size_t)
-AC_HEADER_TIME
 AC_CHECK_SIZEOF(time_t,,[[
 #include <stdio.h>
 #if TIME_WITH_SYS_TIME
@@ -1979,7 +1977,7 @@ AC_DEFINE_UNQUOTED(TPM2DAEMON_SOCK_NAME, "S.tpm2daemon",
 AC_DEFINE_UNQUOTED(DIRMNGR_SOCK_NAME, "S.dirmngr",
                    [The name of the dirmngr socket])
 AC_DEFINE_UNQUOTED(DIRMNGR_DEFAULT_KEYSERVER,
-                   "hkps://hkps.pool.sks-keyservers.net",
+                   "hkps://keyserver.ubuntu.com",
       [The default keyserver for dirmngr to use, if none is explicitly given])
 
 AC_DEFINE_UNQUOTED(GPGEXT_GPG, "gpg", [The standard binary file suffix])
@@ -2144,9 +2142,9 @@ doc/Makefile
 tests/Makefile
 tests/gpgscm/Makefile
 tests/openpgp/Makefile
-tests/tpm2dtests/Makefile
+tests/cms/Makefile
 tests/migrations/Makefile
-tests/gpgsm/Makefile
+tests/tpm2dtests/Makefile
 tests/gpgme/Makefile
 tests/pkits/Makefile
 g10/gpg.w32-manifest
diff --git a/dirmngr/Makefile.am b/dirmngr/Makefile.am
index 77ca3f5..f56e59a 100644
--- a/dirmngr/Makefile.am
+++ b/dirmngr/Makefile.am
@@ -76,6 +76,7 @@ endif
 if USE_LDAP
 dirmngr_SOURCES += ldapserver.h ldapserver.c ldap.c w32-ldap-help.h \
                    ldap-wrapper.h ldap-parse-uri.c ldap-parse-uri.h \
+                   ldap-misc.c ldap-misc.h \
                    ks-engine-ldap.c $(ldap_url) ldap-wrapper.c
 ldaplibs = $(LDAPLIBS)
 else
@@ -93,7 +94,7 @@ endif
 dirmngr_LDFLAGS = $(extra_bin_ldflags)
 
 if USE_LDAP
-dirmngr_ldap_SOURCES = dirmngr_ldap.c $(ldap_url)
+dirmngr_ldap_SOURCES = dirmngr_ldap.c ldap-misc.c ldap-misc.h $(ldap_url)
 dirmngr_ldap_CFLAGS = $(GPG_ERROR_CFLAGS) $(LIBGCRYPT_CFLAGS)
 dirmngr_ldap_LDFLAGS =
 dirmngr_ldap_LDADD = $(libcommon) \
@@ -120,7 +121,7 @@ t_common_ldadd = $(libcommon) $(LIBASSUAN_LIBS) $(LIBGCRYPT_LIBS) \
 module_tests = t-http-basic
 
 if USE_LDAP
-module_tests += t-ldap-parse-uri
+module_tests += t-ldap-parse-uri t-ldap-misc
 endif
 
 # Test which need a network connections are only used in maintainer mode.
@@ -156,16 +157,23 @@ t_http_basic_CFLAGS  = -DWITHOUT_NPTH=1  $(USE_C99_CFLAGS) \
 t_http_basic_LDADD   = $(t_common_ldadd) \
 	         $(NTBTLS_LIBS) $(KSBA_LIBS) $(LIBGNUTLS_LIBS) $(DNSLIBS)
 
-
 t_ldap_parse_uri_SOURCES = \
 	t-ldap-parse-uri.c ldap-parse-uri.c ldap-parse-uri.h \
-        http.c http-common.c dns-stuff.c \
+        http.c http-common.c dns-stuff.c ldap-misc.c \
         $(ldap_url) $(t_common_src)
 t_ldap_parse_uri_CFLAGS = -DWITHOUT_NPTH=1  $(USE_C99_CFLAGS) \
 			  $(LIBGCRYPT_CFLAGS) \
                           $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS)
 t_ldap_parse_uri_LDADD = $(ldaplibs) $(t_common_ldadd) $(DNSLIBS)
 
+t_ldap_misc_SOURCES = t-ldap-misc.c ldap-misc.c ldap-misc.h $(ldap_url)
+t_ldap_misc_CFLAGS = -DWITHOUT_NPTH=1 $(GPG_ERROR_CFLAGS) $(LIBGCRYPT_CFLAGS)
+t_ldap_misc_LDFLAGS =
+t_ldap_misc_LDADD = $(libcommon) \
+		     $(GPG_ERROR_LIBS) $(LIBGCRYPT_LIBS) $(LDAPLIBS) \
+		     $(LBER_LIBS) $(LIBINTL) $(LIBICONV) $(NETLIBS)
+
+
 t_dns_stuff_CFLAGS = -DWITHOUT_NPTH=1  $(USE_C99_CFLAGS) \
 		     $(LIBGCRYPT_CFLAGS) \
 	             $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS)
diff --git a/dirmngr/Makefile.in b/dirmngr/Makefile.in
index c2eb147..087a260 100644
--- a/dirmngr/Makefile.in
+++ b/dirmngr/Makefile.in
@@ -154,11 +154,12 @@ noinst_PROGRAMS = $(am__EXEEXT_2) $(am__EXEEXT_3) $(am__EXEEXT_4)
 @USE_LIBDNS_TRUE@am__append_9 = dns.c dns.h
 @USE_LDAP_TRUE@am__append_10 = ldapserver.h ldapserver.c ldap.c w32-ldap-help.h \
 @USE_LDAP_TRUE@                   ldap-wrapper.h ldap-parse-uri.c ldap-parse-uri.h \
+@USE_LDAP_TRUE@                   ldap-misc.c ldap-misc.h \
 @USE_LDAP_TRUE@                   ks-engine-ldap.c $(ldap_url) ldap-wrapper.c
 
 @USE_LDAP_TRUE@am__append_11 = $(ldaplibs)
 @USE_LIBDNS_TRUE@am__append_12 = dns.c dns.h
-@USE_LDAP_TRUE@am__append_13 = t-ldap-parse-uri
+@USE_LDAP_TRUE@am__append_13 = t-ldap-parse-uri t-ldap-misc
 subdir = dirmngr
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/autobuild.m4 \
@@ -184,7 +185,8 @@ CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" \
 	"$(DESTDIR)$(pkgdatadir)"
-@USE_LDAP_TRUE@am__EXEEXT_1 = t-ldap-parse-uri$(EXEEXT)
+@USE_LDAP_TRUE@am__EXEEXT_1 = t-ldap-parse-uri$(EXEEXT) \
+@USE_LDAP_TRUE@	t-ldap-misc$(EXEEXT)
 am__EXEEXT_2 = t-http-basic$(EXEEXT) $(am__EXEEXT_1)
 @MAINTAINER_MODE_TRUE@am__EXEEXT_3 = t-dns-stuff$(EXEEXT)
 @MAINTAINER_MODE_TRUE@am__EXEEXT_4 = t-http$(EXEEXT)
@@ -198,12 +200,12 @@ am__dirmngr_SOURCES_DIST = dirmngr.c dirmngr.h server.c crlcache.c \
 	ks-engine.h ks-engine-hkp.c ks-engine-http.c \
 	ks-engine-finger.c ks-engine-kdns.c dns.c dns.h ldapserver.h \
 	ldapserver.c ldap.c w32-ldap-help.h ldap-wrapper.h \
-	ldap-parse-uri.c ldap-parse-uri.h ks-engine-ldap.c ldap-url.h \
-	ldap-url.c ldap-wrapper.c
+	ldap-parse-uri.c ldap-parse-uri.h ldap-misc.c ldap-misc.h \
+	ks-engine-ldap.c ldap-url.h ldap-url.c ldap-wrapper.c
 @USE_LIBDNS_TRUE@am__objects_1 = dns.$(OBJEXT)
 @HAVE_W32_SYSTEM_TRUE@am__objects_2 = ldap-url.$(OBJEXT)
 @USE_LDAP_TRUE@am__objects_3 = ldapserver.$(OBJEXT) ldap.$(OBJEXT) \
-@USE_LDAP_TRUE@	ldap-parse-uri.$(OBJEXT) \
+@USE_LDAP_TRUE@	ldap-parse-uri.$(OBJEXT) ldap-misc.$(OBJEXT) \
 @USE_LDAP_TRUE@	ks-engine-ldap.$(OBJEXT) $(am__objects_2) \
 @USE_LDAP_TRUE@	ldap-wrapper.$(OBJEXT)
 am_dirmngr_OBJECTS = dirmngr.$(OBJEXT) server.$(OBJEXT) \
@@ -235,10 +237,12 @@ dirmngr_client_DEPENDENCIES = $(libcommon) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
 dirmngr_client_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(dirmngr_client_LDFLAGS) $(LDFLAGS) -o $@
-am__dirmngr_ldap_SOURCES_DIST = dirmngr_ldap.c ldap-url.h ldap-url.c
+am__dirmngr_ldap_SOURCES_DIST = dirmngr_ldap.c ldap-misc.c ldap-misc.h \
+	ldap-url.h ldap-url.c
 @HAVE_W32_SYSTEM_TRUE@am__objects_4 = dirmngr_ldap-ldap-url.$(OBJEXT)
 @USE_LDAP_TRUE@am_dirmngr_ldap_OBJECTS =  \
 @USE_LDAP_TRUE@	dirmngr_ldap-dirmngr_ldap.$(OBJEXT) \
+@USE_LDAP_TRUE@	dirmngr_ldap-ldap-misc.$(OBJEXT) \
 @USE_LDAP_TRUE@	$(am__objects_4)
 dirmngr_ldap_OBJECTS = $(am_dirmngr_ldap_OBJECTS)
 @USE_LDAP_TRUE@dirmngr_ldap_DEPENDENCIES = $(libcommon) \
@@ -291,22 +295,35 @@ t_http_basic_DEPENDENCIES = $(am__DEPENDENCIES_4) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 t_http_basic_LINK = $(CCLD) $(t_http_basic_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+am__t_ldap_misc_SOURCES_DIST = t-ldap-misc.c ldap-misc.c ldap-misc.h \
+	ldap-url.h ldap-url.c
+@HAVE_W32_SYSTEM_TRUE@am__objects_11 = t_ldap_misc-ldap-url.$(OBJEXT)
+am_t_ldap_misc_OBJECTS = t_ldap_misc-t-ldap-misc.$(OBJEXT) \
+	t_ldap_misc-ldap-misc.$(OBJEXT) $(am__objects_11)
+t_ldap_misc_OBJECTS = $(am_t_ldap_misc_OBJECTS)
+t_ldap_misc_DEPENDENCIES = $(libcommon) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+t_ldap_misc_LINK = $(CCLD) $(t_ldap_misc_CFLAGS) $(CFLAGS) \
+	$(t_ldap_misc_LDFLAGS) $(LDFLAGS) -o $@
 am__t_ldap_parse_uri_SOURCES_DIST = t-ldap-parse-uri.c \
 	ldap-parse-uri.c ldap-parse-uri.h http.c http-common.c \
-	dns-stuff.c ldap-url.h ldap-url.c t-support.h t-support.c \
-	dns.c dns.h
-@HAVE_W32_SYSTEM_TRUE@am__objects_11 =  \
+	dns-stuff.c ldap-misc.c ldap-url.h ldap-url.c t-support.h \
+	t-support.c dns.c dns.h
+@HAVE_W32_SYSTEM_TRUE@am__objects_12 =  \
 @HAVE_W32_SYSTEM_TRUE@	t_ldap_parse_uri-ldap-url.$(OBJEXT)
-@USE_LIBDNS_TRUE@am__objects_12 = t_ldap_parse_uri-dns.$(OBJEXT)
-am__objects_13 = t_ldap_parse_uri-t-support.$(OBJEXT) \
-	$(am__objects_12)
+@USE_LIBDNS_TRUE@am__objects_13 = t_ldap_parse_uri-dns.$(OBJEXT)
+am__objects_14 = t_ldap_parse_uri-t-support.$(OBJEXT) \
+	$(am__objects_13)
 am_t_ldap_parse_uri_OBJECTS =  \
 	t_ldap_parse_uri-t-ldap-parse-uri.$(OBJEXT) \
 	t_ldap_parse_uri-ldap-parse-uri.$(OBJEXT) \
 	t_ldap_parse_uri-http.$(OBJEXT) \
 	t_ldap_parse_uri-http-common.$(OBJEXT) \
-	t_ldap_parse_uri-dns-stuff.$(OBJEXT) $(am__objects_11) \
-	$(am__objects_13)
+	t_ldap_parse_uri-dns-stuff.$(OBJEXT) \
+	t_ldap_parse_uri-ldap-misc.$(OBJEXT) $(am__objects_12) \
+	$(am__objects_14)
 t_ldap_parse_uri_OBJECTS = $(am_t_ldap_parse_uri_OBJECTS)
 t_ldap_parse_uri_DEPENDENCIES = $(am__DEPENDENCIES_2) \
 	$(am__DEPENDENCIES_4) $(am__DEPENDENCIES_1)
@@ -331,17 +348,18 @@ am__depfiles_remade = ./$(DEPDIR)/cdblib.Po ./$(DEPDIR)/certcache.Po \
 	./$(DEPDIR)/crlcache.Po ./$(DEPDIR)/crlfetch.Po \
 	./$(DEPDIR)/dirmngr-client.Po ./$(DEPDIR)/dirmngr.Po \
 	./$(DEPDIR)/dirmngr_ldap-dirmngr_ldap.Po \
+	./$(DEPDIR)/dirmngr_ldap-ldap-misc.Po \
 	./$(DEPDIR)/dirmngr_ldap-ldap-url.Po ./$(DEPDIR)/dns-stuff.Po \
 	./$(DEPDIR)/dns.Po ./$(DEPDIR)/domaininfo.Po \
 	./$(DEPDIR)/http-common.Po ./$(DEPDIR)/http-ntbtls.Po \
 	./$(DEPDIR)/http.Po ./$(DEPDIR)/ks-action.Po \
 	./$(DEPDIR)/ks-engine-finger.Po ./$(DEPDIR)/ks-engine-hkp.Po \
 	./$(DEPDIR)/ks-engine-http.Po ./$(DEPDIR)/ks-engine-kdns.Po \
-	./$(DEPDIR)/ks-engine-ldap.Po ./$(DEPDIR)/ldap-parse-uri.Po \
-	./$(DEPDIR)/ldap-url.Po ./$(DEPDIR)/ldap-wrapper.Po \
-	./$(DEPDIR)/ldap.Po ./$(DEPDIR)/ldapserver.Po \
-	./$(DEPDIR)/loadswdb.Po ./$(DEPDIR)/misc.Po \
-	./$(DEPDIR)/ocsp.Po ./$(DEPDIR)/server.Po \
+	./$(DEPDIR)/ks-engine-ldap.Po ./$(DEPDIR)/ldap-misc.Po \
+	./$(DEPDIR)/ldap-parse-uri.Po ./$(DEPDIR)/ldap-url.Po \
+	./$(DEPDIR)/ldap-wrapper.Po ./$(DEPDIR)/ldap.Po \
+	./$(DEPDIR)/ldapserver.Po ./$(DEPDIR)/loadswdb.Po \
+	./$(DEPDIR)/misc.Po ./$(DEPDIR)/ocsp.Po ./$(DEPDIR)/server.Po \
 	./$(DEPDIR)/t_dns_stuff-dns-stuff.Po \
 	./$(DEPDIR)/t_dns_stuff-dns.Po \
 	./$(DEPDIR)/t_dns_stuff-t-dns-stuff.Po \
@@ -355,10 +373,14 @@ am__depfiles_remade = ./$(DEPDIR)/cdblib.Po ./$(DEPDIR)/certcache.Po \
 	./$(DEPDIR)/t_http_basic-http.Po \
 	./$(DEPDIR)/t_http_basic-t-http-basic.Po \
 	./$(DEPDIR)/t_http_basic-t-support.Po \
+	./$(DEPDIR)/t_ldap_misc-ldap-misc.Po \
+	./$(DEPDIR)/t_ldap_misc-ldap-url.Po \
+	./$(DEPDIR)/t_ldap_misc-t-ldap-misc.Po \
 	./$(DEPDIR)/t_ldap_parse_uri-dns-stuff.Po \
 	./$(DEPDIR)/t_ldap_parse_uri-dns.Po \
 	./$(DEPDIR)/t_ldap_parse_uri-http-common.Po \
 	./$(DEPDIR)/t_ldap_parse_uri-http.Po \
+	./$(DEPDIR)/t_ldap_parse_uri-ldap-misc.Po \
 	./$(DEPDIR)/t_ldap_parse_uri-ldap-parse-uri.Po \
 	./$(DEPDIR)/t_ldap_parse_uri-ldap-url.Po \
 	./$(DEPDIR)/t_ldap_parse_uri-t-ldap-parse-uri.Po \
@@ -384,11 +406,12 @@ am__v_CCLD_1 =
 SOURCES = $(dirmngr_SOURCES) $(dirmngr_client_SOURCES) \
 	$(dirmngr_ldap_SOURCES) $(t_dns_stuff_SOURCES) \
 	$(t_http_SOURCES) $(t_http_basic_SOURCES) \
-	$(t_ldap_parse_uri_SOURCES)
+	$(t_ldap_misc_SOURCES) $(t_ldap_parse_uri_SOURCES)
 DIST_SOURCES = $(am__dirmngr_SOURCES_DIST) $(dirmngr_client_SOURCES) \
 	$(am__dirmngr_ldap_SOURCES_DIST) \
 	$(am__t_dns_stuff_SOURCES_DIST) $(am__t_http_SOURCES_DIST) \
 	$(am__t_http_basic_SOURCES_DIST) \
+	$(am__t_ldap_misc_SOURCES_DIST) \
 	$(am__t_ldap_parse_uri_SOURCES_DIST)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
@@ -710,7 +733,7 @@ dirmngr_LDADD = $(libcommonpth) $(DNSLIBS) $(LIBASSUAN_LIBS) \
 	$(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV) $(NETLIBS) \
 	$(am__append_11)
 dirmngr_LDFLAGS = $(extra_bin_ldflags)
-@USE_LDAP_TRUE@dirmngr_ldap_SOURCES = dirmngr_ldap.c $(ldap_url)
+@USE_LDAP_TRUE@dirmngr_ldap_SOURCES = dirmngr_ldap.c ldap-misc.c ldap-misc.h $(ldap_url)
 @USE_LDAP_TRUE@dirmngr_ldap_CFLAGS = $(GPG_ERROR_CFLAGS) $(LIBGCRYPT_CFLAGS)
 @USE_LDAP_TRUE@dirmngr_ldap_LDFLAGS = 
 @USE_LDAP_TRUE@dirmngr_ldap_LDADD = $(libcommon) \
@@ -762,7 +785,7 @@ t_http_basic_LDADD = $(t_common_ldadd) \
 
 t_ldap_parse_uri_SOURCES = \
 	t-ldap-parse-uri.c ldap-parse-uri.c ldap-parse-uri.h \
-        http.c http-common.c dns-stuff.c \
+        http.c http-common.c dns-stuff.c ldap-misc.c \
         $(ldap_url) $(t_common_src)
 
 t_ldap_parse_uri_CFLAGS = -DWITHOUT_NPTH=1  $(USE_C99_CFLAGS) \
@@ -770,6 +793,13 @@ t_ldap_parse_uri_CFLAGS = -DWITHOUT_NPTH=1  $(USE_C99_CFLAGS) \
                           $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS)
 
 t_ldap_parse_uri_LDADD = $(ldaplibs) $(t_common_ldadd) $(DNSLIBS)
+t_ldap_misc_SOURCES = t-ldap-misc.c ldap-misc.c ldap-misc.h $(ldap_url)
+t_ldap_misc_CFLAGS = -DWITHOUT_NPTH=1 $(GPG_ERROR_CFLAGS) $(LIBGCRYPT_CFLAGS)
+t_ldap_misc_LDFLAGS = 
+t_ldap_misc_LDADD = $(libcommon) \
+		     $(GPG_ERROR_LIBS) $(LIBGCRYPT_LIBS) $(LDAPLIBS) \
+		     $(LBER_LIBS) $(LIBINTL) $(LIBICONV) $(NETLIBS)
+
 t_dns_stuff_CFLAGS = -DWITHOUT_NPTH=1  $(USE_C99_CFLAGS) \
 		     $(LIBGCRYPT_CFLAGS) \
 	             $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS)
@@ -922,6 +952,10 @@ t-http-basic$(EXEEXT): $(t_http_basic_OBJECTS) $(t_http_basic_DEPENDENCIES) $(EX
 	@rm -f t-http-basic$(EXEEXT)
 	$(AM_V_CCLD)$(t_http_basic_LINK) $(t_http_basic_OBJECTS) $(t_http_basic_LDADD) $(LIBS)
 
+t-ldap-misc$(EXEEXT): $(t_ldap_misc_OBJECTS) $(t_ldap_misc_DEPENDENCIES) $(EXTRA_t_ldap_misc_DEPENDENCIES) 
+	@rm -f t-ldap-misc$(EXEEXT)
+	$(AM_V_CCLD)$(t_ldap_misc_LINK) $(t_ldap_misc_OBJECTS) $(t_ldap_misc_LDADD) $(LIBS)
+
 t-ldap-parse-uri$(EXEEXT): $(t_ldap_parse_uri_OBJECTS) $(t_ldap_parse_uri_DEPENDENCIES) $(EXTRA_t_ldap_parse_uri_DEPENDENCIES) 
 	@rm -f t-ldap-parse-uri$(EXEEXT)
 	$(AM_V_CCLD)$(t_ldap_parse_uri_LINK) $(t_ldap_parse_uri_OBJECTS) $(t_ldap_parse_uri_LDADD) $(LIBS)
@@ -939,6 +973,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dirmngr-client.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dirmngr.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dirmngr_ldap-dirmngr_ldap.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dirmngr_ldap-ldap-misc.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dirmngr_ldap-ldap-url.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dns-stuff.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dns.Po@am__quote@ # am--include-marker
@@ -952,6 +987,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ks-engine-http.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ks-engine-kdns.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ks-engine-ldap.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ldap-misc.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ldap-parse-uri.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ldap-url.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ldap-wrapper.Po@am__quote@ # am--include-marker
@@ -977,10 +1013,14 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_http_basic-http.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_http_basic-t-http-basic.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_http_basic-t-support.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_ldap_misc-ldap-misc.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_ldap_misc-ldap-url.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_ldap_misc-t-ldap-misc.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_ldap_parse_uri-dns-stuff.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_ldap_parse_uri-dns.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_ldap_parse_uri-http-common.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_ldap_parse_uri-http.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_ldap_parse_uri-ldap-misc.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_ldap_parse_uri-ldap-parse-uri.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_ldap_parse_uri-ldap-url.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_ldap_parse_uri-t-ldap-parse-uri.Po@am__quote@ # am--include-marker
@@ -1022,6 +1062,20 @@ dirmngr_ldap-dirmngr_ldap.obj: dirmngr_ldap.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(dirmngr_ldap_CFLAGS) $(CFLAGS) -c -o dirmngr_ldap-dirmngr_ldap.obj `if test -f 'dirmngr_ldap.c'; then $(CYGPATH_W) 'dirmngr_ldap.c'; else $(CYGPATH_W) '$(srcdir)/dirmngr_ldap.c'; fi`
 
+dirmngr_ldap-ldap-misc.o: ldap-misc.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(dirmngr_ldap_CFLAGS) $(CFLAGS) -MT dirmngr_ldap-ldap-misc.o -MD -MP -MF $(DEPDIR)/dirmngr_ldap-ldap-misc.Tpo -c -o dirmngr_ldap-ldap-misc.o `test -f 'ldap-misc.c' || echo '$(srcdir)/'`ldap-misc.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/dirmngr_ldap-ldap-misc.Tpo $(DEPDIR)/dirmngr_ldap-ldap-misc.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ldap-misc.c' object='dirmngr_ldap-ldap-misc.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(dirmngr_ldap_CFLAGS) $(CFLAGS) -c -o dirmngr_ldap-ldap-misc.o `test -f 'ldap-misc.c' || echo '$(srcdir)/'`ldap-misc.c
+
+dirmngr_ldap-ldap-misc.obj: ldap-misc.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(dirmngr_ldap_CFLAGS) $(CFLAGS) -MT dirmngr_ldap-ldap-misc.obj -MD -MP -MF $(DEPDIR)/dirmngr_ldap-ldap-misc.Tpo -c -o dirmngr_ldap-ldap-misc.obj `if test -f 'ldap-misc.c'; then $(CYGPATH_W) 'ldap-misc.c'; else $(CYGPATH_W) '$(srcdir)/ldap-misc.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/dirmngr_ldap-ldap-misc.Tpo $(DEPDIR)/dirmngr_ldap-ldap-misc.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ldap-misc.c' object='dirmngr_ldap-ldap-misc.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(dirmngr_ldap_CFLAGS) $(CFLAGS) -c -o dirmngr_ldap-ldap-misc.obj `if test -f 'ldap-misc.c'; then $(CYGPATH_W) 'ldap-misc.c'; else $(CYGPATH_W) '$(srcdir)/ldap-misc.c'; fi`
+
 dirmngr_ldap-ldap-url.o: ldap-url.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(dirmngr_ldap_CFLAGS) $(CFLAGS) -MT dirmngr_ldap-ldap-url.o -MD -MP -MF $(DEPDIR)/dirmngr_ldap-ldap-url.Tpo -c -o dirmngr_ldap-ldap-url.o `test -f 'ldap-url.c' || echo '$(srcdir)/'`ldap-url.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/dirmngr_ldap-ldap-url.Tpo $(DEPDIR)/dirmngr_ldap-ldap-url.Po
@@ -1260,6 +1314,48 @@ t_http_basic-http-common.obj: http-common.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_http_basic_CFLAGS) $(CFLAGS) -c -o t_http_basic-http-common.obj `if test -f 'http-common.c'; then $(CYGPATH_W) 'http-common.c'; else $(CYGPATH_W) '$(srcdir)/http-common.c'; fi`
 
+t_ldap_misc-t-ldap-misc.o: t-ldap-misc.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_ldap_misc_CFLAGS) $(CFLAGS) -MT t_ldap_misc-t-ldap-misc.o -MD -MP -MF $(DEPDIR)/t_ldap_misc-t-ldap-misc.Tpo -c -o t_ldap_misc-t-ldap-misc.o `test -f 't-ldap-misc.c' || echo '$(srcdir)/'`t-ldap-misc.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/t_ldap_misc-t-ldap-misc.Tpo $(DEPDIR)/t_ldap_misc-t-ldap-misc.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='t-ldap-misc.c' object='t_ldap_misc-t-ldap-misc.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_ldap_misc_CFLAGS) $(CFLAGS) -c -o t_ldap_misc-t-ldap-misc.o `test -f 't-ldap-misc.c' || echo '$(srcdir)/'`t-ldap-misc.c
+
+t_ldap_misc-t-ldap-misc.obj: t-ldap-misc.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_ldap_misc_CFLAGS) $(CFLAGS) -MT t_ldap_misc-t-ldap-misc.obj -MD -MP -MF $(DEPDIR)/t_ldap_misc-t-ldap-misc.Tpo -c -o t_ldap_misc-t-ldap-misc.obj `if test -f 't-ldap-misc.c'; then $(CYGPATH_W) 't-ldap-misc.c'; else $(CYGPATH_W) '$(srcdir)/t-ldap-misc.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/t_ldap_misc-t-ldap-misc.Tpo $(DEPDIR)/t_ldap_misc-t-ldap-misc.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='t-ldap-misc.c' object='t_ldap_misc-t-ldap-misc.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_ldap_misc_CFLAGS) $(CFLAGS) -c -o t_ldap_misc-t-ldap-misc.obj `if test -f 't-ldap-misc.c'; then $(CYGPATH_W) 't-ldap-misc.c'; else $(CYGPATH_W) '$(srcdir)/t-ldap-misc.c'; fi`
+
+t_ldap_misc-ldap-misc.o: ldap-misc.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_ldap_misc_CFLAGS) $(CFLAGS) -MT t_ldap_misc-ldap-misc.o -MD -MP -MF $(DEPDIR)/t_ldap_misc-ldap-misc.Tpo -c -o t_ldap_misc-ldap-misc.o `test -f 'ldap-misc.c' || echo '$(srcdir)/'`ldap-misc.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/t_ldap_misc-ldap-misc.Tpo $(DEPDIR)/t_ldap_misc-ldap-misc.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ldap-misc.c' object='t_ldap_misc-ldap-misc.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_ldap_misc_CFLAGS) $(CFLAGS) -c -o t_ldap_misc-ldap-misc.o `test -f 'ldap-misc.c' || echo '$(srcdir)/'`ldap-misc.c
+
+t_ldap_misc-ldap-misc.obj: ldap-misc.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_ldap_misc_CFLAGS) $(CFLAGS) -MT t_ldap_misc-ldap-misc.obj -MD -MP -MF $(DEPDIR)/t_ldap_misc-ldap-misc.Tpo -c -o t_ldap_misc-ldap-misc.obj `if test -f 'ldap-misc.c'; then $(CYGPATH_W) 'ldap-misc.c'; else $(CYGPATH_W) '$(srcdir)/ldap-misc.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/t_ldap_misc-ldap-misc.Tpo $(DEPDIR)/t_ldap_misc-ldap-misc.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ldap-misc.c' object='t_ldap_misc-ldap-misc.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_ldap_misc_CFLAGS) $(CFLAGS) -c -o t_ldap_misc-ldap-misc.obj `if test -f 'ldap-misc.c'; then $(CYGPATH_W) 'ldap-misc.c'; else $(CYGPATH_W) '$(srcdir)/ldap-misc.c'; fi`
+
+t_ldap_misc-ldap-url.o: ldap-url.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_ldap_misc_CFLAGS) $(CFLAGS) -MT t_ldap_misc-ldap-url.o -MD -MP -MF $(DEPDIR)/t_ldap_misc-ldap-url.Tpo -c -o t_ldap_misc-ldap-url.o `test -f 'ldap-url.c' || echo '$(srcdir)/'`ldap-url.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/t_ldap_misc-ldap-url.Tpo $(DEPDIR)/t_ldap_misc-ldap-url.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ldap-url.c' object='t_ldap_misc-ldap-url.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_ldap_misc_CFLAGS) $(CFLAGS) -c -o t_ldap_misc-ldap-url.o `test -f 'ldap-url.c' || echo '$(srcdir)/'`ldap-url.c
+
+t_ldap_misc-ldap-url.obj: ldap-url.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_ldap_misc_CFLAGS) $(CFLAGS) -MT t_ldap_misc-ldap-url.obj -MD -MP -MF $(DEPDIR)/t_ldap_misc-ldap-url.Tpo -c -o t_ldap_misc-ldap-url.obj `if test -f 'ldap-url.c'; then $(CYGPATH_W) 'ldap-url.c'; else $(CYGPATH_W) '$(srcdir)/ldap-url.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/t_ldap_misc-ldap-url.Tpo $(DEPDIR)/t_ldap_misc-ldap-url.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ldap-url.c' object='t_ldap_misc-ldap-url.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_ldap_misc_CFLAGS) $(CFLAGS) -c -o t_ldap_misc-ldap-url.obj `if test -f 'ldap-url.c'; then $(CYGPATH_W) 'ldap-url.c'; else $(CYGPATH_W) '$(srcdir)/ldap-url.c'; fi`
+
 t_ldap_parse_uri-t-ldap-parse-uri.o: t-ldap-parse-uri.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_ldap_parse_uri_CFLAGS) $(CFLAGS) -MT t_ldap_parse_uri-t-ldap-parse-uri.o -MD -MP -MF $(DEPDIR)/t_ldap_parse_uri-t-ldap-parse-uri.Tpo -c -o t_ldap_parse_uri-t-ldap-parse-uri.o `test -f 't-ldap-parse-uri.c' || echo '$(srcdir)/'`t-ldap-parse-uri.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/t_ldap_parse_uri-t-ldap-parse-uri.Tpo $(DEPDIR)/t_ldap_parse_uri-t-ldap-parse-uri.Po
@@ -1330,6 +1426,20 @@ t_ldap_parse_uri-dns-stuff.obj: dns-stuff.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_ldap_parse_uri_CFLAGS) $(CFLAGS) -c -o t_ldap_parse_uri-dns-stuff.obj `if test -f 'dns-stuff.c'; then $(CYGPATH_W) 'dns-stuff.c'; else $(CYGPATH_W) '$(srcdir)/dns-stuff.c'; fi`
 
+t_ldap_parse_uri-ldap-misc.o: ldap-misc.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_ldap_parse_uri_CFLAGS) $(CFLAGS) -MT t_ldap_parse_uri-ldap-misc.o -MD -MP -MF $(DEPDIR)/t_ldap_parse_uri-ldap-misc.Tpo -c -o t_ldap_parse_uri-ldap-misc.o `test -f 'ldap-misc.c' || echo '$(srcdir)/'`ldap-misc.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/t_ldap_parse_uri-ldap-misc.Tpo $(DEPDIR)/t_ldap_parse_uri-ldap-misc.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ldap-misc.c' object='t_ldap_parse_uri-ldap-misc.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_ldap_parse_uri_CFLAGS) $(CFLAGS) -c -o t_ldap_parse_uri-ldap-misc.o `test -f 'ldap-misc.c' || echo '$(srcdir)/'`ldap-misc.c
+
+t_ldap_parse_uri-ldap-misc.obj: ldap-misc.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_ldap_parse_uri_CFLAGS) $(CFLAGS) -MT t_ldap_parse_uri-ldap-misc.obj -MD -MP -MF $(DEPDIR)/t_ldap_parse_uri-ldap-misc.Tpo -c -o t_ldap_parse_uri-ldap-misc.obj `if test -f 'ldap-misc.c'; then $(CYGPATH_W) 'ldap-misc.c'; else $(CYGPATH_W) '$(srcdir)/ldap-misc.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/t_ldap_parse_uri-ldap-misc.Tpo $(DEPDIR)/t_ldap_parse_uri-ldap-misc.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ldap-misc.c' object='t_ldap_parse_uri-ldap-misc.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_ldap_parse_uri_CFLAGS) $(CFLAGS) -c -o t_ldap_parse_uri-ldap-misc.obj `if test -f 'ldap-misc.c'; then $(CYGPATH_W) 'ldap-misc.c'; else $(CYGPATH_W) '$(srcdir)/ldap-misc.c'; fi`
+
 t_ldap_parse_uri-ldap-url.o: ldap-url.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(t_ldap_parse_uri_CFLAGS) $(CFLAGS) -MT t_ldap_parse_uri-ldap-url.o -MD -MP -MF $(DEPDIR)/t_ldap_parse_uri-ldap-url.Tpo -c -o t_ldap_parse_uri-ldap-url.o `test -f 'ldap-url.c' || echo '$(srcdir)/'`ldap-url.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/t_ldap_parse_uri-ldap-url.Tpo $(DEPDIR)/t_ldap_parse_uri-ldap-url.Po
@@ -1622,6 +1732,7 @@ distclean: distclean-am
 	-rm -f ./$(DEPDIR)/dirmngr-client.Po
 	-rm -f ./$(DEPDIR)/dirmngr.Po
 	-rm -f ./$(DEPDIR)/dirmngr_ldap-dirmngr_ldap.Po
+	-rm -f ./$(DEPDIR)/dirmngr_ldap-ldap-misc.Po
 	-rm -f ./$(DEPDIR)/dirmngr_ldap-ldap-url.Po
 	-rm -f ./$(DEPDIR)/dns-stuff.Po
 	-rm -f ./$(DEPDIR)/dns.Po
@@ -1635,6 +1746,7 @@ distclean: distclean-am
 	-rm -f ./$(DEPDIR)/ks-engine-http.Po
 	-rm -f ./$(DEPDIR)/ks-engine-kdns.Po
 	-rm -f ./$(DEPDIR)/ks-engine-ldap.Po
+	-rm -f ./$(DEPDIR)/ldap-misc.Po
 	-rm -f ./$(DEPDIR)/ldap-parse-uri.Po
 	-rm -f ./$(DEPDIR)/ldap-url.Po
 	-rm -f ./$(DEPDIR)/ldap-wrapper.Po
@@ -1660,10 +1772,14 @@ distclean: distclean-am
 	-rm -f ./$(DEPDIR)/t_http_basic-http.Po
 	-rm -f ./$(DEPDIR)/t_http_basic-t-http-basic.Po
 	-rm -f ./$(DEPDIR)/t_http_basic-t-support.Po
+	-rm -f ./$(DEPDIR)/t_ldap_misc-ldap-misc.Po
+	-rm -f ./$(DEPDIR)/t_ldap_misc-ldap-url.Po
+	-rm -f ./$(DEPDIR)/t_ldap_misc-t-ldap-misc.Po
 	-rm -f ./$(DEPDIR)/t_ldap_parse_uri-dns-stuff.Po
 	-rm -f ./$(DEPDIR)/t_ldap_parse_uri-dns.Po
 	-rm -f ./$(DEPDIR)/t_ldap_parse_uri-http-common.Po
 	-rm -f ./$(DEPDIR)/t_ldap_parse_uri-http.Po
+	-rm -f ./$(DEPDIR)/t_ldap_parse_uri-ldap-misc.Po
 	-rm -f ./$(DEPDIR)/t_ldap_parse_uri-ldap-parse-uri.Po
 	-rm -f ./$(DEPDIR)/t_ldap_parse_uri-ldap-url.Po
 	-rm -f ./$(DEPDIR)/t_ldap_parse_uri-t-ldap-parse-uri.Po
@@ -1722,6 +1838,7 @@ maintainer-clean: maintainer-clean-am
 	-rm -f ./$(DEPDIR)/dirmngr-client.Po
 	-rm -f ./$(DEPDIR)/dirmngr.Po
 	-rm -f ./$(DEPDIR)/dirmngr_ldap-dirmngr_ldap.Po
+	-rm -f ./$(DEPDIR)/dirmngr_ldap-ldap-misc.Po
 	-rm -f ./$(DEPDIR)/dirmngr_ldap-ldap-url.Po
 	-rm -f ./$(DEPDIR)/dns-stuff.Po
 	-rm -f ./$(DEPDIR)/dns.Po
@@ -1735,6 +1852,7 @@ maintainer-clean: maintainer-clean-am
 	-rm -f ./$(DEPDIR)/ks-engine-http.Po
 	-rm -f ./$(DEPDIR)/ks-engine-kdns.Po
 	-rm -f ./$(DEPDIR)/ks-engine-ldap.Po
+	-rm -f ./$(DEPDIR)/ldap-misc.Po
 	-rm -f ./$(DEPDIR)/ldap-parse-uri.Po
 	-rm -f ./$(DEPDIR)/ldap-url.Po
 	-rm -f ./$(DEPDIR)/ldap-wrapper.Po
@@ -1760,10 +1878,14 @@ maintainer-clean: maintainer-clean-am
 	-rm -f ./$(DEPDIR)/t_http_basic-http.Po
 	-rm -f ./$(DEPDIR)/t_http_basic-t-http-basic.Po
 	-rm -f ./$(DEPDIR)/t_http_basic-t-support.Po
+	-rm -f ./$(DEPDIR)/t_ldap_misc-ldap-misc.Po
+	-rm -f ./$(DEPDIR)/t_ldap_misc-ldap-url.Po
+	-rm -f ./$(DEPDIR)/t_ldap_misc-t-ldap-misc.Po
 	-rm -f ./$(DEPDIR)/t_ldap_parse_uri-dns-stuff.Po
 	-rm -f ./$(DEPDIR)/t_ldap_parse_uri-dns.Po
 	-rm -f ./$(DEPDIR)/t_ldap_parse_uri-http-common.Po
 	-rm -f ./$(DEPDIR)/t_ldap_parse_uri-http.Po
+	-rm -f ./$(DEPDIR)/t_ldap_parse_uri-ldap-misc.Po
 	-rm -f ./$(DEPDIR)/t_ldap_parse_uri-ldap-parse-uri.Po
 	-rm -f ./$(DEPDIR)/t_ldap_parse_uri-ldap-url.Po
 	-rm -f ./$(DEPDIR)/t_ldap_parse_uri-t-ldap-parse-uri.Po
diff --git a/dirmngr/certcache.c b/dirmngr/certcache.c
index bee1c44..4c2bf12 100644
--- a/dirmngr/certcache.c
+++ b/dirmngr/certcache.c
@@ -724,11 +724,12 @@ cert_cache_init (strlist_t hkp_cacerts)
   /* Put the special pool certificate into our store.  This is
    * currently only used with ntbtls.  For GnuTLS http_session_new
    * unfortunately loads that certificate directly from the file.  */
-  fname = make_filename_try (gnupg_datadir (),
-                             "sks-keyservers.netCA.pem", NULL);
-  if (fname)
-    load_certs_from_file (fname, CERTTRUST_CLASS_HKPSPOOL, 1);
-  xfree (fname);
+  /* Disabled for 2.3.2 because the service had to be shutdown.  */
+  /* fname = make_filename_try (gnupg_datadir (), */
+  /*                            "sks-keyservers.netCA.pem", NULL); */
+  /* if (fname) */
+  /*   load_certs_from_file (fname, CERTTRUST_CLASS_HKPSPOOL, 1); */
+  /* xfree (fname); */
 
   for (sl = hkp_cacerts; sl; sl = sl->next)
     load_certs_from_file (sl->d, CERTTRUST_CLASS_HKP, 0);
diff --git a/dirmngr/crlcache.c b/dirmngr/crlcache.c
index 9d18b72..d508e17 100644
--- a/dirmngr/crlcache.c
+++ b/dirmngr/crlcache.c
@@ -1725,7 +1725,8 @@ finish_sig_check (ksba_crl_t crl, gcry_md_hd_t md, int algo,
         {
           log_error ("hash algo mismatch: %d announced but %d used\n",
                      algo, hashalgo);
-          return gpg_error (GPG_ERR_INV_CRL);
+          err = gpg_error (GPG_ERR_INV_CRL);
+          goto leave;
         }
       /* Add some restrictions; see ../sm/certcheck.c for details.  */
       switch (algo)
@@ -1741,14 +1742,16 @@ finish_sig_check (ksba_crl_t crl, gcry_md_hd_t md, int algo,
         default:
           log_error ("PSS hash algorithm '%s' rejected\n",
                      gcry_md_algo_name (algo));
-          return gpg_error (GPG_ERR_DIGEST_ALGO);
+          err = gpg_error (GPG_ERR_DIGEST_ALGO);
+          goto leave;
         }
 
       if (gcry_md_get_algo_dlen (algo) != saltlen)
         {
           log_error ("PSS hash algorithm '%s' rejected due to salt length %u\n",
                      gcry_md_algo_name (algo), saltlen);
-          return gpg_error (GPG_ERR_DIGEST_ALGO);
+          err = gpg_error (GPG_ERR_DIGEST_ALGO);
+          goto leave;
         }
     }
 
diff --git a/dirmngr/crlfetch.c b/dirmngr/crlfetch.c
index c8091f6..e355aab 100644
--- a/dirmngr/crlfetch.c
+++ b/dirmngr/crlfetch.c
@@ -240,7 +240,7 @@ crl_fetch (ctrl_t ctrl, const char *url, ksba_reader_t *reader)
       else
         {
 #       if USE_LDAP
-          err = url_fetch_ldap (ctrl, url, NULL, 0, reader);
+          err = url_fetch_ldap (ctrl, url, reader);
 #       else /*!USE_LDAP*/
           err = gpg_error (GPG_ERR_NOT_IMPLEMENTED);
 #       endif /*!USE_LDAP*/
@@ -513,7 +513,7 @@ fetch_cert_by_url (ctrl_t ctrl, const char *url,
   else /* Assume LDAP.  */
     {
 #if USE_LDAP
-      err = url_fetch_ldap (ctrl, url, NULL, 0, &reader);
+      err = url_fetch_ldap (ctrl, url, &reader);
 #else
       (void)ctrl;
       (void)url;
diff --git a/dirmngr/crlfetch.h b/dirmngr/crlfetch.h
index 3822adb..f309653 100644
--- a/dirmngr/crlfetch.h
+++ b/dirmngr/crlfetch.h
@@ -62,8 +62,7 @@ void crl_close_reader (ksba_reader_t reader);
 
 /*-- ldap.c --*/
 gpg_error_t url_fetch_ldap (ctrl_t ctrl,
-                            const char *url, const char *host, int port,
-                            ksba_reader_t *reader);
+                            const char *url, ksba_reader_t *reader);
 gpg_error_t attr_fetch_ldap (ctrl_t ctrl,
                              const char *dn, const char *attr,
                              ksba_reader_t *reader);
diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
index 38ae1c6..330983f 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
@@ -125,6 +125,7 @@ enum cmd_and_opt_values {
   oHTTPProxy,
   oLDAPProxy,
   oOnlyLDAPProxy,
+  oLDAPServer,
   oLDAPFile,
   oLDAPTimeout,
   oLDAPAddServers,
@@ -260,6 +261,8 @@ static gpgrt_opt_t opts[] = {
                 N_("|HOST|use HOST for LDAP queries")),
   ARGPARSE_s_n (oOnlyLDAPProxy, "only-ldap-proxy",
                 N_("do not use fallback hosts with --ldap-proxy")),
+  ARGPARSE_s_s (oLDAPServer, "ldapserver",
+                N_("|SPEC|use this keyserver to lookup keys")),
   ARGPARSE_s_s (oLDAPFile, "ldapserverlist-file",
                 N_("|FILE|read LDAP server list from FILE")),
   ARGPARSE_s_n (oLDAPAddServers, "add-servers",
@@ -378,6 +381,11 @@ static int network_activity_seen;
 /* A list of filenames registered with --hkp-cacert.  */
 static strlist_t hkp_cacert_filenames;
 
+/* A flag used to clear the list of ldapservers iff --ldapserver is
+ * given on the command line or one of the conf files. In this case we
+ * want to clear all old specifications through the legacy
+ * dirmngr_ldapservers.conf. */
+static int ldapserver_list_needs_reset;
 
 /* The timer tick used for housekeeping stuff.  The second constant is used when a shutdown is pending.  */
 #define TIMERTICK_INTERVAL           (60)
@@ -671,6 +679,8 @@ parse_rereadable_options (gpgrt_argparse_t *pargs, int reread)
       set_dns_timeout (0);
       opt.connect_timeout = 0;
       opt.connect_quick_timeout = 0;
+      opt.ldaptimeout = DEFAULT_LDAP_TIMEOUT;
+      ldapserver_list_needs_reset = 1;
       return 1;
     }
 
@@ -759,6 +769,32 @@ parse_rereadable_options (gpgrt_argparse_t *pargs, int reread)
     case oStandardResolver: enable_standard_resolver (1); break;
     case oRecursiveResolver: enable_recursive_resolver (1); break;
 
+    case oLDAPServer:
+#if USE_LDAP
+      {
+        ldap_server_t server;
+        char *p;
+
+        p = pargs->r.ret_str;
+        if (!strncmp (p, "ldap:", 5) && !(p[5] == '/' && p[6] == '/'))
+          p += 5;
+
+        server = ldapserver_parse_one (p, NULL, 0);
+        if (server)
+          {
+            if (ldapserver_list_needs_reset)
+              {
+                ldapserver_list_needs_reset = 0;
+                ldapserver_list_free (opt.ldapservers);
+                opt.ldapservers = NULL;
+              }
+            server->next = opt.ldapservers;
+            opt.ldapservers = server;
+          }
+      }
+#endif
+      break;
+
     case oKeyServer:
       if (*pargs->r.ret_str)
         add_to_strlist (&opt.keyserver, pargs->r.ret_str);
@@ -780,6 +816,10 @@ parse_rereadable_options (gpgrt_argparse_t *pargs, int reread)
       opt.connect_quick_timeout = pargs->r.ret_ulong * 1000;
       break;
 
+    case oLDAPTimeout:
+      opt.ldaptimeout = pargs->r.ret_int;
+      break;
+
     default:
       return 0; /* Not handled. */
     }
@@ -1035,9 +1075,6 @@ main (int argc, char **argv)
 #        endif /*USE_LDAP*/
           break;
 	case oLDAPAddServers: opt.add_new_ldapservers = 1; break;
-	case oLDAPTimeout:
-	  opt.ldaptimeout = pargs.r.ret_int;
-	  break;
 
         case oFakedSystemTime:
           gnupg_set_time ((time_t)pargs.r.ret_ulong, 0);
@@ -1133,9 +1170,11 @@ main (int argc, char **argv)
   if (cmd != aGPGConfTest && cmd != aGPGConfList && cmd != aGPGConfVersions)
     set_tor_mode ();
 
-  /* Get LDAP server list from file. */
+  /* Get LDAP server list from file unless --ldapserver has been used.  */
 #if USE_LDAP
-  if (!ldapfile)
+  if (opt.ldapservers)
+    ;
+  else if (!ldapfile)
     {
       ldapfile = make_filename (gnupg_homedir (),
                                 "dirmngr_ldapservers.conf",
diff --git a/dirmngr/dirmngr.h b/dirmngr/dirmngr.h
index 92d9d4b..498a3d7 100644
--- a/dirmngr/dirmngr.h
+++ b/dirmngr/dirmngr.h
@@ -50,7 +50,9 @@ struct ldap_server_s
   char *user;
   char *pass;
   char *base;
-  unsigned int use_ldaps:1;
+  unsigned int starttls:1;       /* Use STARTTLS.  */
+  unsigned int ldap_over_tls:1;  /* Use LDAP over an TLS tunnel */
+  unsigned int ntds:1;           /* Use Active Directory authentication.  */
 };
 typedef struct ldap_server_s *ldap_server_t;
 
diff --git a/dirmngr/dirmngr_ldap.c b/dirmngr/dirmngr_ldap.c
index 7d19410..9c9fcc5 100644
--- a/dirmngr/dirmngr_ldap.c
+++ b/dirmngr/dirmngr_ldap.c
@@ -1,5 +1,5 @@
 /* dirmngr-ldap.c  -  The LDAP helper for dirmngr.
- * Copyright (C) 2004 g10 Code GmbH
+ * Copyright (C) 2004, 2021 g10 Code GmbH
  * Copyright (C) 2010 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
@@ -52,10 +52,10 @@
 #include "../common/stringhelp.h"
 #include "../common/mischelp.h"
 #include "../common/strlist.h"
-
-#include "../common/i18n.h"
 #include "../common/util.h"
 #include "../common/init.h"
+#include "ldap-misc.h"
+
 
 /* There is no need for the npth_unprotect and leave functions here;
  * thus we redefine them to nops.  We keep them in the code just for
@@ -87,11 +87,11 @@ enum
     oUser,
     oPass,
     oEnvPass,
-    oDN,
-    oFilter,
+    oBase,
     oAttr,
-    oTls,
-
+    oStartTLS,
+    oLdapTLS,
+    oNtds,
     oOnlySearchTimeout,
     oLogWithPID
   };
@@ -99,40 +99,41 @@ enum
 
 /* The list of options as used by the argparse.c code.  */
 static gpgrt_opt_t opts[] = {
-  { oVerbose,  "verbose",   0, N_("verbose") },
-  { oQuiet,    "quiet",     0, N_("be somewhat more quiet") },
-  { oTimeout,  "timeout",   1, N_("|N|set LDAP timeout to N seconds")},
-  { oMulti,    "multi",     0, N_("return all values in"
-                                  " a record oriented format")},
+  { oVerbose,  "verbose",   0, "verbose" },
+  { oQuiet,    "quiet",     0, "be somewhat more quiet" },
+  { oTimeout,  "timeout",   1, "|N|set LDAP timeout to N seconds"},
+  { oMulti,    "multi",     0, "return all values in"
+                               " a record oriented format"},
   { oProxy,    "proxy",     2,
-    N_("|NAME|ignore host part and connect through NAME")},
-  { oTls,      "tls",       0, N_("force a TLS connection")},
-  { oHost,     "host",      2, N_("|NAME|connect to host NAME")},
-  { oPort,     "port",      1, N_("|N|connect to port N")},
-  { oUser,     "user",      2, N_("|NAME|use user NAME for authentication")},
-  { oPass,     "pass",      2, N_("|PASS|use password PASS"
-                                  " for authentication")},
-  { oEnvPass,  "env-pass",  0, N_("take password from $DIRMNGR_LDAP_PASS")},
-  { oDN,       "dn",        2, N_("|STRING|query DN STRING")},
-  { oFilter,   "filter",    2, N_("|STRING|use STRING as filter expression")},
-  { oAttr,     "attr",      2, N_("|STRING|return the attribute STRING")},
+                "|NAME|ignore host part and connect through NAME"},
+  { oStartTLS, "starttls",  0, "use STARTLS for the conenction"},
+  { oLdapTLS,  "ldaptls",   0, "use a TLS for the connection"},
+  { oNtds,     "ntds",      0, "authenticate using AD"},
+  { oHost,     "host",      2, "|NAME|connect to host NAME"},
+  { oPort,     "port",      1, "|N|connect to port N"},
+  { oUser,     "user",      2, "|NAME|use NAME for authentication"},
+  { oPass,     "pass",      2, "|PASS|use password PASS"
+                               " for authentication"},
+  { oEnvPass,  "env-pass",  0, "take password from $DIRMNGR_LDAP_PASS"},
+  { oBase,     "base",      2, "|DN|Start query at DN"},
+  { oAttr,     "attr",      2, "|STRING|return the attribute STRING"},
   { oOnlySearchTimeout, "only-search-timeout", 0, "@"},
   { oLogWithPID,"log-with-pid", 0, "@"},
   ARGPARSE_end ()
 };
 
 
-/* A structure with module options.  This is not a static variable
-   because if we are not build as a standalone binary, each thread
-   using this module needs to handle its own values.  */
-struct my_opt_s
+/* A structure with module options.  */
+static struct
 {
   int quiet;
   int verbose;
   my_ldap_timeval_t timeout;/* Timeout for the LDAP search functions.  */
   unsigned int alarm_timeout; /* And for the alarm based timeout.  */
   int multi;
-  int force_tls;
+  int starttls;
+  int ldaptls;
+  int ntds;
 
   estream_t outstream;    /* Send output to this stream.  */
 
@@ -142,19 +143,18 @@ struct my_opt_s
   char *user;  /* Authentication user.  */
   char *pass;  /* Authentication password.  */
   char *host;  /* Override host.  */
-  int port;    /* Override port.  */
-  char *dn;    /* Override DN.  */
-  char *filter;/* Override filter.  */
+  int  port;   /* Override port.  */
+  char *base;  /* Override DN.  */
   char *attr;  /* Override attribute.  */
-};
-typedef struct my_opt_s *my_opt_t;
+} opt;
 
 
 /* Prototypes.  */
 #ifndef HAVE_W32_SYSTEM
 static void catch_alarm (int dummy);
 #endif
-static int process_url (my_opt_t myopt, const char *url);
+static gpg_error_t connect_ldap (LDAP **r_ld);
+static gpg_error_t process_filter (LDAP *ld, const char *string);
 
 
 
@@ -172,14 +172,14 @@ my_strusage (int level)
     case 13: p = VERSION; break;
     case 14: p = GNUPG_DEF_COPYRIGHT_LINE; break;
     case 17: p = PRINTABLE_OS_NAME; break;
-    case 19: p = _("Please report bugs to <@EMAIL@>.\n"); break;
+    case 19: p = "Please report bugs to <@EMAIL@>.\n"; break;
     case 49: p = PACKAGE_BUGREPORT; break;
     case 1:
     case 40: p =
-               _("Usage: dirmngr_ldap [options] [URL] (-h for help)\n");
+               "Usage: dirmngr_ldap [options] filters (-h for help)\n";
       break;
     case 41: p =
-          _("Syntax: dirmngr_ldap [options] [URL]\n"
+           ("Syntax: dirmngr_ldap [options] filters\n"
             "Internal LDAP helper for Dirmngr\n"
             "Interface and options may change without notice\n");
       break;
@@ -197,29 +197,23 @@ main (int argc, char **argv)
   int any_err = 0;
   char *p;
   int only_search_timeout = 0;
-  struct my_opt_s my_opt_buffer;
-  my_opt_t myopt = &my_opt_buffer;
   char *malloced_buffer1 = NULL;
-
-  memset (&my_opt_buffer, 0, sizeof my_opt_buffer);
+  LDAP *ld;
 
   early_system_init ();
 
   gpgrt_set_strusage (my_strusage);
   log_set_prefix ("dirmngr_ldap", GPGRT_LOG_WITH_PREFIX);
 
-  /* Setup I18N and common subsystems. */
-  i18n_init();
-
   init_common_subsystems (&argc, &argv);
 
   es_set_binary (es_stdout);
-  myopt->outstream = es_stdout;
+  opt.outstream = es_stdout;
 
   /* LDAP defaults */
-  myopt->timeout.tv_sec = DEFAULT_LDAP_TIMEOUT;
-  myopt->timeout.tv_usec = 0;
-  myopt->alarm_timeout = 0;
+  opt.timeout.tv_sec = DEFAULT_LDAP_TIMEOUT;
+  opt.timeout.tv_usec = 0;
+  opt.alarm_timeout = 0;
 
   /* Parse the command line.  */
   pargs.argc = &argc;
@@ -229,27 +223,28 @@ main (int argc, char **argv)
     {
       switch (pargs.r_opt)
         {
-        case oVerbose: myopt->verbose++; break;
-        case oQuiet: myopt->quiet++; break;
+        case oVerbose: opt.verbose++; break;
+        case oQuiet: opt.quiet++; break;
 	case oTimeout:
-	  myopt->timeout.tv_sec = pargs.r.ret_int;
-	  myopt->timeout.tv_usec = 0;
-          myopt->alarm_timeout = pargs.r.ret_int;
+	  opt.timeout.tv_sec = pargs.r.ret_int;
+	  opt.timeout.tv_usec = 0;
+          opt.alarm_timeout = pargs.r.ret_int;
 	  break;
         case oOnlySearchTimeout: only_search_timeout = 1; break;
-        case oMulti: myopt->multi = 1; break;
-        case oUser: myopt->user = pargs.r.ret_str; break;
-        case oPass: myopt->pass = pargs.r.ret_str; break;
+        case oStartTLS: opt.starttls = 1; opt.ldaptls = 0; break;
+        case oLdapTLS:  opt.starttls = 0; opt.ldaptls = 1; break;
+        case oNtds:     opt.ntds = 1; break;
+        case oMulti: opt.multi = 1; break;
+        case oUser: opt.user = pargs.r.ret_str; break;
+        case oPass: opt.pass = pargs.r.ret_str; break;
         case oEnvPass:
-          myopt->pass = getenv ("DIRMNGR_LDAP_PASS");
+          opt.pass = getenv ("DIRMNGR_LDAP_PASS");
           break;
-        case oProxy: myopt->proxy = pargs.r.ret_str; break;
-        case oTls:  myopt->force_tls = 1; break;
-        case oHost: myopt->host = pargs.r.ret_str; break;
-        case oPort: myopt->port = pargs.r.ret_int; break;
-        case oDN:   myopt->dn = pargs.r.ret_str; break;
-        case oFilter: myopt->filter = pargs.r.ret_str; break;
-        case oAttr: myopt->attr = pargs.r.ret_str; break;
+        case oProxy: opt.proxy = pargs.r.ret_str; break;
+        case oHost: opt.host = pargs.r.ret_str; break;
+        case oPort: opt.port = pargs.r.ret_int; break;
+        case oBase: opt.base = pargs.r.ret_str; break;
+        case oAttr: opt.attr = pargs.r.ret_str; break;
         case oLogWithPID:
           {
             unsigned int oldflags;
@@ -266,36 +261,43 @@ main (int argc, char **argv)
   gpgrt_argparse (NULL, &pargs, NULL);
 
   if (only_search_timeout)
-    myopt->alarm_timeout = 0;
+    opt.alarm_timeout = 0;
 
-  if (myopt->proxy)
+  if (opt.proxy)
     {
-      malloced_buffer1 = xtrystrdup (myopt->proxy);
+      malloced_buffer1 = xtrystrdup (opt.proxy);
       if (!malloced_buffer1)
         {
           log_error ("error copying string: %s\n", strerror (errno));
           return 1;
         }
-      myopt->host = malloced_buffer1;
-      p = strchr (myopt->host, ':');
+      opt.host = malloced_buffer1;
+      p = strchr (opt.host, ':');
       if (p)
         {
           *p++ = 0;
-          myopt->port = atoi (p);
+          opt.port = atoi (p);
         }
-      if (!myopt->port)
-        myopt->port = 389;  /* make sure ports gets overridden.  */
+      if (!opt.port)
+        opt.port = 389;  /* make sure ports gets overridden.  */
     }
 
-  if (myopt->port < 0 || myopt->port > 65535)
-    log_error (_("invalid port number %d\n"), myopt->port);
+  if (opt.port < 0 || opt.port > 65535)
+    log_error ("invalid port number %d\n", opt.port);
+
+  if (!opt.port)
+    opt.port = opt.ldaptls? 636 : 389;
+
+#ifndef HAVE_W32_SYSTEM
+  if (!opt.host)
+    opt.host = "localhost";
+#endif
+
 
   if (log_get_errorcount (0))
     exit (2);
-  if (argc < 1)
-    gpgrt_usage (1);
 
-  if (myopt->alarm_timeout)
+  if (opt.alarm_timeout)
     {
 #ifndef HAVE_W32_SYSTEM
 # if defined(HAVE_SIGACTION) && defined(HAVE_STRUCT_SIGACTION)
@@ -312,9 +314,23 @@ main (int argc, char **argv)
 #endif
     }
 
-  for (; argc; argc--, argv++)
-    if (process_url (myopt, *argv))
-      any_err = 1;
+  if (connect_ldap (&ld))
+    any_err = 1;
+  else
+    {
+      if (!argc)
+        {
+          if (process_filter (ld, "(objectClass=*)"))
+            any_err = 1;
+        }
+      else
+        {
+          for (; argc; argc--, argv++)
+            if (process_filter (ld, *argv))
+              any_err = 1;
+        }
+      ldap_unbind (ld);
+    }
 
   xfree (malloced_buffer1);
   return any_err;
@@ -345,16 +361,16 @@ alarm_thread (void *arg)
 
 
 static void
-set_timeout (my_opt_t myopt)
+set_timeout (void)
 {
-  if (myopt->alarm_timeout)
+  if (opt.alarm_timeout)
     {
 #ifdef HAVE_W32_SYSTEM
       static HANDLE timer;
       LARGE_INTEGER due_time;
 
       /* A negative value is a relative time.  */
-      due_time.QuadPart = (unsigned long long)-10000000 * myopt->alarm_timeout;
+      due_time.QuadPart = (unsigned long long)-10000000 * opt.alarm_timeout;
 
       if (!timer)
         {
@@ -376,15 +392,192 @@ set_timeout (my_opt_t myopt)
       else /* Retrigger the timer.  */
         SetWaitableTimer (timer, &due_time, 0, NULL, NULL, 0);
 #else
-      alarm (myopt->alarm_timeout);
+      alarm (opt.alarm_timeout);
+#endif
+    }
+}
+
+
+
+/* Connect to the ldap server.  On success the connection handle is
+ * stored at R_LD. */
+static gpg_error_t
+connect_ldap (LDAP **r_ld)
+{
+  gpg_error_t err = 0;
+  int lerr;
+  LDAP *ld = NULL;
+#ifndef HAVE_W32_SYSTEM
+  char *tmpstr;
 #endif
+
+  *r_ld = NULL;
+
+  if (opt.starttls || opt.ldaptls)
+    {
+#ifndef HAVE_LDAP_START_TLS_S
+      log_error ("ldap: can't connect to the server: no TLS support.");
+      err = GPG_ERR_LDAP_NOT_SUPPORTED;
+      goto leave;
+#endif
+    }
+
+
+  set_timeout ();
+#ifdef HAVE_W32_SYSTEM
+  npth_unprotect ();
+  ld = ldap_sslinit (opt.host, opt.port, opt.ldaptls);
+  npth_protect ();
+  if (!ld)
+    {
+      lerr = LdapGetLastError ();
+      err = ldap_err_to_gpg_err (lerr);
+      log_error ("error initializing LDAP '%s:%d': %s\n",
+                 opt.host, opt.port, ldap_err2string (lerr));
+      goto leave;
+    }
+#else /* Unix */
+  tmpstr = xtryasprintf ("%s://%s:%d",
+                         opt.ldaptls? "ldaps" : "ldap",
+                         opt.host, opt.port);
+  if (!tmpstr)
+    {
+      err = gpg_error_from_syserror ();
+      goto leave;
+    }
+  npth_unprotect ();
+  lerr = ldap_initialize (&ld, tmpstr);
+  npth_protect ();
+  if (lerr || !ld)
+    {
+      err = ldap_err_to_gpg_err (lerr);
+      log_error ("error initializing LDAP '%s': %s\n",
+                 tmpstr, ldap_err2string (lerr));
+      xfree (tmpstr);
+      goto leave;
+    }
+  xfree (tmpstr);
+#endif /* Unix */
+
+  if (opt.verbose)
+    log_info ("LDAP connected to '%s:%d'%s\n",
+              opt.host, opt.port,
+              opt.starttls? " using STARTTLS" :
+              opt.ldaptls?  " using LDAP-over-TLS" : "");
+
+
+#ifdef HAVE_LDAP_SET_OPTION
+  {
+    int ver = LDAP_VERSION3;
+
+    lerr = ldap_set_option (ld, LDAP_OPT_PROTOCOL_VERSION, &ver);
+    if (lerr != LDAP_SUCCESS)
+      {
+	log_error ("unable to go to LDAP 3: %s\n", ldap_err2string (lerr));
+	err = ldap_err_to_gpg_err (lerr);
+	goto leave;
+      }
+  }
+#endif
+
+
+#ifdef HAVE_LDAP_START_TLS_S
+  if (opt.starttls)
+    {
+#ifndef HAVE_W32_SYSTEM
+      int check_cert = LDAP_OPT_X_TLS_HARD; /* LDAP_OPT_X_TLS_NEVER */
+
+      lerr = ldap_set_option (ld, LDAP_OPT_X_TLS_REQUIRE_CERT, &check_cert);
+      if (lerr)
+	{
+	  log_error ("ldap: error setting an TLS option: %s\n",
+                     ldap_err2string (lerr));
+          err = ldap_err_to_gpg_err (lerr);
+	  goto leave;
+	}
+#else
+      /* On Windows, the certificates are checked by default.  If the
+	 option to disable checking mentioned above is ever
+	 implemented, the way to do that on Windows is to install a
+	 callback routine using ldap_set_option (..,
+	 LDAP_OPT_SERVER_CERTIFICATE, ..); */
+#endif
+
+      npth_unprotect ();
+      lerr = ldap_start_tls_s (ld,
+#ifdef HAVE_W32_SYSTEM
+			      /* ServerReturnValue, result */
+			      NULL, NULL,
+#endif
+			      /* ServerControls, ClientControls */
+			      NULL, NULL);
+      npth_protect ();
+      if (lerr)
+	{
+	  log_error ("ldap: error switching to STARTTLS mode: %s\n",
+                     ldap_err2string (lerr));
+          err = ldap_err_to_gpg_err (lerr);
+	  goto leave;
+	}
+    }
+#endif
+
+  if (opt.ntds)
+    {
+      if (opt.verbose)
+        log_info ("binding to current user via AD\n");
+#ifdef HAVE_W32_SYSTEM
+      npth_unprotect ();
+      lerr = ldap_bind_s (ld, NULL, NULL, LDAP_AUTH_NEGOTIATE);
+      npth_protect ();
+      if (lerr != LDAP_SUCCESS)
+	{
+	  log_error ("error binding to LDAP via AD: %s\n",
+                     ldap_err2string (lerr));
+          err = ldap_err_to_gpg_err (lerr);
+	  goto leave;
+	}
+#else /* Unix */
+      err = gpg_error (GPG_ERR_NOT_SUPPORTED);
+      goto leave;
+#endif /* Unix */
+    }
+  else if (opt.user)
+    {
+      if (opt.verbose)
+        log_info ("LDAP bind to '%s', password '%s'\n",
+                   opt.user, opt.pass ? ">not_shown<" : ">none<");
+
+      npth_unprotect ();
+      lerr = ldap_simple_bind_s (ld, opt.user, opt.pass);
+      npth_protect ();
+      if (lerr != LDAP_SUCCESS)
+	{
+	  log_error ("error binding to LDAP: %s\n", ldap_err2string (lerr));
+          err = ldap_err_to_gpg_err (lerr);
+	  goto leave;
+	}
+    }
+  else
+    {
+      /* By default we don't bind as there is usually no need to.  */
+    }
+
+ leave:
+  if (err)
+    {
+      if (ld)
+        ldap_unbind (ld);
     }
+  else
+    *r_ld = ld;
+  return err;
 }
 
 
 /* Helper for fetch_ldap().  */
 static int
-print_ldap_entries (my_opt_t myopt, LDAP *ld, LDAPMessage *msg, char *want_attr)
+print_ldap_entries (LDAP *ld, LDAPMessage *msg, char *want_attr)
 {
   LDAPMessage *item;
   int any = 0;
@@ -396,15 +589,15 @@ print_ldap_entries (my_opt_t myopt, LDAP *ld, LDAPMessage *msg, char *want_attr)
       BerElement *berctx;
       char *attr;
 
-      if (myopt->verbose > 1)
-        log_info (_("scanning result for attribute '%s'\n"),
+      if (opt.verbose > 1)
+        log_info ("scanning result for attribute '%s'\n",
                   want_attr? want_attr : "[all]");
 
-      if (myopt->multi)
+      if (opt.multi)
         { /*  Write item marker. */
-          if (es_fwrite ("I\0\0\0\0", 5, 1, myopt->outstream) != 1)
+          if (es_fwrite ("I\0\0\0\0", 5, 1, opt.outstream) != 1)
             {
-              log_error (_("error writing to stdout: %s\n"),
+              log_error ("error writing to stdout: %s\n",
                          strerror (errno));
               return -1;
             }
@@ -420,10 +613,10 @@ print_ldap_entries (my_opt_t myopt, LDAP *ld, LDAPMessage *msg, char *want_attr)
           struct berval **values;
           int idx;
 
-          if (myopt->verbose > 1)
-            log_info (_("          available attribute '%s'\n"), attr);
+          if (opt.verbose > 1)
+            log_info ("          available attribute '%s'\n", attr);
 
-          set_timeout (myopt);
+          set_timeout ();
 
           /* I case we want only one attribute we do a case
              insensitive compare without the optional extension
@@ -458,23 +651,23 @@ print_ldap_entries (my_opt_t myopt, LDAP *ld, LDAPMessage *msg, char *want_attr)
 
           if (!values)
             {
-              if (myopt->verbose)
-                log_info (_("attribute '%s' not found\n"), attr);
+              if (opt.verbose)
+                log_info ("attribute '%s' not found\n", attr);
               ldap_memfree (attr);
               continue;
             }
 
-          if (myopt->verbose)
+          if (opt.verbose)
             {
-              log_info (_("found attribute '%s'\n"), attr);
-              if (myopt->verbose > 1)
+              log_info ("found attribute '%s'\n", attr);
+              if (opt.verbose > 1)
                 for (idx=0; values[idx]; idx++)
                   log_info ("         length[%d]=%d\n",
                             idx, (int)values[0]->bv_len);
 
             }
 
-          if (myopt->multi)
+          if (opt.multi)
             { /*  Write attribute marker. */
               unsigned char tmp[5];
               size_t n = strlen (attr);
@@ -484,10 +677,10 @@ print_ldap_entries (my_opt_t myopt, LDAP *ld, LDAPMessage *msg, char *want_attr)
               tmp[2] = (n >> 16);
               tmp[3] = (n >> 8);
               tmp[4] = (n);
-              if (es_fwrite (tmp, 5, 1, myopt->outstream) != 1
-                  || es_fwrite (attr, n, 1, myopt->outstream) != 1)
+              if (es_fwrite (tmp, 5, 1, opt.outstream) != 1
+                  || es_fwrite (attr, n, 1, opt.outstream) != 1)
                 {
-                  log_error (_("error writing to stdout: %s\n"),
+                  log_error ("error writing to stdout: %s\n",
                              strerror (errno));
                   ldap_value_free_len (values);
                   ldap_memfree (attr);
@@ -498,7 +691,7 @@ print_ldap_entries (my_opt_t myopt, LDAP *ld, LDAPMessage *msg, char *want_attr)
 
           for (idx=0; values[idx]; idx++)
             {
-              if (myopt->multi)
+              if (opt.multi)
                 { /* Write value marker.  */
                   unsigned char tmp[5];
                   size_t n = values[0]->bv_len;
@@ -509,9 +702,9 @@ print_ldap_entries (my_opt_t myopt, LDAP *ld, LDAPMessage *msg, char *want_attr)
                   tmp[3] = (n >> 8);
                   tmp[4] = (n);
 
-                  if (es_fwrite (tmp, 5, 1, myopt->outstream) != 1)
+                  if (es_fwrite (tmp, 5, 1, opt.outstream) != 1)
                     {
-                      log_error (_("error writing to stdout: %s\n"),
+                      log_error ("error writing to stdout: %s\n",
                                  strerror (errno));
                       ldap_value_free_len (values);
                       ldap_memfree (attr);
@@ -521,9 +714,9 @@ print_ldap_entries (my_opt_t myopt, LDAP *ld, LDAPMessage *msg, char *want_attr)
                 }
 
 	      if (es_fwrite (values[0]->bv_val, values[0]->bv_len,
-                             1, myopt->outstream) != 1)
+                             1, opt.outstream) != 1)
                 {
-                  log_error (_("error writing to stdout: %s\n"),
+                  log_error ("error writing to stdout: %s\n",
                              strerror (errno));
                   ldap_value_free_len (values);
                   ldap_memfree (attr);
@@ -532,18 +725,18 @@ print_ldap_entries (my_opt_t myopt, LDAP *ld, LDAPMessage *msg, char *want_attr)
                 }
 
               any = 1;
-              if (!myopt->multi)
+              if (!opt.multi)
                 break; /* Print only the first value.  */
             }
           ldap_value_free_len (values);
           ldap_memfree (attr);
-          if (want_attr || !myopt->multi)
+          if (want_attr || !opt.multi)
             break; /* We only want to return the first attribute.  */
         }
       ber_free (berctx, 0);
     }
 
-  if (myopt->verbose > 1 && any)
+  if (opt.verbose > 1 && any)
     log_info ("result has been printed\n");
 
   return any?0:-1;
@@ -551,183 +744,51 @@ print_ldap_entries (my_opt_t myopt, LDAP *ld, LDAPMessage *msg, char *want_attr)
 
 
 
-/* Helper for the URL based LDAP query. */
+/* Fetch data from the server at LD using FILTER.  */
 static int
-fetch_ldap (my_opt_t myopt, const char *url, const LDAPURLDesc *ludp)
+fetch_ldap (LDAP *ld, const char *base, int scope, const char *filter)
 {
-  LDAP *ld;
+  gpg_error_t err;
+  int lerr;
   LDAPMessage *msg;
-  int rc = 0;
-  char *host, *dn, *filter, *attrs[2], *attr;
-  int port;
-  int ret;
-  int usetls;
-
-  host     = myopt->host?   myopt->host   : ludp->lud_host;
-  port     = myopt->port?   myopt->port   : ludp->lud_port;
-  dn       = myopt->dn?     myopt->dn     : ludp->lud_dn;
-  filter   = myopt->filter? myopt->filter : ludp->lud_filter;
-  attrs[0] = myopt->attr?   myopt->attr   : ludp->lud_attrs? ludp->lud_attrs[0]:NULL;
-  attrs[1] = NULL;
-  attr = attrs[0];
+  char *attrs[2];
 
-  if (!port && myopt->force_tls)
-    port = 636;
-  else if (!port)
-    port = (ludp->lud_scheme && !strcmp (ludp->lud_scheme, "ldaps"))? 636:389;
+  if (filter && !*filter)
+    filter = NULL;
 
-  if (myopt->verbose)
+  if (opt.verbose)
     {
-      log_info (_("processing url '%s'\n"), url);
-      if (myopt->force_tls)
-        log_info ("forcing tls\n");
-      else
-        log_info ("not forcing tls\n");
-
-      if (myopt->user)
-        log_info (_("          user '%s'\n"), myopt->user);
-      if (myopt->pass)
-        log_info (_("          pass '%s'\n"), *myopt->pass?"*****":"");
-      if (host)
-        log_info (_("          host '%s'\n"), host);
-      log_info (_("          port %d\n"), port);
-      if (dn)
-        log_info (_("            DN '%s'\n"), dn);
+      log_info ("fetching using");
+      if (base)
+        log_printf (" base '%s'", base);
       if (filter)
-        log_info (_("        filter '%s'\n"), filter);
-      if (myopt->multi && !myopt->attr && ludp->lud_attrs)
-        {
-          int i;
-          for (i=0; ludp->lud_attrs[i]; i++)
-            log_info (_("          attr '%s'\n"), ludp->lud_attrs[i]);
-        }
-      else if (attr)
-        log_info (_("          attr '%s'\n"), attr);
-    }
-
-
-  if (!host || !*host)
-    {
-      log_error (_("no host name in '%s'\n"), url);
-      return -1;
-    }
-  if (!myopt->multi && !attr)
-    {
-      log_error (_("no attribute given for query '%s'\n"), url);
-      return -1;
+        log_printf (" filter '%s'", filter);
+      log_printf ("\n");
     }
 
-  if (!myopt->multi && !myopt->attr
-      && ludp->lud_attrs && ludp->lud_attrs[0] && ludp->lud_attrs[1])
-    log_info (_("WARNING: using first attribute only\n"));
-
-  set_timeout (myopt);
-
-  usetls = (myopt->force_tls
-            || (ludp->lud_scheme && !strcmp (ludp->lud_scheme, "ldaps")));
-#if HAVE_W32_SYSTEM
-  if (1)
-    {
-      npth_unprotect ();
-      ld = ldap_sslinit (host, port, usetls);
-      npth_protect ();
-      if (!ld)
-        {
-          ret = LdapGetLastError ();
-          log_error (_("LDAP init to '%s:%d' failed: %s\n"),
-                     host, port, ldap_err2string (ret));
-          return -1;
-        }
-    }
-#else /*!W32*/
-  if (usetls)
-    {
-      char *uri;
-
-      uri = xtryasprintf ("ldaps://%s:%d", host, port);
-      if (!uri)
-        {
-          log_error (_("error allocating memory: %s\n"),
-                     gpg_strerror (gpg_error_from_syserror ()));
-          return -1;
-        }
-      npth_unprotect ();
-      ret = ldap_initialize (&ld, uri);
-      npth_protect ();
-      if (ret)
-        {
-          log_error (_("LDAP init to '%s' failed: %s\n"),
-                     uri, ldap_err2string (ret));
-          xfree (uri);
-          return -1;
-        }
-      else if (myopt->verbose)
-        log_info (_("LDAP init to '%s' done\n"), uri);
-      xfree (uri);
-    }
-  else
-    {
-      /* Keep the old way so to avoid regressions.  Eventually we
-       * should really consider the supplied scheme and use only
-       * ldap_initialize.  */
-      npth_unprotect ();
-      ld = ldap_init (host, port);
-      npth_protect ();
-      if (!ld)
-        {
-          log_error (_("LDAP init to '%s:%d' failed: %s\n"),
-                     host, port, strerror (errno));
-          return -1;
-        }
-    }
-#endif /*!W32*/
-
-  npth_unprotect ();
-  /* Fixme:  Can we use MYOPT->user or is it shared with other theeads?.  */
-  ret = ldap_simple_bind_s (ld, myopt->user, myopt->pass);
-  npth_protect ();
-#ifdef LDAP_VERSION3
-  if (ret == LDAP_PROTOCOL_ERROR)
-    {
-      /* Protocol error could mean that the server only supports v3. */
-      int version = LDAP_VERSION3;
-      if (myopt->verbose)
-        log_info ("protocol error; retrying bind with v3 protocol\n");
-      npth_unprotect ();
-      ldap_set_option (ld, LDAP_OPT_PROTOCOL_VERSION, &version);
-      ret = ldap_simple_bind_s (ld, myopt->user, myopt->pass);
-      npth_protect ();
-    }
-#endif
-  if (ret)
-    {
-      log_error (_("binding to '%s:%d' failed: %s\n"),
-                 host, port, ldap_err2string (ret));
-      ldap_unbind (ld);
-      return -1;
-    }
+  attrs[0] = opt.attr;
+  attrs[1] = NULL;
 
-  set_timeout (myopt);
+  set_timeout ();
   npth_unprotect ();
-  rc = ldap_search_st (ld, dn, ludp->lud_scope, filter,
-                       myopt->multi && !myopt->attr && ludp->lud_attrs?
-                       ludp->lud_attrs:attrs,
-                       0,
-                       &myopt->timeout, &msg);
+  lerr = ldap_search_st (ld, base, scope, filter,
+                         attrs,
+                         0,
+                         &opt.timeout, &msg);
   npth_protect ();
-  if (rc == LDAP_SIZELIMIT_EXCEEDED && myopt->multi)
+  if (lerr == LDAP_SIZELIMIT_EXCEEDED && opt.multi)
     {
-      if (es_fwrite ("E\0\0\0\x09truncated", 14, 1, myopt->outstream) != 1)
+      if (es_fwrite ("E\0\0\0\x09truncated", 14, 1, opt.outstream) != 1)
         {
-          log_error (_("error writing to stdout: %s\n"), strerror (errno));
+          log_error ("error writing to stdout: %s\n", strerror (errno));
           return -1;
         }
     }
-  else if (rc)
+  else if (lerr)
     {
-      log_error (_("searching '%s' failed: %s\n"),
-                 url, ldap_err2string (rc));
-      if (rc != LDAP_NO_SUCH_OBJECT)
+      log_error ("searching '%s' failed: %s\n",
+                 filter, ldap_err2string (lerr));
+      if (lerr != LDAP_NO_SUCH_OBJECT)
         {
           /* FIXME: Need deinit (ld)?  */
           /* Hmmm: Do we need to released MSG in case of an error? */
@@ -735,39 +796,43 @@ fetch_ldap (my_opt_t myopt, const char *url, const LDAPURLDesc *ludp)
         }
     }
 
-  rc = print_ldap_entries (myopt, ld, msg, myopt->multi? NULL:attr);
+  err = print_ldap_entries (ld, msg, opt.multi? NULL:opt.attr);
 
   ldap_msgfree (msg);
-  ldap_unbind (ld);
-  return rc;
+  return err;
 }
 
 
 
 
-/* Main processing.  Take the URL and run the LDAP query. The result
-   is printed to stdout, errors are logged to the log stream. */
-static int
-process_url (my_opt_t myopt, const char *url)
+/* Main processing.  Take the filter and run the LDAP query. The
+ * result is printed to stdout, errors are logged to the log stream.
+ * To allow searching with a different base it is possible to extend
+ * the filer.  For example:
+ *
+ *   ^CN=foo, OU=My Users&(objectClasses=*)
+ *
+ * Uses "CN=foo, OU=My Users" as base DN and "(objectClasses=*)" as
+ * filter.  If the base prefix includes an ampersand, it needs to be
+ * doubled.  The usual escaping rules for DNs (for the base) and
+ * filters apply.  If no scope is given (see ldap_parse_extfilter for
+ * the syntax) subtree scope is used.
+ */
+static gpg_error_t
+process_filter (LDAP *ld, const char *string)
 {
-  int rc;
-  LDAPURLDesc *ludp = NULL;
-
-
-  if (!ldap_is_ldap_url (url))
-    {
-      log_error (_("'%s' is not an LDAP URL\n"), url);
-      return -1;
-    }
-
-  if (ldap_url_parse (url, &ludp))
-    {
-      log_error (_("'%s' is an invalid LDAP URL\n"), url);
-      return -1;
-    }
-
-  rc = fetch_ldap (myopt, url, ludp);
-
-  ldap_free_urldesc (ludp);
-  return rc;
+  gpg_error_t err;
+  char *base, *filter;
+  int scope = -1;
+
+  err = ldap_parse_extfilter (string, 0, &base, &scope, &filter);
+  if (!err)
+    err = fetch_ldap (ld,
+                      base? base : opt.base,
+                      scope == -1? LDAP_SCOPE_SUBTREE : scope,
+                      filter);
+
+  xfree (base);
+  xfree (filter);
+  return err;
 }
diff --git a/dirmngr/http-ntbtls.c b/dirmngr/http-ntbtls.c
index ae5cf55..2191acb 100644
--- a/dirmngr/http-ntbtls.c
+++ b/dirmngr/http-ntbtls.c
@@ -47,7 +47,7 @@ gnupg_http_tls_verify_cb (void *opaque,
   ksba_cert_t cert;
   ksba_cert_t hostcert = NULL;
   unsigned int validate_flags;
-  const char *hostname;
+  /* const char *hostname; */
 
   (void)http;
   (void)session;
@@ -81,14 +81,16 @@ gnupg_http_tls_verify_cb (void *opaque,
    * certificate.  Note that this differes from the GnuTLS
    * implementation which uses this special certificate only if no
    * other certificates are configured. */
-  hostname = ntbtls_get_hostname (tls);
-  if (hostname
-      && !ascii_strcasecmp (hostname, get_default_keyserver (1)))
-    {
-      validate_flags |= VALIDATE_FLAG_TRUST_HKPSPOOL;
-    }
-  else /* Use the certificates as requested from the HTTP module.  */
+  /* Disabled for 2.3.2 to due problems with the standard hkps pool.  */
+  /* hostname = ntbtls_get_hostname (tls); */
+  /* if (hostname */
+  /*     && !ascii_strcasecmp (hostname, get_default_keyserver (1))) */
+  /*   { */
+  /*     validate_flags |= VALIDATE_FLAG_TRUST_HKPSPOOL; */
+  /*   } */
+  /* else */
     {
+      /* Use the certificates as requested from the HTTP module.  */
       if ((http_flags & HTTP_FLAG_TRUST_CFG))
         validate_flags |= VALIDATE_FLAG_TRUST_CONFIG;
       if ((http_flags & HTTP_FLAG_TRUST_DEF))
diff --git a/dirmngr/http.c b/dirmngr/http.c
index f7f6530..73606c0 100644
--- a/dirmngr/http.c
+++ b/dirmngr/http.c
@@ -1,8 +1,8 @@
 /* http.c  -  HTTP protocol handler
- * Copyright (C) 1999, 2001, 2002, 2003, 2004, 2006, 2009, 2010,
+ * Copyright (C) 1999, 2001-2004, 2006, 2009, 2010,
  *               2011 Free Software Foundation, Inc.
- * Copyright (C) 2014 Werner Koch
- * Copyright (C) 2015-2019 g10 Code GmbH
+ * Copyright (C) 1999, 2001-2004, 2006, 2009, 2010, 2011, 2014 Werner Koch
+ * Copyright (C) 2015-2017, 2021 g10 Code GmbH
  *
  * This file is part of GnuPG.
  *
@@ -761,35 +761,38 @@ http_session_new (http_session_t *r_session,
         goto leave;
       }
 
-    is_hkps_pool = (intended_hostname
-                    && !ascii_strcasecmp (intended_hostname,
-                                          get_default_keyserver (1)));
+    /* Disabled for 2.3.2 to due problems with the standard hkps pool.  */
+    /* is_hkps_pool = (intended_hostname */
+    /*                 && !ascii_strcasecmp (intended_hostname, */
+    /*                                       get_default_keyserver (1))); */
+    is_hkps_pool = 0;
 
     /* If we are looking for the hkps pool from sks-keyservers.net,
      * then forcefully use its dedicated certificate authority.  */
-    if (is_hkps_pool)
-      {
-        char *pemname = make_filename_try (gnupg_datadir (),
-                                           "sks-keyservers.netCA.pem", NULL);
-        if (!pemname)
-          {
-            err = gpg_error_from_syserror ();
-            log_error ("setting CA from file '%s' failed: %s\n",
-                       pemname, gpg_strerror (err));
-          }
-        else
-          {
-            rc = gnutls_certificate_set_x509_trust_file
-              (sess->certcred, pemname, GNUTLS_X509_FMT_PEM);
-            if (rc < 0)
-              log_info ("setting CA from file '%s' failed: %s\n",
-                        pemname, gnutls_strerror (rc));
-            xfree (pemname);
-          }
-
-        if (is_hkps_pool)
-          add_system_cas = 0;
-      }
+    /* Disabled for 2.3.2 because the service had to be shutdown.  */
+    /* if (is_hkps_pool) */
+    /*   { */
+    /*     char *pemname = make_filename_try (gnupg_datadir (), */
+    /*                                        "sks-keyservers.netCA.pem", NULL); */
+    /*     if (!pemname) */
+    /*       { */
+    /*         err = gpg_error_from_syserror (); */
+    /*         log_error ("setting CA from file '%s' failed: %s\n", */
+    /*                    pemname, gpg_strerror (err)); */
+    /*       } */
+    /*     else */
+    /*       { */
+    /*         rc = gnutls_certificate_set_x509_trust_file */
+    /*           (sess->certcred, pemname, GNUTLS_X509_FMT_PEM); */
+    /*         if (rc < 0) */
+    /*           log_info ("setting CA from file '%s' failed: %s\n", */
+    /*                     pemname, gnutls_strerror (rc)); */
+    /*         xfree (pemname); */
+    /*       } */
+    /*         */
+    /*     if (is_hkps_pool) */
+    /*       add_system_cas = 0; */
+    /*   } */
 
     /* Add configured certificates to the session.  */
     if ((flags & HTTP_FLAG_TRUST_DEF) && !is_hkps_pool)
@@ -1293,15 +1296,14 @@ parse_uri (parsed_uri_t *ret_uri, const char *uri,
 /*
  * Parse an URI and put the result into the newly allocated RET_URI.
  * On success the caller must use http_release_parsed_uri() to
- * releases the resources.  If NO_SCHEME_CHECK is set, the function
- * tries to parse the URL in the same way it would do for an HTTP
- * style URI; this can for example be used for hkps or ldap schemes.
- */
+ * releases the resources.  If the HTTP_PARSE_NO_SCHEME_CHECK flag is
+ * set, the function tries to parse the URL in the same way it would
+ * do for an HTTP style URI.   */
 gpg_error_t
 http_parse_uri (parsed_uri_t *ret_uri, const char *uri,
-                int no_scheme_check)
+                unsigned int flags)
 {
-  return parse_uri (ret_uri, uri, no_scheme_check, 0);
+  return parse_uri (ret_uri, uri, !!(flags & HTTP_PARSE_NO_SCHEME_CHECK), 0);
 }
 
 
@@ -1352,8 +1354,9 @@ do_parse_uri (parsed_uri_t uri, int only_local_part,
   uri->off_host = 0;
   uri->off_path = 0;
 
-  /* A quick validity check. */
-  if (strspn (p, VALID_URI_CHARS) != n)
+  /* A quick validity check unless we have the opaque scheme. */
+  if (strspn (p, VALID_URI_CHARS) != n
+      && strncmp (p, "opaque:", 7))
     return GPG_ERR_BAD_URI;	/* Invalid characters found. */
 
   if (!only_local_part)
@@ -1383,6 +1386,12 @@ do_parse_uri (parsed_uri_t uri, int only_local_part,
           uri->is_http = 1;
           uri->use_tls = 1;
         }
+      else if (!strcmp (uri->scheme, "opaque"))
+        {
+          uri->opaque = 1;
+          uri->path = p2;
+          return 0;
+        }
       else if (!no_scheme_check)
 	return GPG_ERR_INV_URI; /* Not an http style scheme.  */
       else if (!strcmp (uri->scheme, "ldap") && !force_tls)
@@ -2208,7 +2217,11 @@ send_request (ctrl_t ctrl, http_t hd, const char *httphost, const char *auth,
 
   p = build_rel_path (hd->uri);
   if (!p)
-    return gpg_err_make (default_errsource, gpg_err_code_from_syserror ());
+    {
+      xfree (authstr);
+      xfree (proxy_authstr);
+      return gpg_err_make (default_errsource, gpg_err_code_from_syserror ());
+    }
 
   if (http_proxy && *http_proxy)
     {
@@ -3541,6 +3554,15 @@ uri_query_lookup (parsed_uri_t uri, const char *key)
   return NULL;
 }
 
+const char *
+uri_query_value (parsed_uri_t url, const char *key)
+{
+  struct uri_tuple_s *t;
+  t = uri_query_lookup (url, key);
+  return t? t->value : NULL;
+}
+
+
 
 /* Return true if both URI point to the same host for the purpose of
  * redirection check.  A is the original host and B the host given in
@@ -3677,7 +3699,6 @@ http_prepare_redirect (http_redir_info_t *info, unsigned int status_code,
       if (!newurl)
         {
           err = gpg_error_from_syserror ();
-          http_release_parsed_uri (locuri);
           return err;
         }
     }
@@ -3696,7 +3717,6 @@ http_prepare_redirect (http_redir_info_t *info, unsigned int status_code,
       if (!newurl)
         {
           err = gpg_error_from_syserror ();
-          http_release_parsed_uri (locuri);
           return err;
         }
     }
diff --git a/dirmngr/http.h b/dirmngr/http.h
index 4ad0351..18420c9 100644
--- a/dirmngr/http.h
+++ b/dirmngr/http.h
@@ -71,6 +71,7 @@ struct parsed_uri_s
 typedef struct parsed_uri_s *parsed_uri_t;
 
 struct uri_tuple_s *uri_query_lookup (parsed_uri_t uri, const char *key);
+const char *uri_query_value (parsed_uri_t url, const char *key);
 
 typedef enum
   {
@@ -151,8 +152,9 @@ void http_session_set_log_cb (http_session_t sess,
 void http_session_set_timeout (http_session_t sess, unsigned int timeout);
 
 
+#define HTTP_PARSE_NO_SCHEME_CHECK 1
 gpg_error_t http_parse_uri (parsed_uri_t *ret_uri, const char *uri,
-                            int no_scheme_check);
+                            unsigned int flags);
 
 void http_release_parsed_uri (parsed_uri_t uri);
 
diff --git a/dirmngr/ks-action.c b/dirmngr/ks-action.c
index c2d8c37..57cf04a 100644
--- a/dirmngr/ks-action.c
+++ b/dirmngr/ks-action.c
@@ -67,6 +67,8 @@ ks_action_help (ctrl_t ctrl, const char *url)
 {
   gpg_error_t err;
   parsed_uri_t parsed_uri;  /* The broken down URI.  */
+  char *tmpstr;
+  const char *s;
 
   if (!url || !*url)
     {
@@ -76,12 +78,39 @@ ks_action_help (ctrl_t ctrl, const char *url)
   else
     {
 #if USE_LDAP
-      if (ldap_uri_p (url))
+      if (!strncmp (url, "ldap:", 5) && !(url[5] == '/' && url[6] == '/'))
+        {
+          /* Special ldap scheme given.  This differs from a valid
+           * ldap scheme in that no double slash follows.  Use
+           * http_parse_uri to put it as opaque value into parsed_uri.  */
+          tmpstr = strconcat ("opaque:", url+5, NULL);
+          if (!tmpstr)
+            err = gpg_error_from_syserror ();
+          else
+            {
+              err = http_parse_uri (&parsed_uri, tmpstr, 0);
+              xfree (tmpstr);
+            }
+        }
+      else if ((s=strchr (url, ':')) && !(s[1] == '/' && s[2] == '/'))
+        {
+          /* No scheme given.  Use http_parse_uri to put the string as
+           * opaque value into parsed_uri.  */
+          tmpstr = strconcat ("opaque:", url, NULL);
+          if (!tmpstr)
+            err = gpg_error_from_syserror ();
+          else
+            {
+              err = http_parse_uri (&parsed_uri, tmpstr, 0);
+              xfree (tmpstr);
+            }
+        }
+      else if (ldap_uri_p (url))
 	err = ldap_parse_uri (&parsed_uri, url);
       else
 #endif
 	{
-	  err = http_parse_uri (&parsed_uri, url, 1);
+	  err = http_parse_uri (&parsed_uri, url, HTTP_PARSE_NO_SCHEME_CHECK);
 	}
 
       if (err)
@@ -164,9 +193,10 @@ ks_action_search (ctrl_t ctrl, uri_item_t keyservers,
       int is_ldap = 0;
       unsigned int http_status = 0;
 #if USE_LDAP
-      is_ldap = (strcmp (uri->parsed_uri->scheme, "ldap") == 0
-		 || strcmp (uri->parsed_uri->scheme, "ldaps") == 0
-		 || strcmp (uri->parsed_uri->scheme, "ldapi") == 0);
+      is_ldap = (!strcmp (uri->parsed_uri->scheme, "ldap")
+		 || !strcmp (uri->parsed_uri->scheme, "ldaps")
+		 || !strcmp (uri->parsed_uri->scheme, "ldapi")
+                 || uri->parsed_uri->opaque);
 #endif
       if (is_http || is_ldap)
         {
@@ -242,9 +272,10 @@ ks_action_get (ctrl_t ctrl, uri_item_t keyservers,
         is_hkp_s = is_http_s = 0;
 
 #if USE_LDAP
-      is_ldap = (strcmp (uri->parsed_uri->scheme, "ldap") == 0
-		 || strcmp (uri->parsed_uri->scheme, "ldaps") == 0
-		 || strcmp (uri->parsed_uri->scheme, "ldapi") == 0);
+      is_ldap = (!strcmp (uri->parsed_uri->scheme, "ldap")
+		 || !strcmp (uri->parsed_uri->scheme, "ldaps")
+		 || !strcmp (uri->parsed_uri->scheme, "ldapi")
+                 || uri->parsed_uri->opaque);
 #endif
 
       if (is_hkp_s || is_http_s || is_ldap)
@@ -313,7 +344,7 @@ ks_action_fetch (ctrl_t ctrl, const char *url, estream_t outfp)
   if (!url)
     return gpg_error (GPG_ERR_INV_URI);
 
-  err = http_parse_uri (&parsed_uri, url, 1);
+  err = http_parse_uri (&parsed_uri, url, HTTP_PARSE_NO_SCHEME_CHECK);
   if (err)
     return err;
 
@@ -382,9 +413,10 @@ ks_action_put (ctrl_t ctrl, uri_item_t keyservers,
       int is_ldap = 0;
 
 #if USE_LDAP
-      is_ldap = (strcmp (uri->parsed_uri->scheme, "ldap") == 0
-		|| strcmp (uri->parsed_uri->scheme, "ldaps") == 0
-		|| strcmp (uri->parsed_uri->scheme, "ldapi") == 0);
+      is_ldap = (!strcmp (uri->parsed_uri->scheme, "ldap")
+                 || !strcmp (uri->parsed_uri->scheme, "ldaps")
+                 || !strcmp (uri->parsed_uri->scheme, "ldapi")
+                 || uri->parsed_uri->opaque);
 #endif
 
       if (is_http || is_ldap)
diff --git a/dirmngr/ks-engine-hkp.c b/dirmngr/ks-engine-hkp.c
index 93c676b..a2b4607 100644
--- a/dirmngr/ks-engine-hkp.c
+++ b/dirmngr/ks-engine-hkp.c
@@ -733,7 +733,8 @@ mark_host_dead (const char *name)
   parsed_uri_t parsed_uri = NULL;
   int done = 0;
 
-  if (name && *name && !http_parse_uri (&parsed_uri, name, 1))
+  if (name && *name
+      && !http_parse_uri (&parsed_uri, name, HTTP_PARSE_NO_SCHEME_CHECK))
     {
       if (parsed_uri->v6lit)
         {
@@ -1484,6 +1485,7 @@ ks_hkp_search (ctrl_t ctrl, parsed_uri_t uri, const char *pattern,
   gpg_error_t err;
   KEYDB_SEARCH_DESC desc;
   char fprbuf[2+64+1];
+  char *namebuffer = NULL;
   char *hostport = NULL;
   char *request = NULL;
   estream_t fp = NULL;
@@ -1508,10 +1510,26 @@ ks_hkp_search (ctrl_t ctrl, parsed_uri_t uri, const char *pattern,
     {
     case KEYDB_SEARCH_MODE_EXACT:
     case KEYDB_SEARCH_MODE_SUBSTR:
-    case KEYDB_SEARCH_MODE_MAIL:
     case KEYDB_SEARCH_MODE_MAILSUB:
       pattern = desc.u.name;
       break;
+    case KEYDB_SEARCH_MODE_MAIL:
+      namebuffer = xtrystrdup (desc.u.name);
+      if (!namebuffer)
+        {
+          err = gpg_error_from_syserror ();
+          goto leave;
+        }
+      /* Strip trailing angle bracket.  */
+      if (namebuffer[0] && namebuffer[1]
+          && namebuffer[strlen (namebuffer)-1] == '>')
+        namebuffer[strlen(namebuffer)-1] = 0;
+      /* Strip optional leading angle bracket.  */
+      if (*namebuffer == '<' && namebuffer[1])
+        pattern = namebuffer + 1;
+      else
+        pattern = namebuffer;
+      break;
     case KEYDB_SEARCH_MODE_SHORT_KID:
       snprintf (fprbuf, sizeof fprbuf, "0x%08lX", (ulong)desc.u.kid[1]);
       pattern = fprbuf;
@@ -1615,6 +1633,7 @@ ks_hkp_search (ctrl_t ctrl, parsed_uri_t uri, const char *pattern,
   xfree (request);
   xfree (hostport);
   xfree (httphost);
+  xfree (namebuffer);
   return err;
 }
 
@@ -1630,6 +1649,7 @@ ks_hkp_get (ctrl_t ctrl, parsed_uri_t uri, const char *keyspec, estream_t *r_fp)
   KEYDB_SEARCH_DESC desc;
   char kidbuf[2+64+1];
   const char *exactname = NULL;
+  char *namebuffer = NULL;
   char *searchkey = NULL;
   char *hostport = NULL;
   char *request = NULL;
@@ -1675,6 +1695,24 @@ ks_hkp_get (ctrl_t ctrl, parsed_uri_t uri, const char *keyspec, estream_t *r_fp)
       exactname = desc.u.name;
       break;
 
+    case KEYDB_SEARCH_MODE_MAIL:
+      namebuffer = xtrystrdup (desc.u.name);
+      if (!namebuffer)
+        {
+          err = gpg_error_from_syserror ();
+          goto leave;
+        }
+      /* Strip trailing angle bracket.  */
+      if (namebuffer[0] && namebuffer[1]
+          && namebuffer[strlen (namebuffer)-1] == '>')
+        namebuffer[strlen(namebuffer)-1] = 0;
+      /* Strip optional leading angle bracket.  */
+      if (*namebuffer == '<' && namebuffer[1])
+        exactname = namebuffer + 1;
+      else
+        exactname = namebuffer;
+      break;
+
     default:
       return gpg_error (GPG_ERR_INV_USER_ID);
     }
@@ -1736,6 +1774,7 @@ ks_hkp_get (ctrl_t ctrl, parsed_uri_t uri, const char *keyspec, estream_t *r_fp)
 
  leave:
   es_fclose (fp);
+  xfree (namebuffer);
   xfree (request);
   xfree (hostport);
   xfree (httphost);
diff --git a/dirmngr/ks-engine-ldap.c b/dirmngr/ks-engine-ldap.c
index 67c456c..e0f8e6f 100644
--- a/dirmngr/ks-engine-ldap.c
+++ b/dirmngr/ks-engine-ldap.c
@@ -24,32 +24,18 @@
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
-#ifdef HAVE_GETOPT_H
-# include <getopt.h>
-#endif
 #include <stdlib.h>
-#include <errno.h>
-#include <assert.h>
-
-#ifdef _WIN32
-# include <winsock2.h>
-# include <winldap.h>
-#else
-# ifdef NEED_LBER_H
-#  include <lber.h>
-# endif
-/* For OpenLDAP, to enable the API that we're using. */
-# define LDAP_DEPRECATED 1
-# include <ldap.h>
-#endif
 #include <npth.h>
 
+
 #include "dirmngr.h"
 #include "misc.h"
 #include "../common/userids.h"
 #include "../common/mbox-util.h"
 #include "ks-engine.h"
+#include "ldap-misc.h"
 #include "ldap-parse-uri.h"
+#include "ldapserver.h"
 
 
 /* Flags with infos from the connected server.  */
@@ -59,177 +45,11 @@
 #define SERVERINFO_NTDS     8 /* Server is an Active Directory.      */
 
 
-
 #ifndef HAVE_TIMEGM
 time_t timegm(struct tm *tm);
 #endif
-
-/* Convert an LDAP error to a GPG error.  */
-static int
-ldap_err_to_gpg_err (int code)
-{
-  gpg_err_code_t ec;
-
-  switch (code)
-    {
-#ifdef LDAP_X_CONNECTING
-    case LDAP_X_CONNECTING: ec = GPG_ERR_LDAP_X_CONNECTING; break;
-#endif
-
-    case LDAP_REFERRAL_LIMIT_EXCEEDED: ec = GPG_ERR_LDAP_REFERRAL_LIMIT; break;
-    case LDAP_CLIENT_LOOP: ec = GPG_ERR_LDAP_CLIENT_LOOP; break;
-    case LDAP_NO_RESULTS_RETURNED: ec = GPG_ERR_LDAP_NO_RESULTS; break;
-    case LDAP_CONTROL_NOT_FOUND: ec = GPG_ERR_LDAP_CONTROL_NOT_FOUND; break;
-    case LDAP_NOT_SUPPORTED: ec = GPG_ERR_LDAP_NOT_SUPPORTED; break;
-    case LDAP_CONNECT_ERROR: ec = GPG_ERR_LDAP_CONNECT; break;
-    case LDAP_NO_MEMORY: ec = GPG_ERR_LDAP_NO_MEMORY; break;
-    case LDAP_PARAM_ERROR: ec = GPG_ERR_LDAP_PARAM; break;
-    case LDAP_USER_CANCELLED: ec = GPG_ERR_LDAP_USER_CANCELLED; break;
-    case LDAP_FILTER_ERROR: ec = GPG_ERR_LDAP_FILTER; break;
-    case LDAP_AUTH_UNKNOWN: ec = GPG_ERR_LDAP_AUTH_UNKNOWN; break;
-    case LDAP_TIMEOUT: ec = GPG_ERR_LDAP_TIMEOUT; break;
-    case LDAP_DECODING_ERROR: ec = GPG_ERR_LDAP_DECODING; break;
-    case LDAP_ENCODING_ERROR: ec = GPG_ERR_LDAP_ENCODING; break;
-    case LDAP_LOCAL_ERROR: ec = GPG_ERR_LDAP_LOCAL; break;
-    case LDAP_SERVER_DOWN: ec = GPG_ERR_LDAP_SERVER_DOWN; break;
-
-    case LDAP_SUCCESS: ec = GPG_ERR_LDAP_SUCCESS; break;
-
-    case LDAP_OPERATIONS_ERROR: ec = GPG_ERR_LDAP_OPERATIONS; break;
-    case LDAP_PROTOCOL_ERROR: ec = GPG_ERR_LDAP_PROTOCOL; break;
-    case LDAP_TIMELIMIT_EXCEEDED: ec = GPG_ERR_LDAP_TIMELIMIT; break;
-    case LDAP_SIZELIMIT_EXCEEDED: ec = GPG_ERR_LDAP_SIZELIMIT; break;
-    case LDAP_COMPARE_FALSE: ec = GPG_ERR_LDAP_COMPARE_FALSE; break;
-    case LDAP_COMPARE_TRUE: ec = GPG_ERR_LDAP_COMPARE_TRUE; break;
-    case LDAP_AUTH_METHOD_NOT_SUPPORTED: ec=GPG_ERR_LDAP_UNSUPPORTED_AUTH;break;
-    case LDAP_STRONG_AUTH_REQUIRED: ec = GPG_ERR_LDAP_STRONG_AUTH_RQRD; break;
-    case LDAP_PARTIAL_RESULTS: ec = GPG_ERR_LDAP_PARTIAL_RESULTS; break;
-    case LDAP_REFERRAL: ec = GPG_ERR_LDAP_REFERRAL; break;
-
-#ifdef LDAP_ADMINLIMIT_EXCEEDED
-    case LDAP_ADMINLIMIT_EXCEEDED: ec = GPG_ERR_LDAP_ADMINLIMIT; break;
-#endif
-
-#ifdef LDAP_UNAVAILABLE_CRITICAL_EXTENSION
-    case LDAP_UNAVAILABLE_CRITICAL_EXTENSION:
-                               ec = GPG_ERR_LDAP_UNAVAIL_CRIT_EXTN; break;
-#endif
-
-    case LDAP_CONFIDENTIALITY_REQUIRED: ec = GPG_ERR_LDAP_CONFIDENT_RQRD; break;
-    case LDAP_SASL_BIND_IN_PROGRESS: ec = GPG_ERR_LDAP_SASL_BIND_INPROG; break;
-    case LDAP_NO_SUCH_ATTRIBUTE: ec = GPG_ERR_LDAP_NO_SUCH_ATTRIBUTE; break;
-    case LDAP_UNDEFINED_TYPE: ec = GPG_ERR_LDAP_UNDEFINED_TYPE; break;
-    case LDAP_INAPPROPRIATE_MATCHING: ec = GPG_ERR_LDAP_BAD_MATCHING; break;
-    case LDAP_CONSTRAINT_VIOLATION: ec = GPG_ERR_LDAP_CONST_VIOLATION; break;
-
-#ifdef LDAP_TYPE_OR_VALUE_EXISTS
-    case LDAP_TYPE_OR_VALUE_EXISTS: ec = GPG_ERR_LDAP_TYPE_VALUE_EXISTS; break;
-#endif
-
-    case LDAP_INVALID_SYNTAX: ec = GPG_ERR_LDAP_INV_SYNTAX; break;
-    case LDAP_NO_SUCH_OBJECT: ec = GPG_ERR_LDAP_NO_SUCH_OBJ; break;
-    case LDAP_ALIAS_PROBLEM: ec = GPG_ERR_LDAP_ALIAS_PROBLEM; break;
-    case LDAP_INVALID_DN_SYNTAX: ec = GPG_ERR_LDAP_INV_DN_SYNTAX; break;
-    case LDAP_IS_LEAF: ec = GPG_ERR_LDAP_IS_LEAF; break;
-    case LDAP_ALIAS_DEREF_PROBLEM: ec = GPG_ERR_LDAP_ALIAS_DEREF; break;
-
-#ifdef LDAP_X_PROXY_AUTHZ_FAILURE
-    case LDAP_X_PROXY_AUTHZ_FAILURE: ec = GPG_ERR_LDAP_X_PROXY_AUTH_FAIL; break;
-#endif
-
-    case LDAP_INAPPROPRIATE_AUTH: ec = GPG_ERR_LDAP_BAD_AUTH; break;
-    case LDAP_INVALID_CREDENTIALS: ec = GPG_ERR_LDAP_INV_CREDENTIALS; break;
-
-#ifdef LDAP_INSUFFICIENT_ACCESS
-    case LDAP_INSUFFICIENT_ACCESS: ec = GPG_ERR_LDAP_INSUFFICIENT_ACC; break;
-#endif
-
-    case LDAP_BUSY: ec = GPG_ERR_LDAP_BUSY; break;
-    case LDAP_UNAVAILABLE: ec = GPG_ERR_LDAP_UNAVAILABLE; break;
-    case LDAP_UNWILLING_TO_PERFORM: ec = GPG_ERR_LDAP_UNWILL_TO_PERFORM; break;
-    case LDAP_LOOP_DETECT: ec = GPG_ERR_LDAP_LOOP_DETECT; break;
-    case LDAP_NAMING_VIOLATION: ec = GPG_ERR_LDAP_NAMING_VIOLATION; break;
-    case LDAP_OBJECT_CLASS_VIOLATION: ec = GPG_ERR_LDAP_OBJ_CLS_VIOLATION; break;
-    case LDAP_NOT_ALLOWED_ON_NONLEAF: ec=GPG_ERR_LDAP_NOT_ALLOW_NONLEAF;break;
-    case LDAP_NOT_ALLOWED_ON_RDN: ec = GPG_ERR_LDAP_NOT_ALLOW_ON_RDN; break;
-    case LDAP_ALREADY_EXISTS: ec = GPG_ERR_LDAP_ALREADY_EXISTS; break;
-    case LDAP_NO_OBJECT_CLASS_MODS: ec = GPG_ERR_LDAP_NO_OBJ_CLASS_MODS; break;
-    case LDAP_RESULTS_TOO_LARGE: ec = GPG_ERR_LDAP_RESULTS_TOO_LARGE; break;
-    case LDAP_AFFECTS_MULTIPLE_DSAS: ec = GPG_ERR_LDAP_AFFECTS_MULT_DSAS; break;
-
-#ifdef LDAP_VLV_ERROR
-    case LDAP_VLV_ERROR: ec = GPG_ERR_LDAP_VLV; break;
-#endif
-
-    case LDAP_OTHER: ec = GPG_ERR_LDAP_OTHER; break;
-
-#ifdef LDAP_CUP_RESOURCES_EXHAUSTED
-    case LDAP_CUP_RESOURCES_EXHAUSTED: ec=GPG_ERR_LDAP_CUP_RESOURCE_LIMIT;break;
-    case LDAP_CUP_SECURITY_VIOLATION: ec=GPG_ERR_LDAP_CUP_SEC_VIOLATION; break;
-    case LDAP_CUP_INVALID_DATA: ec = GPG_ERR_LDAP_CUP_INV_DATA; break;
-    case LDAP_CUP_UNSUPPORTED_SCHEME: ec = GPG_ERR_LDAP_CUP_UNSUP_SCHEME; break;
-    case LDAP_CUP_RELOAD_REQUIRED: ec = GPG_ERR_LDAP_CUP_RELOAD; break;
-#endif
-
-#ifdef LDAP_CANCELLED
-    case LDAP_CANCELLED: ec = GPG_ERR_LDAP_CANCELLED; break;
-#endif
-
-#ifdef LDAP_NO_SUCH_OPERATION
-    case LDAP_NO_SUCH_OPERATION: ec = GPG_ERR_LDAP_NO_SUCH_OPERATION; break;
-#endif
-
-#ifdef LDAP_TOO_LATE
-    case LDAP_TOO_LATE: ec = GPG_ERR_LDAP_TOO_LATE; break;
-#endif
 
-#ifdef LDAP_CANNOT_CANCEL
-    case LDAP_CANNOT_CANCEL: ec = GPG_ERR_LDAP_CANNOT_CANCEL; break;
-#endif
 
-#ifdef LDAP_ASSERTION_FAILED
-    case LDAP_ASSERTION_FAILED: ec = GPG_ERR_LDAP_ASSERTION_FAILED; break;
-#endif
-
-#ifdef LDAP_PROXIED_AUTHORIZATION_DENIED
-    case LDAP_PROXIED_AUTHORIZATION_DENIED:
-                                      ec = GPG_ERR_LDAP_PROX_AUTH_DENIED; break;
-#endif
-
-    default:
-#if defined(LDAP_E_ERROR) && defined(LDAP_X_ERROR)
-      if (LDAP_E_ERROR (code))
-        ec = GPG_ERR_LDAP_E_GENERAL;
-      else if (LDAP_X_ERROR (code))
-        ec = GPG_ERR_LDAP_X_GENERAL;
-      else
-#endif
-        ec = GPG_ERR_LDAP_GENERAL;
-      break;
-    }
-
-  return ec;
-}
-
-/* Retrieve an LDAP error and return it's GPG equivalent.  */
-static int
-ldap_to_gpg_err (LDAP *ld)
-{
-#if defined(HAVE_LDAP_GET_OPTION) && defined(LDAP_OPT_ERROR_NUMBER)
-  int err;
-
-  if (ldap_get_option (ld, LDAP_OPT_ERROR_NUMBER, &err) == 0)
-    return ldap_err_to_gpg_err (err);
-  else
-    return GPG_ERR_GENERAL;
-#elif defined(HAVE_LDAP_LD_ERRNO)
-  return ldap_err_to_gpg_err (ld->ld_errno);
-#else
-  /* We should never get here since the LDAP library should always
-     have either ldap_get_option or ld_errno, but just in case... */
-  return GPG_ERR_INTERNAL;
-#endif
-}
 
 static time_t
 ldap2epochtime (const char *timestr)
@@ -295,6 +115,16 @@ epoch2ldaptime (time_t stamp)
     return xstrdup ("INVALID TIME");
 }
 #endif
+
+
+static void
+my_ldap_value_free (char **vals)
+{
+  if (vals)
+    ldap_value_free (vals);
+}
+
+
 
 /* Print a help output for the schemata supported by this module. */
 gpg_error_t
@@ -302,24 +132,31 @@ ks_ldap_help (ctrl_t ctrl, parsed_uri_t uri)
 {
   const char data[] =
     "Handler for LDAP URLs:\n"
-    "  ldap://host:port/[BASEDN]???[bindname=BINDNAME,password=PASSWORD]\n"
+    "  ldap://HOST:PORT/[BASEDN]????[bindname=BINDNAME,password=PASSWORD]\n"
     "\n"
     "Note: basedn, bindname and password need to be percent escaped. In\n"
     "particular, spaces need to be replaced with %20 and commas with %2c.\n"
-    "bindname will typically be of the form:\n"
+    "Thus bindname will typically be of the form:\n"
     "\n"
     "  uid=user%2cou=PGP%20Users%2cdc=EXAMPLE%2cdc=ORG\n"
     "\n"
     "The ldaps:// and ldapi:// schemes are also supported.  If ldaps is used\n"
     "then the server's certificate will be checked.  If it is not valid, any\n"
-    "operation will be aborted.\n"
+    "operation will be aborted.  Note that ldaps means LDAP with STARTTLS\n"
+    "\n"
+    "As an alternative to an URL a string in this form may be used:\n"
+    "\n"
+    "  HOST:PORT:BINDNAME:PASSWORD:BASEDN:FLAGS:\n"
+    "\n"
+    "The use of the percent sign or a colon in one of the string values is\n"
+    "currently not supported.\n"
     "\n"
     "Supported methods: search, get, put\n";
   gpg_error_t err;
 
   if(!uri)
     err = ks_print_help (ctrl, "  ldap");
-  else if (uri->is_ldap)
+  else if (uri->is_ldap || uri->opaque)
     err = ks_print_help (ctrl, data);
   else
     err = 0;
@@ -379,7 +216,8 @@ keyspec_to_ldap_filter (const char *keyspec, char **filter, int only_exact,
       else
         p = freeme;
       if ((serverinfo & SERVERINFO_SCHEMAV2))
-        f = xasprintf ("(gpgMailbox=%s)", p);
+        f = xasprintf ("(&(gpgMailbox=%s)(!(|(pgpRevoked=1)(pgpDisabled=1))))",
+                       p);
       else if (!only_exact)
         f = xasprintf ("(pgpUserID=*<%s>*)", p);
       break;
@@ -480,96 +318,176 @@ keyspec_to_ldap_filter (const char *keyspec, char **filter, int only_exact,
    If no LDAP error occurred, you still need to check that *basednp is
    valid.  If it is NULL, then the server does not appear to be an
    OpenPGP Keyserver.  */
-static int
+static gpg_error_t
 my_ldap_connect (parsed_uri_t uri, LDAP **ldap_connp,
-                 char **basednp, unsigned int *r_serverinfo)
+                 char **r_basedn, char **r_host, int *r_use_tls,
+                 unsigned int *r_serverinfo)
 {
-  int err = 0;
+  gpg_error_t err = 0;
+  int lerr;
+  ldap_server_t server = NULL;
   LDAP *ldap_conn = NULL;
-  char *user = uri->auth;
-  struct uri_tuple_s *password_param;
-  char *password;
   char *basedn = NULL;
+  char *host = NULL;   /* Host to use.  */
+  int port;            /* Port to use.  */
+  int use_tls;         /* 1 = starttls, 2 = ldap-over-tls  */
+  int use_ntds;        /* Use Active Directory authentication.  */
+  const char *bindname;
+  const char *password;
+  const char *basedn_arg;
+#ifndef HAVE_W32_SYSTEM
+  char *tmpstr;
+#endif
 
+  if (r_basedn)
+    *r_basedn = NULL;
+  if (r_host)
+    *r_host = NULL;
+  if (r_use_tls)
+    *r_use_tls = 0;
   *r_serverinfo = 0;
 
-  password_param = uri_query_lookup (uri, "password");
-  password = password_param ? password_param->value : NULL;
+  if (uri->opaque)
+    {
+      server = ldapserver_parse_one (uri->path, NULL, 0);
+      if (!server)
+        return gpg_error (GPG_ERR_LDAP_OTHER);
+      host = server->host;
+      port = server->port;
+      bindname = server->user;
+      password = bindname? server->pass : NULL;
+      basedn_arg = server->base;
+      use_tls = server->starttls? 1 : server->ldap_over_tls? 2 : 0;
+      use_ntds = server->ntds;
+    }
+  else
+    {
+      host = uri->host;
+      port = uri->port;
+      bindname = uri->auth;
+      password = bindname? uri_query_value (uri, "password") : NULL;
+      basedn_arg = uri->path;
+      use_tls = uri->use_tls ? 1 : 0;
+      use_ntds = uri->ad_current;
+    }
+
+  if (!port)
+    port = use_tls == 2? 636 : 389;
+
+
+  if (host)
+    {
+      host = xtrystrdup (host);
+      if (!host)
+        {
+          err = gpg_error_from_syserror ();
+          goto out;
+        }
+    }
+
+  if (opt.verbose)
+    log_info ("ldap connect to '%s:%d:%s:%s:%s:%s%s'\n",
+              host, port,
+              basedn_arg ? basedn_arg : "",
+              bindname ? bindname : "",
+              password ? "*****" : "",
+              use_tls == 1? "starttls" : use_tls == 2? "ldaptls" : "plain",
+              use_ntds ? ",ntds":"");
 
-  if (opt.debug)
-    log_debug ("my_ldap_connect(%s:%d/%s????%s%s%s%s%s%s)\n",
-               uri->host, uri->port,
-               uri->path ? uri->path : "",
-               uri->auth ? "bindname=" : "",
-               uri->auth ? uri->auth : "",
-               uri->auth && password ? "," : "",
-               password ? "password=" : "",
-               password ? ">not shown<": "",
-               uri->ad_current? " auth=>current_user<":"");
 
   /* If the uri specifies a secure connection and we don't support
      TLS, then fail; don't silently revert to an insecure
      connection.  */
-  if (uri->use_tls)
+  if (use_tls)
     {
 #ifndef HAVE_LDAP_START_TLS_S
-      log_error ("Can't use LDAP to connect to the server: no TLS support.");
+      log_error ("ldap: can't connect to the server: no TLS support.");
       err = GPG_ERR_LDAP_NOT_SUPPORTED;
       goto out;
 #endif
     }
 
-  ldap_conn = ldap_init (uri->host, uri->port);
+
+#ifdef HAVE_W32_SYSTEM
+  /* Note that host==NULL uses the default domain controller.  */
+  npth_unprotect ();
+  ldap_conn = ldap_sslinit (host, port, (use_tls == 2));
+  npth_protect ();
   if (!ldap_conn)
     {
-      err = gpg_err_code_from_syserror ();
-      log_error ("error initializing LDAP for (%s://%s:%d)\n",
-                 uri->scheme, uri->host, uri->port);
+      lerr = LdapGetLastError ();
+      err = ldap_err_to_gpg_err (lerr);
+      log_error ("error initializing LDAP '%s:%d': %s\n",
+                 host, port, ldap_err2string (lerr));
+      goto out;
+    }
+#else /* Unix */
+  tmpstr = xtryasprintf ("%s://%s:%d",
+                         use_tls == 2? "ldaps" : "ldap",
+                         host, port);
+  if (!tmpstr)
+    {
+      err = gpg_error_from_syserror ();
       goto out;
     }
+  npth_unprotect ();
+  lerr = ldap_initialize (&ldap_conn, tmpstr);
+  npth_protect ();
+  if (lerr != LDAP_SUCCESS || !ldap_conn)
+    {
+      err = ldap_err_to_gpg_err (lerr);
+      log_error ("error initializing LDAP '%s': %s\n",
+                 tmpstr, ldap_err2string (lerr));
+      xfree (tmpstr);
+      goto out;
+    }
+  xfree (tmpstr);
+#endif /* Unix */
 
 #ifdef HAVE_LDAP_SET_OPTION
   {
     int ver = LDAP_VERSION3;
 
-    err = ldap_set_option (ldap_conn, LDAP_OPT_PROTOCOL_VERSION, &ver);
-    if (err != LDAP_SUCCESS)
+    lerr = ldap_set_option (ldap_conn, LDAP_OPT_PROTOCOL_VERSION, &ver);
+    if (lerr != LDAP_SUCCESS)
       {
 	log_error ("ks-ldap: unable to go to LDAP 3: %s\n",
-		   ldap_err2string (err));
+		   ldap_err2string (lerr));
+	err = ldap_err_to_gpg_err (lerr);
 	goto out;
       }
   }
-#endif
-
-  /* XXX: It would be nice to have an option to provide the server's
-     certificate.  */
-#if 0
-#if defined(LDAP_OPT_X_TLS_CACERTFILE) && defined(HAVE_LDAP_SET_OPTION)
-  err = ldap_set_option (NULL, LDAP_OPT_X_TLS_CACERTFILE, ca_cert_file);
-  if (err)
+  if (opt.ldaptimeout)
     {
-      log_error ("unable to set ca-cert-file to '%s': %s\n",
-		 ca_cert_file, ldap_err2string (err));
-      goto out;
+      int ver = opt.ldaptimeout;
+
+      lerr = ldap_set_option (ldap_conn, LDAP_OPT_TIMELIMIT, &ver);
+      if (lerr != LDAP_SUCCESS)
+        {
+          log_error ("ks-ldap: unable to set LDAP timelimit to %us: %s\n",
+                     opt.ldaptimeout, ldap_err2string (lerr));
+          err = ldap_err_to_gpg_err (lerr);
+          goto out;
+        }
+      if (opt.verbose)
+        log_info ("ldap timeout set to %us\n", opt.ldaptimeout);
     }
-#endif /* LDAP_OPT_X_TLS_CACERTFILE && HAVE_LDAP_SET_OPTION */
 #endif
 
+
 #ifdef HAVE_LDAP_START_TLS_S
-  if (uri->use_tls)
+  if (use_tls == 1)
     {
-      /* XXX: We need an option to determine whether to abort if the
-	 certificate is bad or not.  Right now we conservatively
-	 default to checking the certificate and aborting.  */
 #ifndef HAVE_W32_SYSTEM
       int check_cert = LDAP_OPT_X_TLS_HARD; /* LDAP_OPT_X_TLS_NEVER */
 
-      err = ldap_set_option (ldap_conn,
-			     LDAP_OPT_X_TLS_REQUIRE_CERT, &check_cert);
-      if (err)
+      lerr = ldap_set_option (ldap_conn,
+                              LDAP_OPT_X_TLS_REQUIRE_CERT, &check_cert);
+      if (lerr)
 	{
-	  log_error ("error setting TLS option on LDAP connection\n");
+	  log_error ("ldap: error setting an TLS option: %s\n",
+                     ldap_err2string (lerr));
+          err = ldap_err_to_gpg_err (lerr);
 	  goto out;
 	}
 #else
@@ -581,7 +499,7 @@ my_ldap_connect (parsed_uri_t uri, LDAP **ldap_connp,
 #endif
 
       npth_unprotect ();
-      err = ldap_start_tls_s (ldap_conn,
+      lerr = ldap_start_tls_s (ldap_conn,
 #ifdef HAVE_W32_SYSTEM
 			      /* ServerReturnValue, result */
 			      NULL, NULL,
@@ -589,45 +507,44 @@ my_ldap_connect (parsed_uri_t uri, LDAP **ldap_connp,
 			      /* ServerControls, ClientControls */
 			      NULL, NULL);
       npth_protect ();
-      if (err)
+      if (lerr)
 	{
-	  log_error ("error connecting to LDAP server with TLS\n");
+	  log_error ("ldap: error switching to STARTTLS mode: %s\n",
+                     ldap_err2string (lerr));
+          err = ldap_err_to_gpg_err (lerr);
 	  goto out;
 	}
     }
 #endif
 
-  if (uri->ad_current)
+  if (use_ntds)
     {
-      if (opt.debug)
-        log_debug ("LDAP bind to current user via AD\n");
 #ifdef HAVE_W32_SYSTEM
       npth_unprotect ();
-      err = ldap_bind_s (ldap_conn, NULL, NULL, LDAP_AUTH_NEGOTIATE);
+      lerr = ldap_bind_s (ldap_conn, NULL, NULL, LDAP_AUTH_NEGOTIATE);
       npth_protect ();
-      if (err != LDAP_SUCCESS)
+      if (lerr != LDAP_SUCCESS)
 	{
 	  log_error ("error binding to LDAP via AD: %s\n",
-                     ldap_err2string (err));
+                     ldap_err2string (lerr));
+          err = ldap_err_to_gpg_err (lerr);
 	  goto out;
 	}
 #else
+      log_error ("ldap: no Active Directory support but 'ntds' requested\n");
       err = gpg_error (GPG_ERR_NOT_SUPPORTED);
       goto out;
 #endif
     }
-  else if (uri->auth)
+  else if (bindname)
     {
-      if (opt.debug)
-        log_debug ("LDAP bind to %s, password %s\n",
-                   user, password ? ">not shown<" : ">none<");
-
       npth_unprotect ();
-      err = ldap_simple_bind_s (ldap_conn, user, password);
+      lerr = ldap_simple_bind_s (ldap_conn, bindname, password);
       npth_protect ();
-      if (err != LDAP_SUCCESS)
+      if (lerr != LDAP_SUCCESS)
 	{
-	  log_error ("error binding to LDAP: %s\n", ldap_err2string (err));
+	  log_error ("error binding to LDAP: %s\n", ldap_err2string (lerr));
+          err = ldap_err_to_gpg_err (lerr);
 	  goto out;
 	}
     }
@@ -636,13 +553,16 @@ my_ldap_connect (parsed_uri_t uri, LDAP **ldap_connp,
       /* By default we don't bind as there is usually no need to.  */
     }
 
-  if (uri->path && *uri->path)
+  if (basedn_arg && *basedn_arg)
     {
-      /* User specified base DN.  */
-      basedn = xstrdup (uri->path);
-
-      /* If the user specifies a base DN, then we know the server is a
+      /* User specified base DN.  In this case we know the server is a
        * real LDAP server.  */
+      basedn = xtrystrdup (basedn_arg);
+      if (!basedn)
+        {
+          err = gpg_error_from_syserror ();
+          goto out;
+        }
       *r_serverinfo |= SERVERINFO_REALLDAP;
     }
   else
@@ -651,11 +571,11 @@ my_ldap_connect (parsed_uri_t uri, LDAP **ldap_connp,
       char *attr[] = { "namingContexts", NULL };
 
       npth_unprotect ();
-      err = ldap_search_s (ldap_conn, "", LDAP_SCOPE_BASE,
+      lerr = ldap_search_s (ldap_conn, "", LDAP_SCOPE_BASE,
 			   "(objectClass=*)", attr, 0, &res);
       npth_protect ();
 
-      if (err == LDAP_SUCCESS)
+      if (lerr == LDAP_SUCCESS)
 	{
 	  char **context;
 
@@ -674,7 +594,7 @@ my_ldap_connect (parsed_uri_t uri, LDAP **ldap_connp,
 
               *r_serverinfo |= SERVERINFO_REALLDAP;
 
-	      for (i = 0; context[i] && ! basedn; i++)
+	      for (i = 0; context[i] && !basedn; i++)
 		{
 		  char **vals;
 		  LDAPMessage *si_res;
@@ -684,36 +604,36 @@ my_ldap_connect (parsed_uri_t uri, LDAP **ldap_connp,
                     char *object = xasprintf ("cn=pgpServerInfo,%s",
                                               context[i]);
                     npth_unprotect ();
-                    err = ldap_search_s (ldap_conn, object, LDAP_SCOPE_BASE,
+                    lerr = ldap_search_s (ldap_conn, object, LDAP_SCOPE_BASE,
                                          "(objectClass=*)", attr2, 0, &si_res);
                     npth_protect ();
                     xfree (object);
                   }
 
-		  if (err == LDAP_SUCCESS)
+		  if (lerr == LDAP_SUCCESS)
 		    {
 		      vals = ldap_get_values (ldap_conn, si_res,
 					      "pgpBaseKeySpaceDN");
-		      if (vals)
+		      if (vals && vals[0])
 			{
 			  basedn = xtrystrdup (vals[0]);
-			  ldap_value_free (vals);
 			}
+                      my_ldap_value_free (vals);
 
 		      vals = ldap_get_values (ldap_conn, si_res,
 					      "pgpSoftware");
-		      if (vals)
+		      if (vals && vals[0])
 			{
                           if (opt.debug)
                             log_debug ("Server: \t%s\n", vals[0]);
                           if (!ascii_strcasecmp (vals[0], "GnuPG"))
                             is_gnupg = 1;
-			  ldap_value_free (vals);
 			}
+                      my_ldap_value_free (vals);
 
 		      vals = ldap_get_values (ldap_conn, si_res,
 					      "pgpVersion");
-		      if (vals)
+		      if (vals && vals[0])
 			{
                           if (opt.debug)
                             log_debug ("Version:\t%s\n", vals[0]);
@@ -729,8 +649,8 @@ my_ldap_connect (parsed_uri_t uri, LDAP **ldap_connp,
                                   && !ascii_strcasecmp (fields[1], "ntds"))
                                 *r_serverinfo |= SERVERINFO_NTDS;
                             }
-			  ldap_value_free (vals);
 			}
+                      my_ldap_value_free (vals);
 		    }
 
 		  /* From man ldap_search_s: "res parameter of
@@ -743,7 +663,7 @@ my_ldap_connect (parsed_uri_t uri, LDAP **ldap_connp,
 	      ldap_value_free (context);
 	    }
 	}
-      else
+      else /* ldap_search failed.  */
 	{
 	  /* We don't have an answer yet, which means the server might
 	     be a PGP.com keyserver. */
@@ -753,32 +673,32 @@ my_ldap_connect (parsed_uri_t uri, LDAP **ldap_connp,
 	  char *attr2[] = { "pgpBaseKeySpaceDN", "version", "software", NULL };
 
           npth_unprotect ();
-	  err = ldap_search_s (ldap_conn, "cn=pgpServerInfo", LDAP_SCOPE_BASE,
+	  lerr = ldap_search_s (ldap_conn, "cn=pgpServerInfo", LDAP_SCOPE_BASE,
 			       "(objectClass=*)", attr2, 0, &si_res);
           npth_protect ();
-	  if (err == LDAP_SUCCESS)
+	  if (lerr == LDAP_SUCCESS)
 	    {
 	      /* For the PGP LDAP keyserver, this is always
 	       * "OU=ACTIVE,O=PGP KEYSPACE,C=US", but it might not be
                * in the future. */
 
 	      vals = ldap_get_values (ldap_conn, si_res, "baseKeySpaceDN");
-	      if (vals)
+	      if (vals && vals[0])
 		{
 		  basedn = xtrystrdup (vals[0]);
-		  ldap_value_free (vals);
 		}
+              my_ldap_value_free (vals);
 
 	      vals = ldap_get_values (ldap_conn, si_res, "software");
-	      if (vals)
+	      if (vals && vals[0])
 		{
                   if (opt.debug)
                     log_debug ("ks-ldap: PGP Server: \t%s\n", vals[0]);
-		  ldap_value_free (vals);
 		}
+              my_ldap_value_free (vals);
 
 	      vals = ldap_get_values (ldap_conn, si_res, "version");
-	      if (vals)
+	      if (vals && vals[0])
 		{
                   if (opt.debug)
                     log_debug ("ks-ldap: PGP Server Version:\t%s\n", vals[0]);
@@ -792,8 +712,8 @@ my_ldap_connect (parsed_uri_t uri, LDAP **ldap_connp,
 		  if (atoi (vals[0]) > 1)
                     *r_serverinfo |= SERVERINFO_PGPKEYV2;
 
-		  ldap_value_free (vals);
 		}
+              my_ldap_value_free (vals);
 	    }
 
 	  ldap_msgfree (si_res);
@@ -816,23 +736,27 @@ my_ldap_connect (parsed_uri_t uri, LDAP **ldap_connp,
                  (*r_serverinfo & SERVERINFO_PGPKEYV2)? "pgpKeyV2":"pgpKey");
     }
 
-  if (err)
-    xfree (basedn);
-  else
-    {
-      if (basednp)
-	*basednp = basedn;
-      else
-	xfree (basedn);
-    }
+  ldapserver_list_free (server);
 
   if (err)
     {
+      xfree (basedn);
       if (ldap_conn)
 	ldap_unbind (ldap_conn);
     }
   else
-    *ldap_connp = ldap_conn;
+    {
+      if (r_basedn)
+	*r_basedn = basedn;
+      else
+	xfree (basedn);
+      if (r_host)
+        *r_host = host;
+      else
+        xfree (host);
+
+      *ldap_connp = ldap_conn;
+    }
 
   return err;
 }
@@ -847,10 +771,17 @@ extract_keys (estream_t output,
   char **vals;
 
   es_fprintf (output, "INFO %s BEGIN\n", certid);
-  es_fprintf (output, "pub:%s:", certid);
 
   /* Note: ldap_get_values returns a NULL terminated array of
      strings.  */
+
+  vals = ldap_get_values (ldap_conn, message, "gpgfingerprint");
+  if (vals && vals[0] && vals[0][0])
+    es_fprintf (output, "pub:%s:", vals[0]);
+  else
+    es_fprintf (output, "pub:%s:", certid);
+  my_ldap_value_free (vals);
+
   vals = ldap_get_values (ldap_conn, message, "pgpkeytype");
   if (vals && vals[0])
     {
@@ -858,8 +789,8 @@ extract_keys (estream_t output,
 	es_fprintf  (output, "1");
       else if (strcmp (vals[0],"DSS/DH") == 0)
 	es_fprintf (output, "17");
-      ldap_value_free (vals);
     }
+  my_ldap_value_free (vals);
 
   es_fprintf (output, ":");
 
@@ -869,8 +800,8 @@ extract_keys (estream_t output,
       int v = atoi (vals[0]);
       if (v > 0)
 	es_fprintf (output, "%d", v);
-      ldap_value_free (vals);
     }
+  my_ldap_value_free (vals);
 
   es_fprintf (output, ":");
 
@@ -879,8 +810,8 @@ extract_keys (estream_t output,
     {
       if (strlen (vals[0]) == 15)
 	es_fprintf (output, "%u", (unsigned int) ldap2epochtime (vals[0]));
-      ldap_value_free (vals);
     }
+  my_ldap_value_free (vals);
 
   es_fprintf (output, ":");
 
@@ -889,8 +820,8 @@ extract_keys (estream_t output,
     {
       if (strlen (vals[0]) == 15)
 	es_fprintf (output, "%u", (unsigned int) ldap2epochtime (vals[0]));
-      ldap_value_free (vals);
     }
+  my_ldap_value_free (vals);
 
   es_fprintf (output, ":");
 
@@ -899,8 +830,8 @@ extract_keys (estream_t output,
     {
       if (atoi (vals[0]) == 1)
 	es_fprintf (output, "r");
-      ldap_value_free (vals);
     }
+  my_ldap_value_free (vals);
 
   es_fprintf (output, "\n");
 
@@ -910,8 +841,8 @@ extract_keys (estream_t output,
       int i;
       for (i = 0; vals[i]; i++)
 	es_fprintf (output, "uid:%s\n", vals[i]);
-      ldap_value_free (vals);
     }
+  my_ldap_value_free (vals);
 
   es_fprintf (output, "INFO %s END\n", certid);
 }
@@ -926,6 +857,8 @@ ks_ldap_get (ctrl_t ctrl, parsed_uri_t uri, const char *keyspec,
   gpg_error_t err = 0;
   int ldap_err;
   unsigned int serverinfo;
+  char *host = NULL;
+  int use_tls;
   char *filter = NULL;
   LDAP *ldap_conn = NULL;
   char *basedn = NULL;
@@ -942,12 +875,11 @@ ks_ldap_get (ctrl_t ctrl, parsed_uri_t uri, const char *keyspec,
     }
 
   /* Make sure we are talking to an OpenPGP LDAP server.  */
-  ldap_err = my_ldap_connect (uri, &ldap_conn, &basedn, &serverinfo);
-  if (ldap_err || !basedn)
+  err = my_ldap_connect (uri, &ldap_conn,
+                         &basedn, &host, &use_tls, &serverinfo);
+  if (err || !basedn)
     {
-      if (ldap_err)
-	err = ldap_err_to_gpg_err (ldap_err);
-      else
+      if (!err)
 	err = gpg_error (GPG_ERR_GENERAL);
       goto out;
     }
@@ -970,6 +902,7 @@ ks_ldap_get (ctrl_t ctrl, parsed_uri_t uri, const char *keyspec,
 	"dummy",
 	"pgpcertid", "pgpuserid", "pgpkeyid", "pgprevoked", "pgpdisabled",
 	"pgpkeycreatetime", "modifytimestamp", "pgpkeysize", "pgpkeytype",
+        "gpgfingerprint",
 	NULL
       };
     /* 1 if we want just attribute types; 0 if we want both attribute
@@ -1072,7 +1005,7 @@ ks_ldap_get (ctrl_t ctrl, parsed_uri_t uri, const char *keyspec,
 		}
 	    }
 
-	  ldap_value_free (certid);
+          my_ldap_value_free (certid);
 	}
 
       free_strlist (seen);
@@ -1082,7 +1015,8 @@ ks_ldap_get (ctrl_t ctrl, parsed_uri_t uri, const char *keyspec,
 
       if (!err && anykey)
         err = dirmngr_status_printf (ctrl, "SOURCE", "%s://%s",
-                                     uri->scheme, uri->host? uri->host:"");
+                                     use_tls? "ldaps" : "ldap",
+                                     host? host:"");
     }
   }
 
@@ -1104,6 +1038,7 @@ ks_ldap_get (ctrl_t ctrl, parsed_uri_t uri, const char *keyspec,
     }
 
   xfree (basedn);
+  xfree (host);
 
   if (ldap_conn)
     ldap_unbind (ldap_conn);
@@ -1138,12 +1073,10 @@ ks_ldap_search (ctrl_t ctrl, parsed_uri_t uri, const char *pattern,
     }
 
   /* Make sure we are talking to an OpenPGP LDAP server.  */
-  ldap_err = my_ldap_connect (uri, &ldap_conn, &basedn, &serverinfo);
-  if (ldap_err || !basedn)
+  err = my_ldap_connect (uri, &ldap_conn, &basedn, NULL, NULL, &serverinfo);
+  if (err || !basedn)
     {
-      if (ldap_err)
-	err = ldap_err_to_gpg_err (ldap_err);
-      else
+      if (!err)
 	err = GPG_ERR_GENERAL;
       goto out;
     }
@@ -1177,7 +1110,8 @@ ks_ldap_search (ctrl_t ctrl, parsed_uri_t uri, const char *pattern,
       {
 	"pgpcertid", "pgpuserid", "pgprevoked", "pgpdisabled",
 	"pgpkeycreatetime", "pgpkeyexpiretime", "modifytimestamp",
-	"pgpkeysize", "pgpkeytype", NULL
+	"pgpkeysize", "pgpkeytype", "gpgfingerprint",
+        NULL
       };
 
     if (opt.debug)
@@ -1217,6 +1151,7 @@ ks_ldap_search (ctrl_t ctrl, parsed_uri_t uri, const char *pattern,
 	    add_to_strlist (&dupelist, certid[0]);
 	    count++;
 	  }
+        my_ldap_value_free (certid);
       }
 
     if (ldap_err == LDAP_SIZELIMIT_EXCEEDED)
@@ -1246,18 +1181,26 @@ ks_ldap_search (ctrl_t ctrl, parsed_uri_t uri, const char *pattern,
 	    LDAPMessage *uids;
 
 	    certid = ldap_get_values (ldap_conn, each, "pgpcertid");
-	    if (! certid || ! certid[0])
-	      continue;
+	    if (!certid || !certid[0])
+              {
+                my_ldap_value_free (certid);
+                continue;
+              }
 
 	    /* Have we seen this certid before? */
 	    if (! strlist_find (dupelist, certid[0]))
 	      {
 		add_to_strlist (&dupelist, certid[0]);
 
-		es_fprintf (fp, "pub:%s:",certid[0]);
+                vals = ldap_get_values (ldap_conn, each, "gpgfingerprint");
+                if (vals && vals[0] && vals[0][0])
+                  es_fprintf (fp, "pub:%s:", vals[0]);
+                else
+                  es_fprintf (fp, "pub:%s:", certid[0]);
+                my_ldap_value_free (vals);
 
 		vals = ldap_get_values (ldap_conn, each, "pgpkeytype");
-		if (vals)
+		if (vals && vals[0])
 		  {
 		    /* The LDAP server doesn't exactly handle this
 		       well. */
@@ -1265,60 +1208,60 @@ ks_ldap_search (ctrl_t ctrl, parsed_uri_t uri, const char *pattern,
 		      es_fputs ("1", fp);
 		    else if (strcasecmp (vals[0], "DSS/DH") == 0)
 		      es_fputs ("17", fp);
-		    ldap_value_free (vals);
 		  }
+		my_ldap_value_free (vals);
 
 		es_fputc (':', fp);
 
 		vals = ldap_get_values (ldap_conn, each, "pgpkeysize");
-		if (vals)
+		if (vals && vals[0])
 		  {
 		    /* Not sure why, but some keys are listed with a
 		       key size of 0.  Treat that like an unknown. */
 		    if (atoi (vals[0]) > 0)
 		      es_fprintf (fp, "%d", atoi (vals[0]));
-		    ldap_value_free (vals);
 		  }
+                my_ldap_value_free (vals);
 
 		es_fputc (':', fp);
 
 		/* YYYYMMDDHHmmssZ */
 
 		vals = ldap_get_values (ldap_conn, each, "pgpkeycreatetime");
-		if(vals && strlen (vals[0]) == 15)
+		if(vals && vals[0] && strlen (vals[0]) == 15)
 		  {
 		    es_fprintf (fp, "%u",
 				(unsigned int) ldap2epochtime(vals[0]));
-		    ldap_value_free (vals);
 		  }
+                my_ldap_value_free (vals);
 
 		es_fputc (':', fp);
 
 		vals = ldap_get_values (ldap_conn, each, "pgpkeyexpiretime");
-		if (vals && strlen (vals[0]) == 15)
+		if (vals && vals[0] && strlen (vals[0]) == 15)
 		  {
 		    es_fprintf (fp, "%u",
 				(unsigned int) ldap2epochtime (vals[0]));
-		    ldap_value_free (vals);
 		  }
+                my_ldap_value_free (vals);
 
 		es_fputc (':', fp);
 
 		vals = ldap_get_values (ldap_conn, each, "pgprevoked");
-		if (vals)
+		if (vals && vals[0])
 		  {
 		    if (atoi (vals[0]) == 1)
 		      es_fprintf (fp, "r");
-		    ldap_value_free (vals);
 		  }
+                my_ldap_value_free (vals);
 
 		vals = ldap_get_values (ldap_conn, each, "pgpdisabled");
-		if (vals)
+		if (vals && vals[0])
 		  {
 		    if (atoi (vals[0]) ==1)
 		      es_fprintf (fp, "d");
-		    ldap_value_free (vals);
 		  }
+                my_ldap_value_free (vals);
 
 #if 0
 		/* This is not yet specified in the keyserver
@@ -1326,12 +1269,12 @@ ks_ldap_search (ctrl_t ctrl, parsed_uri_t uri, const char *pattern,
 		es_fputc (':', fp);
 
 		vals = ldap_get_values (ldap_conn, each, "modifytimestamp");
-		if(vals && strlen (vals[0]) == 15)
+		if(vals && vals[0] strlen (vals[0]) == 15)
 		  {
 		    es_fprintf (fp, "%u",
 				(unsigned int) ldap2epochtime (vals[0]));
-		    ldap_value_free (vals);
 		  }
+                my_ldap_value_free (vals);
 #endif
 
 		es_fprintf (fp, "\n");
@@ -1342,10 +1285,13 @@ ks_ldap_search (ctrl_t ctrl, parsed_uri_t uri, const char *pattern,
 		     uids = ldap_next_entry (ldap_conn, uids))
 		  {
 		    vals = ldap_get_values (ldap_conn, uids, "pgpcertid");
-		    if (! vals)
-		      continue;
+                    if (!vals || !vals[0])
+                      {
+                        my_ldap_value_free (vals);
+                        continue;
+                      }
 
-		    if (strcasecmp (certid[0], vals[0]) == 0)
+		    if (!ascii_strcasecmp (certid[0], vals[0]))
 		      {
 			char **uidvals;
 
@@ -1355,12 +1301,14 @@ ks_ldap_search (ctrl_t ctrl, parsed_uri_t uri, const char *pattern,
 						   uids, "pgpuserid");
 			if (uidvals)
 			  {
-			    /* Need to escape any colons */
-			    char *quoted = percent_escape (uidvals[0], NULL);
-			    es_fputs (quoted, fp);
+			    /* Need to percent escape any colons */
+                            char *quoted = try_percent_escape (uidvals[0],
+                                                               NULL);
+                            if (quoted)
+                              es_fputs (quoted, fp);
 			    xfree (quoted);
-			    ldap_value_free (uidvals);
 			  }
+                        my_ldap_value_free (uidvals);
 
 			es_fprintf (fp, "\n");
 		      }
@@ -1369,7 +1317,7 @@ ks_ldap_search (ctrl_t ctrl, parsed_uri_t uri, const char *pattern,
 		  }
 	      }
 
-	      ldap_value_free (certid);
+            my_ldap_value_free (certid);
 	  }
       }
 
@@ -1383,8 +1331,7 @@ ks_ldap_search (ctrl_t ctrl, parsed_uri_t uri, const char *pattern,
  out:
   if (err)
     {
-      if (fp)
-	es_fclose (fp);
+      es_fclose (fp);
     }
   else
     {
@@ -1701,7 +1648,7 @@ uncescape (char *str)
 	  && hexdigitp (str + r + 3))
 	{
 	  int x = hextobyte (&str[r + 2]);
-	  assert (0 <= x && x <= 0xff);
+	  log_assert (0 <= x && x <= 0xff);
 
 	  str[w] = x;
 
@@ -2017,12 +1964,10 @@ ks_ldap_put (ctrl_t ctrl, parsed_uri_t uri,
       return gpg_error (GPG_ERR_NOT_SUPPORTED);
     }
 
-  ldap_err = my_ldap_connect (uri, &ldap_conn, &basedn, &serverinfo);
-  if (ldap_err || !basedn)
+  err = my_ldap_connect (uri, &ldap_conn, &basedn, NULL, NULL, &serverinfo);
+  if (err || !basedn)
     {
-      if (ldap_err)
-	err = ldap_err_to_gpg_err (ldap_err);
-      else
+      if (!err)
 	err = GPG_ERR_GENERAL;
       goto out;
     }
@@ -2076,8 +2021,8 @@ ks_ldap_put (ctrl_t ctrl, parsed_uri_t uri,
     {
       dump = es_fopen("/tmp/modlist.txt", "w");
       if (! dump)
-	log_error ("Failed to open /tmp/modlist.txt: %s\n",
-		   strerror (errno));
+	log_error ("failed to open /tmp/modlist.txt: %s\n",
+		   gpg_strerror (gpg_error_from_syserror ()));
 
       if (dump)
 	{
diff --git a/dirmngr/ldap-misc.c b/dirmngr/ldap-misc.c
new file mode 100644
index 0000000..42f9c7a
--- /dev/null
+++ b/dirmngr/ldap-misc.c
@@ -0,0 +1,332 @@
+/* ldap-misc.c - Miscellaneous helpers for LDAP functions
+ * Copyright (C) 2015, 2021 g10 Code GmbH
+ *
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuPG is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+#include <config.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include "dirmngr-err.h"
+#include "../common/util.h"
+#include "ldap-misc.h"
+
+
+/* Convert an LDAP error to a GPG error.  */
+gpg_err_code_t
+ldap_err_to_gpg_err (int code)
+{
+  gpg_err_code_t ec;
+
+  switch (code)
+    {
+#ifdef LDAP_X_CONNECTING
+    case LDAP_X_CONNECTING: ec = GPG_ERR_LDAP_X_CONNECTING; break;
+#endif
+
+    case LDAP_REFERRAL_LIMIT_EXCEEDED: ec = GPG_ERR_LDAP_REFERRAL_LIMIT; break;
+    case LDAP_CLIENT_LOOP: ec = GPG_ERR_LDAP_CLIENT_LOOP; break;
+    case LDAP_NO_RESULTS_RETURNED: ec = GPG_ERR_LDAP_NO_RESULTS; break;
+    case LDAP_CONTROL_NOT_FOUND: ec = GPG_ERR_LDAP_CONTROL_NOT_FOUND; break;
+    case LDAP_NOT_SUPPORTED: ec = GPG_ERR_LDAP_NOT_SUPPORTED; break;
+    case LDAP_CONNECT_ERROR: ec = GPG_ERR_LDAP_CONNECT; break;
+    case LDAP_NO_MEMORY: ec = GPG_ERR_LDAP_NO_MEMORY; break;
+    case LDAP_PARAM_ERROR: ec = GPG_ERR_LDAP_PARAM; break;
+    case LDAP_USER_CANCELLED: ec = GPG_ERR_LDAP_USER_CANCELLED; break;
+    case LDAP_FILTER_ERROR: ec = GPG_ERR_LDAP_FILTER; break;
+    case LDAP_AUTH_UNKNOWN: ec = GPG_ERR_LDAP_AUTH_UNKNOWN; break;
+    case LDAP_TIMEOUT: ec = GPG_ERR_LDAP_TIMEOUT; break;
+    case LDAP_DECODING_ERROR: ec = GPG_ERR_LDAP_DECODING; break;
+    case LDAP_ENCODING_ERROR: ec = GPG_ERR_LDAP_ENCODING; break;
+    case LDAP_LOCAL_ERROR: ec = GPG_ERR_LDAP_LOCAL; break;
+    case LDAP_SERVER_DOWN: ec = GPG_ERR_LDAP_SERVER_DOWN; break;
+
+    case LDAP_SUCCESS: ec = GPG_ERR_LDAP_SUCCESS; break;
+
+    case LDAP_OPERATIONS_ERROR: ec = GPG_ERR_LDAP_OPERATIONS; break;
+    case LDAP_PROTOCOL_ERROR: ec = GPG_ERR_LDAP_PROTOCOL; break;
+    case LDAP_TIMELIMIT_EXCEEDED: ec = GPG_ERR_LDAP_TIMELIMIT; break;
+    case LDAP_SIZELIMIT_EXCEEDED: ec = GPG_ERR_LDAP_SIZELIMIT; break;
+    case LDAP_COMPARE_FALSE: ec = GPG_ERR_LDAP_COMPARE_FALSE; break;
+    case LDAP_COMPARE_TRUE: ec = GPG_ERR_LDAP_COMPARE_TRUE; break;
+    case LDAP_AUTH_METHOD_NOT_SUPPORTED: ec=GPG_ERR_LDAP_UNSUPPORTED_AUTH;break;
+    case LDAP_STRONG_AUTH_REQUIRED: ec = GPG_ERR_LDAP_STRONG_AUTH_RQRD; break;
+    case LDAP_PARTIAL_RESULTS: ec = GPG_ERR_LDAP_PARTIAL_RESULTS; break;
+    case LDAP_REFERRAL: ec = GPG_ERR_LDAP_REFERRAL; break;
+
+#ifdef LDAP_ADMINLIMIT_EXCEEDED
+    case LDAP_ADMINLIMIT_EXCEEDED: ec = GPG_ERR_LDAP_ADMINLIMIT; break;
+#endif
+
+#ifdef LDAP_UNAVAILABLE_CRITICAL_EXTENSION
+    case LDAP_UNAVAILABLE_CRITICAL_EXTENSION:
+                               ec = GPG_ERR_LDAP_UNAVAIL_CRIT_EXTN; break;
+#endif
+
+    case LDAP_CONFIDENTIALITY_REQUIRED: ec = GPG_ERR_LDAP_CONFIDENT_RQRD; break;
+    case LDAP_SASL_BIND_IN_PROGRESS: ec = GPG_ERR_LDAP_SASL_BIND_INPROG; break;
+    case LDAP_NO_SUCH_ATTRIBUTE: ec = GPG_ERR_LDAP_NO_SUCH_ATTRIBUTE; break;
+    case LDAP_UNDEFINED_TYPE: ec = GPG_ERR_LDAP_UNDEFINED_TYPE; break;
+    case LDAP_INAPPROPRIATE_MATCHING: ec = GPG_ERR_LDAP_BAD_MATCHING; break;
+    case LDAP_CONSTRAINT_VIOLATION: ec = GPG_ERR_LDAP_CONST_VIOLATION; break;
+
+#ifdef LDAP_TYPE_OR_VALUE_EXISTS
+    case LDAP_TYPE_OR_VALUE_EXISTS: ec = GPG_ERR_LDAP_TYPE_VALUE_EXISTS; break;
+#endif
+
+    case LDAP_INVALID_SYNTAX: ec = GPG_ERR_LDAP_INV_SYNTAX; break;
+    case LDAP_NO_SUCH_OBJECT: ec = GPG_ERR_LDAP_NO_SUCH_OBJ; break;
+    case LDAP_ALIAS_PROBLEM: ec = GPG_ERR_LDAP_ALIAS_PROBLEM; break;
+    case LDAP_INVALID_DN_SYNTAX: ec = GPG_ERR_LDAP_INV_DN_SYNTAX; break;
+    case LDAP_IS_LEAF: ec = GPG_ERR_LDAP_IS_LEAF; break;
+    case LDAP_ALIAS_DEREF_PROBLEM: ec = GPG_ERR_LDAP_ALIAS_DEREF; break;
+
+#ifdef LDAP_X_PROXY_AUTHZ_FAILURE
+    case LDAP_X_PROXY_AUTHZ_FAILURE: ec = GPG_ERR_LDAP_X_PROXY_AUTH_FAIL; break;
+#endif
+
+    case LDAP_INAPPROPRIATE_AUTH: ec = GPG_ERR_LDAP_BAD_AUTH; break;
+    case LDAP_INVALID_CREDENTIALS: ec = GPG_ERR_LDAP_INV_CREDENTIALS; break;
+
+#ifdef LDAP_INSUFFICIENT_ACCESS
+    case LDAP_INSUFFICIENT_ACCESS: ec = GPG_ERR_LDAP_INSUFFICIENT_ACC; break;
+#endif
+
+    case LDAP_BUSY: ec = GPG_ERR_LDAP_BUSY; break;
+    case LDAP_UNAVAILABLE: ec = GPG_ERR_LDAP_UNAVAILABLE; break;
+    case LDAP_UNWILLING_TO_PERFORM: ec = GPG_ERR_LDAP_UNWILL_TO_PERFORM; break;
+    case LDAP_LOOP_DETECT: ec = GPG_ERR_LDAP_LOOP_DETECT; break;
+    case LDAP_NAMING_VIOLATION: ec = GPG_ERR_LDAP_NAMING_VIOLATION; break;
+    case LDAP_OBJECT_CLASS_VIOLATION: ec = GPG_ERR_LDAP_OBJ_CLS_VIOLATION; break;
+    case LDAP_NOT_ALLOWED_ON_NONLEAF: ec=GPG_ERR_LDAP_NOT_ALLOW_NONLEAF;break;
+    case LDAP_NOT_ALLOWED_ON_RDN: ec = GPG_ERR_LDAP_NOT_ALLOW_ON_RDN; break;
+    case LDAP_ALREADY_EXISTS: ec = GPG_ERR_LDAP_ALREADY_EXISTS; break;
+    case LDAP_NO_OBJECT_CLASS_MODS: ec = GPG_ERR_LDAP_NO_OBJ_CLASS_MODS; break;
+    case LDAP_RESULTS_TOO_LARGE: ec = GPG_ERR_LDAP_RESULTS_TOO_LARGE; break;
+    case LDAP_AFFECTS_MULTIPLE_DSAS: ec = GPG_ERR_LDAP_AFFECTS_MULT_DSAS; break;
+
+#ifdef LDAP_VLV_ERROR
+    case LDAP_VLV_ERROR: ec = GPG_ERR_LDAP_VLV; break;
+#endif
+
+    case LDAP_OTHER: ec = GPG_ERR_LDAP_OTHER; break;
+
+#ifdef LDAP_CUP_RESOURCES_EXHAUSTED
+    case LDAP_CUP_RESOURCES_EXHAUSTED: ec=GPG_ERR_LDAP_CUP_RESOURCE_LIMIT;break;
+    case LDAP_CUP_SECURITY_VIOLATION: ec=GPG_ERR_LDAP_CUP_SEC_VIOLATION; break;
+    case LDAP_CUP_INVALID_DATA: ec = GPG_ERR_LDAP_CUP_INV_DATA; break;
+    case LDAP_CUP_UNSUPPORTED_SCHEME: ec = GPG_ERR_LDAP_CUP_UNSUP_SCHEME; break;
+    case LDAP_CUP_RELOAD_REQUIRED: ec = GPG_ERR_LDAP_CUP_RELOAD; break;
+#endif
+
+#ifdef LDAP_CANCELLED
+    case LDAP_CANCELLED: ec = GPG_ERR_LDAP_CANCELLED; break;
+#endif
+
+#ifdef LDAP_NO_SUCH_OPERATION
+    case LDAP_NO_SUCH_OPERATION: ec = GPG_ERR_LDAP_NO_SUCH_OPERATION; break;
+#endif
+
+#ifdef LDAP_TOO_LATE
+    case LDAP_TOO_LATE: ec = GPG_ERR_LDAP_TOO_LATE; break;
+#endif
+
+#ifdef LDAP_CANNOT_CANCEL
+    case LDAP_CANNOT_CANCEL: ec = GPG_ERR_LDAP_CANNOT_CANCEL; break;
+#endif
+
+#ifdef LDAP_ASSERTION_FAILED
+    case LDAP_ASSERTION_FAILED: ec = GPG_ERR_LDAP_ASSERTION_FAILED; break;
+#endif
+
+#ifdef LDAP_PROXIED_AUTHORIZATION_DENIED
+    case LDAP_PROXIED_AUTHORIZATION_DENIED:
+                                      ec = GPG_ERR_LDAP_PROX_AUTH_DENIED; break;
+#endif
+
+    default:
+#if defined(LDAP_E_ERROR) && defined(LDAP_X_ERROR)
+      if (LDAP_E_ERROR (code))
+        ec = GPG_ERR_LDAP_E_GENERAL;
+      else if (LDAP_X_ERROR (code))
+        ec = GPG_ERR_LDAP_X_GENERAL;
+      else
+#endif
+        ec = GPG_ERR_LDAP_GENERAL;
+      break;
+    }
+
+  return ec;
+}
+
+
+/* Retrieve an LDAP error and return it's GPG equivalent.  */
+gpg_err_code_t
+ldap_to_gpg_err (LDAP *ld)
+{
+#if defined(HAVE_LDAP_GET_OPTION) && defined(LDAP_OPT_ERROR_NUMBER)
+  int err;
+
+  if (ldap_get_option (ld, LDAP_OPT_ERROR_NUMBER, &err) == 0)
+    return ldap_err_to_gpg_err (err);
+  else
+    return GPG_ERR_GENERAL;
+#elif defined(HAVE_LDAP_LD_ERRNO)
+  return ldap_err_to_gpg_err (ld->ld_errno);
+#else
+  /* We should never get here since the LDAP library should always
+     have either ldap_get_option or ld_errno, but just in case... */
+  return GPG_ERR_INTERNAL;
+#endif
+}
+
+
+
+/* Parse an extended filter syntax as used by dirmngr_ldap.c
+ * For example:
+ *
+ *   ^CN=foo, OU=My Users&(objectClasses=*)
+ *
+ * Uses "CN=foo, OU=My Users" as base DN and "(objectClasses=*)" as
+ * filter.  If the base prefix includes an ampersand, it needs to be
+ * doubled.  The usual escaping rules for DNs (for the base) and
+ * filters apply.  Other examples:
+ *
+ *  ^CN=foo, OU=My Users&
+ *
+ * Use just the base DN.
+ *
+ *  ^CN=foo, OU=My Users&SCOPE&
+ *
+ * Specify the scope which is "base", "one", or "sub".  May of course
+ * also be followed by a filter.
+ *
+ *  ^&SCOPE&(objectClasses=*)
+ *
+ * Give a scope and a filter.  Note that R_SCOPE is only changed if a
+ * STRING has scope parameter.  Setting this initally to -1 allows to
+ * detect this case.
+ */
+gpg_error_t
+ldap_parse_extfilter (const char *string, int silent,
+                      char **r_base, int *r_scope, char **r_filter)
+{
+  gpg_error_t err = 0;
+  char *base = NULL;
+  char *filter = NULL;
+  const char *s;
+  char *p;
+
+  if (r_base)
+    *r_base = NULL;
+  if (r_filter)
+    *r_filter = NULL;
+
+  if (*string == '^')
+    {
+      string++;
+      base = xtrymalloc (strlen (string)+1);
+      if (!base)
+        {
+          err = gpg_error_from_syserror ();
+          goto leave;
+        }
+      for (s=string, p=base; *s; s++)
+        {
+          *p++ = *s;
+          if (*s == '&' && s[1] == '&')
+            s++;  /* Skip quoted ampersand.  */
+          else if (*s == '&')
+            {
+              p--;
+              break;
+            }
+        }
+      *p = 0;
+      if (!*s)
+        {
+          if (!silent)
+            log_info ("LDAP extended filter is not terminated\n");
+          err = gpg_error (GPG_ERR_SYNTAX);
+          goto leave;
+        }
+      string = s + 1;
+    }
+
+  if (!*string)
+    goto leave; /* ready.  */
+
+  if (!strncmp (string, "base&", 5))
+    {
+      string += 5;
+      if (r_scope)
+        *r_scope = LDAP_SCOPE_BASE;
+    }
+  else if (!strncmp (string, "one&", 4))
+    {
+      string += 4;
+      if (r_scope)
+        *r_scope = LDAP_SCOPE_ONELEVEL;
+    }
+  else if (!strncmp (string, "sub&", 4))
+    {
+      string += 4;
+      if (r_scope)
+        *r_scope = LDAP_SCOPE_SUBTREE;
+    }
+
+  if (!*string)
+    goto leave; /* ready.  */
+
+  if (*string != '(')
+    {
+      if (!silent)
+        log_info ("LDAP filter does not start with a left parentheses\n");
+      return gpg_error (GPG_ERR_SYNTAX);
+    }
+  if (string[strlen(string)-1] != ')')
+    {
+      if (!silent)
+        log_info ("LDAP filter does not end with a right parentheses\n");
+      return gpg_error (GPG_ERR_SYNTAX);
+    }
+
+  filter = xtrystrdup (string);
+  if (!filter)
+    err = gpg_error_from_syserror ();
+
+ leave:
+  if (err)
+    {
+      xfree (base);
+      xfree (filter);
+    }
+  else
+    {
+      if (r_base)
+        *r_base = base;
+      else
+        xfree (base);
+      if (r_filter)
+        *r_filter = filter;
+      else
+        xfree (filter);
+    }
+  return err;
+}
diff --git a/dirmngr/ldap-misc.h b/dirmngr/ldap-misc.h
new file mode 100644
index 0000000..d555caf
--- /dev/null
+++ b/dirmngr/ldap-misc.h
@@ -0,0 +1,43 @@
+/* ldap-misc.h - Miscellaneous helpers for LDAP functions
+ * Copyright (C) 2015, 2021 g10 Code GmbH
+ *
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuPG is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+#ifndef DIRMNGR_LDAP_MISC_H
+#define DIRMNGR_LDAP_MISC_H
+
+#ifdef _WIN32
+# include <winsock2.h>
+# include <winldap.h>
+#else
+# ifdef NEED_LBER_H
+#  include <lber.h>
+# endif
+/* For OpenLDAP, to enable the API that we're using. */
+# define LDAP_DEPRECATED 1
+# include <ldap.h>
+#endif
+
+
+gpg_err_code_t ldap_err_to_gpg_err (int code);
+gpg_err_code_t ldap_to_gpg_err (LDAP *ld);
+gpg_error_t ldap_parse_extfilter (const char *string, int silent,
+                                  char **r_base, int *r_scope, char **r_filter);
+
+
+#endif /*DIRMNGR_LDAP_MISC_H*/
diff --git a/dirmngr/ldap-wrapper.c b/dirmngr/ldap-wrapper.c
index 31de6e0..629c5c2 100644
--- a/dirmngr/ldap-wrapper.c
+++ b/dirmngr/ldap-wrapper.c
@@ -548,7 +548,7 @@ ldap_reaper_launch_thread (void)
 #ifdef HAVE_W32_SYSTEM
   /* Static init does not yet work in W32 nPth.  */
   if (npth_cond_init (&reaper_run_cond, NULL))
-    log_fatal ("%s: failed to init condition variabale: %s\n",
+    log_fatal ("%s: failed to init condition variable: %s\n",
                __func__, gpg_strerror (gpg_error_from_syserror ()));
 #endif
 
@@ -857,9 +857,9 @@ ldap_wrapper (ctrl_t ctrl, ksba_reader_t *reader, const char *argv[])
   err = gnupg_spawn_process (pgmname, arg_list,
                              NULL, NULL, GNUPG_SPAWN_NONBLOCK,
                              NULL, &outfp, &errfp, &pid);
-  xfree (arg_list);
   if (err)
     {
+  xfree (arg_list);
       xfree (ctx);
       log_error ("error running '%s': %s\n", pgmname, gpg_strerror (err));
       return err;
@@ -878,6 +878,7 @@ ldap_wrapper (ctrl_t ctrl, ksba_reader_t *reader, const char *argv[])
     err = ksba_reader_set_cb (*reader, reader_callback, ctx);
   if (err)
     {
+      xfree (arg_list);
       log_error (_("error initializing reader object: %s\n"),
                  gpg_strerror (err));
       destroy_wrapper (ctx);
@@ -899,8 +900,15 @@ ldap_wrapper (ctrl_t ctrl, ksba_reader_t *reader, const char *argv[])
   unlock_reaper_list ();
 
   if (DBG_EXTPROG)
-    log_debug ("ldap wrapper %d started (%p, %s)\n",
-               (int)ctx->pid, ctx->reader, pgmname);
+    {
+      log_debug ("ldap wrapper %d started (%p, %s)",
+                 (int)ctx->pid, ctx->reader, pgmname);
+      for (i=0; arg_list[i]; i++)
+        log_printf (" [%s]", arg_list[i]);
+      log_printf ("\n");
+    }
+  xfree (arg_list);
+
 
   /* Need to wait for the first byte so we are able to detect an empty
      output and not let the consumer see an EOF without further error
diff --git a/dirmngr/ldap.c b/dirmngr/ldap.c
index ffe54ba..7424035 100644
--- a/dirmngr/ldap.c
+++ b/dirmngr/ldap.c
@@ -1,12 +1,12 @@
 /* ldap.c - LDAP access
  * Copyright (C) 2002 Klarälvdalens Datakonsult AB
- * Copyright (C) 2003, 2004, 2005, 2007, 2008, 2010 g10 Code GmbH
+ * Copyright (C) 2003, 2004, 2005, 2007, 2008, 2010, 2021 g10 Code GmbH
  *
- * This file is part of DirMngr.
+ * This file is part of GnuPG.
  *
- * DirMngr is free software; you can redistribute it and/or modify
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * DirMngr is distributed in the hope that it will be useful,
@@ -15,8 +15,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 #include <config.h>
@@ -36,6 +36,7 @@
 #include "ldapserver.h"
 #include "misc.h"
 #include "ldap-wrapper.h"
+#include "ldap-url.h"
 #include "../common/host2net.h"
 
 
@@ -116,14 +117,15 @@ static gpg_error_t
 run_ldap_wrapper (ctrl_t ctrl,
                   int ignore_timeout,
                   int multi_mode,
+                  int tls_mode,
+                  int ntds,
                   const char *proxy,
                   const char *host, int port,
                   const char *user, const char *pass,
-                  const char *dn, const char *filter, const char *attr,
-                  const char *url,
+                  const char *base, const char *filter, const char *attr,
                   ksba_reader_t *reader)
 {
-  const char *argv[40];
+  const char *argv[50];
   int argc;
   char portbuf[30], timeoutbuf[30];
 
@@ -131,7 +133,7 @@ run_ldap_wrapper (ctrl_t ctrl,
   *reader = NULL;
 
   argc = 0;
-  if (pass)  /* Note, that the password must be the first item.  */
+  if (pass && *pass)  /* Note, that the password must be the first item.  */
     {
       argv[argc++] = "--pass";
       argv[argc++] = pass;
@@ -145,9 +147,18 @@ run_ldap_wrapper (ctrl_t ctrl,
   argv[argc++] = "--log-with-pid";
   if (multi_mode)
     argv[argc++] = "--multi";
+
+  if (tls_mode == 1)
+    argv[argc++] = "--starttls";
+  else if (tls_mode)
+    argv[argc++] = "--ldaptls";
+
+  if (ntds)
+    argv[argc++] = "--ntds";
+
   if (opt.ldaptimeout)
     {
-      sprintf (timeoutbuf, "%u", opt.ldaptimeout);
+      snprintf (timeoutbuf, sizeof timeoutbuf, "%u", opt.ldaptimeout);
       argv[argc++] = "--timeout";
       argv[argc++] = timeoutbuf;
       if (ignore_timeout)
@@ -158,7 +169,7 @@ run_ldap_wrapper (ctrl_t ctrl,
       argv[argc++] = "--proxy";
       argv[argc++] = proxy;
     }
-  if (host)
+  if (host && *host)
     {
       argv[argc++] = "--host";
       argv[argc++] = host;
@@ -169,27 +180,24 @@ run_ldap_wrapper (ctrl_t ctrl,
       argv[argc++] = "--port";
       argv[argc++] = portbuf;
     }
-  if (user)
+  if (user && *user)
     {
       argv[argc++] = "--user";
       argv[argc++] = user;
     }
-  if (dn)
-    {
-      argv[argc++] = "--dn";
-      argv[argc++] = dn;
-    }
-  if (filter)
+  if (base && *base)
     {
-      argv[argc++] = "--filter";
-      argv[argc++] = filter;
+      argv[argc++] = "--base";
+      argv[argc++] = base;
     }
   if (attr)
     {
       argv[argc++] = "--attr";
       argv[argc++] = attr;
     }
-  argv[argc++] = url? url : "ldap://";
+
+  if (filter)
+    argv[argc++] = filter;
   argv[argc] = NULL;
 
   return ldap_wrapper (ctrl, reader, argv);
@@ -202,19 +210,48 @@ run_ldap_wrapper (ctrl_t ctrl,
    reader is returned.  If HOST or PORT are not 0, they are used to
    override the values from the URL. */
 gpg_error_t
-url_fetch_ldap (ctrl_t ctrl, const char *url, const char *host, int port,
-                ksba_reader_t *reader)
+url_fetch_ldap (ctrl_t ctrl, const char *url, ksba_reader_t *reader)
 {
   gpg_error_t err;
+  LDAPURLDesc *ludp = NULL;
+  int tls_mode;
+
+  if (!ldap_is_ldap_url (url))
+    {
+      log_error (_("'%s' is not an LDAP URL\n"), url);
+      return gpg_error (GPG_ERR_INV_URI);
+    }
+
+  if (ldap_url_parse (url, &ludp))
+    {
+      log_error (_("'%s' is an invalid LDAP URL\n"), url);
+      return gpg_error (GPG_ERR_INV_URI);
+    }
+
+  if (ludp->lud_filter && ludp->lud_filter[0] != '(')
+    {
+      log_error (_("'%s' is an invalid LDAP URL\n"), url);
+      err = gpg_error (GPG_ERR_BAD_URI);
+      goto leave;
+    }
+
+  if (ludp->lud_scheme && !strcmp (ludp->lud_scheme, "ldaps"))
+    tls_mode = 2; /* LDAP-over-TLS here becuase we get it from certs. */
+  else
+    tls_mode = 0;
 
   err = run_ldap_wrapper (ctrl,
                           1, /* Ignore explicit timeout because CRLs
                                 might be very large. */
-                          0,
+                          0, /* No Multi-mode.  */
+                          tls_mode,
+                          0, /* No AD authentication.  */
                           opt.ldap_proxy,
-                          host, port,
-                          NULL, NULL,
-                          NULL, NULL, NULL, url,
+                          ludp->lud_host, ludp->lud_port,
+                          NULL, NULL,  /* user, password */
+                          ludp->lud_dn,    /* Base DN */
+                          ludp->lud_filter,
+                          ludp->lud_attrs? ludp->lud_attrs[0] : NULL,
                           reader);
 
   /* FIXME: This option might be used for DoS attacks.  Because it
@@ -223,17 +260,8 @@ url_fetch_ldap (ctrl_t ctrl, const char *url, const char *host, int port,
      turn. */
   if (!err && opt.add_new_ldapservers && !opt.ldap_proxy)
     {
-      if (host)
-        add_server_to_servers (host, port);
-      else if (url)
-        {
-          char *tmp = host_and_port_from_url (url, &port);
-          if (tmp)
-            {
-              add_server_to_servers (tmp, port);
-              xfree (tmp);
-            }
-        }
+      if (ludp->lud_host)
+        add_server_to_servers (ludp->lud_host, ludp->lud_port);
     }
 
   /* If the lookup failed and we are not only using the proxy, we try
@@ -252,19 +280,32 @@ url_fetch_ldap (ctrl_t ctrl, const char *url, const char *host, int port,
         {
 	  ldap_server_t server = iter.server;
 
+          if (server->starttls)
+            tls_mode = 1;
+          else if (server->ldap_over_tls)
+            tls_mode = 2;
+          else
+            tls_mode = 0;
+
           err = run_ldap_wrapper (ctrl,
                                   0,
-                                  0,
+                                  0, /* No Multi-mode */
+                                  tls_mode,
+                                  server->ntds,
                                   NULL,
                                   server->host, server->port,
-                                  NULL, NULL,
-                                  NULL, NULL, NULL, url,
+                                  server->user, server->pass,
+                                  server->base,
+                                  ludp->lud_filter,
+                                  ludp->lud_attrs? ludp->lud_attrs[0] : NULL,
                                   reader);
           if (!err)
             break;
         }
     }
 
+ leave:
+  ldap_free_urldesc (ludp);
   return err;
 }
 
@@ -281,20 +322,32 @@ attr_fetch_ldap (ctrl_t ctrl,
 
   *reader = NULL;
 
-  /* FIXME; we might want to look at the Base SN to try matching
+  /* FIXME; we might want to look at the Base DN to try matching
      servers first. */
   for (ldapserver_iter_begin (&iter, ctrl); ! ldapserver_iter_end_p (&iter);
        ldapserver_iter_next (&iter))
     {
       ldap_server_t server = iter.server;
+      int tls_mode;
+
+      if (server->starttls)
+        tls_mode = 1;
+      else if (server->ldap_over_tls)
+        tls_mode = 2;
+      else
+        tls_mode = 0;
 
       err = run_ldap_wrapper (ctrl,
                               0,
                               0,
+                              tls_mode,
+                              server->ntds,
                               opt.ldap_proxy,
                               server->host, server->port,
                               server->user, server->pass,
-                              dn, "objectClass=*", attr, NULL,
+                              dn,
+                              "(objectClass=*)",
+                              attr,
                               reader);
       if (!err)
         break; /* Probably found a result. Ready. */
@@ -302,46 +355,144 @@ attr_fetch_ldap (ctrl_t ctrl,
   return err;
 }
 
+
 
-/* Parse PATTERN and return a new strlist to be used for the actual
-   LDAP query.  Bit 0 of the flags field is set if that pattern is
-   actually a base specification.  Caller must release the returned
-   strlist.  NULL is returned on error.
+/* Return true if VALUE needs escaping.  */
+static int
+rfc2254_need_escape (const char *value)
+{
+  /* NUL needs to be escaped as well but we can represent that in
+   * VALUE, so no need for it.  */
+  return !!strpbrk (value, "*()\\");
+}
 
- * Possible patterns:
+/* Escape VALUE using RFC-2254 rules.  Returns NULL on error. */
+static char *
+rfc2254_escape (const char *value)
+{
+  const char *s;
+  char *buffer, *p;
+  size_t length = 0;
+
+  for (s=value; *s; s++)
+    switch (*s)
+      {
+      case '*':
+      case '(':
+      case ')':
+      case '\\': length += 3; break;
+      default:   length++; break;
+      }
+
+  buffer = xtrymalloc (length+1);
+  if (!buffer)
+    return NULL;
+  p = buffer;
+  for (s=value; *s; s++)
+    switch (*s)
+      {
+      case '*':  p = stpcpy (p, "\\2a"); break;
+      case '(':  p = stpcpy (p, "\\28"); break;
+      case ')':  p = stpcpy (p, "\\29"); break;
+      case '\\': p = stpcpy (p, "\\5c"); break;
+      default:   *p++ = *s; break;
+      }
+  *p = 0;
+  return buffer;
+}
+
+
+/* Return true if VALUE needs escaping.  */
+static int
+extfilt_need_escape (const char *value)
+{
+  /* NUL needs to be escaped as well but we can represent that in
+   * VALUE, so no need for it.  */
+  return !!strchr (value, '&');
+}
+
+/* Escape VALUE using our extended filter rules from dirmngr_ldap.c.
+ * Returns NULL on error. */
+static char *
+extfilt_escape (const char *value)
+{
+  const char *s;
+  char *buffer, *p;
+  size_t length = 0;
+
+  for (s=value; *s; s++)
+    {
+      length++;
+      if (*s == '&')
+        length++;
+    }
+
+  buffer = xtrymalloc (length+1);
+  if (!buffer)
+    return NULL;
+  p = buffer;
+  for (s=value; *s; s++)
+    {
+      *p++ = *s;
+      if (*s == '&')
+        *p++ = '&';
+    }
+  *p = 0;
+  return buffer;
+}
+
+
+/* Parse PATTERN and return a new filter expression for an LDAP query.
+ * The extended filter syntax as known by dirmngr_ldap.c is used.
+ * Caller must release the returned value.  R_RESULT is set to NULL on
+ * error.
+ *
+ * Supported patterns:
  *
- *   KeyID
- *   Fingerprint
- *   OpenPGP userid
- * x Email address  Indicated by a left angle bracket.
- *   Exact word match in user id or subj. name
- * x Subj. DN  indicated bu a leading slash
- *   Issuer DN
- *   Serial number + subj. DN
- * x Substring match indicated by a leading '*; is also the default.
+ *  | Ok  | gpg style user id type                               |
+ *  |-----+------------------------------------------------------|
+ *  | no  | KeyID                                                |
+ *  | no  | Fingerprint                                          |
+ *  | no  | OpenPGP userid                                       |
+ *  | yes | Email address  Indicated by a left angle bracket.    |
+ *  | no  | Exact word match in user id or subj. name            |
+ *  | yes | Subj. DN  indicated by a leading slash               |
+ *  | no  | Issuer DN                                            |
+ *  | no  | Serial number + subj. DN                             |
+ *  | yes | Substring match indicated by a leading '*; (default) |
  */
-
-strlist_t
-parse_one_pattern (const char *pattern)
+static gpg_error_t
+make_one_filter (const char *pattern, char **r_result)
 {
-  strlist_t result = NULL;
-  char *p;
+  gpg_error_t err = 0;
+  char *pattern_buffer = NULL;
+  char *result = NULL;
+  size_t n;
+
+  *r_result = NULL;
 
   switch (*pattern)
     {
     case '<':			/* Email. */
       {
         pattern++;
-	result = xmalloc (sizeof *result + 5 + strlen (pattern));
-        result->next = NULL;
-        result->flags = 0;
-	p = stpcpy (stpcpy (result->d, "mail="), pattern);
-	if (p[-1] == '>')
-	  *--p = 0;
-        if (!*result->d) /* Error. */
+        if (rfc2254_need_escape (pattern)
+            && !(pattern = pattern_buffer = rfc2254_escape (pattern)))
+          {
+            err = gpg_error_from_syserror ();
+            goto leave;
+          }
+        result = strconcat ("(mail=", pattern, ")", NULL);
+        if (!result)
           {
-            xfree (result);
-            result = NULL;
+            err = gpg_error_from_syserror ();
+            goto leave;
+          }
+        n = strlen (result);
+        if (result[n-2] == '>') /* Strip trailing '>' */
+          {
+            result[n-2] = ')';
+            result[n-1] = 0;
           }
 	break;
       }
@@ -349,125 +500,86 @@ parse_one_pattern (const char *pattern)
       pattern++;
       if (*pattern)
         {
-          result = xmalloc (sizeof *result + strlen (pattern));
-          result->next = NULL;
-          result->flags = 1; /* Base spec. */
-          strcpy (result->d, pattern);
+          /* We need just the BaseDN.  This assumes that the Subject
+           * is correcly stored in the DT.  This is however not always
+           * the case and the actual DN is different ffrom the
+           * subject.  In this case we won't find anything.  */
+          if (extfilt_need_escape (pattern)
+              && !(pattern = pattern_buffer = extfilt_escape (pattern)))
+            {
+              err = gpg_error_from_syserror ();
+              goto leave;
+            }
+          result = strconcat ("^", pattern, "&base&", NULL);
+          if (!result)
+            {
+              err = gpg_error_from_syserror ();
+              goto leave;
+            }
         }
       break;
-    case '#':			/* Issuer DN. */
+    case '#':			/* Issuer DN - Not yet working. */
       pattern++;
       if (*pattern == '/')  /* Just issuer DN. */
         {
           pattern++;
+          if (extfilt_need_escape (pattern)
+              && !(pattern = pattern_buffer = extfilt_escape (pattern)))
+            {
+              err = gpg_error_from_syserror ();
+              goto leave;
+            }
+          result = strconcat ("^", pattern, "&base&", NULL);
+          if (!result)
+            {
+              err = gpg_error_from_syserror ();
+              goto leave;
+            }
 	}
       else  /* Serial number + issuer DN */
 	{
+
         }
       break;
     case '*':
       pattern++;
       /* fall through */
     default:			/* Take as substring match. */
-      {
-	const char format[] = "(|(sn=*%s*)(|(cn=*%s*)(mail=*%s*)))";
-
-        if (*pattern)
-          {
-            result = xmalloc (sizeof *result
-                              + strlen (format) + 3 * strlen (pattern));
-            result->next = NULL;
-            result->flags = 0;
-            sprintf (result->d, format, pattern, pattern, pattern);
-          }
-      }
+      if (*pattern)
+        {
+          if (rfc2254_need_escape (pattern)
+              && !(pattern = pattern_buffer = rfc2254_escape (pattern)))
+            {
+              err = gpg_error_from_syserror ();
+              goto leave;
+            }
+          result = strconcat ("(|(sn=*", pattern,
+                              "*)(|(cn=*", pattern,
+                              "*)(mail=*", pattern,
+                              "*)))", NULL);
+          if (!result)
+            {
+              err = gpg_error_from_syserror ();
+              goto leave;
+            }
+        }
       break;
     }
 
-  return result;
-}
-
-/* Take the string STRING and escape it according to the URL rules.
-   Return a newly allocated string. */
-static char *
-escape4url (const char *string)
-{
-  const char *s;
-  char *buf, *p;
-  size_t n;
-
-  if (!string)
-    string = "";
-
-  for (s=string,n=0; *s; s++)
-    if (strchr (UNENCODED_URL_CHARS, *s))
-      n++;
-    else
-      n += 3;
-
-  buf = malloc (n+1);
-  if (!buf)
-    return NULL;
-
-  for (s=string,p=buf; *s; s++)
-    if (strchr (UNENCODED_URL_CHARS, *s))
-      *p++ = *s;
-    else
-      {
-        sprintf (p, "%%%02X", *(const unsigned char *)s);
-        p += 3;
-      }
-  *p = 0;
-
-  return buf;
-}
-
+  if (!result)
+    err = gpg_error (GPG_ERR_INV_USER_ID);
 
-
-/* Create a LDAP URL from DN and FILTER and return it in URL.  We don't
-   need the host and port because this will be specified using the
-   override options. */
-static gpg_error_t
-make_url (char **url, const char *dn, const char *filter)
-{
-  gpg_error_t err;
-  char *u_dn, *u_filter;
-  char const attrs[] = (USERCERTIFICATE ","
-                        /* In 2005 wk mentioned in the changelog that
-                         * work on the userSMIMECertificate has
-                         * started but it seems that no further
-                         * progress was made or the whole thing was
-                         * simply forgotten.  */
-                        /* USERSMIMECERTIFICATE "," */
-                        CACERTIFICATE ","
-                        X509CACERT );
-
-  *url = NULL;
-
-  u_dn = escape4url (dn);
-  if (!u_dn)
-      return gpg_error_from_errno (errno);
-
-  u_filter = escape4url (filter);
-  if (!u_filter)
-    {
-      err = gpg_error_from_errno (errno);
-      xfree (u_dn);
-      return err;
-    }
-
-  *url = strconcat ("ldap:///", u_dn, "?", attrs, "?sub?", u_filter, NULL);
-  if (!*url)
-    err = gpg_error_from_syserror ();
+ leave:
+  xfree (pattern_buffer);
+  if (err)
+    xfree (result);
   else
-    err = 0;
-
-  xfree (u_dn);
-  xfree (u_filter);
+    *r_result = result;
   return err;
 }
 
 
+
 /* Prepare an LDAP query to return the cACertificate attribute for DN.
  * All configured default servers are queried until one responds.
  * This function returns an error code or 0 and stored a newly
@@ -483,7 +595,7 @@ start_cacert_fetch_ldap (ctrl_t ctrl, cert_fetch_context_t *r_context,
   if (!*r_context)
     return gpg_error_from_errno (errno);
 
-  /* FIXME; we might want to look at the Base SN to try matching
+  /* FIXME; we might want to look at the Base DN to try matching
      servers first. */
   err = gpg_error (GPG_ERR_CONFIGURATION);
 
@@ -495,10 +607,12 @@ start_cacert_fetch_ldap (ctrl_t ctrl, cert_fetch_context_t *r_context,
       err = run_ldap_wrapper (ctrl,
                               0,
                               1,  /* --multi (record format) */
+                              0, /* No TLS */
+                              0, /* No AD authentication.  */
                               opt.ldap_proxy,
                               server->host, server->port,
                               server->user, server->pass,
-                              dn, "objectClass=*", "cACertificate", NULL,
+                              dn, "objectClass=*", "cACertificate",
                               &(*r_context)->reader);
       if (!err)
         break; /* Probably found a result. */
@@ -526,12 +640,12 @@ start_cert_fetch_ldap (ctrl_t ctrl, cert_fetch_context_t *r_context,
   int port;
   char *user = NULL;
   char *pass = NULL;
-  const char *base;
+  char *base = NULL;
   char *argv[50];
   int argc = 0;
   int argc_malloced = 0;
   char portbuf[30], timeoutbuf[30];
-  int use_ldaps = 0;
+  int starttls, ldaptls, ntds;
 
   *r_context = NULL;
 
@@ -559,17 +673,24 @@ start_cert_fetch_ldap (ctrl_t ctrl, cert_fetch_context_t *r_context,
           err = gpg_error_from_syserror ();
           goto leave;
         }
-      base = server->base;
-      use_ldaps = server->use_ldaps;
+      if (server->base && !(base = xtrystrdup (server->base)))
+        {
+          err = gpg_error_from_syserror ();
+          goto leave;
+        }
+
+      starttls = server->starttls;
+      ldaptls  =  server->ldap_over_tls;
+      ntds     = server->ntds;
     }
   else /* Use a default server. */
-    return gpg_error (GPG_ERR_NOT_IMPLEMENTED);
-
+    {
+      err = gpg_error (GPG_ERR_NOT_IMPLEMENTED);
+      goto leave;
+    }
 
-  if (!base)
-    base = "";
 
-  if (pass) /* Note: Must be the first item. */
+  if (pass && *pass) /* Note: Must be the first item. */
     {
       argv[argc++] = "--pass";
       argv[argc++] = pass;
@@ -582,20 +703,27 @@ start_cert_fetch_ldap (ctrl_t ctrl, cert_fetch_context_t *r_context,
 
   argv[argc++] = "--log-with-pid";
   argv[argc++] = "--multi";
+
+  if (starttls)
+    argv[argc++] = "--starttls";
+  else if (ldaptls)
+    argv[argc++] = "--ldaptls";
+
+  if (ntds)
+    argv[argc++] = "--ntds";
+
   if (opt.ldaptimeout)
     {
       snprintf (timeoutbuf, sizeof timeoutbuf, "%u", opt.ldaptimeout);
       argv[argc++] = "--timeout";
       argv[argc++] = timeoutbuf;
     }
-  if (opt.ldap_proxy)
+  if (proxy && *proxy)
     {
       argv[argc++] = "--proxy";
       argv[argc++] = proxy;
     }
-  if (use_ldaps)
-    argv[argc++] = "--tls";
-  if (host)
+  if (host && *host)
     {
       argv[argc++] = "--host";
       argv[argc++] = host;
@@ -606,56 +734,49 @@ start_cert_fetch_ldap (ctrl_t ctrl, cert_fetch_context_t *r_context,
       argv[argc++] = "--port";
       argv[argc++] = portbuf;
     }
-  if (user)
+  if (user && *user)
     {
       argv[argc++] = "--user";
       argv[argc++] = user;
     }
+  if (base && *base)
+    {
+      argv[argc++] = "--base";
+      argv[argc++] = base;
+    }
+
 
   /* All entries in argv from this index on are malloc'ed.  */
   argc_malloced = argc;
 
   for (; patterns; patterns = patterns->next)
     {
-      strlist_t sl;
-      char *url;
-
       if (argc >= DIM (argv) - 1)
         {
           /* Too many patterns.  It does not make sense to allow an
              arbitrary number of patters because the length of the
              command line is limited anyway.  */
-          /* fixme: cleanup. */
-          return gpg_error (GPG_ERR_RESOURCE_LIMIT);
+          err = gpg_error (GPG_ERR_RESOURCE_LIMIT);
+          goto leave;
         }
-      sl = parse_one_pattern (patterns->d);
-      if (!sl)
+      if (*patterns->d)
         {
-          log_error (_("start_cert_fetch: invalid pattern '%s'\n"),
-                     patterns->d);
-          err = gpg_error (GPG_ERR_INV_USER_ID);
-          goto leave;
+          err = make_one_filter (patterns->d, &argv[argc]);
+          if (err)
+            goto leave;
+          argc++;
         }
-      if ((sl->flags & 1))
-        err = make_url (&url, sl->d, "objectClass=*");
-      else
-        err = make_url (&url, base, sl->d);
-      free_strlist (sl);
-      if (err)
-        goto leave;
-      argv[argc++] = url;
     }
   argv[argc] = NULL;
 
   *r_context = xtrycalloc (1, sizeof **r_context);
   if (!*r_context)
     {
-      err = gpg_error_from_errno (errno);
+      err = gpg_error_from_syserror ();
       goto leave;
     }
 
   err = ldap_wrapper (ctrl, &(*r_context)->reader, (const char**)argv);
-
   if (err)
     {
       xfree (*r_context);
@@ -667,6 +788,7 @@ start_cert_fetch_ldap (ctrl_t ctrl, cert_fetch_context_t *r_context,
     xfree (argv[argc_malloced]);
   xfree (proxy);
   xfree (host);
+  xfree (base);
   xfree (user);
   xfree (pass);
   return err;
diff --git a/dirmngr/ldapserver.c b/dirmngr/ldapserver.c
index 20a2bb1..4ef2843 100644
--- a/dirmngr/ldapserver.c
+++ b/dirmngr/ldapserver.c
@@ -47,18 +47,26 @@ ldapserver_list_free (ldap_server_t servers)
 
 
 /* Parse a single LDAP server configuration line.  Returns the server
-   or NULL in case of errors.  The configuration line is assumed to be
-   colon separated with these fields:
-
-   1. field: Hostname
-   2. field: Portnumber
-   3. field: Username
-   4. field: Password
-   5. field: Base DN
-   6. field: Flags
-
-   FILENAME and LINENO are used for diagnostic purposes only.
-*/
+ * or NULL in case of errors.  The configuration line is assumed to be
+ * colon separated with these fields:
+ *
+ * 1. field: Hostname
+ * 2. field: Portnumber
+ * 3. field: Username
+ * 4. field: Password
+ * 5. field: Base DN
+ * 6. field: Flags
+ *
+ * Flags are:
+ *
+ *   starttls  := Use STARTTLS with a default port of 389
+ *   ldaptls   := Tunnel LDAP trough a TLS tunnel with default port 636
+ *   plain     := Switch to plain unsecured LDAP.
+ *   (The last of these 3 flags is the effective one)
+ *   ntds      := Use Active Directory authentication
+ *
+ * FILENAME and LINENO are used for diagnostic purposes only.
+ */
 ldap_server_t
 ldapserver_parse_one (char *line,
 		      const char *filename, unsigned int lineno)
@@ -72,7 +80,13 @@ ldapserver_parse_one (char *line,
   int i;
 
   /* Parse the colon separated fields.  */
-  server = xcalloc (1, sizeof *server);
+  server = xtrycalloc (1, sizeof *server);
+  if (!server)
+    {
+      fail = 1;
+      goto leave;
+    }
+
   for (fieldno = 1, p = line; p; p = endp, fieldno++ )
     {
       endp = strchr (p, ':');
@@ -82,14 +96,9 @@ ldapserver_parse_one (char *line,
       switch (fieldno)
 	{
 	case 1:
-	  if (*p)
-	    server->host = xstrdup (p);
-	  else
-	    {
-	      log_error (_("%s:%u: no hostname given\n"),
-			 filename, lineno);
-	      fail = 1;
-	    }
+          server->host = xtrystrdup (p);
+          if (!server->host)
+            fail = 1;
 	  break;
 
 	case 2:
@@ -98,24 +107,36 @@ ldapserver_parse_one (char *line,
 	  break;
 
 	case 3:
-	  if (*p)
-	    server->user = xstrdup (p);
+          server->user = xtrystrdup (p);
+          if (!server->user)
+            fail = 1;
 	  break;
 
 	case 4:
 	  if (*p && !server->user)
 	    {
-	      log_error (_("%s:%u: password given without user\n"),
-			 filename, lineno);
+              if (filename)
+                log_error (_("%s:%u: password given without user\n"),
+                           filename, lineno);
+              else
+                log_error ("ldap: password given without user ('%s')\n", line);
 	      fail = 1;
 	    }
 	  else if (*p)
-	    server->pass = xstrdup (p);
+            {
+              server->pass = xtrystrdup (p);
+              if (!server->pass)
+                fail = 1;
+            }
 	  break;
 
 	case 5:
 	  if (*p)
-	    server->base = xstrdup (p);
+            {
+              server->base = xtrystrdup (p);
+              if (!server->base)
+                fail = 1;;
+            }
 	  break;
 
         case 6:
@@ -124,20 +145,45 @@ ldapserver_parse_one (char *line,
 
             flags = strtokenize (p, ",");
             if (!flags)
-              log_fatal ("strtokenize failed: %s\n",
-                         gpg_strerror (gpg_error_from_syserror ()));
+              {
+                log_error ("strtokenize failed: %s\n",
+                           gpg_strerror (gpg_error_from_syserror ()));
+                fail = 1;
+                break;
+              }
 
             for (i=0; (s = flags[i]); i++)
               {
                 if (!*s)
                   ;
-                else if (!ascii_strcasecmp (s, "ldaps"))
-                  server->use_ldaps = 1;
-                else if (!ascii_strcasecmp (s, "ldap"))
-                  server->use_ldaps = 0;
+                else if (!ascii_strcasecmp (s, "starttls"))
+                  {
+                    server->starttls = 1;
+                    server->ldap_over_tls = 0;
+                  }
+                else if (!ascii_strcasecmp (s, "ldaptls"))
+                  {
+                    server->starttls = 0;
+                    server->ldap_over_tls = 1;
+                  }
+                else if (!ascii_strcasecmp (s, "plain"))
+                  {
+                    server->starttls = 0;
+                    server->ldap_over_tls = 0;
+                  }
+                else if (!ascii_strcasecmp (s, "ntds"))
+                  {
+                    server->ntds = 1;
+                  }
                 else
-                  log_info (_("%s:%u: ignoring unknown flag '%s'\n"),
-                            filename, lineno, s);
+                  {
+                    if (filename)
+                      log_info (_("%s:%u: ignoring unknown flag '%s'\n"),
+                                filename, lineno, s);
+                    else
+                      log_info ("ldap: unknown flag '%s' ignored in (%s)\n",
+                                s, line);
+                  }
               }
 
             xfree (flags);
@@ -150,9 +196,13 @@ ldapserver_parse_one (char *line,
 	}
     }
 
+ leave:
   if (fail)
     {
-      log_info (_("%s:%u: skipping this line\n"), filename, lineno);
+      if (filename)
+        log_info (_("%s:%u: skipping this line\n"), filename, lineno);
+      else
+        log_info ("ldap: error in server spec ('%s')\n", line);
       ldapserver_list_free (server);
       server = NULL;
     }
diff --git a/dirmngr/ldapserver.h b/dirmngr/ldapserver.h
index 1b20508..c62f5a9 100644
--- a/dirmngr/ldapserver.h
+++ b/dirmngr/ldapserver.h
@@ -26,18 +26,6 @@
 void ldapserver_list_free (ldap_server_t servers);
 
 
-/* Parse a single LDAP server configuration line.  Returns the server
-   or NULL in case of errors.  The configuration line is assumed to be
-   colon separated with these fields:
-
-   1. field: Hostname
-   2. field: Portnumber
-   3. field: Username
-   4. field: Password
-   5. field: Base DN
-
-   FILENAME and LINENO are used for diagnostic purposes only.
-*/
 ldap_server_t ldapserver_parse_one (char *line,
 				    const char *filename, unsigned int lineno);
 
diff --git a/dirmngr/ocsp.c b/dirmngr/ocsp.c
index 6ed1809..6ec760d 100644
--- a/dirmngr/ocsp.c
+++ b/dirmngr/ocsp.c
@@ -450,7 +450,7 @@ check_signature (ctrl_t ctrl,
 {
   gpg_error_t err;
   int algo, cert_idx;
-  gcry_sexp_t s_hash;
+  gcry_sexp_t s_hash = NULL;
   ksba_cert_t cert;
   const char *s;
 
@@ -534,6 +534,7 @@ check_signature (ctrl_t ctrl,
       err = ksba_ocsp_get_responder_id (ocsp, &name, &keyid);
       if (err)
         {
+          gcry_sexp_release (s_hash);
           log_error (_("error getting responder ID: %s\n"),
                      gcry_strerror (err));
           return err;
diff --git a/dirmngr/server.c b/dirmngr/server.c
index 0ccba29..ced92de 100644
--- a/dirmngr/server.c
+++ b/dirmngr/server.c
@@ -1140,10 +1140,13 @@ task_check_wkd_support (ctrl_t ctrl, const char *domain)
 
 
 static const char hlp_ldapserver[] =
-  "LDAPSERVER <data>\n"
+  "LDAPSERVER [--clear] <data>\n"
   "\n"
   "Add a new LDAP server to the list of configured LDAP servers.\n"
-  "DATA is in the same format as expected in the configure file.";
+  "DATA is in the same format as expected in the configure file.\n"
+  "An optional prefix \"ldap:\" is allowed.  With no args all\n"
+  "configured ldapservers are listed.  Option --clear removes all\n"
+  "servers configured in this session.";
 static gpg_error_t
 cmd_ldapserver (assuan_context_t ctx, char *line)
 {
@@ -1151,13 +1154,63 @@ cmd_ldapserver (assuan_context_t ctx, char *line)
   ctrl_t ctrl = assuan_get_pointer (ctx);
   ldap_server_t server;
   ldap_server_t *last_next_p;
+  int clear_flag;
 
+  clear_flag = has_option (line, "--clear");
+  line = skip_options (line);
   while (spacep (line))
     line++;
-  if (*line == '\0')
-    return leave_cmd (ctx, PARM_ERROR (_("ldapserver missing")));
 
-  server = ldapserver_parse_one (line, "", 0);
+  if (clear_flag)
+    {
+#if USE_LDAP
+      ldapserver_list_free (ctrl->server_local->ldapservers);
+#endif /*USE_LDAP*/
+      ctrl->server_local->ldapservers = NULL;
+    }
+
+  if (!*line && clear_flag)
+    return leave_cmd (ctx, 0);
+
+  if (!*line)
+    {
+      /* List all ldapservers.  */
+      struct ldapserver_iter ldapserver_iter;
+      char *tmpstr;
+      char portstr[20];
+
+      for (ldapserver_iter_begin (&ldapserver_iter, ctrl);
+           !ldapserver_iter_end_p (&ldapserver_iter);
+           ldapserver_iter_next (&ldapserver_iter))
+        {
+          server = ldapserver_iter.server;
+          if (server->port)
+            snprintf (portstr, sizeof portstr, "%d", server->port);
+          else
+            *portstr = 0;
+
+          tmpstr = xtryasprintf ("ldap:%s:%s:%s:%s:%s:%s%s:",
+                                 server->host? server->host : "",
+                                 portstr,
+                                 server->user? server->user : "",
+                                 server->pass? "*****": "",
+                                 server->base? server->base : "",
+                                 server->starttls ? "starttls" :
+                                 server->ldap_over_tls ? "ldaptls" : "none",
+                                 server->ntds ? ",ntds" : "");
+          if (!tmpstr)
+            return leave_cmd (ctx, gpg_error_from_syserror ());
+          dirmngr_status (ctrl, "LDAPSERVER", tmpstr, NULL);
+          xfree (tmpstr);
+        }
+      return leave_cmd (ctx, 0);
+    }
+
+  /* Skip an "ldap:" prefix unless it is a valid ldap url.  */
+  if (!strncmp (line, "ldap:", 5) && !(line[5] == '/' && line[6] == '/'))
+    line += 5;
+
+  server = ldapserver_parse_one (line, NULL, 0);
   if (! server)
     return leave_cmd (ctx, gpg_error (GPG_ERR_INV_ARG));
 
@@ -1619,7 +1672,8 @@ lookup_cert_by_pattern (assuan_context_t ctx, char *line,
           if (!err && single)
             goto ready;
 
-          if (gpg_err_code (err) == GPG_ERR_NO_DATA)
+          if (gpg_err_code (err) == GPG_ERR_NO_DATA
+              || gpg_err_code (err) == GPG_ERR_NOT_FOUND)
             {
               err = 0;
               if (cache_only)
@@ -2065,6 +2119,8 @@ make_keyserver_item (const char *uri, uri_item_t *r_item)
 {
   gpg_error_t err;
   uri_item_t item;
+  const char *s;
+  char *tmpstr = NULL;
 
   *r_item = NULL;
 
@@ -2082,22 +2138,22 @@ make_keyserver_item (const char *uri, uri_item_t *r_item)
    */
   if (!strcmp (uri, "hkps://keys.gnupg.net")
       || !strcmp (uri, "keys.gnupg.net"))
-    uri = "hkps://hkps.pool.sks-keyservers.net";
+    uri = "hkps://keyserver.ubuntu.com";
   else if (!strcmp (uri, "https://keys.gnupg.net"))
-    uri = "https://hkps.pool.sks-keyservers.net";
+    uri = "hkps://keyserver.ubuntu.com";
   else if (!strcmp (uri, "hkp://keys.gnupg.net"))
-    uri = "hkp://hkps.pool.sks-keyservers.net";
+    uri = "hkp://pgp.surf.nl";
   else if (!strcmp (uri, "http://keys.gnupg.net"))
-    uri = "http://hkps.pool.sks-keyservers.net";
+    uri = "hkp://pgp.surf.nl:80";
   else if (!strcmp (uri, "hkps://http-keys.gnupg.net")
            || !strcmp (uri, "http-keys.gnupg.net"))
-    uri = "hkps://ha.pool.sks-keyservers.net";
+    uri = "hkps://keyserver.ubuntu.com";
   else if (!strcmp (uri, "https://http-keys.gnupg.net"))
-    uri = "https://ha.pool.sks-keyservers.net";
+    uri = "hkps://keyserver.ubuntu.com";
   else if (!strcmp (uri, "hkp://http-keys.gnupg.net"))
-    uri = "hkp://ha.pool.sks-keyservers.net";
+    uri = "hkp://pgp.surf.nl";
   else if (!strcmp (uri, "http://http-keys.gnupg.net"))
-    uri = "http://ha.pool.sks-keyservers.net";
+    uri = "hkp://pgp.surf.nl:80";
 
   item = xtrymalloc (sizeof *item + strlen (uri));
   if (!item)
@@ -2108,14 +2164,64 @@ make_keyserver_item (const char *uri, uri_item_t *r_item)
   strcpy (item->uri, uri);
 
 #if USE_LDAP
-  if (ldap_uri_p (item->uri))
-    err = ldap_parse_uri (&item->parsed_uri, uri);
-  else
+  if (!strncmp (uri, "ldap:", 5) && !(uri[5] == '/' && uri[6] == '/'))
+    {
+      /* Special ldap scheme given.  This differs from a valid ldap
+       * scheme in that no double slash follows..  Use http_parse_uri
+       * to put it as opaque value into parsed_uri.  */
+      tmpstr = strconcat ("opaque:", uri+5, NULL);
+      if (!tmpstr)
+        err = gpg_error_from_syserror ();
+      else
+        err = http_parse_uri (&item->parsed_uri, tmpstr, 0);
+    }
+  else if ((s=strchr (uri, ':')) && !(s[1] == '/' && s[2] == '/'))
+    {
+      /* No valid scheme given.  Use http_parse_uri to put the string
+       * as opaque value into parsed_uri.  */
+      tmpstr = strconcat ("opaque:", uri, NULL);
+      if (!tmpstr)
+        err = gpg_error_from_syserror ();
+      else
+        err = http_parse_uri (&item->parsed_uri, tmpstr, 0);
+    }
+  else if (ldap_uri_p (uri))
+    {
+      int fixup = 0;
+      /* Fixme: We should get rid of that parser and replace it with
+       * our generic (http) URI parser.  */
+
+      /* If no port has been specified and the scheme ist ldaps we use
+       * our idea of the default port because the standard LDAP URL
+       * parser would use 636 here.  This is because we redefined
+       * ldaps to mean starttls.  */
+#ifdef HAVE_W32_SYSTEM
+      if (!strcmp (uri, "ldap:///"))
+          fixup = 1;
+      else
 #endif
+        if (!http_parse_uri (&item->parsed_uri,uri,HTTP_PARSE_NO_SCHEME_CHECK))
+        {
+          if (!item->parsed_uri->port
+              && !strcmp (item->parsed_uri->scheme, "ldaps"))
+            fixup = 2;
+          http_release_parsed_uri (item->parsed_uri);
+          item->parsed_uri = NULL;
+        }
+
+      err = ldap_parse_uri (&item->parsed_uri, uri);
+      if (!err && fixup == 1)
+        item->parsed_uri->ad_current = 1;
+      else if (!err && fixup == 2)
+        item->parsed_uri->port = 389;
+    }
+  else
+#endif /* USE_LDAP */
     {
-      err = http_parse_uri (&item->parsed_uri, uri, 1);
+      err = http_parse_uri (&item->parsed_uri, uri, HTTP_PARSE_NO_SCHEME_CHECK);
     }
 
+  xfree (tmpstr);
   if (err)
     xfree (item);
   else
diff --git a/dirmngr/t-http.c b/dirmngr/t-http.c
index 8ad5e7a..7f3aa00 100644
--- a/dirmngr/t-http.c
+++ b/dirmngr/t-http.c
@@ -381,7 +381,7 @@ main (int argc, char **argv)
   (void)no_crl;
 #endif /*HTTP_USE_GNUTLS*/
 
-  rc = http_parse_uri (&uri, *argv, 1);
+  rc = http_parse_uri (&uri, *argv, HTTP_PARSE_NO_SCHEME_CHECK);
   if (rc)
     {
       log_error ("'%s': %s\n", *argv, gpg_strerror (rc));
diff --git a/dirmngr/t-ldap-misc.c b/dirmngr/t-ldap-misc.c
new file mode 100644
index 0000000..afba102
--- /dev/null
+++ b/dirmngr/t-ldap-misc.c
@@ -0,0 +1,158 @@
+/* t-ldap-parse-uri.c - Tests for ldap-parse-uri.c and ldap-misc.c
+ * Copyright (C) 2015  g10 Code GmbH
+ *
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuPG is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include <config.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <gpg-error.h>
+
+#include "../common/util.h"
+#include "t-support.h"
+#include "ldap-misc.h"
+
+
+static void
+test_ldap_parse_extfilter (void)
+{
+  struct {
+    const char *string;
+    const char *base;
+    const char *filter;
+    int scope;
+    gpg_err_code_t ec;
+  } tests[] =
+  {
+   { "^CN=foo, OU=My Users&(objectClasses=*)",
+     "CN=foo, OU=My Users", "(objectClasses=*)",
+     -1 },
+   { "^CN=foo, OU=My Users&base&(objectClasses=*)",
+     "CN=foo, OU=My Users", "(objectClasses=*)",
+     LDAP_SCOPE_BASE },
+   { "^CN=foo, OU=My Users&one&(objectClasses=*)",
+     "CN=foo, OU=My Users", "(objectClasses=*)",
+     LDAP_SCOPE_ONELEVEL },
+   { "^CN=foo, OU=My Users&sub&(objectClasses=*)",
+     "CN=foo, OU=My Users", "(objectClasses=*)",
+     LDAP_SCOPE_SUBTREE },
+   /* { "^CN=foo, OU=My Users&children&(objectClasses=*)", */
+   /*   "CN=foo, OU=My Users", "(objectClasses=*)", */
+   /*   LDAP_SCOPE_CHILDREN }, */
+   { "^CN=foo, OU=My Users&",
+     "CN=foo, OU=My Users", NULL,
+     -1 },
+   { "^CN=foo, OU=My Users&sub&",
+     "CN=foo, OU=My Users", NULL,
+     LDAP_SCOPE_SUBTREE },
+   /* { "^&children&(objectClasses=*)", */
+   /*   "", "(objectClasses=*)", */
+   /*   LDAP_SCOPE_CHILDREN }, */
+   { "^CN=foo, OU=My &&Users&base&(objectClasses=*)",
+     "CN=foo, OU=My &Users", "(objectClasses=*)",
+     LDAP_SCOPE_BASE },
+   { "^CN=foo, OU=My Users&&&base&(objectClasses=*)",
+     "CN=foo, OU=My Users&", "(objectClasses=*)",
+     LDAP_SCOPE_BASE },
+   { "^CN=foo, OU=My Users",
+     NULL, NULL,
+     LDAP_SCOPE_BASE, GPG_ERR_SYNTAX },
+   { "^CN=foo, OU=My Users&base(objectClasses=*)",
+     NULL, NULL,
+     LDAP_SCOPE_BASE, GPG_ERR_SYNTAX },
+   { "^CN=foo, OU=My Users&base&objectClasses=*)",
+     NULL, NULL,
+     LDAP_SCOPE_BASE, GPG_ERR_SYNTAX },
+   { "^CN=foo, OU=My Users&base&(objectClasses=*",
+     NULL, NULL,
+     LDAP_SCOPE_BASE, GPG_ERR_SYNTAX }
+  };
+  int idx;
+  gpg_error_t err;
+  int errcount = 0;
+  char *base, *filter;
+  int scope;
+
+  for (idx= 0; idx < DIM (tests); idx++)
+    {
+      scope = -1;
+      err = ldap_parse_extfilter (tests[idx].string, 1, &base, &scope, &filter);
+      if (err && tests[idx].ec)
+        {
+          if (gpg_err_code (err) != tests[idx].ec)
+            {
+              fprintf (stderr, "%s: test %d failed: wrong error code %d\n",
+                       __func__, idx, err);
+              errcount++;
+            }
+          continue;
+        }
+      if (err)
+        {
+          fprintf (stderr, "%s: test %d failed: %s\n",
+                   __func__, idx, gpg_strerror (err));
+          errcount++;
+          continue;
+        }
+      if (tests[idx].ec)
+        {
+          fprintf (stderr, "%s: test %d failed: error not detected\n",
+                   __func__, idx);
+          errcount++;
+          continue;
+        }
+      if ((!tests[idx].base ^ !base)
+          || (tests[idx].base && strcmp (tests[idx].base, base)))
+        {
+          fprintf (stderr, "%s: test %d failed: base mismatch ('%s')\n",
+                   __func__, idx, base? base : "(null");
+          errcount++;
+        }
+      if ((!tests[idx].filter ^ !filter)
+          || (tests[idx].filter && strcmp (tests[idx].filter, filter)))
+        {
+          fprintf (stderr, "%s: test %d failed: filter mismatch ('%s')\n",
+                   __func__, idx, filter? filter : "(null");
+          errcount++;
+        }
+      if (tests[idx].scope != scope)
+        {
+          fprintf (stderr, "%s: test %d failed: scope mismatch (%d)\n",
+                   __func__, idx, scope);
+          errcount++;
+        }
+      xfree (base);
+      xfree (filter);
+    }
+  if (errcount)
+    exit (1);
+}
+
+
+
+
+int
+main (int argc, char **argv)
+{
+  (void)argc;
+  (void)argv;
+
+  test_ldap_parse_extfilter ();
+
+  return 0;
+}
diff --git a/dirmngr/t-support.h b/dirmngr/t-support.h
index f773f1e..7f60c94 100644
--- a/dirmngr/t-support.h
+++ b/dirmngr/t-support.h
@@ -31,6 +31,12 @@
 #ifndef DIRMNGR_T_SUPPORT_H
 #define DIRMNGR_T_SUPPORT_H 1
 
+#ifndef DIM
+# define DIM(v)		     (sizeof(v)/sizeof((v)[0]))
+# define DIMof(type,member)   DIM(((type *)0)->member)
+#endif
+
+
 /* Macros to print the result of a test.  */
 #define pass()  do { ; } while(0)
 #define fail(a)  do { fprintf (stderr, "%s:%d: test %d failed\n",\
diff --git a/doc/DETAILS b/doc/DETAILS
index 17735e6..b5b1bb7 100644
--- a/doc/DETAILS
+++ b/doc/DETAILS
@@ -1229,7 +1229,7 @@ pkd:0:1024:B665B1435F4C2 .... FF26ABB:
 
 *** CERTINFO <certtype> <certref> [<label>]
 
-    This status is mettited for X.509 certifcates.
+    This status is emitted for X.509 certifcates.
     CERTTYPE is a number indicating the type of the certificate:
      0   := Unknown
      100 := Regular X.509 cert
@@ -1248,7 +1248,9 @@ pkd:0:1024:B665B1435F4C2 .... FF26ABB:
     This status returns the Manufactorer ID as the unsigned number N.
     For OpenPGP this is well defined; for other cards this is 0.  The
     name of the manufacturer is also given as <string>; spaces are not
-    escaped.  For PKCS#15 cards <string> is TokenInfo.manufactorerID.
+    escaped.  For PKCS#15 cards <string> is TokenInfo.manufactorerID;
+    a string in brackets describing GnuPG's own card product name may
+    be appended to <string>.
 
 *** KEY-STATUS <keyref> <status>
     This is the response from scdaemon on GETATTR KEY-STATUS for
@@ -1663,7 +1665,10 @@ Description of some debug flags:
 ** List of useful RFCs
   - RFC-3447 :: PKCS  #1: RSA Cryptography Specifications Version 2.1
   - RFC-4880 :: OpenPGP
+  - RFC-5083 :: CMS - Authenticated-Enveloped-Data
+  - RFC-5084 :: CMS - AES-GCM
   - RFC-5280 :: X.509 PKI Certificate and CRL Profile
+  - RFC-5652 :: CMS (STD0070)
   - RFC-6818 :: Updates to the X.509 PKI Certificate and CRL Profile
   - RFC-8398 :: Internationalized Email Addresses in X.509 Certificates.
   - RFC-8399 :: Internationalization Updates to RFC 5280
diff --git a/doc/defsincdate b/doc/defsincdate
index 0572772..24039dc 100644
--- a/doc/defsincdate
+++ b/doc/defsincdate
@@ -1 +1 @@
-1618904276
+1629821396
diff --git a/doc/dirmngr.texi b/doc/dirmngr.texi
index 981b48b..1638d7d 100644
--- a/doc/dirmngr.texi
+++ b/doc/dirmngr.texi
@@ -14,7 +14,7 @@
 @manpage dirmngr.8
 @ifset manverb
 .B dirmngr
-\- CRL and OCSP daemon
+\- GnuPG's network access daemon
 @end ifset
 
 @mansect synopsis
@@ -321,9 +321,8 @@ provided.  These are the same as the @option{--keyserver-options} of
 @command{gpg}, but apply only to this particular keyserver.
 
 Most keyservers synchronize with each other, so there is generally no
-need to send keys to more than one server. The keyserver
-@code{hkp://keys.gnupg.net} uses round robin DNS to give a different
-keyserver each time you use it.
+need to send keys to more than one server. Somes keyservers use round
+robin DNS to give a different keyserver each time you use it.
 
 If exactly two keyservers are configured and only one is a Tor hidden
 service (.onion), Dirmngr selects the keyserver to use depending on
@@ -331,28 +330,43 @@ whether Tor is locally running or not.  The check for a running Tor is
 done for each new connection.
 
 If no keyserver is explicitly configured, dirmngr will use the
-built-in default of @code{hkps://hkps.pool.sks-keyservers.net}.
+built-in default of @code{https://keyserver.ubuntu.com}.
 
 Windows users with a keyserver running on their Active Directory
-should use @code{ldap:///} for @var{name} to access this directory.
-As an alternative it is also possible to add @code{gpgNtds=1} as
-extension (i.e. after the fourth question mark).
+may use the short form @code{ldap:///} for @var{name} to access this directory.
 
 For accessing anonymous LDAP keyservers @var{name} is in general just
 a @code{ldaps://ldap.example.com}.  A BaseDN parameter should never be
-specified.  If authentication is required the value of @var{name} is
-for example:
+specified.  If authentication is required things are more complicated
+and two methods are available:
+
+The modern method (since version 2.2.28) is to use the very same syntax
+as used with the option @option{--ldapserver}.  Please see over
+there for details; here is an example:
+
+@example
+       keyserver ldap:ldap.example.com::uid=USERNAME,ou=GnuPG Users,
+       dc=example,dc=com:PASSWORD::starttls
+@end example
+
+       The other method is to use a full URL for @var{name}; for example:
 
 @example
        keyserver ldaps://ldap.example.com/????bindname=uid=USERNAME
        %2Cou=GnuPG%20Users%2Cdc=example%2Cdc=com,password=PASSWORD
 @end example
 
-       Put this all on one line without any spaces and keep the '%2C' as given.
-       Replace USERNAME, PASSWORD, and the 'dc' parts according to the
-       instructions received from the LDAP administrator.  Note that only
-       simple authentication (i.e. cleartext passwords) is supported and thus
-       using ldaps is strongly suggested.
+       Put this all on one line without any spaces and keep the '%2C'
+       as given.  Replace USERNAME, PASSWORD, and the 'dc' parts
+       according to the instructions received from your LDAP
+       administrator.  Note that only simple authentication
+       (i.e. cleartext passwords) is supported and thus using ldaps is
+       strongly suggested (since 2.2.28 "ldaps" defaults to port 389
+       and uses STARTTLS).  On Windows authentication via AD can be
+       requested by adding @code{gpgNtds=1} after the fourth question
+       mark instead of the bindname and password parameter.
+
+
 
 @item --nameserver @var{ipaddr}
 @opindex nameserver
@@ -424,10 +438,9 @@ configured LDAP server if the connection using the "proxy" failed.
 
 @item --ldapserverlist-file @var{file}
 @opindex ldapserverlist-file
-Read a list of LDAP servers to consult for CRLs and certificates from
-file.  This servers from this list are used after any servers set by a
-client for its session. The default value for @var{file} is
-@file{dirmngr_ldapservers.conf}.
+Read the list of LDAP servers to consult for CRLs and X.509 certificates from
+file instead of the default per-user ldap server list file. The default
+value for @var{file} is @file{dirmngr_ldapservers.conf}.
 
 This server list file contains one LDAP server per line in the format
 
@@ -435,10 +448,6 @@ This server list file contains one LDAP server per line in the format
 
 Lines starting with a  @samp{#} are comments.
 
-The only defined flag is @code{ldaps} to specify that a TLS
-connections shall be used.  Flags are comma delimited; unknown flags
-are ignored.
-
 Note that as usual all strings entered are expected to be UTF-8 encoded.
 Obviously this will lead to problems if the password has originally been
 encoded as Latin-1.  There is no other solution here than to put such a
@@ -448,6 +457,40 @@ helpful for frontends as it enables editing this configuration file using
 percent-escaped strings.}
 
 
+@item --ldapserver @var{spec}
+@opindex ldapserver
+This is an alternative way to specify LDAP servers for CRL and X.509
+certificate retrieval.  If this option is used the servers configured
+in @file{dirmngr_ldapservers.conf} (or the file given by
+@option{--ldapserverlist-file}) are cleared.  Note that
+@file{dirmngr_ldapservers.conf} is not read again by a reload
+signal. However, @option{--ldapserver} options are read again.
+
+@var{spec} is either a proper LDAP URL or a colon delimited list of
+the form
+
+@sc{hostname:port:username:password:base_dn:flags:}
+
+with an optional prefix of @code{ldap:} (but without the two slashes
+which would turn this into a proper LDAP URL).  @sc{flags} is a list
+of one or more comma delimited keywords:
+@table @code
+@item plain
+The default: Do not use a TLS secured connection at all; the default
+port is 389.
+@item starttls
+Use STARTTLS to secure the connection; the default port is 389.
+@item ldaptls
+Tunnel LDAP through a TLS connection; the default port is 636.
+@item ntds
+On Windows authenticate the LDAP connection using the Active Directory
+with the current user.
+@end table
+
+Note that in an URL style specification the scheme @code{ldaps://}
+refers to STARTTLS and _not_ to LDAP-over-TLS.
+
+
 @item --ldaptimeout @var{secs}
 @opindex ldaptimeout
 Specify the number of seconds to wait for an LDAP query before timing
@@ -552,10 +595,8 @@ the file is in PEM format a suffix of @code{.pem} is expected for
 @var{file}.  This option may be given multiple times to add more
 root certificates.  Tilde expansion is supported.
 
-If no @code{hkp-cacert} directive is present, dirmngr will make a
-reasonable choice: if the keyserver in question is the special pool
-@code{hkps.pool.sks-keyservers.net}, it will use the bundled root
-certificate for that pool.  Otherwise, it will use the system CAs.
+If no @code{hkp-cacert} directive is present, dirmngr will use the
+system CAs.
 
 @end table
 
diff --git a/doc/gnupg-card-architecture.pdf b/doc/gnupg-card-architecture.pdf
index c523d77..47e03b1 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 c9b9268..1702413 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 558430d..eec9585 100644
--- a/doc/gnupg-module-overview.png
+++ b/doc/gnupg-module-overview.png
diff --git a/doc/gnupg.info b/doc/gnupg.info
index 5438dcb..070cfa4 100644
--- a/doc/gnupg.info
+++ b/doc/gnupg.info
@@ -1,7 +1,7 @@
 This is gnupg.info, produced by makeinfo version 6.5 from gnupg.texi.
 
-This is the 'The GNU Privacy Guard Manual' (version 2.3.1-beta26, April
-2021).
+This is the 'The GNU Privacy Guard Manual' (version 2.3.2-beta150,
+August 2021).
 
    (C) 2002, 2004, 2005, 2006, 2007, 2010 Free Software Foundation, Inc.
 (C) 2013, 2014, 2015 Werner Koch.
@@ -23,204 +23,204 @@ END-INFO-DIR-ENTRY
 
 
 Indirect:
-gnupg.info-1: 988
-gnupg.info-2: 305922
-gnupg.info-3: 611731
+gnupg.info-1: 990
+gnupg.info-2: 302761
+gnupg.info-3: 616434
 
 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-file14195
-Ref: option --no-allow-mark-trusted14568
-Ref: option --allow-preset-passphrase14772
-Ref: option --no-allow-loopback-pinentry14925
-Ref: option --extra-socket22316
-Ref: option --enable-ssh-support23690
-Ref: option --ssh-fingerprint-digest26027
-Node: Agent Configuration27684
-Node: Agent Signals33082
-Node: Agent Examples34542
-Node: Agent Protocol35109
-Node: Agent PKDECRYPT37263
-Node: Agent PKSIGN39175
-Node: Agent GENKEY41479
-Node: Agent IMPORT43376
-Node: Agent EXPORT43820
-Node: Agent ISTRUSTED44035
-Node: Agent GET_PASSPHRASE46410
-Node: Agent CLEAR_PASSPHRASE48851
-Node: Agent PRESET_PASSPHRASE49242
-Node: Agent GET_CONFIRMATION50080
-Node: Agent HAVEKEY50752
-Node: Agent LEARN51384
-Node: Agent PASSWD51682
-Node: Agent UPDATESTARTUPTTY52148
-Node: Agent GETEVENTCOUNTER52626
-Node: Agent GETINFO53434
-Node: Agent OPTION54138
-Node: Invoking DIRMNGR57196
-Node: Dirmngr Commands58094
-Node: Dirmngr Options60547
-Ref: Dirmngr Options-Footnote-176630
-Node: Dirmngr Configuration76765
-Node: Dirmngr Signals81643
-Node: Dirmngr Examples82671
-Node: Dirmngr Protocol83353
-Node: Dirmngr LOOKUP84003
-Node: Dirmngr ISVALID85374
-Node: Dirmngr CHECKCRL87947
-Node: Dirmngr CHECKOCSP89004
-Node: Dirmngr CACHECERT90310
-Node: Dirmngr VALIDATE91149
-Node: Invoking GPG91717
-Node: GPG Commands92947
-Node: General GPG Commands93841
-Node: Operational GPG Commands94530
-Ref: option --export-ownertrust111592
-Node: OpenPGP Key Management114117
-Node: GPG Options137342
-Node: GPG Configuration Options138675
-Ref: gpg-option --options151906
-Ref: trust-model-tofu156387
-Node: GPG Key related Options175974
-Node: GPG Input and Output182295
-Node: OpenPGP Options196347
-Node: Compliance Options202150
-Node: GPG Esoteric Options205038
-Ref: GPG Esoteric Options-Footnote-1234445
-Node: Deprecated Options234599
-Node: GPG Configuration236102
-Node: GPG Examples241782
-Node: Unattended Usage of GPG250470
-Node: Programmatic use of GnuPG251101
-Node: Ephemeral home directories251652
-Node: The quick key manipulation interface252959
-Node: Unattended GPG key generation253546
-Node: Invoking GPGSM262865
-Node: GPGSM Commands263734
-Node: General GPGSM Commands264172
-Node: Operational GPGSM Commands264860
-Node: Certificate Management266894
-Node: GPGSM Options272340
-Node: Configuration Options272914
-Ref: gpgsm-option --options273183
-Node: Certificate Options277052
-Ref: gpgsm-option --validation-model280656
-Node: Input and Output281636
-Ref: option --p12-charset282219
-Ref: gpgsm-option --with-key-data283463
-Ref: gpgsm-option --with-validation283737
-Node: CMS Options284615
-Node: Esoteric Options285635
-Node: GPGSM Configuration291148
-Node: GPGSM Examples296664
-Node: Unattended Usage296861
-Node: Automated signature checking297452
-Node: CSR and certificate creation299275
-Node: GPGSM Protocol305922
-Node: GPGSM ENCRYPT307178
-Node: GPGSM DECRYPT309853
-Node: GPGSM SIGN310689
-Node: GPGSM VERIFY312145
-Node: GPGSM GENKEY312661
-Node: GPGSM LISTKEYS313676
-Ref: gpgsm-cmd listkeys313835
-Node: GPGSM EXPORT314588
-Node: GPGSM IMPORT315552
-Node: GPGSM DELETE316293
-Node: GPGSM GETAUDITLOG316800
-Ref: gpgsm-cmd getauditlog316969
-Node: GPGSM GETINFO317313
-Node: GPGSM OPTION318162
-Node: Invoking SCDAEMON321515
-Node: Scdaemon Commands322189
-Node: Scdaemon Options323317
-Node: Card applications332251
-Node: OpenPGP Card332916
-Node: NKS Card333389
-Node: DINSIG Card333715
-Node: PKCS#15 Card334091
-Node: Geldkarte Card334361
-Node: SmartCard-HSM334752
-Node: Undefined Card335348
-Node: Scdaemon Configuration335761
-Node: Scdaemon Examples336799
-Node: Scdaemon Protocol336982
-Node: Scdaemon SERIALNO338501
-Node: Scdaemon LEARN339347
-Node: Scdaemon READCERT340194
-Node: Scdaemon READKEY340596
-Node: Scdaemon PKSIGN340882
-Node: Scdaemon PKDECRYPT341608
-Node: Scdaemon GETATTR342358
-Node: Scdaemon SETATTR342560
-Node: Scdaemon WRITEKEY342765
-Node: Scdaemon GENKEY343467
-Node: Scdaemon RANDOM343670
-Node: Scdaemon PASSWD343893
-Node: Scdaemon CHECKPIN344284
-Node: Scdaemon RESTART345287
-Node: Scdaemon APDU345820
-Node: Specify a User ID346793
-Ref: how-to-specify-a-user-id346951
-Node: Trust Values351809
-Ref: trust-values351941
-Node: Smart Card Tool352546
-Node: gpg-card352892
-Node: Helper Tools382192
-Node: watchgnupg383049
-Ref: option watchgnupg --tcp384406
-Node: gpgv386070
-Node: addgnupghome391277
-Node: gpgconf391975
-Ref: gpgconf-Footnote-1394164
-Node: Invoking gpgconf394462
-Node: Format conventions401503
-Node: Listing components406836
-Node: Checking programs408921
-Node: Listing options411661
-Node: Changing options419159
-Node: Listing global options420863
-Node: Querying versions422636
-Node: Files used by gpgconf425336
-Node: applygnupgdefaults425814
-Node: gpg-preset-passphrase426560
-Node: Invoking gpg-preset-passphrase427597
-Node: gpg-connect-agent429001
-Node: Invoking gpg-connect-agent429717
-Node: Controlling gpg-connect-agent434244
-Node: dirmngr-client440771
-Node: gpgparsemail444124
-Node: gpgtar444439
-Node: gpg-check-pattern448473
-Node: Web Key Service448929
-Node: gpg-wks-client449242
-Node: gpg-wks-server454111
-Node: Howtos459533
-Node: Howto Create a Server Cert459805
-Node: System Notes468218
-Node: W32 Notes469429
-Node: Debugging469851
-Node: Debugging Tools470679
-Node: kbxutil470959
-Node: Debugging Hints472490
-Node: Common Problems473621
-Node: Architecture Details478858
-Node: Component interaction479168
-Ref: fig:moduleoverview479354
-Node: GnuPG-1 and GnuPG-2479461
-Ref: fig:cardarchitecture479751
-Node: Copying479866
-Node: Contributors517390
-Node: Glossary523645
-Node: Option Index526164
-Node: Environment Index611731
-Node: Index617324
+Node: Top990
+Node: Installation2979
+Node: Invoking GPG-AGENT5328
+Node: Agent Commands7094
+Node: Agent Options8898
+Ref: option --options9178
+Ref: option --homedir9504
+Ref: option --log-file14199
+Ref: option --no-allow-mark-trusted14572
+Ref: option --allow-preset-passphrase14776
+Ref: option --no-allow-loopback-pinentry14929
+Ref: option --extra-socket23282
+Ref: option --enable-ssh-support24656
+Ref: option --ssh-fingerprint-digest26993
+Node: Agent Configuration28650
+Node: Agent Signals34048
+Node: Agent Examples35508
+Node: Agent Protocol36075
+Node: Agent PKDECRYPT38229
+Node: Agent PKSIGN40141
+Node: Agent GENKEY42445
+Node: Agent IMPORT44342
+Node: Agent EXPORT44786
+Node: Agent ISTRUSTED45001
+Node: Agent GET_PASSPHRASE47376
+Node: Agent CLEAR_PASSPHRASE49817
+Node: Agent PRESET_PASSPHRASE50208
+Node: Agent GET_CONFIRMATION51046
+Node: Agent HAVEKEY51718
+Node: Agent LEARN52350
+Node: Agent PASSWD52648
+Node: Agent UPDATESTARTUPTTY53114
+Node: Agent GETEVENTCOUNTER53592
+Node: Agent GETINFO54400
+Node: Agent OPTION55104
+Node: Invoking DIRMNGR58162
+Node: Dirmngr Commands59060
+Node: Dirmngr Options61513
+Ref: Dirmngr Options-Footnote-178997
+Node: Dirmngr Configuration79132
+Node: Dirmngr Signals84010
+Node: Dirmngr Examples85038
+Node: Dirmngr Protocol85720
+Node: Dirmngr LOOKUP86370
+Node: Dirmngr ISVALID87741
+Node: Dirmngr CHECKCRL90314
+Node: Dirmngr CHECKOCSP91371
+Node: Dirmngr CACHECERT92677
+Node: Dirmngr VALIDATE93516
+Node: Invoking GPG94084
+Node: GPG Commands95314
+Node: General GPG Commands96208
+Node: Operational GPG Commands96897
+Ref: option --export-ownertrust114199
+Node: OpenPGP Key Management116724
+Node: GPG Options139949
+Node: GPG Configuration Options141282
+Ref: gpg-option --options154513
+Ref: trust-model-tofu159081
+Node: GPG Key related Options178894
+Node: GPG Input and Output185215
+Node: OpenPGP Options199267
+Node: Compliance Options205070
+Node: GPG Esoteric Options207958
+Ref: GPG Esoteric Options-Footnote-1237365
+Node: Deprecated Options237519
+Node: GPG Configuration239022
+Node: GPG Examples244702
+Node: Unattended Usage of GPG253513
+Node: Programmatic use of GnuPG254144
+Node: Ephemeral home directories254695
+Node: The quick key manipulation interface256002
+Node: Unattended GPG key generation256589
+Node: Invoking GPGSM265908
+Node: GPGSM Commands266777
+Node: General GPGSM Commands267215
+Node: Operational GPGSM Commands267903
+Node: Certificate Management269937
+Node: GPGSM Options275383
+Node: Configuration Options275957
+Ref: gpgsm-option --options276226
+Node: Certificate Options279548
+Ref: gpgsm-option --validation-model283152
+Node: Input and Output284132
+Ref: option --p12-charset284715
+Ref: gpgsm-option --with-key-data285959
+Ref: gpgsm-option --with-validation286233
+Node: CMS Options287111
+Node: Esoteric Options288131
+Node: GPGSM Configuration293644
+Node: GPGSM Examples299160
+Node: Unattended Usage299357
+Node: Automated signature checking299948
+Node: CSR and certificate creation302761
+Node: GPGSM Protocol308420
+Node: GPGSM ENCRYPT309676
+Node: GPGSM DECRYPT312351
+Node: GPGSM SIGN313187
+Node: GPGSM VERIFY314643
+Node: GPGSM GENKEY315159
+Node: GPGSM LISTKEYS316174
+Ref: gpgsm-cmd listkeys316333
+Node: GPGSM EXPORT317086
+Node: GPGSM IMPORT318050
+Node: GPGSM DELETE318791
+Node: GPGSM GETAUDITLOG319298
+Ref: gpgsm-cmd getauditlog319467
+Node: GPGSM GETINFO319811
+Node: GPGSM OPTION320660
+Node: Invoking SCDAEMON324013
+Node: Scdaemon Commands324687
+Node: Scdaemon Options325815
+Node: Card applications334749
+Node: OpenPGP Card335414
+Node: NKS Card335887
+Node: DINSIG Card336213
+Node: PKCS#15 Card336589
+Node: Geldkarte Card336859
+Node: SmartCard-HSM337250
+Node: Undefined Card337846
+Node: Scdaemon Configuration338259
+Node: Scdaemon Examples339297
+Node: Scdaemon Protocol339480
+Node: Scdaemon SERIALNO340999
+Node: Scdaemon LEARN341845
+Node: Scdaemon READCERT342692
+Node: Scdaemon READKEY343094
+Node: Scdaemon PKSIGN343380
+Node: Scdaemon PKDECRYPT344106
+Node: Scdaemon GETATTR344856
+Node: Scdaemon SETATTR345058
+Node: Scdaemon WRITEKEY345263
+Node: Scdaemon GENKEY345965
+Node: Scdaemon RANDOM346168
+Node: Scdaemon PASSWD346391
+Node: Scdaemon CHECKPIN346782
+Node: Scdaemon RESTART347785
+Node: Scdaemon APDU348318
+Node: Specify a User ID349291
+Ref: how-to-specify-a-user-id349449
+Node: Trust Values354307
+Ref: trust-values354439
+Node: Smart Card Tool355044
+Node: gpg-card355390
+Node: Helper Tools384690
+Node: watchgnupg385547
+Ref: option watchgnupg --tcp386904
+Node: gpgv388568
+Node: addgnupghome393775
+Node: gpgconf394473
+Ref: gpgconf-Footnote-1396662
+Node: Invoking gpgconf396960
+Node: Format conventions404001
+Node: Listing components409334
+Node: Checking programs411419
+Node: Listing options414159
+Node: Changing options421657
+Node: Listing global options423361
+Node: Querying versions425134
+Node: Files used by gpgconf427834
+Node: applygnupgdefaults428312
+Node: gpg-preset-passphrase429058
+Node: Invoking gpg-preset-passphrase430095
+Node: gpg-connect-agent431499
+Node: Invoking gpg-connect-agent432215
+Node: Controlling gpg-connect-agent436742
+Node: dirmngr-client443269
+Node: gpgparsemail446622
+Node: gpgtar446937
+Node: gpg-check-pattern450971
+Node: Web Key Service453275
+Node: gpg-wks-client453588
+Node: gpg-wks-server458456
+Node: Howtos463878
+Node: Howto Create a Server Cert464150
+Node: System Notes472563
+Node: W32 Notes473774
+Node: Debugging474196
+Node: Debugging Tools475024
+Node: kbxutil475304
+Node: Debugging Hints476835
+Node: Common Problems477966
+Node: Architecture Details483203
+Node: Component interaction483513
+Ref: fig:moduleoverview483699
+Node: GnuPG-1 and GnuPG-2483806
+Ref: fig:cardarchitecture484096
+Node: Copying484211
+Node: Contributors521735
+Node: Glossary527990
+Node: Option Index530509
+Node: Environment Index616434
+Node: Index622027
 
 End Tag Table
diff --git a/doc/gnupg.info-1 b/doc/gnupg.info-1
index efcf851..24f110e 100644
--- a/doc/gnupg.info-1
+++ b/doc/gnupg.info-1
@@ -1,7 +1,7 @@
 This is gnupg.info, produced by makeinfo version 6.5 from gnupg.texi.
 
-This is the 'The GNU Privacy Guard Manual' (version 2.3.1-beta26, April
-2021).
+This is the 'The GNU Privacy Guard Manual' (version 2.3.2-beta150,
+August 2021).
 
    (C) 2002, 2004, 2005, 2006, 2007, 2010 Free Software Foundation, Inc.
 (C) 2013, 2014, 2015 Werner Koch.
@@ -27,8 +27,8 @@ File: gnupg.info,  Node: Top,  Next: Installation,  Up: (dir)
 Using the GNU Privacy Guard
 ***************************
 
-This is the 'The GNU Privacy Guard Manual' (version 2.3.1-beta26, April
-2021).
+This is the 'The GNU Privacy Guard Manual' (version 2.3.2-beta150,
+August 2021).
 
    (C) 2002, 2004, 2005, 2006, 2007, 2010 Free Software Foundation, Inc.
 (C) 2013, 2014, 2015 Werner Koch.
@@ -447,10 +447,15 @@ the two leading dashes, in the configuration file.
      Defaults to 1.
 
 '--check-passphrase-pattern FILE'
+'--check-sym-passphrase-pattern FILE'
      Check the passphrase against the pattern given in FILE.  When
      entering a new passphrase matching one of these pattern a warning
-     will be displayed.  FILE should be an absolute filename.  The
-     default is not to use any pattern file.
+     will be displayed.  If FILE does not contain any slashes and does
+     not start with "~/" it is searched in the system configuration
+     directory ('/etc/gnupg').  The default is not to use any pattern
+     file.  The second version of this option is only used when creating
+     a new symmetric key to allow the use of different patterns for such
+     passphrases.
 
      Security note: It is known that checking a passphrase against a
      list of pattern or even against a complete dictionary is not very
@@ -479,6 +484,19 @@ the two leading dashes, in the configuration file.
      timeout, however a Pinentry may use its own default timeout value
      in this case.  A Pinentry may or may not honor this request.
 
+'--pinentry-formatted-passphrase'
+     This option asks the Pinentry to enable passphrase formatting when
+     asking the user for a new passphrase and masking of the passphrase
+     is turned off.
+
+     If passphrase formatting is enabled, then all non-breaking space
+     characters are stripped from the entered passphrase.  Passphrase
+     formatting is mostly useful in combination with passphrases
+     generated with the GENPIN feature of some Pinentries.  Note that
+     such a generated passphrase, if not modified by the user, skips all
+     passphrase constraints checking because such constraints would
+     actually weaken the generated passphrase.
+
 '--pinentry-program FILENAME'
      Use program FILENAME as the PIN entry.  The default is installation
      dependent.  With the default configuration the name of the default
@@ -1708,9 +1726,8 @@ off the two leading dashes.
      only to this particular keyserver.
 
      Most keyservers synchronize with each other, so there is generally
-     no need to send keys to more than one server.  The keyserver
-     'hkp://keys.gnupg.net' uses round robin DNS to give a different
-     keyserver each time you use it.
+     no need to send keys to more than one server.  Somes keyservers use
+     round robin DNS to give a different keyserver each time you use it.
 
      If exactly two keyservers are configured and only one is a Tor
      hidden service (.onion), Dirmngr selects the keyserver to use
@@ -1718,26 +1735,37 @@ off the two leading dashes.
      a running Tor is done for each new connection.
 
      If no keyserver is explicitly configured, dirmngr will use the
-     built-in default of 'hkps://hkps.pool.sks-keyservers.net'.
+     built-in default of 'https://keyserver.ubuntu.com'.
 
      Windows users with a keyserver running on their Active Directory
-     should use 'ldap:///' for NAME to access this directory.  As an
-     alternative it is also possible to add 'gpgNtds=1' as extension
-     (i.e.  after the fourth question mark).
+     may use the short form 'ldap:///' for NAME to access this
+     directory.
 
      For accessing anonymous LDAP keyservers NAME is in general just a
      'ldaps://ldap.example.com'.  A BaseDN parameter should never be
-     specified.  If authentication is required the value of NAME is for
-     example:
+     specified.  If authentication is required things are more
+     complicated and two methods are available:
+
+     The modern method (since version 2.2.28) is to use the very same
+     syntax as used with the option '--ldapserver'.  Please see over
+     there for details; here is an example:
+
+                 keyserver ldap:ldap.example.com::uid=USERNAME,ou=GnuPG Users,
+                 dc=example,dc=com:PASSWORD::starttls
+
+     The other method is to use a full URL for NAME; for example:
 
                  keyserver ldaps://ldap.example.com/????bindname=uid=USERNAME
                  %2Cou=GnuPG%20Users%2Cdc=example%2Cdc=com,password=PASSWORD
 
      Put this all on one line without any spaces and keep the '%2C' as
      given.  Replace USERNAME, PASSWORD, and the 'dc' parts according to
-     the instructions received from the LDAP administrator.  Note that
+     the instructions received from your LDAP administrator.  Note that
      only simple authentication (i.e.  cleartext passwords) is supported
-     and thus using ldaps is strongly suggested.
+     and thus using ldaps is strongly suggested (since 2.2.28 "ldaps"
+     defaults to port 389 and uses STARTTLS). On Windows authentication
+     via AD can be requested by adding 'gpgNtds=1' after the fourth
+     question mark instead of the bindname and password parameter.
 
 '--nameserver IPADDR'
      In "Tor mode" Dirmngr uses a public resolver via Tor to resolve DNS
@@ -1793,9 +1821,9 @@ off the two leading dashes.
      LDAP server if the connection using the "proxy" failed.
 
 '--ldapserverlist-file FILE'
-     Read a list of LDAP servers to consult for CRLs and certificates
-     from file.  This servers from this list are used after any servers
-     set by a client for its session.  The default value for FILE is
+     Read the list of LDAP servers to consult for CRLs and X.509
+     certificates from file instead of the default per-user ldap server
+     list file.  The default value for FILE is
      'dirmngr_ldapservers.conf'.
 
      This server list file contains one LDAP server per line in the
@@ -1805,16 +1833,43 @@ off the two leading dashes.
 
      Lines starting with a '#' are comments.
 
-     The only defined flag is 'ldaps' to specify that a TLS connections
-     shall be used.  Flags are comma delimited; unknown flags are
-     ignored.
-
      Note that as usual all strings entered are expected to be UTF-8
      encoded.  Obviously this will lead to problems if the password has
      originally been encoded as Latin-1.  There is no other solution
      here than to put such a password in the binary encoding into the
      file (i.e.  non-ascii characters won't show up readable).(1)
 
+'--ldapserver SPEC'
+     This is an alternative way to specify LDAP servers for CRL and
+     X.509 certificate retrieval.  If this option is used the servers
+     configured in 'dirmngr_ldapservers.conf' (or the file given by
+     '--ldapserverlist-file') are cleared.  Note that
+     'dirmngr_ldapservers.conf' is not read again by a reload signal.
+     However, '--ldapserver' options are read again.
+
+     SPEC is either a proper LDAP URL or a colon delimited list of the
+     form
+
+     HOSTNAME:PORT:USERNAME:PASSWORD:BASE_DN:FLAGS:
+
+     with an optional prefix of 'ldap:' (but without the two slashes
+     which would turn this into a proper LDAP URL). FLAGS is a list of
+     one or more comma delimited keywords:
+     'plain'
+          The default: Do not use a TLS secured connection at all; the
+          default port is 389.
+     'starttls'
+          Use STARTTLS to secure the connection; the default port is
+          389.
+     'ldaptls'
+          Tunnel LDAP through a TLS connection; the default port is 636.
+     'ntds'
+          On Windows authenticate the LDAP connection using the Active
+          Directory with the current user.
+
+     Note that in an URL style specification the scheme 'ldaps://'
+     refers to STARTTLS and _not_ to LDAP-over-TLS.
+
 '--ldaptimeout SECS'
      Specify the number of seconds to wait for an LDAP query before
      timing out.  The default are 15 seconds.  0 will never timeout.
@@ -1906,10 +1961,8 @@ off the two leading dashes.
      This option may be given multiple times to add more root
      certificates.  Tilde expansion is supported.
 
-     If no 'hkp-cacert' directive is present, dirmngr will make a
-     reasonable choice: if the keyserver in question is the special pool
-     'hkps.pool.sks-keyservers.net', it will use the bundled root
-     certificate for that pool.  Otherwise, it will use the system CAs.
+     If no 'hkp-cacert' directive is present, dirmngr will use the
+     system CAs.
 
    ---------- Footnotes ----------
 
@@ -2562,11 +2615,16 @@ File: gnupg.info,  Node: Operational GPG Commands,  Next: OpenPGP Key Management
      Locate the keys given as arguments.  This command basically uses
      the same algorithm as used when locating keys for encryption and
      may thus be used to see what keys 'gpg' might use.  In particular
-     external methods as defined by '--auto-key-locate' may be used to
-     locate a key.  Only public keys are listed.  The variant
-     '--locate-external-keys' does not consider a locally existing key
-     and can thus be used to force the refresh of a key via the defined
-     external methods.
+     external methods as defined by '--auto-key-locate' are used to
+     locate a key if the arguments comain valid mail addresses.  Only
+     public keys are listed.
+
+     The variant '--locate-external-keys' does not consider a locally
+     existing key and can thus be used to force the refresh of a key via
+     the defined external methods.  If a fingerprint is given and and
+     the methods defined by -auto-key-locate define LDAP servers, the
+     key is fetched from these resources; defined non-LDAP keyservers
+     are skipped.
 
 '--show-keys'
      This commands takes OpenPGP keys as input and prints information
@@ -3713,12 +3771,13 @@ usually found in the option file.
      claim" signatures are always accepted.
 
 '--trusted-key LONG KEY ID OR FINGERPRINT'
-     Assume that the specified key (which must be given as a full 8 byte
-     key ID, a 20 byte, or 32 byte fingerprint) is as trustworthy as one
-     of your own secret keys.  This option is useful if you don't want
-     to keep your secret keys (or one of them) online but still want to
-     be able to check the validity of a given recipient's or signator's
-     key.
+     Assume that the specified key (which should be given as
+     fingerprint) is as trustworthy as one of your own secret keys.
+     This option is useful if you don't want to keep your secret keys
+     (or one of them) online but still want to be able to check the
+     validity of a given recipient's or signator's key.  If the given
+     key is not locally available but an LDAP keyserver is configured
+     the missing key is imported from that server.
 
 '--trust-model {pgp|classic|tofu|tofu+pgp|direct|always|auto}'
      Set what trust model GnuPG should follow.  The models are:
@@ -3846,14 +3905,21 @@ usually found in the option file.
 
      ntds
           Locate the key using the Active Directory (Windows only).
+          This method also allows to search by fingerprint using the
+          command '--locate-external-key'.
 
      keyserver
-          Locate a key using a keyserver.
+          Locate a key using a keyserver.  This method also allows to
+          search by fingerprint using the command
+          '--locate-external-key' if any of the configured keyservers is
+          an LDAP server.
 
      keyserver-URL
           In addition, a keyserver URL as used in the 'dirmngr'
           configuration may be used here to query that particular
-          keyserver.
+          keyserver.  This method also allows to search by fingerprint
+          using the command '--locate-external-key' if the URL specifies
+          an LDAP server.
 
      local
           Locate the key using the local keyrings.  This mechanism
@@ -3941,10 +4007,7 @@ usually found in the option file.
      keyserver: "hkp"/"hkps" for the HTTP (or compatible) keyservers or
      "ldap"/"ldaps" for the LDAP keyservers.  Note that your particular
      installation of GnuPG may have other keyserver types available as
-     well.  Keyserver schemes are case-insensitive.  After the keyserver
-     name, optional keyserver configuration options may be provided.
-     These are the same as the global '--keyserver-options' from below,
-     but apply only to this particular keyserver.
+     well.  Keyserver schemes are case-insensitive.
 
      Most keyservers synchronize with each other, so there is generally
      no need to send keys to more than one server.  The keyserver
@@ -5754,6 +5817,9 @@ Values for FLAG must be space separated.  The supported flags are:
      VALUE spans to the end of the expression.
 -c
      The string match in this part is done case-sensitive.
+-t
+     Leading and trailing spaces are not removed from VALUE.  The
+     optional single space after OP is here required.
 
    The filter options concatenate several specifications for a filter of
 the same type.  For example the four options in this example:
@@ -6453,28 +6519,14 @@ in the option file.
      verbosity by giving several verbose commands to 'gpgsm', such as
      '-vv'.
 
+'--ldapserver STRING'
 '--keyserver STRING'
-     Add an LDAP server to use for certificate and CRL lookup.  This
-     option can be given multiple times to configure more than one LDAP
-     server.  Note that the 'dirmngr' can in addition be configured with
-     a default list of LDAP servers to be used after those configured
-     with this option.  The syntax of STRING is:
-
-     HOSTNAME:PORT:USERNAME:PASSWORD:BASE_DN:FLAGS
-
-     The only defined flag is 'ldaps' to specify that a TLS connections
-     shall be used.  Flags are comma delimited; unknown flags are
-     ignored.
-
-     Note that all parts of that string are expected to be UTF-8
-     encoded.  This may lead to problems if the PASSWORD has originally
-     been encoded as Latin-1; in such a case better configure such an
-     LDAP server using the global configuration of 'dirmngr'.
-
-     Here is an example which uses the default port, no username, no
-     password, and requests a TLS connection:
-
-          --keyserver ldap.pca.dfn.de::::o=DFN-Verein,c=DE:ldaps
+     Add an LDAP server to use for X.509 certificate and CRL lookup.
+     This option can be given multiple times to configure more than one
+     LDAP server.  Note that in general 'dirmngr' should be configured
+     with the list of LDAP servers; if this option is also configured
+     here, it is used in addition to those configured in dirmngr.  For
+     the syntax see the description of dirmngr's ldapserver option.
 
 '--policy-file FILENAME'
      Change the default name of the policy file to FILENAME.  The
@@ -7016,140 +7068,3 @@ Error verifying a signature
      cannot be decided whether the signature is valid or invalid.  A
      common reason for this is a missing certificate.
 
-
-File: gnupg.info,  Node: CSR and certificate creation,  Prev: Automated signature checking,  Up: Unattended Usage
-
-5.5.2 CSR and certificate creation
-----------------------------------
-
-The command '--generate-key' may be used along with the option '--batch'
-to either create a certificate signing request (CSR) or an X.509
-certificate.  This is controlled by a parameter file; the format of this
-file is as follows:
-
-   * Text only, line length is limited to about 1000 characters.
-   * UTF-8 encoding must be used to specify non-ASCII characters.
-   * Empty lines are ignored.
-   * Leading and trailing while space is ignored.
-   * A hash sign as the first non white space character indicates a
-     comment line.
-   * Control statements are indicated by a leading percent sign, the
-     arguments are separated by white space from the keyword.
-   * Parameters are specified by a keyword, followed by a colon.
-     Arguments are separated by white space.
-   * The first parameter must be 'Key-Type', control statements may be
-     placed anywhere.
-   * The order of the parameters does not matter except for 'Key-Type'
-     which must be the first parameter.  The parameters are only used
-     for the generated CSR/certificate; parameters from previous sets
-     are not used.  Some syntactically checks may be performed.
-   * Key generation takes place when either the end of the parameter
-     file is reached, the next 'Key-Type' parameter is encountered or at
-     the control statement '%commit' is encountered.
-
-Control statements:
-
-%echo TEXT
-     Print TEXT as diagnostic.
-
-%dry-run
-     Suppress actual key generation (useful for syntax checking).
-
-%commit
-     Perform the key generation.  Note that an implicit commit is done
-     at the next Key-Type parameter.
-
-General Parameters:
-
-Key-Type: ALGO
-     Starts a new parameter block by giving the type of the primary key.
-     The algorithm must be capable of signing.  This is a required
-     parameter.  The supported values for ALGO are 'rsa', 'ecdsa', and
-     'eddsa'.
-
-Key-Length: NBITS
-     The requested length of a generated key in bits.  Defaults to 3072.
-     The value is ignored for ECC algorithms.
-
-Key-Grip: HEXSTRING
-     This is optional and used to generate a CSR or certificate for an
-     already existing key.  Key-Length will be ignored when given.
-
-Key-Usage: USAGE-LIST
-     Space or comma delimited list of key usage, allowed values are
-     'encrypt', 'sign' and 'cert'.  This is used to generate the
-     keyUsage extension.  Please make sure that the algorithm is capable
-     of this usage.  Default is to allow encrypt and sign.
-
-Name-DN: SUBJECT-NAME
-     This is the Distinguished Name (DN) of the subject in RFC-2253
-     format.
-
-Name-Email: STRING
-     This is an email address for the altSubjectName.  This parameter is
-     optional but may occur several times to add several email addresses
-     to a certificate.
-
-Name-DNS: STRING
-     The is an DNS name for the altSubjectName.  This parameter is
-     optional but may occur several times to add several DNS names to a
-     certificate.
-
-Name-URI: STRING
-     This is an URI for the altSubjectName.  This parameter is optional
-     but may occur several times to add several URIs to a certificate.
-
-Additional parameters used to create a certificate (in contrast to a
-certificate signing request):
-
-Serial: SN
-     If this parameter is given an X.509 certificate will be generated.
-     SN is expected to be a hex string representing an unsigned integer
-     of arbitrary length.  The special value 'random' can be used to
-     create a 64 bit random serial number.
-
-Issuer-DN: ISSUER-NAME
-     This is the DN name of the issuer in RFC-2253 format.  If it is not
-     set it will default to the subject DN and a special GnuPG extension
-     will be included in the certificate to mark it as a standalone
-     certificate.
-
-Creation-Date: ISO-DATE
-Not-Before: ISO-DATE
-     Set the notBefore date of the certificate.  Either a date like
-     '1986-04-26' or '1986-04-26 12:00' or a standard ISO timestamp like
-     '19860426T042640' may be used.  The time is considered to be UTC.
-     If it is not given the current date is used.
-
-Expire-Date: ISO-DATE
-Not-After: ISO-DATE
-     Set the notAfter date of the certificate.  Either a date like
-     '2063-04-05' or '2063-04-05 17:00' or a standard ISO timestamp like
-     '20630405T170000' may be used.  The time is considered to be UTC.
-     If it is not given a default value in the not too far future is
-     used.
-
-Signing-Key: KEYGRIP
-     This gives the keygrip of the key used to sign the certificate.  If
-     it is not given a self-signed certificate will be created.  For
-     compatibility with future versions, it is suggested to prefix the
-     keygrip with a '&'.
-
-Hash-Algo: HASH-ALGO
-     Use HASH-ALGO for this CSR or certificate.  The supported hash
-     algorithms are: 'sha1', 'sha256', 'sha384' and 'sha512'; they may
-     also be specified with uppercase letters.  The default is 'sha256'.
-
-Authority-Key-Id: HEXSTRING
-     Insert the decoded value of HEXSTRING as authorityKeyIdentifier.
-     If this is not given and an ECC algorithm is used the public part
-     of the certified public key is used as authorityKeyIdentifier.  To
-     inhibit any authorityKeyIdentifier use the special value 'none' for
-     HEXSTRING.
-
-Subject-Key-Id: HEXSTRING
-     Insert the decoded value of HEXSTRING as subjectKeyIdentifier.  If
-     this is not given and an ECC algorithm is used the public part of
-     the signing key is used as authorityKeyIdentifier.  To inhibit any
-     subjectKeyIdentifier use the special value 'none' for HEXSTRING.
-
diff --git a/doc/gnupg.info-2 b/doc/gnupg.info-2
index aa8cff5..39ecca2 100644
--- a/doc/gnupg.info-2
+++ b/doc/gnupg.info-2
@@ -1,7 +1,7 @@
 This is gnupg.info, produced by makeinfo version 6.5 from gnupg.texi.
 
-This is the 'The GNU Privacy Guard Manual' (version 2.3.1-beta26, April
-2021).
+This is the 'The GNU Privacy Guard Manual' (version 2.3.2-beta150,
+August 2021).
 
    (C) 2002, 2004, 2005, 2006, 2007, 2010 Free Software Foundation, Inc.
 (C) 2013, 2014, 2015 Werner Koch.
@@ -22,6 +22,143 @@ START-INFO-DIR-ENTRY
 END-INFO-DIR-ENTRY
 
 
+File: gnupg.info,  Node: CSR and certificate creation,  Prev: Automated signature checking,  Up: Unattended Usage
+
+5.5.2 CSR and certificate creation
+----------------------------------
+
+The command '--generate-key' may be used along with the option '--batch'
+to either create a certificate signing request (CSR) or an X.509
+certificate.  This is controlled by a parameter file; the format of this
+file is as follows:
+
+   * Text only, line length is limited to about 1000 characters.
+   * UTF-8 encoding must be used to specify non-ASCII characters.
+   * Empty lines are ignored.
+   * Leading and trailing while space is ignored.
+   * A hash sign as the first non white space character indicates a
+     comment line.
+   * Control statements are indicated by a leading percent sign, the
+     arguments are separated by white space from the keyword.
+   * Parameters are specified by a keyword, followed by a colon.
+     Arguments are separated by white space.
+   * The first parameter must be 'Key-Type', control statements may be
+     placed anywhere.
+   * The order of the parameters does not matter except for 'Key-Type'
+     which must be the first parameter.  The parameters are only used
+     for the generated CSR/certificate; parameters from previous sets
+     are not used.  Some syntactically checks may be performed.
+   * Key generation takes place when either the end of the parameter
+     file is reached, the next 'Key-Type' parameter is encountered or at
+     the control statement '%commit' is encountered.
+
+Control statements:
+
+%echo TEXT
+     Print TEXT as diagnostic.
+
+%dry-run
+     Suppress actual key generation (useful for syntax checking).
+
+%commit
+     Perform the key generation.  Note that an implicit commit is done
+     at the next Key-Type parameter.
+
+General Parameters:
+
+Key-Type: ALGO
+     Starts a new parameter block by giving the type of the primary key.
+     The algorithm must be capable of signing.  This is a required
+     parameter.  The supported values for ALGO are 'rsa', 'ecdsa', and
+     'eddsa'.
+
+Key-Length: NBITS
+     The requested length of a generated key in bits.  Defaults to 3072.
+     The value is ignored for ECC algorithms.
+
+Key-Grip: HEXSTRING
+     This is optional and used to generate a CSR or certificate for an
+     already existing key.  Key-Length will be ignored when given.
+
+Key-Usage: USAGE-LIST
+     Space or comma delimited list of key usage, allowed values are
+     'encrypt', 'sign' and 'cert'.  This is used to generate the
+     keyUsage extension.  Please make sure that the algorithm is capable
+     of this usage.  Default is to allow encrypt and sign.
+
+Name-DN: SUBJECT-NAME
+     This is the Distinguished Name (DN) of the subject in RFC-2253
+     format.
+
+Name-Email: STRING
+     This is an email address for the altSubjectName.  This parameter is
+     optional but may occur several times to add several email addresses
+     to a certificate.
+
+Name-DNS: STRING
+     The is an DNS name for the altSubjectName.  This parameter is
+     optional but may occur several times to add several DNS names to a
+     certificate.
+
+Name-URI: STRING
+     This is an URI for the altSubjectName.  This parameter is optional
+     but may occur several times to add several URIs to a certificate.
+
+Additional parameters used to create a certificate (in contrast to a
+certificate signing request):
+
+Serial: SN
+     If this parameter is given an X.509 certificate will be generated.
+     SN is expected to be a hex string representing an unsigned integer
+     of arbitrary length.  The special value 'random' can be used to
+     create a 64 bit random serial number.
+
+Issuer-DN: ISSUER-NAME
+     This is the DN name of the issuer in RFC-2253 format.  If it is not
+     set it will default to the subject DN and a special GnuPG extension
+     will be included in the certificate to mark it as a standalone
+     certificate.
+
+Creation-Date: ISO-DATE
+Not-Before: ISO-DATE
+     Set the notBefore date of the certificate.  Either a date like
+     '1986-04-26' or '1986-04-26 12:00' or a standard ISO timestamp like
+     '19860426T042640' may be used.  The time is considered to be UTC.
+     If it is not given the current date is used.
+
+Expire-Date: ISO-DATE
+Not-After: ISO-DATE
+     Set the notAfter date of the certificate.  Either a date like
+     '2063-04-05' or '2063-04-05 17:00' or a standard ISO timestamp like
+     '20630405T170000' may be used.  The time is considered to be UTC.
+     If it is not given a default value in the not too far future is
+     used.
+
+Signing-Key: KEYGRIP
+     This gives the keygrip of the key used to sign the certificate.  If
+     it is not given a self-signed certificate will be created.  For
+     compatibility with future versions, it is suggested to prefix the
+     keygrip with a '&'.
+
+Hash-Algo: HASH-ALGO
+     Use HASH-ALGO for this CSR or certificate.  The supported hash
+     algorithms are: 'sha1', 'sha256', 'sha384' and 'sha512'; they may
+     also be specified with uppercase letters.  The default is 'sha256'.
+
+Authority-Key-Id: HEXSTRING
+     Insert the decoded value of HEXSTRING as authorityKeyIdentifier.
+     If this is not given and an ECC algorithm is used the public part
+     of the certified public key is used as authorityKeyIdentifier.  To
+     inhibit any authorityKeyIdentifier use the special value 'none' for
+     HEXSTRING.
+
+Subject-Key-Id: HEXSTRING
+     Insert the decoded value of HEXSTRING as subjectKeyIdentifier.  If
+     this is not given and an ECC algorithm is used the public part of
+     the signing key is used as authorityKeyIdentifier.  To inhibit any
+     subjectKeyIdentifier use the special value 'none' for HEXSTRING.
+
+
 File: gnupg.info,  Node: GPGSM Protocol,  Prev: Unattended Usage,  Up: Invoking GPGSM
 
 5.6 The Protocol the Server Mode Uses
@@ -3799,6 +3936,48 @@ File: gnupg.info,  Node: gpg-check-pattern,  Prev: gpgtar,  Up: Helper Tools
 'gpg-check-pattern' checks a passphrase given on stdin against a
 specified pattern file.
 
+   The pattern file is line based with comment lines beginning on the
+_first_ position with a '#'.  Empty lines and lines with only white
+spaces are ignored.  The actual pattern lines may either be verbatim
+string pattern and match as they are (trailing spaces are ignored) or
+extended regular expressions indicated by a '/' or '!/' in the first
+column and terminated by another '/' or end of line.  If a regular
+expression starts with '!/' the match result is reversed.  By default
+all comparisons are case insensitive.
+
+   Tag lines may be used to further control the operation of this tool.
+The currently defined tags are:
+
+'[icase]'
+     Switch to case insensitive comparison for all further patterns.
+     This is the default.
+
+'[case]'
+     Switch to case sensitive comparison for all further patterns.
+
+'[reject]'
+     Switch to reject mode.  This is the default mode.
+
+'[accept]'
+     Switch to accept mode.
+
+   In the future more tags may be introduced and thus it is advisable
+not to start a plain pattern string with an open bracket.  The tags must
+be given verbatim on the line with no spaces to the left or any non
+white space characters to the right.
+
+   In reject mode the program exits on the first match with an exit code
+of 1 (failure).  If at the end of the pattern list the reject mode is
+still active the program exits with code 0 (success).
+
+   In accept mode blocks of patterns are used.  A block starts at the
+next pattern after an "accept" tag and ends with the last pattern before
+the next "accept" or "reject" tag or at the end of the pattern list.  If
+all patterns in a block match the program exits with an exit code of 0
+(success).  If any pattern in a block do not match the next pattern
+block is evaluated.  If at the end of the pattern list the accept mode
+is still active the program exits with code 1 (failure).
+
 
 '--verbose'
      Enable extra informational output.
@@ -3829,7 +4008,7 @@ File: gnupg.info,  Node: gpg-wks-client,  Next: gpg-wks-server,  Up: Web Key Ser
 ==========================
 
 The 'gpg-wks-client' is used to send requests to a Web Key Service
-provider.  This is usuallay done to upload a key into a Web Key
+provider.  This is usually done to upload a key into a Web Key
 Directory.
 
    With the '--supported' command the caller can test whether a site
@@ -5516,13 +5695,13 @@ Option Index
 * --no-history:                          gpg-card.            (line  59)
 * --no-history <1>:                      Invoking gpg-connect-agent.
                                                               (line  82)
-* add-servers:                           Dirmngr Options.     (line 273)
+* add-servers:                           Dirmngr Options.     (line 310)
 * aead-algo:                             GPG Esoteric Options.
                                                               (line 225)
 * agent-program:                         GPG Configuration Options.
-                                                              (line 730)
+                                                              (line 735)
 * agent-program <1>:                     Configuration Options.
-                                                              (line  70)
+                                                              (line  56)
 * agent-program <2>:                     gpg-card.            (line  64)
 * agent-program <3>:                     Invoking gpg-connect-agent.
                                                               (line  87)
@@ -5533,7 +5712,7 @@ Option Index
 * allow-loopback-pinentry:               Agent Options.       (line 152)
 * allow-non-selfsigned-uid:              GPG Esoteric Options.
                                                               (line 392)
-* allow-ocsp:                            Dirmngr Options.     (line 294)
+* allow-ocsp:                            Dirmngr Options.     (line 331)
 * allow-old-cipher-algos:                GPG Esoteric Options.
                                                               (line 433)
 * allow-preset-passphrase:               Agent Options.       (line 147)
@@ -5564,15 +5743,15 @@ Option Index
                                                               (line 115)
 * authenticate:                          gpg-card.            (line  94)
 * auto-check-trustdb:                    GPG Configuration Options.
-                                                              (line 717)
-* auto-expand-secmem:                    Agent Options.       (line 400)
+                                                              (line 722)
+* auto-expand-secmem:                    Agent Options.       (line 418)
 * auto-issuer-key-retrieve:              Certificate Options. (line  62)
 * auto-key-import:                       GPG Configuration Options.
-                                                              (line 559)
+                                                              (line 567)
 * auto-key-locate:                       GPG Configuration Options.
-                                                              (line 502)
+                                                              (line 503)
 * auto-key-retrieve:                     GPG Configuration Options.
-                                                              (line 571)
+                                                              (line 579)
 * base64:                                Input and Output.    (line  11)
 * batch:                                 Agent Options.       (line  48)
 * batch <1>:                             GPG Configuration Options.
@@ -5589,9 +5768,9 @@ Option Index
 * call-protect-tool:                     Operational GPGSM Commands.
                                                               (line  41)
 * card-edit:                             Operational GPG Commands.
-                                                              (line 205)
+                                                              (line 210)
 * card-status:                           Operational GPG Commands.
-                                                              (line 211)
+                                                              (line 216)
 * card-timeout:                          Scdaemon Options.    (line 159)
 * cert-digest-algo:                      GPG Esoteric Options.
                                                               (line 265)
@@ -5604,15 +5783,16 @@ Option Index
 * change-passphrase <1>:                 Certificate Management.
                                                               (line 120)
 * change-pin:                            Operational GPG Commands.
-                                                              (line 214)
-* check:                                 gpg-check-pattern.   (line  14)
-* check-passphrase-pattern:              Agent Options.       (line 223)
+                                                              (line 219)
+* check:                                 gpg-check-pattern.   (line  56)
+* check-passphrase-pattern:              Agent Options.       (line 224)
 * check-signatures:                      Operational GPG Commands.
                                                               (line 140)
 * check-sigs:                            Operational GPG Commands.
                                                               (line 141)
+* check-sym-passphrase-pattern:          Agent Options.       (line 224)
 * check-trustdb:                         Operational GPG Commands.
-                                                              (line 344)
+                                                              (line 349)
 * chuid:                                 GPG Esoteric Options.
                                                               (line 639)
 * chuid <1>:                             Esoteric Options.    (line   7)
@@ -5638,7 +5818,7 @@ Option Index
                                                               (line 120)
 * compliance:                            Compliance Options.  (line  60)
 * compliant-needed:                      GPG Configuration Options.
-                                                              (line 692)
+                                                              (line 697)
 * compress-algo:                         GPG Esoteric Options.
                                                               (line 242)
 * compress-level:                        GPG Configuration Options.
@@ -5654,7 +5834,7 @@ Option Index
 * daemon <1>:                            Dirmngr Commands.    (line  27)
 * daemon <2>:                            Scdaemon Commands.   (line  31)
 * dearmor:                               Operational GPG Commands.
-                                                              (line 398)
+                                                              (line 403)
 * debug:                                 Agent Options.       (line  82)
 * debug <1>:                             Dirmngr Options.     (line  59)
 * debug <2>:                             GPG Esoteric Options.
@@ -5723,13 +5903,13 @@ Option Index
 * default-sig-expire:                    GPG Esoteric Options.
                                                               (line 544)
 * delete-keys:                           Operational GPG Commands.
-                                                              (line 219)
+                                                              (line 224)
 * delete-keys <1>:                       Certificate Management.
                                                               (line  71)
 * delete-secret-and-public-key:          Operational GPG Commands.
-                                                              (line 239)
+                                                              (line 244)
 * delete-secret-keys:                    Operational GPG Commands.
-                                                              (line 228)
+                                                              (line 233)
 * deny-admin:                            Scdaemon Options.    (line 175)
 * desig-revoke:                          OpenPGP Key Management.
                                                               (line 134)
@@ -5743,37 +5923,37 @@ Option Index
 * dirmngr:                               Invoking gpg-connect-agent.
                                                               (line  13)
 * dirmngr-program:                       GPG Configuration Options.
-                                                              (line 737)
+                                                              (line 742)
 * dirmngr-program <1>:                   Configuration Options.
-                                                              (line  76)
+                                                              (line  62)
 * 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 288)
+* disable-check-own-socket:              Agent Options.       (line 306)
 * disable-check-own-socket <1>:          Dirmngr Options.     (line  79)
 * disable-cipher-algo:                   GPG Esoteric Options.
                                                               (line 276)
 * disable-crl-checks:                    Certificate Options. (line  13)
 * disable-dsa2:                          GPG Configuration Options.
                                                               (line 190)
-* disable-extended-key-format:           Agent Options.       (line 334)
-* disable-http:                          Dirmngr Options.     (line 207)
-* disable-ipv4:                          Dirmngr Options.     (line 201)
-* disable-ipv6:                          Dirmngr Options.     (line 201)
+* disable-extended-key-format:           Agent Options.       (line 352)
+* disable-http:                          Dirmngr Options.     (line 217)
+* disable-ipv4:                          Dirmngr Options.     (line 211)
+* disable-ipv6:                          Dirmngr Options.     (line 211)
 * disable-large-rsa:                     GPG Configuration Options.
                                                               (line 181)
-* disable-ldap:                          Dirmngr Options.     (line 204)
+* 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-policy-checks:                 Certificate Options. (line   8)
 * disable-pubkey-algo:                   GPG Esoteric Options.
                                                               (line 281)
-* disable-scdaemon:                      Agent Options.       (line 282)
+* disable-scdaemon:                      Agent Options.       (line 300)
 * disable-signer-uid:                    OpenPGP Options.     (line  37)
 * disable-trusted-cert-crl-check:        Certificate Options. (line  24)
-* display:                               Agent Options.       (line 306)
+* display:                               Agent Options.       (line 324)
 * display-charset:                       GPG Configuration Options.
                                                               (line 275)
 * display-charset:iso-8859-1:            GPG Configuration Options.
@@ -5807,7 +5987,7 @@ Option Index
 * dump-secret-keys:                      Certificate Management.
                                                               (line  43)
 * edit-card:                             Operational GPG Commands.
-                                                              (line 204)
+                                                              (line 209)
 * edit-key:                              OpenPGP Key Management.
                                                               (line 139)
 * emit-version:                          GPG Esoteric Options.
@@ -5815,24 +5995,24 @@ Option Index
 * enable-crl-checks:                     Certificate Options. (line  13)
 * enable-dsa2:                           GPG Configuration Options.
                                                               (line 190)
-* enable-extended-key-format:            Agent Options.       (line 334)
+* enable-extended-key-format:            Agent Options.       (line 352)
 * 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 242)
+* enable-passphrase-history:             Agent Options.       (line 247)
 * enable-pinpad-varlen:                  Scdaemon Options.    (line 164)
 * enable-policy-checks:                  Certificate Options. (line   8)
 * enable-progress-filter:                GPG Esoteric Options.
                                                               (line  88)
-* enable-putty-support:                  Agent Options.       (line 346)
+* enable-putty-support:                  Agent Options.       (line 364)
 * enable-special-filenames:              GPG Esoteric Options.
                                                               (line 595)
 * enable-special-filenames <1>:          gpgv.                (line  97)
-* enable-ssh-support:                    Agent Options.       (line 346)
+* enable-ssh-support:                    Agent Options.       (line 364)
 * enable-trusted-cert-crl-check:         Certificate Options. (line  24)
 * enarmor:                               Operational GPG Commands.
-                                                              (line 398)
+                                                              (line 403)
 * encrypt:                               Operational GPG Commands.
                                                               (line  32)
 * encrypt <1>:                           Operational GPGSM Commands.
@@ -5850,11 +6030,11 @@ Option Index
 * exec-path:                             GPG Configuration Options.
                                                               (line 219)
 * exit-on-status-write-error:            GPG Configuration Options.
-                                                              (line 766)
+                                                              (line 771)
 * expert:                                GPG Configuration Options.
-                                                              (line 821)
+                                                              (line 826)
 * export:                                Operational GPG Commands.
-                                                              (line 245)
+                                                              (line 250)
 * export <1>:                            Certificate Management.
                                                               (line  80)
 * export-filter:                         GPG Input and Output.
@@ -5862,7 +6042,7 @@ Option Index
 * export-options:                        GPG Input and Output.
                                                               (line 233)
 * export-ownertrust:                     Operational GPG Commands.
-                                                              (line 359)
+                                                              (line 364)
 * export-secret-key-p12:                 Certificate Management.
                                                               (line  93)
 * export-secret-key-p8:                  Certificate Management.
@@ -5870,13 +6050,13 @@ Option Index
 * export-secret-key-raw:                 Certificate Management.
                                                               (line 102)
 * export-secret-keys:                    Operational GPG Commands.
-                                                              (line 263)
+                                                              (line 268)
 * export-secret-subkeys:                 Operational GPG Commands.
-                                                              (line 263)
+                                                              (line 268)
 * export-ssh-key:                        Operational GPG Commands.
-                                                              (line 285)
+                                                              (line 290)
 * extra-digest-algo:                     Esoteric Options.    (line  16)
-* extra-socket:                          Agent Options.       (line 320)
+* extra-socket:                          Agent Options.       (line 338)
 * extract:                               gpgtar.              (line  19)
 * factory-reset:                         gpg-card.            (line 107)
 * faked-system-time:                     Agent Options.       (line  52)
@@ -5888,9 +6068,9 @@ Option Index
 * fetch:                                 gpg-card.            (line 112)
 * fetch-crl:                             Dirmngr Commands.    (line  52)
 * fetch-keys:                            Operational GPG Commands.
-                                                              (line 328)
+                                                              (line 333)
 * fingerprint:                           Operational GPG Commands.
-                                                              (line 189)
+                                                              (line 194)
 * fixed-list-mode:                       GPG Input and Output.
                                                               (line 291)
 * flush:                                 Dirmngr Commands.    (line  62)
@@ -5919,9 +6099,9 @@ Option Index
 * gen-key <1>:                           Certificate Management.
                                                               (line   8)
 * gen-prime:                             Operational GPG Commands.
-                                                              (line 393)
+                                                              (line 398)
 * gen-random:                            Operational GPG Commands.
-                                                              (line 386)
+                                                              (line 391)
 * gen-revoke:                            OpenPGP Key Management.
                                                               (line 120)
 * generate:                              gpg-card.            (line 119)
@@ -5936,7 +6116,7 @@ Option Index
 * gnupg:                                 Compliance Options.  (line  12)
 * gpg:                                   gpgtar.              (line 110)
 * gpg-agent-info:                        GPG Configuration Options.
-                                                              (line 727)
+                                                              (line 732)
 * gpg-args:                              gpgtar.              (line 113)
 * gpg-program:                           gpg-card.            (line  69)
 * gpgconf-list:                          GPG Esoteric Options.
@@ -5979,25 +6159,25 @@ Option Index
 * homedir <5>:                           Invoking gpgconf.    (line 115)
 * homedir <6>:                           Invoking gpg-connect-agent.
                                                               (line  43)
-* honor-http-proxy:                      Dirmngr Options.     (line 226)
-* http-proxy:                            Dirmngr Options.     (line 230)
+* honor-http-proxy:                      Dirmngr Options.     (line 236)
+* http-proxy:                            Dirmngr Options.     (line 240)
 * ignore-cache-for-signing:              Agent Options.       (line 175)
-* ignore-cert-extension:                 Dirmngr Options.     (line 343)
+* ignore-cert-extension:                 Dirmngr Options.     (line 380)
 * ignore-cert-extension <1>:             Certificate Options. (line  82)
 * ignore-crc-error:                      GPG Esoteric Options.
                                                               (line 417)
-* ignore-http-dp:                        Dirmngr Options.     (line 210)
-* ignore-ldap-dp:                        Dirmngr Options.     (line 217)
+* ignore-http-dp:                        Dirmngr Options.     (line 220)
+* ignore-ldap-dp:                        Dirmngr Options.     (line 227)
 * ignore-mdc-error:                      GPG Esoteric Options.
                                                               (line 424)
-* ignore-ocsp-service-url:               Dirmngr Options.     (line 222)
+* ignore-ocsp-service-url:               Dirmngr Options.     (line 232)
 * ignore-time-conflict:                  GPG Esoteric Options.
                                                               (line 403)
 * ignore-time-conflict <1>:              gpgv.                (line  63)
 * ignore-valid-from:                     GPG Esoteric Options.
                                                               (line 410)
 * import:                                Operational GPG Commands.
-                                                              (line 299)
+                                                              (line 304)
 * import <1>:                            Certificate Management.
                                                               (line 110)
 * import-filter:                         GPG Input and Output.
@@ -6005,7 +6185,7 @@ Option Index
 * import-options:                        GPG Input and Output.
                                                               (line  53)
 * import-ownertrust:                     Operational GPG Commands.
-                                                              (line 365)
+                                                              (line 370)
 * include-certs:                         CMS Options.         (line   7)
 * include-key-block:                     OpenPGP Options.     (line  45)
 * input-size-hint:                       GPG Input and Output.
@@ -6013,8 +6193,8 @@ Option Index
 * interactive:                           GPG Esoteric Options.
                                                               (line  19)
 * kdf-setup:                             gpg-card.            (line 126)
-* keep-display:                          Agent Options.       (line 311)
-* keep-tty:                              Agent Options.       (line 311)
+* keep-display:                          Agent Options.       (line 329)
+* keep-tty:                              Agent Options.       (line 329)
 * key-origin:                            GPG Input and Output.
                                                               (line  45)
 * keyboxd:                               Invoking gpg-connect-agent.
@@ -6104,33 +6284,36 @@ Option Index
 * keyedit:uid:                           OpenPGP Key Management.
                                                               (line 144)
 * keyid-format:                          GPG Configuration Options.
-                                                              (line 605)
+                                                              (line 613)
 * keyring:                               GPG Configuration Options.
                                                               (line 223)
 * keyring <1>:                           gpgv.                (line  38)
 * keyserver:                             Dirmngr Options.     (line 148)
 * keyserver <1>:                         GPG Configuration Options.
-                                                              (line 614)
+                                                              (line 622)
 * keyserver <2>:                         Configuration Options.
-                                                              (line  43)
+                                                              (line  44)
 * keyserver-options:                     GPG Configuration Options.
-                                                              (line 636)
+                                                              (line 641)
 * kill:                                  Invoking gpgconf.    (line  84)
 * known-notation:                        GPG Esoteric Options.
                                                               (line 168)
 * lang:                                  gpg-card.            (line 129)
 * launch:                                Invoking gpgconf.    (line  76)
-* lc-ctype:                              Agent Options.       (line 306)
-* lc-messages:                           Agent Options.       (line 306)
-* ldap-proxy:                            Dirmngr Options.     (line 235)
-* ldapserverlist-file:                   Dirmngr Options.     (line 246)
-* ldaptimeout:                           Dirmngr Options.     (line 269)
+* lc-ctype:                              Agent Options.       (line 324)
+* lc-messages:                           Agent Options.       (line 324)
+* ldap-proxy:                            Dirmngr Options.     (line 245)
+* ldapserver:                            Dirmngr Options.     (line 275)
+* ldapserver <1>:                        Configuration Options.
+                                                              (line  44)
+* ldapserverlist-file:                   Dirmngr Options.     (line 256)
+* ldaptimeout:                           Dirmngr Options.     (line 306)
 * learn-card:                            Certificate Management.
                                                               (line 115)
 * legacy-list-mode:                      GPG Input and Output.
                                                               (line 297)
 * limit-card-insert-tries:               GPG Configuration Options.
-                                                              (line 775)
+                                                              (line 780)
 * list:                                  gpg-card.            (line 136)
 * list-archive:                          gpgtar.              (line  39)
 * list-chain:                            Certificate Management.
@@ -6181,7 +6364,7 @@ Option Index
 * list-options:sort-sigs:                GPG Configuration Options.
                                                               (line 138)
 * list-packets:                          Operational GPG Commands.
-                                                              (line 198)
+                                                              (line 203)
 * list-secret-keys:                      Operational GPG Commands.
                                                               (line 130)
 * list-secret-keys <1>:                  Certificate Management.
@@ -6190,7 +6373,7 @@ Option Index
                                                               (line 481)
 * list-sigs:                             GPG Esoteric Options.
                                                               (line 482)
-* listen-backlog:                        Agent Options.       (line 316)
+* listen-backlog:                        Agent Options.       (line 334)
 * listen-backlog <1>:                    Dirmngr Options.     (line 134)
 * listen-backlog <2>:                    Scdaemon Options.    (line 115)
 * load-crl:                              Dirmngr Commands.    (line  44)
@@ -6204,17 +6387,17 @@ Option Index
 * locate-keys:                           Operational GPG Commands.
                                                               (line 170)
 * lock-multiple:                         GPG Configuration Options.
-                                                              (line 755)
+                                                              (line 760)
 * lock-never:                            GPG Configuration Options.
-                                                              (line 759)
+                                                              (line 764)
 * lock-once:                             GPG Configuration Options.
-                                                              (line 751)
+                                                              (line 756)
 * log-file:                              Agent Options.       (line 134)
 * log-file <1>:                          Dirmngr Options.     (line  30)
 * log-file <2>:                          GPG Esoteric Options.
                                                               (line 105)
 * log-file <3>:                          Configuration Options.
-                                                              (line  97)
+                                                              (line  83)
 * log-file <4>:                          Scdaemon Options.    (line 120)
 * log-file <5>:                          gpgv.                (line  59)
 * logger-fd:                             GPG Esoteric Options.
@@ -6227,15 +6410,15 @@ Option Index
 * mangle-dos-filenames:                  GPG Configuration Options.
                                                               (line 346)
 * marginals-needed:                      GPG Configuration Options.
-                                                              (line 696)
+                                                              (line 701)
 * max-cache-ttl:                         Agent Options.       (line 196)
 * max-cache-ttl-ssh:                     Agent Options.       (line 202)
 * max-cert-depth:                        GPG Configuration Options.
-                                                              (line 704)
+                                                              (line 709)
 * max-output:                            GPG Input and Output.
                                                               (line  19)
-* max-passphrase-days:                   Agent Options.       (line 237)
-* max-replies:                           Dirmngr Options.     (line 340)
+* max-passphrase-days:                   Agent Options.       (line 242)
+* max-replies:                           Dirmngr Options.     (line 377)
 * min-cert-level:                        GPG Configuration Options.
                                                               (line 391)
 * min-passphrase-len:                    Agent Options.       (line 212)
@@ -6244,7 +6427,7 @@ Option Index
 * multifile:                             Operational GPG Commands.
                                                               (line 100)
 * name:                                  gpg-card.            (line 159)
-* nameserver:                            Dirmngr Options.     (line 193)
+* nameserver:                            Dirmngr Options.     (line 203)
 * no:                                    GPG Configuration Options.
                                                               (line  67)
 * no-allow-external-cache:               Agent Options.       (line 160)
@@ -6253,15 +6436,15 @@ Option Index
 * no-armor:                              GPG Input and Output.
                                                               (line  12)
 * no-auto-key-import:                    GPG Configuration Options.
-                                                              (line 559)
+                                                              (line 567)
 * no-auto-key-retrieve:                  GPG Configuration Options.
-                                                              (line 571)
+                                                              (line 579)
 * no-auto-trust-new-key:                 GPG Esoteric Options.
                                                               (line 576)
 * no-autostart:                          GPG Configuration Options.
-                                                              (line 744)
+                                                              (line 749)
 * no-autostart <1>:                      Configuration Options.
-                                                              (line  86)
+                                                              (line  72)
 * no-autostart <2>:                      gpg-card.            (line  53)
 * no-autostart <3>:                      Invoking gpg-connect-agent.
                                                               (line  78)
@@ -6282,7 +6465,7 @@ Option Index
                                                               (line  73)
 * no-grab:                               Agent Options.       (line 128)
 * no-greeting:                           GPG Configuration Options.
-                                                              (line 789)
+                                                              (line 794)
 * no-groups:                             GPG Key related Options.
                                                               (line  73)
 * no-include-key-block:                  OpenPGP Options.     (line  45)
@@ -6295,34 +6478,34 @@ Option Index
 * no-options:                            GPG Configuration Options.
                                                               (line 321)
 * no-random-seed-file:                   GPG Configuration Options.
-                                                              (line 783)
+                                                              (line 788)
 * no-secmem-warning:                     GPG Configuration Options.
-                                                              (line 792)
+                                                              (line 797)
 * no-secmem-warning <1>:                 Configuration Options.
-                                                              (line  93)
+                                                              (line  79)
 * no-sig-cache:                          GPG Configuration Options.
-                                                              (line 707)
+                                                              (line 712)
 * no-skip-hidden-recipients:             GPG Key related Options.
                                                               (line 127)
 * no-symkey-cache:                       GPG Esoteric Options.
                                                               (line 367)
 * no-tty:                                GPG Configuration Options.
                                                               (line  58)
-* no-use-standard-socket:                Agent Options.       (line 296)
+* no-use-standard-socket:                Agent Options.       (line 314)
 * no-use-tor:                            Dirmngr Options.     (line  98)
 * no-verbose:                            GPG Configuration Options.
                                                               (line  37)
 * not-dash-escaped:                      GPG Esoteric Options.
                                                               (line 296)
 * null:                                  gpgtar.              (line  86)
-* null <1>:                              gpg-check-pattern.   (line  17)
+* null <1>:                              gpg-check-pattern.   (line  59)
 * ocsp:                                  dirmngr-client.      (line  61)
-* ocsp-current-period:                   Dirmngr Options.     (line 335)
-* ocsp-max-clock-skew:                   Dirmngr Options.     (line 327)
-* ocsp-max-period:                       Dirmngr Options.     (line 331)
-* ocsp-responder:                        Dirmngr Options.     (line 301)
-* ocsp-signer:                           Dirmngr Options.     (line 306)
-* only-ldap-proxy:                       Dirmngr Options.     (line 241)
+* ocsp-current-period:                   Dirmngr Options.     (line 372)
+* ocsp-max-clock-skew:                   Dirmngr Options.     (line 364)
+* ocsp-max-period:                       Dirmngr Options.     (line 368)
+* ocsp-responder:                        Dirmngr Options.     (line 338)
+* ocsp-signer:                           Dirmngr Options.     (line 343)
+* only-ldap-proxy:                       Dirmngr Options.     (line 251)
 * openpgp:                               Compliance Options.  (line  20)
 * openpgp <1>:                           gpgtar.              (line  95)
 * options:                               Agent Options.       (line  10)
@@ -6363,7 +6546,7 @@ Option Index
 * pcsc-shared:                           Scdaemon Options.    (line 124)
 * pem:                                   dirmngr-client.      (line  58)
 * permission-warning:                    GPG Configuration Options.
-                                                              (line 795)
+                                                              (line 800)
 * personal-aead-preferences:             OpenPGP Options.     (line  66)
 * personal-cipher-preferences:           OpenPGP Options.     (line  57)
 * personal-compress-preferences:         OpenPGP Options.     (line  84)
@@ -6373,18 +6556,19 @@ Option Index
 * pgp8:                                  Compliance Options.  (line  53)
 * photo-viewer:                          GPG Configuration Options.
                                                               (line 196)
-* pinentry-invisible-char:               Agent Options.       (line 245)
+* pinentry-formatted-passphrase:         Agent Options.       (line 261)
+* pinentry-invisible-char:               Agent Options.       (line 250)
 * pinentry-mode:                         GPG Esoteric Options.
                                                               (line 352)
 * pinentry-mode <1>:                     Esoteric Options.    (line 101)
-* pinentry-program:                      Agent Options.       (line 256)
-* pinentry-timeout:                      Agent Options.       (line 250)
-* pinentry-touch-file:                   Agent Options.       (line 269)
+* pinentry-program:                      Agent Options.       (line 274)
+* pinentry-timeout:                      Agent Options.       (line 255)
+* pinentry-touch-file:                   Agent Options.       (line 287)
 * ping:                                  dirmngr-client.      (line  69)
 * policy-file:                           Configuration Options.
-                                                              (line  66)
+                                                              (line  52)
 * prefer-system-dirmngr:                 Configuration Options.
-                                                              (line  80)
+                                                              (line  66)
 * preserve-permissions:                  GPG Esoteric Options.
                                                               (line 603)
 * preset:                                Invoking gpg-preset-passphrase.
@@ -6392,7 +6576,7 @@ Option Index
 * primary-keyring:                       GPG Configuration Options.
                                                               (line 242)
 * print-md:                              Operational GPG Commands.
-                                                              (line 381)
+                                                              (line 386)
 * privatedo:                             gpg-card.            (line 171)
 * q:                                     gpg-card.            (line 177)
 * q <1>:                                 Invoking gpg-connect-agent.
@@ -6435,9 +6619,9 @@ Option Index
 * readcert:                              gpg-card.            (line 180)
 * reader-port:                           Scdaemon Options.    (line 147)
 * rebuild-keydb-caches:                  Operational GPG Commands.
-                                                              (line 375)
+                                                              (line 380)
 * receive-keys:                          Operational GPG Commands.
-                                                              (line 308)
+                                                              (line 313)
 * recipient:                             GPG Key related Options.
                                                               (line   8)
 * recipient <1>:                         Input and Output.    (line  46)
@@ -6446,18 +6630,18 @@ Option Index
                                                               (line  22)
 * recursive-resolver:                    Dirmngr Options.     (line 117)
 * recv-keys:                             Operational GPG Commands.
-                                                              (line 309)
+                                                              (line 314)
 * refresh-keys:                          Operational GPG Commands.
-                                                              (line 312)
+                                                              (line 317)
 * reload:                                Invoking gpgconf.    (line  70)
 * remove-socketdir:                      Invoking gpgconf.    (line  97)
 * request-origin:                        GPG Esoteric Options.
                                                               (line 372)
 * request-origin <1>:                    Esoteric Options.    (line 116)
 * require-cross-certification:           GPG Configuration Options.
-                                                              (line 814)
+                                                              (line 819)
 * require-secmem:                        GPG Configuration Options.
-                                                              (line 809)
+                                                              (line 814)
 * reset:                                 gpg-card.            (line 187)
 * resolver-timeout:                      Dirmngr Options.     (line 120)
 * rfc2440:                               Compliance Options.  (line  36)
@@ -6466,23 +6650,23 @@ Option Index
 * run:                                   Invoking gpg-connect-agent.
                                                               (line 105)
 * s:                                     Dirmngr Options.     (line  87)
-* s2k-calibration:                       Agent Options.       (line 409)
+* s2k-calibration:                       Agent Options.       (line 427)
 * s2k-cipher-algo:                       OpenPGP Options.     (line  94)
-* s2k-count:                             Agent Options.       (line 416)
+* s2k-count:                             Agent Options.       (line 434)
 * 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 278)
+* scdaemon-program:                      Agent Options.       (line 296)
 * search-keys:                           Operational GPG Commands.
-                                                              (line 318)
+                                                              (line 323)
 * secret-keyring:                        GPG Configuration Options.
                                                               (line 237)
 * send:                                  gpg-wks-client.      (line  58)
 * send <1>:                              gpg-wks-server.      (line  60)
 * send-keys:                             Operational GPG Commands.
-                                                              (line 252)
+                                                              (line 257)
 * sender:                                GPG Key related Options.
                                                               (line  81)
 * server:                                Agent Commands.      (line  23)
@@ -6505,7 +6689,7 @@ Option Index
                                                               (line  52)
 * show-keyring:                          Deprecated Options.  (line  16)
 * show-keys:                             Operational GPG Commands.
-                                                              (line 180)
+                                                              (line 185)
 * show-notation:                         Deprecated Options.  (line  25)
 * show-photos:                           Deprecated Options.  (line   8)
 * show-policy-url:                       Deprecated Options.  (line  33)
@@ -6530,7 +6714,7 @@ Option Index
 * skip-verify:                           GPG Esoteric Options.
                                                               (line 473)
 * squid-mode:                            dirmngr-client.      (line 101)
-* ssh-fingerprint-digest:                Agent Options.       (line 394)
+* ssh-fingerprint-digest:                Agent Options.       (line 412)
 * standard-resolver:                     Dirmngr Options.     (line 110)
 * status-fd:                             GPG Esoteric Options.
                                                               (line  93)
@@ -6556,25 +6740,25 @@ Option Index
 * time-only:                             watchgnupg.          (line  46)
 * tls-debug:                             Dirmngr Options.     (line  69)
 * tofu-default-policy:                   GPG Configuration Options.
-                                                              (line 700)
+                                                              (line 705)
 * tofu-policy:                           Operational GPG Commands.
-                                                              (line 411)
+                                                              (line 416)
 * trust-model:                           GPG Configuration Options.
-                                                              (line 405)
+                                                              (line 406)
 * trust-model:always:                    GPG Configuration Options.
-                                                              (line 486)
+                                                              (line 487)
 * trust-model:auto:                      GPG Configuration Options.
-                                                              (line 495)
+                                                              (line 496)
 * trust-model:classic:                   GPG Configuration Options.
-                                                              (line 413)
+                                                              (line 414)
 * trust-model:direct:                    GPG Configuration Options.
-                                                              (line 478)
+                                                              (line 479)
 * trust-model:pgp:                       GPG Configuration Options.
-                                                              (line 408)
+                                                              (line 409)
 * trust-model:tofu:                      GPG Configuration Options.
-                                                              (line 416)
+                                                              (line 417)
 * trust-model:tofu+pgp:                  GPG Configuration Options.
-                                                              (line 466)
+                                                              (line 467)
 * trustdb-name:                          GPG Configuration Options.
                                                               (line 247)
 * trusted-key:                           GPG Configuration Options.
@@ -6583,25 +6767,25 @@ Option Index
                                                               (line 119)
 * try-secret-key:                        GPG Key related Options.
                                                               (line 108)
-* ttyname:                               Agent Options.       (line 306)
-* ttytype:                               Agent Options.       (line 306)
+* ttyname:                               Agent Options.       (line 324)
+* ttytype:                               Agent Options.       (line 324)
 * uif:                                   gpg-card.            (line 196)
 * unblock:                               gpg-card.            (line 202)
 * ungroup:                               GPG Key related Options.
                                                               (line  70)
 * unwrap:                                Operational GPG Commands.
-                                                              (line 403)
+                                                              (line 408)
 * update-trustdb:                        Operational GPG Commands.
-                                                              (line 334)
+                                                              (line 339)
 * url:                                   gpg-card.            (line 207)
 * url <1>:                               dirmngr-client.      (line  94)
 * url <2>:                               dirmngr-client.      (line  98)
 * use-agent:                             GPG Configuration Options.
-                                                              (line 724)
+                                                              (line 729)
 * use-embedded-filename:                 GPG Esoteric Options.
                                                               (line 211)
-* use-standard-socket:                   Agent Options.       (line 296)
-* use-standard-socket-p:                 Agent Options.       (line 296)
+* use-standard-socket:                   Agent Options.       (line 314)
+* use-standard-socket-p:                 Agent Options.       (line 314)
 * use-tor:                               Dirmngr Options.     (line  98)
 * utf8-strings:                          GPG Configuration Options.
                                                               (line 302)
@@ -6629,7 +6813,7 @@ Option Index
                                                               (line  36)
 * verbose <10>:                          dirmngr-client.      (line  53)
 * verbose <11>:                          gpgtar.              (line  61)
-* verbose <12>:                          gpg-check-pattern.   (line  11)
+* verbose <12>:                          gpg-check-pattern.   (line  53)
 * verbose <13>:                          gpg-wks-client.      (line 112)
 * verbose <14>:                          gpg-wks-server.      (line  78)
 * verify:                                Operational GPG Commands.
@@ -6707,7 +6891,7 @@ Option Index
                                                               (line 328)
 * writecert:                             gpg-card.            (line 217)
 * writekey:                              gpg-card.            (line 224)
-* xauthority:                            Agent Options.       (line 306)
+* xauthority:                            Agent Options.       (line 324)
 * yes:                                   GPG Configuration Options.
                                                               (line  63)
 * yubikey:                               gpg-card.            (line 229)
diff --git a/doc/gnupg.info-3 b/doc/gnupg.info-3
index 2466061..06f1882 100644
--- a/doc/gnupg.info-3
+++ b/doc/gnupg.info-3
diff --git a/doc/gpg-agent.texi b/doc/gpg-agent.texi
index 41bfb09..f20d833 100644
--- a/doc/gpg-agent.texi
+++ b/doc/gpg-agent.texi
@@ -205,14 +205,14 @@ if used in an options file.
 
 
 @item -v
-@item --verbose
+@itemx --verbose
 @opindex verbose
 Outputs additional information while running.
 You can increase the verbosity by giving several
 verbose commands to @command{gpg-agent}, such as @samp{-vv}.
 
 @item -q
-@item --quiet
+@itemx --quiet
 @opindex quiet
 Try to be as quiet as possible.
 
@@ -429,11 +429,17 @@ of digits or special characters a warning will be displayed.  Defaults
 to 1.
 
 @item --check-passphrase-pattern @var{file}
+@itemx --check-sym-passphrase-pattern @var{file}
 @opindex check-passphrase-pattern
+@opindex check-sym-passphrase-pattern
 Check the passphrase against the pattern given in @var{file}.  When
 entering a new passphrase matching one of these pattern a warning will
-be displayed. @var{file} should be an absolute filename.  The default is
-not to use any pattern file.
+be displayed.  If @var{file} does not contain any slashes and does not
+start with "~/" it is searched in the system configuration directory
+(@file{@value{SYSCONFDIR}}).  The default is not to use any
+pattern file.  The second version of this option is only used when
+creating a new symmetric key to allow the use of different patterns
+for such passphrases.
 
 Security note: It is known that checking a passphrase against a list of
 pattern or even against a complete dictionary is not very effective to
@@ -465,6 +471,19 @@ user input.  The default value of 0 does not ask the pinentry to
 timeout, however a Pinentry may use its own default timeout value in
 this case.  A Pinentry may or may not honor this request.
 
+@item --pinentry-formatted-passphrase
+@opindex pinentry-formatted-passphrase
+This option asks the Pinentry to enable passphrase formatting when asking the
+user for a new passphrase and masking of the passphrase is turned off.
+
+If passphrase formatting is enabled, then all non-breaking space characters
+are stripped from the entered passphrase.  Passphrase formatting is mostly
+useful in combination with passphrases generated with the GENPIN
+feature of some Pinentries.  Note that such a generated
+passphrase, if not modified by the user, skips all passphrase
+constraints checking because such constraints would actually weaken
+the generated passphrase.
+
 @item --pinentry-program @var{filename}
 @opindex pinentry-program
 Use program @var{filename} as the PIN entry.  The default is
diff --git a/doc/gpg.texi b/doc/gpg.texi
index 16a4b58..81dab59 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -355,11 +355,17 @@ numbers 1-9 or "T" for 10 and above to indicate trust signature levels
 Locate the keys given as arguments.  This command basically uses the
 same algorithm as used when locating keys for encryption and may thus
 be used to see what keys @command{@gpgname} might use.  In particular
-external methods as defined by @option{--auto-key-locate} may be used
-to locate a key.  Only public keys are listed.  The variant
-@option{--locate-external-keys} does not consider a locally existing
-key and can thus be used to force the refresh of a key via the defined
-external methods.
+external methods as defined by @option{--auto-key-locate} are used to
+locate a key if the arguments comain valid mail addresses.  Only
+public keys are listed.
+
+The variant @option{--locate-external-keys} does not consider a
+locally existing key and can thus be used to force the refresh of a
+key via the defined external methods.  If a fingerprint is given and
+and the methods defined by --auto-key-locate define LDAP servers, the
+key is fetched from these resources; defined non-LDAP keyservers are
+skipped.
+
 
 @item --show-keys
 @opindex show-keys
@@ -1696,13 +1702,13 @@ claim" signatures are always accepted.
 
 @item --trusted-key @var{long key ID or fingerprint}
 @opindex trusted-key
-Assume that the specified key (which must be given
-as a full 8 byte key ID, a 20 byte, or 32 byte fingerprint)
-is as trustworthy as one of
-your own secret keys. This option is useful if you
-don't want to keep your secret keys (or one of them)
+Assume that the specified key (which should be given as fingerprint)
+is as trustworthy as one of your own secret keys. This option is
+useful if you don't want to keep your secret keys (or one of them)
 online but still want to be able to check the validity of a given
-recipient's or signator's key.
+recipient's or signator's key.  If the given key is not locally
+available but an LDAP keyserver is configured the missing key is
+imported from that server.
 
 @item --trust-model @{pgp|classic|tofu|tofu+pgp|direct|always|auto@}
 @opindex trust-model
@@ -1842,14 +1848,20 @@ list.  The default is "local,wkd".
   PGP Universal method of checking @samp{ldap://keys.(thedomain)}.
 
   @item ntds
-  Locate the key using the Active Directory (Windows only).
+  Locate the key using the Active Directory (Windows only).  This
+  method also allows to search by fingerprint using the command
+  @option{--locate-external-key}.
 
   @item keyserver
-  Locate a key using a keyserver.
+  Locate a key using a keyserver.  This method also allows to search
+  by fingerprint using the command @option{--locate-external-key} if
+  any of the configured keyservers is an LDAP server.
 
   @item keyserver-URL
   In addition, a keyserver URL as used in the @command{dirmngr}
   configuration may be used here to query that particular keyserver.
+  This method also allows to search by fingerprint using the command
+  @option{--locate-external-key} if the URL specifies an LDAP server.
 
   @item local
   Locate the key using the local keyrings.  This mechanism allows the user to
@@ -1945,10 +1957,7 @@ keys on. The format of the @var{name} is a URI:
 "hkp"/"hkps" for the HTTP (or compatible) keyservers or "ldap"/"ldaps"
 for the LDAP keyservers.  Note that your particular installation of
 GnuPG may have other keyserver types available as well. Keyserver
-schemes are case-insensitive. After the keyserver name, optional
-keyserver configuration options may be provided. These are the same as
-the global @option{--keyserver-options} from below, but apply only to
-this particular keyserver.
+schemes are case-insensitive.
 
 Most keyservers synchronize with each other, so there is generally no
 need to send keys to more than one server. The keyserver
@@ -4063,6 +4072,9 @@ are:
   @var{VALUE} spans to the end of the expression.
   @item -c
   The string match in this part is done case-sensitive.
+  @item -t
+  Leading and trailing spaces are not removed from @var{VALUE}.
+  The optional single space after @var{op} is here required.
 @end table
 
 The filter options concatenate several specifications for a filter of
diff --git a/doc/gpgsm.texi b/doc/gpgsm.texi
index 1d3a7e0..52f939e 100644
--- a/doc/gpgsm.texi
+++ b/doc/gpgsm.texi
@@ -358,35 +358,16 @@ Outputs additional information while running.
 You can increase the verbosity by giving several
 verbose commands to @command{gpgsm}, such as @samp{-vv}.
 
-
-@item --keyserver @var{string}
+@item --ldapserver @var{string}
+@itemx --keyserver @var{string}
+@opindex ldapserver
 @opindex keyserver
-Add an LDAP server to use for certificate and CRL lookup.  This option
-can be given multiple times to configure more than one LDAP server.
-Note that the @command{dirmngr} can in addition be configured with a
-default list of LDAP servers to be used after those configured with
-this option.  The syntax of @var{string} is:
-
-@sc{hostname:port:username:password:base_dn:flags}
-
-The only defined flag is @code{ldaps} to specify that a TLS
-connections shall be used.  Flags are comma delimited; unknown flags
-are ignored.
-
-Note that all parts of that string are expected to be UTF-8 encoded.
-This may lead to problems if the @sc{password} has originally been
-encoded as Latin-1; in such a case better configure such an LDAP server
-using the global configuration of @command{dirmngr}.
-
-Here is an example which uses the default port, no username, no
-password, and requests a TLS connection:
-
-@c man:.RS
-@example
---keyserver ldap.pca.dfn.de::::o=DFN-Verein,c=DE:ldaps
-@end example
-@c man:.RE
-
+Add an LDAP server to use for X.509 certificate and CRL lookup.  This
+option can be given multiple times to configure more than one LDAP
+server.  Note that in general @command{dirmngr} should be configured
+with the list of LDAP servers; if this option is also configured here,
+it is used in addition to those configured in dirmngr.  For the syntax
+see the description of dirmngr's ldapserver option.
 
 @item --policy-file @var{filename}
 @opindex policy-file
diff --git a/doc/help.txt b/doc/help.txt
index 4d748c4..9f056c3 100644
--- a/doc/help.txt
+++ b/doc/help.txt
@@ -32,7 +32,7 @@
 # territory (.e.g. "de_DE"), LL denotes just the locale name
 # (e.g. "de").  The first matching item is returned.  To put a dot or
 # a hash mark at the beginning of a help text line, it needs to be
-# prefixed with ". ".  A single dot may be used to terminated ahelp
+# prefixed with ". ".  A single dot may be used to terminated a help
 # entry.
 
 .#pinentry.qualitybar.tooltip
@@ -52,6 +52,32 @@ configured passphrase constraints.
 .
 
 
+.#pinentry.constraints.hint.short
+# [remove the hash mark from the key to enable this hint]
+# This entry is used by some pinentries to display a hint about
+# enabled passphrase constraints.  These constraints are configurable
+# and the admin may give a hint about them by using this help entry.
+Please use letters and digits.
+.
+
+
+.#pinentry.constraints.hint.long
+# [remove the hash mark from the key to enable this hint]
+# This entry is used by some pinentries to show a tooltip with more
+# information about the configured passphrase constraints.
+Please use letters and digits.
+Extra constraints are enforced, for example
+the use of common car number plates.
+.
+
+
+.#pinentry.formatted_passphrase.hint",
+# [remove the hash mark from the key to enable this hint]
+# If this entry is not set a standard text is shown
+Note: The blanks are not part of the passphrase.
+.
+
+
 .gnupg.agent-problem
 # There was a problem accessing or starting the agent.
 It was either not possible to connect to a running Gpg-Agent or a
diff --git a/doc/tools.texi b/doc/tools.texi
index c48ba4b..8041f48 100644
--- a/doc/tools.texi
+++ b/doc/tools.texi
@@ -2081,6 +2081,51 @@ gpgtar --list-archive test1
 @command{gpg-check-pattern} checks a passphrase given on stdin against
 a specified pattern file.
 
+The pattern file is line based with comment lines beginning on the
+@emph{first} position with a @code{#}.  Empty lines and lines with
+only white spaces are ignored.  The actual pattern lines may either be
+verbatim string pattern and match as they are (trailing spaces are
+ignored) or extended regular expressions indicated by a @code{/} or
+@code{!/} in the first column and terminated by another @code{/} or
+end of line.  If a regular expression starts with @code{!/} the match
+result is reversed. By default all comparisons are case insensitive.
+
+Tag lines may be used to further control the operation of this tool.
+The currently defined tags are:
+
+@table @code
+@item [icase]
+Switch to case insensitive comparison for all further patterns.  This
+is the default.
+
+@item [case]
+Switch to case sensitive comparison for all further patterns.
+
+@item [reject]
+Switch to reject mode.  This is the default mode.
+
+@item [accept]
+Switch to accept mode.
+@end table
+
+In the future more tags may be introduced and thus it is advisable not to
+start a plain pattern string with an open bracket.  The tags must be
+given verbatim on the line with no spaces to the left or any non white
+space characters to the right.
+
+In reject mode the program exits on the first match with an exit code
+of 1 (failure).  If at the end of the pattern list the reject mode is
+still active the program exits with code 0 (success).
+
+In accept mode blocks of patterns are used.  A block starts at the
+next pattern after an "accept" tag and ends with the last pattern
+before the next "accept" or "reject" tag or at the end of the pattern
+list.  If all patterns in a block match the program exits with an exit
+code of 0 (success).  If any pattern in a block do not match the next
+pattern block is evaluated.  If at the end of the pattern list the
+accept mode is still active the program exits with code 1 (failure).
+
+
 @mansect options
 @noindent
 
@@ -2102,6 +2147,6 @@ Input is expected to be null delimited.
 
 @mansect see also
 @ifset isman
-@command{gpg}(1),
+@command{gpg-agent}(1),
 @end ifset
 @include see-also-note.texi
diff --git a/doc/wks.texi b/doc/wks.texi
index ad239f1..48e534b 100644
--- a/doc/wks.texi
+++ b/doc/wks.texi
@@ -57,7 +57,7 @@ Directory.
 
 @mansect description
 The @command{gpg-wks-client} is used to send requests to a Web Key
-Service provider.  This is usuallay done to upload a key into a Web
+Service provider.  This is usually done to upload a key into a Web
 Key Directory.
 
 With the @option{--supported} command the caller can test whether a
diff --git a/g10/call-agent.c b/g10/call-agent.c
index fb80489..8f4e44b 100644
--- a/g10/call-agent.c
+++ b/g10/call-agent.c
@@ -1232,6 +1232,16 @@ agent_scd_getattr (const char *name, struct agent_card_info_s *info)
   parm.ctx = agent_ctx;
   rc = assuan_transact (agent_ctx, line, NULL, NULL, default_inq_cb, &parm,
                         learn_status_cb, info);
+  if (!rc && !strcmp (name, "KEY-FPR"))
+    {
+      /* Let the agent create the shadow keys if not yet done.  */
+      if (info->fpr1len)
+        assuan_transact (agent_ctx, "READKEY --card --no-data -- $SIGNKEYID",
+                         NULL, NULL, NULL, NULL, NULL, NULL);
+      if (info->fpr2len)
+        assuan_transact (agent_ctx, "READKEY --card --no-data -- $ENCRKEYID",
+                         NULL, NULL, NULL, NULL, NULL, NULL);
+    }
 
   return rc;
 }
@@ -1699,6 +1709,7 @@ card_keyinfo_cb (void *opaque, const char *line)
   struct card_keyinfo_parm_s *parm = opaque;
   const char *keyword = line;
   int keywordlen;
+  keypair_info_t keyinfo = NULL;
 
   for (keywordlen=0; *line && !spacep (line); line++, keywordlen++)
     ;
@@ -1709,7 +1720,6 @@ card_keyinfo_cb (void *opaque, const char *line)
     {
       const char *s;
       int n;
-      keypair_info_t keyinfo;
       keypair_info_t *l_p = &parm->list;
 
       while ((*l_p))
@@ -1717,23 +1727,13 @@ card_keyinfo_cb (void *opaque, const char *line)
 
       keyinfo = xtrycalloc (1, sizeof *keyinfo);
       if (!keyinfo)
-        {
-        alloc_error:
-          if (!parm->error)
-            parm->error = gpg_error_from_syserror ();
-          return 0;
-        }
+        goto alloc_error;
 
       for (n=0,s=line; hexdigitp (s); s++, n++)
         ;
 
       if (n != 40)
-        {
-        parm_error:
-          if (!parm->error)
-            parm->error = gpg_error (GPG_ERR_ASS_PARAMETER);
-          return 0;
-        }
+        goto parm_error;
 
       memcpy (keyinfo->keygrip, line, 40);
       keyinfo->keygrip[40] = 0;
@@ -1787,6 +1787,18 @@ card_keyinfo_cb (void *opaque, const char *line)
     }
 
   return err;
+
+ alloc_error:
+  xfree (keyinfo);
+  if (!parm->error)
+    parm->error = gpg_error_from_syserror ();
+  return 0;
+
+ parm_error:
+  xfree (keyinfo);
+  if (!parm->error)
+    parm->error = gpg_error (GPG_ERR_ASS_PARAMETER);
+  return 0;
 }
 
 
@@ -2226,13 +2238,50 @@ agent_probe_any_secret_key (ctrl_t ctrl, kbnode_t keyblock)
   char line[ASSUAN_LINELENGTH];
   char *p;
   kbnode_t kbctx, node;
-  int nkeys;
+  int nkeys;  /* (always zero in secret_keygrips mode)  */
   unsigned char grip[KEYGRIP_LEN];
+  const unsigned char *s;
+  unsigned int n;
 
   err = start_agent (ctrl, 0);
   if (err)
     return err;
 
+  /* If we have not yet issued a "HAVEKEY --list" do that now.  We use
+   * a more or less arbitray limit of 1000 keys.  */
+  if (ctrl && !ctrl->secret_keygrips && !ctrl->no_more_secret_keygrips)
+    {
+      membuf_t data;
+
+      init_membuf (&data, 4096);
+      err = assuan_transact (agent_ctx, "HAVEKEY --list=1000",
+                             put_membuf_cb, &data,
+                             NULL, NULL, NULL, NULL);
+      if (err)
+        xfree (get_membuf (&data, NULL));
+      else
+        {
+          ctrl->secret_keygrips = get_membuf (&data,
+                                              &ctrl->secret_keygrips_len);
+          if (!ctrl->secret_keygrips)
+            err = gpg_error_from_syserror ();
+          if ((ctrl->secret_keygrips_len % 20))
+            {
+              err = gpg_error (GPG_ERR_INV_DATA);
+              xfree (ctrl->secret_keygrips);
+              ctrl->secret_keygrips = NULL;
+            }
+        }
+      if (err)
+        {
+          log_info ("problem with fast path key listing: %s - ignored\n",
+                    gpg_strerror (err));
+          err = 0;
+        }
+      /* We want to do this only once.  */
+      ctrl->no_more_secret_keygrips = 1;
+    }
+
   err = gpg_error (GPG_ERR_NO_SECKEY); /* Just in case no key was
                                           found in KEYBLOCK.  */
   p = stpcpy (line, "HAVEKEY");
@@ -2242,23 +2291,42 @@ agent_probe_any_secret_key (ctrl_t ctrl, kbnode_t keyblock)
         || node->pkt->pkttype == PKT_SECRET_KEY
         || node->pkt->pkttype == PKT_SECRET_SUBKEY)
       {
-        if (nkeys && ((p - line) + 41) > (ASSUAN_LINELENGTH - 2))
+        if (ctrl && ctrl->secret_keygrips)
           {
-            err = assuan_transact (agent_ctx, line,
-                                   NULL, NULL, NULL, NULL, NULL, NULL);
-            if (err != gpg_err_code (GPG_ERR_NO_SECKEY))
-              break; /* Seckey available or unexpected error - ready.  */
-            p = stpcpy (line, "HAVEKEY");
-            nkeys = 0;
+            /* We got an array with all secret keygrips.  Check this.  */
+            err = keygrip_from_pk (node->pkt->pkt.public_key, grip);
+            if (err)
+              return err;
+            for (s=ctrl->secret_keygrips, n = 0;
+                 n < ctrl->secret_keygrips_len;
+                 s += 20, n += 20)
+              {
+                if (!memcmp (s, grip, 20))
+                  return 0;
+              }
+            err = gpg_error (GPG_ERR_NO_SECKEY);
+            /* Keep on looping over the keyblock.  Never bump nkeys.  */
+          }
+        else
+          {
+            if (nkeys && ((p - line) + 41) > (ASSUAN_LINELENGTH - 2))
+              {
+                err = assuan_transact (agent_ctx, line,
+                                       NULL, NULL, NULL, NULL, NULL, NULL);
+                if (err != gpg_err_code (GPG_ERR_NO_SECKEY))
+                  break; /* Seckey available or unexpected error - ready.  */
+                p = stpcpy (line, "HAVEKEY");
+                nkeys = 0;
+              }
+
+            err = keygrip_from_pk (node->pkt->pkt.public_key, grip);
+            if (err)
+              return err;
+            *p++ = ' ';
+            bin2hex (grip, 20, p);
+            p += 40;
+            nkeys++;
           }
-
-        err = keygrip_from_pk (node->pkt->pkt.public_key, grip);
-        if (err)
-          return err;
-        *p++ = ' ';
-        bin2hex (grip, 20, p);
-        p += 40;
-        nkeys++;
       }
 
   if (!err && nkeys)
@@ -2409,6 +2477,14 @@ agent_genkey (ctrl_t ctrl, char **cache_nonce_addr, char **passwd_nonce_addr,
     return err;
   dfltparm.ctx = agent_ctx;
 
+  /* Do not use our cache of secret keygrips anymore - this command
+   * would otherwise requiring to update that cache.  */
+  if (ctrl && ctrl->secret_keygrips)
+    {
+      xfree (ctrl->secret_keygrips);
+      ctrl->secret_keygrips = 0;
+    }
+
   if (timestamp)
     {
       strcpy (timestamparg, " --timestamp=");
@@ -2866,6 +2942,14 @@ agent_import_key (ctrl_t ctrl, const char *desc, char **cache_nonce_addr,
     return err;
   dfltparm.ctx = agent_ctx;
 
+  /* Do not use our cache of secret keygrips anymore - this command
+   * would otherwise requiring to update that cache.  */
+  if (ctrl && ctrl->secret_keygrips)
+    {
+      xfree (ctrl->secret_keygrips);
+      ctrl->secret_keygrips = 0;
+    }
+
   if (timestamp)
     {
       strcpy (timestamparg, " --timestamp=");
diff --git a/g10/call-dirmngr.c b/g10/call-dirmngr.c
index 434b467..f2ee47e 100644
--- a/g10/call-dirmngr.c
+++ b/g10/call-dirmngr.c
@@ -36,7 +36,6 @@
 #include "options.h"
 #include "../common/i18n.h"
 #include "../common/asshelp.h"
-#include "../common/keyserver.h"
 #include "../common/status.h"
 #include "keyserver-internal.h"
 #include "call-dirmngr.h"
@@ -678,7 +677,7 @@ gpg_dirmngr_ks_get (ctrl_t ctrl, char **pattern,
 
   /* If we have an override keyserver we first indicate that the next
      user of the context needs to again setup the global keyservers and
-     them we send the override keyserver.  */
+     then we send the override keyserver.  */
   if (override_keyserver)
     {
       clear_context_flags (ctrl, ctx);
@@ -817,24 +816,14 @@ static void
 record_output (estream_t output,
 	       pkttype_t type,
 	       const char *validity,
-	       /* The public key length or -1.  */
-	       int pub_key_length,
-	       /* The public key algo or -1.  */
-	       int pub_key_algo,
-	       /* 2 ulongs or NULL.  */
-	       const u32 *keyid,
-	       /* The creation / expiration date or 0.  */
-	       u32 creation_date,
-	       u32 expiration_date,
-	       const char *userid)
+	       int pub_key_length,  /* The public key length or -1.  */
+	       int pub_key_algo,    /* The public key algo or -1.    */
+	       const u32 *keyid,    /* 2 ulongs or NULL.             */
+	       u32 creation_date,   /* The creation date or 0.       */
+	       u32 expiration_date, /* The expiration date or 0.     */
+	       const char *userid)  /* The userid or NULL.           */
 {
   const char *type_str = NULL;
-  char *pub_key_length_str = NULL;
-  char *pub_key_algo_str = NULL;
-  char *keyid_str = NULL;
-  char *creation_date_str = NULL;
-  char *expiration_date_str = NULL;
-  char *userid_escaped = NULL;
 
   switch (type)
     {
@@ -853,77 +842,33 @@ record_output (estream_t output,
     default:
       log_assert (! "Unhandled type.");
     }
+  es_fprintf (output, "%s:%s:",
+              type_str,
+	      validity ? validity : "");
 
   if (pub_key_length > 0)
-    pub_key_length_str = xasprintf ("%d", pub_key_length);
+    es_fprintf (output, "%d", pub_key_length);
+  es_fputc (':', output);
 
   if (pub_key_algo != -1)
-    pub_key_algo_str = xasprintf ("%d", pub_key_algo);
+    es_fprintf (output, "%d", pub_key_algo);
+  es_fputc (':', output);
 
   if (keyid)
-    keyid_str = xasprintf ("%08lX%08lX", (ulong) keyid[0], (ulong) keyid[1]);
+    es_fprintf (output, "%08lX%08lX", (ulong) keyid[0], (ulong) keyid[1]);
 
-  if (creation_date)
-    creation_date_str = xstrdup (colon_strtime (creation_date));
+  es_fprintf (output, ":%s:", colon_strtime (creation_date));
+  es_fprintf (output, "%s:::", colon_strtime (expiration_date));
 
-  if (expiration_date)
-    expiration_date_str = xstrdup (colon_strtime (expiration_date));
-
-  /* Quote ':', '%', and any 8-bit characters.  */
   if (userid)
-    {
-      int r;
-      int w = 0;
-
-      int len = strlen (userid);
-      /* A 100k character limit on the uid should be way more than
-	 enough.  */
-      if (len > 100 * 1024)
-	len = 100 * 1024;
-
-      /* The minimum amount of space that we need.  */
-      userid_escaped = xmalloc (len * 3 + 1);
-
-      for (r = 0; r < len; r++)
-	{
-	  if (userid[r] == ':' || userid[r]== '%' || (userid[r] & 0x80))
-	    {
-	      sprintf (&userid_escaped[w], "%%%02X", (byte) userid[r]);
-	      w += 3;
-	    }
-	  else
-	    userid_escaped[w ++] = userid[r];
-	}
-      userid_escaped[w] = '\0';
-    }
+    es_write_sanitized (output, userid, strlen (userid), ":", NULL);
+  else
+    es_fputc (':', output);
+  es_fputs (":::::::::\n", output);
 
-  es_fprintf (output, "%s:%s:%s:%s:%s:%s:%s:%s:%s:%s:%s:%s:%s:%s:%s:%s:%s\n",
-	      type_str,
-	      validity ?: "",
-	      pub_key_length_str ?: "",
-	      pub_key_algo_str ?: "",
-	      keyid_str ?: "",
-	      creation_date_str ?: "",
-	      expiration_date_str ?: "",
-	      "" /* Certificate S/N */,
-	      "" /* Ownertrust.  */,
-	      userid_escaped ?: "",
-	      "" /* Signature class.  */,
-	      "" /* Key capabilities.  */,
-	      "" /* Issuer certificate fingerprint.  */,
-	      "" /* Flag field.  */,
-	      "" /* S/N of a token.  */,
-	      "" /* Hash algo.  */,
-	      "" /* Curve name.  */);
-
-  xfree (userid_escaped);
-  xfree (expiration_date_str);
-  xfree (creation_date_str);
-  xfree (keyid_str);
-  xfree (pub_key_algo_str);
-  xfree (pub_key_length_str);
 }
 
+
 /* Handle the KS_PUT inquiries. */
 static gpg_error_t
 ks_put_inq_cb (void *opaque, const char *line)
diff --git a/g10/call-keyboxd.c b/g10/call-keyboxd.c
index 9042c83..e2fede2 100644
--- a/g10/call-keyboxd.c
+++ b/g10/call-keyboxd.c
@@ -759,7 +759,8 @@ keydb_search (KEYDB_HANDLE hd, KEYDB_SEARCH_DESC *desc,
           break;
 
         case KEYDB_SEARCH_MODE_MAIL:
-          snprintf (line, sizeof line, "SEARCH %s -- <%s", more, desc->u.name);
+          snprintf (line, sizeof line, "SEARCH %s -- <%s",
+                    more, desc->u.name+(desc->u.name[0] == '<') );
           break;
 
         case KEYDB_SEARCH_MODE_MAILSUB:
diff --git a/g10/card-util.c b/g10/card-util.c
index 36f096f..f3ede6d 100644
--- a/g10/card-util.c
+++ b/g10/card-util.c
@@ -140,7 +140,10 @@ change_pin (int unblock_v2, int allow_admin)
 	answer = cpr_get("cardutil.change_pin.menu",_("Your selection? "));
 	cpr_kill_prompt();
 	if (strlen (answer) != 1)
-	  continue;
+          {
+            xfree (answer);
+            continue;
+          }
 
 	if (*answer == '1')
 	  {
@@ -185,8 +188,10 @@ change_pin (int unblock_v2, int allow_admin)
 	  }
 	else if (*answer == 'q' || *answer == 'Q')
 	  {
+            xfree (answer);
 	    break;
 	  }
+        xfree (answer);
       }
 
   agent_release_card_info (&info);
@@ -782,7 +787,8 @@ static int
 change_name (void)
 {
   char *surname = NULL, *givenname = NULL;
-  char *isoname, *p;
+  char *isoname = NULL;
+  char *p;
   int rc;
 
   surname = get_one_name ("keygen.smartcard.surname",
@@ -793,7 +799,8 @@ change_name (void)
     {
       xfree (surname);
       xfree (givenname);
-      return -1; /*canceled*/
+      rc = gpg_error (GPG_ERR_CANCELED);
+      goto leave;
     }
 
   isoname = xmalloc ( strlen (surname) + 2 + strlen (givenname) + 1);
@@ -809,14 +816,17 @@ change_name (void)
       tty_printf (_("Error: Combined name too long "
                     "(limit is %d characters).\n"), 39);
       xfree (isoname);
-      return -1;
+      rc = gpg_error (GPG_ERR_TOO_LARGE);
+      goto leave;
     }
 
   rc = agent_scd_setattr ("DISP-NAME", isoname, strlen (isoname));
   if (rc)
     log_error ("error setting Name: %s\n", gpg_strerror (rc));
 
+ leave:
   xfree (isoname);
+  write_sc_op_status (rc);
   return rc;
 }
 
@@ -1450,7 +1460,10 @@ ask_card_keyattr (int keyno, const struct key_attr *current)
       algo = *answer? atoi (answer) : 0;
 
       if (!*answer || algo == 1 || algo == 2)
-        break;
+        {
+          xfree (answer);
+          break;
+        }
       else
         tty_printf (_("Invalid selection.\n"));
     }
diff --git a/g10/cpr.c b/g10/cpr.c
index 5a39913..002656b 100644
--- a/g10/cpr.c
+++ b/g10/cpr.c
@@ -527,7 +527,11 @@ do_get_from_fd ( const char *keyword, int hidden, int getbool )
   write_status (STATUS_GOT_IT);
 
   if (getbool)	 /* Fixme: is this correct??? */
-    return (string[0] == 'Y' || string[0] == 'y') ? "" : NULL;
+    {
+      char *rv = (string[0] == 'Y' || string[0] == 'y') ? "" : NULL;
+      xfree (string);
+      return rv;
+    }
 
   return string;
 }
diff --git a/g10/encrypt.c b/g10/encrypt.c
index 388c3db..d9af54a 100644
--- a/g10/encrypt.c
+++ b/g10/encrypt.c
@@ -572,7 +572,7 @@ setup_symkey (STRING2KEY **symkey_s2k, DEK **symkey_dek)
   (*symkey_s2k)->hash_algo = s2kdigest;
 
   *symkey_dek = passphrase_to_dek (defcipher,
-                                   *symkey_s2k, 1, 0, NULL, &canceled);
+                                   *symkey_s2k, 1, 0, NULL, 0, &canceled);
   if (!*symkey_dek || !(*symkey_dek)->keylen)
     {
       xfree(*symkey_dek);
diff --git a/g10/getkey.c b/g10/getkey.c
index 6b8d443..cf734db 100644
--- a/g10/getkey.c
+++ b/g10/getkey.c
@@ -445,6 +445,42 @@ leave:
 }
 
 
+/* Same as get_pubkey but if the key was not found the function tries
+ * to import it from LDAP.  FIXME: We should not need this but swicth
+ * to a fingerprint lookup.  */
+gpg_error_t
+get_pubkey_with_ldap_fallback (ctrl_t ctrl, PKT_public_key *pk, u32 *keyid)
+{
+  gpg_error_t err;
+
+  err = get_pubkey (ctrl, pk, keyid);
+  if (!err)
+    return 0;
+
+  if (gpg_err_code (err) != GPG_ERR_NO_PUBKEY)
+    return err;
+
+  /* Note that this code does not handle the case for two readers
+   * having both openpgp encryption keys.  Only one will be tried.  */
+  if (opt.debug)
+    log_debug ("using LDAP to find a public key\n");
+  err = keyserver_import_keyid (ctrl, keyid,
+                                opt.keyserver, KEYSERVER_IMPORT_FLAG_LDAP);
+  if (gpg_err_code (err) == GPG_ERR_NO_DATA
+      || gpg_err_code (err) == GPG_ERR_NO_KEYSERVER)
+    {
+      /* Dirmngr returns NO DATA is the selected keyserver
+       * does not have the requested key.  It returns NO
+       * KEYSERVER if no LDAP keyservers are configured.  */
+      err = gpg_error (GPG_ERR_NO_PUBKEY);
+    }
+  if (err)
+    return err;
+
+  return get_pubkey (ctrl, pk, keyid);
+}
+
+
 /* Similar to get_pubkey, but it does not take PK->REQ_USAGE into
  * account nor does it merge in the self-signed data.  This function
  * also only considers primary keys.  It is intended to be used as a
@@ -925,11 +961,13 @@ get_pubkey_byname (ctrl_t ctrl, enum get_pubkey_modes mode,
   int rc;
   strlist_t namelist = NULL;
   struct akl *akl;
-  int is_mbox;
+  int is_mbox, is_fpr;
+  KEYDB_SEARCH_DESC fprbuf;
   int nodefault = 0;
   int anylocalfirst = 0;
   int mechanism_type = AKL_NODEFAULT;
 
+
   /* If RETCTX is not NULL, then RET_KDBHD must be NULL.  */
   log_assert (retctx == NULL || ret_kdbhd == NULL);
 
@@ -950,6 +988,18 @@ get_pubkey_byname (ctrl_t ctrl, enum get_pubkey_modes mode,
       is_mbox = 1;
     }
 
+  /* If we are called due to --locate-external-key Check whether NAME
+   * is a fingerprint and then try to lookup that key by configured
+   * method which support lookup by fingerprint.  FPRBUF carries the
+   * parsed fingerpint iff IS_FPR is true.  */
+  is_fpr = 0;
+  if (!is_mbox && mode == GET_PUBKEY_NO_LOCAL)
+    {
+      if (!classify_user_id (name, &fprbuf, 1)
+          && fprbuf.mode == KEYDB_SEARCH_MODE_FPR)
+        is_fpr = 1;
+    }
+
   /* The auto-key-locate feature works as follows: there are a number
    * of methods to look up keys.  By default, the local keyring is
    * tried first.  Then, each method listed in the --auto-key-locate is
@@ -1027,7 +1077,7 @@ get_pubkey_byname (ctrl_t ctrl, enum get_pubkey_modes mode,
      retrieval has been enabled, we try to import the key. */
   if (gpg_err_code (rc) == GPG_ERR_NO_PUBKEY
       && mode != GET_PUBKEY_NO_AKL
-      && is_mbox)
+      && (is_mbox || is_fpr))
     {
       /* NAME wasn't present in the local keyring (or we didn't try
        * the local keyring).  Since the auto key locate feature is
@@ -1053,6 +1103,8 @@ get_pubkey_byname (ctrl_t ctrl, enum get_pubkey_modes mode,
 	    case AKL_LOCAL:
               if (mode == GET_PUBKEY_NO_LOCAL)
                 {
+                  /* Note that we get here in is_fpr more, so there is
+                   * no extra check for it required.  */
                   mechanism_string = "";
                   rc = GPG_ERR_NO_PUBKEY;
                 }
@@ -1073,41 +1125,78 @@ get_pubkey_byname (ctrl_t ctrl, enum get_pubkey_modes mode,
 	      break;
 
 	    case AKL_CERT:
-	      mechanism_string = "DNS CERT";
-	      glo_ctrl.in_auto_key_retrieve++;
-	      rc = keyserver_import_cert (ctrl, name, 0, &fpr, &fpr_len);
-	      glo_ctrl.in_auto_key_retrieve--;
-	      break;
+              if (is_fpr)
+                {
+                  mechanism_string = "";
+                  rc = GPG_ERR_NO_PUBKEY;
+                }
+              else
+                {
+                  mechanism_string = "DNS CERT";
+                  glo_ctrl.in_auto_key_retrieve++;
+                  rc = keyserver_import_cert (ctrl, name, 0, &fpr, &fpr_len);
+                  glo_ctrl.in_auto_key_retrieve--;
+                }
+              break;
 
 	    case AKL_PKA:
 	      /* This is now obsolete.  */
 	      break;
 
 	    case AKL_DANE:
-	      mechanism_string = "DANE";
-	      glo_ctrl.in_auto_key_retrieve++;
-	      rc = keyserver_import_cert (ctrl, name, 1, &fpr, &fpr_len);
-	      glo_ctrl.in_auto_key_retrieve--;
+              if (is_fpr)
+                {
+                  mechanism_string = "";
+                  rc = GPG_ERR_NO_PUBKEY;
+                  break;
+                }
+              else
+                {
+                  mechanism_string = "DANE";
+                  glo_ctrl.in_auto_key_retrieve++;
+                  rc = keyserver_import_cert (ctrl, name, 1, &fpr, &fpr_len);
+                  glo_ctrl.in_auto_key_retrieve--;
+                }
 	      break;
 
 	    case AKL_WKD:
-	      mechanism_string = "WKD";
-	      glo_ctrl.in_auto_key_retrieve++;
-	      rc = keyserver_import_wkd (ctrl, name, 0, &fpr, &fpr_len);
-	      glo_ctrl.in_auto_key_retrieve--;
+              if (is_fpr)
+                {
+                  mechanism_string = "";
+                  rc = GPG_ERR_NO_PUBKEY;
+                }
+              else
+                {
+                  mechanism_string = "WKD";
+                  glo_ctrl.in_auto_key_retrieve++;
+                  rc = keyserver_import_wkd (ctrl, name, 0, &fpr, &fpr_len);
+                  glo_ctrl.in_auto_key_retrieve--;
+                }
 	      break;
 
 	    case AKL_LDAP:
-	      mechanism_string = "LDAP";
-	      glo_ctrl.in_auto_key_retrieve++;
-	      rc = keyserver_import_ldap (ctrl, name, &fpr, &fpr_len);
-	      glo_ctrl.in_auto_key_retrieve--;
-	      break;
+              if (is_fpr)
+                {
+                  mechanism_string = "";
+                  rc = GPG_ERR_NO_PUBKEY;
+                }
+              else
+                {
+                  mechanism_string = "LDAP";
+                  glo_ctrl.in_auto_key_retrieve++;
+                  rc = keyserver_import_ldap (ctrl, name, &fpr, &fpr_len);
+                  glo_ctrl.in_auto_key_retrieve--;
+                }
+              break;
 
 	    case AKL_NTDS:
 	      mechanism_string = "NTDS";
 	      glo_ctrl.in_auto_key_retrieve++;
-	      rc = keyserver_import_ntds (ctrl, name, &fpr, &fpr_len);
+              if (is_fpr)
+                rc = keyserver_import_fprint_ntds (ctrl,
+                                                   fprbuf.u.fpr, fprbuf.fprlen);
+              else
+                rc = keyserver_import_ntds (ctrl, name, &fpr, &fpr_len);
 	      glo_ctrl.in_auto_key_retrieve--;
 	      break;
 
@@ -1120,8 +1209,25 @@ get_pubkey_byname (ctrl_t ctrl, enum get_pubkey_modes mode,
 		{
 		  mechanism_string = "keyserver";
 		  glo_ctrl.in_auto_key_retrieve++;
-		  rc = keyserver_import_name (ctrl, name, &fpr, &fpr_len,
-                                              opt.keyserver);
+                  if (is_fpr)
+                    {
+                      rc = keyserver_import_fprint (ctrl,
+                                                    fprbuf.u.fpr, fprbuf.fprlen,
+                                                    opt.keyserver,
+                                                    KEYSERVER_IMPORT_FLAG_LDAP);
+                      /* Map error codes because Dirmngr returns NO
+                       * DATA if the keyserver does not have the
+                       * requested key.  It returns NO KEYSERVER if no
+                       * LDAP keyservers are configured.  */
+                      if (gpg_err_code (rc) == GPG_ERR_NO_DATA
+                          || gpg_err_code (rc) == GPG_ERR_NO_KEYSERVER)
+                        rc = gpg_error (GPG_ERR_NO_PUBKEY);
+                    }
+                  else
+                    {
+                      rc = keyserver_import_mbox (ctrl, name, &fpr, &fpr_len,
+                                                  opt.keyserver);
+                    }
 		  glo_ctrl.in_auto_key_retrieve--;
 		}
 	      else
@@ -1138,8 +1244,21 @@ get_pubkey_byname (ctrl_t ctrl, enum get_pubkey_modes mode,
 		mechanism_string = akl->spec->uri;
 		keyserver = keyserver_match (akl->spec);
 		glo_ctrl.in_auto_key_retrieve++;
-		rc = keyserver_import_name (ctrl,
-                                            name, &fpr, &fpr_len, keyserver);
+                if (is_fpr)
+                  {
+                    rc = keyserver_import_fprint (ctrl,
+                                                  fprbuf.u.fpr, fprbuf.fprlen,
+                                                  opt.keyserver,
+                                                  KEYSERVER_IMPORT_FLAG_LDAP);
+                    if (gpg_err_code (rc) == GPG_ERR_NO_DATA
+                        || gpg_err_code (rc) == GPG_ERR_NO_KEYSERVER)
+                      rc = gpg_error (GPG_ERR_NO_PUBKEY);
+                  }
+                else
+                  {
+                    rc = keyserver_import_mbox (ctrl, name,
+                                                &fpr, &fpr_len, keyserver);
+                  }
 		glo_ctrl.in_auto_key_retrieve--;
 	      }
 	      break;
@@ -1152,21 +1271,27 @@ get_pubkey_byname (ctrl_t ctrl, enum get_pubkey_modes mode,
 	   * requirement as the URL might point to a key put in by an
 	   * attacker.  By forcing the use of the fingerprint, we
 	   * won't use the attacker's key here. */
-	  if (!rc && fpr)
+	  if (!rc && (fpr || is_fpr))
 	    {
 	      char fpr_string[MAX_FINGERPRINT_LEN * 2 + 1];
 
-	      log_assert (fpr_len <= MAX_FINGERPRINT_LEN);
-
-	      free_strlist (namelist);
-	      namelist = NULL;
-
-	      bin2hex (fpr, fpr_len, fpr_string);
+              if (is_fpr)
+                {
+                  log_assert (fprbuf.fprlen <= MAX_FINGERPRINT_LEN);
+                  bin2hex (fprbuf.u.fpr, fprbuf.fprlen, fpr_string);
+                }
+              else
+                {
+                  log_assert (fpr_len <= MAX_FINGERPRINT_LEN);
+                  bin2hex (fpr, fpr_len, fpr_string);
+                }
 
 	      if (opt.verbose)
 		log_info ("auto-key-locate found fingerprint %s\n",
 			  fpr_string);
 
+	      free_strlist (namelist);
+	      namelist = NULL;
 	      add_to_strlist (&namelist, fpr_string);
 	    }
 	  else if (!rc && !fpr && !did_akl_local)
@@ -3791,7 +3916,7 @@ lookup (ctrl_t ctrl, getkey_ctx_t ctx, int want_secret,
 
       if (want_secret)
 	{
-	  rc = agent_probe_any_secret_key (NULL, keyblock);
+	  rc = agent_probe_any_secret_key (ctrl, keyblock);
 	  if (gpg_err_code(rc) == GPG_ERR_NO_SECKEY)
 	    goto skip; /* No secret key available.  */
 	  if (rc)
diff --git a/g10/gpg.c b/g10/gpg.c
index 3332525..54f7eb5 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -1601,6 +1601,7 @@ check_permissions (const char *path, int item)
   if (gnupg_stat (dir,&dirbuf) || !S_ISDIR (dirbuf.st_mode))
     {
       /* Weird error */
+      xfree(dir);
       ret=1;
       goto end;
     }
@@ -2314,6 +2315,8 @@ gpg_deinit_default_ctrl (ctrl_t ctrl)
 
   keydb_release (ctrl->cached_getkey_kdb);
   gpg_keyboxd_deinit_session_data (ctrl);
+  xfree (ctrl->secret_keygrips);
+  ctrl->secret_keygrips = NULL;
 }
 
 
@@ -3723,12 +3726,6 @@ main (int argc, char **argv)
         g10_exit(2);
       }
 
-    if (!logfile)
-      {
-        logfile = comopt.logfile;
-        comopt.logfile = NULL;
-      }
-
     if (opt.use_keyboxd)
       log_info ("Note: Please move option \"%s\" to \"common.conf\"\n",
                 "use-keyboxd");
@@ -4877,12 +4874,14 @@ main (int argc, char **argv)
 	for( ; argc; argc--, argv++ )
 	    append_to_strlist2( &sl, *argv, utf8_strings );
 	rc = keyserver_fetch (ctrl, sl, opt.key_origin);
+	free_strlist (sl);
 	if(rc)
           {
             write_status_failure ("fetch-keys", rc);
             log_error ("key fetch failed: %s\n",gpg_strerror (rc));
+            if (gpg_err_code (rc) == GPG_ERR_NO_DATA)
+              g10_exit (1); /* In this case return 1 and not 2.  */
           }
-	free_strlist(sl);
 	break;
 
       case aExportSecret:
diff --git a/g10/gpg.h b/g10/gpg.h
index d4e66e7..c51bbbb 100644
--- a/g10/gpg.h
+++ b/g10/gpg.h
@@ -110,6 +110,14 @@ struct server_control_s
 
   /* This is used to cache a key data base handle.  */
   KEYDB_HANDLE cached_getkey_kdb;
+
+  /* Cached results from HAVEKEY --list.  They are used if the pointer
+   * is not NULL.  The length gives the length in bytes and is a
+   * multiple of 20.  If the no_more flag is set the list shall not
+   * anymore be refreshed even if it has been freed and NULLed. */
+  unsigned char *secret_keygrips;
+  size_t secret_keygrips_len;
+  int no_more_secret_keygrips;
 };
 
 
diff --git a/g10/gpgv.c b/g10/gpgv.c
index 09c694c..d1e6da9 100644
--- a/g10/gpgv.c
+++ b/g10/gpgv.c
@@ -444,6 +444,16 @@ keyserver_import_fprint (ctrl_t ctrl, const byte *fprint,size_t fprint_len,
 }
 
 int
+keyserver_import_fprint_ntds (ctrl_t ctrl,
+                              const byte *fprint, size_t fprint_len)
+{
+  (void)ctrl;
+  (void)fprint;
+  (void)fprint_len;
+  return -1;
+}
+
+int
 keyserver_import_cert (const char *name)
 {
   (void)name;
@@ -463,7 +473,7 @@ keyserver_import_wkd (ctrl_t ctrl, const char *name, unsigned int flags,
 }
 
 int
-keyserver_import_name (const char *name,struct keyserver_spec *spec)
+keyserver_import_mbox (const char *name,struct keyserver_spec *spec)
 {
   (void)name;
   (void)spec;
@@ -569,13 +579,14 @@ check_secret_key (PKT_public_key *pk, int n)
  */
 DEK *
 passphrase_to_dek (int cipher_algo, STRING2KEY *s2k, int create, int nocache,
-                   const char *tmp, int *canceled)
+                   const char *tmp, unsigned int flags, int *canceled)
 {
   (void)cipher_algo;
   (void)s2k;
   (void)create;
   (void)nocache;
   (void)tmp;
+  (void)flags;
 
   if (canceled)
     *canceled = 0;
diff --git a/g10/import.c b/g10/import.c
index 62ee2a4..951c33d 100644
--- a/g10/import.c
+++ b/g10/import.c
@@ -225,12 +225,14 @@ parse_import_options(char *str,unsigned int *options,int noisy)
       {NULL,0,NULL,NULL}
     };
   int rc;
-  int saved_self_sigs_only;
+  int saved_self_sigs_only, saved_import_clean;
 
-  /* We need to set a flag indicating wether the user has set
-   * IMPORT_SELF_SIGS_ONLY or it came from the default.  */
+  /* We need to set flags indicating wether the user has set certain
+   * options or if they came from the default.  */
   saved_self_sigs_only = (*options & IMPORT_SELF_SIGS_ONLY);
   saved_self_sigs_only &= ~IMPORT_SELF_SIGS_ONLY;
+  saved_import_clean   = (*options & IMPORT_CLEAN);
+  saved_import_clean   &= ~IMPORT_CLEAN;
 
   rc = parse_options (str, options, import_opts, noisy);
 
@@ -239,6 +241,12 @@ parse_import_options(char *str,unsigned int *options,int noisy)
   else
     *options |= saved_self_sigs_only;
 
+  if (rc && (*options & IMPORT_CLEAN))
+    opt.flags.expl_import_clean = 1;
+  else
+    *options |= saved_import_clean;
+
+
   if (rc && (*options & IMPORT_RESTORE))
     {
       /* Alter other options we want or don't want for restore.  */
@@ -4516,7 +4524,10 @@ append_new_uid (unsigned int options,
           err = insert_key_origin_uid (n->pkt->pkt.user_id,
                                        curtime, origin, url);
           if (err)
-            return err;
+            {
+              release_kbnode (n);
+              return err;
+            }
         }
 
       if (n_where)
diff --git a/g10/keydb.h b/g10/keydb.h
index ed58b94..806b930 100644
--- a/g10/keydb.h
+++ b/g10/keydb.h
@@ -292,19 +292,19 @@ gpg_error_t build_sk_list (ctrl_t ctrl, strlist_t locusr,
                            SK_LIST *ret_sk_list, unsigned use);
 
 /*-- passphrase.h --*/
+
+/* Flags for passphrase_to_dek */
+#define GETPASSWORD_FLAG_SYMDECRYPT  1
+
 int  have_static_passphrase(void);
 const char *get_static_passphrase (void);
 void set_passphrase_from_string(const char *pass);
 void read_passphrase_from_fd( int fd );
 void passphrase_clear_cache (const char *cacheid);
-DEK *passphrase_to_dek_ext(u32 *keyid, int pubkey_algo,
-                           int cipher_algo, STRING2KEY *s2k, int mode,
-                           const char *tryagain_text,
-                           const char *custdesc, const char *custprompt,
-                           int *canceled);
 DEK *passphrase_to_dek (int cipher_algo, STRING2KEY *s2k,
                         int create, int nocache,
-                        const char *tryagain_text, int *canceled);
+                        const char *tryagain_text, unsigned int flags,
+                        int *canceled);
 void set_next_passphrase( const char *s );
 char *get_last_passphrase(void);
 void next_to_last_passphrase(void);
@@ -336,6 +336,10 @@ gpg_error_t get_pubkey_for_sig (ctrl_t ctrl,
 /* Return the public key with the key id KEYID and store it at PK.  */
 int get_pubkey (ctrl_t ctrl, PKT_public_key *pk, u32 *keyid);
 
+/* Same as get_pubkey but with auto LDAP fetch.  */
+gpg_error_t get_pubkey_with_ldap_fallback (ctrl_t ctrl,
+                                           PKT_public_key *pk, u32 * keyid);
+
 /* Similar to get_pubkey, but it does not take PK->REQ_USAGE into
    account nor does it merge in the self-signed data.  This function
    also only considers primary keys.  */
diff --git a/g10/keyedit.c b/g10/keyedit.c
index 531d3e1..122548d 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -5306,8 +5306,11 @@ menu_set_keyserver_url (ctrl_t ctrl, const char *url, kbnode_t pub_keyblock)
 	}
     }
 
-  if (ascii_strcasecmp (answer, "none") == 0)
-    uri = NULL;
+  if (!ascii_strcasecmp (answer, "none"))
+    {
+      xfree (answer);
+      uri = NULL;
+    }
   else
     {
       struct keyserver_spec *keyserver = NULL;
@@ -5379,12 +5382,16 @@ menu_set_keyserver_url (ctrl_t ctrl, const char *url, kbnode_t pub_keyblock)
                            uri
                            ? _("Are you sure you want to replace it? (y/N) ")
                            : _("Are you sure you want to delete it? (y/N) ")))
-			continue;
+		        {
+			  xfree (user);
+			  continue;
+		        }
 		    }
 		  else if (uri == NULL)
 		    {
 		      /* There is no current keyserver URL, so there
 		         is no point in trying to un-set it. */
+                      xfree (user);
 		      continue;
 		    }
 
@@ -5397,6 +5404,7 @@ menu_set_keyserver_url (ctrl_t ctrl, const char *url, kbnode_t pub_keyblock)
 		      log_error ("update_keysig_packet failed: %s\n",
 				 gpg_strerror (rc));
 		      xfree (uri);
+	              xfree (user);
 		      return 0;
 		    }
 		  /* replace the packet */
diff --git a/g10/keygen.c b/g10/keygen.c
index a4117cd..239e7ac 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -237,12 +237,13 @@ print_status_key_not_created (const char *handle)
 static gpg_error_t
 write_uid (kbnode_t root, const char *s)
 {
-  PACKET *pkt = xmalloc_clear (sizeof *pkt);
+  PACKET *pkt = NULL;
   size_t n = strlen (s);
 
   if (n > MAX_UID_PACKET_LENGTH - 10)
     return gpg_error (GPG_ERR_INV_USER_ID);
 
+  pkt = xmalloc_clear (sizeof *pkt);
   pkt->pkttype = PKT_USER_ID;
   pkt->pkt.user_id = xmalloc_clear (sizeof *pkt->pkt.user_id + n);
   pkt->pkt.user_id->len = n;
@@ -2860,7 +2861,10 @@ ask_expire_interval(int object,const char *def_expire)
 	    xfree(prompt);
 
 	    if(*answer=='\0')
-	      answer=xstrdup(def_expire);
+              {
+                xfree (answer);
+	        answer = xstrdup (def_expire);
+              }
 	  }
 	cpr_kill_prompt();
 	trim_spaces(answer);
@@ -4951,6 +4955,14 @@ generate_keypair (ctrl_t ctrl, int full, const char *fname,
                   strcpy (r->u.value, curve);
                   r->next = para;
                   para = r;
+                  if (!strcmp (curve, "Ed448"))
+                    {
+                      r = xmalloc_clear (sizeof *r + 20);
+                      r->key = pVERSION;
+                      snprintf (r->u.value, 20, "%d", 5);
+                      r->next = para;
+                      para = r;
+                    }
                 }
               else
                 {
@@ -4995,7 +5007,14 @@ generate_keypair (ctrl_t ctrl, int full, const char *fname,
                       if (!strcmp (curve, "Ed25519"))
                         curve = "Curve25519";
                       else
-                        curve = "X448";
+                        {
+                          curve = "X448";
+                          r = xmalloc_clear (sizeof *r + 20);
+                          r->key = pSUBVERSION;
+                          snprintf (r->u.value, 20, "%d", 5);
+                          r->next = para;
+                          para = r;
+                        }
                     }
                   r = xmalloc_clear (sizeof *r + strlen (curve));
                   r->key = pSUBKEYCURVE;
@@ -5018,6 +5037,14 @@ generate_keypair (ctrl_t ctrl, int full, const char *fname,
                   strcpy (r->u.value, curve);
                   r->next = para;
                   para = r;
+                  if (!strcmp (curve, "Ed448"))
+                    {
+                      r = xmalloc_clear (sizeof *r + 20);
+                      r->key = pVERSION;
+                      snprintf (r->u.value, 20, "%d", 5);
+                      r->next = para;
+                      para = r;
+                    }
                 }
 
               r = xmalloc_clear( sizeof *r + 20 );
@@ -5238,12 +5265,15 @@ card_store_key_with_backup (ctrl_t ctrl, PKT_public_key *sub_psk,
   epoch2isotime (timestamp, (time_t)sk->timestamp);
   err = hexkeygrip_from_pk (sk, &hexgrip);
   if (err)
-    return err;
+    goto leave;
 
   memset(&info, 0, sizeof (info));
   rc = agent_scd_getattr ("SERIALNO", &info);
   if (rc)
-    return (gpg_error_t)rc;
+    {
+      err = (gpg_error_t)rc;
+      goto leave;
+    }
 
   rc = agent_keytocard (hexgrip, 2, 1, info.serialno, timestamp);
   xfree (info.serialno);
@@ -5576,6 +5606,7 @@ do_generate_keypair (ctrl_t ctrl, struct para_data_s *para,
         {
           int no_enc_rsa;
           PKT_public_key *pk;
+          char hexfpr[2*MAX_FINGERPRINT_LEN + 1];
 
           no_enc_rsa = ((get_parameter_algo (ctrl, para, pKEYTYPE, NULL)
                          == PUBKEY_ALGO_RSA)
@@ -5585,8 +5616,8 @@ do_generate_keypair (ctrl_t ctrl, struct para_data_s *para,
 
           pk = find_kbnode (pub_root, PKT_PUBLIC_KEY)->pkt->pkt.public_key;
 
-          keyid_from_pk (pk, pk->main_keyid);
-          register_trusted_keyid (pk->main_keyid);
+          hexfingerprint (pk, hexfpr, sizeof hexfpr);
+          register_trusted_key (hexfpr);
 
           if (!opt.flags.no_auto_trust_new_key)
             update_ownertrust (ctrl, pk,
@@ -6132,12 +6163,20 @@ gen_card_key (int keyno, int algo, int is_primary, kbnode_t pub_root,
      the self-signatures. */
   err = agent_readkey (NULL, 1, keyid, &public);
   if (err)
-    return err;
+    {
+      xfree (pkt);
+      xfree (pk);
+      return err;
+    }
   err = gcry_sexp_sscan (&s_key, NULL, public,
                          gcry_sexp_canon_len (public, 0, NULL, NULL));
   xfree (public);
   if (err)
-    return err;
+    {
+      xfree (pkt);
+      xfree (pk);
+      return err;
+    }
 
   if (algo == PUBKEY_ALGO_RSA)
     err = key_from_sexp (pk->pkey, s_key, "public-key", "ne");
diff --git a/g10/keylist.c b/g10/keylist.c
index e222259..de651d6 100644
--- a/g10/keylist.c
+++ b/g10/keylist.c
@@ -553,7 +553,7 @@ list_all (ctrl_t ctrl, int secret, int mark_secret)
 	}
 
       if (secret || mark_secret)
-        any_secret = !agent_probe_any_secret_key (NULL, keyblock);
+        any_secret = !agent_probe_any_secret_key (ctrl, keyblock);
       else
         any_secret = 0;
 
@@ -645,7 +645,7 @@ list_one (ctrl_t ctrl, strlist_t names, int secret, int mark_secret)
       if (secret)
         any_secret = 1;
       else if (mark_secret)
-        any_secret = !agent_probe_any_secret_key (NULL, keyblock);
+        any_secret = !agent_probe_any_secret_key (ctrl, keyblock);
       else
         any_secret = 0;
 
diff --git a/g10/keyring.c b/g10/keyring.c
index e044cab..baddf5d 100644
--- a/g10/keyring.c
+++ b/g10/keyring.c
@@ -968,7 +968,7 @@ keyring_search (KEYRING_HANDLE hd, KEYDB_SEARCH_DESC *desc,
   int save_mode;
   off_t offset, main_offset;
   size_t n;
-  int need_uid, need_words, need_keyid, need_fpr, any_skip;
+  int need_uid, need_words, need_keyid, need_fpr, any_skip, need_grip;
   int pk_no, uid_no;
   int initial_skip;
   int scanned_from_start;
@@ -976,9 +976,10 @@ keyring_search (KEYRING_HANDLE hd, KEYDB_SEARCH_DESC *desc,
   PKT_user_id *uid = NULL;
   PKT_public_key *pk = NULL;
   u32 aki[2];
+  unsigned char grip[KEYGRIP_LEN];
 
   /* figure out what information we need */
-  need_uid = need_words = need_keyid = need_fpr = any_skip = 0;
+  need_uid = need_words = need_keyid = need_fpr = any_skip = need_grip = 0;
   for (n=0; n < ndesc; n++)
     {
       switch (desc[n].mode)
@@ -1005,8 +1006,11 @@ keyring_search (KEYRING_HANDLE hd, KEYDB_SEARCH_DESC *desc,
           /* always restart the search in this mode */
           keyring_search_reset (hd);
           break;
+        case KEYDB_SEARCH_MODE_KEYGRIP:
+          need_grip = 1;
+          break;
         default: break;
-	}
+        }
       if (desc[n].skipfnc)
         {
           any_skip = 1;
@@ -1143,6 +1147,8 @@ keyring_search (KEYRING_HANDLE hd, KEYDB_SEARCH_DESC *desc,
             }
           if (need_keyid)
             keyid_from_pk (pk, aki);
+          if (need_grip)
+            keygrip_from_pk (pk, grip);
 
           if (use_key_present_hash
               && !key_present_hash_ready
@@ -1197,6 +1203,10 @@ keyring_search (KEYRING_HANDLE hd, KEYDB_SEARCH_DESC *desc,
             if (pk)
               goto found;
             break;
+          case KEYDB_SEARCH_MODE_KEYGRIP:
+            if (pk && !memcmp (desc[n].u.grip, grip, KEYGRIP_LEN))
+              goto found;
+            break;
           default:
             rc = GPG_ERR_INV_ARG;
             goto found;
diff --git a/g10/keyserver-internal.h b/g10/keyserver-internal.h
index ebbd6e9..c93ca43 100644
--- a/g10/keyserver-internal.h
+++ b/g10/keyserver-internal.h
@@ -21,7 +21,6 @@
 #define _KEYSERVER_INTERNAL_H_
 
 #include <time.h>
-#include "../common/keyserver.h"
 #include "../common/iobuf.h"
 #include "../common/types.h"
 
@@ -41,6 +40,8 @@ int keyserver_import (ctrl_t ctrl, strlist_t users);
 int keyserver_import_fprint (ctrl_t ctrl, const byte *fprint,size_t fprint_len,
                              struct keyserver_spec *keyserver,
                              unsigned int flags);
+int keyserver_import_fprint_ntds (ctrl_t ctrl,
+                                  const byte *fprint, size_t fprint_len);
 int keyserver_import_keyid (ctrl_t ctrl, u32 *keyid,
                             struct keyserver_spec *keyserver,
                             unsigned int flags);
@@ -54,8 +55,8 @@ gpg_error_t keyserver_import_wkd (ctrl_t ctrl, const char *name,
                                   unsigned char **fpr, size_t *fpr_len);
 int keyserver_import_ntds (ctrl_t ctrl, const char *name,
                            unsigned char **fpr,size_t *fpr_len);
-int keyserver_import_name (ctrl_t ctrl,
-                           const char *name,unsigned char **fpr,size_t *fpr_len,
+int keyserver_import_mbox (ctrl_t ctrl, const char *mbox,
+                           unsigned char **fpr,size_t *fpr_len,
                            struct keyserver_spec *keyserver);
 int keyserver_import_ldap (ctrl_t ctrl, const char *name,
                            unsigned char **fpr,size_t *fpr_len);
diff --git a/g10/keyserver.c b/g10/keyserver.c
index a062056..f6d12e2 100644
--- a/g10/keyserver.c
+++ b/g10/keyserver.c
@@ -183,37 +183,17 @@ void
 free_keyserver_spec(struct keyserver_spec *keyserver)
 {
   xfree(keyserver->uri);
-  xfree(keyserver->scheme);
-  xfree(keyserver->auth);
-  xfree(keyserver->host);
-  xfree(keyserver->port);
-  xfree(keyserver->path);
-  xfree(keyserver->opaque);
-  free_strlist(keyserver->options);
   xfree(keyserver);
 }
 
 /* Return 0 for match */
 static int
-cmp_keyserver_spec(struct keyserver_spec *one,struct keyserver_spec *two)
+cmp_keyserver_spec(struct keyserver_spec *one, struct keyserver_spec *two)
 {
-  if(ascii_strcasecmp(one->scheme,two->scheme)==0)
-    {
-      if(one->host && two->host && ascii_strcasecmp(one->host,two->host)==0)
-	{
-	  if((one->port && two->port
-	      && ascii_strcasecmp(one->port,two->port)==0)
-	     || (!one->port && !two->port))
-	    return 0;
-	}
-      else if(one->opaque && two->opaque
-	      && ascii_strcasecmp(one->opaque,two->opaque)==0)
-	return 0;
-    }
-
-  return 1;
+  return !!ascii_strcasecmp(one->uri, two->uri);
 }
 
+
 /* Try and match one of our keyservers.  If we can, return that.  If
    we can't, return our input. */
 struct keyserver_spec *
@@ -228,40 +208,24 @@ keyserver_match(struct keyserver_spec *spec)
   return spec;
 }
 
-/* TODO: once we cut over to an all-curl world, we don't need this
-   parser any longer so it can be removed, or at least moved to
-   keyserver/ksutil.c for limited use in gpgkeys_ldap or the like. */
 
+/* Create a new keyserver object from STRING.  Unless REQUIRE_SCHEME
+ * is set a missing scheme is replaced by "hkp://".  The data structure
+ * could be much easier but in the past we parsed the URI here for the
+ * old 2.0 keyserver helpers - which is not anymore needed.  */
 keyserver_spec_t
-parse_keyserver_uri (const char *string,int require_scheme)
+parse_keyserver_uri (const char *string, int require_scheme)
 {
-  int assume_hkp=0;
   struct keyserver_spec *keyserver;
   const char *idx;
   int count;
-  char *uri, *duped_uri, *options;
 
   log_assert (string);
 
-  keyserver=xmalloc_clear(sizeof(struct keyserver_spec));
-
-  duped_uri = uri = xstrdup (string);
-
-  options=strchr(uri,' ');
-  if(options)
-    {
-      char *tok;
-
-      *options='\0';
-      options++;
-
-      while((tok=optsep(&options)))
-	warn_kshelper_option (tok, 0);
-    }
+  keyserver = xcalloc (1, sizeof *keyserver);
 
   /* Get the scheme */
-
-  for(idx=uri,count=0;*idx && *idx!=':';idx++)
+  for(idx=string, count=0; *idx && *idx!=':';idx++)
     {
       count++;
 
@@ -284,165 +248,24 @@ parse_keyserver_uri (const char *string,int require_scheme)
   if(*idx=='\0' || *idx=='[')
     {
       if(require_scheme)
-	return NULL;
-
-      /* Assume HKP if there is no scheme */
-      assume_hkp=1;
-      keyserver->scheme=xstrdup("hkp");
-
-      keyserver->uri=xmalloc(strlen(keyserver->scheme)+3+strlen(uri)+1);
-      strcpy(keyserver->uri,keyserver->scheme);
-      strcat(keyserver->uri,"://");
-      strcat(keyserver->uri,uri);
-    }
-  else
-    {
-      int i;
-
-      keyserver->uri=xstrdup(uri);
-
-      keyserver->scheme=xmalloc(count+1);
-
-      /* Force to lowercase */
-      for(i=0;i<count;i++)
-	keyserver->scheme[i]=ascii_tolower(uri[i]);
-
-      keyserver->scheme[i]='\0';
-
-      /* Skip past the scheme and colon */
-      uri+=count+1;
-    }
-
-  if(ascii_strcasecmp(keyserver->scheme,"x-broken-hkp")==0)
-    {
-      log_info ("keyserver option '%s' is obsolete\n",
-                "x-broken-hkp");
-    }
-  else if(ascii_strcasecmp(keyserver->scheme,"x-hkp")==0)
-    {
-      /* Canonicalize this to "hkp" so it works with both the internal
-	 and external keyserver interface. */
-      xfree(keyserver->scheme);
-      keyserver->scheme=xstrdup("hkp");
-    }
-
-  if (uri[0]=='/' && uri[1]=='/' && uri[2] == '/')
-    {
-      /* Three slashes means network path with a default host name.
-         This is a hack because it does not crok all possible
-         combinations.  We should better replace all code by the parser
-         from http.c.  */
-      keyserver->path = xstrdup (uri+2);
-    }
-  else if(assume_hkp || (uri[0]=='/' && uri[1]=='/'))
-    {
-      /* Two slashes means network path. */
-
-      /* Skip over the "//", if any */
-      if(!assume_hkp)
-	uri+=2;
-
-      /* Do we have userinfo auth data present? */
-      for(idx=uri,count=0;*idx && *idx!='@' && *idx!='/';idx++)
-	count++;
-
-      /* We found a @ before the slash, so that means everything
-	 before the @ is auth data. */
-      if(*idx=='@')
-	{
-	  if(count==0)
-	    goto fail;
-
-	  keyserver->auth=xmalloc(count+1);
-	  strncpy(keyserver->auth,uri,count);
-	  keyserver->auth[count]='\0';
-	  uri+=count+1;
-	}
-
-      /* Is it an RFC-2732 ipv6 [literal address] ? */
-      if(*uri=='[')
-	{
-	  for(idx=uri+1,count=1;*idx
-		&& ((isascii (*idx) && isxdigit(*idx))
-                    || *idx==':' || *idx=='.');idx++)
-	    count++;
-
-	  /* Is the ipv6 literal address terminated? */
-	  if(*idx==']')
-	    count++;
-	  else
-	    goto fail;
-	}
-      else
-	for(idx=uri,count=0;*idx && *idx!=':' && *idx!='/';idx++)
-	  count++;
-
-      if(count==0)
 	goto fail;
 
-      keyserver->host=xmalloc(count+1);
-      strncpy(keyserver->host,uri,count);
-      keyserver->host[count]='\0';
-
-      /* Skip past the host */
-      uri+=count;
-
-      if(*uri==':')
-	{
-	  /* It would seem to be reasonable to limit the range of the
-	     ports to values between 1-65535, but RFC 1738 and 1808
-	     imply there is no limit.  Of course, the real world has
-	     limits. */
-
-	  for(idx=uri+1,count=0;*idx && *idx!='/';idx++)
-	    {
-	      count++;
-
-	      /* Ports are digits only */
-	      if(!digitp(idx))
-		goto fail;
-	    }
-
-	  keyserver->port=xmalloc(count+1);
-	  strncpy(keyserver->port,uri+1,count);
-	  keyserver->port[count]='\0';
-
-	  /* Skip past the colon and port number */
-	  uri+=1+count;
-	}
-
-      /* Everything else is the path */
-      if(*uri)
-	keyserver->path=xstrdup(uri);
-      else
-	keyserver->path=xstrdup("/");
-
-      if(keyserver->path[1])
-	keyserver->flags.direct_uri=1;
-    }
-  else if(uri[0]!='/')
-    {
-      /* No slash means opaque.  Just record the opaque blob and get
-	 out. */
-      keyserver->opaque=xstrdup(uri);
+      /* Assume HKP if there is no scheme */
+      keyserver->uri = xstrconcat ("hkp://", string, NULL);
     }
   else
     {
-      /* One slash means absolute path.  We don't need to support that
-	 yet. */
-      goto fail;
+      keyserver->uri = xstrdup (string);
     }
 
-  xfree (duped_uri);
   return keyserver;
 
  fail:
   free_keyserver_spec(keyserver);
-
-  xfree (duped_uri);
   return NULL;
 }
 
+
 struct keyserver_spec *
 parse_preferred_keyserver(PKT_signature *sig)
 {
@@ -1122,18 +945,16 @@ keyserver_any_configured (ctrl_t ctrl)
 }
 
 
-/* Import all keys that exactly match NAME */
+/* Import all keys that exactly match MBOX */
 int
-keyserver_import_name (ctrl_t ctrl, const char *name,
+keyserver_import_mbox (ctrl_t ctrl, const char *mbox,
                        unsigned char **fpr, size_t *fprlen,
                        struct keyserver_spec *keyserver)
 {
-  KEYDB_SEARCH_DESC desc;
-
-  memset (&desc, 0, sizeof desc);
+  KEYDB_SEARCH_DESC desc = { 0 };
 
-  desc.mode = KEYDB_SEARCH_MODE_EXACT;
-  desc.u.name = name;
+  desc.mode = KEYDB_SEARCH_MODE_MAIL;
+  desc.u.name = mbox;
 
   return keyserver_get (ctrl, &desc, 1, keyserver, 0, fpr, fprlen);
 }
@@ -1155,27 +976,37 @@ keyserver_import_ntds (ctrl_t ctrl, const char *mbox,
 
 
 int
-keyserver_import_fprint (ctrl_t ctrl, const byte *fprint,size_t fprint_len,
+keyserver_import_fprint (ctrl_t ctrl, const byte *fprint, size_t fprint_len,
 			 struct keyserver_spec *keyserver,
                          unsigned int flags)
 {
   KEYDB_SEARCH_DESC desc;
 
-  memset(&desc,0,sizeof(desc));
+  memset (&desc, 0, sizeof(desc));
 
   if (fprint_len == 16 || fprint_len == 20 || fprint_len == 32)
     desc.mode = KEYDB_SEARCH_MODE_FPR;
   else
-    return -1;
+    return gpg_error (GPG_ERR_INV_ARG);
 
-  memcpy(desc.u.fpr,fprint,fprint_len);
+  memcpy (desc.u.fpr, fprint, fprint_len);
   desc.fprlen = fprint_len;
 
-  /* TODO: Warn here if the fingerprint we got doesn't match the one
-     we asked for? */
   return keyserver_get (ctrl, &desc, 1, keyserver, flags, NULL, NULL);
 }
 
+
+int
+keyserver_import_fprint_ntds (ctrl_t ctrl,
+                              const byte *fprint, size_t fprint_len)
+{
+  struct keyserver_spec keyserver = { NULL, "ldap:///" };
+
+  return keyserver_import_fprint (ctrl, fprint, fprint_len,
+                                  &keyserver, KEYSERVER_IMPORT_FLAG_LDAP);
+}
+
+
 int
 keyserver_import_keyid (ctrl_t ctrl,
                         u32 *keyid,struct keyserver_spec *keyserver,
@@ -1196,7 +1027,7 @@ keyserver_import_keyid (ctrl_t ctrl,
 /* code mostly stolen from do_export_stream */
 static int
 keyidlist (ctrl_t ctrl, strlist_t users, KEYDB_SEARCH_DESC **klist,
-           int *count, int fakev3)
+           int *count)
 {
   int rc = 0;
   int num = 100;
@@ -1261,28 +1092,6 @@ keyidlist (ctrl_t ctrl, strlist_t users, KEYDB_SEARCH_DESC **klist,
 
       if((node=find_kbnode(keyblock,PKT_PUBLIC_KEY)))
 	{
-	  /* This is to work around a bug in some keyservers (pksd and
-             OKS) that calculate v4 RSA keyids as if they were v3 RSA.
-             The answer is to refresh both the correct v4 keyid
-             (e.g. 99242560) and the fake v3 keyid (e.g. 68FDDBC7).
-             This only happens for key refresh using the HKP scheme
-             and if the refresh-add-fake-v3-keyids keyserver option is
-             set. */
-	  if(fakev3 && is_RSA(node->pkt->pkt.public_key->pubkey_algo) &&
-	     node->pkt->pkt.public_key->version>=4)
-	    {
-	      (*klist)[*count].mode=KEYDB_SEARCH_MODE_LONG_KID;
-	      v3_keyid (node->pkt->pkt.public_key->pkey[0],
-                        (*klist)[*count].u.kid);
-	      (*count)++;
-
-	      if(*count==num)
-		{
-		  num+=100;
-		  *klist=xrealloc(*klist,sizeof(KEYDB_SEARCH_DESC)*num);
-		}
-	    }
-
 	  /* v4 keys get full fingerprints.  v3 keys get long keyids.
              This is because it's easy to calculate any sort of keyid
              from a v4 fingerprint, but not a v3 fingerprint. */
@@ -1374,7 +1183,6 @@ keyserver_refresh (ctrl_t ctrl, strlist_t users)
 {
   gpg_error_t err;
   int count, numdesc;
-  int fakev3 = 0;
   KEYDB_SEARCH_DESC *desc;
   unsigned int options=opt.keyserver_options.import_options;
 
@@ -1388,19 +1196,8 @@ keyserver_refresh (ctrl_t ctrl, strlist_t users)
      the end here. */
   opt.keyserver_options.import_options|=IMPORT_FAST;
 
-  /* If refresh_add_fake_v3_keyids is on and it's a HKP or MAILTO
-     scheme, then enable fake v3 keyid generation.  Note that this
-     works only with a keyserver configured. gpg.conf
-     (i.e. opt.keyserver); however that method of configuring a
-     keyserver is deprecated and in any case it is questionable
-     whether we should keep on supporting these ancient and broken
-     keyservers.  */
-  if((opt.keyserver_options.options&KEYSERVER_ADD_FAKE_V3) && opt.keyserver
-     && (ascii_strcasecmp(opt.keyserver->scheme,"hkp")==0 ||
-	 ascii_strcasecmp(opt.keyserver->scheme,"mailto")==0))
-    fakev3=1;
-
-  err = keyidlist (ctrl, users, &desc, &numdesc, fakev3);
+
+  err = keyidlist (ctrl, users, &desc, &numdesc);
   if (err)
     return err;
 
@@ -1487,16 +1284,6 @@ keyserver_search (ctrl_t ctrl, strlist_t tokens)
   if (!tokens)
     return 0;  /* Return success if no patterns are given.  */
 
-  /* Write global options */
-
-  /* for(temp=opt.keyserver_options.other;temp;temp=temp->next) */
-  /*   es_fprintf(spawn->tochild,"OPTION %s\n",temp->d); */
-
-  /* Write per-keyserver options */
-
-  /* for(temp=keyserver->options;temp;temp=temp->next) */
-  /*   es_fprintf(spawn->tochild,"OPTION %s\n",temp->d); */
-
   {
     membuf_t mb;
     strlist_t item;
@@ -1516,8 +1303,6 @@ keyserver_search (ctrl_t ctrl, strlist_t tokens)
         goto leave;
       }
   }
-  /* FIXME: Enable the next line */
-  /* log_info (_("searching for \"%s\" from %s\n"), searchstr, keyserver->uri); */
 
   parm.ctrl = ctrl;
   if (searchstr)
@@ -1539,31 +1324,6 @@ keyserver_search (ctrl_t ctrl, strlist_t tokens)
   else if (err)
     log_error ("error searching keyserver: %s\n", gpg_strerror (err));
 
-  /* switch(ret) */
-  /*   { */
-  /*   case KEYSERVER_SCHEME_NOT_FOUND: */
-  /*     log_error(_("no handler for keyserver scheme '%s'\n"), */
-  /*   	    opt.keyserver->scheme); */
-  /*     break; */
-
-  /*   case KEYSERVER_NOT_SUPPORTED: */
-  /*     log_error(_("action '%s' not supported with keyserver " */
-  /*   	      "scheme '%s'\n"), "search", opt.keyserver->scheme); */
-  /*     break; */
-
-  /*   case KEYSERVER_TIMEOUT: */
-  /*     log_error(_("keyserver timed out\n")); */
-  /*     break; */
-
-  /*   case KEYSERVER_INTERNAL_ERROR: */
-  /*   default: */
-  /*     log_error(_("keyserver internal error\n")); */
-  /*     break; */
-  /*   } */
-
-  /* return gpg_error (GPG_ERR_KEYSERVER); */
-
-
  leave:
   xfree (parm.desc);
   xfree (parm.searchstr_disp);
@@ -1718,13 +1478,8 @@ keyserver_get_chunk (ctrl_t ctrl, KEYDB_SEARCH_DESC *desc, int ndesc,
 
       if (!quiet && override_keyserver)
         {
-          if (override_keyserver->host)
-            log_info (_("requesting key %s from %s server %s\n"),
-                      keystr_from_desc (&desc[idx]),
-                      override_keyserver->scheme, override_keyserver->host);
-          else
-            log_info (_("requesting key %s from %s\n"),
-                      keystr_from_desc (&desc[idx]), override_keyserver->uri);
+          log_info (_("requesting key %s from %s\n"),
+                    keystr_from_desc (&desc[idx]), override_keyserver->uri);
         }
     }
 
@@ -1761,13 +1516,17 @@ keyserver_get_chunk (ctrl_t ctrl, KEYDB_SEARCH_DESC *desc, int ndesc,
          never accept or send them but we better protect against rogue
          keyservers. */
 
-      /* For LDAP servers we reset IMPORT_SELF_SIGS_ONLY unless it has
-       * been set explicitly.  */
+      /* For LDAP servers we reset IMPORT_SELF_SIGS_ONLY and
+       * IMPORT_CLEAN unless they have been set explicitly.  */
       options = (opt.keyserver_options.import_options | IMPORT_NO_SECKEY);
       if (source && (!strncmp (source, "ldap:", 5)
-                     || !strncmp (source, "ldaps:", 6))
-          && !opt.flags.expl_import_self_sigs_only)
-        options &= ~IMPORT_SELF_SIGS_ONLY;
+                     || !strncmp (source, "ldaps:", 6)))
+        {
+          if (!opt.flags.expl_import_self_sigs_only)
+            options &= ~IMPORT_SELF_SIGS_ONLY;
+          if (!opt.flags.expl_import_clean)
+            options &= ~IMPORT_CLEAN;
+        }
 
       screenerarg.desc = desc;
       screenerarg.ndesc = *r_ndesc_used;
@@ -1889,6 +1648,8 @@ keyserver_fetch (ctrl_t ctrl, strlist_t urilist, int origin)
   strlist_t sl;
   estream_t datastream;
   unsigned int save_options = opt.keyserver_options.import_options;
+  int any_success = 0;
+  gpg_error_t firsterr = 0;
 
   /* Switch on fast-import, since fetch can handle more than one
      import and we don't want each set to rebuild the trustdb.
@@ -1912,13 +1673,25 @@ keyserver_fetch (ctrl_t ctrl, strlist_t urilist, int origin)
 
           import_print_stats (stats_handle);
           import_release_stats_handle (stats_handle);
+          any_success = 1;
         }
       else
-        log_info (_("WARNING: unable to fetch URI %s: %s\n"),
-                  sl->d, gpg_strerror (err));
+        {
+          log_info (_("WARNING: unable to fetch URI %s: %s\n"),
+                    sl->d, gpg_strerror (err));
+          if (!firsterr)
+            firsterr = err;
+        }
       es_fclose (datastream);
     }
 
+  if (!urilist)
+    err = gpg_error (GPG_ERR_NO_NAME);
+  else if (any_success)
+    err = 0;
+  else
+    err = firsterr;
+
   opt.keyserver_options.import_options = save_options;
 
   /* If the original options didn't have fast import, and the trustdb
@@ -1926,7 +1699,7 @@ keyserver_fetch (ctrl_t ctrl, strlist_t urilist, int origin)
   if (!(opt.keyserver_options.import_options&IMPORT_FAST))
     check_or_update_trustdb (ctrl);
 
-  return 0;
+  return err;
 }
 
 
diff --git a/g10/mainproc.c b/g10/mainproc.c
index 10cc697..1ee5b9a 100644
--- a/g10/mainproc.c
+++ b/g10/mainproc.c
@@ -408,7 +408,8 @@ proc_symkey_enc (CTX c, PACKET *pkt)
         }
       else
         {
-          c->dek = passphrase_to_dek (algo, &enc->s2k, 0, 0, NULL, NULL);
+          c->dek = passphrase_to_dek (algo, &enc->s2k, 0, 0, NULL,
+                                      GETPASSWORD_FLAG_SYMDECRYPT, NULL);
           if (c->dek)
             {
               c->dek->symmetric = 1;
@@ -588,8 +589,8 @@ proc_encrypted (CTX c, PACKET *pkt)
           struct pubkey_enc_list *list;
 
           for (list = c->pkenc_list; list; list = list->next)
-            if (list->result && list->result != -1)
-              {
+            if (list->result)
+              { /* Key was not tried or it caused an error.  */
                 char buf[20];
                 snprintf (buf, sizeof buf, "%08lX%08lX",
                           (ulong)list->keyid[0], (ulong)list->keyid[1]);
@@ -663,7 +664,8 @@ proc_encrypted (CTX c, PACKET *pkt)
               log_info (_("assuming %s encrypted data\n"), "IDEA");
             }
 
-          c->dek = passphrase_to_dek (algo, s2k, 0, 0, NULL, &canceled);
+          c->dek = passphrase_to_dek (algo, s2k, 0, 0, NULL,
+                                      GETPASSWORD_FLAG_SYMDECRYPT, &canceled);
           if (c->dek)
             c->dek->algo_info_printed = 1;
           else if (canceled)
diff --git a/g10/openfile.c b/g10/openfile.c
index 12a232a..5ca168a 100644
--- a/g10/openfile.c
+++ b/g10/openfile.c
@@ -64,7 +64,7 @@ overwrite_filep( const char *fname )
   if ( iobuf_is_pipe_filename (fname) )
     return 1; /* Writing to stdout is always okay.  */
 
-  if ( access( fname, F_OK ) )
+  if ( gnupg_access( fname, F_OK ) )
     return 1; /* Does not exist.  */
 
   if ( !compare_filenames (fname, NAME_OF_DEV_NULL) )
diff --git a/g10/options.h b/g10/options.h
index fca23cb..761d958 100644
--- a/g10/options.h
+++ b/g10/options.h
@@ -31,9 +31,14 @@
 #include "../common/compliance.h"
 
 
-/* Declaration of a keyserver spec type.  The definition is found in
-   ../common/keyserver.h.  */
-struct keyserver_spec;
+/* Object to hold information pertaining to a keyserver; it also
+   allows building a list of keyservers.  For historic reasons this is
+   not a strlist_t.  */
+struct keyserver_spec
+{
+  struct keyserver_spec *next;
+  char *uri;
+};
 typedef struct keyserver_spec *keyserver_spec_t;
 
 
@@ -259,6 +264,9 @@ struct
     /* The next flag is set internally iff IMPORT_SELF_SIGS_ONLY has
      * been set by the user and is not the default value.  */
     unsigned int expl_import_self_sigs_only:1;
+    /* The next flag is set internally iff IMPORT_CLEAN has
+     * been set by the user and is not the default value.  */
+    unsigned int expl_import_clean:1;
   } flags;
 
   /* Linked list of ways to find a key if the key isn't on the local
diff --git a/g10/passphrase.c b/g10/passphrase.c
index 50bb0e1..1793efc 100644
--- a/g10/passphrase.c
+++ b/g10/passphrase.c
@@ -171,15 +171,18 @@ read_passphrase_from_fd( int fd )
  * operation.  If CACHEID is not NULL, it will be used as the cacheID
  * for the gpg-agent; if is NULL and a key fingerprint can be
  * computed, this will be used as the cacheid.
+ *
+ * For FLAGS see passphrase_to_dek;
  */
 static char *
 passphrase_get (int newsymkey, int nocache, const char *cacheid, int repeat,
-                const char *tryagain_text, int *canceled)
+                const char *tryagain_text, unsigned int flags, int *canceled)
 {
   int rc;
   char *pw = NULL;
   char *orig_codeset;
   const char *my_cacheid;
+  const char *desc;
 
   if (canceled)
     *canceled = 0;
@@ -194,6 +197,11 @@ passphrase_get (int newsymkey, int nocache, const char *cacheid, int repeat,
   if (tryagain_text)
     tryagain_text = _(tryagain_text);
 
+  if ((flags & GETPASSWORD_FLAG_SYMDECRYPT))
+    desc = _("Please enter the passphrase for decryption.");
+  else
+    desc = _("Enter passphrase\n");
+
   /* Here we have:
    * REPEAT is set in create mode and if opt.passphrase_repeat is set.
    * (Thus it is not a clean indication that we want a new passphrase).
@@ -205,7 +213,7 @@ passphrase_get (int newsymkey, int nocache, const char *cacheid, int repeat,
    * for a full state analysis and thus this new parameter.
    */
   rc = agent_get_passphrase (my_cacheid, tryagain_text, NULL,
-                             _("Enter passphrase\n"),
+                             desc,
                              newsymkey, repeat, nocache, &pw);
 
   i18n_switchback (orig_codeset);
@@ -264,11 +272,15 @@ passphrase_clear_cache (const char *cacheid)
  * CANCELED is not NULL, sets it to true.
  *
  * If CREATE is true a new passphrase will be created.  If NOCACHE is
- * true the symmetric key caching will not be used.  */
+ * true the symmetric key caching will not be used.
+ * FLAG bits are:
+ *   GETPASSWORD_FLAG_SYMDECRYPT := for symmetric decryption
+ */
 DEK *
 passphrase_to_dek (int cipher_algo, STRING2KEY *s2k,
                    int create, int nocache,
-                   const char *tryagain_text, int *canceled)
+                   const char *tryagain_text, unsigned int flags,
+                   int *canceled)
 {
   char *pw = NULL;
   DEK *dek;
@@ -355,7 +367,7 @@ passphrase_to_dek (int cipher_algo, STRING2KEY *s2k,
       /* Divert to the gpg-agent. */
       pw = passphrase_get (create, create && nocache, s2k_cacheid,
                            create? opt.passphrase_repeat : 0,
-                           tryagain_text, canceled);
+                           tryagain_text, flags, canceled);
       if (*canceled)
         {
           xfree (pw);
diff --git a/g10/pkglue.c b/g10/pkglue.c
index cab007f..1e0191e 100644
--- a/g10/pkglue.c
+++ b/g10/pkglue.c
@@ -424,6 +424,11 @@ pk_encrypt (pubkey_algo_t algo, gcry_mpi_t *resarr, gcry_mpi_t data,
 
       /* Get the shared point and the ephemeral public key.  */
       shared = get_data_from_sexp (s_ciph, "s", &nshared);
+      if (!shared)
+        {
+          rc = gpg_error_from_syserror ();
+          goto leave;
+        }
       rc = sexp_extract_param_sos (s_ciph, "e", &public);
       gcry_sexp_release (s_ciph);
       s_ciph = NULL;
@@ -464,6 +469,7 @@ pk_encrypt (pubkey_algo_t algo, gcry_mpi_t *resarr, gcry_mpi_t data,
         resarr[1] = get_mpi_from_sexp (s_ciph, "b", GCRYMPI_FMT_USG);
     }
 
+ leave:
   gcry_sexp_release (s_ciph);
   return rc;
 }
diff --git a/g10/revoke.c b/g10/revoke.c
index c0a003b..d6cbf93 100644
--- a/g10/revoke.c
+++ b/g10/revoke.c
@@ -435,6 +435,7 @@ gen_desig_revoke (ctrl_t ctrl, const char *uname, strlist_t locusr)
 	iobuf_close(out);
     release_revocation_reason_info( reason );
     release_armor_context (afx);
+    keydb_release (kdbhd);
     return rc;
 }
 
@@ -804,7 +805,10 @@ ask_revocation_reason( int key_rev, int cert_rev, int hint )
 	    trim_spaces( answer );
 	    cpr_kill_prompt();
 	    if( *answer == 'q' || *answer == 'Q')
-	      return NULL; /* cancel */
+              {
+                xfree (answer);
+                return NULL; /* cancel */
+              }
 	    if( hint && !*answer )
 		n = hint;
 	    else if(!digitp( answer ) )
diff --git a/g10/sign.c b/g10/sign.c
index 80e6ce2..ea3de62 100644
--- a/g10/sign.c
+++ b/g10/sign.c
@@ -1504,7 +1504,7 @@ clearsign_file (ctrl_t ctrl,
   push_armor_filter (afx, out);
 
   /* Prepare EXTRAHASH, so that it can be used for v5 signature.  */
-  extrahash = xtrymalloc (sizeof extrahash);
+  extrahash = xtrymalloc (sizeof *extrahash);
   if (!extrahash)
     {
       rc = gpg_error_from_syserror ();
@@ -1605,7 +1605,7 @@ sign_symencrypt_file (ctrl_t ctrl, const char *fname, strlist_t locusr)
   s2k->hash_algo = S2K_DIGEST_ALGO;
 
   algo = default_cipher_algo ();
-  cfx.dek = passphrase_to_dek (algo, s2k, 1, 1, NULL, &canceled);
+  cfx.dek = passphrase_to_dek (algo, s2k, 1, 1, NULL, 0, &canceled);
 
   if (!cfx.dek || !cfx.dek->keylen)
     {
diff --git a/g10/skclist.c b/g10/skclist.c
index c9f7d12..f9647cc 100644
--- a/g10/skclist.c
+++ b/g10/skclist.c
@@ -31,6 +31,7 @@
 #include "keydb.h"
 #include "../common/util.h"
 #include "../common/i18n.h"
+#include "keyserver-internal.h"
 #include "call-agent.h"
 
 
@@ -322,11 +323,13 @@ enum_secret_keys (ctrl_t ctrl, void **context, PKT_public_key *sk)
 {
   gpg_error_t err = 0;
   const char *name;
+  int cardkey;
   kbnode_t keyblock;
   struct
   {
     int eof;
     int state;
+    int cardkey_done;
     strlist_t sl;
     keypair_info_t card_keyinfo;
     keypair_info_t card_keyinfo_list;
@@ -381,6 +384,7 @@ enum_secret_keys (ctrl_t ctrl, void **context, PKT_public_key *sk)
           do
             {
               name = NULL;
+              cardkey = 0;
               keyblock = NULL;
               switch (c->state)
                 {
@@ -431,6 +435,7 @@ enum_secret_keys (ctrl_t ctrl, void **context, PKT_public_key *sk)
                         c->fpr2[i] = *s;
                       c->fpr2[i] = 0;
                       name = c->fpr2;
+                      cardkey = 1;
 
                       c->card_keyinfo = c->card_keyinfo->next;
                     }
@@ -482,11 +487,47 @@ enum_secret_keys (ctrl_t ctrl, void **context, PKT_public_key *sk)
               err = getkey_byname (ctrl, NULL, NULL, name, 1, &c->keyblock);
               if (err)
                 {
+                  struct agent_card_info_s cinfo = { 0 };
+
                   /* getkey_byname might return a keyblock even in the
                      error case - I have not checked.  Thus better release
                      it.  */
                   release_kbnode (c->keyblock);
                   c->keyblock = NULL;
+                  /* If this was a card key we might not yet have the
+                   * public key for it.  Thus check whether the card
+                   * can return the fingerprint of the encryption key
+                   * and we can then find the public key via LDAP.  */
+                  if (cardkey && !c->cardkey_done
+                      && gpg_err_code (err) == GPG_ERR_NO_SECKEY
+                      && !agent_scd_getattr ("KEY-FPR", &cinfo)
+                      && cinfo.fpr2len)
+                    {
+                      /* Note that this code does not handle the case
+                       * for two readers having both openpgp
+                       * encryption keys. only one will be tried.  */
+                      c->cardkey_done = 1;
+                      if (opt.debug)
+                        log_debug ("using LDAP to find public key"
+                                   " for current card\n");
+                      if (!keyserver_import_fprint
+                          (ctrl, cinfo.fpr2, cinfo.fpr2len, opt.keyserver,
+                           KEYSERVER_IMPORT_FLAG_LDAP))
+                        {
+                          char fpr_string[MAX_FINGERPRINT_LEN * 2 + 1];
+
+                          bin2hex (cinfo.fpr2, cinfo.fpr2len, fpr_string);
+                          err = getkey_byname (ctrl, NULL, NULL, fpr_string, 1,
+                                               &c->keyblock);
+                          if (err)
+                            {
+                              release_kbnode (c->keyblock);
+                              c->keyblock = NULL;
+                            }
+                          else
+                            c->node = c->keyblock;
+                        }
+                    }
                 }
               else
                 c->node = c->keyblock;
diff --git a/g10/test-stubs.c b/g10/test-stubs.c
index 174af82..4838d20 100644
--- a/g10/test-stubs.c
+++ b/g10/test-stubs.c
@@ -202,6 +202,16 @@ keyserver_import_fprint (ctrl_t ctrl, const byte *fprint,size_t fprint_len,
 }
 
 int
+keyserver_import_fprint_ntds (ctrl_t ctrl,
+                              const byte *fprint, size_t fprint_len)
+{
+  (void)ctrl;
+  (void)fprint;
+  (void)fprint_len;
+  return -1;
+}
+
+int
 keyserver_import_cert (const char *name)
 {
   (void)name;
@@ -221,7 +231,7 @@ keyserver_import_wkd (ctrl_t ctrl, const char *name, unsigned int flags,
 }
 
 int
-keyserver_import_name (const char *name,struct keyserver_spec *spec)
+keyserver_import_mbox (const char *name,struct keyserver_spec *spec)
 {
   (void)name;
   (void)spec;
@@ -326,13 +336,14 @@ check_secret_key (PKT_public_key *pk, int n)
  */
 DEK *
 passphrase_to_dek (int cipher_algo, STRING2KEY *s2k, int create, int nocache,
-                   const char *tmp, int *canceled)
+                   const char *tmp, unsigned int flags, int *canceled)
 {
   (void)cipher_algo;
   (void)s2k;
   (void)create;
   (void)nocache;
   (void)tmp;
+  (void)flags;
 
   if (canceled)
     *canceled = 0;
diff --git a/g10/tofu.c b/g10/tofu.c
index f490838..83786a0 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -1687,6 +1687,8 @@ ask_about_binding (ctrl_t ctrl,
          GPGSQL_ARG_END);
       if (rc)
         {
+          sqlite3_free (sqerr);
+          sqerr = NULL;
           rc = gpg_error (GPG_ERR_GENERAL);
           break;
         }
@@ -1972,6 +1974,7 @@ ask_about_binding (ctrl_t ctrl,
       else if (!response[0])
         /* Default to unknown.  Don't save it.  */
         {
+          xfree (response);
           tty_printf (_("Defaulting to unknown.\n"));
           *policy = TOFU_POLICY_UNKNOWN;
           break;
@@ -1983,6 +1986,7 @@ ask_about_binding (ctrl_t ctrl,
           if (choice)
             {
               int c = ((size_t) choice - (size_t) choices) / 2;
+              xfree (response);
 
               switch (c)
                 {
diff --git a/g10/trust.c b/g10/trust.c
index bd1c894..67cb102 100644
--- a/g10/trust.c
+++ b/g10/trust.c
@@ -50,17 +50,6 @@ cache_disabled_value (ctrl_t ctrl, PKT_public_key *pk)
 
 
 void
-register_trusted_keyid (u32 *keyid)
-{
-#ifdef NO_TRUST_MODELS
-  (void)keyid;
-#else
-  tdb_register_trusted_keyid (keyid);
-#endif
-}
-
-
-void
 register_trusted_key (const char *string)
 {
 #ifdef NO_TRUST_MODELS
diff --git a/g10/trustdb.c b/g10/trustdb.c
index a313a42..bf74c98 100644
--- a/g10/trustdb.c
+++ b/g10/trustdb.c
@@ -232,7 +232,7 @@ release_key_array ( struct key_array *keys )
  * before initializing the validation module.
  * FIXME: Should be replaced by a function to add those keys to the trustdb.
  */
-void
+static void
 tdb_register_trusted_keyid (u32 *keyid)
 {
   struct key_item *k;
@@ -257,21 +257,21 @@ tdb_register_trusted_key (const char *string)
     {
       if (desc.mode == KEYDB_SEARCH_MODE_LONG_KID)
         {
-          register_trusted_keyid (desc.u.kid);
+          tdb_register_trusted_keyid (desc.u.kid);
           return;
         }
       if (desc.mode == KEYDB_SEARCH_MODE_FPR && desc.fprlen == 20)
         {
           kid[0] = buf32_to_u32 (desc.u.fpr+12);
           kid[1] = buf32_to_u32 (desc.u.fpr+16);
-          register_trusted_keyid (kid);
+          tdb_register_trusted_keyid (kid);
           return;
         }
       if (desc.mode == KEYDB_SEARCH_MODE_FPR && desc.fprlen == 32)
         {
           kid[0] = buf32_to_u32 (desc.u.fpr);
           kid[1] = buf32_to_u32 (desc.u.fpr+4);
-          register_trusted_keyid (kid);
+          tdb_register_trusted_keyid (kid);
           return;
         }
     }
@@ -340,7 +340,7 @@ verify_own_keys (ctrl_t ctrl)
           PKT_public_key pk;
 
           memset (&pk, 0, sizeof pk);
-          rc = get_pubkey (ctrl, &pk, k->kid);
+          rc = get_pubkey_with_ldap_fallback (ctrl, &pk, k->kid);
           if (rc)
 	    log_info(_("key %s: no public key for trusted key - skipped\n"),
 		     keystr(k->kid));
@@ -479,7 +479,7 @@ how_to_fix_the_trustdb ()
     name = "trustdb.gpg";
 
   log_info (_("You may try to re-create the trustdb using the commands:\n"));
-  log_info ("  cd %s\n", default_homedir ());
+  log_info ("  cd %s\n", gnupg_homedir ());
   log_info ("  %s --export-ownertrust > otrust.tmp\n", GPG_NAME);
 #ifdef HAVE_W32_SYSTEM
   log_info ("  del %s\n", name);
@@ -1430,6 +1430,7 @@ ask_ownertrust (ctrl_t ctrl, u32 *kid, int minimum)
     {
       log_error (_("public key %s not found: %s\n"),
                  keystr(kid), gpg_strerror (rc) );
+      free_public_key (pk);
       return TRUST_UNKNOWN;
     }
 
diff --git a/g10/trustdb.h b/g10/trustdb.h
index d52fc53..6c7fd6c 100644
--- a/g10/trustdb.h
+++ b/g10/trustdb.h
@@ -48,7 +48,6 @@
 
 /*-- trust.c --*/
 int cache_disabled_value (ctrl_t ctrl, PKT_public_key *pk);
-void register_trusted_keyid (u32 *keyid);
 void register_trusted_key (const char *string);
 
 const char *trust_value_to_string (unsigned int value);
@@ -75,7 +74,6 @@ const char *get_validity_string (ctrl_t ctrl,
 
 
 /*-- trustdb.c --*/
-void tdb_register_trusted_keyid (u32 *keyid);
 void tdb_register_trusted_key (const char *string);
 /* Returns whether KID is on the list of ultimately trusted keys.  */
 int tdb_keyid_is_utk (u32 *kid);
diff --git a/kbx/backend-sqlite.c b/kbx/backend-sqlite.c
index ae2530d..202897e 100644
--- a/kbx/backend-sqlite.c
+++ b/kbx/backend-sqlite.c
@@ -839,6 +839,8 @@ run_select_statement (ctrl_t ctrl, be_sqlite_local_t ctx,
   unsigned int descidx;
   const char *extra = NULL;
   unsigned char kidbuf[8];
+  const char *s;
+  size_t n;
 
 
   descidx = ctx->descidx;
@@ -916,7 +918,20 @@ run_select_statement (ctrl_t ctrl, be_sqlite_local_t ctx,
                                " WHERE p.ubid = u.ubid AND u.addrspec = ?1",
                                extra, " ORDER BY p.ubid", &ctx->select_stmt);
       if (!err)
-        err = run_sql_bind_text (ctx->select_stmt, 1, desc[descidx].u.name);
+        {
+          s = desc[descidx].u.name;
+          if (s && *s == '<' && s[1])
+            { /* It is common that the indicator for exact addrspec
+               * search has not been removed.  We do this here.  */
+              s++;
+              n = strlen (s);
+              if (n > 1 && s[n-1] == '>')
+                n--;
+            }
+          else
+            n = s? strlen (s):0;
+          err = run_sql_bind_ntext (ctx->select_stmt, 1, s, n);
+        }
       break;
 
     case KEYDB_SEARCH_MODE_MAILSUB:
diff --git a/kbx/frontend.c b/kbx/frontend.c
index c80c9fa..9cb9f14 100644
--- a/kbx/frontend.c
+++ b/kbx/frontend.c
@@ -188,6 +188,73 @@ kbxd_commit (void)
 
 
 
+static void
+dump_search_desc (struct keydb_search_desc *desc)
+{
+  switch (desc->mode)
+    {
+    case KEYDB_SEARCH_MODE_EXACT:
+      log_printf ("EXACT: '%s'\n", desc->u.name);
+      break;
+    case KEYDB_SEARCH_MODE_SUBSTR:
+      log_printf ("SUBSTR: '%s'\n", desc->u.name);
+      break;
+    case KEYDB_SEARCH_MODE_MAIL:
+      log_printf ("MAIL: '%s'\n", desc->u.name);
+      break;
+    case KEYDB_SEARCH_MODE_MAILSUB:
+      log_printf ("MAILSUB: '%s'\n", desc->u.name);
+      break;
+    case KEYDB_SEARCH_MODE_MAILEND:
+      log_printf ("MAILEND: '%s'\n", desc->u.name);
+      break;
+    case KEYDB_SEARCH_MODE_WORDS:
+      log_printf ("WORDS: '%s'\n", desc->u.name);
+      break;
+    case KEYDB_SEARCH_MODE_SHORT_KID:
+      log_printf ("SHORT_KID: 0x%08lX\n", (ulong)desc->u.kid[1]);
+      break;
+    case KEYDB_SEARCH_MODE_LONG_KID:
+      log_printf ("LONG_KID: 0x%08lX%08lX\n",
+                  (ulong)desc->u.kid[0], (ulong)desc->u.kid[1]);
+      break;
+    case KEYDB_SEARCH_MODE_FPR:
+      log_printf ("FPR%02d: ", desc->fprlen);
+      log_printhex (desc->u.fpr, desc->fprlen, "");
+      break;
+    case KEYDB_SEARCH_MODE_ISSUER:
+      log_printf ("ISSUER: '%s'\n", desc->u.name);
+      break;
+    case KEYDB_SEARCH_MODE_ISSUER_SN:
+      log_printf ("ISSUER_SN: '#%.*s/%s'\n",
+                  (int)desc->snlen, desc->sn, desc->u.name);
+      break;
+    case KEYDB_SEARCH_MODE_SN:
+      log_printf ("SN: '%.*s'\n", (int)desc->snlen, desc->sn);
+      break;
+    case KEYDB_SEARCH_MODE_SUBJECT:
+      log_printf ("SUBJECT: '%s'\n", desc->u.name);
+      break;
+    case KEYDB_SEARCH_MODE_KEYGRIP:
+      log_printf ("KEYGRIP: ");
+      log_printhex (desc[0].u.grip, KEYGRIP_LEN, "");
+      break;
+    case KEYDB_SEARCH_MODE_UBID:
+      log_printf ("UBID: ");
+      log_printhex (desc[0].u.ubid, UBID_LEN, "");
+      break;
+    case KEYDB_SEARCH_MODE_FIRST:
+      log_printf ("FIRST\n");
+      break;
+    case KEYDB_SEARCH_MODE_NEXT:
+      log_printf ("NEXT\n");
+      break;
+    default:
+      log_printf ("Bad search mode (%d)\n", desc->mode);
+    }
+}
+
+
 /* Search for the keys described by (DESC,NDESC) and return them to
  * the caller.  If RESET is set, the search state is first reset.
  * Only a reset guarantees that changed search description in DESC are
@@ -208,9 +275,8 @@ kbxd_search (ctrl_t ctrl, KEYDB_SEARCH_DESC *desc, unsigned int ndesc,
       log_debug ("%s: %u search descriptions:\n", __func__, ndesc);
       for (i = 0; i < ndesc; i ++)
         {
-          /* char *t = keydb_search_desc_dump (&desc[i]); */
-          /* log_debug ("%s   %d: %s\n", __func__, i, t); */
-          /* xfree (t); */
+          log_debug ("%s   %d: ", __func__, i);
+          dump_search_desc (&desc[i]);
         }
     }
 
diff --git a/kbx/kbx-client-util.c b/kbx/kbx-client-util.c
index bd71cf2..f9d06fa 100644
--- a/kbx/kbx-client-util.c
+++ b/kbx/kbx-client-util.c
@@ -176,7 +176,8 @@ datastream_thread (void *arg)
   int rc;
   unsigned char lenbuf[4];
   size_t nread, datalen;
-  char *data, *tmpdata;
+  char *data = NULL;
+  char *tmpdata;
 
   /* log_debug ("%s: started\n", __func__); */
   while (kcd->fp)
diff --git a/kbx/kbxserver.c b/kbx/kbxserver.c
index 8a75035..1949e62 100644
--- a/kbx/kbxserver.c
+++ b/kbx/kbxserver.c
@@ -46,6 +46,13 @@
                         /**/: gpg_error (e))
 
 
+/* Helper to provide packing memory for search descriptions.  */
+struct search_backing_store_s
+{
+  unsigned char *sn;
+  char *name;
+};
+
 
 /* Control structure per connection. */
 struct server_local_s
@@ -84,10 +91,13 @@ struct server_local_s
    * cmd_search.  If more than one pattern is required, cmd_search
    * also allocates and sets multi_search_desc and
    * multi_search_desc_len.  If a search description has ever been
-   * allocated the allocated size is stored at
-   * multi_search_desc_size.  */
+   * allocated the allocated size is stored at multi_search_desc_size.
+   * multi_search_store is allocated at the same size as
+   * multi_search_desc and used to provde backing store for the SN and
+   * NAME elements of KEYBOX_SEARCH_DESC.  */
   KEYBOX_SEARCH_DESC search_desc;
   KEYBOX_SEARCH_DESC *multi_search_desc;
+  struct search_backing_store_s *multi_search_store;
   unsigned int multi_search_desc_size;
   unsigned int multi_search_desc_len;
 
@@ -336,7 +346,7 @@ cmd_search (assuan_context_t ctx, char *line)
     }
   else
     {
-      err = classify_user_id (line, &ctrl->server_local->search_desc, 0);
+      err = classify_user_id (line, &ctrl->server_local->search_desc, 1);
       if (err)
         goto leave;
     }
@@ -345,6 +355,9 @@ cmd_search (assuan_context_t ctx, char *line)
     {
       /* More pattern are expected - store the current one and return
        * success.  */
+      KEYBOX_SEARCH_DESC *desc;
+      struct search_backing_store_s *store;
+
       if (!ctrl->server_local->multi_search_desc_size)
         {
           n = 10;
@@ -355,13 +368,21 @@ cmd_search (assuan_context_t ctx, char *line)
               err = gpg_error_from_syserror ();
               goto leave;
             }
+          ctrl->server_local->multi_search_store
+            = xtrycalloc (n, sizeof *ctrl->server_local->multi_search_store);
+          if (!ctrl->server_local->multi_search_store)
+            {
+              err = gpg_error_from_syserror ();
+              xfree (ctrl->server_local->multi_search_desc);
+              ctrl->server_local->multi_search_desc = NULL;
+              goto leave;
+            }
           ctrl->server_local->multi_search_desc_size = n;
         }
 
       if (ctrl->server_local->multi_search_desc_len
           == ctrl->server_local->multi_search_desc_size)
         {
-          KEYBOX_SEARCH_DESC *desc;
           n = ctrl->server_local->multi_search_desc_size + 10;
           desc = xtrycalloc (n, sizeof *desc);
           if (!desc)
@@ -369,20 +390,62 @@ cmd_search (assuan_context_t ctx, char *line)
               err = gpg_error_from_syserror ();
               goto leave;
             }
+          store = xtrycalloc (n, sizeof *store);
+          if (!desc)
+            {
+              err = gpg_error_from_syserror ();
+              xfree (desc);
+              goto leave;
+            }
           for (k=0; k < ctrl->server_local->multi_search_desc_size; k++)
-            desc[k] = ctrl->server_local->multi_search_desc[k];
+            {
+              desc[k] = ctrl->server_local->multi_search_desc[k];
+              store[k] = ctrl->server_local->multi_search_store[k];
+            }
           xfree (ctrl->server_local->multi_search_desc);
+          xfree (ctrl->server_local->multi_search_store);
           ctrl->server_local->multi_search_desc = desc;
+          ctrl->server_local->multi_search_store = store;
           ctrl->server_local->multi_search_desc_size = n;
         }
-      /* Actually store.  */
-      ctrl->server_local->multi_search_desc
-        [ctrl->server_local->multi_search_desc_len++]
-        = ctrl->server_local->search_desc;
+      /* Actually store. We need to fix up the const pointers by
+       * copies from our backing store.  */
+      desc = &(ctrl->server_local->multi_search_desc
+               [ctrl->server_local->multi_search_desc_len]);
+      store = &(ctrl->server_local->multi_search_store
+                [ctrl->server_local->multi_search_desc_len]);
+      *desc = ctrl->server_local->search_desc;
+      if (ctrl->server_local->search_desc.sn)
+        {
+          xfree (store->sn);
+          store->sn = xtrymalloc (ctrl->server_local->search_desc.snlen);
+          if (!store->sn)
+            {
+              err = gpg_error_from_syserror ();
+              goto leave;
+            }
+          memcpy (store->sn, ctrl->server_local->search_desc.sn,
+                  ctrl->server_local->search_desc.snlen);
+          desc->sn = store->sn;
+        }
+      if (ctrl->server_local->search_desc.name_used)
+        {
+          xfree (store->name);
+          store->name = xtrystrdup (ctrl->server_local->search_desc.u.name);
+          if (!store->name)
+            {
+              err = gpg_error_from_syserror ();
+              xfree (store->sn);
+              store->sn = NULL;
+              goto leave;
+            }
+          desc->u.name = store->name;
+        }
+      ctrl->server_local->multi_search_desc_len++;
 
       if (opt_more)
         {
-          /* We need to be called aagain with more pattern.  */
+          /* We need to be called again with more pattern.  */
           ctrl->server_local->search_expecting_more = 1;
           goto leave;
         }
@@ -456,7 +519,7 @@ cmd_next (assuan_context_t ctx, char *line)
     ;
   else if (ctrl->server_local->multi_search_desc_len)
     {
-      /* The next condition should never be tru but we better handle
+      /* The next condition should never be true but we better handle
        * the first/next transition anyway.  */
       if (ctrl->server_local->multi_search_desc[0].mode
           == KEYDB_SEARCH_MODE_FIRST)
@@ -844,7 +907,6 @@ kbxd_start_command_handler (ctrl_t ctrl, gnupg_fd_t fd, unsigned int session_id)
     {
       log_error (_("can't allocate control structure: %s\n"),
                  gpg_strerror (gpg_error_from_syserror ()));
-      xfree (ctrl);
       return;
     }
   ctrl->server_local->client_pid = ASSUAN_INVALID_PID;
@@ -994,6 +1056,17 @@ kbxd_start_command_handler (ctrl_t ctrl, gnupg_fd_t fd, unsigned int session_id)
         }
 
       xfree (ctrl->server_local->multi_search_desc);
+      if (ctrl->server_local->multi_search_store)
+        {
+          size_t nn;
+
+          for (nn=0; nn < ctrl->server_local->multi_search_desc_size; nn++)
+            {
+              xfree (ctrl->server_local->multi_search_store[nn].sn);
+              xfree (ctrl->server_local->multi_search_store[nn].name);
+            }
+          xfree (ctrl->server_local->multi_search_store);
+        }
       xfree (ctrl->server_local);
       ctrl->server_local = NULL;
     }
diff --git a/kbx/keybox-dump.c b/kbx/keybox-dump.c
index 3e66b72..38608ce 100644
--- a/kbx/keybox-dump.c
+++ b/kbx/keybox-dump.c
@@ -881,7 +881,7 @@ _keybox_dump_cut_records (const char *filename, unsigned long from,
                           unsigned long to, FILE *outfp)
 {
   estream_t fp;
-  KEYBOXBLOB blob;
+  KEYBOXBLOB blob = NULL;
   int rc;
   unsigned long recno = 0;
 
@@ -902,6 +902,7 @@ _keybox_dump_cut_records (const char *filename, unsigned long from,
             }
         }
       _keybox_release_blob (blob);
+      blob = NULL;
       recno++;
     }
   if (rc == -1)
@@ -909,6 +910,7 @@ _keybox_dump_cut_records (const char *filename, unsigned long from,
   if (rc)
     fprintf (stderr, "error reading '%s': %s\n", filename, gpg_strerror (rc));
  leave:
+  _keybox_release_blob (blob);
   if (fp != es_stdin)
     es_fclose (fp);
   return rc;
diff --git a/kbx/keybox-search-desc.h b/kbx/keybox-search-desc.h
index 9a0df28..f312da9 100644
--- a/kbx/keybox-search-desc.h
+++ b/kbx/keybox-search-desc.h
@@ -83,6 +83,7 @@ struct keydb_search_desc
     unsigned char grip[KEYGRIP_LEN];
     unsigned char ubid[UBID_LEN];
   } u;
+  byte name_used;/* The union uses NAME.  */
   byte snhex;   /* SN above is a hexstring and not binary.  */
   byte fprlen;  /* Only used with KEYDB_SEARCH_MODE_FPR.  */
   int exact;    /* Use exactly this key ('!' suffix in gpg).  */
diff --git a/kbx/keyboxd.c b/kbx/keyboxd.c
index 76a0694..3f759e6 100644
--- a/kbx/keyboxd.c
+++ b/kbx/keyboxd.c
@@ -1795,7 +1795,10 @@ check_own_socket (void)
 
   err = npth_attr_init (&tattr);
   if (err)
-    return;
+    {
+      xfree (sockname);
+      return;
+    }
   npth_attr_setdetachstate (&tattr, NPTH_CREATE_DETACHED);
   err = npth_create (&thread, &tattr, check_own_socket_thread, sockname);
   if (err)
diff --git a/po/ca.po b/po/ca.po
index 9a856ba..147985c 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: 2021-04-20 12:38+0200\n"
+"POT-Creation-Date: 2021-08-24 18:50+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:328
+#: agent/call-pinentry.c:338
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "no s'ha pogut emmagatzemar l'empremta digital: %s\n"
@@ -47,49 +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:546
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_OK"
 msgstr ""
 
-#: agent/call-pinentry.c:547
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
-#: agent/call-pinentry.c:548
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|_Yes"
 msgstr ""
 
-#: agent/call-pinentry.c:549
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_No"
 msgstr ""
 
-#: agent/call-pinentry.c:550
+#: agent/call-pinentry.c:560
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:551
+#: agent/call-pinentry.c:561
 msgid "|pinentry-label|_Save in password manager"
 msgstr ""
 
-#: agent/call-pinentry.c:552
+#: agent/call-pinentry.c:562
 #, 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:554
+#: agent/call-pinentry.c:564
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:555
+#: agent/call-pinentry.c:565
 #, fuzzy
 #| msgid "invalid passphrase"
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "la contrasenya és invàlida"
 
+#: agent/call-pinentry.c:566
+msgid "Caps Lock is on"
+msgstr ""
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:944
+#: agent/call-pinentry.c:1022
 msgid "Suggest"
 msgstr ""
 
@@ -100,13 +104,25 @@ 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:966
+#: agent/call-pinentry.c:1044
 msgid "pinentry.genpin.tooltip"
 msgstr ""
 
+#: agent/call-pinentry.c:1072
+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
+#, 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:998
+#: agent/call-pinentry.c:1198
 msgid "Quality:"
 msgstr ""
 
@@ -116,107 +132,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:1019
+#: agent/call-pinentry.c:1219
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:1263
+#: agent/call-pinentry.c:1477
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:1266
+#: agent/call-pinentry.c:1480
 #, 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:1303 agent/call-pinentry.c:1506
+#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1303 agent/call-pinentry.c:1506
-#: agent/protect-tool.c:728
+#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/protect-tool.c:729
 #, fuzzy
 msgid "Passphrase:"
 msgstr "la contrasenya és errònia"
 
-#: agent/call-pinentry.c:1330 agent/call-pinentry.c:1580 agent/command.c:1799
-#: agent/command.c:1852 agent/command-ssh.c:3046 agent/genkey.c:398
+#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
+#: agent/command.c:1988 agent/command-ssh.c:3046 agent/genkey.c:442
 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:1351 agent/call-pinentry.c:1603
+#: agent/call-pinentry.c:1566 agent/call-pinentry.c:1830
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:1362 agent/call-pinentry.c:1614
+#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
 msgid "Repeat:"
 msgstr ""
 
-#: agent/call-pinentry.c:1372 agent/call-pinentry.c:1384
-#: agent/call-pinentry.c:1624 agent/call-pinentry.c:1636
+#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
+#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
 #, fuzzy
 msgid "PIN too long"
 msgstr "la línia és massa llarga\n"
 
-#: agent/call-pinentry.c:1373 agent/call-pinentry.c:1625
+#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "la contrasenya és massa llarga\n"
 
-#: agent/call-pinentry.c:1381 agent/call-pinentry.c:1633
+#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Hi ha un caràcter invàlid en el camp *nom*\n"
 
-#: agent/call-pinentry.c:1386 agent/call-pinentry.c:1638
+#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:1405 agent/call-pinentry.c:1656
+#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
 #, fuzzy
 msgid "Bad PIN"
 msgstr "l'MPI és erroni"
 
-#: agent/call-pinentry.c:1405 agent/call-pinentry.c:1656
+#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "la contrasenya és errònia"
 
-#: agent/command.c:697
+#: agent/command.c:823
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:698
+#: agent/command.c:824
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1106 g10/card-util.c:708 g10/card-util.c:729
+#: agent/command.c:1235 g10/card-util.c:713 g10/card-util.c:734
 #, 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:1634 agent/command.c:1791 agent/command-ssh.c:2974
-#: agent/genkey.c:333
+#: agent/command.c:1756 agent/command.c:1921 agent/command-ssh.c:2974
+#: agent/genkey.c:377
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "canvia la contrasenya"
 
-#: agent/command.c:2567
+#: agent/command.c:2703
 #, 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:2697
+#: agent/command.c:2833
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -227,26 +243,26 @@ msgstr ""
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "l'algoritme de protecció %d%s no està suportat\n"
 
-#: agent/command-ssh.c:872 common/dotlock.c:852 g10/card-util.c:953
-#: g10/export.c:1329 g10/gpg.c:1431 g10/keygen.c:5347 g10/keyring.c:1319
-#: g10/keyring.c:1632 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
+#: agent/command-ssh.c:872 common/dotlock.c:852 g10/card-util.c:963
+#: g10/export.c:1329 g10/gpg.c:1431 g10/keygen.c:5377 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
 #: g10/sign.c:1106 g10/sign.c:1443 g10/tdbio.c:753 tools/gpg-card.c:479
 #, fuzzy, c-format
 #| msgid "can't create `%s': %s\n"
 msgid "can't create '%s': %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: agent/command-ssh.c:884 common/helpfile.c:57 g10/card-util.c:910
+#: agent/command-ssh.c:884 common/helpfile.c:57 g10/card-util.c:920
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
 #: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:721 g10/gpg.c:1432
-#: g10/import.c:371 g10/import.c:558 g10/import.c:793 g10/keygen.c:4322
-#: g10/keyring.c:1658 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
+#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4326
+#: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
 #: g10/plaintext.c:610 g10/sign.c:1086 g10/sign.c:1311 g10/sign.c:1424
 #: g10/sign.c:1596 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2380
-#: sm/gpgsm.c:2410 sm/gpgsm.c:2448 sm/keylist.c:1737 sm/qualified.c:65
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2236
+#: sm/gpgsm.c:2266 sm/gpgsm.c:2304 sm/keylist.c:1775 sm/qualified.c:65
 #: dirmngr/certcache.c:396 dirmngr/certcache.c:476 dirmngr/certcache.c:478
-#: dirmngr/crlcache.c:2588 dirmngr/dirmngr.c:1720 tools/gpg-card.c:408
+#: dirmngr/crlcache.c:2591 dirmngr/dirmngr.c:1759 tools/gpg-card.c:408
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
@@ -358,39 +374,39 @@ msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:109 sm/certreqgen-ui.c:433
+#: 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:116
+#: agent/genkey.c:150
 #, fuzzy, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "%s: error en escriure el registre de directoris: %s\n"
 
-#: agent/genkey.c:154
+#: agent/genkey.c:191
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Introduïu la contrasenya\n"
 
-#: agent/genkey.c:184
+#: agent/genkey.c:227
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:186
+#: agent/genkey.c:229
 #, 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:198
+#: agent/genkey.c:241
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:215
+#: agent/genkey.c:258
 #, fuzzy, c-format
 #| msgid "Name must be at least 5 characters long\n"
 msgid "A passphrase should be at least %u character long."
@@ -398,7 +414,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:234
+#: agent/genkey.c:277
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -406,394 +422,393 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:260
+#: agent/genkey.c:304
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:275
+#: agent/genkey.c:319
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
-#: agent/genkey.c:296
+#: agent/genkey.c:340
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "Voleu usar de tota manera aquesta clau?"
 
-#: agent/genkey.c:464
+#: agent/genkey.c:508
 #, 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:590
+#: agent/genkey.c:637
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "canvia la contrasenya"
 
-#: agent/gpg-agent.c:162 scd/scdaemon.c:115 dirmngr/dirmngr.c:182
+#: agent/gpg-agent.c:164 scd/scdaemon.c:115 dirmngr/dirmngr.c:183
 msgid "Options used for startup"
 msgstr ""
 
-#: agent/gpg-agent.c:164 scd/scdaemon.c:120 dirmngr/dirmngr.c:171
+#: agent/gpg-agent.c:166 scd/scdaemon.c:120 dirmngr/dirmngr.c:172
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:117 dirmngr/dirmngr.c:170
+#: agent/gpg-agent.c:167 scd/scdaemon.c:117 dirmngr/dirmngr.c:171
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:167 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:169 dirmngr/dirmngr.c:174
 #, fuzzy
 #| msgid "Key is superseded"
 msgid "run in supervised mode"
 msgstr "La clau ha estat substituïda"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:121 dirmngr/dirmngr.c:184
+#: agent/gpg-agent.c:171 scd/scdaemon.c:121 dirmngr/dirmngr.c:185
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:170 scd/scdaemon.c:122 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:172 scd/scdaemon.c:122 dirmngr/dirmngr.c:186
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:171 scd/scdaemon.c:123 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:173 scd/scdaemon.c:123 dirmngr/dirmngr.c:187
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:179 g10/gpg.c:589 scd/scdaemon.c:125 sm/gpgsm.c:422
-#: dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:181 g10/gpg.c:589 scd/scdaemon.c:125 sm/gpgsm.c:423
+#: dirmngr/dirmngr.c:189
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FITXER|carrega el mòdul d'extensió especificat"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:574 scd/scdaemon.c:129 sm/gpgsm.c:265
-#: dirmngr/dirmngr.c:192
+#: agent/gpg-agent.c:185 g10/gpg.c:574 scd/scdaemon.c:129 sm/gpgsm.c:265
+#: dirmngr/dirmngr.c:193
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
 # Un dels dos és en la llista d'opcions amb --help. Urgh. jm
-#: agent/gpg-agent.c:185 g10/gpg.c:576 g10/gpgv.c:78 kbx/kbxutil.c:89
+#: agent/gpg-agent.c:187 g10/gpg.c:576 g10/gpgv.c:78 kbx/kbxutil.c:89
 #: scd/scdaemon.c:131 sm/gpgsm.c:267 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:194 dirmngr/dirmngr_ldap.c:102
-#: tools/gpg-connect-agent.c:85 tools/gpgconf.c:111
+#: dirmngr/dirmngr.c:195 tools/gpg-connect-agent.c:85 tools/gpgconf.c:111
 msgid "verbose"
 msgstr "detall"
 
-#: agent/gpg-agent.c:186 g10/gpg.c:578 g10/gpgv.c:79 kbx/kbxutil.c:90
+#: agent/gpg-agent.c:188 g10/gpg.c:578 g10/gpgv.c:79 kbx/kbxutil.c:90
 #: scd/scdaemon.c:132 sm/gpgsm.c:269 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:195 dirmngr/dirmngr_ldap.c:103
+#: dirmngr/dirmngr.c:196
 msgid "be somewhat more quiet"
 msgstr "una mica més silenciós"
 
-#: agent/gpg-agent.c:194 g10/gpg.c:593 sm/gpgsm.c:283 dirmngr/dirmngr.c:205
+#: agent/gpg-agent.c:196 g10/gpg.c:593 sm/gpgsm.c:283 dirmngr/dirmngr.c:206
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 scd/scdaemon.c:146 sm/gpgsm.c:290
-#: dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:599 scd/scdaemon.c:146 sm/gpgsm.c:290
+#: dirmngr/dirmngr.c:210
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: agent/gpg-agent.c:201
+#: agent/gpg-agent.c:203
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualitza la base de dades de confiança"
 
-#: agent/gpg-agent.c:203
+#: agent/gpg-agent.c:205
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 #, 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:213
+#: agent/gpg-agent.c:215
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:215
+#: agent/gpg-agent.c:217
 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:216
+#: agent/gpg-agent.c:218
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
 msgstr "no és suportat"
 
-#: agent/gpg-agent.c:218
+#: agent/gpg-agent.c:220
 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:221
+#: agent/gpg-agent.c:223
 #, fuzzy
 #| msgid "not supported"
 msgid "enable putty support"
 msgstr "no és suportat"
 
-#: agent/gpg-agent.c:233 g10/gpg.c:844 scd/scdaemon.c:176 sm/gpgsm.c:382
+#: agent/gpg-agent.c:235 g10/gpg.c:844 scd/scdaemon.c:176 sm/gpgsm.c:383
 msgid "Options controlling the security"
 msgstr ""
 
-#: agent/gpg-agent.c:236
+#: agent/gpg-agent.c:238
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:238
+#: agent/gpg-agent.c:240
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:242
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:244
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:246
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:248
 #, fuzzy
 msgid "disallow the use of an external password cache"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:250
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:253
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: agent/gpg-agent.c:256
+#: agent/gpg-agent.c:258
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:261
 msgid "do not allow bypassing the passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:261
+#: agent/gpg-agent.c:263
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:265
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:266
+#: agent/gpg-agent.c:268
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:268
+#: agent/gpg-agent.c:272
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|usa el mode de contrasenya especificat"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:274
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: agent/gpg-agent.c:273
+#: agent/gpg-agent.c:277
 msgid "Options controlling the PIN-Entry"
 msgstr ""
 
-#: agent/gpg-agent.c:275
+#: agent/gpg-agent.c:279
 #, fuzzy
 #| msgid "use the gpg-agent"
 msgid "never use the PIN-entry"
 msgstr "utilitza el gpg-agent"
 
-#: agent/gpg-agent.c:277
+#: agent/gpg-agent.c:281
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:283
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:282
+#: agent/gpg-agent.c:286
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:286
+#: agent/gpg-agent.c:290
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:294
 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:551 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: agent/gpg-agent.c:557 agent/preset-passphrase.c:99 agent/protect-tool.c:154
 #: g10/gpg.c:1132 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:612 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:438
-#: dirmngr/dirmngr_ldap.c:175 tools/gpg-connect-agent.c:220 tools/gpgconf.c:151
+#: sm/gpgsm.c:613 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:446
+#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:151
 #: 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:560
+#: agent/gpg-agent.c:566
 #, 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:562
+#: agent/gpg-agent.c:568
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:607 g10/gpg.c:1337 scd/scdaemon.c:384 sm/gpgsm.c:760
-#: dirmngr/dirmngr.c:522
+#: agent/gpg-agent.c:613 g10/gpg.c:1337 scd/scdaemon.c:384 sm/gpgsm.c:761
+#: dirmngr/dirmngr.c:530
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:972 g10/gpg.c:3910 g10/gpg.c:3934 sm/gpgsm.c:1769
-#: sm/gpgsm.c:1775
+#: agent/gpg-agent.c:986 g10/gpg.c:3907 g10/gpg.c:3931 sm/gpgsm.c:1622
+#: sm/gpgsm.c:1628
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algorisme de resum seleccionat no és vàlid\n"
 
-#: agent/gpg-agent.c:1196 agent/gpg-agent.c:2019 common/comopt.c:93
-#: g10/gpg.c:2591 scd/scdaemon.c:549 sm/gpgsm.c:1155 dirmngr/dirmngr.c:989
-#: dirmngr/dirmngr.c:1840
+#: agent/gpg-agent.c:1210 agent/gpg-agent.c:2035 common/comopt.c:93
+#: g10/gpg.c:2594 scd/scdaemon.c:549 sm/gpgsm.c:1028 dirmngr/dirmngr.c:1029
+#: dirmngr/dirmngr.c:1879
 #, 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:1335 g10/gpg.c:3861 scd/scdaemon.c:687 sm/gpgsm.c:1709
-#: dirmngr/dirmngr.c:1108 tools/gpg-connect-agent.c:1270 tools/gpgconf.c:634
+#: agent/gpg-agent.c:1349 g10/gpg.c:3858 scd/scdaemon.c:687 sm/gpgsm.c:1562
+#: dirmngr/dirmngr.c:1145 tools/gpg-connect-agent.c:1270 tools/gpgconf.c:668
 #, 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:2172 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1267
+#: agent/gpg-agent.c:2188 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1306
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: agent/gpg-agent.c:2189 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1280
+#: agent/gpg-agent.c:2205 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1319
 #, fuzzy, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "Certificat de revocació vàlid"
 
-#: agent/gpg-agent.c:2228
+#: agent/gpg-agent.c:2244
 #, 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:2239 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1312
+#: agent/gpg-agent.c:2255 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1351
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: agent/gpg-agent.c:2244 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1315
+#: agent/gpg-agent.c:2260 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1354
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "error mentre s'enviava a «%s»: %s\n"
 
-#: agent/gpg-agent.c:2255 agent/gpg-agent.c:2295 agent/gpg-agent.c:2304
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1324
+#: agent/gpg-agent.c:2271 agent/gpg-agent.c:2311 agent/gpg-agent.c:2320
+#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1363
 #, 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:2269 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1336
+#: agent/gpg-agent.c:2285 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1375
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: agent/gpg-agent.c:2289 agent/gpg-agent.c:2342 common/homedir.c:517
+#: agent/gpg-agent.c:2305 agent/gpg-agent.c:2358 common/homedir.c:537
 #: 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:2292 agent/gpg-agent.c:2347 common/homedir.c:520
+#: agent/gpg-agent.c:2308 agent/gpg-agent.c:2363 common/homedir.c:540
 #: g10/openfile.c:402
 #, fuzzy, c-format
 msgid "directory '%s' created\n"
 msgstr "%s: s'ha creat el directori\n"
 
-#: agent/gpg-agent.c:2353
+#: agent/gpg-agent.c:2369
 #, 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:2357
+#: agent/gpg-agent.c:2373
 #, 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:2512 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2069
+#: agent/gpg-agent.c:2528 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2108
 #, 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:2719
+#: agent/gpg-agent.c:2735
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2724
+#: agent/gpg-agent.c:2740
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2799
+#: agent/gpg-agent.c:2815
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2804
+#: agent/gpg-agent.c:2820
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3026 scd/scdaemon.c:1374 dirmngr/dirmngr.c:2283
+#: agent/gpg-agent.c:3042 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2322
 #, 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:3114 scd/scdaemon.c:1439
+#: agent/gpg-agent.c:3130 scd/scdaemon.c:1441
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu claus es descarta\n"
 
-#: agent/gpg-agent.c:3252 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3271 common/simple-pwquery.c:247 g10/call-agent.c:260
 #: sm/call-agent.c:131 tools/gpg-connect-agent.c:2319 tools/card-call-scd.c:311
 #, fuzzy, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent no està disponible en aquesta sessió\n"
 
-#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:70
+#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:66
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -815,7 +830,7 @@ msgid ""
 msgstr ""
 
 #: agent/protect-tool.c:107 g10/gpg.c:448 kbx/kbxutil.c:72 sm/gpgsm.c:215
-#: dirmngr/dirmngr.c:168 tools/gpgconf.c:81
+#: dirmngr/dirmngr.c:169 tools/gpgconf.c:81
 msgid ""
 "@Commands:\n"
 " "
@@ -845,40 +860,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:707
+#: agent/protect-tool.c:708 sm/import.c:775
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
-#: agent/protect-tool.c:712
+#: agent/protect-tool.c:713 sm/export.c:727
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
-#: agent/protect-tool.c:718
+#: agent/protect-tool.c:719
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:723
+#: agent/protect-tool.c:724
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
-#: agent/protect-tool.c:734
+#: agent/protect-tool.c:735
 #, fuzzy, c-format
 msgid "cancelled\n"
 msgstr "Cancel·la"
 
-#: agent/protect-tool.c:736
+#: agent/protect-tool.c:737
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: agent/trustlist.c:153 agent/trustlist.c:363 tools/gpgconf.c:424
+#: agent/trustlist.c:153 agent/trustlist.c:363 tools/gpgconf.c:458
 #, fuzzy, c-format
 msgid "error opening '%s': %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
@@ -1035,7 +1050,7 @@ msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
 msgid "secret key parts are not available\n"
 msgstr "parts de la clau secreta no estan disponbles\n"
 
-#: agent/cvt-openpgp.c:343 g10/card-util.c:1562
+#: agent/cvt-openpgp.c:343 g10/card-util.c:1575
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -1067,7 +1082,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:505 common/exechelp-posix.c:580
-#: common/exechelp-posix.c:866 dirmngr/dirmngr.c:1354
+#: common/exechelp-posix.c:866 dirmngr/dirmngr.c:1393
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
@@ -1142,7 +1157,7 @@ msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3082
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3099
 msgid "yes"
 msgstr "sí|si"
 
@@ -1198,7 +1213,7 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:115 g10/card-util.c:917 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:927 tools/no-libgcrypt.c:30
 #: tools/gpg-card.c:416
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
@@ -1280,7 +1295,7 @@ msgstr ""
 
 # FIXME: preferència? jm
 # Ho discutírem en la llista, segur.  Deu ser als arxius.  ivb
-#: common/asshelp.c:737 g10/call-dirmngr.c:408
+#: common/asshelp.c:737 g10/call-dirmngr.c:407
 #, fuzzy, c-format
 #| msgid "WARNING: %s overrides %s\n"
 msgid "WARNING: %s\n"
@@ -1384,7 +1399,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:4212
+#: scd/app-openpgp.c:4214
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
@@ -1473,12 +1488,12 @@ msgstr ""
 "No s'han trobat certificats amb confiança no definida.\n"
 "\n"
 
-#: common/audit.c:1112 sm/certchain.c:1242
+#: common/audit.c:1112 sm/certchain.c:1243
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "Certificat correcte"
 
-#: common/audit.c:1115 sm/certchain.c:1252
+#: common/audit.c:1115 sm/certchain.c:1253
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "La clau és disponible en: "
@@ -1530,22 +1545,22 @@ msgstr "[no establert]"
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "el caràcter radix64 %02x invàlid s'ha omés\n"
 
-#: common/ttyio.c:433
+#: common/ttyio.c:447
 #, c-format
 msgid "Sorry, we are in batchmode - can't get input\n"
 msgstr ""
 
-#: common/ttyio.c:439
+#: common/ttyio.c:453
 #, c-format
 msgid "Sorry, no terminal at all requested - can't get input\n"
 msgstr ""
 
-#: common/ttyio.c:474 common/ttyio.c:484
+#: common/ttyio.c:488 common/ttyio.c:498
 #, c-format
 msgid "too many errors; giving up\n"
 msgstr ""
 
-#: common/ttyio.c:536
+#: common/ttyio.c:550
 #, c-format
 msgid "Control-D detected\n"
 msgstr ""
@@ -1599,8 +1614,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:1036 dirmngr/dirmngr.c:895
-#: dirmngr/dirmngr.c:904
+#: common/init.c:191 sm/gpgsm.c:909 dirmngr/dirmngr.c:935 dirmngr/dirmngr.c:944
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
@@ -1761,7 +1775,7 @@ msgid "Enter passphrase: "
 msgstr "Introduïu la contrasenya: "
 
 #: g10/call-agent.c:318 g10/encrypt.c:282 g10/encrypt.c:818 g10/sign.c:473
-#: sm/call-agent.c:180 sm/encrypt.c:701 sm/sign.c:436
+#: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
 #, fuzzy, c-format
 #| msgid "%s does not yet work with %s\n"
 msgid "%s is not compliant with %s mode\n"
@@ -1772,109 +1786,109 @@ msgstr "%s encara no funciona amb %s\n"
 msgid "error from TPM: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: g10/call-agent.c:2123 g10/passphrase.c:225 g10/passphrase.c:258
-#: tools/card-call-scd.c:1751
+#: g10/call-agent.c:2135 g10/passphrase.c:233 g10/passphrase.c:266
+#: tools/card-call-scd.c:1755
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "hi ha un problema amb l'agent: l'agent ha tornat 0x%lx\n"
 
-#: g10/call-dirmngr.c:179 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2316
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2316
 #, fuzzy, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "gpg-agent no està disponible en aquesta sessió\n"
 
-#: g10/call-dirmngr.c:213
+#: g10/call-dirmngr.c:212
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "keyserver option \"honor-keyserver-url\" may not be used in Tor mode\n"
 msgstr "no podeu usar %s mentre esteu en mode %s\n"
 
-#: g10/call-dirmngr.c:386
+#: g10/call-dirmngr.c:385
 msgid "WKD uses a cached result"
 msgstr ""
 
-#: g10/call-dirmngr.c:389
+#: g10/call-dirmngr.c:388
 msgid "Tor is not running"
 msgstr ""
 
-#: g10/call-dirmngr.c:391
+#: g10/call-dirmngr.c:390
 #, fuzzy
 msgid "Tor is not properly configured"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: g10/call-dirmngr.c:393
+#: g10/call-dirmngr.c:392
 #, fuzzy
 msgid "DNS is not properly configured"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: g10/call-dirmngr.c:395
+#: g10/call-dirmngr.c:394
 msgid "unacceptable HTTP redirect from server"
 msgstr ""
 
-#: g10/call-dirmngr.c:397
+#: g10/call-dirmngr.c:396
 msgid "unacceptable HTTP redirect from server was cleaned up"
 msgstr ""
 
-#: g10/call-dirmngr.c:399
+#: g10/call-dirmngr.c:398
 #, fuzzy
 #| msgid "generate a revocation certificate"
 msgid "server uses an invalid certificate"
 msgstr "genera un certificat de revocació"
 
-#: g10/call-dirmngr.c:406 g10/gpg.c:4599
+#: g10/call-dirmngr.c:405 g10/gpg.c:4596
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:369 g10/card-util.c:1924
-#: tools/gpg-card.c:3039
+#: g10/card-util.c:86 g10/card-util.c:374 g10/card-util.c:1937
+#: tools/gpg-card.c:3056
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "la clau secreta no està disponible"
 
-#: g10/card-util.c:91 g10/card-util.c:1930
+#: g10/card-util.c:91 g10/card-util.c:1943
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
 # Destès? ivb
 # Desatès, sí. jm
-#: g10/card-util.c:97 g10/card-util.c:2309 g10/delkey.c:164 g10/keyedit.c:1428
-#: g10/keygen.c:4791 g10/revoke.c:214 g10/revoke.c:638
+#: g10/card-util.c:97 g10/card-util.c:2322 g10/delkey.c:164 g10/keyedit.c:1428
+#: g10/keygen.c:4795 g10/revoke.c:214 g10/revoke.c:639
 #, fuzzy, c-format
 msgid "can't do this in batch mode\n"
 msgstr "no es pot fet això en mode desatès\n"
 
-#: g10/card-util.c:105 tools/gpg-card.c:2943
+#: g10/card-util.c:105 tools/gpg-card.c:2960
 #, fuzzy, c-format
 msgid "This command is only available for version 2 cards\n"
 msgstr "Aquesta ordre no està permesa mentre s'està en mode %s.\n"
 
 # Parts?  Peces?  ivb
-#: g10/card-util.c:107 scd/app-openpgp.c:3398 tools/gpg-card.c:2948
+#: g10/card-util.c:107 scd/app-openpgp.c:3399 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"
 
-#: g10/card-util.c:140 g10/card-util.c:1448 g10/card-util.c:1710
-#: g10/card-util.c:1802 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1991 g10/keygen.c:2165 g10/keygen.c:2385 g10/keygen.c:2685
+#: g10/card-util.c:140 g10/card-util.c:1458 g10/card-util.c:1723
+#: g10/card-util.c:1815 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/keygen.c:1992 g10/keygen.c:2166 g10/keygen.c:2386 g10/keygen.c:2686
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
 #: tools/gpg-card.c:510
 msgid "Your selection? "
 msgstr "La vostra selecció? "
 
-#: g10/card-util.c:262 g10/card-util.c:313 tools/gpg-card.c:596
+#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:596
 #: tools/gpg-card.c:636
 msgid "[not set]"
 msgstr "[no establert]"
 
-#: g10/card-util.c:558 tools/gpg-card.c:903
+#: g10/card-util.c:563 tools/gpg-card.c:905
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:559 tools/gpg-card.c:904
+#: g10/card-util.c:564 tools/gpg-card.c:906
 msgid "Ms."
 msgstr ""
 
@@ -1882,121 +1896,121 @@ msgstr ""
 # Probablement és una clau, femení. jm
 # Werner FIXME: please add translator comment saying *what* is
 # uncompressed so we know the gender. jm
-#: g10/card-util.c:586 tools/gpg-card.c:931
+#: g10/card-util.c:591 tools/gpg-card.c:933
 msgid "not forced"
 msgstr "no forçat"
 
-#: g10/card-util.c:586 tools/gpg-card.c:931
+#: g10/card-util.c:591 tools/gpg-card.c:933
 msgid "forced"
 msgstr "forçat"
 
-#: g10/card-util.c:768 tools/gpg-card.c:1468
+#: g10/card-util.c:773 tools/gpg-card.c:1484
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:770 tools/gpg-card.c:1470
+#: g10/card-util.c:775 tools/gpg-card.c:1486
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:772 tools/gpg-card.c:1472
+#: g10/card-util.c:777 tools/gpg-card.c:1488
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:789 tools/gpg-card.c:1505
+#: g10/card-util.c:795 tools/gpg-card.c:1521
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:791 tools/gpg-card.c:1506
+#: g10/card-util.c:797 tools/gpg-card.c:1522
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:809 tools/gpg-card.c:1523
+#: g10/card-util.c:816 tools/gpg-card.c:1539
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:830 tools/gpg-card.c:1561
+#: g10/card-util.c:840 tools/gpg-card.c:1577
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "no hi ha cap clau pública corresponent: %s\n"
 
-#: g10/card-util.c:926 g10/decrypt-data.c:495 g10/import.c:406 g10/import.c:756
-#: g10/import.c:815 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1666
-#: tools/gpgconf.c:437 tools/gpgconf.c:483 tools/gpg-card.c:426
+#: g10/card-util.c:936 g10/decrypt-data.c:495 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:1705
+#: tools/gpgconf.c:471 tools/gpgconf.c:517 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:959 g10/decrypt-data.c:498 g10/export.c:2496
+#: g10/card-util.c:969 g10/decrypt-data.c:498 g10/export.c:2496
 #: dirmngr/crlcache.c:925 tools/gpg-card.c:486 tools/gpg-card.c:493
 #, fuzzy, c-format
 msgid "error writing '%s': %s\n"
 msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
 
-#: g10/card-util.c:986 tools/gpg-card.c:1650
+#: g10/card-util.c:996 tools/gpg-card.c:1666
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:1024 tools/gpg-card.c:1945
+#: g10/card-util.c:1034 tools/gpg-card.c:1962
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:1109 tools/gpg-card.c:1699
+#: g10/card-util.c:1119 tools/gpg-card.c:1715
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferències actualitzades"
 
-#: g10/card-util.c:1117 tools/gpg-card.c:1710
+#: g10/card-util.c:1127 tools/gpg-card.c:1726
 #, fuzzy, c-format
 msgid "Error: invalid length of preference string.\n"
 msgstr "hi ha un caràcter invàlid en la cadena de preferència\n"
 
-#: g10/card-util.c:1126 tools/gpg-card.c:1719
+#: g10/card-util.c:1136 tools/gpg-card.c:1735
 #, fuzzy, c-format
 msgid "Error: invalid characters in preference string.\n"
 msgstr "hi ha un caràcter invàlid en la cadena de preferència\n"
 
-#: g10/card-util.c:1148 tools/gpg-card.c:1753
+#: g10/card-util.c:1158 tools/gpg-card.c:1769
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1162 tools/gpg-card.c:1770
+#: g10/card-util.c:1172 tools/gpg-card.c:1786
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: g10/card-util.c:1185 tools/gpg-card.c:1835
+#: g10/card-util.c:1195 tools/gpg-card.c:1852
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Empremta digital:"
 
-#: g10/card-util.c:1209 tools/gpg-card.c:1861
+#: g10/card-util.c:1219 tools/gpg-card.c:1878
 #, fuzzy, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: g10/card-util.c:1259
+#: g10/card-util.c:1269
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "La generació de claus ha fallat: %s\n"
 
-#: g10/card-util.c:1260
+#: g10/card-util.c:1270
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "no s'han trobat dades OpenPGP vàlides.\n"
 
-#: g10/card-util.c:1273 g10/keygen.c:4811 g10/keygen.c:5972
+#: g10/card-util.c:1283 g10/keygen.c:4815 g10/keygen.c:6003
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
 
-#: g10/card-util.c:1358
+#: g10/card-util.c:1368
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1375 tools/gpg-card.c:3328
+#: g10/card-util.c:1385 tools/gpg-card.c:3345
 msgid ""
 "Note: There is no guarantee that the card supports the requested\n"
 "      key type or size.  If the key generation does not succeed,\n"
@@ -2004,102 +2018,102 @@ msgid ""
 "      key types and sizes are supported.\n"
 msgstr ""
 
-#: g10/card-util.c:1396 g10/keygen.c:2570 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1406 g10/keygen.c:2571 sm/certreqgen-ui.c:180
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Quina grandària voleu? (1024) "
 
-#: g10/card-util.c:1406 g10/keygen.c:2493 g10/keygen.c:2525
+#: g10/card-util.c:1416 g10/keygen.c:2494 g10/keygen.c:2526
 #: sm/certreqgen-ui.c:195
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrodonida fins a %u bits\n"
 
-#: g10/card-util.c:1414 g10/keygen.c:2578 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1424 g10/keygen.c:2579 sm/certreqgen-ui.c:185
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/card-util.c:1433
+#: g10/card-util.c:1443
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1435
+#: g10/card-util.c:1445
 #, fuzzy
 msgid "Signature key\n"
 msgstr "Aquesta signatura va caducar el %s\n"
 
-#: g10/card-util.c:1437
+#: g10/card-util.c:1447
 #, fuzzy
 msgid "Encryption key\n"
 msgstr "   (%d) RSA (només xifrar)\n"
 
-#: g10/card-util.c:1439
+#: g10/card-util.c:1449
 msgid "Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1441 g10/keygen.c:2112 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1451 g10/keygen.c:2113 sm/certreqgen-ui.c:158
 msgid "Please select what kind of key you want:\n"
 msgstr "Seleccioneu quin tipus de clau voleu:\n"
 
-#: g10/card-util.c:1442 sm/certreqgen-ui.c:159
+#: g10/card-util.c:1452 sm/certreqgen-ui.c:159
 #, fuzzy, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA (només signar)\n"
 
-#: g10/card-util.c:1443
+#: g10/card-util.c:1453
 #, fuzzy, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) DSA i ElGamal (predeterminat)\n"
 
-#: g10/card-util.c:1455 g10/card-util.c:1722 g10/card-util.c:1822
-#: g10/keyedit.c:900 g10/keygen.c:2017 g10/keygen.c:2045 g10/keygen.c:2172
-#: g10/keygen.c:2425 g10/keygen.c:2713 g10/revoke.c:836
+#: g10/card-util.c:1468 g10/card-util.c:1735 g10/card-util.c:1835
+#: g10/keyedit.c:900 g10/keygen.c:2018 g10/keygen.c:2046 g10/keygen.c:2173
+#: g10/keygen.c:2426 g10/keygen.c:2714 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "La selecció és invàlida.\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1541
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 
-#: g10/card-util.c:1533
+#: g10/card-util.c:1546
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1582
 #, fuzzy, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "error mentre s'enviava a «%s»: %s\n"
 
-#: g10/card-util.c:1585 g10/card-util.c:2106 g10/card-util.c:2162
+#: g10/card-util.c:1598 g10/card-util.c:2119 g10/card-util.c:2175
 #, fuzzy, c-format
 msgid "error getting card info: %s\n"
 msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
 
-#: g10/card-util.c:1591 g10/card-util.c:1936 g10/card-util.c:2112
-#: g10/card-util.c:2171 tools/gpg-card.c:3057 tools/gpg-card.c:3296
-#: tools/gpg-card.c:3354
+#: g10/card-util.c:1604 g10/card-util.c:1949 g10/card-util.c:2125
+#: g10/card-util.c:2184 tools/gpg-card.c:3074 tools/gpg-card.c:3313
+#: tools/gpg-card.c:3371
 #, fuzzy, c-format
 #| msgid "This command is not allowed while in %s mode.\n"
 msgid "This command is not supported by this card\n"
 msgstr "Aquesta ordre no està permesa mentre s'està en mode %s.\n"
 
-#: g10/card-util.c:1637 tools/gpg-card.c:2426
+#: g10/card-util.c:1650 tools/gpg-card.c:2443
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1651
+#: g10/card-util.c:1664
 #, fuzzy, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "es descarta: la clau secreta ja és present\n"
 
-#: g10/card-util.c:1654 tools/gpg-card.c:2398
+#: g10/card-util.c:1667 tools/gpg-card.c:2415
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1666 tools/gpg-card.c:2457
+#: g10/card-util.c:1679 tools/gpg-card.c:2474
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2107,171 +2121,171 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1701
+#: g10/card-util.c:1714
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Seleccioneu quin tipus de clau voleu:\n"
 
-#: g10/card-util.c:1703 g10/card-util.c:1793
+#: g10/card-util.c:1716 g10/card-util.c:1806
 msgid "   (1) Signature key\n"
 msgstr ""
 
-#: g10/card-util.c:1704 g10/card-util.c:1795
+#: g10/card-util.c:1717 g10/card-util.c:1808
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (només xifrar)\n"
 
-#: g10/card-util.c:1705 g10/card-util.c:1797
+#: g10/card-util.c:1718 g10/card-util.c:1810
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1790
+#: g10/card-util.c:1803
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Seleccioneu la raó de la revocació:\n"
 
-#: g10/card-util.c:1836
+#: g10/card-util.c:1849
 #, fuzzy, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: g10/card-util.c:1941 tools/gpg-card.c:3065
+#: g10/card-util.c:1954 tools/gpg-card.c:3082
 #, fuzzy, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr "es descarta: la clau secreta ja és present\n"
 
-#: g10/card-util.c:1944 tools/gpg-card.c:3068 tools/gpg-card.c:3409
+#: g10/card-util.c:1957 tools/gpg-card.c:3085 tools/gpg-card.c:3426
 #, fuzzy
 msgid "Continue? (y/N) "
 msgstr "Signar realment? "
 
-#: g10/card-util.c:1949 tools/gpg-card.c:3079
+#: g10/card-util.c:1962 tools/gpg-card.c:3096
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2142
+#: g10/card-util.c:2155
 #, fuzzy, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: g10/card-util.c:2188
+#: g10/card-util.c:2201
 #, fuzzy, c-format
 msgid "error for setup UIF: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: g10/card-util.c:2212 g10/keyedit.c:1263 tools/gpg-card.c:3649
+#: g10/card-util.c:2225 g10/keyedit.c:1263 tools/gpg-card.c:3666
 msgid "quit this menu"
 msgstr "ix del menú"
 
-#: g10/card-util.c:2214
+#: g10/card-util.c:2227
 #, fuzzy
 msgid "show admin commands"
 msgstr "les ordres entren en conflicte\n"
 
 # «pantalla» o «ajuda»?  ivb
 # «ajuda», evidentment. jm
-#: g10/card-util.c:2215 g10/keyedit.c:1266 tools/gpg-card.c:3652
+#: g10/card-util.c:2228 g10/keyedit.c:1266 tools/gpg-card.c:3669
 msgid "show this help"
 msgstr "mostra aquesta ajuda"
 
-#: g10/card-util.c:2217 tools/gpg-card.c:3654
+#: g10/card-util.c:2230 tools/gpg-card.c:3671
 #, fuzzy
 msgid "list all available data"
 msgstr "La clau és disponible en: "
 
-#: g10/card-util.c:2220 tools/gpg-card.c:3656
+#: g10/card-util.c:2233 tools/gpg-card.c:3673
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:2221 tools/gpg-card.c:3657
+#: g10/card-util.c:2234 tools/gpg-card.c:3674
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:2222 tools/gpg-card.c:3658
+#: g10/card-util.c:2235 tools/gpg-card.c:3675
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:2223 tools/gpg-card.c:3659
+#: g10/card-util.c:2236 tools/gpg-card.c:3676
 #, fuzzy
 msgid "change the login name"
 msgstr "canvia la data de caducitat"
 
-#: g10/card-util.c:2224 tools/gpg-card.c:3660
+#: g10/card-util.c:2237 tools/gpg-card.c:3677
 #, fuzzy
 msgid "change the language preferences"
 msgstr "canvia la confiança"
 
-#: g10/card-util.c:2225 tools/gpg-card.c:3661
+#: g10/card-util.c:2238 tools/gpg-card.c:3678
 msgid "change card holder's salutation"
 msgstr ""
 
-#: g10/card-util.c:2227 tools/gpg-card.c:3663
+#: g10/card-util.c:2240 tools/gpg-card.c:3680
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra empremta"
 
-#: g10/card-util.c:2228 tools/gpg-card.c:3664
+#: g10/card-util.c:2241 tools/gpg-card.c:3681
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:2229 tools/gpg-card.c:3665
+#: g10/card-util.c:2242 tools/gpg-card.c:3682
 #, fuzzy
 msgid "generate new keys"
 msgstr "genera un nou parell de claus"
 
-#: g10/card-util.c:2230 tools/gpg-card.c:3666
+#: g10/card-util.c:2243 tools/gpg-card.c:3683
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:2231 tools/gpg-card.c:3667
+#: g10/card-util.c:2244 tools/gpg-card.c:3684
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:2232 tools/gpg-card.c:3668
+#: g10/card-util.c:2245 tools/gpg-card.c:3685
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:2233 tools/gpg-card.c:3672
+#: g10/card-util.c:2246 tools/gpg-card.c:3689
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2235
+#: g10/card-util.c:2248
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr "|NOM|usa NOM com a destinatari predeterminat"
 
-#: g10/card-util.c:2236
+#: g10/card-util.c:2249
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "canvia la confiança"
 
-#: g10/card-util.c:2237 tools/gpg-card.c:3674
+#: g10/card-util.c:2250 tools/gpg-card.c:3691
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the User Interaction Flag"
 msgstr "canvia la confiança"
 
-#: g10/card-util.c:2361 tools/gpg-card.c:3924
+#: g10/card-util.c:2374 tools/gpg-card.c:3941
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2402
+#: g10/card-util.c:2415
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "les ordres entren en conflicte\n"
 
-#: g10/card-util.c:2433
+#: g10/card-util.c:2446
 msgid "Admin commands are allowed\n"
 msgstr ""
 
-#: g10/card-util.c:2435
+#: g10/card-util.c:2448
 msgid "Admin commands are not allowed\n"
 msgstr ""
 
-#: g10/card-util.c:2546 g10/keyedit.c:2275 tools/gpg-card.c:3814
-#: tools/gpg-card.c:4072
+#: g10/card-util.c:2559 g10/keyedit.c:2275 tools/gpg-card.c:3831
+#: tools/gpg-card.c:4089
 #, c-format
 msgid "Invalid command  (try \"help\")\n"
 msgstr "L'ordre no és vàlida (proveu «help»)\n"
@@ -2281,23 +2295,23 @@ msgstr "L'ordre no és vàlida (proveu «help»)\n"
 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:5293 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5292 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:1934 g10/export.c:2342 g10/export.c:2463
-#: g10/getkey.c:1907 g10/gpg.c:5238 g10/keyedit.c:1450 g10/keyedit.c:2382
-#: g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:703 g10/keyserver.c:1240
-#: g10/revoke.c:230 g10/tofu.c:2168
+#: g10/getkey.c:2032 g10/gpg.c:5237 g10/keyedit.c:1450 g10/keyedit.c:2382
+#: g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:703 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:2002 g10/getkey.c:1915 g10/getkey.c:4330
-#: g10/gpg.c:5247 g10/keyedit.c:2354 g10/keyserver.c:1258 g10/revoke.c:236
-#: g10/revoke.c:665 g10/tofu.c:2176
+#: g10/delkey.c:90 g10/export.c:2002 g10/getkey.c:2040 g10/getkey.c:4455
+#: g10/gpg.c:5246 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"
 msgstr "s'ha produït un error en llegir el bloc de claus: %s\n"
@@ -2424,14 +2438,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:555 g10/encrypt.c:808 g10/decrypt-data.c:261 g10/gpg.c:4083
-#: g10/gpg.c:4130 sm/decrypt.c:742 sm/encrypt.c:691 sm/gpgsm.c:1793
+#: g10/encrypt.c:555 g10/encrypt.c:808 g10/decrypt-data.c:261 g10/gpg.c:4080
+#: g10/gpg.c:4127 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1646
 #, 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:564 g10/gpg.c:4095 g10/gpg.c:4142 g10/sig-check.c:155
-#: g10/sign.c:452 sm/gpgsm.c:1803 sm/gpgsm.c:1813 sm/sign.c:596 sm/verify.c:510
+#: g10/encrypt.c:564 g10/gpg.c:4092 g10/gpg.c:4139 g10/sig-check.c:155
+#: g10/sign.c:452 sm/gpgsm.c:1656 sm/gpgsm.c:1666 sm/sign.c:596 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"
@@ -2449,7 +2463,7 @@ msgid ""
 msgstr ""
 "forçar el xifrat asimètric %s (%d) viola les preferències del destinatari\n"
 
-#: g10/encrypt.c:838 sm/encrypt.c:766
+#: g10/encrypt.c:838 sm/encrypt.c:767
 #, fuzzy, c-format
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "AV�S: %s és una opció desaconsellada.\n"
@@ -2481,7 +2495,7 @@ msgstr "%s/%s xifrat per a: «%s»\n"
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "no podeu usar %s mentre esteu en mode %s\n"
 
-#: g10/decrypt-data.c:239 g10/mainproc.c:380 sm/decrypt.c:494
+#: g10/decrypt-data.c:239 g10/mainproc.c:380 sm/decrypt.c:892
 #, fuzzy, c-format
 #| msgid "%s encrypted data\n"
 msgid "%s.%s encrypted data\n"
@@ -2494,7 +2508,7 @@ msgstr "xifrat amb l'algoritme %d (desconegut)\n"
 
 # És no-wrap?  ivb
 # Com? jm
-#: g10/decrypt-data.c:361 g10/decrypt-data.c:414 sm/decrypt.c:508
+#: g10/decrypt-data.c:361 g10/decrypt-data.c:414 sm/decrypt.c:906
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2542,7 +2556,7 @@ msgstr ""
 msgid " - skipped"
 msgstr "%s: es descarta: %s\n"
 
-#: g10/export.c:1333 g10/import.c:2124 g10/openfile.c:202 g10/openfile.c:296
+#: g10/export.c:1333 g10/import.c:2132 g10/openfile.c:202 g10/openfile.c:296
 #: g10/sign.c:1110 g10/sign.c:1447
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
@@ -2583,65 +2597,65 @@ msgstr "error en crear «%s»: %s\n"
 msgid "[User ID not found]"
 msgstr "[No s'ha trobat l'id d'usuari]"
 
-#: g10/getkey.c:1199
+#: g10/getkey.c:1324
 #, fuzzy, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: g10/getkey.c:1205
+#: g10/getkey.c:1330
 #, fuzzy, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: g10/getkey.c:1207
+#: g10/getkey.c:1332
 #, fuzzy
 msgid "No fingerprint"
 msgstr "Empremta digital:"
 
-#: g10/getkey.c:1449
+#: g10/getkey.c:1574
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1884 g10/revoke.c:657 g10/revoke.c:718
+#: g10/getkey.c:2009 g10/revoke.c:658 g10/revoke.c:719
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "no s'ha trobat la clau secreta «%s»: %s\n"
 
-#: g10/getkey.c:1887 g10/pkclist.c:1012
+#: g10/getkey.c:2012 g10/pkclist.c:1012
 #, fuzzy, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/getkey.c:1965
+#: g10/getkey.c:2090
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "|NOM|usa NOM com a clau secreta predeterminada"
 
-#: g10/getkey.c:1973
+#: g10/getkey.c:2098
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "|NOM|usa NOM com a clau secreta predeterminada"
 
-#: g10/getkey.c:1980
+#: g10/getkey.c:2105
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr ""
 
-#: g10/getkey.c:2837
+#: g10/getkey.c:2962
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "La clau invàlida %08lX s'ha fet vàlida amb --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:3703
+#: g10/getkey.c:3828
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "s'usarà la clau secundària %08lX en lloc de la primària %08lX\n"
 
-#: g10/getkey.c:4259 g10/gpg.c:2167
+#: g10/getkey.c:4384 g10/gpg.c:2168
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "opcions d'importació no vàlides\n"
@@ -2848,7 +2862,7 @@ msgstr ""
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:651 kbx/kbxutil.c:91 sm/gpgsm.c:424 tools/gpgconf.c:113
+#: g10/gpg.c:651 kbx/kbxutil.c:91 sm/gpgsm.c:425 tools/gpgconf.c:113
 msgid "do not make any changes"
 msgstr "no fa cap canvi"
 
@@ -2882,7 +2896,7 @@ msgstr "usa el mode de text canònic"
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|nivell de compressió N (0 no comprimeix)"
 
-#: g10/gpg.c:762 sm/gpgsm.c:357
+#: g10/gpg.c:762 sm/gpgsm.c:358
 msgid "Options controlling key import and export"
 msgstr ""
 
@@ -2902,11 +2916,11 @@ msgstr "importa claus d'un servidor de claus"
 msgid "include the public key in signatures"
 msgstr "comprova les signatures de la claus"
 
-#: g10/gpg.c:776 sm/gpgsm.c:360
+#: g10/gpg.c:776 sm/gpgsm.c:361
 msgid "disable all access to the dirmngr"
 msgstr ""
 
-#: g10/gpg.c:788 sm/gpgsm.c:367
+#: g10/gpg.c:788 sm/gpgsm.c:368
 msgid "Options controlling key listings"
 msgstr ""
 
@@ -2926,15 +2940,15 @@ msgstr "|NOM|xifra per a NOM"
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "usa aquest id per a signar o desxifrar"
 
-#: g10/gpg.c:876 sm/gpgsm.c:408
+#: g10/gpg.c:876 sm/gpgsm.c:409
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:895 sm/gpgsm.c:420 dirmngr/dirmngr.c:286
+#: g10/gpg.c:895 sm/gpgsm.c:421 dirmngr/dirmngr.c:289
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:966 sm/gpgsm.c:453
+#: g10/gpg.c:966 sm/gpgsm.c:454
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -3001,7 +3015,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:1168 sm/gpgsm.c:636
+#: g10/gpg.c:1168 sm/gpgsm.c:637
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -3025,12 +3039,12 @@ msgstr "Dispersió: "
 msgid "Compression: "
 msgstr "Compressió: "
 
-#: g10/gpg.c:1274 sm/gpgsm.c:710
+#: g10/gpg.c:1274 sm/gpgsm.c:711
 #, fuzzy, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "forma d'ús: gpg [opcions] "
 
-#: g10/gpg.c:1467 sm/gpgsm.c:803
+#: g10/gpg.c:1467 sm/gpgsm.c:804
 #, c-format
 msgid "conflicting commands\n"
 msgstr "les ordres entren en conflicte\n"
@@ -3042,539 +3056,539 @@ 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:1683
+#: g10/gpg.c:1684
 #, 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:1686
+#: g10/gpg.c:1687
 #, 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:1689
+#: g10/gpg.c:1690
 #, 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:1695
+#: g10/gpg.c:1696
 #, 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:1698
+#: g10/gpg.c:1699
 #, 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:1701
+#: g10/gpg.c:1702
 #, 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:1707
+#: g10/gpg.c:1708
 #, 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:1710
+#: g10/gpg.c:1711
 #, 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:1713
+#: g10/gpg.c:1714
 #, 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:1719
+#: g10/gpg.c:1720
 #, 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:1722
+#: g10/gpg.c:1723
 #, 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:1725
+#: g10/gpg.c:1726
 #, 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:1941
+#: g10/gpg.c:1942
 #, fuzzy, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
 
-#: g10/gpg.c:2037
+#: g10/gpg.c:2038
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:2039
+#: g10/gpg.c:2040
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/gpg.c:2041
+#: g10/gpg.c:2042
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2043
+#: g10/gpg.c:2044
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/gpg.c:2045
+#: g10/gpg.c:2046
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2049
+#: g10/gpg.c:2050
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2051
+#: g10/gpg.c:2052
 #, 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:2053
+#: g10/gpg.c:2054
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:2055
+#: g10/gpg.c:2056
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:2057
+#: g10/gpg.c:2058
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:2059
+#: g10/gpg.c:2060
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mostra en quin anell de claus està una clau llistada"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2062
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/gpg.c:2178
+#: g10/gpg.c:2179
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "el destinatari predeterminat és desconegut «%s»\n"
 
-#: g10/gpg.c:2180
+#: g10/gpg.c:2181
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2975 g10/gpg.c:3828 g10/gpg.c:3840
+#: g10/gpg.c:2978 g10/gpg.c:3825 g10/gpg.c:3837
 #, 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:3151 g10/gpg.c:3163
+#: g10/gpg.c:3154 g10/gpg.c:3166
 #, 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:3185
+#: g10/gpg.c:3188
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "No és una adreça vàlida\n"
 
-#: g10/gpg.c:3217 sm/gpgsm.c:1270
+#: g10/gpg.c:3220 sm/gpgsm.c:1143
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "l'algoritme de dispersió és invàlid «%s»\n"
 
-#: g10/gpg.c:3223 sm/gpgsm.c:1276
+#: g10/gpg.c:3226 sm/gpgsm.c:1149
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:3280
+#: g10/gpg.c:3283
 #, 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:3302 g10/gpg.c:3511 g10/keyedit.c:5319
+#: g10/gpg.c:3305 g10/gpg.c:3514 g10/keyedit.c:5322
 #, 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:3320
+#: g10/gpg.c:3323
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:3323
+#: g10/gpg.c:3326
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3333
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opcions d'importanció no vàlides\n"
 
-#: g10/gpg.c:3333
+#: g10/gpg.c:3336
 #, c-format
 msgid "invalid import options\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:3339 g10/gpg.c:3354
+#: g10/gpg.c:3342 g10/gpg.c:3357
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:3345
+#: g10/gpg.c:3348
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3351
 #, c-format
 msgid "invalid export options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3363
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opcions d'importanció no vàlides\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3366
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:3371
+#: g10/gpg.c:3374
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3373
+#: g10/gpg.c:3376
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3378
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:3377
+#: g10/gpg.c:3380
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3384
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3386
 #, 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:3385
+#: g10/gpg.c:3388
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:3387
+#: g10/gpg.c:3390
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3389
+#: g10/gpg.c:3392
 #, 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:3396
+#: g10/gpg.c:3399
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:3399
+#: g10/gpg.c:3402
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3409
 #, 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:3613
+#: g10/gpg.c:3616
 #, 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:3616
+#: g10/gpg.c:3619
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3625
+#: g10/gpg.c:3628
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:3807 sm/gpgsm.c:1675
+#: g10/gpg.c:3804 sm/gpgsm.c:1528
 #, 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:3821
+#: g10/gpg.c:3818
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AV�S: %s té preferència sobre %s\n"
 
-#: g10/gpg.c:3830
+#: g10/gpg.c:3827
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s no és permés amb %s!\n"
 
-#: g10/gpg.c:3833
+#: g10/gpg.c:3830
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s no té sentit amb %s!\n"
 
-#: g10/gpg.c:3848 sm/gpgsm.c:1696 dirmngr/dirmngr.c:1123
+#: g10/gpg.c:3845 sm/gpgsm.c:1549 dirmngr/dirmngr.c:1160
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3869
+#: g10/gpg.c:3866
 #, 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:3897 g10/gpg.c:3928 sm/gpgsm.c:1763
+#: g10/gpg.c:3894 g10/gpg.c:3925 sm/gpgsm.c:1616
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no és vàlid\n"
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3901
 #, 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:3916
+#: g10/gpg.c:3913
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no és vàlid\n"
 
-#: g10/gpg.c:3922
+#: g10/gpg.c:3919
 #, 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:3937
+#: g10/gpg.c:3934
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ha de ser major que 0\n"
 
-#: g10/gpg.c:3939
+#: g10/gpg.c:3936
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ha de ser major que 1\n"
 
-#: g10/gpg.c:3941
+#: g10/gpg.c:3938
 #, 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:3943
+#: g10/gpg.c:3940
 #, 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:3945
+#: g10/gpg.c:3942
 #, 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:3949
+#: g10/gpg.c:3946
 #, 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:3953
+#: g10/gpg.c:3950
 #, 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:3960
+#: g10/gpg.c:3957
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "les preferències per defecte són invàlides\n"
 
-#: g10/gpg.c:3964
+#: g10/gpg.c:3961
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "les preferències personals de xifrat són invàlides\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3964
 #, 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:3971
+#: g10/gpg.c:3968
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "les preferències personals de digest són invàlides\n"
 
-#: g10/gpg.c:3975
+#: g10/gpg.c:3972
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "les preferències personals de compressió són invàlides\n"
 
-#: g10/gpg.c:3984 g10/gpg.c:3989
+#: g10/gpg.c:3981 g10/gpg.c:3986
 #, 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:4026
+#: g10/gpg.c:4023
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s encara no funciona amb %s\n"
 
-#: g10/gpg.c:4089
+#: g10/gpg.c:4086
 #, 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:4101
+#: g10/gpg.c:4098
 #, 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:4256
+#: g10/gpg.c:4253
 #, 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:4268
+#: g10/gpg.c:4265
 #, 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:4340
+#: g10/gpg.c:4337
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "ha fallat el desxifratge: %s\n"
 
-#: g10/gpg.c:4369
+#: g10/gpg.c:4366
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4372
+#: g10/gpg.c:4369
 #, 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:4430
+#: g10/gpg.c:4427
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4433
+#: g10/gpg.c:4430
 #, 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:4821 g10/keyserver.c:1870
+#: g10/gpg.c:4818 g10/keyserver.c:1629
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "l'enviament al servidor de claus ha fallat: %s\n"
 
-#: g10/gpg.c:4826
+#: g10/gpg.c:4823
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "la recepció des del servidor de claus ha fallat: %s\n"
 
-#: g10/gpg.c:4832
+#: g10/gpg.c:4829
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "l'exportació de la clau ha fallat: %s\n"
 
-#: g10/gpg.c:4845
+#: g10/gpg.c:4842
 #, 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:4857
+#: g10/gpg.c:4854
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ha fallat la cerca al servidor de claus: %s\n"
 
-#: g10/gpg.c:4870
+#: g10/gpg.c:4867
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "ha fallat el refresc des del servidor de claus: %s\n"
 
-#: g10/gpg.c:4937
+#: g10/gpg.c:4936
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "no s'ha pogut llevar l'armadura: %s\n"
 
-#: g10/gpg.c:4948
+#: g10/gpg.c:4947
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: g10/gpg.c:5053
+#: g10/gpg.c:5052
 #, 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:5205 g10/tofu.c:2156
+#: g10/gpg.c:5204 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:5216
+#: g10/gpg.c:5215
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5272
+#: g10/gpg.c:5271
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5283
+#: g10/gpg.c:5282
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Endavant, escriviu el missatge...\n"
 
-#: g10/gpg.c:5630
+#: g10/gpg.c:5629
 #, 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:5632
+#: g10/gpg.c:5631
 #, 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:5665
+#: g10/gpg.c:5664
 #, 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"
@@ -3588,7 +3602,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:414 tools/gpgconf.c:116 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:415 tools/gpgconf.c:116 tools/gpg-card.c:95
 msgid "|FD|write status info to this FD"
 msgstr "|FD|escriu informació d'estat en aquest FD"
 
@@ -3687,271 +3701,271 @@ msgstr ""
 msgid "repair keys on import"
 msgstr "mostra empremta"
 
-#: g10/import.c:399 g10/import.c:721
+#: g10/import.c:407 g10/import.c:729
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "es descarta un bloc de tipus %d\n"
 
-#: g10/import.c:738
+#: g10/import.c:746
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "fins ara s'han processat %lu claus\n"
 
-#: g10/import.c:831
+#: g10/import.c:839
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Nombre total processat: %lu\n"
 
-#: g10/import.c:834
+#: g10/import.c:842
 #, fuzzy, c-format
 #| msgid "      skipped new keys: %lu\n"
 msgid "    skipped PGP-2 keys: %lu\n"
 msgstr " claus noves descartades: %lu\n"
 
-#: g10/import.c:836
+#: g10/import.c:844
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr " claus noves descartades: %lu\n"
 
-#: g10/import.c:839
+#: g10/import.c:847
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "                sense ID: %lu\n"
 
-#: g10/import.c:842 sm/import.c:129
+#: g10/import.c:850 sm/import.c:129
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importades: %lu"
 
-#: g10/import.c:846 sm/import.c:133
+#: g10/import.c:854 sm/import.c:133
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "          no modificades: %lu\n"
 
-#: g10/import.c:848
+#: g10/import.c:856
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "       ID d'usuaris nous: %lu\n"
 
-#: g10/import.c:850
+#: g10/import.c:858
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "          subclaus noves: %lu\n"
 
-#: g10/import.c:852
+#: g10/import.c:860
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        signatures noves: %lu\n"
 
-#: g10/import.c:854
+#: g10/import.c:862
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "       noves revocacions: %lu\n"
 
-#: g10/import.c:856 sm/import.c:135
+#: g10/import.c:864 sm/import.c:135
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr " claus privades llegides: %lu\n"
 
-#: g10/import.c:858 sm/import.c:137
+#: g10/import.c:866 sm/import.c:137
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "claus privades importades: %lu\n"
 
-#: g10/import.c:860 sm/import.c:139
+#: g10/import.c:868 sm/import.c:139
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "claus privades no canviades: %lu\n"
 
-#: g10/import.c:862 sm/import.c:141
+#: g10/import.c:870 sm/import.c:141
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "              importades: %lu\n"
 
-#: g10/import.c:864
+#: g10/import.c:872
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "        signatures noves: %lu\n"
 
-#: g10/import.c:866
+#: g10/import.c:874
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr " claus privades llegides: %lu\n"
 
-#: g10/import.c:1291
+#: g10/import.c:1299
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:1333
+#: g10/import.c:1341
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:1351
+#: g10/import.c:1359
 #, fuzzy, c-format
 msgid "         \"%s\": preference for AEAD algorithm %s\n"
 msgstr "signatura %s, algorisme de resum %s\n"
 
-#: g10/import.c:1366
+#: g10/import.c:1374
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "signatura %s, algorisme de resum %s\n"
 
-#: g10/import.c:1378
+#: g10/import.c:1386
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:1391
+#: g10/import.c:1399
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:1393
+#: g10/import.c:1401
 #, c-format
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:1418
+#: g10/import.c:1426
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:1932 g10/import.c:3053
+#: g10/import.c:1940 g10/import.c:3061
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "clau %08lX: sense ID\n"
 
-#: g10/import.c:1938
+#: g10/import.c:1946
 #, fuzzy, c-format
 msgid "key %s: %s\n"
 msgstr "es descarta «%s»: %s\n"
 
-#: g10/import.c:1939 g10/import.c:3025
+#: g10/import.c:1947 g10/import.c:3033
 msgid "rejected by import screener"
 msgstr ""
 
-#: g10/import.c:1988
+#: g10/import.c:1996
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "clau %08lX: corrupció de la subclau HKP reparada\n"
 
-#: g10/import.c:2009
+#: g10/import.c:2017
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "clau %08lX: s'ha acceptat la ID d'usuari no autosignada «%s»\n"
 
-#: g10/import.c:2020 g10/import.c:2051
+#: g10/import.c:2028 g10/import.c:2059
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "clau %08lX: l'ID no és vàlid\n"
 
-#: g10/import.c:2022
+#: g10/import.c:2030
 #, c-format
 msgid "this may be caused by a missing self-signature\n"
 msgstr "açò pot ser causat per l'absència d'autosignatura\n"
 
-#: g10/import.c:2101 g10/import.c:3439
+#: g10/import.c:2109 g10/import.c:3447
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "clau %08lX: no s'ha trobat la clau pública: %s\n"
 
-#: g10/import.c:2107
+#: g10/import.c:2115
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "clau %08lX: clau nova - es descarta \n"
 
-#: g10/import.c:2119
+#: g10/import.c:2127
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "no s'ha trobat cap anell escrivible: %s\n"
 
-#: g10/import.c:2151 g10/import.c:2253 g10/import.c:3514
+#: g10/import.c:2159 g10/import.c:2261 g10/import.c:3522
 #, fuzzy, c-format
 #| msgid "error writing keyring `%s': %s\n"
 msgid "error writing keyring '%s': %s\n"
 msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
 
-#: g10/import.c:2174
+#: g10/import.c:2182
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "clau %08lX: s'ha importat la clau pública «%s»\n"
 
-#: g10/import.c:2201
+#: g10/import.c:2209
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "clau %08lX: no correspon a la nostra còpia\n"
 
-#: g10/import.c:2269
+#: g10/import.c:2277
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "clau %08lX: «%s» 1 ID d'usuari nou\n"
 
-#: g10/import.c:2272
+#: g10/import.c:2280
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "clau %08lX: «%s» %d ID d'usuari nous\n"
 
-#: g10/import.c:2275
+#: g10/import.c:2283
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "clau %08lX: «%s» 1 signatura nova\n"
 
-#: g10/import.c:2278
+#: g10/import.c:2286
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "clau %08lX: «%s» %d signatures noves\n"
 
-#: g10/import.c:2281
+#: g10/import.c:2289
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "clau %08lX: «%s» 1 subclau nova\n"
 
-#: g10/import.c:2284
+#: g10/import.c:2292
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "clau %08lX: «%s» %d subclaus noves\n"
 
-#: g10/import.c:2287
+#: g10/import.c:2295
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "clau %08lX: «%s» %d signatures noves\n"
 
-#: g10/import.c:2290
+#: g10/import.c:2298
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "clau %08lX: «%s» %d signatures noves\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2301
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "clau %08lX: «%s» %d ID d'usuari nous\n"
 
-#: g10/import.c:2296
+#: g10/import.c:2304
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "clau %08lX: «%s» %d ID d'usuari nous\n"
 
-#: g10/import.c:2332
+#: g10/import.c:2340
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "clau %08lX: «%s» no ha estat modificada\n"
 
-#: g10/import.c:2692 g10/import.c:2887
+#: g10/import.c:2700 g10/import.c:2895
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "clau %08lX: s'ha importat la clau secreta\n"
 
-#: g10/import.c:2700
+#: g10/import.c:2708
 #, fuzzy, c-format
 #| msgid "skipped: secret key already present\n"
 msgid "key %s: secret key already exists\n"
 msgstr "es descarta: la clau secreta ja és present\n"
 
-#: g10/import.c:2708
+#: g10/import.c:2716
 #, fuzzy, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "error mentre s'enviava a «%s»: %s\n"
@@ -3964,69 +3978,69 @@ msgstr "error mentre s'enviava a «%s»: %s\n"
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2877
+#: g10/import.c:2885
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:3024
+#: g10/import.c:3032
 #, fuzzy, c-format
 msgid "secret key %s: %s\n"
 msgstr "no s'ha trobat la clau secreta «%s»: %s\n"
 
-#: g10/import.c:3045 g10/import.c:3084
+#: g10/import.c:3053 g10/import.c:3092
 #, fuzzy, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: g10/import.c:3072
+#: g10/import.c:3080
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "clau %08lX: clau secreta amb xifrat %d no vàlid - es descarta\n"
 
-#: g10/import.c:3234 g10/pkclist.c:75 g10/revoke.c:774
+#: g10/import.c:3242 g10/pkclist.c:75 g10/revoke.c:775
 msgid "No reason specified"
 msgstr "No s'ha especificat cap raó"
 
-#: g10/import.c:3235 g10/pkclist.c:77 g10/revoke.c:776
+#: g10/import.c:3243 g10/pkclist.c:77 g10/revoke.c:777
 msgid "Key is superseded"
 msgstr "La clau ha estat substituïda"
 
-#: g10/import.c:3236 g10/pkclist.c:79 g10/revoke.c:775
+#: g10/import.c:3244 g10/pkclist.c:79 g10/revoke.c:776
 msgid "Key has been compromised"
 msgstr "La clau ha estat compromesa"
 
-#: g10/import.c:3237 g10/pkclist.c:81 g10/revoke.c:777
+#: g10/import.c:3245 g10/pkclist.c:81 g10/revoke.c:778
 msgid "Key is no longer used"
 msgstr "La clau ja no s'usa"
 
-#: g10/import.c:3238 g10/pkclist.c:83 g10/revoke.c:778
+#: g10/import.c:3246 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "L'ID d'usuari ja no és vàlid"
 
-#: g10/import.c:3363 g10/keylist.c:1105 g10/pkclist.c:87
+#: g10/import.c:3371 g10/keylist.c:1105 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "raó de la revocació: "
 
-#: g10/import.c:3382 g10/keylist.c:1124 g10/pkclist.c:103
+#: g10/import.c:3390 g10/keylist.c:1124 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "comentari de la revocació: "
 
-#: g10/import.c:3432
+#: g10/import.c:3440
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "clau %08lX: falta la clau pública: no es pot aplicar el certificat\n"
 "de revocació\n"
 
-#: g10/import.c:3461
+#: g10/import.c:3469
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "clau %08lX: no s'ha trobat el bloc de claus original: %s\n"
 
-#: g10/import.c:3468
+#: g10/import.c:3476
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "clau %08lX: no s'ha pogut llegir el bloc de claus original: %s\n"
@@ -4034,22 +4048,22 @@ msgstr "clau %08lX: no s'ha pogut llegir el bloc de claus original: %s\n"
 # O «rebutjara»? ivb
 # Per tots els canvis d'anglicisme «ignorat» -> «es descarta»,
 # «es rebutja» està bé. jm
-#: g10/import.c:3488
+#: g10/import.c:3496
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "clau %08lX: el certificat de revocació és invàlid: %s: es rebutja\n"
 
-#: g10/import.c:3523
+#: g10/import.c:3531
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "clau %08lX: s'ha importat el certificat de revocació «%s»\n"
 
-#: g10/import.c:3609
+#: g10/import.c:3617
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "clau %08lX: no hi ha ID per a la signatura\n"
 
-#: g10/import.c:3626
+#: g10/import.c:3634
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
@@ -4057,127 +4071,126 @@ msgstr ""
 "«%s»\n"
 "\n"
 
-#: g10/import.c:3628
+#: g10/import.c:3636
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "clau %08lX: l'autosignatura no és vàlida en l'id d'usuari «%s»\n"
 
-#: g10/import.c:3645 g10/import.c:3673 g10/import.c:3729
+#: g10/import.c:3653 g10/import.c:3681 g10/import.c:3737
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "clau %08lX: l'algoritme de clau pública no és suportat\n"
 
-#: g10/import.c:3646
+#: g10/import.c:3654
 #, fuzzy, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "clau %08lX: s'ha afegit la signatura de clau directa\n"
 
-#: g10/import.c:3660
+#: g10/import.c:3668
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "clau %08lX: no hi ha una subclau per a l'enllaç de la clau\n"
 
-#: g10/import.c:3675
+#: g10/import.c:3683
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "clau %08lX: l'enllaç de subclau és invàlid\n"
 
-#: g10/import.c:3694
+#: g10/import.c:3702
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "clau %08lX: s'ha eliminat un enllaç de subclau múltiple\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3726
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "clau %08lX: no hi ha una subclau per a la clau de revocació\n"
 
-#: g10/import.c:3731
+#: g10/import.c:3739
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "clau %08lX: Subclau de revocació no vàlida\n"
 
-#: g10/import.c:3746
+#: g10/import.c:3754
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "clau %08lX: s'han eliminat subclaus de revocació múltiples\n"
 
-#: g10/import.c:3790
+#: g10/import.c:3798
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "clau %08lX: es descarta l'ID d'usuari '"
 
-#: g10/import.c:3817
+#: g10/import.c:3825
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "clau %08lX: es descarta la subclau\n"
 
-#: g10/import.c:3849
+#: g10/import.c:3857
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "clau %08lX: la signatura és inexportable (classe %02x) - es descarta\n"
 
-#: g10/import.c:3860
+#: g10/import.c:3868
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "clau %08lX: el certificat de revocació és en el lloc equivocat - es "
 "descarta\n"
 
-#: g10/import.c:3878
+#: g10/import.c:3886
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "clau %08lX: el certificat de revocació és invàlid: %s - es descarta\n"
 
-#: g10/import.c:3892
+#: g10/import.c:3900
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr ""
 "clau %08lX: la signatura de la subclau és en el lloc equivocat - es "
 "descarta\n"
 
-#: g10/import.c:3900
+#: g10/import.c:3908
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr ""
 "clau %08lX: la classe de signatura és inesperada (0x%02x) - es descarta\n"
 
-#: g10/import.c:4073
+#: g10/import.c:4081
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "clau %08lX: s'ha detectat un ID d'usuari duplicat - es fusiona\n"
 
-#: g10/import.c:4180
+#: g10/import.c:4188
 #, fuzzy, c-format
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr "clau %08lX: s'ha detectat un ID d'usuari duplicat - es fusiona\n"
 
-#: g10/import.c:4245
+#: g10/import.c:4253
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "AV�S: la clau %08lX pot estar revocada: s'adquireix la clau de revocació "
 "%08lX\n"
 
-#: g10/import.c:4261
+#: g10/import.c:4269
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AV�S: la clau %08lX pot estar revocada: la clau de revocació %08lX no està "
 "present.\n"
 
-#: g10/import.c:4327
+#: g10/import.c:4335
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "clau %08lX: s'hi ha afegit el certificat de revocació «%s»\n"
 
-#: g10/import.c:4365
+#: g10/import.c:4373
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "clau %08lX: s'ha afegit la signatura de clau directa\n"
 
-#: g10/key-check.c:133 dirmngr/dirmngr_ldap.c:650 dirmngr/ldap-wrapper.c:835
-#: dirmngr/ldap-wrapper.c:852
+#: g10/key-check.c:133 dirmngr/ldap-wrapper.c:835 dirmngr/ldap-wrapper.c:852
 #, fuzzy, c-format
 msgid "error allocating memory: %s\n"
 msgstr "error en crear l'anell «%s»: %s\n"
@@ -4240,7 +4253,7 @@ msgid ""
 "all signatures.\n"
 msgstr ""
 
-#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:284 sm/keydb.c:297
+#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:289 sm/keydb.c:302
 #, fuzzy, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "error en crear l'anell «%s»: %s\n"
@@ -4251,7 +4264,7 @@ msgstr "error en crear l'anell «%s»: %s\n"
 msgid "error creating keyring '%s': %s\n"
 msgstr "error en crear l'anell «%s»: %s\n"
 
-#: g10/keydb.c:388 sm/keydb.c:303
+#: g10/keydb.c:388 sm/keydb.c:308
 #, fuzzy, c-format
 msgid "keybox '%s' created\n"
 msgstr "s'ha creat l'anell «%s»\n"
@@ -4531,8 +4544,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Signar realment? "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6192 g10/keyedit.c:6275 g10/keyedit.c:6404
-#: g10/keyedit.c:6466 g10/sign.c:528
+#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
+#: g10/keyedit.c:6474 g10/sign.c:528
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Ha fallat el procés de signatura: %s\n"
@@ -4953,7 +4966,7 @@ msgstr "Usuari inexistent.\n"
 msgid "Nothing to sign.\n"
 msgstr "No hi ha res que signar amb la clau %08lX\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6057
+#: g10/keyedit.c:2973 g10/keyedit.c:6065
 #, c-format
 msgid "Not signed by you.\n"
 msgstr ""
@@ -5027,7 +5040,7 @@ msgstr "Aquesta clau pot ser revocada per la clau %s "
 msgid "(sensitive)"
 msgstr " (sensible)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:525
+#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "no s'ha pogut creat %s: %s\n"
@@ -5043,7 +5056,7 @@ msgid "expired: %s"
 msgstr " [caduca: %s]"
 
 #: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2262
-#: g10/keyserver.c:531
+#: g10/keyserver.c:354
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [caduca: %s]"
@@ -5079,14 +5092,14 @@ 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:535
-#: g10/mainproc.c:2280 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
+#: g10/mainproc.c:2282 g10/tofu.c:1789 g10/trust.c:426 dirmngr/ocsp.c:792
 #, fuzzy
 msgid "revoked"
 msgstr "[revocada]"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:539
-#: g10/mainproc.c:2282 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
+#: g10/mainproc.c:2284 g10/tofu.c:1794 g10/trust.c:113
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -5130,7 +5143,7 @@ msgstr "Esteu segur que encara voleu afegir-lo? (s/N) "
 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:3107
+#: g10/keyedit.c:4273 g10/keygen.c:3111
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
@@ -5284,7 +5297,7 @@ msgstr ""
 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:5357 g10/keyedit.c:5495
+#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
 #, 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"
@@ -5293,138 +5306,138 @@ msgstr "es descarta l'autosignatura v3 en l'id d'usuari «%s»\n"
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5380
+#: g10/keyedit.c:5383
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
 
-#: g10/keyedit.c:5381
+#: g10/keyedit.c:5384
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
 
-#: g10/keyedit.c:5441
+#: g10/keyedit.c:5449
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notació de signatura: "
 
-#: g10/keyedit.c:5588
+#: g10/keyedit.c:5596
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Voleu sobreescriure? (s/N) "
 
-#: g10/keyedit.c:5658
+#: g10/keyedit.c:5666
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "No hi ha cap ID amb l'índex %d\n"
 
-#: g10/keyedit.c:5720
+#: g10/keyedit.c:5728
 #, 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:5821
+#: g10/keyedit.c:5829
 #, 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:5843
+#: g10/keyedit.c:5851
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "No hi ha cap ID amb l'índex %d\n"
 
-#: g10/keyedit.c:5984
+#: g10/keyedit.c:5992
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID d'usuari: «"
 
-#: g10/keyedit.c:5987 g10/keyedit.c:6089 g10/keyedit.c:6137
+#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
 #, 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:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
+#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
 msgid " (non-exportable)"
 msgstr " (no-exportable)"
 
-#: g10/keyedit.c:5993
+#: g10/keyedit.c:6001
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Aquesta signatura va caducar el %s.\n"
 
-#: g10/keyedit.c:5998
+#: g10/keyedit.c:6006
 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:6003
+#: g10/keyedit.c:6011
 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:6063
+#: g10/keyedit.c:6071
 #, 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:6092
+#: g10/keyedit.c:6100
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (no-exportable)"
 
-#: g10/keyedit.c:6099
+#: g10/keyedit.c:6107
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocat per %08lX el %s\n"
 
-#: g10/keyedit.c:6124
+#: g10/keyedit.c:6132
 msgid "You are about to revoke these signatures:\n"
 msgstr "Esteu a punt de revocar aquestes signatures:\n"
 
 # (s/N)?  ivb
-#: g10/keyedit.c:6147
+#: g10/keyedit.c:6155
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realment voleu crear els certificats de revocació? (s/N) "
 
-#: g10/keyedit.c:6180
+#: g10/keyedit.c:6188
 #, c-format
 msgid "no secret key\n"
 msgstr "ho hi ha clau secreta\n"
 
-#: g10/keyedit.c:6228
+#: g10/keyedit.c:6236
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6238
+#: g10/keyedit.c:6246
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:6255
+#: g10/keyedit.c:6263
 #, 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:6351
+#: g10/keyedit.c:6359
 #, 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:6389
+#: g10/keyedit.c:6397
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:6451
+#: g10/keyedit.c:6459
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:6548
+#: g10/keyedit.c:6556
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -5435,83 +5448,83 @@ msgstr ""
 msgid "invalid value for option '%s'\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/keygen.c:338
+#: g10/keygen.c:339
 #, fuzzy, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "la preferència %c%lu és duplicada\n"
 
-#: g10/keygen.c:345
+#: g10/keygen.c:346
 #, fuzzy, c-format
 msgid "too many cipher preferences\n"
 msgstr "hi ha massa preferències «%c»\n"
 
-#: g10/keygen.c:347
+#: g10/keygen.c:348
 #, fuzzy, c-format
 msgid "too many digest preferences\n"
 msgstr "hi ha massa preferències «%c»\n"
 
-#: g10/keygen.c:349
+#: g10/keygen.c:350
 #, fuzzy, c-format
 msgid "too many compression preferences\n"
 msgstr "hi ha massa preferències «%c»\n"
 
-#: g10/keygen.c:351
+#: g10/keygen.c:352
 #, fuzzy, c-format
 msgid "too many AEAD preferences\n"
 msgstr "hi ha massa preferències «%c»\n"
 
-#: g10/keygen.c:521
+#: g10/keygen.c:522
 #, fuzzy, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "hi ha un caràcter invàlid en la cadena de preferència\n"
 
-#: g10/keygen.c:1130
+#: g10/keygen.c:1131
 #, c-format
 msgid "writing direct signature\n"
 msgstr "s'està escrivint una signatura directa\n"
 
-#: g10/keygen.c:1176
+#: g10/keygen.c:1177
 #, c-format
 msgid "writing self signature\n"
 msgstr "s'està escrivint l'autosignatura\n"
 
-#: g10/keygen.c:1233
+#: g10/keygen.c:1234
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "s'està escrivint la signatura de comprovació de la clau\n"
 
-#: g10/keygen.c:1598 g10/keygen.c:1603 g10/keygen.c:1655 g10/keygen.c:1660
-#: g10/keygen.c:1832 g10/keygen.c:1837
+#: g10/keygen.c:1599 g10/keygen.c:1604 g10/keygen.c:1656 g10/keygen.c:1661
+#: g10/keygen.c:1833 g10/keygen.c:1838
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "la mida de la clau és invàlida; s'hi usaran %u bits\n"
 
-#: g10/keygen.c:1609 g10/keygen.c:1666 g10/keygen.c:1674 g10/keygen.c:1843
+#: g10/keygen.c:1610 g10/keygen.c:1667 g10/keygen.c:1675 g10/keygen.c:1844
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "la mida de la clau ha estat arrodonida fins a %u bits\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1701
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1899
+#: g10/keygen.c:1900
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1902
+#: g10/keygen.c:1903
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1906
 #, fuzzy
 msgid "Encrypt"
 msgstr "xifra dades"
 
-#: g10/keygen.c:1908
+#: g10/keygen.c:1909
 msgid "Authenticate"
 msgstr ""
 
@@ -5525,180 +5538,180 @@ msgstr ""
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1929
+#: g10/keygen.c:1930
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1967
 #, c-format
 msgid "Possible actions for this %s key: "
 msgstr ""
 
-#: g10/keygen.c:1973
+#: g10/keygen.c:1974
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1979
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1981
+#: g10/keygen.c:1982
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr ""
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1985
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1987
+#: g10/keygen.c:1988
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:2116
+#: g10/keygen.c:2117
 #, fuzzy, c-format
 msgid "   (%d) RSA and RSA%s\n"
 msgstr "   (%d) DSA i ElGamal (predeterminat)\n"
 
-#: g10/keygen.c:2120
+#: g10/keygen.c:2121
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal%s\n"
 msgstr "   (%d) DSA i ElGamal (predeterminat)\n"
 
-#: g10/keygen.c:2123
+#: g10/keygen.c:2124
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "   (%d) DSA (sign only)%s\n"
 msgstr "   (%d) DSA (només signar)\n"
 
-#: g10/keygen.c:2125
+#: g10/keygen.c:2126
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (sign only)\n"
 msgid "   (%d) RSA (sign only)%s\n"
 msgstr "   (%d) RSA (només signar)\n"
 
-#: g10/keygen.c:2131
+#: g10/keygen.c:2132
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)%s\n"
 msgstr "   (%d) ElGamal (només xifrar)\n"
 
-#: g10/keygen.c:2133
+#: g10/keygen.c:2134
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (encrypt only)\n"
 msgid "   (%d) RSA (encrypt only)%s\n"
 msgstr "   (%d) RSA (només xifrar)\n"
 
-#: g10/keygen.c:2139
+#: g10/keygen.c:2140
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)%s\n"
 msgstr "   (%d) DSA (només signar)\n"
 
-#: g10/keygen.c:2141
+#: g10/keygen.c:2142
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (només xifrar)\n"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2148
 #, fuzzy, c-format
 #| msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgid "   (%d) ECC (sign and encrypt)%s\n"
 msgstr "   (%d) ElGamal (signar i xifrar)\n"
 
-#: g10/keygen.c:2147 g10/keygen.c:2678
+#: g10/keygen.c:2148 g10/keygen.c:2679
 #, fuzzy
 #| msgid " (default)"
 msgid " *default*"
 msgstr " (predeterminat)"
 
-#: g10/keygen.c:2148
+#: g10/keygen.c:2149
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "  (%d) ECC (sign only)\n"
 msgstr "   (%d) DSA (només signar)\n"
 
-#: g10/keygen.c:2150
+#: g10/keygen.c:2151
 #, fuzzy, c-format
 msgid "  (%d) ECC (set your own capabilities)%s\n"
 msgstr "   (%d) DSA (només signar)\n"
 
-#: g10/keygen.c:2152
+#: g10/keygen.c:2153
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (encrypt only)\n"
 msgid "  (%d) ECC (encrypt only)%s\n"
 msgstr "   (%d) RSA (només xifrar)\n"
 
-#: g10/keygen.c:2156
+#: g10/keygen.c:2157
 #, fuzzy, c-format
 msgid "  (%d) Existing key%s\n"
 msgstr "   (%d) RSA (només xifrar)\n"
 
-#: g10/keygen.c:2158
+#: g10/keygen.c:2159
 #, fuzzy, c-format
 msgid "  (%d) Existing key from card%s\n"
 msgstr "   (%d) RSA (només xifrar)\n"
 
-#: g10/keygen.c:2254 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2255 sm/certreqgen-ui.c:203
 #, fuzzy
 msgid "Enter the keygrip: "
 msgstr "Notació de signatura: "
 
-#: g10/keygen.c:2267 sm/certreqgen-ui.c:211 tools/gpg-card.c:2280
+#: g10/keygen.c:2268 sm/certreqgen-ui.c:211 tools/gpg-card.c:2297
 #, c-format
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr ""
 
-#: g10/keygen.c:2269 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2270 sm/certreqgen-ui.c:213
 #, fuzzy
 msgid "No key with this keygrip\n"
 msgstr "No hi ha cap ID amb l'índex %d\n"
 
-#: g10/keygen.c:2288 g10/keygen.c:2298 g10/keygen.c:3440 g10/keygen.c:3451
+#: g10/keygen.c:2289 g10/keygen.c:2299 g10/keygen.c:3444 g10/keygen.c:3455
 #: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
 #, fuzzy, c-format
 msgid "error reading the card: %s\n"
 msgstr "%s: error en llegir el registre lliure: %s\n"
 
-#: g10/keygen.c:2292 g10/keygen.c:3444 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2293 g10/keygen.c:3448 sm/certreqgen-ui.c:234
 #, fuzzy, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: g10/keygen.c:2311 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2312 sm/certreqgen-ui.c:246
 #, fuzzy
 msgid "Available keys:\n"
 msgstr "desactiva una clau"
 
-#: g10/keygen.c:2504 g10/keygen.c:2518
+#: g10/keygen.c:2505 g10/keygen.c:2519
 #, fuzzy, c-format
 #| msgid "rounded up to %u bits\n"
 msgid "rounded to %u bits\n"
 msgstr "arrodonida fins a %u bits\n"
 
-#: g10/keygen.c:2559
+#: g10/keygen.c:2560
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:2567
+#: g10/keygen.c:2568
 #, fuzzy, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Quina grandària voleu? (1024) "
 
-#: g10/keygen.c:2584 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2585 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La grandària sol·licitada és %u bits\n"
 
-#: g10/keygen.c:2630
+#: g10/keygen.c:2631
 #, fuzzy
 #| msgid "Please select what kind of key you want:\n"
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Seleccioneu quin tipus de clau voleu:\n"
 
-#: g10/keygen.c:2819
+#: g10/keygen.c:2820
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5714,7 +5727,7 @@ msgstr ""
 "      <n>m = la clau caduca als n mesos\n"
 "      <n>y = la clau caduca als n anys\n"
 
-#: g10/keygen.c:2830
+#: g10/keygen.c:2831
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5730,42 +5743,42 @@ msgstr ""
 "      <n>m = la signatura caduca als n mesos\n"
 "      <n>y = la signatura caduca als n anys\n"
 
-#: g10/keygen.c:2853
+#: g10/keygen.c:2854
 msgid "Key is valid for? (0) "
 msgstr "Indiqueu la validesa de la clau (0) "
 
-#: g10/keygen.c:2858
+#: g10/keygen.c:2859
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Indiqueu la validesa de la signatura (0) "
 
-#: g10/keygen.c:2871 g10/keygen.c:2896
+#: g10/keygen.c:2875 g10/keygen.c:2900
 msgid "invalid value\n"
 msgstr "el valor no és vàlid\n"
 
-#: g10/keygen.c:2878
+#: g10/keygen.c:2882
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s no caduca en absolut\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2883
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s no caduca en absolut\n"
 
-#: g10/keygen.c:2884
+#: g10/keygen.c:2888
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s caduca el %s\n"
 
-#: g10/keygen.c:2885
+#: g10/keygen.c:2889
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Aquesta signatura caduca el %s\n"
 
 # Amb «it» es refereix a les dates?  ivb
 # Això vaig entendre jo. jm
-#: g10/keygen.c:2889
+#: g10/keygen.c:2893
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5773,12 +5786,12 @@ msgstr ""
 "El vostre sistema no pot representar dates posteriors a l'any 2038.\n"
 "Tanmateix, les tractarà bé fins l'any 2106.\n"
 
-#: g10/keygen.c:2902
+#: g10/keygen.c:2906
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "És correcte? (s/n)"
 
-#: g10/keygen.c:2970
+#: g10/keygen.c:2974
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5789,7 +5802,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2985
+#: g10/keygen.c:2989
 #, fuzzy
 msgid ""
 "\n"
@@ -5806,50 +5819,50 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:3004
+#: g10/keygen.c:3008
 msgid "Real name: "
 msgstr "Nom i cognoms: "
 
-#: g10/keygen.c:3013
+#: g10/keygen.c:3017
 msgid "Invalid character in name\n"
 msgstr "Hi ha un caràcter invàlid en el camp *nom*\n"
 
-#: g10/keygen.c:3014
+#: g10/keygen.c:3018
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:3018
+#: g10/keygen.c:3022
 msgid "Name may not start with a digit\n"
 msgstr "El nom no pot començar amb un dígit\n"
 
-#: g10/keygen.c:3021
+#: g10/keygen.c:3025
 msgid "Name must be at least 5 characters long\n"
 msgstr "El nom ha de tenir, si més no, 5 caràcters\n"
 
-#: g10/keygen.c:3031
+#: g10/keygen.c:3035
 msgid "Email address: "
 msgstr "Adreça electrònica: "
 
-#: g10/keygen.c:3037
+#: g10/keygen.c:3041
 msgid "Not a valid email address\n"
 msgstr "No és una adreça vàlida\n"
 
-#: g10/keygen.c:3046
+#: g10/keygen.c:3050
 msgid "Comment: "
 msgstr "Comentari: "
 
-#: g10/keygen.c:3052
+#: g10/keygen.c:3056
 msgid "Invalid character in comment\n"
 msgstr "Hi ha un caràcter invàlid en el camp *comentari*\n"
 
-#: g10/keygen.c:3088
+#: g10/keygen.c:3092
 #, fuzzy, c-format
 #| msgid "You are using the `%s' character set.\n"
 msgid "You are using the '%s' character set.\n"
 msgstr "Esteu usant el joc de caràcters `%s'.\n"
 
-#: g10/keygen.c:3094
+#: g10/keygen.c:3098
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5860,7 +5873,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3099
+#: g10/keygen.c:3103
 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"
 
@@ -5877,35 +5890,35 @@ msgstr "No inclogueu l'adreça ni en el camp *nom* ni en el camp *comentari*\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3124
+#: g10/keygen.c:3128
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoXx"
 
-#: g10/keygen.c:3134
+#: g10/keygen.c:3138
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Canvia (N)om, (C)omentari, (E)mail o (X) ix "
 
-#: g10/keygen.c:3135
+#: g10/keygen.c:3139
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Canvia (N)om, (C)omentari, (E)mail o (O) d'acord / (X) ix"
 
-#: g10/keygen.c:3140
+#: g10/keygen.c:3144
 #, fuzzy
 #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Canvia (N)om, (C)omentari, (E)mail o (X) ix "
 
-#: g10/keygen.c:3141
+#: g10/keygen.c:3145
 #, fuzzy
 #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "Canvia (N)om, (C)omentari, (E)mail o (O) d'acord / (X) ix"
 
-#: g10/keygen.c:3160
+#: g10/keygen.c:3164
 msgid "Please correct the error first\n"
 msgstr "Corregiu l'error primer\n"
 
-#: g10/keygen.c:3206
+#: g10/keygen.c:3210
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -5917,18 +5930,18 @@ msgstr ""
 "nombres primers; açò dóna oportunitat al generador de nombres aleatoris\n"
 "d'aconseguir prou entropia.\n"
 
-#: g10/keygen.c:3591
+#: g10/keygen.c:3595
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4590 g10/keygen.c:4663 g10/keygen.c:4681 g10/keygen.c:4710
-#: g10/keygen.c:5086 g10/keygen.c:5632 g10/keygen.c:5943 g10/keygen.c:6050
+#: g10/keygen.c:4594 g10/keygen.c:4667 g10/keygen.c:4685 g10/keygen.c:4714
+#: g10/keygen.c:5113 g10/keygen.c:5663 g10/keygen.c:5974 g10/keygen.c:6081
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "La generació de claus ha fallat: %s\n"
 
-#: g10/keygen.c:4599
+#: g10/keygen.c:4603
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5936,70 +5949,70 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:4601
+#: g10/keygen.c:4605
 msgid "Continue? (Y/n) "
 msgstr ""
 
-#: g10/keygen.c:4622
+#: g10/keygen.c:4626
 #, fuzzy, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "«%s» ja està comprimida\n"
 
-#: g10/keygen.c:4627
+#: g10/keygen.c:4631
 #, fuzzy
 #| msgid "Create anyway? "
 msgid "Create anyway? (y/N) "
 msgstr "Voleu crear la clau de tota manera? "
 
-#: g10/keygen.c:4633
+#: g10/keygen.c:4637
 #, fuzzy, c-format
 #| msgid "Create anyway? "
 msgid "creating anyway\n"
 msgstr "Voleu crear la clau de tota manera? "
 
-#: g10/keygen.c:5069
+#: g10/keygen.c:5096
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 
-#: g10/keygen.c:5118
+#: g10/keygen.c:5145
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "La generació de claus ha estat cancel·lada.\n"
 
-#: g10/keygen.c:5178
+#: g10/keygen.c:5205
 #, fuzzy, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: g10/keygen.c:5198
+#: g10/keygen.c:5225
 #, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr ""
 
-#: g10/keygen.c:5359 g10/keygen.c:5561
+#: g10/keygen.c:5389 g10/keygen.c:5591
 #, fuzzy, c-format
 #| msgid "writing public key to `%s'\n"
 msgid "writing public key to '%s'\n"
 msgstr "s'està escrivint la clau pública a «%s»\n"
 
 # Potser no hi haja cap anell! ivb
-#: g10/keygen.c:5555
+#: g10/keygen.c:5585
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "no s'ha trobat cap anell públic escrivible: %s\n"
 
-#: g10/keygen.c:5569
+#: g10/keygen.c:5599
 #, fuzzy, c-format
 #| msgid "error writing public keyring `%s': %s\n"
 msgid "error writing public keyring '%s': %s\n"
 msgstr "s'ha produït un error mentre s'escrivia l'anell públic «%s»: %s\n"
 
-#: g10/keygen.c:5603
+#: g10/keygen.c:5634
 msgid "public and secret key created and signed.\n"
 msgstr "s'han creat i signat les claus pública i secreta.\n"
 
-#: g10/keygen.c:5619
+#: g10/keygen.c:5650
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -6009,7 +6022,7 @@ msgstr ""
 "\"--edit-key\" per a generar una clau secundària per a tal propòsit.\n"
 
 # Werner FIXME: Use ngettext. jm
-#: g10/keygen.c:5801 g10/keygen.c:6000
+#: g10/keygen.c:5832 g10/keygen.c:6031
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -6018,7 +6031,7 @@ msgstr ""
 "amb el rellotge)\n"
 
 # Werner FIXME: use ngettext. jm
-#: g10/keygen.c:5803 g10/keygen.c:6002
+#: g10/keygen.c:5834 g10/keygen.c:6033
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -6026,23 +6039,23 @@ msgstr ""
 "la clau s'ha creat %lu segons en el futur (salt en el temps o problemes\n"
 "amb el rellotge)\n"
 
-#: g10/keygen.c:5814 g10/keygen.c:6013
+#: g10/keygen.c:5845 g10/keygen.c:6044
 #, fuzzy, c-format
 #| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOTA: crear subclaus per a claus v3 no és conforme amb OpenPGP\n"
 
-#: g10/keygen.c:5826 g10/keygen.c:5828
+#: g10/keygen.c:5857 g10/keygen.c:5859
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Les parts secretes de la clau primària no estan disponibles.\n"
 
-#: g10/keygen.c:5835 g10/keygen.c:5837
+#: g10/keygen.c:5866 g10/keygen.c:5868
 #, fuzzy, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Les parts secretes de la clau primària no estan disponibles.\n"
 
-#: g10/keygen.c:5857 g10/keygen.c:6027
+#: g10/keygen.c:5888 g10/keygen.c:6058
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Crear realment? "
@@ -6125,19 +6138,19 @@ msgstr "     Empremta digital ="
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1467
+#: g10/keyring.c:1477
 #, fuzzy, c-format
 msgid "caching keyring '%s'\n"
 msgstr "s'està comprovant l'anell «%s»\n"
 
-#: g10/keyring.c:1541
+#: g10/keyring.c:1551
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signature)\n"
 msgid_plural "%lu keys cached so far (%lu signatures)\n"
 msgstr[0] "s'han comprovat %lu claus (%lu signatures)\n"
 msgstr[1] "s'han comprovat %lu claus (%lu signatures)\n"
 
-#: g10/keyring.c:1557
+#: g10/keyring.c:1567
 #, fuzzy, c-format
 #| msgid "\t%lu keys updated\n"
 msgid "%lu key cached"
@@ -6145,7 +6158,7 @@ msgid_plural "%lu keys cached"
 msgstr[0] "\t%lu clau actualitzades\n"
 msgstr[1] "\t%lu clau actualitzades\n"
 
-#: g10/keyring.c:1559
+#: g10/keyring.c:1569
 #, fuzzy, c-format
 #| msgid "1 bad signature\n"
 msgid " (%lu signature)\n"
@@ -6155,7 +6168,7 @@ msgstr[1] "1 signatura errònia\n"
 
 # Fitxer indi fins final.  Hau!  ivb
 # Grrr. Com em tracten els esclaus ja... jm
-#: g10/keyring.c:1636
+#: g10/keyring.c:1646
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: s'ha creat l'anell\n"
@@ -6185,79 +6198,74 @@ msgstr ""
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "la URL de política de signatura donada no és vàlida\n"
 
-#: g10/keyserver.c:537
+#: g10/keyserver.c:360
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:740
+#: g10/keyserver.c:563
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:846
+#: g10/keyserver.c:669
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr ""
 
-#: g10/keyserver.c:986 g10/keyserver.c:1096
+#: g10/keyserver.c:809 g10/keyserver.c:919
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: no és un ID vàlid\n"
 
-#: g10/keyserver.c:1420 g10/keyserver.c:1453
+#: g10/keyserver.c:1217 g10/keyserver.c:1250
 #, 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:1427
+#: g10/keyserver.c:1224
 #, 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:1531
+#: g10/keyserver.c:1316
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "no s'ha trobat la clau «%s»: %s\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1319
 #, fuzzy, c-format
 msgid "key not found on keyserver\n"
 msgstr "no s'ha trobat la clau «%s»: %s\n"
 
-#: g10/keyserver.c:1722
-#, fuzzy, c-format
-msgid "requesting key %s from %s server %s\n"
-msgstr "s'està sol·licitant la clau %08lX de %s\n"
-
-#: g10/keyserver.c:1726
+#: g10/keyserver.c:1481
 #, 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:1841 g10/keyserver.c:2020
+#: g10/keyserver.c:1600 g10/keyserver.c:1793
 #, fuzzy, c-format
 msgid "no keyserver known\n"
 msgstr "error de servidor de claus"
 
-#: g10/keyserver.c:1856 g10/skclist.c:213 g10/skclist.c:241
+#: g10/keyserver.c:1615 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:1860
+#: g10/keyserver.c:1619
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1901
+#: g10/keyserver.c:1662
 #, fuzzy, c-format
 msgid "requesting key from '%s'\n"
 msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1917
+#: g10/keyserver.c:1680
 #, 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"
@@ -6284,259 +6292,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:472
+#: g10/mainproc.c:473
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "la clau pública és %08lX\n"
 
-#: g10/mainproc.c:524
+#: g10/mainproc.c:525
 #, 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:528 g10/pkclist.c:231
+#: g10/mainproc.c:529 g10/pkclist.c:231
 #, c-format
 msgid "      \"%s\"\n"
 msgstr ""
 
-#: g10/mainproc.c:532
+#: g10/mainproc.c:533
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "xifrat amb una clau %s, ID %08lX\n"
 
-#: g10/mainproc.c:552 g10/mainproc.c:935
+#: g10/mainproc.c:553 g10/mainproc.c:937
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:560
+#: g10/mainproc.c:561
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "xifrat amb %lu contrasenyes\n"
 
 # FIXME WK: Use ngettext
-#: g10/mainproc.c:562
+#: g10/mainproc.c:563
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "xifrat amb 1 contrasenya\n"
 
-#: g10/mainproc.c:577 g10/mainproc.c:602
+#: g10/mainproc.c:578 g10/mainproc.c:603
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "ha fallat el desxifratge amb la clau pública: %s\n"
 
-#: g10/mainproc.c:613
+#: g10/mainproc.c:614
 #, 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:642 g10/mainproc.c:663
+#: g10/mainproc.c:643 g10/mainproc.c:664
 #, 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:649
+#: g10/mainproc.c:650
 #, 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:742 g10/mainproc.c:780
+#: g10/mainproc.c:744 g10/mainproc.c:782
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AV�S: el missatge no tenia protecció d'integritat\n"
 
-#: g10/mainproc.c:753
+#: g10/mainproc.c:755
 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:756
+#: g10/mainproc.c:758
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:761
+#: g10/mainproc.c:763
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "ha fallat el desxifratge: %s\n"
 
-#: g10/mainproc.c:773
+#: g10/mainproc.c:775
 #, c-format
 msgid "decryption okay\n"
 msgstr "desxifratge correcte\n"
 
-#: g10/mainproc.c:786
+#: g10/mainproc.c:788
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AV�S: el missatge xifrat ha estat manipulat!\n"
 
-#: g10/mainproc.c:804
+#: g10/mainproc.c:806
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "ha fallat el desxifratge: %s\n"
 
-#: g10/mainproc.c:851
+#: g10/mainproc.c:853
 #, 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:858
+#: g10/mainproc.c:860
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nom del fitxer original='%.*s'\n"
 
-#: g10/mainproc.c:1135
+#: g10/mainproc.c:1137
 #, 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:1440 g10/mainproc.c:1483
+#: g10/mainproc.c:1442 g10/mainproc.c:1485
 #, fuzzy, c-format
 msgid "no signature found\n"
 msgstr "Signatura correcta de \""
 
-#: g10/mainproc.c:1763
+#: g10/mainproc.c:1765
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Signatura INCORRECTA de \""
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1767
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Signatura caducada de \""
 
-#: g10/mainproc.c:1767
+#: g10/mainproc.c:1769
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Signatura correcta de \""
 
-#: g10/mainproc.c:1789
+#: g10/mainproc.c:1791
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "s'ha eliminat la verificació de signatura\n"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1905
 #, 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:1919 g10/mainproc.c:1926
+#: g10/mainproc.c:1921 g10/mainproc.c:1928
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Aquesta signatura va caducar el %s\n"
 
-#: g10/mainproc.c:1920 g10/mainproc.c:1927 sm/verify.c:480
+#: g10/mainproc.c:1922 g10/mainproc.c:1929 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:1931
+#: g10/mainproc.c:1933
 #, 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:1937
+#: g10/mainproc.c:1939
 #, fuzzy, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "              alias \""
 
-#: g10/mainproc.c:1992
+#: g10/mainproc.c:1994
 #, c-format
 msgid "Key available at: "
 msgstr "La clau és disponible en: "
 
-#: g10/mainproc.c:2034
+#: g10/mainproc.c:2036
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2234
+#: g10/mainproc.c:2236
 msgid "[uncertain]"
 msgstr "[incert]"
 
-#: g10/mainproc.c:2272
+#: g10/mainproc.c:2274
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "              alias \""
 
-#: g10/mainproc.c:2347
+#: g10/mainproc.c:2349
 #, 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:2363
+#: g10/mainproc.c:2365
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Aquesta signatura va caducar el %s\n"
 
-#: g10/mainproc.c:2368
+#: g10/mainproc.c:2370
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Aquesta signatura caduca el %s\n"
 
-#: g10/mainproc.c:2379
+#: g10/mainproc.c:2381
 #, 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:2380
+#: g10/mainproc.c:2382
 msgid "binary"
 msgstr "binari"
 
-#: g10/mainproc.c:2381
+#: g10/mainproc.c:2383
 msgid "textmode"
 msgstr "mode text"
 
-#: g10/mainproc.c:2381 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2383 g10/trust.c:112 dirmngr/ocsp.c:793
 msgid "unknown"
 msgstr "desconeguda"
 
-#: g10/mainproc.c:2383
+#: g10/mainproc.c:2385
 #, fuzzy
 #| msgid "unknown pubkey algorithm"
 msgid ", key algorithm "
 msgstr "l'algoritme de clau pública és desconegut"
 
-#: g10/mainproc.c:2418
+#: g10/mainproc.c:2420
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2457
+#: g10/mainproc.c:2459
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "No s'ha pogut comprovar la signatura: %s\n"
 
-#: g10/mainproc.c:2553 g10/mainproc.c:2572 g10/mainproc.c:2696
+#: g10/mainproc.c:2555 g10/mainproc.c:2574 g10/mainproc.c:2698
 #, c-format
 msgid "not a detached signature\n"
 msgstr "no és una signatura separada\n"
 
-#: g10/mainproc.c:2606
+#: g10/mainproc.c:2608
 #, 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:2615
+#: g10/mainproc.c:2617
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "signatura autònoma de classe 0x%02x\n"
 
-#: g10/mainproc.c:2700
+#: g10/mainproc.c:2702
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signatura de l'estil antic (PGP 2.x)\n"
@@ -6729,51 +6737,56 @@ msgstr "Notació de signatura crítica: "
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "el subpaquet de tipus %d té el bit crític activat\n"
 
-#: g10/passphrase.c:208
+#: g10/passphrase.c:201 sm/decrypt.c:669
+#, fuzzy
+msgid "Please enter the passphrase for decryption."
+msgstr "canvia la contrasenya"
+
+#: g10/passphrase.c:203
 msgid "Enter passphrase\n"
 msgstr "Introduïu la contrasenya\n"
 
-#: g10/passphrase.c:219
+#: g10/passphrase.c:227
 #, c-format
 msgid "cancelled by user\n"
 msgstr "s'ha cancel·lat per l'usuari\n"
 
-#: g10/passphrase.c:460
+#: g10/passphrase.c:472
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID de la clau principal %08lX)"
 
-#: g10/passphrase.c:467
+#: g10/passphrase.c:479
 #, fuzzy
 msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
-#: g10/passphrase.c:471
+#: g10/passphrase.c:483
 #, fuzzy
 msgid "Please enter the passphrase to import the OpenPGP secret key:"
 msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
-#: g10/passphrase.c:476
+#: g10/passphrase.c:488
 #, fuzzy
 msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
-#: g10/passphrase.c:479
+#: g10/passphrase.c:491
 #, fuzzy
 msgid "Please enter the passphrase to export the OpenPGP secret key:"
 msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
-#: g10/passphrase.c:484
+#: g10/passphrase.c:496
 #, fuzzy
 msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 msgstr "Realment voleu eliminar les claus seleccionades? "
 
-#: g10/passphrase.c:487
+#: g10/passphrase.c:499
 #, fuzzy
 msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgstr "Realment voleu eliminar les claus seleccionades? "
 
-#: g10/passphrase.c:496
+#: g10/passphrase.c:508
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -6949,7 +6962,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:313 g10/revoke.c:803
+#: g10/pkclist.c:313 g10/revoke.c:804
 msgid "Your decision? "
 msgstr "La vostra decisió? "
 
@@ -7251,7 +7264,7 @@ msgstr "no s'han pogut obrir les dades signades `%s'\n"
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "no s'han pogut obrir les dades signades `%s'\n"
 
-#: g10/pubkey-enc.c:99 sm/decrypt.c:879
+#: g10/pubkey-enc.c:99 sm/decrypt.c:1329
 #, fuzzy, c-format
 msgid "key %s is not suitable for decryption in %s mode\n"
 msgstr "clau %08lX: sense ID\n"
@@ -7300,7 +7313,7 @@ msgid "Note: key has been revoked"
 msgstr "NOTA: aquesta clau ha estat revocada!"
 
 #: g10/revoke.c:100 g10/revoke.c:126 g10/revoke.c:172 g10/revoke.c:184
-#: g10/revoke.c:502
+#: g10/revoke.c:503
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "ha fallat build_packet: %s\n"
@@ -7329,11 +7342,11 @@ msgstr "La clau secreta està disponible.\n"
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Voleu crear un certificat de revocació per a aquesta clau? "
 
-#: g10/revoke.c:334 g10/revoke.c:744
+#: g10/revoke.c:334 g10/revoke.c:745
 msgid "ASCII armored output forced.\n"
 msgstr "s'ha forçat l'eixida d'armadura ASCII.\n"
 
-#: g10/revoke.c:350 g10/revoke.c:481
+#: g10/revoke.c:350 g10/revoke.c:482
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "ha fallat make_keysig_packet: %s\n"
@@ -7347,19 +7360,19 @@ msgstr "S'ha creat el certificat de revocació.\n"
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "no s'han ttrobat claus de revocació per a «%s»\n"
 
-#: g10/revoke.c:567
+#: g10/revoke.c:568
 #, fuzzy
 msgid "This is a revocation certificate for the OpenPGP key:"
 msgstr "Voleu crear un certificat de revocació per a aquesta clau? "
 
-#: g10/revoke.c:583
+#: g10/revoke.c:584
 msgid ""
 "A revocation certificate is a kind of \"kill switch\" to publicly\n"
 "declare that a key shall not anymore be used.  It is not possible\n"
 "to retract such a revocation certificate once it has been published."
 msgstr ""
 
-#: g10/revoke.c:586
+#: g10/revoke.c:587
 msgid ""
 "Use it to revoke this key in case of a compromise or loss of\n"
 "the secret key.  However, if the secret key is still accessible,\n"
@@ -7368,20 +7381,20 @@ msgid ""
 "of the gpg command \"--generate-revocation\" in the GnuPG manual."
 msgstr ""
 
-#: g10/revoke.c:592
+#: g10/revoke.c:593
 msgid ""
 "To avoid an accidental use of this file, a colon has been inserted\n"
 "before the 5 dashes below.  Remove this colon with a text editor\n"
 "before importing and publishing this revocation certificate."
 msgstr ""
 
-#: g10/revoke.c:611
+#: g10/revoke.c:612
 #, fuzzy, c-format
 #| msgid "Revocation certificate created.\n"
 msgid "revocation certificate stored as '%s.rev'\n"
 msgstr "S'ha creat el certificat de revocació.\n"
 
-#: g10/revoke.c:655
+#: g10/revoke.c:656
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found\n"
 msgstr "no s'ha trobat la clau secreta «%s»: %s\n"
@@ -7389,23 +7402,23 @@ msgstr "no s'ha trobat la clau secreta «%s»: %s\n"
 #. TRANSLATORS: The %s prints a key specification which
 #. for example has been given at the command line.  Several lines
 #. lines with secret key infos are printed after this message.
-#: g10/revoke.c:680
+#: g10/revoke.c:681
 #, c-format
 msgid "'%s' matches multiple secret keys:\n"
 msgstr ""
 
-#: g10/revoke.c:705
+#: g10/revoke.c:706
 #, fuzzy, c-format
 #| msgid "error creating keyring `%s': %s\n"
 msgid "error searching the keyring: %s\n"
 msgstr "error en crear l'anell «%s»: %s\n"
 
-#: g10/revoke.c:728
+#: g10/revoke.c:729
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Voleu crear un certificat de revocació per a aquesta clau? "
 
-#: g10/revoke.c:752
+#: g10/revoke.c:753
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -7424,34 +7437,34 @@ msgstr ""
 "d'impressió de la vostra màquina podria emmagatzemar les dades i fer-les\n"
 "disponibles a altres!\n"
 
-#: g10/revoke.c:786
+#: g10/revoke.c:787
 msgid "Please select the reason for the revocation:\n"
 msgstr "Seleccioneu la raó de la revocació:\n"
 
-#: g10/revoke.c:796
+#: g10/revoke.c:797
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: g10/revoke.c:798
+#: g10/revoke.c:799
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Segurament voleu seleccionar %d ací)\n"
 
-#: g10/revoke.c:839
+#: g10/revoke.c:843
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 "Introduïu una descripció opcional; finalitzeu amb una línia en blanc:\n"
 
-#: g10/revoke.c:867
+#: g10/revoke.c:871
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Raó de la revocació: %s\n"
 
-#: g10/revoke.c:869
+#: g10/revoke.c:873
 msgid "(No description given)\n"
 msgstr "(No es va donar una descripció)\n"
 
-#: g10/revoke.c:874
+#: g10/revoke.c:878
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "És açò correcte? "
@@ -7636,24 +7649,24 @@ msgstr "signatura:"
 msgid "%s.%s encryption will be used\n"
 msgstr "s'utilitzarà xifratge %s\n"
 
-#: g10/skclist.c:172 g10/skclist.c:253
+#: g10/skclist.c:173 g10/skclist.c:254
 #, c-format
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "la clau no està marcada com a insegura - no es pot utilitzar amb el GNA "
 "fals!\n"
 
-#: g10/skclist.c:204
+#: g10/skclist.c:205
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "es descarta «%s»: duplicat\n"
 
-#: g10/skclist.c:223
+#: g10/skclist.c:224
 #, c-format
 msgid "skipped: secret key already present\n"
 msgstr "es descarta: la clau secreta ja és present\n"
 
-#: g10/skclist.c:242
+#: g10/skclist.c:243
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
@@ -7890,10 +7903,10 @@ msgstr ""
 msgid "TOFU DB error"
 msgstr ""
 
-#: g10/tofu.c:687 g10/tofu.c:2073 g10/tofu.c:2354 g10/tofu.c:2373
-#: g10/tofu.c:2386 g10/tofu.c:2398 g10/tofu.c:2413 g10/tofu.c:2425
-#: g10/tofu.c:3021 g10/tofu.c:3038 g10/tofu.c:3075 g10/tofu.c:3092
-#: g10/tofu.c:3404
+#: g10/tofu.c:687 g10/tofu.c:2077 g10/tofu.c:2358 g10/tofu.c:2377
+#: g10/tofu.c:2390 g10/tofu.c:2402 g10/tofu.c:2417 g10/tofu.c:2429
+#: g10/tofu.c:3025 g10/tofu.c:3042 g10/tofu.c:3079 g10/tofu.c:3096
+#: g10/tofu.c:3408
 #, fuzzy, c-format
 msgid "error reading TOFU database: %s\n"
 msgstr "error mentre s'enviava a «%s»: %s\n"
@@ -7915,7 +7928,7 @@ msgstr "%s: error en escriure el registre de directoris: %s\n"
 msgid "error opening TOFU database '%s': %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: g10/tofu.c:1148 g10/tofu.c:3458 g10/tofu.c:3604
+#: g10/tofu.c:1148 g10/tofu.c:3462 g10/tofu.c:3608
 #, fuzzy, c-format
 msgid "error updating TOFU database: %s\n"
 msgstr "error mentre s'enviava a «%s»: %s\n"
@@ -7955,43 +7968,43 @@ msgstr "error en crear «%s»: %s\n"
 msgid "This key's user IDs:\n"
 msgstr "llista claus i ID"
 
-#: g10/tofu.c:1634 g10/tofu.c:1799
+#: g10/tofu.c:1634 g10/tofu.c:1801
 #, fuzzy, c-format
 #| msgid "Policy: "
 msgid "policy: %s"
 msgstr "Política: "
 
-#: g10/tofu.c:1725
+#: g10/tofu.c:1727
 #, fuzzy, c-format
 msgid "error gathering signature stats: %s\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: g10/tofu.c:1729
+#: g10/tofu.c:1731
 #, c-format
 msgid "The email address \"%s\" is associated with %d key:\n"
 msgid_plural "The email address \"%s\" is associated with %d keys:\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1747
+#: g10/tofu.c:1749
 #, c-format
 msgid "Statistics for keys with the email address \"%s\":\n"
 msgstr ""
 
-#: g10/tofu.c:1797
+#: g10/tofu.c:1799
 #, fuzzy
 #| msgid "list keys"
 msgid "this key"
 msgstr "llista claus"
 
-#: g10/tofu.c:1823
+#: g10/tofu.c:1825
 #, fuzzy, c-format
 msgid "Verified %d message."
 msgid_plural "Verified %d messages."
 msgstr[0] "|algo [fitxers]|imprimeix resums de missatges"
 msgstr[1] "|algo [fitxers]|imprimeix resums de missatges"
 
-#: g10/tofu.c:1827
+#: g10/tofu.c:1829
 #, fuzzy, c-format
 #| msgid "encrypted with %lu passphrases\n"
 msgid "Encrypted %d message."
@@ -7999,68 +8012,68 @@ msgid_plural "Encrypted %d messages."
 msgstr[0] "xifrat amb %lu contrasenyes\n"
 msgstr[1] "xifrat amb %lu contrasenyes\n"
 
-#: g10/tofu.c:1834
+#: g10/tofu.c:1836
 #, fuzzy, c-format
 msgid "Verified %d message in the future."
 msgid_plural "Verified %d messages in the future."
 msgstr[0] "|algo [fitxers]|imprimeix resums de missatges"
 msgstr[1] "|algo [fitxers]|imprimeix resums de missatges"
 
-#: g10/tofu.c:1838
+#: g10/tofu.c:1840
 #, fuzzy, c-format
 msgid "Encrypted %d message in the future."
 msgid_plural "Encrypted %d messages in the future."
 msgstr[0] "|algo [fitxers]|imprimeix resums de missatges"
 msgstr[1] "|algo [fitxers]|imprimeix resums de missatges"
 
-#: g10/tofu.c:1852
+#: g10/tofu.c:1854
 #, c-format
 msgid "Messages verified over the past %d day: %d."
 msgid_plural "Messages verified over the past %d days: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1858
+#: g10/tofu.c:1860
 #, c-format
 msgid "Messages encrypted over the past %d day: %d."
 msgid_plural "Messages encrypted over the past %d days: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1868
+#: g10/tofu.c:1870
 #, c-format
 msgid "Messages verified over the past %d month: %d."
 msgid_plural "Messages verified over the past %d months: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1874
+#: g10/tofu.c:1876
 #, c-format
 msgid "Messages encrypted over the past %d month: %d."
 msgid_plural "Messages encrypted over the past %d months: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1884
+#: g10/tofu.c:1886
 #, c-format
 msgid "Messages verified over the past %d year: %d."
 msgid_plural "Messages verified over the past %d years: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1890
+#: g10/tofu.c:1892
 #, c-format
 msgid "Messages encrypted over the past %d year: %d."
 msgid_plural "Messages encrypted over the past %d years: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1898
+#: g10/tofu.c:1900
 #, c-format
 msgid "Messages verified in the past: %d."
 msgstr ""
 
-#: g10/tofu.c:1902
+#: g10/tofu.c:1904
 #, fuzzy, c-format
 msgid "Messages encrypted in the past: %d."
 msgstr "|algo [fitxers]|imprimeix resums de missatges"
@@ -8068,131 +8081,131 @@ msgstr "|algo [fitxers]|imprimeix resums de missatges"
 #. TRANSLATORS: Please translate the text found in the source
 #. * file below.  We don't directly internationalize that text so
 #. * that we can tweak it without breaking translations.
-#: g10/tofu.c:1919
+#: g10/tofu.c:1921
 msgid "TOFU detected a binding conflict"
 msgstr ""
 
 #. TRANSLATORS: Two letters (normally the lower and upper case
 #. * version of the hotkey) for each of the five choices.  If
 #. * there is only one choice in your language, repeat it.
-#: g10/tofu.c:1961
+#: g10/tofu.c:1963
 msgid "gGaAuUrRbB"
 msgstr ""
 
-#: g10/tofu.c:1967
+#: g10/tofu.c:1969
 msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 
-#: g10/tofu.c:1975
+#: g10/tofu.c:1978
 msgid "Defaulting to unknown.\n"
 msgstr ""
 
-#: g10/tofu.c:2093 g10/tofu.c:2228
+#: g10/tofu.c:2097 g10/tofu.c:2232
 #, c-format
 msgid "TOFU db corruption detected.\n"
 msgstr ""
 
-#: g10/tofu.c:2829
+#: g10/tofu.c:2833
 #, fuzzy, c-format
 msgid "error changing TOFU policy: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: g10/tofu.c:2880
+#: g10/tofu.c:2884
 #, c-format
 msgid "%lld~year"
 msgid_plural "%lld~years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2885
+#: g10/tofu.c:2889
 #, c-format
 msgid "%lld~month"
 msgid_plural "%lld~months"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2890
+#: g10/tofu.c:2894
 #, c-format
 msgid "%lld~week"
 msgid_plural "%lld~weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2895
+#: g10/tofu.c:2899
 #, c-format
 msgid "%lld~day"
 msgid_plural "%lld~days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2900
+#: g10/tofu.c:2904
 #, c-format
 msgid "%lld~hour"
 msgid_plural "%lld~hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2905
+#: g10/tofu.c:2909
 #, c-format
 msgid "%lld~minute"
 msgid_plural "%lld~minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2907
+#: g10/tofu.c:2911
 #, c-format
 msgid "%lld~second"
 msgid_plural "%lld~seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:3145
+#: g10/tofu.c:3149
 #, c-format
 msgid "%s: Verified 0~signatures and encrypted 0~messages."
 msgstr ""
 
 # Werner FIXME: use ngettext. jm
-#: g10/tofu.c:3151
+#: g10/tofu.c:3155
 #, fuzzy, c-format
 #| msgid "Deleted %d signatures.\n"
 msgid "%s: Verified 0 signatures."
 msgstr "S'han esborrat %d signatures.\n"
 
-#: g10/tofu.c:3165
+#: g10/tofu.c:3169
 #, fuzzy
 #| msgid "encrypted with %lu passphrases\n"
 msgid "Encrypted 0 messages."
 msgstr "xifrat amb %lu contrasenyes\n"
 
-#: g10/tofu.c:3181
+#: g10/tofu.c:3185
 #, fuzzy, c-format
 #| msgid "Policy: "
 msgid "(policy: %s)"
 msgstr "Política: "
 
-#: g10/tofu.c:3215
+#: g10/tofu.c:3219
 #, c-format
 msgid ""
 "Warning: we have yet to see a message signed using this key and user id!\n"
 msgstr ""
 
-#: g10/tofu.c:3218
+#: g10/tofu.c:3222
 #, c-format
 msgid ""
 "Warning: we've only seen one message signed using this key and user id!\n"
 msgstr ""
 
-#: g10/tofu.c:3222
+#: g10/tofu.c:3226
 #, c-format
 msgid "Warning: you have yet to encrypt a message to this key!\n"
 msgstr ""
 
-#: g10/tofu.c:3225
+#: g10/tofu.c:3229
 #, c-format
 msgid "Warning: you have only encrypted one message to this key!\n"
 msgstr ""
 
-#: g10/tofu.c:3254
+#: g10/tofu.c:3258
 #, c-format
 msgid ""
 "Warning: if you think you've seen more signatures by this key and user id, "
@@ -8209,13 +8222,13 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:3339 g10/tofu.c:3502 g10/tofu.c:3708 g10/tofu.c:3761
-#: g10/tofu.c:3902 g10/tofu.c:3979 g10/tofu.c:4017
+#: g10/tofu.c:3343 g10/tofu.c:3506 g10/tofu.c:3712 g10/tofu.c:3765
+#: g10/tofu.c:3906 g10/tofu.c:3983 g10/tofu.c:4021
 #, fuzzy, c-format
 msgid "error opening TOFU database: %s\n"
 msgstr "error mentre s'enviava a «%s»: %s\n"
 
-#: g10/tofu.c:3535
+#: g10/tofu.c:3539
 #, c-format
 msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
 msgstr ""
@@ -8285,7 +8298,7 @@ msgstr ""
 "no és necessària una comprovació de la base de dades de confiança\n"
 "\n"
 
-#: g10/trustdb.c:601 g10/trustdb.c:2272
+#: g10/trustdb.c:601 g10/trustdb.c:2273
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "la pròxima comprovació de la base de dades de confiança serà el %s\n"
@@ -8319,14 +8332,14 @@ msgstr "si us plau, feu un --check-trustdb\n"
 msgid "checking the trustdb\n"
 msgstr "s'està comprovant la base de dades de confiança\n"
 
-#: g10/trustdb.c:1993
+#: g10/trustdb.c:1994
 #, fuzzy, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr[0] "fins ara s'han processat %lu claus\n"
 msgstr[1] "fins ara s'han processat %lu claus\n"
 
-#: g10/trustdb.c:1996
+#: g10/trustdb.c:1997
 #, fuzzy, c-format
 #| msgid "%d keys processed (%d validity counts cleared)\n"
 msgid " (%d validity count cleared)\n"
@@ -8334,46 +8347,46 @@ msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] "s'han processat %d claus (s'han netejat %d comptes de validesa)\n"
 msgstr[1] "s'han processat %d claus (s'han netejat %d comptes de validesa)\n"
 
-#: g10/trustdb.c:2066
+#: g10/trustdb.c:2067
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "no s'han trobat claus amb confiança absoluta\n"
 
-#: g10/trustdb.c:2080
+#: g10/trustdb.c:2081
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 "no s'ha trobat la clau pública de la clau amb confiança absoluta %08lX\n"
 
-#: g10/trustdb.c:2198
+#: g10/trustdb.c:2199
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2279
+#: g10/trustdb.c:2280
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "registre de confiança %lu, tipus %d: no s'ha pogut escriure: %s\n"
 
-#: g10/trust.c:125
+#: g10/trust.c:114
 msgid "undefined"
 msgstr ""
 
-#: g10/trust.c:126
+#: g10/trust.c:115
 #, fuzzy
 msgid "never"
 msgstr "mai       "
 
-#: g10/trust.c:127
+#: g10/trust.c:116
 msgid "marginal"
 msgstr ""
 
-#: g10/trust.c:128
+#: g10/trust.c:117
 msgid "full"
 msgstr ""
 
-#: g10/trust.c:129
+#: g10/trust.c:118
 msgid "ultimate"
 msgstr ""
 
@@ -8385,43 +8398,43 @@ msgstr ""
 #. It gets passed to atoi() so everything after the number is
 #. essentially a comment and need not be translated.  Either key and
 #. uid are both NULL, or neither are NULL.
-#: g10/trust.c:166
+#: g10/trust.c:155
 msgid "10 translator see trust.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trust.c:169
+#: g10/trust.c:158
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[revocada]"
 
-#: g10/trust.c:171 g10/trust.c:177
+#: g10/trust.c:160 g10/trust.c:166
 #, fuzzy
 msgid "[ expired]"
 msgstr "[caducada]"
 
-#: g10/trust.c:176
+#: g10/trust.c:165
 #, fuzzy
 msgid "[ unknown]"
 msgstr "desconeguda"
 
-#: g10/trust.c:178
+#: g10/trust.c:167
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trust.c:179
+#: g10/trust.c:168
 #, fuzzy
 msgid "[  never ]"
 msgstr "mai       "
 
-#: g10/trust.c:180
+#: g10/trust.c:169
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trust.c:181
+#: g10/trust.c:170
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trust.c:182
+#: g10/trust.c:171
 msgid "[ultimate]"
 msgstr ""
 
@@ -8481,16 +8494,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:4937 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2386
+#: scd/app-piv.c:1770 scd/app-p15.c:5035 scd/app-nks.c:1530
+#: scd/app-openpgp.c:2387
 #, 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:4956 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2402
+#: scd/app-piv.c:1787 scd/app-p15.c:5054 scd/app-nks.c:1549
+#: scd/app-openpgp.c:2403
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
@@ -8525,10 +8538,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:2669
-#: scd/app-openpgp.c:2693 scd/app-openpgp.c:2871 scd/app-openpgp.c:2893
-#: scd/app-openpgp.c:3074 scd/app-openpgp.c:3361 scd/app-openpgp.c:3408
-#: scd/app-openpgp.c:3545 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2670
+#: scd/app-openpgp.c:2694 scd/app-openpgp.c:2872 scd/app-openpgp.c:2894
+#: scd/app-openpgp.c:3075 scd/app-openpgp.c:3362 scd/app-openpgp.c:3409
+#: scd/app-openpgp.c:3547 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -8548,96 +8561,96 @@ msgstr ""
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr ""
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3616
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3618
 #, fuzzy, c-format
 msgid "key already exists\n"
 msgstr "«%s» ja està comprimida\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3620
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3622
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3622
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3624
 #, fuzzy, c-format
 msgid "generating new key\n"
 msgstr "genera un nou parell de claus"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3624
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3626
 #, fuzzy, c-format
 msgid "writing new key\n"
 msgstr "genera un nou parell de claus"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4484 scd/app-openpgp.c:4767
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4486 scd/app-openpgp.c:4761
 #, 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:1615
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1616
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1622
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1623
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1732
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1733
 #, 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:4943
+#: scd/app-piv.c:3279 scd/app-openpgp.c:4937
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4951
+#: scd/app-piv.c:3294 scd/app-openpgp.c:4945
 #, 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:4957
+#: scd/app-piv.c:3300 scd/app-openpgp.c:4951
 #, 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:1842 scd/app-openpgp.c:4966
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1843 scd/app-openpgp.c:4960
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-p15.c:5035 scd/app-nks.c:2038
+#: scd/app-p15.c:5133 scd/app-nks.c:2038
 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:5038 scd/app-openpgp.c:2818
+#: scd/app-p15.c:5136 scd/app-openpgp.c:2819
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "canvia la contrasenya"
 
-#: scd/app-p15.c:5040 scd/app-nks.c:2028
+#: scd/app-p15.c:5138 scd/app-nks.c:2028
 #, 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:5043 scd/app-nks.c:2019
+#: scd/app-p15.c:5141 scd/app-nks.c:2019
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "canvia la contrasenya"
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4321
+#: scd/app-nks.c:1468 scd/app-openpgp.c:4323
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1476 scd/app-openpgp.c:4333
+#: scd/app-nks.c:1476 scd/app-openpgp.c:4335
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
@@ -8679,27 +8692,27 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3442 scd/app-dinsig.c:534
+#: scd/app-nks.c:2221 scd/app-openpgp.c:3443 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:943
+#: scd/app-openpgp.c:944
 #, 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:956
+#: scd/app-openpgp.c:957
 #, 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:1427 scd/app-openpgp.c:3389 scd/app-openpgp.c:5715
+#: scd/app-openpgp.c:1428 scd/app-openpgp.c:3390 scd/app-openpgp.c:5709
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1949
+#: scd/app-openpgp.c:1950
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
@@ -8707,43 +8720,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:2373
+#: scd/app-openpgp.c:2374
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2621
+#: scd/app-openpgp.c:2622
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2628
+#: scd/app-openpgp.c:2629
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2641
+#: scd/app-openpgp.c:2642
 #, fuzzy
 msgid "||Please unlock the card"
 msgstr "canvia la contrasenya"
 
-#: scd/app-openpgp.c:2700 scd/app-openpgp.c:2900 scd/app-openpgp.c:3368
+#: scd/app-openpgp.c:2701 scd/app-openpgp.c:2901 scd/app-openpgp.c:3369
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2717 scd/app-openpgp.c:2760 scd/app-openpgp.c:2917
-#: scd/app-openpgp.c:5325
+#: scd/app-openpgp.c:2718 scd/app-openpgp.c:2761 scd/app-openpgp.c:2918
+#: scd/app-openpgp.c:5319
 #, 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:2804 scd/app-openpgp.c:5724
+#: scd/app-openpgp.c:2805 scd/app-openpgp.c:5718
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2808
+#: scd/app-openpgp.c:2809
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8751,22 +8764,22 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: scd/app-openpgp.c:2841
+#: scd/app-openpgp.c:2842
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3355
+#: scd/app-openpgp.c:3356
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "canvia la contrasenya"
 
-#: scd/app-openpgp.c:3404
+#: scd/app-openpgp.c:3405
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Seleccioneu la raó de la revocació:\n"
 
-#: scd/app-openpgp.c:3414 scd/app-openpgp.c:3481
+#: scd/app-openpgp.c:3415 scd/app-openpgp.c:3484
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
@@ -8774,82 +8787,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:3437
+#: scd/app-openpgp.c:3438
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3439
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3439
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3541
+#: scd/app-openpgp.c:3543
 #, fuzzy
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "canvia la contrasenya"
 
-#: scd/app-openpgp.c:3542
+#: scd/app-openpgp.c:3544
 #, fuzzy
 msgid "||Please enter the PIN and New PIN"
 msgstr "canvia la contrasenya"
 
-#: scd/app-openpgp.c:3600 scd/app-openpgp.c:5026
+#: scd/app-openpgp.c:3602 scd/app-openpgp.c:5020
 #, 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:3606 scd/app-openpgp.c:5033
+#: scd/app-openpgp.c:3608 scd/app-openpgp.c:5027
 #, fuzzy, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: scd/app-openpgp.c:4302 scd/app-openpgp.c:4657
+#: scd/app-openpgp.c:4304 scd/app-openpgp.c:4653
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4343 scd/app-openpgp.c:4351
+#: scd/app-openpgp.c:4345 scd/app-openpgp.c:4353
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
 # �dem.  ivb
-#: scd/app-openpgp.c:4651
+#: scd/app-openpgp.c:4647
 #, fuzzy, c-format
 #| msgid "unsupported URI"
 msgid "unsupported curve\n"
 msgstr "l'URI no és suportada"
 
-#: scd/app-openpgp.c:4991
+#: scd/app-openpgp.c:4985
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5041
+#: scd/app-openpgp.c:5035
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5240
+#: scd/app-openpgp.c:5234
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "signatura %s, algorisme de resum %s\n"
 
-#: scd/app-openpgp.c:5298
+#: scd/app-openpgp.c:5292
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5729
+#: scd/app-openpgp.c:5723
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:6241 scd/app-openpgp.c:6252
+#: scd/app-openpgp.c:6250 scd/app-openpgp.c:6261
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr ""
@@ -8871,7 +8884,7 @@ msgstr "Introduïu el nom d'usuari: "
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:274 dirmngr/dirmngr.c:198
+#: scd/scdaemon.c:136 sm/gpgsm.c:274 dirmngr/dirmngr.c:199
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
@@ -8936,12 +8949,12 @@ msgstr ""
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2104
+#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2143
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2112
+#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2151
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -8951,11 +8964,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:199 sm/certchain.c:2172
+#: sm/certchain.c:199 sm/certchain.c:2174
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:200 sm/certchain.c:2172
+#: sm/certchain.c:200 sm/certchain.c:2174
 #, fuzzy
 msgid "shell"
 msgstr "ajuda"
@@ -8989,238 +9002,238 @@ msgstr "s'està escrivint la clau secreta a «%s»\n"
 msgid "certificate policy not allowed"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: sm/certchain.c:595 sm/keydb.c:1891 sm/keydb.c:1980
+#: sm/certchain.c:596 sm/keydb.c:1913 sm/keydb.c:2002
 #, fuzzy, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "no s'ha pogut emmagatzemar l'empremta digital: %s\n"
 
-#: sm/certchain.c:624
+#: sm/certchain.c:625
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:644
+#: sm/certchain.c:645
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#: sm/certchain.c:724 dirmngr/ocsp.c:683
 #, fuzzy, c-format
 #| msgid "%s: can't access: %s\n"
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "%s: no s'ha pogut accedir: %s\n"
 
-#: sm/certchain.c:791
+#: sm/certchain.c:792
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr ""
 
-#: sm/certchain.c:816
+#: sm/certchain.c:817
 #, fuzzy, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: sm/certchain.c:819
+#: sm/certchain.c:820
 #, fuzzy, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: sm/certchain.c:1046 sm/certchain.c:1561 sm/certchain.c:2200 sm/decrypt.c:643
-#: sm/encrypt.c:620 sm/import.c:414 sm/keydb.c:1898 sm/keydb.c:1987
-#: sm/sign.c:428 sm/verify.c:117
+#: sm/certchain.c:1047 sm/certchain.c:1562 sm/certchain.c:2202
+#: sm/decrypt.c:1084 sm/encrypt.c:621 sm/import.c:414 sm/keydb.c:1920
+#: sm/keydb.c:2009 sm/sign.c:428 sm/verify.c:117
 #, fuzzy, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
 
-#: sm/certchain.c:1232
+#: sm/certchain.c:1233
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "NOTA: aquesta clau ha estat revocada!"
 
-#: sm/certchain.c:1247
+#: sm/certchain.c:1248
 msgid "the status of the certificate is unknown"
 msgstr ""
 
-#: sm/certchain.c:1254
+#: sm/certchain.c:1255
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:1260
+#: sm/certchain.c:1261
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
 
-#: sm/certchain.c:1289 sm/certchain.c:1357 dirmngr/validate.c:497
+#: sm/certchain.c:1290 sm/certchain.c:1358 dirmngr/validate.c:497
 #, fuzzy, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "problema en la lectura del certificat: %s\n"
 
-#: sm/certchain.c:1304 sm/certchain.c:1389 dirmngr/validate.c:515
+#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:515
 #, fuzzy, c-format
 msgid "certificate not yet valid"
 msgstr "Certificat de revocació vàlid"
 
-#: sm/certchain.c:1305 sm/certchain.c:1390
+#: sm/certchain.c:1306 sm/certchain.c:1391
 #, fuzzy
 msgid "root certificate not yet valid"
 msgstr "Certificat de revocació vàlid"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1307 sm/certchain.c:1392
 #, fuzzy
 msgid "intermediate certificate not yet valid"
 msgstr "Certificat de revocació vàlid"
 
-#: sm/certchain.c:1319 dirmngr/validate.c:526
+#: sm/certchain.c:1320 dirmngr/validate.c:526
 #, fuzzy, c-format
 msgid "certificate has expired"
 msgstr "problema en la lectura del certificat: %s\n"
 
-#: sm/certchain.c:1320
+#: sm/certchain.c:1321
 #, fuzzy
 msgid "root certificate has expired"
 msgstr "problema en la lectura del certificat: %s\n"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1322
 #, fuzzy
 msgid "intermediate certificate has expired"
 msgstr "problema en la lectura del certificat: %s\n"
 
-#: sm/certchain.c:1363
+#: sm/certchain.c:1364
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:1372
+#: sm/certchain.c:1373
 #, fuzzy
 msgid "certificate with invalid validity"
 msgstr "problema en la lectura del certificat: %s\n"
 
-#: sm/certchain.c:1409
+#: sm/certchain.c:1410
 msgid "signature not created during lifetime of certificate"
 msgstr ""
 
-#: sm/certchain.c:1411
+#: sm/certchain.c:1412
 msgid "certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1413
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1416
+#: sm/certchain.c:1417
 #, fuzzy, c-format
 msgid "  (  signature created at "
 msgstr "        signatures noves: %lu\n"
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1418
 #, fuzzy, c-format
 msgid "  (certificate created at "
 msgstr "S'ha creat el certificat de revocació.\n"
 
-#: sm/certchain.c:1420
+#: sm/certchain.c:1421
 #, fuzzy, c-format
 msgid "  (certificate valid from "
 msgstr "Certificat de revocació vàlid"
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1422
 #, c-format
 msgid "  (     issuer valid from "
 msgstr ""
 
-#: sm/certchain.c:1451 dirmngr/validate.c:577
+#: sm/certchain.c:1452 dirmngr/validate.c:577
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "Empremta digital:"
 
-#: sm/certchain.c:1460
+#: sm/certchain.c:1461
 #, fuzzy, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 "No s'han trobat certificats amb confiança no definida.\n"
 "\n"
 
-#: sm/certchain.c:1473
+#: sm/certchain.c:1474
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1479
+#: sm/certchain.c:1480
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1538
+#: sm/certchain.c:1539
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 
-#: sm/certchain.c:1602
+#: sm/certchain.c:1603
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "Certificat correcte"
 
-#: sm/certchain.c:1680
+#: sm/certchain.c:1681
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1749 dirmngr/validate.c:575
+#: sm/certchain.c:1750 dirmngr/validate.c:575
 #, fuzzy, c-format
 msgid "root certificate is not marked trusted"
 msgstr ""
 "No s'han trobat certificats amb confiança no definida.\n"
 "\n"
 
-#: sm/certchain.c:1765
+#: sm/certchain.c:1766
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
 
-#: sm/certchain.c:1796 sm/import.c:175 dirmngr/validate.c:630
+#: sm/certchain.c:1797 sm/import.c:175 dirmngr/validate.c:630
 #, fuzzy, c-format
 msgid "certificate chain too long\n"
 msgstr "Certificat de revocació vàlid"
 
-#: sm/certchain.c:1808 dirmngr/validate.c:642
+#: sm/certchain.c:1809 dirmngr/validate.c:642
 #, fuzzy, c-format
 msgid "issuer certificate not found"
 msgstr "Certificat de revocació vàlid"
 
-#: sm/certchain.c:1842 dirmngr/validate.c:668
+#: sm/certchain.c:1844 dirmngr/validate.c:668
 #, fuzzy, c-format
 msgid "certificate has a BAD signature"
 msgstr "verifica una signatura"
 
-#: sm/certchain.c:1874 dirmngr/validate.c:692
+#: sm/certchain.c:1876 dirmngr/validate.c:692
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1933 dirmngr/validate.c:717
+#: sm/certchain.c:1935 dirmngr/validate.c:717
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1975 sm/certchain.c:2275 dirmngr/validate.c:747
+#: sm/certchain.c:1977 sm/certchain.c:2278 dirmngr/validate.c:747
 #, fuzzy, c-format
 msgid "certificate is good\n"
 msgstr "Certificat de revocació vàlid"
 
-#: sm/certchain.c:1976
+#: sm/certchain.c:1978
 #, fuzzy, c-format
 msgid "intermediate certificate is good\n"
 msgstr "certificat duplicat: esborrat"
 
-#: sm/certchain.c:1977
+#: sm/certchain.c:1979
 #, fuzzy, c-format
 msgid "root certificate is good\n"
 msgstr ""
 "No s'han trobat certificats amb confiança no definida.\n"
 "\n"
 
-#: sm/certchain.c:2159
+#: sm/certchain.c:2161
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:2168
+#: sm/certchain.c:2170
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -9235,18 +9248,18 @@ 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:1372 dirmngr/validate.c:903
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1411 dirmngr/validate.c:903
 #: dirmngr/validate.c:927
 #, fuzzy, c-format
 msgid "out of core\n"
 msgstr "no forçat"
 
-#: sm/certcheck.c:389 sm/verify.c:212
+#: sm/certcheck.c:388 sm/verify.c:212
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:793
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:794
 #, fuzzy
 msgid "none"
 msgstr "no"
@@ -9557,17 +9570,17 @@ msgstr ""
 msgid "resource problem: out of core\n"
 msgstr ""
 
-#: sm/decrypt.c:719
+#: sm/decrypt.c:1159
 #, c-format
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
 
-#: sm/decrypt.c:721
+#: sm/decrypt.c:1161
 #, c-format
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr ""
 
-#: sm/decrypt.c:868
+#: sm/decrypt.c:1318
 #, fuzzy, c-format
 msgid "encrypted to %s key %s\n"
 msgstr "xifrat amb una clau %s, ID %08lX\n"
@@ -9577,7 +9590,7 @@ msgstr "xifrat amb una clau %s, ID %08lX\n"
 msgid "certificate '%s' not found: %s\n"
 msgstr "no s'ha trobat la clau secreta «%s»: %s\n"
 
-#: sm/delete.c:120 sm/keydb.c:1999 sm/keydb.c:2098
+#: sm/delete.c:120 sm/keydb.c:2021 sm/keydb.c:2120
 #, fuzzy, c-format
 msgid "error locking keybox: %s\n"
 msgstr "s'ha produït un error en llegir el bloc de claus: %s\n"
@@ -9597,7 +9610,7 @@ msgstr "certificat duplicat: esborrat"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: sm/encrypt.c:606
+#: sm/encrypt.c:607
 #, fuzzy, c-format
 msgid "no valid recipients given\n"
 msgstr "(No es va donar una descripció)\n"
@@ -9673,69 +9686,69 @@ msgstr "|NOM|usa NOM com a clau secreta predeterminada"
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "afegeix aquest anell a la llista"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:352 dirmngr/dirmngr.c:265
 #, fuzzy
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|HOST|usa aquest servidor per a cercar claus"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:363
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:364
+#: sm/gpgsm.c:365
 #, 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:385
+#: sm/gpgsm.c:386
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:389
+#: sm/gpgsm.c:390
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: sm/gpgsm.c:393
+#: sm/gpgsm.c:394
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:396
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:398
+#: sm/gpgsm.c:399
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOM|usa l'algoritme de xifratge NOM"
 
-#: sm/gpgsm.c:400
+#: sm/gpgsm.c:401
 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:410
+#: sm/gpgsm.c:411
 msgid "batch mode: never ask"
 msgstr "mode desatès: no pregunta mai"
 
-#: sm/gpgsm.c:412
+#: sm/gpgsm.c:413
 msgid "assume yes on most questions"
 msgstr "suposa «sí» en la majoria de les preguntes"
 
-#: sm/gpgsm.c:413
+#: sm/gpgsm.c:414
 msgid "assume no on most questions"
 msgstr "suposa «no» en la majoria de les preguntes"
 
-#: sm/gpgsm.c:430
+#: sm/gpgsm.c:431
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FITXER|carrega el mòdul d'extensió especificat"
 
-#: sm/gpgsm.c:615
+#: sm/gpgsm.c:616
 #, 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:618
+#: sm/gpgsm.c:619
 #, fuzzy
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
@@ -9746,53 +9759,28 @@ msgstr ""
 "signa, comprova, xifra o desxifra\n"
 "l'operació predeterminada depén de les dades introduïdes\n"
 
-#: sm/gpgsm.c:826
+#: sm/gpgsm.c:827
 #, 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:837
+#: sm/gpgsm.c:838
 #, fuzzy, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "el destinatari predeterminat és desconegut «%s»\n"
 
-#: sm/gpgsm.c:896 dirmngr/ldapserver.c:89
-#, fuzzy, c-format
-msgid "%s:%u: no hostname given\n"
-msgstr "(No es va donar una descripció)\n"
-
-#: sm/gpgsm.c:915 dirmngr/ldapserver.c:108
-#, c-format
-msgid "%s:%u: password given without user\n"
-msgstr ""
-
-#: sm/gpgsm.c:946 dirmngr/ldapserver.c:139
-#, c-format
-msgid "%s:%u: ignoring unknown flag '%s'\n"
-msgstr ""
-
-#: sm/gpgsm.c:962 dirmngr/ldapserver.c:155
-#, fuzzy, c-format
-msgid "%s:%u: skipping this line\n"
-msgstr " o = omet aquesta clau\n"
-
-#: sm/gpgsm.c:1550
-#, fuzzy, c-format
-msgid "could not parse keyserver\n"
-msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
-
-#: sm/gpgsm.c:1858
+#: sm/gpgsm.c:1711
 #, 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:1904
+#: sm/gpgsm.c:1757
 #, fuzzy, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "no s'ha pogut tancar «%s»: %s\n"
 
-#: sm/gpgsm.c:2273
+#: sm/gpgsm.c:2129
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
@@ -9812,52 +9800,52 @@ msgstr "Certificat correcte"
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:471 sm/keydb.c:2018 sm/keydb.c:2111
+#: sm/import.c:472 sm/keydb.c:2040 sm/keydb.c:2133
 #, fuzzy, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: sm/import.c:530 sm/import.c:562
+#: sm/import.c:531 sm/import.c:563
 #, fuzzy, c-format
 msgid "error importing certificate: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: sm/import.c:751 tools/gpg-connect-agent.c:1475
+#: sm/import.c:752 tools/gpg-connect-agent.c:1475
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: sm/keydb.c:503
+#: sm/keydb.c:508
 #, fuzzy, c-format
 msgid "no keyboxd running in this session\n"
 msgstr "gpg-agent no està disponible en aquesta sessió\n"
 
-#: sm/keydb.c:595
+#: sm/keydb.c:600
 #, fuzzy, c-format
 msgid "error opening key DB: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: sm/keydb.c:1936
+#: sm/keydb.c:1958
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1948
+#: sm/keydb.c:1970
 #, fuzzy, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: sm/keydb.c:1956
+#: sm/keydb.c:1978
 #, fuzzy, c-format
 msgid "error storing certificate: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: sm/keydb.c:2009
+#: sm/keydb.c:2031
 #, fuzzy, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "rev? hi ha problemes en la comprovació de la revocació: %s\n"
 
-#: sm/keydb.c:2030 sm/keydb.c:2122
+#: sm/keydb.c:2052 sm/keydb.c:2144
 #, fuzzy, c-format
 msgid "error storing flags: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
@@ -10030,57 +10018,57 @@ msgstr ""
 msgid "error loading certificate '%s': %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: dirmngr/certcache.c:819
+#: dirmngr/certcache.c:820
 #, fuzzy, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "Certificat invàlid"
 
-#: dirmngr/certcache.c:821
+#: dirmngr/certcache.c:822
 #, fuzzy, c-format
 msgid "    runtime cached certificates: %u\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: dirmngr/certcache.c:823
+#: dirmngr/certcache.c:824
 #, fuzzy, c-format
 msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: dirmngr/certcache.c:851 dirmngr/dirmngr-client.c:392
+#: dirmngr/certcache.c:852 dirmngr/dirmngr-client.c:392
 #, fuzzy, c-format
 msgid "certificate already cached\n"
 msgstr "S'ha creat el certificat de revocació.\n"
 
-#: dirmngr/certcache.c:853
+#: dirmngr/certcache.c:854
 #, fuzzy, c-format
 msgid "certificate cached\n"
 msgstr "Certificat de revocació vàlid"
 
-#: dirmngr/certcache.c:855 dirmngr/certcache.c:875 dirmngr/dirmngr-client.c:396
+#: dirmngr/certcache.c:856 dirmngr/certcache.c:876 dirmngr/dirmngr-client.c:396
 #, fuzzy, c-format
 msgid "error caching certificate: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: dirmngr/certcache.c:938
+#: dirmngr/certcache.c:939
 #, fuzzy, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: dirmngr/certcache.c:1384 dirmngr/certcache.c:1393
+#: dirmngr/certcache.c:1385 dirmngr/certcache.c:1394
 #, fuzzy, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: dirmngr/certcache.c:1579 dirmngr/certcache.c:1588
+#: dirmngr/certcache.c:1580 dirmngr/certcache.c:1589
 #, fuzzy, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: dirmngr/certcache.c:1694 dirmngr/validate.c:483
+#: dirmngr/certcache.c:1695 dirmngr/validate.c:483
 #, fuzzy, c-format
 msgid "no issuer found in certificate\n"
 msgstr "Certificat correcte"
 
-#: dirmngr/certcache.c:1704
+#: dirmngr/certcache.c:1705
 #, fuzzy, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "error en crear «%s»: %s\n"
@@ -10117,7 +10105,7 @@ msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 msgid "not removing file '%s'\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2380
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2383
 #, fuzzy, c-format
 msgid "error closing cache file: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
@@ -10352,14 +10340,14 @@ msgid "error getting data from cache file: %s\n"
 msgstr "error en crear «%s»: %s\n"
 
 #: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1672 dirmngr/crlcache.c:1697
-#: dirmngr/crlcache.c:1763
+#: dirmngr/crlcache.c:1766
 #, fuzzy, c-format
 #| msgid "invalid response from agent\n"
 msgid "got an invalid S-expression from libksba\n"
 msgstr "la resposta de l'agent és invàlida\n"
 
 #: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1679 dirmngr/crlcache.c:1705
-#: dirmngr/crlcache.c:1770 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1773 dirmngr/misc.c:176
 #, fuzzy, c-format
 #| msgid "changing permission of  `%s' failed: %s\n"
 msgid "converting S-expression failed: %s\n"
@@ -10376,203 +10364,203 @@ msgstr "l'algoritme de dispersió és invàlid «%s»\n"
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1797 dirmngr/ocsp.c:478
+#: dirmngr/crlcache.c:1800 dirmngr/ocsp.c:478
 #, fuzzy, c-format
 #| msgid "changing permission of  `%s' failed: %s\n"
 msgid "creating S-expression failed: %s\n"
 msgstr "no s'han pogut canviar els permissos de «%s»: %s\n"
 
-#: dirmngr/crlcache.c:1871
+#: dirmngr/crlcache.c:1874
 #, fuzzy, c-format
 #| msgid "build_packet failed: %s\n"
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "ha fallat build_packet: %s\n"
 
-#: dirmngr/crlcache.c:1886
+#: dirmngr/crlcache.c:1889
 #, fuzzy, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: dirmngr/crlcache.c:1893
+#: dirmngr/crlcache.c:1896
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1897
+#: dirmngr/crlcache.c:1900
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1917
+#: dirmngr/crlcache.c:1920
 #, fuzzy, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: dirmngr/crlcache.c:1932
+#: dirmngr/crlcache.c:1935
 #, fuzzy, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "%s: error en escriure el registre de directoris: %s\n"
 
-#: dirmngr/crlcache.c:1959
+#: dirmngr/crlcache.c:1962
 #, fuzzy, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "Certificat correcte"
 
-#: dirmngr/crlcache.c:1974
+#: dirmngr/crlcache.c:1977
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2020
+#: dirmngr/crlcache.c:2023
 #, fuzzy, c-format
 #| msgid "signature verification suppressed\n"
 msgid "CRL signature verification failed: %s\n"
 msgstr "s'ha eliminat la verificació de signatura\n"
 
-#: dirmngr/crlcache.c:2032
+#: dirmngr/crlcache.c:2035
 #, fuzzy, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
 
-#: dirmngr/crlcache.c:2174
+#: dirmngr/crlcache.c:2177
 #, fuzzy, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: dirmngr/crlcache.c:2181
+#: dirmngr/crlcache.c:2184
 #, fuzzy, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: dirmngr/crlcache.c:2215
+#: dirmngr/crlcache.c:2218
 #, fuzzy, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "no es pot crear el directori «%s»: %s\n"
 
-#: dirmngr/crlcache.c:2219
+#: dirmngr/crlcache.c:2222
 #, fuzzy, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "no es pot crear el directori «%s»: %s\n"
 
-#: dirmngr/crlcache.c:2229
+#: dirmngr/crlcache.c:2232
 #, fuzzy, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: dirmngr/crlcache.c:2239
+#: dirmngr/crlcache.c:2242
 #, fuzzy, c-format
 #| msgid "lid ?: insert failed: %s\n"
 msgid "crl_parse_insert failed: %s\n"
 msgstr "lid ?: la inserció ha fallat: %s\n"
 
-#: dirmngr/crlcache.c:2249
+#: dirmngr/crlcache.c:2252
 #, fuzzy, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "%s: error en escriure el registre de directoris: %s\n"
 
-#: dirmngr/crlcache.c:2256
+#: dirmngr/crlcache.c:2259
 #, fuzzy, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: dirmngr/crlcache.c:2281
+#: dirmngr/crlcache.c:2284
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2285
+#: dirmngr/crlcache.c:2288
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2301
+#: dirmngr/crlcache.c:2304
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2311
+#: dirmngr/crlcache.c:2314
 #, fuzzy, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2365
 #, fuzzy, c-format
 msgid "creating cache file '%s'\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: dirmngr/crlcache.c:2394
+#: dirmngr/crlcache.c:2397
 #, fuzzy, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: dirmngr/crlcache.c:2408
+#: dirmngr/crlcache.c:2411
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
 "program start\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2448
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2468
+#: dirmngr/crlcache.c:2471
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2471
+#: dirmngr/crlcache.c:2474
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2474
+#: dirmngr/crlcache.c:2477
 msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2481
+#: dirmngr/crlcache.c:2484
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2499
+#: dirmngr/crlcache.c:2502
 #, fuzzy, c-format
 #| msgid "WARNING: invalid size of random_seed file - not used\n"
 msgid " WARNING: invalid cache record length\n"
 msgstr "AV�S: el tamany del fitxer random_seed no és vàlid - no s'usarà\n"
 
-#: dirmngr/crlcache.c:2506
+#: dirmngr/crlcache.c:2509
 #, fuzzy, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "%s: error en llegir el registre lliure: %s\n"
 
-#: dirmngr/crlcache.c:2517
+#: dirmngr/crlcache.c:2520
 #, fuzzy, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "rev? hi ha problemes en la comprovació de la revocació: %s\n"
 
-#: dirmngr/crlcache.c:2548
+#: dirmngr/crlcache.c:2551
 #, fuzzy, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: dirmngr/crlcache.c:2551
+#: dirmngr/crlcache.c:2554
 msgid "End CRL dump\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2672
+#: dirmngr/crlcache.c:2675
 #, fuzzy, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: dirmngr/crlcache.c:2683
+#: dirmngr/crlcache.c:2686
 #, fuzzy, c-format
 #| msgid "lid ?: insert failed: %s\n"
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "lid ?: la inserció ha fallat: %s\n"
 
-#: dirmngr/crlcache.c:2743
+#: dirmngr/crlcache.c:2746
 #, fuzzy, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
@@ -10593,7 +10581,7 @@ msgstr ""
 msgid "error retrieving '%s': %s\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: dirmngr/crlfetch.c:218 dirmngr/ldap-wrapper.c:881 dirmngr/misc.c:573
+#: dirmngr/crlfetch.c:218 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
 #, fuzzy, c-format
 #| msgid "%s: error writing dir record: %s\n"
 msgid "error initializing reader object: %s\n"
@@ -10768,135 +10756,135 @@ msgstr ""
 msgid "looking up '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:175
+#: dirmngr/dirmngr.c:176
 msgid "list the contents of the CRL cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:176
+#: dirmngr/dirmngr.c:177
 #, fuzzy
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|FITXER|carrega el mòdul d'extensió especificat"
 
-#: dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr.c:178
 msgid "|URL|fetch a CRL from URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:178
+#: dirmngr/dirmngr.c:179
 msgid "shutdown the dirmngr"
 msgstr ""
 
-#: dirmngr/dirmngr.c:179
+#: dirmngr/dirmngr.c:180
 msgid "flush the cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:213
 msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:215
+#: dirmngr/dirmngr.c:216
 msgid "|N|do not return more than N items in one query"
 msgstr ""
 
-#: dirmngr/dirmngr.c:221
+#: dirmngr/dirmngr.c:222
 msgid "Network related options"
 msgstr ""
 
-#: dirmngr/dirmngr.c:223
+#: dirmngr/dirmngr.c:224
 msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:235
+#: dirmngr/dirmngr.c:236
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:238
+#: dirmngr/dirmngr.c:239
 #, fuzzy
 msgid "|URL|use keyserver at URL"
 msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
 
-#: dirmngr/dirmngr.c:240
+#: dirmngr/dirmngr.c:241
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-#: dirmngr/dirmngr.c:242
+#: dirmngr/dirmngr.c:243
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:244
+#: dirmngr/dirmngr.c:245
 msgid "inhibit the use of HTTP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:246
+#: dirmngr/dirmngr.c:247
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:248
+#: dirmngr/dirmngr.c:249
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:250
+#: dirmngr/dirmngr.c:251
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: dirmngr/dirmngr.c:254
+#: dirmngr/dirmngr.c:255
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: dirmngr/dirmngr.c:256
+#: dirmngr/dirmngr.c:257
 msgid "inhibit the use of LDAP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:258
+#: dirmngr/dirmngr.c:259
 msgid "ignore LDAP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:260
+#: dirmngr/dirmngr.c:261
 msgid "|HOST|use HOST for LDAP queries"
 msgstr ""
 
-#: dirmngr/dirmngr.c:262
+#: dirmngr/dirmngr.c:263
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr ""
 
-#: dirmngr/dirmngr.c:264
+#: dirmngr/dirmngr.c:267
 #, fuzzy
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FITXER|carrega el mòdul d'extensió especificat"
 
-#: dirmngr/dirmngr.c:266
+#: dirmngr/dirmngr.c:269
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 
-#: dirmngr/dirmngr.c:269 dirmngr/dirmngr_ldap.c:104
+#: dirmngr/dirmngr.c:272
 msgid "|N|set LDAP timeout to N seconds"
 msgstr ""
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:275
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:274
+#: dirmngr/dirmngr.c:277
 msgid "allow sending OCSP requests"
 msgstr ""
 
-#: dirmngr/dirmngr.c:276
+#: dirmngr/dirmngr.c:279
 msgid "ignore certificate contained OCSP service URLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:278
+#: dirmngr/dirmngr.c:281
 #, fuzzy
 msgid "|URL|use OCSP responder at URL"
 msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
 
-#: dirmngr/dirmngr.c:280
+#: dirmngr/dirmngr.c:283
 msgid "|FPR|OCSP response signed by FPR"
 msgstr ""
 
-#: dirmngr/dirmngr.c:288
+#: dirmngr/dirmngr.c:291
 msgid "force loading of outdated CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:299
+#: dirmngr/dirmngr.c:302
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -10909,80 +10897,80 @@ msgstr ""
 "@\n"
 "(En la pàgina del man hi ha una llista completa d'ordres i d'opcions)\n"
 
-#: dirmngr/dirmngr.c:441
+#: dirmngr/dirmngr.c:449
 #, fuzzy
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: dirmngr/dirmngr.c:443
+#: dirmngr/dirmngr.c:451
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:523
+#: dirmngr/dirmngr.c:531
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:609 tools/gpgconf.c:667 tools/gpgconf.c:702
-#: tools/gpgconf.c:802
+#: dirmngr/dirmngr.c:617 tools/gpgconf.c:701 tools/gpgconf.c:736
+#: tools/gpgconf.c:836
 #, fuzzy, c-format
 msgid "usage: %s [options] "
 msgstr "forma d'ús: gpg [opcions] "
 
-#: dirmngr/dirmngr.c:1260
+#: dirmngr/dirmngr.c:1299
 #, 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:1495 dirmngr/server.c:1824
+#: dirmngr/dirmngr.c:1534 dirmngr/server.c:1878
 #, fuzzy, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: dirmngr/dirmngr.c:1501 dirmngr/server.c:1830
+#: dirmngr/dirmngr.c:1540 dirmngr/server.c:1884
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: dirmngr/dirmngr.c:1643
+#: dirmngr/dirmngr.c:1682
 #, fuzzy, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "la línia és massa llarga\n"
 
-#: dirmngr/dirmngr.c:1698 dirmngr/dirmngr.c:1782
+#: dirmngr/dirmngr.c:1737 dirmngr/dirmngr.c:1821
 #, fuzzy, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: dirmngr/dirmngr.c:1734 dirmngr/dirmngr.c:1760 tools/gpgconf-comp.c:3539
+#: dirmngr/dirmngr.c:1773 dirmngr/dirmngr.c:1799 tools/gpgconf-comp.c:3549
 #, fuzzy, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "error de lectura: %s\n"
 
-#: dirmngr/dirmngr.c:1789
+#: dirmngr/dirmngr.c:1828
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1876
+#: dirmngr/dirmngr.c:1915
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1917
+#: dirmngr/dirmngr.c:1956
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1922
+#: dirmngr/dirmngr.c:1961
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1924
+#: dirmngr/dirmngr.c:1963
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
@@ -10991,228 +10979,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:1929
+#: dirmngr/dirmngr.c:1968
 #, fuzzy, c-format
 #| msgid "not forced"
 msgid "shutdown forced\n"
 msgstr "no forçat"
 
-#: dirmngr/dirmngr.c:1937
+#: dirmngr/dirmngr.c:1976
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1944
+#: dirmngr/dirmngr.c:1983
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:105
-msgid "return all values in a record oriented format"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:108
-msgid "|NAME|ignore host part and connect through NAME"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:109
-msgid "force a TLS connection"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:110
-#, fuzzy
-#| msgid "|NAME|set terminal charset to NAME"
-msgid "|NAME|connect to host NAME"
-msgstr "|NOM|el joc de caràcters serà NOM"
-
-#: dirmngr/dirmngr_ldap.c:111
-msgid "|N|connect to port N"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:112
-#, fuzzy
-#| msgid "|NAME|use NAME as default recipient"
-msgid "|NAME|use user NAME for authentication"
-msgstr "|NOM|usa NOM com a destinatari predeterminat"
-
-#: dirmngr/dirmngr_ldap.c:113
-msgid "|PASS|use password PASS for authentication"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:115
-msgid "take password from $DIRMNGR_LDAP_PASS"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:116
-msgid "|STRING|query DN STRING"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:117
-msgid "|STRING|use STRING as filter expression"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:118
-msgid "|STRING|return the attribute STRING"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:179
-#, fuzzy
-#| msgid "Usage: gpg [options] [files] (-h for help)"
-msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
-msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
-
-#: dirmngr/dirmngr_ldap.c:182
-msgid ""
-"Syntax: dirmngr_ldap [options] [URL]\n"
-"Internal LDAP helper for Dirmngr\n"
-"Interface and options may change without notice\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:291
-#, fuzzy, c-format
-#| msgid "invalid import options\n"
-msgid "invalid port number %d\n"
-msgstr "opcions d'importació no vàlides\n"
-
-#: dirmngr/dirmngr_ldap.c:400
-#, c-format
-msgid "scanning result for attribute '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:407 dirmngr/dirmngr_ldap.c:490
-#: dirmngr/dirmngr_ldap.c:514 dirmngr/dirmngr_ldap.c:526
-#: dirmngr/dirmngr_ldap.c:722
-#, fuzzy, c-format
-msgid "error writing to stdout: %s\n"
-msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:424
-#, c-format
-msgid "          available attribute '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:462
-#, fuzzy, c-format
-msgid "attribute '%s' not found\n"
-msgstr "no s'ha trobat la clau secreta «%s»: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:469
-#, c-format
-msgid "found attribute '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:581
-#, fuzzy, c-format
-#| msgid "reading from `%s'\n"
-msgid "processing url '%s'\n"
-msgstr "s'està llegint des de «%s»\n"
-
-#: dirmngr/dirmngr_ldap.c:588
-#, fuzzy, c-format
-#| msgid "          w/o user IDs: %lu\n"
-msgid "          user '%s'\n"
-msgstr "                sense ID: %lu\n"
-
-#: dirmngr/dirmngr_ldap.c:590
-#, fuzzy, c-format
-msgid "          pass '%s'\n"
-msgstr "              alias \""
-
-#: dirmngr/dirmngr_ldap.c:592
-#, fuzzy, c-format
-#| msgid "          w/o user IDs: %lu\n"
-msgid "          host '%s'\n"
-msgstr "                sense ID: %lu\n"
-
-#: dirmngr/dirmngr_ldap.c:593
-#, fuzzy, c-format
-#| msgid "          not imported: %lu\n"
-msgid "          port %d\n"
-msgstr "              importades: %lu\n"
-
-#: dirmngr/dirmngr_ldap.c:595
-#, fuzzy, c-format
-msgid "            DN '%s'\n"
-msgstr "              alias \""
-
-#: dirmngr/dirmngr_ldap.c:597
-#, c-format
-msgid "        filter '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:602 dirmngr/dirmngr_ldap.c:605
-#, fuzzy, c-format
-msgid "          attr '%s'\n"
-msgstr "              alias \""
-
-#: dirmngr/dirmngr_ldap.c:611
-#, fuzzy, c-format
-msgid "no host name in '%s'\n"
-msgstr "(No es va donar una descripció)\n"
-
-#: dirmngr/dirmngr_ldap.c:616
-#, c-format
-msgid "no attribute given for query '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:622
-#, fuzzy, c-format
-#| msgid "WARNING: using insecure memory!\n"
-msgid "WARNING: using first attribute only\n"
-msgstr "AV�S: esteu usant memòria insegura!\n"
-
-#: dirmngr/dirmngr_ldap.c:637 dirmngr/dirmngr_ldap.c:678
-#, fuzzy, c-format
-msgid "LDAP init to '%s:%d' failed: %s\n"
-msgstr "no s'ha pogut crear l'armadura: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:659
-#, fuzzy, c-format
-msgid "LDAP init to '%s' failed: %s\n"
-msgstr "no s'ha pogut crear l'armadura: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:665
-#, fuzzy, c-format
-msgid "LDAP init to '%s' done\n"
-msgstr "no s'ha pogut crear l'armadura: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:704
-#, fuzzy, c-format
-msgid "binding to '%s:%d' failed: %s\n"
-msgstr "no s'ha pogut crear l'armadura: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:728
-#, fuzzy, c-format
-#| msgid "dearmoring failed: %s\n"
-msgid "searching '%s' failed: %s\n"
-msgstr "no s'ha pogut llevar l'armadura: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:759
-#, fuzzy, c-format
-msgid "'%s' is not an LDAP URL\n"
-msgstr "«%s» no és un fitxer JPEG\n"
-
-#: dirmngr/dirmngr_ldap.c:765
-#, c-format
-msgid "'%s' is an invalid LDAP URL\n"
-msgstr ""
-
-#: dirmngr/http.c:1989 dirmngr/ocsp.c:255
+#: dirmngr/http.c:1998 dirmngr/ocsp.c:255
 #, fuzzy, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: dirmngr/http.c:3630 dirmngr/ocsp.c:229
+#: dirmngr/http.c:3652 dirmngr/ocsp.c:229
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr ""
 
-#: dirmngr/http.c:3636 dirmngr/ocsp.c:246
+#: dirmngr/http.c:3658 dirmngr/ocsp.c:246
 #, fuzzy, c-format
 msgid "too many redirections\n"
 msgstr "hi ha massa preferències «%c»\n"
 
-#: dirmngr/http.c:3748
+#: dirmngr/http.c:3768
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "redirection changed to '%s'\n"
@@ -11253,31 +11051,51 @@ msgstr "ha fallat l'actualització: %s\n"
 msgid "ldap wrapper %d stalled - killing\n"
 msgstr ""
 
-#: dirmngr/ldap.c:91
+#: dirmngr/ldap.c:92
 #, c-format
 msgid "invalid char 0x%02x in host name - not added\n"
 msgstr ""
 
-#: dirmngr/ldap.c:95
+#: dirmngr/ldap.c:96
 #, fuzzy, c-format
 msgid "adding '%s:%d' to the ldap server list\n"
 msgstr "s'està cercant «%s» al servidor HKP %s\n"
 
-#: dirmngr/ldap.c:98 dirmngr/misc.c:512
+#: dirmngr/ldap.c:99 dirmngr/misc.c:512
 #, fuzzy, c-format
 msgid "malloc failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: dirmngr/ldap.c:634
+#: dirmngr/ldap.c:221
+#, fuzzy, c-format
+msgid "'%s' is not an LDAP URL\n"
+msgstr "«%s» no és un fitxer JPEG\n"
+
+#: dirmngr/ldap.c:227 dirmngr/ldap.c:233
 #, c-format
-msgid "start_cert_fetch: invalid pattern '%s'\n"
+msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
-#: dirmngr/ldap.c:846
+#: dirmngr/ldap.c:968
 #, c-format
 msgid "ldap_search hit the size limit of the server\n"
 msgstr ""
 
+#: dirmngr/ldapserver.c:119
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr ""
+
+#: dirmngr/ldapserver.c:181
+#, c-format
+msgid "%s:%u: ignoring unknown flag '%s'\n"
+msgstr ""
+
+#: dirmngr/ldapserver.c:203
+#, fuzzy, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr " o = omet aquesta clau\n"
+
 #: dirmngr/misc.c:172
 #, fuzzy, c-format
 #| msgid "%s: invalid file version %d\n"
@@ -11371,87 +11189,87 @@ msgstr ""
 msgid "allocating list item failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: dirmngr/ocsp.c:537 dirmngr/ocsp.c:724
+#: dirmngr/ocsp.c:538 dirmngr/ocsp.c:725
 #, fuzzy, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: dirmngr/ocsp.c:584
+#: dirmngr/ocsp.c:585
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:623 dirmngr/validate.c:648
+#: dirmngr/ocsp.c:624 dirmngr/validate.c:648
 #, fuzzy, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "Certificat de revocació vàlid"
 
-#: dirmngr/ocsp.c:633
+#: dirmngr/ocsp.c:634
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:640
+#: dirmngr/ocsp.c:641
 #, fuzzy, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "Certificat correcte"
 
-#: dirmngr/ocsp.c:650
+#: dirmngr/ocsp.c:651
 #, fuzzy, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
 
-#: dirmngr/ocsp.c:689
+#: dirmngr/ocsp.c:690
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:696
 #, fuzzy, c-format
 #| msgid "no default secret keyring: %s\n"
 msgid "no default OCSP signer defined\n"
 msgstr "no hi ha anell secret predeterminat: %s\n"
 
-#: dirmngr/ocsp.c:702
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:707
+#: dirmngr/ocsp.c:708
 #, fuzzy, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "Ha fallat el procés de signatura: %s\n"
 
-#: dirmngr/ocsp.c:764
+#: dirmngr/ocsp.c:765
 #, fuzzy, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: dirmngr/ocsp.c:789
+#: dirmngr/ocsp.c:790
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:790
+#: dirmngr/ocsp.c:791
 msgid "good"
 msgstr ""
 
-#: dirmngr/ocsp.c:796
+#: dirmngr/ocsp.c:797
 #, fuzzy, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "NOTA: aquesta clau ha estat revocada!"
 
-#: dirmngr/ocsp.c:831
+#: dirmngr/ocsp.c:832
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:843
+#: dirmngr/ocsp.c:844
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:858
+#: dirmngr/ocsp.c:859
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr ""
@@ -11461,72 +11279,68 @@ msgstr ""
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "Ha fallat el procés de signatura: %s\n"
 
-#: dirmngr/server.c:1158
-msgid "ldapserver missing"
-msgstr ""
-
-#: dirmngr/server.c:1224
+#: dirmngr/server.c:1277
 msgid "serialno missing in cert ID"
 msgstr ""
 
-#: dirmngr/server.c:1387 dirmngr/server.c:1473 dirmngr/server.c:1909
-#: dirmngr/server.c:1980 dirmngr/server.c:2556 dirmngr/server.c:2571
+#: dirmngr/server.c:1440 dirmngr/server.c:1526 dirmngr/server.c:1963
+#: dirmngr/server.c:2034 dirmngr/server.c:2662 dirmngr/server.c:2677
 #, fuzzy, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "Ha fallat el procés de signatura: %s\n"
 
-#: dirmngr/server.c:1516
+#: dirmngr/server.c:1569
 #, fuzzy, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: dirmngr/server.c:1528 dirmngr/server.c:1559 dirmngr/server.c:1718
+#: dirmngr/server.c:1581 dirmngr/server.c:1612 dirmngr/server.c:1772
 #, fuzzy, c-format
 msgid "error sending data: %s\n"
 msgstr "error mentre s'enviava a «%s»: %s\n"
 
-#: dirmngr/server.c:1666
+#: dirmngr/server.c:1720
 #, fuzzy, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: dirmngr/server.c:1699
+#: dirmngr/server.c:1753
 #, fuzzy, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: dirmngr/server.c:1726
+#: dirmngr/server.c:1780
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:2860
+#: dirmngr/server.c:2966
 #, fuzzy, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: dirmngr/server.c:2871
+#: dirmngr/server.c:2977
 #, fuzzy, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "%s: no s'ha pogut crear la taula de dispersió: %s\n"
 
-#: dirmngr/server.c:2892
+#: dirmngr/server.c:2998
 #, fuzzy, c-format
 #| msgid "failed to initialize the TrustDB: %s\n"
 msgid "failed to initialize the server: %s\n"
 msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
 
-#: dirmngr/server.c:2900
+#: dirmngr/server.c:3006
 #, fuzzy, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "no s'ha pogut reconstruir la memòria cau de l'anell: %s\n"
 
-#: dirmngr/server.c:2933
+#: dirmngr/server.c:3039
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:2952
+#: dirmngr/server.c:3058
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -11675,73 +11489,73 @@ msgstr "gpg-agent no està disponible en aquesta sessió\n"
 msgid "error sending standard options: %s\n"
 msgstr "error mentre s'enviava a «%s»: %s\n"
 
-#: tools/gpgconf-comp.c:649
+#: tools/gpgconf-comp.c:655
 msgid "OpenPGP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:653
+#: tools/gpgconf-comp.c:659
 msgid "S/MIME"
 msgstr ""
 
-#: tools/gpgconf-comp.c:657
+#: tools/gpgconf-comp.c:663
 #, fuzzy
 msgid "Public Keys"
 msgstr "la clau pública és %08lX\n"
 
-#: tools/gpgconf-comp.c:661
+#: tools/gpgconf-comp.c:667
 msgid "Private Keys"
 msgstr ""
 
-#: tools/gpgconf-comp.c:665
+#: tools/gpgconf-comp.c:671
 msgid "Smartcards"
 msgstr ""
 
-#: tools/gpgconf-comp.c:669
+#: tools/gpgconf-comp.c:676
 msgid "TPM"
 msgstr ""
 
-#: tools/gpgconf-comp.c:673
+#: tools/gpgconf-comp.c:681
 #, fuzzy
 #| msgid "network error"
 msgid "Network"
 msgstr "error de la xarxa"
 
-#: tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:685
 #, fuzzy
 msgid "Passphrase Entry"
 msgstr "la contrasenya és errònia"
 
-#: tools/gpgconf-comp.c:941
+#: tools/gpgconf-comp.c:951
 #, fuzzy
 msgid "Component not suitable for launching"
 msgstr "no s'ha trobat la clau pública"
 
-#: tools/gpgconf-comp.c:947
+#: tools/gpgconf-comp.c:957
 #, c-format
 msgid "Configuration file of component %s is broken\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:950
+#: tools/gpgconf-comp.c:960
 #, fuzzy, c-format
 #| msgid "Please use the command \"toggle\" first.\n"
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr "Useu l'ordre «toggle» abans.\n"
 
-#: tools/gpgconf-comp.c:2816
+#: tools/gpgconf-comp.c:2826
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2946
+#: tools/gpgconf-comp.c:2956
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3543
+#: tools/gpgconf-comp.c:3553
 #, fuzzy, c-format
 msgid "error closing '%s'\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: tools/gpgconf-comp.c:3545
+#: tools/gpgconf-comp.c:3555
 #, fuzzy, c-format
 msgid "error parsing '%s'\n"
 msgstr "error en la lectura de «%s»: %s\n"
@@ -11825,16 +11639,16 @@ msgid ""
 "Manage configuration options for tools of the @GNUPG@ system\n"
 msgstr ""
 
-#: tools/gpgconf.c:669 tools/gpgconf.c:704
+#: tools/gpgconf.c:703 tools/gpgconf.c:738
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:678 tools/gpgconf.c:728 tools/gpgconf.c:778
+#: tools/gpgconf.c:712 tools/gpgconf.c:762 tools/gpgconf.c:812
 #, fuzzy
 msgid "Component not found"
 msgstr "no s'ha trobat la clau pública"
 
-#: tools/gpgconf.c:804
+#: tools/gpgconf.c:838
 msgid "No argument allowed"
 msgstr ""
 
@@ -11849,88 +11663,191 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
-#: tools/gpg-card.c:2390
+#: tools/gpg-card.c:2407
 #, fuzzy, c-format
 msgid "Note: key %s is already stored on the card!\n"
 msgstr "es descarta: la clau secreta ja és present\n"
 
-#: tools/gpg-card.c:2393
+#: tools/gpg-card.c:2410
 #, fuzzy, c-format
 msgid "Note: Keys are already stored on the card!\n"
 msgstr "es descarta: la clau secreta ja és present\n"
 
-#: tools/gpg-card.c:2396
+#: tools/gpg-card.c:2413
 #, c-format
 msgid "Replace existing key %s ? (y/N) "
 msgstr ""
 
-#: tools/gpg-card.c:2549 tools/gpg-card.c:2712 tools/gpg-card.c:2935
-#: tools/gpg-card.c:3044
+#: tools/gpg-card.c:2566 tools/gpg-card.c:2729 tools/gpg-card.c:2952
+#: tools/gpg-card.c:3061
 #, c-format
 msgid "%s card no. %s detected\n"
 msgstr ""
 
-#: tools/gpg-card.c:3396
+#: tools/gpg-card.c:3413
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3406 tools/gpg-card.c:3420
+#: tools/gpg-card.c:3423 tools/gpg-card.c:3437
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
 "         can only be reverted using a factory reset!\n"
 msgstr ""
 
-#: tools/gpg-card.c:3423
+#: tools/gpg-card.c:3440
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3669
+#: tools/gpg-card.c:3686
 #, fuzzy
 msgid "authenticate to the card"
 msgstr "S'ha creat el certificat de revocació.\n"
 
-#: tools/gpg-card.c:3671
+#: tools/gpg-card.c:3688
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3673
+#: tools/gpg-card.c:3690
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication"
 msgstr "|NOM|usa NOM com a destinatari predeterminat"
 
-#: tools/gpg-card.c:3675
+#: tools/gpg-card.c:3692
 #, fuzzy
 #| msgid "change the expire date"
 msgid "change a private data object"
 msgstr "canvia la data de caducitat"
 
-#: tools/gpg-card.c:3676
+#: tools/gpg-card.c:3693
 #, fuzzy
 msgid "read a certificate from a data object"
 msgstr "S'ha creat el certificat de revocació.\n"
 
-#: tools/gpg-card.c:3677
+#: tools/gpg-card.c:3694
 #, fuzzy
 msgid "store a certificate to a data object"
 msgstr "S'ha creat el certificat de revocació.\n"
 
-#: tools/gpg-card.c:3678
+#: tools/gpg-card.c:3695
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3679
+#: tools/gpg-card.c:3696
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3681
+#: tools/gpg-card.c:3698
 msgid "manage the command history"
 msgstr ""
 
 #, fuzzy
+#~ msgid "requesting key %s from %s server %s\n"
+#~ msgstr "s'està sol·licitant la clau %08lX de %s\n"
+
+#, fuzzy
+#~ msgid "%s:%u: no hostname given\n"
+#~ msgstr "(No es va donar una descripció)\n"
+
+#, fuzzy
+#~ msgid "could not parse keyserver\n"
+#~ msgstr ""
+#~ "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
+
+#, fuzzy
+#~| msgid "|NAME|set terminal charset to NAME"
+#~ msgid "|NAME|connect to host NAME"
+#~ msgstr "|NOM|el joc de caràcters serà NOM"
+
+#, fuzzy
+#~| msgid "|NAME|use NAME as default recipient"
+#~ msgid "|NAME|use user NAME for authentication"
+#~ msgstr "|NOM|usa NOM com a destinatari predeterminat"
+
+#, fuzzy
+#~| msgid "Usage: gpg [options] [files] (-h for help)"
+#~ msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
+#~ msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
+
+#, fuzzy
+#~| msgid "invalid import options\n"
+#~ msgid "invalid port number %d\n"
+#~ msgstr "opcions d'importació no vàlides\n"
+
+#, fuzzy
+#~ msgid "error writing to stdout: %s\n"
+#~ msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
+
+#, fuzzy
+#~ msgid "attribute '%s' not found\n"
+#~ msgstr "no s'ha trobat la clau secreta «%s»: %s\n"
+
+#, fuzzy
+#~| msgid "reading from `%s'\n"
+#~ msgid "processing url '%s'\n"
+#~ msgstr "s'està llegint des de «%s»\n"
+
+#, fuzzy
+#~| msgid "          w/o user IDs: %lu\n"
+#~ msgid "          user '%s'\n"
+#~ msgstr "                sense ID: %lu\n"
+
+#, fuzzy
+#~ msgid "          pass '%s'\n"
+#~ msgstr "              alias \""
+
+#, fuzzy
+#~| msgid "          w/o user IDs: %lu\n"
+#~ msgid "          host '%s'\n"
+#~ msgstr "                sense ID: %lu\n"
+
+#, fuzzy
+#~| msgid "          not imported: %lu\n"
+#~ msgid "          port %d\n"
+#~ msgstr "              importades: %lu\n"
+
+#, fuzzy
+#~ msgid "            DN '%s'\n"
+#~ msgstr "              alias \""
+
+#, fuzzy
+#~ msgid "          attr '%s'\n"
+#~ msgstr "              alias \""
+
+#, fuzzy
+#~ msgid "no host name in '%s'\n"
+#~ msgstr "(No es va donar una descripció)\n"
+
+#, fuzzy
+#~| msgid "WARNING: using insecure memory!\n"
+#~ msgid "WARNING: using first attribute only\n"
+#~ msgstr "AV�S: esteu usant memòria insegura!\n"
+
+#, fuzzy
+#~ msgid "LDAP init to '%s:%d' failed: %s\n"
+#~ msgstr "no s'ha pogut crear l'armadura: %s\n"
+
+#, fuzzy
+#~ msgid "LDAP init to '%s' failed: %s\n"
+#~ msgstr "no s'ha pogut crear l'armadura: %s\n"
+
+#, fuzzy
+#~ msgid "LDAP init to '%s' done\n"
+#~ msgstr "no s'ha pogut crear l'armadura: %s\n"
+
+#, fuzzy
+#~ msgid "binding to '%s:%d' failed: %s\n"
+#~ msgstr "no s'ha pogut crear l'armadura: %s\n"
+
+#, fuzzy
+#~| msgid "dearmoring failed: %s\n"
+#~ msgid "searching '%s' failed: %s\n"
+#~ msgstr "no s'ha pogut llevar l'armadura: %s\n"
+
+#, fuzzy
 #~ msgid "Suggest a random passphrase."
 #~ msgstr "canvia la contrasenya"
 
diff --git a/po/cs.gmo b/po/cs.gmo
index e3df065..a43f540 100644
--- a/po/cs.gmo
+++ b/po/cs.gmo
diff --git a/po/cs.po b/po/cs.po
index 546efc1..cafe72e 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: 2021-04-20 12:38+0200\n"
+"POT-Creation-Date: 2021-08-24 18:50+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:328
+#: agent/call-pinentry.c:338
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "získání zámku pinetry se nezdařilo: %s\n"
@@ -59,45 +59,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:546
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_OK"
 msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:547
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_Cancel"
 msgstr "|pinentry-label|_Zrušit"
 
-#: agent/call-pinentry.c:548
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|_Yes"
 msgstr "|pinentry-label|_Ano"
 
-#: agent/call-pinentry.c:549
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_No"
 msgstr "|pinentry-label|_Ne"
 
-#: agent/call-pinentry.c:550
+#: agent/call-pinentry.c:560
 msgid "|pinentry-label|PIN:"
 msgstr "|pinentry-label|PIN:"
 
-#: agent/call-pinentry.c:551
+#: agent/call-pinentry.c:561
 msgid "|pinentry-label|_Save in password manager"
 msgstr "|pinentry-label|_Uložit do správce hesel"
 
-#: agent/call-pinentry.c:552
+#: agent/call-pinentry.c:562
 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:554
+#: agent/call-pinentry.c:564
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr "|pinentry-tt|Zviditelnit heslo"
 
-#: agent/call-pinentry.c:555
+#: agent/call-pinentry.c:565
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "|pinentry-tt|Skrýt heslo"
 
+#: agent/call-pinentry.c:566
+msgid "Caps Lock is on"
+msgstr ""
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:944
+#: agent/call-pinentry.c:1022
 msgid "Suggest"
 msgstr ""
 
@@ -108,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:966
+#: agent/call-pinentry.c:1044
 #, fuzzy
 #| msgid "pinentry.qualitybar.tooltip"
 msgid "pinentry.genpin.tooltip"
@@ -116,9 +120,22 @@ msgstr ""
 "Kvalita textu zde zadaného.\n"
 "Na podrobnosti ohledně kritérií se zeptejte svého správce."
 
+#: agent/call-pinentry.c:1072
+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
+#, fuzzy
+#| msgid "Passphrase too long"
+msgid "Passphrase Not Allowed"
+msgstr "Heslo je příliš dlouhé"
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:998
+#: agent/call-pinentry.c:1198
 msgid "Quality:"
 msgstr "Kvalita:"
 
@@ -128,96 +145,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:1019
+#: agent/call-pinentry.c:1219
 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:1263
+#: agent/call-pinentry.c:1477
 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:1266
+#: agent/call-pinentry.c:1480
 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:1303 agent/call-pinentry.c:1506
+#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
 msgid "PIN:"
 msgstr "PIN:"
 
-#: agent/call-pinentry.c:1303 agent/call-pinentry.c:1506
-#: agent/protect-tool.c:728
+#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/protect-tool.c:729
 msgid "Passphrase:"
 msgstr "Heslo:"
 
-#: agent/call-pinentry.c:1330 agent/call-pinentry.c:1580 agent/command.c:1799
-#: agent/command.c:1852 agent/command-ssh.c:3046 agent/genkey.c:398
+#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
+#: agent/command.c:1988 agent/command-ssh.c:3046 agent/genkey.c:442
 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:1351 agent/call-pinentry.c:1603
+#: agent/call-pinentry.c:1566 agent/call-pinentry.c:1830
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (pokus %d z %d)"
 
-#: agent/call-pinentry.c:1362 agent/call-pinentry.c:1614
+#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
 msgid "Repeat:"
 msgstr "Znovu:"
 
-#: agent/call-pinentry.c:1372 agent/call-pinentry.c:1384
-#: agent/call-pinentry.c:1624 agent/call-pinentry.c:1636
+#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
+#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
 msgid "PIN too long"
 msgstr "PIN je příliš dlouhý"
 
-#: agent/call-pinentry.c:1373 agent/call-pinentry.c:1625
+#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
 msgid "Passphrase too long"
 msgstr "Heslo je příliš dlouhé"
 
-#: agent/call-pinentry.c:1381 agent/call-pinentry.c:1633
+#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
 msgid "Invalid characters in PIN"
 msgstr "Neplatný znak v PINu"
 
-#: agent/call-pinentry.c:1386 agent/call-pinentry.c:1638
+#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
 msgid "PIN too short"
 msgstr "PIN je příliš krátký"
 
-#: agent/call-pinentry.c:1405 agent/call-pinentry.c:1656
+#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
 msgid "Bad PIN"
 msgstr "Špatný PIN"
 
-#: agent/call-pinentry.c:1405 agent/call-pinentry.c:1656
+#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
 msgid "Bad Passphrase"
 msgstr "Špatné heslo"
 
-#: agent/command.c:697
+#: agent/command.c:823
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:698
+#: agent/command.c:824
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1106 g10/card-util.c:708 g10/card-util.c:729
+#: agent/command.c:1235 g10/card-util.c:713 g10/card-util.c:734
 #, 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:1634 agent/command.c:1791 agent/command-ssh.c:2974
-#: agent/genkey.c:333
+#: agent/command.c:1756 agent/command.c:1921 agent/command-ssh.c:2974
+#: agent/genkey.c:377
 msgid "Please re-enter this passphrase"
 msgstr "Prosím, vložte toto heslo znovu"
 
-#: agent/command.c:2567
+#: agent/command.c:2703
 #, fuzzy, c-format
 #| msgid ""
 #| "Please enter the passphrase to protect the imported object within the "
@@ -229,7 +246,7 @@ msgstr ""
 "Prosím, zadejte heslo, abyste ochránili importovaný objekt uvnitř systému "
 "GnuPG."
 
-#: agent/command.c:2697
+#: agent/command.c:2833
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -240,25 +257,25 @@ msgstr ""
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "SSH klí�e delší než %d bitů nejsou podporovány\n"
 
-#: agent/command-ssh.c:872 common/dotlock.c:852 g10/card-util.c:953
-#: g10/export.c:1329 g10/gpg.c:1431 g10/keygen.c:5347 g10/keyring.c:1319
-#: g10/keyring.c:1632 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
+#: agent/command-ssh.c:872 common/dotlock.c:852 g10/card-util.c:963
+#: g10/export.c:1329 g10/gpg.c:1431 g10/keygen.c:5377 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
 #: g10/sign.c:1106 g10/sign.c:1443 g10/tdbio.c:753 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:884 common/helpfile.c:57 g10/card-util.c:910
+#: agent/command-ssh.c:884 common/helpfile.c:57 g10/card-util.c:920
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
 #: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:721 g10/gpg.c:1432
-#: g10/import.c:371 g10/import.c:558 g10/import.c:793 g10/keygen.c:4322
-#: g10/keyring.c:1658 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
+#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4326
+#: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
 #: g10/plaintext.c:610 g10/sign.c:1086 g10/sign.c:1311 g10/sign.c:1424
 #: g10/sign.c:1596 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2380
-#: sm/gpgsm.c:2410 sm/gpgsm.c:2448 sm/keylist.c:1737 sm/qualified.c:65
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2236
+#: sm/gpgsm.c:2266 sm/gpgsm.c:2304 sm/keylist.c:1775 sm/qualified.c:65
 #: dirmngr/certcache.c:396 dirmngr/certcache.c:476 dirmngr/certcache.c:478
-#: dirmngr/crlcache.c:2588 dirmngr/dirmngr.c:1720 tools/gpg-card.c:408
+#: dirmngr/crlcache.c:2591 dirmngr/dirmngr.c:1759 tools/gpg-card.c:408
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "nelze otevřít „%s“: %s\n"
@@ -364,27 +381,27 @@ msgstr "PIN nebyl zopakován správně; zkuste to znovu"
 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:109 sm/certreqgen-ui.c:433
+#: 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:116
+#: 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
+#: agent/genkey.c:191
 msgid "Enter new passphrase"
 msgstr "Vložte nové heslo"
 
-#: agent/genkey.c:184
+#: agent/genkey.c:227
 #, 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:186
+#: agent/genkey.c:229
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -393,11 +410,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:198
+#: agent/genkey.c:241
 msgid "Yes, protection is not needed"
 msgstr "Ano, ochrana není třeba"
 
-#: agent/genkey.c:215
+#: agent/genkey.c:258
 #, c-format
 msgid "A passphrase should be at least %u character long."
 msgid_plural "A passphrase should be at least %u characters long."
@@ -405,7 +422,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:234
+#: agent/genkey.c:277
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -415,243 +432,242 @@ 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:260
+#: agent/genkey.c:304
 #, 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:275
+#: agent/genkey.c:319
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "Varování: Zadali jste nebezpe�né heslo."
 
-#: agent/genkey.c:296
+#: agent/genkey.c:340
 msgid "Take this one anyway"
 msgstr "Použít přesto tento klí�"
 
-#: agent/genkey.c:464
+#: agent/genkey.c:508
 #, 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:590
+#: agent/genkey.c:637
 msgid "Please enter the new passphrase"
 msgstr "Prosím, zadejte nové heslo"
 
-#: agent/gpg-agent.c:162 scd/scdaemon.c:115 dirmngr/dirmngr.c:182
+#: agent/gpg-agent.c:164 scd/scdaemon.c:115 dirmngr/dirmngr.c:183
 #, fuzzy
 #| msgid "Options useful for debugging"
 msgid "Options used for startup"
 msgstr "Volby užite�né při ladění"
 
-#: agent/gpg-agent.c:164 scd/scdaemon.c:120 dirmngr/dirmngr.c:171
+#: agent/gpg-agent.c:166 scd/scdaemon.c:120 dirmngr/dirmngr.c:172
 msgid "run in daemon mode (background)"
 msgstr "poběží v režimu démona (na pozadí)"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:117 dirmngr/dirmngr.c:170
+#: agent/gpg-agent.c:167 scd/scdaemon.c:117 dirmngr/dirmngr.c:171
 msgid "run in server mode (foreground)"
 msgstr "poběží v režimu serveru (na popředí)"
 
-#: agent/gpg-agent.c:167 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:169 dirmngr/dirmngr.c:174
 msgid "run in supervised mode"
 msgstr "poběží v režimu dohledu"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:121 dirmngr/dirmngr.c:184
+#: agent/gpg-agent.c:171 scd/scdaemon.c:121 dirmngr/dirmngr.c:185
 msgid "do not detach from the console"
 msgstr "neodpojovat se od konzole"
 
-#: agent/gpg-agent.c:170 scd/scdaemon.c:122 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:172 scd/scdaemon.c:122 dirmngr/dirmngr.c:186
 msgid "sh-style command output"
 msgstr "vypisovat příkazy ve stylu sh"
 
-#: agent/gpg-agent.c:171 scd/scdaemon.c:123 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:173 scd/scdaemon.c:123 dirmngr/dirmngr.c:187
 msgid "csh-style command output"
 msgstr "vypisovat příkazy ve stylu csh"
 
-#: agent/gpg-agent.c:179 g10/gpg.c:589 scd/scdaemon.c:125 sm/gpgsm.c:422
-#: dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:181 g10/gpg.c:589 scd/scdaemon.c:125 sm/gpgsm.c:423
+#: dirmngr/dirmngr.c:189
 msgid "|FILE|read options from FILE"
 msgstr "|SOUBOR|na�íst volby ze SOUBORU"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:574 scd/scdaemon.c:129 sm/gpgsm.c:265
-#: dirmngr/dirmngr.c:192
+#: agent/gpg-agent.c:185 g10/gpg.c:574 scd/scdaemon.c:129 sm/gpgsm.c:265
+#: dirmngr/dirmngr.c:193
 msgid "Options controlling the diagnostic output"
 msgstr "Volby ovlivňující diagnostický výstup"
 
-#: agent/gpg-agent.c:185 g10/gpg.c:576 g10/gpgv.c:78 kbx/kbxutil.c:89
+#: agent/gpg-agent.c:187 g10/gpg.c:576 g10/gpgv.c:78 kbx/kbxutil.c:89
 #: scd/scdaemon.c:131 sm/gpgsm.c:267 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:194 dirmngr/dirmngr_ldap.c:102
-#: tools/gpg-connect-agent.c:85 tools/gpgconf.c:111
+#: dirmngr/dirmngr.c:195 tools/gpg-connect-agent.c:85 tools/gpgconf.c:111
 msgid "verbose"
 msgstr "upovídaný režim"
 
-#: agent/gpg-agent.c:186 g10/gpg.c:578 g10/gpgv.c:79 kbx/kbxutil.c:90
+#: agent/gpg-agent.c:188 g10/gpg.c:578 g10/gpgv.c:79 kbx/kbxutil.c:90
 #: scd/scdaemon.c:132 sm/gpgsm.c:269 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:195 dirmngr/dirmngr_ldap.c:103
+#: dirmngr/dirmngr.c:196
 msgid "be somewhat more quiet"
 msgstr "být o trochu víc tichý"
 
-#: agent/gpg-agent.c:194 g10/gpg.c:593 sm/gpgsm.c:283 dirmngr/dirmngr.c:205
+#: agent/gpg-agent.c:196 g10/gpg.c:593 sm/gpgsm.c:283 dirmngr/dirmngr.c:206
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|SOUBOR|protokol z režimu serveru se zapíše do SOUBORU"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 scd/scdaemon.c:146 sm/gpgsm.c:290
-#: dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:599 scd/scdaemon.c:146 sm/gpgsm.c:290
+#: dirmngr/dirmngr.c:210
 msgid "Options controlling the configuration"
 msgstr "Volby ovlivňující nastavení"
 
-#: agent/gpg-agent.c:201
+#: agent/gpg-agent.c:203
 msgid "do not use the SCdaemon"
 msgstr "nepoužívat SCdémona"
 
-#: agent/gpg-agent.c:203
+#: agent/gpg-agent.c:205
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PROGRAM|použít PROGRAM jako SCdaemon program"
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 #, 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:209
+#: agent/gpg-agent.c:211
 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:213
+#: agent/gpg-agent.c:215
 msgid "ignore requests to change the TTY"
 msgstr "ignorovat požadavky na změnu TTY"
 
-#: agent/gpg-agent.c:215
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the X display"
 msgstr "ignorovat požadavky na změnu X displeje"
 
-#: agent/gpg-agent.c:216
+#: agent/gpg-agent.c:218
 msgid "enable ssh support"
 msgstr "zapnout podporu pro OpenSSH"
 
-#: agent/gpg-agent.c:218
+#: agent/gpg-agent.c:220
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "|ALGORITMUS|ukazovat otisky SSH pomocí ALGORITMU"
 
-#: agent/gpg-agent.c:221
+#: agent/gpg-agent.c:223
 msgid "enable putty support"
 msgstr "zapnout podporu pro PuTTY"
 
-#: agent/gpg-agent.c:233 g10/gpg.c:844 scd/scdaemon.c:176 sm/gpgsm.c:382
+#: agent/gpg-agent.c:235 g10/gpg.c:844 scd/scdaemon.c:176 sm/gpgsm.c:383
 msgid "Options controlling the security"
 msgstr "Volby ovlivňující bezpe�nost"
 
-#: agent/gpg-agent.c:236
+#: agent/gpg-agent.c:238
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|zahodit zapamatované PINy po N sekundách"
 
-#: agent/gpg-agent.c:238
+#: agent/gpg-agent.c:240
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|zahazovat klí�e SSH po N sekundách"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:242
 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:242
+#: agent/gpg-agent.c:244
 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:244
+#: agent/gpg-agent.c:246
 msgid "do not use the PIN cache when signing"
 msgstr "nepoužívat paměť PINů na podepisování"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:248
 msgid "disallow the use of an external password cache"
 msgstr "nedovolit použít vnější úložiště na hesla"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:250
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "nedovolit klientům ozna�ovat klí�e za „důvěryhodné“"
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:253
 msgid "allow presetting passphrase"
 msgstr "umožnit přednastavení hesla"
 
-#: agent/gpg-agent.c:256
+#: agent/gpg-agent.c:258
 msgid "Options enforcing a passphrase policy"
 msgstr "Volby vynucující politiku hesel"
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:261
 msgid "do not allow bypassing the passphrase policy"
 msgstr "nedovolit obejití politiky hesel"
 
-#: agent/gpg-agent.c:261
+#: agent/gpg-agent.c:263
 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:263
+#: agent/gpg-agent.c:265
 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:266
+#: agent/gpg-agent.c:268
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr "|SOUBOR|prověřovat nová hesla proti vzorům v SOUBORU"
 
-#: agent/gpg-agent.c:268
+#: agent/gpg-agent.c:272
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|omezit platnost hesla na N dnů"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:274
 msgid "do not allow the reuse of old passphrases"
 msgstr "nedovolit opakovat stará hesla"
 
-#: agent/gpg-agent.c:273
+#: agent/gpg-agent.c:277
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the PIN-Entry"
 msgstr "Volby ovlivňující bezpe�nost"
 
-#: agent/gpg-agent.c:275
+#: agent/gpg-agent.c:279
 msgid "never use the PIN-entry"
 msgstr ""
 
-#: agent/gpg-agent.c:277
+#: agent/gpg-agent.c:281
 msgid "disallow caller to override the pinentry"
 msgstr "znemožnit volajícímu přebít pinentry"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:283
 #, 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:282
+#: agent/gpg-agent.c:286
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PROGRAM|použít PROGRAM jako PIN-Entry program"
 
-#: agent/gpg-agent.c:286
+#: agent/gpg-agent.c:290
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|nastavit �asový limit pro Pinentry na N sekund"
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:294
 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:551 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: agent/gpg-agent.c:557 agent/preset-passphrase.c:99 agent/protect-tool.c:154
 #: g10/gpg.c:1132 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:612 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:438
-#: dirmngr/dirmngr_ldap.c:175 tools/gpg-connect-agent.c:220 tools/gpgconf.c:151
+#: sm/gpgsm.c:613 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:446
+#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:151
 #: 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:560
+#: agent/gpg-agent.c:566
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Použití: @GPG_AGENT@ [volby] (-h pro nápovědu)"
 
-#: agent/gpg-agent.c:562
+#: agent/gpg-agent.c:568
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -659,131 +675,131 @@ msgstr ""
 "Syntaxe: @GPG_AGENT@ [volby] [příkaz [argumenty]]\n"
 "Správa tajných klí�ů pro @GNUPG@\n"
 
-#: agent/gpg-agent.c:607 g10/gpg.c:1337 scd/scdaemon.c:384 sm/gpgsm.c:760
-#: dirmngr/dirmngr.c:522
+#: agent/gpg-agent.c:613 g10/gpg.c:1337 scd/scdaemon.c:384 sm/gpgsm.c:761
+#: dirmngr/dirmngr.c:530
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "zadána neplatná úroveň ladění „%s“\n"
 
-#: agent/gpg-agent.c:972 g10/gpg.c:3910 g10/gpg.c:3934 sm/gpgsm.c:1769
-#: sm/gpgsm.c:1775
+#: agent/gpg-agent.c:986 g10/gpg.c:3907 g10/gpg.c:3931 sm/gpgsm.c:1622
+#: sm/gpgsm.c:1628
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybraný hashovací algoritmus je neplatný\n"
 
-#: agent/gpg-agent.c:1196 agent/gpg-agent.c:2019 common/comopt.c:93
-#: g10/gpg.c:2591 scd/scdaemon.c:549 sm/gpgsm.c:1155 dirmngr/dirmngr.c:989
-#: dirmngr/dirmngr.c:1840
+#: agent/gpg-agent.c:1210 agent/gpg-agent.c:2035 common/comopt.c:93
+#: g10/gpg.c:2594 scd/scdaemon.c:549 sm/gpgsm.c:1028 dirmngr/dirmngr.c:1029
+#: dirmngr/dirmngr.c:1879
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "�tou se možnosti z „%s“\n"
 
-#: agent/gpg-agent.c:1335 g10/gpg.c:3861 scd/scdaemon.c:687 sm/gpgsm.c:1709
-#: dirmngr/dirmngr.c:1108 tools/gpg-connect-agent.c:1270 tools/gpgconf.c:634
+#: agent/gpg-agent.c:1349 g10/gpg.c:3858 scd/scdaemon.c:687 sm/gpgsm.c:1562
+#: dirmngr/dirmngr.c:1145 tools/gpg-connect-agent.c:1270 tools/gpgconf.c:668
 #, 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:2172 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1267
+#: agent/gpg-agent.c:2188 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1306
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "socket nelze vytvořit: %s\n"
 
-#: agent/gpg-agent.c:2189 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1280
+#: agent/gpg-agent.c:2205 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1319
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "název socketu „%s“ je příliš dlouhý\n"
 
-#: agent/gpg-agent.c:2228
+#: agent/gpg-agent.c:2244
 #, 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:2239 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1312
+#: agent/gpg-agent.c:2255 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1351
 #, 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:2244 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1315
+#: agent/gpg-agent.c:2260 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1354
 #, 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:2255 agent/gpg-agent.c:2295 agent/gpg-agent.c:2304
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1324
+#: agent/gpg-agent.c:2271 agent/gpg-agent.c:2311 agent/gpg-agent.c:2320
+#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1363
 #, 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:2269 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1336
+#: agent/gpg-agent.c:2285 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1375
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "naslouchá se na socketu „%s“\n"
 
-#: agent/gpg-agent.c:2289 agent/gpg-agent.c:2342 common/homedir.c:517
+#: agent/gpg-agent.c:2305 agent/gpg-agent.c:2358 common/homedir.c:537
 #: 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:2292 agent/gpg-agent.c:2347 common/homedir.c:520
+#: agent/gpg-agent.c:2308 agent/gpg-agent.c:2363 common/homedir.c:540
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "adresář „%s“ vytvořen\n"
 
-#: agent/gpg-agent.c:2353
+#: agent/gpg-agent.c:2369
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "volání stat() na „%s“ selhalo: %s\n"
 
-#: agent/gpg-agent.c:2357
+#: agent/gpg-agent.c:2373
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "„%s“ nelze použít jako domovský adresář\n"
 
-#: agent/gpg-agent.c:2512 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2069
+#: agent/gpg-agent.c:2528 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2108
 #, 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:2719
+#: agent/gpg-agent.c:2735
 #, 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:2724
+#: agent/gpg-agent.c:2740
 #, 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:2799
+#: agent/gpg-agent.c:2815
 #, 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:2804
+#: agent/gpg-agent.c:2820
 #, 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:3026 scd/scdaemon.c:1374 dirmngr/dirmngr.c:2283
+#: agent/gpg-agent.c:3042 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2322
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "npth_pselect selhala: %s – �eká se 1 s\n"
 
-#: agent/gpg-agent.c:3114 scd/scdaemon.c:1439
+#: agent/gpg-agent.c:3130 scd/scdaemon.c:1441
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s pozastaveno\n"
 
-#: agent/gpg-agent.c:3252 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3271 common/simple-pwquery.c:247 g10/call-agent.c:260
 #: sm/call-agent.c:131 tools/gpg-connect-agent.c:2319 tools/card-call-scd.c:311
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "v této relaci neběží žádný gpg-agent\n"
 
-#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:70
+#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:66
 msgid ""
 "@Options:\n"
 " "
@@ -804,7 +820,7 @@ msgstr ""
 "Správa do�asné paměti pro hesla\n"
 
 #: agent/protect-tool.c:107 g10/gpg.c:448 kbx/kbxutil.c:72 sm/gpgsm.c:215
-#: dirmngr/dirmngr.c:168 tools/gpgconf.c:81
+#: dirmngr/dirmngr.c:169 tools/gpgconf.c:81
 msgid ""
 "@Commands:\n"
 " "
@@ -835,15 +851,15 @@ msgstr ""
 "Syntaxe: gpg-protect-tool [volby] [argumenty]\n"
 "Nástroj na správu tajných klí�ů\n"
 
-#: agent/protect-tool.c:707
+#: agent/protect-tool.c:708 sm/import.c:775
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Prosím, vložte heslo, abyste zpřístupnili objekt PKCS#12."
 
-#: agent/protect-tool.c:712
+#: agent/protect-tool.c:713 sm/export.c:727
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Prosím, vložte heslo, abyste ochránili nový objekt PKCS#12."
 
-#: agent/protect-tool.c:718
+#: agent/protect-tool.c:719
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
@@ -851,7 +867,7 @@ msgstr ""
 "Prosím, zadejte heslo, abyste ochránili importovaný objekt uvnitř systému "
 "GnuPG."
 
-#: agent/protect-tool.c:723
+#: agent/protect-tool.c:724
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -859,17 +875,17 @@ msgstr ""
 "Prosím, vložte heslo nebo PIN\n"
 "potřebný pro dokon�ení této operace."
 
-#: agent/protect-tool.c:734
+#: agent/protect-tool.c:735
 #, c-format
 msgid "cancelled\n"
 msgstr "zrušeno\n"
 
-#: agent/protect-tool.c:736
+#: agent/protect-tool.c:737
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "chyba při ptaní se na heslo: %s\n"
 
-#: agent/trustlist.c:153 agent/trustlist.c:363 tools/gpgconf.c:424
+#: agent/trustlist.c:153 agent/trustlist.c:363 tools/gpgconf.c:458
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "chyba při otevírání „%s“: %s\n"
@@ -1027,7 +1043,7 @@ msgstr "kontrola vytvořeného podpisu se nepodařila: %s\n"
 msgid "secret key parts are not available\n"
 msgstr "tajné �ásti klí�e nejsou dostupné\n"
 
-#: agent/cvt-openpgp.c:343 g10/card-util.c:1562
+#: agent/cvt-openpgp.c:343 g10/card-util.c:1575
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr "algoritmus %d (%s) veřejného klí�e není podporován\n"
@@ -1056,7 +1072,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:505 common/exechelp-posix.c:580
-#: common/exechelp-posix.c:866 dirmngr/dirmngr.c:1354
+#: common/exechelp-posix.c:866 dirmngr/dirmngr.c:1393
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "chyba při rozdvojování procesu: %s\n"
@@ -1130,7 +1146,7 @@ msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "přejmenování „%s“ na „%s“ se nezdařilo: %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3082
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3099
 msgid "yes"
 msgstr "ano"
 
@@ -1184,7 +1200,7 @@ msgstr "při pokusu alokovat %lu bajtů došla bezpe�ná paměť"
 msgid "out of core while allocating %lu bytes"
 msgstr "při pokusu alokovat %lu bajtů došla paměť"
 
-#: common/miscellaneous.c:115 g10/card-util.c:917 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:927 tools/no-libgcrypt.c:30
 #: tools/gpg-card.c:416
 #, c-format
 msgid "error allocating enough memory: %s\n"
@@ -1261,7 +1277,7 @@ msgstr "chyba při získávání verze z „%s“: %s\n"
 msgid "server '%s' is older than us (%s < %s)"
 msgstr "server „%s“ je starší než my (%s < %s)"
 
-#: common/asshelp.c:737 g10/call-dirmngr.c:408
+#: common/asshelp.c:737 g10/call-dirmngr.c:407
 #, c-format
 msgid "WARNING: %s\n"
 msgstr "VAROV�N�: %s\n"
@@ -1345,7 +1361,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:4212
+#: scd/app-openpgp.c:4214
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "nepodporovaný algoritmus: %s"
@@ -1420,11 +1436,11 @@ msgstr "Řetěz certifikátů je platný"
 msgid "Root certificate trustworthy"
 msgstr "Kořenový certifikát je důvěryhodný"
 
-#: common/audit.c:1112 sm/certchain.c:1242
+#: common/audit.c:1112 sm/certchain.c:1243
 msgid "no CRL found for certificate"
 msgstr "pro certifikát nebyl nalezen žádný CRL"
 
-#: common/audit.c:1115 sm/certchain.c:1252
+#: common/audit.c:1115 sm/certchain.c:1253
 msgid "the available CRL is too old"
 msgstr "dostupný CRL je příliš starý"
 
@@ -1470,22 +1486,22 @@ msgstr "[neuvedeno]"
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "neplatný radix64 znak %02x byl přesko�en\n"
 
-#: common/ttyio.c:433
+#: common/ttyio.c:447
 #, c-format
 msgid "Sorry, we are in batchmode - can't get input\n"
 msgstr ""
 
-#: common/ttyio.c:439
+#: common/ttyio.c:453
 #, c-format
 msgid "Sorry, no terminal at all requested - can't get input\n"
 msgstr ""
 
-#: common/ttyio.c:474 common/ttyio.c:484
+#: common/ttyio.c:488 common/ttyio.c:498
 #, c-format
 msgid "too many errors; giving up\n"
 msgstr ""
 
-#: common/ttyio.c:536
+#: common/ttyio.c:550
 #, c-format
 msgid "Control-D detected\n"
 msgstr ""
@@ -1540,8 +1556,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:1036 dirmngr/dirmngr.c:895
-#: dirmngr/dirmngr.c:904
+#: common/init.c:191 sm/gpgsm.c:909 dirmngr/dirmngr.c:935 dirmngr/dirmngr.c:944
 #, 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"
@@ -1694,7 +1709,7 @@ msgid "Enter passphrase: "
 msgstr "Vložte heslo: "
 
 #: g10/call-agent.c:318 g10/encrypt.c:282 g10/encrypt.c:818 g10/sign.c:473
-#: sm/call-agent.c:180 sm/encrypt.c:701 sm/sign.c:436
+#: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
 #, c-format
 msgid "%s is not compliant with %s mode\n"
 msgstr "%s není v souladu s režimem %s\n"
@@ -1705,213 +1720,213 @@ msgstr "%s není v souladu s režimem %s\n"
 msgid "error from TPM: %s\n"
 msgstr "chyba při �tení z %s': %s\n"
 
-#: g10/call-agent.c:2123 g10/passphrase.c:225 g10/passphrase.c:258
-#: tools/card-call-scd.c:1751
+#: g10/call-agent.c:2135 g10/passphrase.c:233 g10/passphrase.c:266
+#: tools/card-call-scd.c:1755
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problém s agentem: %s\n"
 
-#: g10/call-dirmngr.c:179 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2316
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2316
 #, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "v této relaci neběží žádný dirmngr\n"
 
-#: g10/call-dirmngr.c:213
+#: g10/call-dirmngr.c:212
 #, fuzzy, c-format
 #| msgid "keyserver option \"%s\" may not be used in %s mode\n"
 msgid "keyserver option \"honor-keyserver-url\" may not be used in Tor mode\n"
 msgstr "volba serveru s klí�i „%s“ se nesmí používat v režimu %s\n"
 
-#: g10/call-dirmngr.c:386
+#: g10/call-dirmngr.c:385
 msgid "WKD uses a cached result"
 msgstr "WKD používá zapamatované výsledky"
 
-#: g10/call-dirmngr.c:389
+#: g10/call-dirmngr.c:388
 msgid "Tor is not running"
 msgstr "To neběží"
 
-#: g10/call-dirmngr.c:391
+#: g10/call-dirmngr.c:390
 msgid "Tor is not properly configured"
 msgstr "Tor není řádně nastaven"
 
-#: g10/call-dirmngr.c:393
+#: g10/call-dirmngr.c:392
 msgid "DNS is not properly configured"
 msgstr "DNS není řádně nastaveno"
 
-#: g10/call-dirmngr.c:395
+#: g10/call-dirmngr.c:394
 msgid "unacceptable HTTP redirect from server"
 msgstr "nepřijatelné přesměrování HTTP serverem"
 
-#: g10/call-dirmngr.c:397
+#: g10/call-dirmngr.c:396
 msgid "unacceptable HTTP redirect from server was cleaned up"
 msgstr "nepřijatelné přesměrování HTTP serverem bylo odklizeno"
 
-#: g10/call-dirmngr.c:399
+#: g10/call-dirmngr.c:398
 msgid "server uses an invalid certificate"
 msgstr "server používá neplatný certifikát"
 
-#: g10/call-dirmngr.c:406 g10/gpg.c:4599
+#: g10/call-dirmngr.c:405 g10/gpg.c:4596
 #, c-format
 msgid "Note: %s\n"
 msgstr "Poznámka: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:369 g10/card-util.c:1924
-#: tools/gpg-card.c:3039
+#: g10/card-util.c:86 g10/card-util.c:374 g10/card-util.c:1937
+#: tools/gpg-card.c:3056
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP karta není dostupná: %s\n"
 
-#: g10/card-util.c:91 g10/card-util.c:1930
+#: g10/card-util.c:91 g10/card-util.c:1943
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "Nalezena OpenPGP karta �íslo %s\n"
 
-#: g10/card-util.c:97 g10/card-util.c:2309 g10/delkey.c:164 g10/keyedit.c:1428
-#: g10/keygen.c:4791 g10/revoke.c:214 g10/revoke.c:638
+#: g10/card-util.c:97 g10/card-util.c:2322 g10/delkey.c:164 g10/keyedit.c:1428
+#: g10/keygen.c:4795 g10/revoke.c:214 g10/revoke.c:639
 #, c-format
 msgid "can't do this in batch mode\n"
 msgstr "nelze provést v dávkovém režimu\n"
 
-#: g10/card-util.c:105 tools/gpg-card.c:2943
+#: g10/card-util.c:105 tools/gpg-card.c:2960
 #, c-format
 msgid "This command is only available for version 2 cards\n"
 msgstr "Tento příkaz je dostupný pouze pro karty verze 2\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3398 tools/gpg-card.c:2948
+#: g10/card-util.c:107 scd/app-openpgp.c:3399 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"
 
-#: g10/card-util.c:140 g10/card-util.c:1448 g10/card-util.c:1710
-#: g10/card-util.c:1802 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1991 g10/keygen.c:2165 g10/keygen.c:2385 g10/keygen.c:2685
+#: g10/card-util.c:140 g10/card-util.c:1458 g10/card-util.c:1723
+#: g10/card-util.c:1815 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/keygen.c:1992 g10/keygen.c:2166 g10/keygen.c:2386 g10/keygen.c:2686
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
 #: tools/gpg-card.c:510
 msgid "Your selection? "
 msgstr "Váš výběr? "
 
-#: g10/card-util.c:262 g10/card-util.c:313 tools/gpg-card.c:596
+#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:596
 #: tools/gpg-card.c:636
 msgid "[not set]"
 msgstr "[není nastaveno]"
 
-#: g10/card-util.c:558 tools/gpg-card.c:903
+#: g10/card-util.c:563 tools/gpg-card.c:905
 msgid "Mr."
 msgstr "Pan"
 
-#: g10/card-util.c:559 tools/gpg-card.c:904
+#: g10/card-util.c:564 tools/gpg-card.c:906
 msgid "Ms."
 msgstr "Paní"
 
-#: g10/card-util.c:586 tools/gpg-card.c:931
+#: g10/card-util.c:591 tools/gpg-card.c:933
 msgid "not forced"
 msgstr "není vyžadováno"
 
-#: g10/card-util.c:586 tools/gpg-card.c:931
+#: g10/card-util.c:591 tools/gpg-card.c:933
 msgid "forced"
 msgstr "vyžadováno"
 
-#: g10/card-util.c:768 tools/gpg-card.c:1468
+#: g10/card-util.c:773 tools/gpg-card.c:1484
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Chyba: V sou�asné verzi je povolenou pouze plain ASCII.\n"
 
-#: g10/card-util.c:770 tools/gpg-card.c:1470
+#: g10/card-util.c:775 tools/gpg-card.c:1486
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Chyba: Znak „<“ nelze použít.\n"
 
-#: g10/card-util.c:772 tools/gpg-card.c:1472
+#: g10/card-util.c:777 tools/gpg-card.c:1488
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Chyba: Více mezer není povoleno.\n"
 
-#: g10/card-util.c:789 tools/gpg-card.c:1505
+#: g10/card-util.c:795 tools/gpg-card.c:1521
 msgid "Cardholder's surname: "
 msgstr "Příjmení držitele karty: "
 
-#: g10/card-util.c:791 tools/gpg-card.c:1506
+#: g10/card-util.c:797 tools/gpg-card.c:1522
 msgid "Cardholder's given name: "
 msgstr "Jméno (křestní) držitele karty: "
 
-#: g10/card-util.c:809 tools/gpg-card.c:1523
+#: g10/card-util.c:816 tools/gpg-card.c:1539
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Chyba: jméno a příjmení je příliš dlouhé (limit je %d znaků).\n"
 
-#: g10/card-util.c:830 tools/gpg-card.c:1561
+#: g10/card-util.c:840 tools/gpg-card.c:1577
 msgid "URL to retrieve public key: "
 msgstr "URL pro získání veřejného klí�e: "
 
-#: g10/card-util.c:926 g10/decrypt-data.c:495 g10/import.c:406 g10/import.c:756
-#: g10/import.c:815 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1666
-#: tools/gpgconf.c:437 tools/gpgconf.c:483 tools/gpg-card.c:426
+#: g10/card-util.c:936 g10/decrypt-data.c:495 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:1705
+#: tools/gpgconf.c:471 tools/gpgconf.c:517 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:959 g10/decrypt-data.c:498 g10/export.c:2496
+#: g10/card-util.c:969 g10/decrypt-data.c:498 g10/export.c:2496
 #: dirmngr/crlcache.c:925 tools/gpg-card.c:486 tools/gpg-card.c:493
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr "chyba při zápisu do „%s“: %s\n"
 
-#: g10/card-util.c:986 tools/gpg-card.c:1650
+#: g10/card-util.c:996 tools/gpg-card.c:1666
 msgid "Login data (account name): "
 msgstr "Login (jménu ú�tu): "
 
-#: g10/card-util.c:1024 tools/gpg-card.c:1945
+#: g10/card-util.c:1034 tools/gpg-card.c:1962
 msgid "Private DO data: "
 msgstr "Privátní DO data: "
 
-#: g10/card-util.c:1109 tools/gpg-card.c:1699
+#: g10/card-util.c:1119 tools/gpg-card.c:1715
 msgid "Language preferences: "
 msgstr "Jazykové předvolby: "
 
-#: g10/card-util.c:1117 tools/gpg-card.c:1710
+#: g10/card-util.c:1127 tools/gpg-card.c:1726
 #, c-format
 msgid "Error: invalid length of preference string.\n"
 msgstr "Chyba: neplatná délka řetězce s předvolbami.\n"
 
-#: g10/card-util.c:1126 tools/gpg-card.c:1719
+#: g10/card-util.c:1136 tools/gpg-card.c:1735
 #, c-format
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Chyba: neplatný znak v řetězci s předvolbami\n"
 
-#: g10/card-util.c:1148 tools/gpg-card.c:1753
+#: g10/card-util.c:1158 tools/gpg-card.c:1769
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr "Oslovení (M = Pan, F = Paní, nebo mezera): "
 
-#: g10/card-util.c:1162 tools/gpg-card.c:1770
+#: g10/card-util.c:1172 tools/gpg-card.c:1786
 msgid "Error: invalid response.\n"
 msgstr "Chyba: neplatná odpově�.\n"
 
-#: g10/card-util.c:1185 tools/gpg-card.c:1835
+#: g10/card-util.c:1195 tools/gpg-card.c:1852
 msgid "CA fingerprint: "
 msgstr "Otisk CA: "
 
-#: g10/card-util.c:1209 tools/gpg-card.c:1861
+#: g10/card-util.c:1219 tools/gpg-card.c:1878
 #, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Chyba: chybně utvořené otisk.\n"
 
-#: g10/card-util.c:1259
+#: g10/card-util.c:1269
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "operace s klí�em není možná: %s\n"
 
-#: g10/card-util.c:1260
+#: g10/card-util.c:1270
 msgid "not an OpenPGP card"
 msgstr "toto není OpenPGP karta"
 
-#: g10/card-util.c:1273 g10/keygen.c:4811 g10/keygen.c:5972
+#: g10/card-util.c:1283 g10/keygen.c:4815 g10/keygen.c:6003
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "chyba při získání informací o aktuálním klí�i: %s\n"
 
-#: g10/card-util.c:1358
+#: g10/card-util.c:1368
 msgid "Replace existing key? (y/N) "
 msgstr "Přepsat existující klí�? (a/N) "
 
-#: g10/card-util.c:1375 tools/gpg-card.c:3328
+#: g10/card-util.c:1385 tools/gpg-card.c:3345
 #, fuzzy
 #| msgid ""
 #| "Note: There is no guarantee that the card supports the requested size.\n"
@@ -1928,99 +1943,99 @@ msgstr ""
 "dokumentace\n"
 "          své karty, kde se dozvíte, jaké velikosti jsou dovoleny.\n"
 
-#: g10/card-util.c:1396 g10/keygen.c:2570 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1406 g10/keygen.c:2571 sm/certreqgen-ui.c:180
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Jakou délku klí�e si přejete? (%u) "
 
-#: g10/card-util.c:1406 g10/keygen.c:2493 g10/keygen.c:2525
+#: g10/card-util.c:1416 g10/keygen.c:2494 g10/keygen.c:2526
 #: sm/certreqgen-ui.c:195
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokrouhleno na %u bitů\n"
 
-#: g10/card-util.c:1414 g10/keygen.c:2578 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1424 g10/keygen.c:2579 sm/certreqgen-ui.c:185
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "velikost klí�e %s musí být v intervalu %u-%u\n"
 
-#: g10/card-util.c:1433
+#: g10/card-util.c:1443
 msgid "Changing card key attribute for: "
 msgstr "Mění se atribut kartového klí�e pro: "
 
-#: g10/card-util.c:1435
+#: g10/card-util.c:1445
 msgid "Signature key\n"
 msgstr "Podepisovací klí�\n"
 
-#: g10/card-util.c:1437
+#: g10/card-util.c:1447
 msgid "Encryption key\n"
 msgstr "Šifrovací klí�\n"
 
-#: g10/card-util.c:1439
+#: g10/card-util.c:1449
 msgid "Authentication key\n"
 msgstr "Autentiza�ní klí�\n"
 
-#: g10/card-util.c:1441 g10/keygen.c:2112 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1451 g10/keygen.c:2113 sm/certreqgen-ui.c:158
 msgid "Please select what kind of key you want:\n"
 msgstr "Prosím, vyberte druh klí�e, který chcete:\n"
 
-#: g10/card-util.c:1442 sm/certreqgen-ui.c:159
+#: g10/card-util.c:1452 sm/certreqgen-ui.c:159
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1443
+#: g10/card-util.c:1453
 #, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) ECC\n"
 
-#: g10/card-util.c:1455 g10/card-util.c:1722 g10/card-util.c:1822
-#: g10/keyedit.c:900 g10/keygen.c:2017 g10/keygen.c:2045 g10/keygen.c:2172
-#: g10/keygen.c:2425 g10/keygen.c:2713 g10/revoke.c:836
+#: g10/card-util.c:1468 g10/card-util.c:1735 g10/card-util.c:1835
+#: g10/keyedit.c:900 g10/keygen.c:2018 g10/keygen.c:2046 g10/keygen.c:2173
+#: g10/keygen.c:2426 g10/keygen.c:2714 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Neplatný výběr.\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1541
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr "Karta bude nyní přenastavena na generování klí�e dlouhého %u bitů\n"
 
-#: g10/card-util.c:1533
+#: g10/card-util.c:1546
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr "Karta bude nyní přenastavena na generování klí�e typu: %s\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1582
 #, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "chyba při změně atributu klí�e %d: %s\n"
 
-#: g10/card-util.c:1585 g10/card-util.c:2106 g10/card-util.c:2162
+#: g10/card-util.c:1598 g10/card-util.c:2119 g10/card-util.c:2175
 #, c-format
 msgid "error getting card info: %s\n"
 msgstr "chyba při získání informací o kartě: %s\n"
 
-#: g10/card-util.c:1591 g10/card-util.c:1936 g10/card-util.c:2112
-#: g10/card-util.c:2171 tools/gpg-card.c:3057 tools/gpg-card.c:3296
-#: tools/gpg-card.c:3354
+#: g10/card-util.c:1604 g10/card-util.c:1949 g10/card-util.c:2125
+#: g10/card-util.c:2184 tools/gpg-card.c:3074 tools/gpg-card.c:3313
+#: tools/gpg-card.c:3371
 #, c-format
 msgid "This command is not supported by this card\n"
 msgstr "Tento příkaz není touto kartou podporován\n"
 
-#: g10/card-util.c:1637 tools/gpg-card.c:2426
+#: g10/card-util.c:1650 tools/gpg-card.c:2443
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Vytvořit zálohu šifrovacího klí�e mimo kartu? (A/n) "
 
-#: g10/card-util.c:1651
+#: g10/card-util.c:1664
 #, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "Poznámka: na kartě jsou již klí�e uloženy!\n"
 
-#: g10/card-util.c:1654 tools/gpg-card.c:2398
+#: g10/card-util.c:1667 tools/gpg-card.c:2415
 msgid "Replace existing keys? (y/N) "
 msgstr "Přepsat existující klí�e? (a/N) "
 
-#: g10/card-util.c:1666 tools/gpg-card.c:2457
+#: g10/card-util.c:1679 tools/gpg-card.c:2474
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2031,158 +2046,158 @@ msgstr ""
 "   PIN = „%s“     PIN správce = „%s“\n"
 "Měli byste je změnit příkazem --change-pin\n"
 
-#: g10/card-util.c:1701
+#: g10/card-util.c:1714
 msgid "Please select the type of key to generate:\n"
 msgstr "Prosím, vyberte druh klí�e, který chcete generovat:\n"
 
-#: g10/card-util.c:1703 g10/card-util.c:1793
+#: g10/card-util.c:1716 g10/card-util.c:1806
 msgid "   (1) Signature key\n"
 msgstr "   (1) Podepisovací klí�\n"
 
-#: g10/card-util.c:1704 g10/card-util.c:1795
+#: g10/card-util.c:1717 g10/card-util.c:1808
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Šifrovací klí�\n"
 
-#: g10/card-util.c:1705 g10/card-util.c:1797
+#: g10/card-util.c:1718 g10/card-util.c:1810
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Autentiza�ní klí�\n"
 
-#: g10/card-util.c:1790
+#: g10/card-util.c:1803
 msgid "Please select where to store the key:\n"
 msgstr "Prosím vyberte, kam uložit klí�:\n"
 
-#: g10/card-util.c:1836
+#: g10/card-util.c:1849
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "Volání KEYTOCARD selhalo: %s\n"
 
-#: g10/card-util.c:1941 tools/gpg-card.c:3065
+#: g10/card-util.c:1954 tools/gpg-card.c:3082
 #, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr "Poznámka: Tento příkaz zni�í všechny klí�e uložené na kartě!\n"
 
-#: g10/card-util.c:1944 tools/gpg-card.c:3068 tools/gpg-card.c:3409
+#: g10/card-util.c:1957 tools/gpg-card.c:3085 tools/gpg-card.c:3426
 msgid "Continue? (y/N) "
 msgstr "Pokra�ovat (a/N) "
 
 # The code expects non-localized "yes"
-#: g10/card-util.c:1949 tools/gpg-card.c:3079
+#: g10/card-util.c:1962 tools/gpg-card.c:3096
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr "Opravdu obnovit tovární nastavení (zadejte „yes“) "
 
-#: g10/card-util.c:2142
+#: g10/card-util.c:2155
 #, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "chyba při nastavování KDF: %s\n"
 
-#: g10/card-util.c:2188
+#: g10/card-util.c:2201
 #, fuzzy, c-format
 #| msgid "error for setup KDF: %s\n"
 msgid "error for setup UIF: %s\n"
 msgstr "chyba při nastavování KDF: %s\n"
 
-#: g10/card-util.c:2212 g10/keyedit.c:1263 tools/gpg-card.c:3649
+#: g10/card-util.c:2225 g10/keyedit.c:1263 tools/gpg-card.c:3666
 msgid "quit this menu"
 msgstr "ukon�it toto menu"
 
-#: g10/card-util.c:2214
+#: g10/card-util.c:2227
 msgid "show admin commands"
 msgstr "zobraz příkazy správce"
 
-#: g10/card-util.c:2215 g10/keyedit.c:1266 tools/gpg-card.c:3652
+#: g10/card-util.c:2228 g10/keyedit.c:1266 tools/gpg-card.c:3669
 msgid "show this help"
 msgstr "ukázat tuto pomoc"
 
-#: g10/card-util.c:2217 tools/gpg-card.c:3654
+#: g10/card-util.c:2230 tools/gpg-card.c:3671
 msgid "list all available data"
 msgstr "vypiš všechna dostupná data"
 
-#: g10/card-util.c:2220 tools/gpg-card.c:3656
+#: g10/card-util.c:2233 tools/gpg-card.c:3673
 msgid "change card holder's name"
 msgstr "změní jméno majitele karty"
 
-#: g10/card-util.c:2221 tools/gpg-card.c:3657
+#: g10/card-util.c:2234 tools/gpg-card.c:3674
 msgid "change URL to retrieve key"
 msgstr "změní URL pro získání klí�e"
 
-#: g10/card-util.c:2222 tools/gpg-card.c:3658
+#: g10/card-util.c:2235 tools/gpg-card.c:3675
 msgid "fetch the key specified in the card URL"
 msgstr "získá klí� specifikovaný v URL karty"
 
-#: g10/card-util.c:2223 tools/gpg-card.c:3659
+#: g10/card-util.c:2236 tools/gpg-card.c:3676
 msgid "change the login name"
 msgstr "změnit login name"
 
-#: g10/card-util.c:2224 tools/gpg-card.c:3660
+#: g10/card-util.c:2237 tools/gpg-card.c:3677
 msgid "change the language preferences"
 msgstr "změnit jazykové předvolby"
 
-#: g10/card-util.c:2225 tools/gpg-card.c:3661
+#: g10/card-util.c:2238 tools/gpg-card.c:3678
 msgid "change card holder's salutation"
 msgstr "změní oslovení držitele karty"
 
-#: g10/card-util.c:2227 tools/gpg-card.c:3663
+#: g10/card-util.c:2240 tools/gpg-card.c:3680
 msgid "change a CA fingerprint"
 msgstr "vypsat otisk certifika�ní autority"
 
-#: g10/card-util.c:2228 tools/gpg-card.c:3664
+#: g10/card-util.c:2241 tools/gpg-card.c:3681
 msgid "toggle the signature force PIN flag"
 msgstr "zapnout/vypnout požadování PINu při každé self-sign operaci"
 
-#: g10/card-util.c:2229 tools/gpg-card.c:3665
+#: g10/card-util.c:2242 tools/gpg-card.c:3682
 msgid "generate new keys"
 msgstr "vytvořit nový pár klí�ů"
 
-#: g10/card-util.c:2230 tools/gpg-card.c:3666
+#: g10/card-util.c:2243 tools/gpg-card.c:3683
 msgid "menu to change or unblock the PIN"
 msgstr "nabídka pro změnu anebo odblokování PINu"
 
-#: g10/card-util.c:2231 tools/gpg-card.c:3667
+#: g10/card-util.c:2244 tools/gpg-card.c:3684
 msgid "verify the PIN and list all data"
 msgstr "ověř PIN a vypiš všechna data"
 
-#: g10/card-util.c:2232 tools/gpg-card.c:3668
+#: g10/card-util.c:2245 tools/gpg-card.c:3685
 msgid "unblock the PIN using a Reset Code"
 msgstr "odblokovat PIN pomocí reseta�ního kódu"
 
-#: g10/card-util.c:2233 tools/gpg-card.c:3672
+#: g10/card-util.c:2246 tools/gpg-card.c:3689
 msgid "destroy all keys and data"
 msgstr "zni�it všechny klí�e a data"
 
-#: g10/card-util.c:2235
+#: g10/card-util.c:2248
 #, fuzzy
 #| msgid "setup KDF for PIN authentication"
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr "nastavit KDF pro autentizaci kódem PIN"
 
-#: g10/card-util.c:2236
+#: g10/card-util.c:2249
 msgid "change the key attribute"
 msgstr "změnit atribut klí�e"
 
-#: g10/card-util.c:2237 tools/gpg-card.c:3674
+#: g10/card-util.c:2250 tools/gpg-card.c:3691
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the User Interaction Flag"
 msgstr "změnit důvěryhodnost vlastníka klí�e"
 
-#: g10/card-util.c:2361 tools/gpg-card.c:3924
+#: g10/card-util.c:2374 tools/gpg-card.c:3941
 msgid "gpg/card> "
 msgstr "gpg/karta> "
 
-#: g10/card-util.c:2402
+#: g10/card-util.c:2415
 msgid "Admin-only command\n"
 msgstr "pouze příkazy správce\n"
 
-#: g10/card-util.c:2433
+#: g10/card-util.c:2446
 msgid "Admin commands are allowed\n"
 msgstr "příkazy správce jsou povoleny\n"
 
-#: g10/card-util.c:2435
+#: g10/card-util.c:2448
 msgid "Admin commands are not allowed\n"
 msgstr "příkazy správce nejsou povoleny\n"
 
-#: g10/card-util.c:2546 g10/keyedit.c:2275 tools/gpg-card.c:3814
-#: tools/gpg-card.c:4072
+#: g10/card-util.c:2559 g10/keyedit.c:2275 tools/gpg-card.c:3831
+#: tools/gpg-card.c:4089
 #, c-format
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Neplatný příkaz (zkuste „help“)\n"
@@ -2192,22 +2207,22 @@ msgstr "Neplatný příkaz (zkuste „help“)\n"
 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:5293 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5292 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:1934 g10/export.c:2342 g10/export.c:2463
-#: g10/getkey.c:1907 g10/gpg.c:5238 g10/keyedit.c:1450 g10/keyedit.c:2382
-#: g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:703 g10/keyserver.c:1240
-#: g10/revoke.c:230 g10/tofu.c:2168
+#: g10/getkey.c:2032 g10/gpg.c:5237 g10/keyedit.c:1450 g10/keyedit.c:2382
+#: g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:703 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:2002 g10/getkey.c:1915 g10/getkey.c:4330
-#: g10/gpg.c:5247 g10/keyedit.c:2354 g10/keyserver.c:1258 g10/revoke.c:236
-#: g10/revoke.c:665 g10/tofu.c:2176
+#: g10/delkey.c:90 g10/export.c:2002 g10/getkey.c:2040 g10/getkey.c:4455
+#: g10/gpg.c:5246 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"
 msgstr "chyba při �tení bloku klí�e: %s\n"
@@ -2334,14 +2349,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:555 g10/encrypt.c:808 g10/decrypt-data.c:261 g10/gpg.c:4083
-#: g10/gpg.c:4130 sm/decrypt.c:742 sm/encrypt.c:691 sm/gpgsm.c:1793
+#: g10/encrypt.c:555 g10/encrypt.c:808 g10/decrypt-data.c:261 g10/gpg.c:4080
+#: g10/gpg.c:4127 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1646
 #, 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:564 g10/gpg.c:4095 g10/gpg.c:4142 g10/sig-check.c:155
-#: g10/sign.c:452 sm/gpgsm.c:1803 sm/gpgsm.c:1813 sm/sign.c:596 sm/verify.c:510
+#: g10/encrypt.c:564 g10/gpg.c:4092 g10/gpg.c:4139 g10/sig-check.c:155
+#: g10/sign.c:452 sm/gpgsm.c:1656 sm/gpgsm.c:1666 sm/sign.c:596 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"
@@ -2358,7 +2373,7 @@ msgid ""
 msgstr ""
 "VAROV�N�: vyžádaná symetrická šifra %s (%d) nevyhovuje předvolbám příjemce\n"
 
-#: g10/encrypt.c:838 sm/encrypt.c:766
+#: g10/encrypt.c:838 sm/encrypt.c:767
 #, c-format
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "VAROV�N�: klí� %s není vhodný pro šifrování v režimu %s\n"
@@ -2388,7 +2403,7 @@ msgstr "%s/%s zašifrovaný pro: „%s“\n"
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "volba „%s“ se nesmí používat v režimu %s\n"
 
-#: g10/decrypt-data.c:239 g10/mainproc.c:380 sm/decrypt.c:494
+#: g10/decrypt-data.c:239 g10/mainproc.c:380 sm/decrypt.c:892
 #, fuzzy, c-format
 #| msgid "%s encrypted data\n"
 msgid "%s.%s encrypted data\n"
@@ -2399,7 +2414,7 @@ msgstr "%s zašifrovaná data\n"
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "zašifrováno neznámým algoritmem %d\n"
 
-#: g10/decrypt-data.c:361 g10/decrypt-data.c:414 sm/decrypt.c:508
+#: g10/decrypt-data.c:361 g10/decrypt-data.c:414 sm/decrypt.c:906
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2439,7 +2454,7 @@ msgid " - skipped"
 msgstr " – přesko�eno"
 
 # g10/import.c:766 g10/openfile.c:261#, c-format
-#: g10/export.c:1333 g10/import.c:2124 g10/openfile.c:202 g10/openfile.c:296
+#: g10/export.c:1333 g10/import.c:2132 g10/openfile.c:202 g10/openfile.c:296
 #: g10/sign.c:1110 g10/sign.c:1447
 #, c-format
 msgid "writing to '%s'\n"
@@ -2475,62 +2490,62 @@ msgstr "chyba při vytváření „%s“: %s\n"
 msgid "[User ID not found]"
 msgstr "[ID uživatele nenalezeno]"
 
-#: g10/getkey.c:1199
+#: g10/getkey.c:1324
 #, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "„%s“ automaticky získáno přes %s\n"
 
-#: g10/getkey.c:1205
+#: g10/getkey.c:1330
 #, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "chyba při získávání „%s“ přes %s: %s\n"
 
-#: g10/getkey.c:1207
+#: g10/getkey.c:1332
 msgid "No fingerprint"
 msgstr "Chybí otisk"
 
-#: g10/getkey.c:1449
+#: g10/getkey.c:1574
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr "zjišťuje se nová kopie zastaralého klí�e skrze %s\n"
 
-#: g10/getkey.c:1884 g10/revoke.c:657 g10/revoke.c:718
+#: g10/getkey.c:2009 g10/revoke.c:658 g10/revoke.c:719
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "tajný klí� „%s“ nenalezen: %s\n"
 
-#: g10/getkey.c:1887 g10/pkclist.c:1012
+#: g10/getkey.c:2012 g10/pkclist.c:1012
 #, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "(zkontrolujte argument volby „%s“)\n"
 
-#: g10/getkey.c:1965
+#: g10/getkey.c:2090
 #, c-format
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "Pozor: jako výchozí klí� se nepoužije „%s“: %s\n"
 
-#: g10/getkey.c:1973
+#: g10/getkey.c:2098
 #, c-format
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "jako výchozí tajný klí� pro podepisování se použije „%s“\n"
 
-#: g10/getkey.c:1980
+#: g10/getkey.c:2105
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr "všechny hodnoty předány „%s“ se ignorují\n"
 
 # c-format
-#: g10/getkey.c:2837
+#: g10/getkey.c:2962
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Neplatný klí� %s změněn na platný pomocí --always-non-selfsigned-uid\n"
 
-#: g10/getkey.c:3703
+#: g10/getkey.c:3828
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "používám podklí� %s místo primárního klí�e %s\n"
 
-#: g10/getkey.c:4259 g10/gpg.c:2167
+#: g10/getkey.c:4384 g10/gpg.c:2168
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "platné hodnoty pro volbu „%s“:\n"
@@ -2717,7 +2732,7 @@ msgstr "|SPEC|nastavit e-mailový alias"
 msgid "use strict OpenPGP behavior"
 msgstr "použít chování striktně podle OpenPGP"
 
-#: g10/gpg.c:651 kbx/kbxutil.c:91 sm/gpgsm.c:424 tools/gpgconf.c:113
+#: g10/gpg.c:651 kbx/kbxutil.c:91 sm/gpgsm.c:425 tools/gpgconf.c:113
 msgid "do not make any changes"
 msgstr "neprovádět žádné změny"
 
@@ -2753,7 +2768,7 @@ msgstr "použít kanonický textový režim"
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|nastavit úroveň komprese na N (0 – žádná)"
 
-#: g10/gpg.c:762 sm/gpgsm.c:357
+#: g10/gpg.c:762 sm/gpgsm.c:358
 #, fuzzy
 #| msgid "Options controlling the interactivity and enforcement"
 msgid "Options controlling key import and export"
@@ -2771,11 +2786,11 @@ msgstr "importovat chybějící klí� z podpisu"
 msgid "include the public key in signatures"
 msgstr "zahrnovat veřejný klí� do podpisů"
 
-#: g10/gpg.c:776 sm/gpgsm.c:360
+#: g10/gpg.c:776 sm/gpgsm.c:361
 msgid "disable all access to the dirmngr"
 msgstr "zakázat veškerý přístup k dirmngr"
 
-#: g10/gpg.c:788 sm/gpgsm.c:367
+#: g10/gpg.c:788 sm/gpgsm.c:368
 #, fuzzy
 #| msgid "Options controlling the configuration"
 msgid "Options controlling key listings"
@@ -2795,15 +2810,15 @@ msgstr "|ID_UŽIVATELE|šifrovat pro ID_UŽIVATELE"
 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:876 sm/gpgsm.c:408
+#: g10/gpg.c:876 sm/gpgsm.c:409
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:895 sm/gpgsm.c:420 dirmngr/dirmngr.c:286
+#: g10/gpg.c:895 sm/gpgsm.c:421 dirmngr/dirmngr.c:289
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:966 sm/gpgsm.c:453
+#: g10/gpg.c:966 sm/gpgsm.c:454
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2845,7 +2860,7 @@ msgstr ""
 "Podepisuje, ověřuje, šifruje nebo dešifruje.\n"
 "Výchozí operace závisí na vstupních datech.\n"
 
-#: g10/gpg.c:1168 sm/gpgsm.c:636
+#: g10/gpg.c:1168 sm/gpgsm.c:637
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2869,12 +2884,12 @@ msgstr "Hash: "
 msgid "Compression: "
 msgstr "Komprese: "
 
-#: g10/gpg.c:1274 sm/gpgsm.c:710
+#: g10/gpg.c:1274 sm/gpgsm.c:711
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "použití: %s [přepína�e] %s\n"
 
-#: g10/gpg.c:1467 sm/gpgsm.c:803
+#: g10/gpg.c:1467 sm/gpgsm.c:804
 #, c-format
 msgid "conflicting commands\n"
 msgstr "konfliktní příkazy\n"
@@ -2884,48 +2899,48 @@ msgstr "konfliktní příkazy\n"
 msgid "no = sign found in group definition '%s'\n"
 msgstr "no = podpis nalezen v definici skupiny „%s“\n"
 
-#: g10/gpg.c:1683
+#: g10/gpg.c:1684
 #, 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:1686
+#: g10/gpg.c:1687
 #, 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:1689
+#: g10/gpg.c:1690
 #, 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:1695
+#: g10/gpg.c:1696
 #, 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:1698
+#: g10/gpg.c:1699
 #, 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:1701
+#: g10/gpg.c:1702
 #, 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:1707
+#: g10/gpg.c:1708
 #, 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:1710
+#: g10/gpg.c:1711
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@ -2933,21 +2948,21 @@ msgstr ""
 "VAROV�N�: vlastnictví adresáře „%s“ s konfigura�ním souborem není nastaveno "
 "nebezpe�ně\n"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1714
 #, 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:1719
+#: g10/gpg.c:1720
 #, 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:1722
+#: g10/gpg.c:1723
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@ -2955,7 +2970,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:1725
+#: g10/gpg.c:1726
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr ""
@@ -2963,465 +2978,465 @@ msgstr ""
 "nastavena bezpe�ně\n"
 
 # c-format
-#: g10/gpg.c:1941
+#: g10/gpg.c:1942
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "neznámá konfigura�ní položka „%s“\n"
 
-#: g10/gpg.c:2037
+#: g10/gpg.c:2038
 msgid "display photo IDs during key listings"
 msgstr "zobrazovat ID fotografií během výpisu klí�ů"
 
-#: g10/gpg.c:2039
+#: g10/gpg.c:2040
 msgid "show key usage information during key listings"
 msgstr "ukazovat údaje o ú�elu klí�e při výpisu klí�ů"
 
-#: g10/gpg.c:2041
+#: g10/gpg.c:2042
 msgid "show policy URLs during signature listings"
 msgstr "ukazovat URL politik během výpisu podpisů"
 
-#: g10/gpg.c:2043
+#: g10/gpg.c:2044
 msgid "show all notations during signature listings"
 msgstr "ukazovat všechny poznámky během výpisu podpisů"
 
-#: g10/gpg.c:2045
+#: g10/gpg.c:2046
 msgid "show IETF standard notations during signature listings"
 msgstr "ukazovat poznámky IETF standardu během vypisování podpisů"
 
-#: g10/gpg.c:2049
+#: g10/gpg.c:2050
 msgid "show user-supplied notations during signature listings"
 msgstr "ukazovat uživatelské poznámky během výpisu podpisů"
 
-#: g10/gpg.c:2051
+#: g10/gpg.c:2052
 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:2053
+#: g10/gpg.c:2054
 msgid "show user ID validity during key listings"
 msgstr "ukazovat platnost ID uživatelů při výpisu klí�ů"
 
-#: g10/gpg.c:2055
+#: g10/gpg.c:2056
 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:2057
+#: g10/gpg.c:2058
 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:2059
+#: g10/gpg.c:2060
 msgid "show the keyring name in key listings"
 msgstr "ukazovat název souboru s klí�i při výpisu klí�ů"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2062
 msgid "show expiration dates during signature listings"
 msgstr "ukazovat data expirace během výpisu podpisů"
 
-#: g10/gpg.c:2178
+#: g10/gpg.c:2179
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "neznámá TOFU politika „%s“\n"
 
-#: g10/gpg.c:2180
+#: g10/gpg.c:2181
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(možnosti lze vypsat příkazem „help“)\n"
 
-#: g10/gpg.c:2975 g10/gpg.c:3828 g10/gpg.c:3840
+#: g10/gpg.c:2978 g10/gpg.c:3825 g10/gpg.c:3837
 #, 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:3151 g10/gpg.c:3163
+#: g10/gpg.c:3154 g10/gpg.c:3166
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "„%s“ není platná doba expirace podpisu\n"
 
-#: g10/gpg.c:3185
+#: g10/gpg.c:3188
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "„%s“ není správná e-mailová adresa\n"
 
-#: g10/gpg.c:3217 sm/gpgsm.c:1270
+#: g10/gpg.c:3220 sm/gpgsm.c:1143
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "neplatný režim pinentry „%s“\n"
 
-#: g10/gpg.c:3223 sm/gpgsm.c:1276
+#: g10/gpg.c:3226 sm/gpgsm.c:1149
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "neplatný původ požadavku „%s“\n"
 
-#: g10/gpg.c:3280
+#: g10/gpg.c:3283
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "„%s“ není platná znaková sada\n"
 
-#: g10/gpg.c:3302 g10/gpg.c:3511 g10/keyedit.c:5319
+#: g10/gpg.c:3305 g10/gpg.c:3514 g10/keyedit.c:5322
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "nelze zpracovat URL serveru klí�ů\n"
 
-#: g10/gpg.c:3320
+#: g10/gpg.c:3323
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: neplatný parametr pro server klí�ů\n"
 
-#: g10/gpg.c:3323
+#: g10/gpg.c:3326
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "neplatný parametr pro server klí�ů\n"
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3333
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatný parametr pro import\n"
 
-#: g10/gpg.c:3333
+#: g10/gpg.c:3336
 #, c-format
 msgid "invalid import options\n"
 msgstr "neplatný parametr pro import\n"
 
-#: g10/gpg.c:3339 g10/gpg.c:3354
+#: g10/gpg.c:3342 g10/gpg.c:3357
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "neplatná volba filtru: %s\n"
 
-#: g10/gpg.c:3345
+#: g10/gpg.c:3348
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatný parametr pro export\n"
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3351
 #, c-format
 msgid "invalid export options\n"
 msgstr "neplatný parametr pro export\n"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3363
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: neplatný parametr pro výpis\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3366
 #, c-format
 msgid "invalid list options\n"
 msgstr "neplatný parametr pro výpis\n"
 
-#: g10/gpg.c:3371
+#: g10/gpg.c:3374
 msgid "display photo IDs during signature verification"
 msgstr "zobrazovat ID fotografií při ověřování podpisu"
 
-#: g10/gpg.c:3373
+#: g10/gpg.c:3376
 msgid "show policy URLs during signature verification"
 msgstr "ukazovat URL politik při ověřování podpisu"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3378
 msgid "show all notations during signature verification"
 msgstr "ukazovat všechny poznámky při ověřování podpisu"
 
-#: g10/gpg.c:3377
+#: g10/gpg.c:3380
 msgid "show IETF standard notations during signature verification"
 msgstr "ukazovat poznámky IETF standardu při ověřování podpisu"
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3384
 msgid "show user-supplied notations during signature verification"
 msgstr "ukazovat uživatelské poznámky při ověřování podpisu"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3386
 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:3385
+#: g10/gpg.c:3388
 msgid "show user ID validity during signature verification"
 msgstr "ukazovat platnost ID uživatele při ověřování podpisu"
 
-#: g10/gpg.c:3387
+#: g10/gpg.c:3390
 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:3389
+#: g10/gpg.c:3392
 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:3396
+#: g10/gpg.c:3399
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: neplatný parametr pro ověření\n"
 
-#: g10/gpg.c:3399
+#: g10/gpg.c:3402
 #, c-format
 msgid "invalid verify options\n"
 msgstr "neplatný parametr pro ověření\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3409
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nelze nastavit exec-path na %s\n"
 
-#: g10/gpg.c:3613
+#: g10/gpg.c:3616
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: neplatný seznam auto-key-locate\n"
 
-#: g10/gpg.c:3616
+#: g10/gpg.c:3619
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "neplatný seznam auto-key-locate\n"
 
-#: g10/gpg.c:3625
+#: g10/gpg.c:3628
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "neplatný argument u volby „%.50s“\n"
 
-#: g10/gpg.c:3807 sm/gpgsm.c:1675
+#: g10/gpg.c:3804 sm/gpgsm.c:1528
 #, 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:3821
+#: g10/gpg.c:3818
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROV�N�: %s přepíše %s\n"
 
-#: g10/gpg.c:3830
+#: g10/gpg.c:3827
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Není dovoleno používat %s s %s!\n"
 
-#: g10/gpg.c:3833
+#: g10/gpg.c:3830
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nedává s %s smysl!\n"
 
-#: g10/gpg.c:3848 sm/gpgsm.c:1696 dirmngr/dirmngr.c:1123
+#: g10/gpg.c:3845 sm/gpgsm.c:1549 dirmngr/dirmngr.c:1160
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "VAROV�N�: pracuji s podvrženým systémovým �asem: "
 
-#: g10/gpg.c:3869
+#: g10/gpg.c:3866
 #, 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:3897 g10/gpg.c:3928 sm/gpgsm.c:1763
+#: g10/gpg.c:3894 g10/gpg.c:3925 sm/gpgsm.c:1616
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybraný šifrovací algoritmus je neplatný\n"
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3901
 #, 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:3916
+#: g10/gpg.c:3913
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "vybraný kompresní algoritmus je neplatný\n"
 
-#: g10/gpg.c:3922
+#: g10/gpg.c:3919
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybraný hashovací algoritmus je neplatný\n"
 
-#: g10/gpg.c:3937
+#: g10/gpg.c:3934
 #, 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:3939
+#: g10/gpg.c:3936
 #, 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:3941
+#: g10/gpg.c:3938
 #, 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:3943
+#: g10/gpg.c:3940
 #, 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:3945
+#: g10/gpg.c:3942
 #, 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:3949
+#: g10/gpg.c:3946
 #, 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:3953
+#: g10/gpg.c:3950
 #, 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:3960
+#: g10/gpg.c:3957
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "neplatné implicitní předvolby\n"
 
-#: g10/gpg.c:3964
+#: g10/gpg.c:3961
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatné uživatelské předvolby pro šifrování\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3964
 #, 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:3971
+#: g10/gpg.c:3968
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "neplatné uživatelské předvolby pro hashování\n"
 
-#: g10/gpg.c:3975
+#: g10/gpg.c:3972
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "neplatné uživatelské předvolby pro komprimaci\n"
 
-#: g10/gpg.c:3984 g10/gpg.c:3989
+#: g10/gpg.c:3981 g10/gpg.c:3986
 #, 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:4026
+#: g10/gpg.c:4023
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s dosud není funk�ní s %s\n"
 
-#: g10/gpg.c:4089
+#: g10/gpg.c:4086
 #, 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:4101
+#: g10/gpg.c:4098
 #, 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:4256
+#: g10/gpg.c:4253
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nemohu inicializovat databázi důvěry: %s\n"
 
-#: g10/gpg.c:4268
+#: g10/gpg.c:4265
 #, 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:4340
+#: g10/gpg.c:4337
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "symetrické šifrování „%s“ se nepovedlo: %s\n"
 
-#: g10/gpg.c:4369
+#: g10/gpg.c:4366
 #, 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:4372
+#: g10/gpg.c:4369
 #, 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:4430
+#: g10/gpg.c:4427
 #, 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:4433
+#: g10/gpg.c:4430
 #, 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:4821 g10/keyserver.c:1870
+#: g10/gpg.c:4818 g10/keyserver.c:1629
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "odeslání na keyserver se nezdařilo: %s\n"
 
-#: g10/gpg.c:4826
+#: g10/gpg.c:4823
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "získání dat z serveru klí�ů se nezdařilo: %s\n"
 
-#: g10/gpg.c:4832
+#: g10/gpg.c:4829
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export klí�e se nepodařil: %s\n"
 
-#: g10/gpg.c:4845
+#: g10/gpg.c:4842
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "export jako SSH klí� se nepodařil: %s\n"
 
-#: g10/gpg.c:4857
+#: g10/gpg.c:4854
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "hledání na serveru klí�ů se nezdařilo: %s\n"
 
-#: g10/gpg.c:4870
+#: g10/gpg.c:4867
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "obnovení dat na serveru klí�ů se nezdařilo: %s\n"
 
-#: g10/gpg.c:4937
+#: g10/gpg.c:4936
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dekódování z ASCII formátu selhalo: %s\n"
 
-#: g10/gpg.c:4948
+#: g10/gpg.c:4947
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "kódování do ASCII formátu selhalo: %s\n"
 
-#: g10/gpg.c:5053
+#: g10/gpg.c:5052
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "neplatný hashovací algoritmus „%s“\n"
 
-#: g10/gpg.c:5205 g10/tofu.c:2156
+#: g10/gpg.c:5204 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:5216
+#: g10/gpg.c:5215
 #, 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:5272
+#: g10/gpg.c:5271
 #, 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:5283
+#: g10/gpg.c:5282
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Za�něte psát svou zprávu…\n"
 
-#: g10/gpg.c:5630
+#: g10/gpg.c:5629
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadané URL pro certifika�ní politiku je neplatné\n"
 
-#: g10/gpg.c:5632
+#: g10/gpg.c:5631
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadané URL pro podepisovací politiku je neplatné\n"
 
-#: g10/gpg.c:5665
+#: g10/gpg.c:5664
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "zadané URL preferovaného serveru klí�ů je neplatné\n"
@@ -3434,7 +3449,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:414 tools/gpgconf.c:116 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:415 tools/gpgconf.c:116 tools/gpg-card.c:95
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zapsat informace o stavu do tohoto FD"
 
@@ -3523,97 +3538,97 @@ msgstr "předpokládat vstup ve formátu zálohy klí�ů GnuPG"
 msgid "repair keys on import"
 msgstr "při importu opravit klí�e"
 
-#: g10/import.c:399 g10/import.c:721
+#: g10/import.c:407 g10/import.c:729
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "blok typu %d byl přesko�en\n"
 
-#: g10/import.c:738
+#: g10/import.c:746
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu klí�e byly doposud zpracovány\n"
 
-#: g10/import.c:831
+#: g10/import.c:839
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Celkový po�et zpracovaných klí�ů: %lu\n"
 
-#: g10/import.c:834
+#: g10/import.c:842
 #, c-format
 msgid "    skipped PGP-2 keys: %lu\n"
 msgstr "           přesko�eny klí�e PGP2: %lu\n"
 
-#: g10/import.c:836
+#: g10/import.c:844
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "           přesko�eny nové klí�e: %lu\n"
 
-#: g10/import.c:839
+#: g10/import.c:847
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "                bez ID uživatele: %lu\n"
 
-#: g10/import.c:842 sm/import.c:129
+#: g10/import.c:850 sm/import.c:129
 #, c-format
 msgid "              imported: %lu"
 msgstr "                     importováno: %lu"
 
-#: g10/import.c:846 sm/import.c:133
+#: g10/import.c:854 sm/import.c:133
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                       beze změn: %lu\n"
 
-#: g10/import.c:848
+#: g10/import.c:856
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "               nová ID uživatelů: %lu\n"
 
-#: g10/import.c:850
+#: g10/import.c:858
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "                   nové podklí�e: %lu\n"
 
-#: g10/import.c:852
+#: g10/import.c:860
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "                    nové podpisy: %lu\n"
 
-#: g10/import.c:854
+#: g10/import.c:862
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "             nové revokace klí�ů: %lu\n"
 
-#: g10/import.c:856 sm/import.c:135
+#: g10/import.c:864 sm/import.c:135
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "            pře�tené tajné klí�e: %lu\n"
 
-#: g10/import.c:858 sm/import.c:137
+#: g10/import.c:866 sm/import.c:137
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "         importované tajné klí�e: %lu\n"
 
-#: g10/import.c:860 sm/import.c:139
+#: g10/import.c:868 sm/import.c:139
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "           tajné klí�e nezměněny: %lu\n"
 
-#: g10/import.c:862 sm/import.c:141
+#: g10/import.c:870 sm/import.c:141
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "                   neimportováno: %lu\n"
 
-#: g10/import.c:864
+#: g10/import.c:872
 #, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "              odstraněné podpisy: %lu\n"
 
-#: g10/import.c:866
+#: g10/import.c:874
 #, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "       odstraněné uživatelské ID: %lu\n"
 
-#: g10/import.c:1291
+#: g10/import.c:1299
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
@@ -3622,174 +3637,174 @@ msgstr ""
 "VAROV�N�: klí� %s obsahuje předvolby pro nedostupné\n"
 "algoritmy na těchto ID uživatelů:\n"
 
-#: g10/import.c:1333
+#: g10/import.c:1341
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": předvolby pro šifrovací algoritmus %s\n"
 
-#: g10/import.c:1351
+#: g10/import.c:1359
 #, fuzzy, c-format
 #| msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgid "         \"%s\": preference for AEAD algorithm %s\n"
 msgstr "         \"%s\": předvolby pro šifrovací algoritmus %s\n"
 
-#: g10/import.c:1366
+#: g10/import.c:1374
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": předvolby pro podepisovací algoritmus %s\n"
 
-#: g10/import.c:1378
+#: g10/import.c:1386
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": předvolby pro komprima�ní algoritmus %s\n"
 
-#: g10/import.c:1391
+#: g10/import.c:1399
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "velmi doporu�ujeme aktualizaci nastavení vašich preferencí a\n"
 
-#: g10/import.c:1393
+#: g10/import.c:1401
 #, c-format
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "distribuci tohoto klí�e aby jste předešel problémům s neshodou algoritmů\n"
 
-#: g10/import.c:1418
+#: g10/import.c:1426
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "nelze aktualizovat předvolby s: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:1932 g10/import.c:3053
+#: g10/import.c:1940 g10/import.c:3061
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "klí� %s: chybí identifikátor uživatele\n"
 
-#: g10/import.c:1938
+#: g10/import.c:1946
 #, c-format
 msgid "key %s: %s\n"
 msgstr "klí� %s: %s\n"
 
-#: g10/import.c:1939 g10/import.c:3025
+#: g10/import.c:1947 g10/import.c:3033
 msgid "rejected by import screener"
 msgstr "zamítnut kontrolou při importu"
 
-#: g10/import.c:1988
+#: g10/import.c:1996
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "klí� %s: poškození PKS podklí�e opraveno\n"
 
 # c-format
-#: g10/import.c:2009
+#: g10/import.c:2017
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "klí� %s: přijat id uživatele \"%s\",který není podepsán jím samým\n"
 
-#: g10/import.c:2020 g10/import.c:2051
+#: g10/import.c:2028 g10/import.c:2059
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "klí� %s: chybí platný identifikátor uživatele\n"
 
-#: g10/import.c:2022
+#: g10/import.c:2030
 #, c-format
 msgid "this may be caused by a missing self-signature\n"
 msgstr "může to být způsobeno chybějícím podpisem klí�e jím samým\n"
 
-#: g10/import.c:2101 g10/import.c:3439
+#: g10/import.c:2109 g10/import.c:3447
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "klí� %s: veřejný klí� nenalezen: %s\n"
 
-#: g10/import.c:2107
+#: g10/import.c:2115
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "klí� %s: nový klí� - přesko�en\n"
 
-#: g10/import.c:2119
+#: g10/import.c:2127
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "nenalezen zapisovatelný soubor klí�ů (keyring): %s\n"
 
-#: g10/import.c:2151 g10/import.c:2253 g10/import.c:3514
+#: g10/import.c:2159 g10/import.c:2261 g10/import.c:3522
 #, c-format
 msgid "error writing keyring '%s': %s\n"
 msgstr "chyba při zápisu souboru klí�ů (keyring) „%s“: %s\n"
 
-#: g10/import.c:2174
+#: g10/import.c:2182
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "klí� %s: veřejný klí� „%s“ importován\n"
 
-#: g10/import.c:2201
+#: g10/import.c:2209
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "klí� %s: neodpovídá naší kopii\n"
 
-#: g10/import.c:2269
+#: g10/import.c:2277
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "klí� %s: „%s“ 1 nový identifikátor uživatele\n"
 
-#: g10/import.c:2272
+#: g10/import.c:2280
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "klí� %s: „%s“ %d nových identifikátorů uživatele\n"
 
-#: g10/import.c:2275
+#: g10/import.c:2283
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "klí� %s: „%s“ 1 nový podpis\n"
 
-#: g10/import.c:2278
+#: g10/import.c:2286
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "klí� %s: „%s“ %d nových podpisů\n"
 
-#: g10/import.c:2281
+#: g10/import.c:2289
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "klí� %s: „%s“ 1 nový podklí�\n"
 
-#: g10/import.c:2284
+#: g10/import.c:2292
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "klí� %s: „%s“ %d nových podklí�ů\n"
 
-#: g10/import.c:2287
+#: g10/import.c:2295
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "klí� %s: „%s“ %d podpisů odstraněno\n"
 
-#: g10/import.c:2290
+#: g10/import.c:2298
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "klí� %s: „%s“ %d podpisů odstraněno\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2301
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "klí� %s: „%s“ %d ID uživatele odstraněno\n"
 
-#: g10/import.c:2296
+#: g10/import.c:2304
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "klí� %s: „%s“ %d ID uživatele odstraněno\n"
 
-#: g10/import.c:2332
+#: g10/import.c:2340
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "klí� %s: „%s“ beze změn\n"
 
-#: g10/import.c:2692 g10/import.c:2887
+#: g10/import.c:2700 g10/import.c:2895
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "klí� %s: tajný klí� importován\n"
 
-#: g10/import.c:2700
+#: g10/import.c:2708
 #, c-format
 msgid "key %s: secret key already exists\n"
 msgstr "klí� %s: tajný klí� již existuje\n"
 
-#: g10/import.c:2708
+#: g10/import.c:2716
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "klí� %s: chyba při odesílání dat agentovi: %s\n"
@@ -3802,205 +3817,204 @@ msgstr "klí� %s: chyba při odesílání dat agentovi: %s\n"
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2877
+#: g10/import.c:2885
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr "Pro migraci „%s“ u každé karty spusťte: %s\n"
 
-#: g10/import.c:3024
+#: g10/import.c:3032
 #, c-format
 msgid "secret key %s: %s\n"
 msgstr "tajný klí� %s: %s\n"
 
-#: g10/import.c:3045 g10/import.c:3084
+#: g10/import.c:3053 g10/import.c:3092
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "import tajných klí�ů není povolen\n"
 
-#: g10/import.c:3072
+#: g10/import.c:3080
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "klí� %s: tajný klí� s neplatnou šifrou %d – přesko�eno\n"
 
-#: g10/import.c:3234 g10/pkclist.c:75 g10/revoke.c:774
+#: g10/import.c:3242 g10/pkclist.c:75 g10/revoke.c:775
 msgid "No reason specified"
 msgstr "Důvod nebyl specifikován"
 
-#: g10/import.c:3235 g10/pkclist.c:77 g10/revoke.c:776
+#: g10/import.c:3243 g10/pkclist.c:77 g10/revoke.c:777
 msgid "Key is superseded"
 msgstr "Klí� je nahrazen"
 
-#: g10/import.c:3236 g10/pkclist.c:79 g10/revoke.c:775
+#: g10/import.c:3244 g10/pkclist.c:79 g10/revoke.c:776
 msgid "Key has been compromised"
 msgstr "Klí� byl zkompromitován"
 
-#: g10/import.c:3237 g10/pkclist.c:81 g10/revoke.c:777
+#: g10/import.c:3245 g10/pkclist.c:81 g10/revoke.c:778
 msgid "Key is no longer used"
 msgstr "Klí� se již nepoužívá"
 
-#: g10/import.c:3238 g10/pkclist.c:83 g10/revoke.c:778
+#: g10/import.c:3246 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "Identifikátor uživatele již neplatí"
 
-#: g10/import.c:3363 g10/keylist.c:1105 g10/pkclist.c:87
+#: g10/import.c:3371 g10/keylist.c:1105 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "důvod pro revokaci: "
 
-#: g10/import.c:3382 g10/keylist.c:1124 g10/pkclist.c:103
+#: g10/import.c:3390 g10/keylist.c:1124 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "revoka�ní poznámka: "
 
-#: g10/import.c:3432
+#: g10/import.c:3440
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "klí� %s: chybí veřejný klí� – nemohu aplikovat revoka�ní certifikát\n"
 
-#: g10/import.c:3461
+#: g10/import.c:3469
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "klí� %s: nemohu najít originální blok klí�e: %s\n"
 
-#: g10/import.c:3468
+#: g10/import.c:3476
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "klí� %s: nemohu �íst originální blok klí�e: %s\n"
 
-#: g10/import.c:3488
+#: g10/import.c:3496
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "klí� %s: neplatný revoka�ní certifikát: %s – zamítnuto\n"
 
-#: g10/import.c:3523
+#: g10/import.c:3531
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "klí� %s: „%s“ revoka�ní certifikát importován\n"
 
-#: g10/import.c:3609
+#: g10/import.c:3617
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "klí� %s: neexistuje id uživatele pro podpis\n"
 
-#: g10/import.c:3626
+#: g10/import.c:3634
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "klí� %s: nepodporovaný algoritmus veřejného klí�e u uživatelského ID „%s“\n"
 
-#: g10/import.c:3628
+#: g10/import.c:3636
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "klí� %s neplatný podpis klí�e jím samým u uživatelského ID „%s“\n"
 
-#: g10/import.c:3645 g10/import.c:3673 g10/import.c:3729
+#: g10/import.c:3653 g10/import.c:3681 g10/import.c:3737
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "klí� %s: nepodporovaný algoritmus veřejného klí�e\n"
 
-#: g10/import.c:3646
+#: g10/import.c:3654
 #, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "klí� %s: neplatný podpis klí�e jím samým (direct key signature)\n"
 
-#: g10/import.c:3660
+#: g10/import.c:3668
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "klí� %s: neexistuje podklí� pro vázání klí�ů\n"
 
-#: g10/import.c:3675
+#: g10/import.c:3683
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "klí� %s: neplatná vazba podklí�e\n"
 
-#: g10/import.c:3694
+#: g10/import.c:3702
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "klí� %s: smazána vícenásobná vazba podklí�e\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3726
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "klí� %s: neexistuje podklí� pro odvolání klí�e\n"
 
-#: g10/import.c:3731
+#: g10/import.c:3739
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "klí� %s: neplatný odvolací podklí�\n"
 
-#: g10/import.c:3746
+#: g10/import.c:3754
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "klí� %s: vícenásobná odvolání podklí�e smazáno\n"
 
-#: g10/import.c:3790
+#: g10/import.c:3798
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "klí� %s: přesko�en identifikátor uživatele „%s“\n"
 
-#: g10/import.c:3817
+#: g10/import.c:3825
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "klí� %s: podklí� přesko�en\n"
 
-#: g10/import.c:3849
+#: g10/import.c:3857
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "klí� %s: podpis není exportovatelný (třída %02X) - přesko�eno\n"
 
-#: g10/import.c:3860
+#: g10/import.c:3868
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "klí� %s: revoka�ní certifikát na špatném místě - přesko�eno \n"
 
-#: g10/import.c:3878
+#: g10/import.c:3886
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "klí� %s: neplatný revoka�ní certifikát: %s - přesko�en\n"
 
-#: g10/import.c:3892
+#: g10/import.c:3900
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "klí� %s: podpis podklí�e na špatném místě - přesko�eno \n"
 
-#: g10/import.c:3900
+#: g10/import.c:3908
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "klí� %s: neo�ekávaná podpisová třída (0x%02X) - přesko�eno\n"
 
-#: g10/import.c:4073
+#: g10/import.c:4081
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "klí� %s: objeven duplikovaný identifikátor uživatele - slou�en\n"
 
-#: g10/import.c:4180
+#: g10/import.c:4188
 #, fuzzy, c-format
 #| msgid "key %s: duplicated user ID detected - merged\n"
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr "klí� %s: objeven duplikovaný identifikátor uživatele - slou�en\n"
 
-#: g10/import.c:4245
+#: g10/import.c:4253
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "VAROV�N�: klí� %s může být odvolán: zkouším získat revoka�ní klí� %s\n"
 
-#: g10/import.c:4261
+#: g10/import.c:4269
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "VAROV�N�: klí� %s může být odvolán: revoka�ní klí� %s nenalezen.\n"
 
-#: g10/import.c:4327
+#: g10/import.c:4335
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "klí� %s: „%s“ přidán revoka�ní certifikát\n"
 
-#: g10/import.c:4365
+#: g10/import.c:4373
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "klí� %s: podpis klí�e jím samým (direct key signature) přidán\n"
 
-#: g10/key-check.c:133 dirmngr/dirmngr_ldap.c:650 dirmngr/ldap-wrapper.c:835
-#: dirmngr/ldap-wrapper.c:852
+#: g10/key-check.c:133 dirmngr/ldap-wrapper.c:835 dirmngr/ldap-wrapper.c:852
 #, c-format
 msgid "error allocating memory: %s\n"
 msgstr "chyba při alokování paměti: %s\n"
@@ -4072,7 +4086,7 @@ msgid ""
 "all signatures.\n"
 msgstr ""
 
-#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:284 sm/keydb.c:297
+#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:289 sm/keydb.c:302
 #, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "chyba při vytváření schránky na klí�e (keybox) „%s“: %s\n"
@@ -4082,7 +4096,7 @@ msgstr "chyba při vytváření schránky na klí�e (keybox) „%s“: %s\n"
 msgid "error creating keyring '%s': %s\n"
 msgstr "chyba při vytváření souboru klí�ů (keyring) „%s“: %s\n"
 
-#: g10/keydb.c:388 sm/keydb.c:303
+#: g10/keydb.c:388 sm/keydb.c:308
 #, c-format
 msgid "keybox '%s' created\n"
 msgstr "schránka na klí�e (keybox) „%s“ vytvořena\n"
@@ -4339,8 +4353,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:6192 g10/keyedit.c:6275 g10/keyedit.c:6404
-#: g10/keyedit.c:6466 g10/sign.c:528
+#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
+#: g10/keyedit.c:6474 g10/sign.c:528
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "podepsání selhalo: %s\n"
@@ -4708,7 +4722,7 @@ msgstr "Žádný identifikátor uživatele neodpovídá."
 msgid "Nothing to sign.\n"
 msgstr "Nic na podepsání.\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6057
+#: g10/keyedit.c:2973 g10/keyedit.c:6065
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "Nepodepsáno vámi.\n"
@@ -4776,7 +4790,7 @@ msgstr "Tento klí� může být odvolán %s klí�em %s "
 msgid "(sensitive)"
 msgstr "(citlivá informace)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:525
+#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "vytvořen: %s"
@@ -4792,7 +4806,7 @@ msgid "expired: %s"
 msgstr "platnost skon�ila: %s"
 
 #: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2262
-#: g10/keyserver.c:531
+#: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "platnost skon�í: %s"
@@ -4829,13 +4843,13 @@ msgstr ""
 "být nutně správné, dokud znova nespustíte program.\n"
 
 # status
-#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:535
-#: g10/mainproc.c:2280 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
+#: g10/mainproc.c:2282 g10/tofu.c:1789 g10/trust.c:426 dirmngr/ocsp.c:792
 msgid "revoked"
 msgstr "odvolán"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:539
-#: g10/mainproc.c:2282 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
+#: g10/mainproc.c:2284 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "platnost skon�ila"
 
@@ -4875,7 +4889,7 @@ msgstr "Jste si jistý, že jej chcete stále přidat? (a/N) "
 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:3107
+#: g10/keyedit.c:4273 g10/keygen.c:3111
 msgid "Such a user ID already exists on this key!\n"
 msgstr "Takový identifikátor uživatele již u tohoto klí�e existuje!\n"
 
@@ -5017,7 +5031,7 @@ msgstr "podklí� %s nepodepisuje, a tak není třeba jej křížově certifikov
 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:5357 g10/keyedit.c:5495
+#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
 #, 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"
@@ -5026,127 +5040,127 @@ msgstr "přesko�en v3 podpis klí�e jím samým u uživatelského id „%s“\
 msgid "Enter your preferred keyserver URL: "
 msgstr "Vložte URL preferovaného serveru klí�ů: "
 
-#: g10/keyedit.c:5380
+#: g10/keyedit.c:5383
 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:5381
+#: g10/keyedit.c:5384
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Jste si jistý(á), že jej chcete smazat? (a/N) "
 
-#: g10/keyedit.c:5441
+#: g10/keyedit.c:5449
 msgid "Enter the notation: "
 msgstr "Vložte poznámku: "
 
-#: g10/keyedit.c:5588
+#: g10/keyedit.c:5596
 msgid "Proceed? (y/N) "
 msgstr "Pokra�ovat (a/N)? "
 
-#: g10/keyedit.c:5658
+#: g10/keyedit.c:5666
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Neexistuje identifikátor uživatele s indexem %d\n"
 
-#: g10/keyedit.c:5720
+#: g10/keyedit.c:5728
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Neexistuje uživatelské ID s hashem %s\n"
 
-#: g10/keyedit.c:5821
+#: g10/keyedit.c:5829
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Neexistuje podklí� s ID klí�e „%s“.\n"
 
-#: g10/keyedit.c:5843
+#: g10/keyedit.c:5851
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Neexistuje podklí� s indexem %d\n"
 
-#: g10/keyedit.c:5984
+#: g10/keyedit.c:5992
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID uživatele: „%s“\n"
 
-#: g10/keyedit.c:5987 g10/keyedit.c:6089 g10/keyedit.c:6137
+#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
 #, 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:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
+#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
 msgid " (non-exportable)"
 msgstr " (neexportovatelné)"
 
-#: g10/keyedit.c:5993
+#: g10/keyedit.c:6001
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Platnost podpisu vyprší %s.\n"
 
-#: g10/keyedit.c:5998
+#: g10/keyedit.c:6006
 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:6003
+#: g10/keyedit.c:6011
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vytvořit pro tento podpis odvolací certifikát? (a/N)"
 
-#: g10/keyedit.c:6063
+#: g10/keyedit.c:6071
 #, 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:6092
+#: g10/keyedit.c:6100
 msgid " (non-revocable)"
 msgstr " (neodvolatelné)"
 
-#: g10/keyedit.c:6099
+#: g10/keyedit.c:6107
 #, 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:6124
+#: g10/keyedit.c:6132
 msgid "You are about to revoke these signatures:\n"
 msgstr "Chystáte se odvolat tyto podpisy:\n"
 
-#: g10/keyedit.c:6147
+#: g10/keyedit.c:6155
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Opravdu vytvořit odvolací certifikáty? (a/N) "
 
-#: g10/keyedit.c:6180
+#: g10/keyedit.c:6188
 #, c-format
 msgid "no secret key\n"
 msgstr "neexistuje tajný klí�\n"
 
-#: g10/keyedit.c:6228
+#: g10/keyedit.c:6236
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr "pokus odvolat ID neuživatele: %s\n"
 
-#: g10/keyedit.c:6238
+#: g10/keyedit.c:6246
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "uživatelské ID „%s“ je již odvoláno\n"
 
-#: g10/keyedit.c:6255
+#: g10/keyedit.c:6263
 #, 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:6351
+#: g10/keyedit.c:6359
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Poslední platné ID uživatele nelze odvolat.\n"
 
-#: g10/keyedit.c:6389
+#: g10/keyedit.c:6397
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Klí� %s je již odvolán.\n"
 
-#: g10/keyedit.c:6451
+#: g10/keyedit.c:6459
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Podklí� %s je již odvolán.\n"
 
-#: g10/keyedit.c:6548
+#: g10/keyedit.c:6556
 #, 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"
@@ -5156,64 +5170,64 @@ msgstr "Zobrazuji %s fotografický ID o velikosti %ld pro klí� %s (uid %d)\n"
 msgid "invalid value for option '%s'\n"
 msgstr "neplatný argument u volby „%s“\n"
 
-#: g10/keygen.c:338
+#: g10/keygen.c:339
 #, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "duplicita předvolby „%s“\n"
 
-#: g10/keygen.c:345
+#: g10/keygen.c:346
 #, c-format
 msgid "too many cipher preferences\n"
 msgstr "příliš mnoho předvoleb pro šifrování\n"
 
-#: g10/keygen.c:347
+#: g10/keygen.c:348
 #, c-format
 msgid "too many digest preferences\n"
 msgstr "příliš mnoho předvoleb pro vzorkování\n"
 
-#: g10/keygen.c:349
+#: g10/keygen.c:350
 #, c-format
 msgid "too many compression preferences\n"
 msgstr "příliš mnoho předvoleb pro komprimaci\n"
 
-#: g10/keygen.c:351
+#: g10/keygen.c:352
 #, fuzzy, c-format
 #| msgid "too many cipher preferences\n"
 msgid "too many AEAD preferences\n"
 msgstr "příliš mnoho předvoleb pro šifrování\n"
 
-#: g10/keygen.c:521
+#: g10/keygen.c:522
 #, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "neplatná položka „%s“ v řetězci s předvolbami\n"
 
-#: g10/keygen.c:1130
+#: g10/keygen.c:1131
 #, c-format
 msgid "writing direct signature\n"
 msgstr "zapisuji podpis klí�e jím samým (direct signature)\n"
 
-#: g10/keygen.c:1176
+#: g10/keygen.c:1177
 #, c-format
 msgid "writing self signature\n"
 msgstr "zapisuji podpis klí�e sebou samým\n"
 
-#: g10/keygen.c:1233
+#: g10/keygen.c:1234
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "zapisuji „key-binding“ podpis\n"
 
-#: g10/keygen.c:1598 g10/keygen.c:1603 g10/keygen.c:1655 g10/keygen.c:1660
-#: g10/keygen.c:1832 g10/keygen.c:1837
+#: g10/keygen.c:1599 g10/keygen.c:1604 g10/keygen.c:1656 g10/keygen.c:1661
+#: g10/keygen.c:1833 g10/keygen.c:1838
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "neplatná délka klí�e; použiji %u bitů\n"
 
-#: g10/keygen.c:1609 g10/keygen.c:1666 g10/keygen.c:1674 g10/keygen.c:1843
+#: g10/keygen.c:1610 g10/keygen.c:1667 g10/keygen.c:1675 g10/keygen.c:1844
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "délka klí�e zaokrouhlena na %u bitů\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1701
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
@@ -5221,19 +5235,19 @@ msgstr ""
 "VAROV�N�: některé OpenPGP programy nedokáží zacházet s DSA klí�em s takto "
 "dlouhým hashem\n"
 
-#: g10/keygen.c:1899
+#: g10/keygen.c:1900
 msgid "Sign"
 msgstr "Podepisování"
 
-#: g10/keygen.c:1902
+#: g10/keygen.c:1903
 msgid "Certify"
 msgstr "Certifikování"
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1906
 msgid "Encrypt"
 msgstr "Šifrování"
 
-#: g10/keygen.c:1908
+#: g10/keygen.c:1909
 msgid "Authenticate"
 msgstr "Autentizace"
 
@@ -5247,180 +5261,180 @@ msgstr "Autentizace"
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1929
+#: g10/keygen.c:1930
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1967
 #, fuzzy, c-format
 #| msgid "Possible actions for a %s key: "
 msgid "Possible actions for this %s key: "
 msgstr "Pro klí� %s lze provést: "
 
-#: g10/keygen.c:1973
+#: g10/keygen.c:1974
 msgid "Current allowed actions: "
 msgstr "Aktuálně povolené akce: "
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1979
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Zapnout/vypnout schopnost podepisovat\n"
 
-#: g10/keygen.c:1981
+#: g10/keygen.c:1982
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Zapnout/vypnout schopnost Å¡ifrovat\n"
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1985
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Zapnout/vypnout schopnost autentizovat\n"
 
-#: g10/keygen.c:1987
+#: g10/keygen.c:1988
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Konec\n"
 
-#: g10/keygen.c:2116
+#: g10/keygen.c:2117
 #, fuzzy, c-format
 #| msgid "   (%d) RSA and RSA (default)\n"
 msgid "   (%d) RSA and RSA%s\n"
 msgstr "   (%d) RSA a RSA (implicitní)\n"
 
-#: g10/keygen.c:2120
+#: g10/keygen.c:2121
 #, fuzzy, c-format
 #| msgid "   (%d) DSA and Elgamal\n"
 msgid "   (%d) DSA and Elgamal%s\n"
 msgstr "   (%d) DSA a Elgamal\n"
 
-#: g10/keygen.c:2123
+#: g10/keygen.c:2124
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "   (%d) DSA (sign only)%s\n"
 msgstr "   (%d) DSA (pouze pro podpis)\n"
 
-#: g10/keygen.c:2125
+#: g10/keygen.c:2126
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (sign only)\n"
 msgid "   (%d) RSA (sign only)%s\n"
 msgstr "   (%d) RSA (pouze pro podpis)\n"
 
-#: g10/keygen.c:2131
+#: g10/keygen.c:2132
 #, fuzzy, c-format
 #| msgid "   (%d) Elgamal (encrypt only)\n"
 msgid "   (%d) Elgamal (encrypt only)%s\n"
 msgstr "   (%d) Elgamal (pouze pro šifrování)\n"
 
-#: g10/keygen.c:2133
+#: g10/keygen.c:2134
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (encrypt only)\n"
 msgid "   (%d) RSA (encrypt only)%s\n"
 msgstr "   (%d) RSA (pouze pro šifrování)\n"
 
-#: g10/keygen.c:2139
+#: g10/keygen.c:2140
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (set your own capabilities)\n"
 msgid "   (%d) DSA (set your own capabilities)%s\n"
 msgstr "   (%d) DSA (nastavit si vlastní použití)\n"
 
-#: g10/keygen.c:2141
+#: g10/keygen.c:2142
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (set your own capabilities)\n"
 msgid "   (%d) RSA (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (nastavit si vlastní použití)\n"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2148
 #, fuzzy, c-format
 #| msgid "   (%d) sign, encrypt\n"
 msgid "   (%d) ECC (sign and encrypt)%s\n"
 msgstr "   (%d) podepisovat, Å¡ifrovat\n"
 
-#: g10/keygen.c:2147 g10/keygen.c:2678
+#: g10/keygen.c:2148 g10/keygen.c:2679
 msgid " *default*"
 msgstr ""
 
-#: g10/keygen.c:2148
+#: g10/keygen.c:2149
 #, c-format
 msgid "  (%d) ECC (sign only)\n"
 msgstr "  (%d) ECC (pouze pro podpis)\n"
 
-#: g10/keygen.c:2150
+#: g10/keygen.c:2151
 #, fuzzy, c-format
 #| msgid "  (%d) ECC (set your own capabilities)\n"
 msgid "  (%d) ECC (set your own capabilities)%s\n"
 msgstr "  (%d) ECC (nastavit si vlastní použití)\n"
 
-#: g10/keygen.c:2152
+#: g10/keygen.c:2153
 #, fuzzy, c-format
 #| msgid "  (%d) ECC (encrypt only)\n"
 msgid "  (%d) ECC (encrypt only)%s\n"
 msgstr "  (%d) ECC (pouze pro šifrování)\n"
 
-#: g10/keygen.c:2156
+#: g10/keygen.c:2157
 #, fuzzy, c-format
 #| msgid "  (%d) Existing key\n"
 msgid "  (%d) Existing key%s\n"
 msgstr "  (%d) Existující klí�\n"
 
-#: g10/keygen.c:2158
+#: g10/keygen.c:2159
 #, fuzzy, c-format
 #| msgid "  (%d) Existing key from card\n"
 msgid "  (%d) Existing key from card%s\n"
 msgstr "  (%d) Klí� existující na kartě\n"
 
-#: g10/keygen.c:2254 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2255 sm/certreqgen-ui.c:203
 msgid "Enter the keygrip: "
 msgstr "Vložte keygrip: "
 
-#: g10/keygen.c:2267 sm/certreqgen-ui.c:211 tools/gpg-card.c:2280
+#: g10/keygen.c:2268 sm/certreqgen-ui.c:211 tools/gpg-card.c:2297
 #, c-format
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr "Není platným keygripem (o�ekáváno 40 šestnáctkových �íslic)\n"
 
-#: g10/keygen.c:2269 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2270 sm/certreqgen-ui.c:213
 msgid "No key with this keygrip\n"
 msgstr "Klí� s takovým keygripem neexistuje\n"
 
-#: g10/keygen.c:2288 g10/keygen.c:2298 g10/keygen.c:3440 g10/keygen.c:3451
+#: g10/keygen.c:2289 g10/keygen.c:2299 g10/keygen.c:3444 g10/keygen.c:3455
 #: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
 #, c-format
 msgid "error reading the card: %s\n"
 msgstr "chyba při �tení z karty: %s\n"
 
-#: g10/keygen.c:2292 g10/keygen.c:3444 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2293 g10/keygen.c:3448 sm/certreqgen-ui.c:234
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "Sériové �íslo karty: %s\n"
 
-#: g10/keygen.c:2311 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2312 sm/certreqgen-ui.c:246
 msgid "Available keys:\n"
 msgstr "Dostupné klí�e:\n"
 
-#: g10/keygen.c:2504 g10/keygen.c:2518
+#: g10/keygen.c:2505 g10/keygen.c:2519
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr "zaokrouhleno na %u bitů\n"
 
-#: g10/keygen.c:2559
+#: g10/keygen.c:2560
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "klí� %s může mít délku v intervalu %u až %u bitů.\n"
 
-#: g10/keygen.c:2567
+#: g10/keygen.c:2568
 #, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Jakou délku podklí�e si přejete? (%u) "
 
-#: g10/keygen.c:2584 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2585 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Požadovaná délka klí�e je %u bitů.\n"
 
-#: g10/keygen.c:2630
+#: g10/keygen.c:2631
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Prosím, vyberte, kterou eliptickou křivku chcete:\n"
 
-#: g10/keygen.c:2819
+#: g10/keygen.c:2820
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5436,7 +5450,7 @@ msgstr ""
 "      <n>m = doba platnosti klí�e skon�í za n měsíců\n"
 "      <n>y = doba platnosti klí�e skon�í za n let\n"
 
-#: g10/keygen.c:2830
+#: g10/keygen.c:2831
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5452,38 +5466,38 @@ msgstr ""
 "      <n>m = doba platnosti podpisu skon�í za n měsíců\n"
 "      <n>y = doba platnosti podpisu skon�í za n let\n"
 
-#: g10/keygen.c:2853
+#: g10/keygen.c:2854
 msgid "Key is valid for? (0) "
 msgstr "Klí� je platný po? (0) "
 
-#: g10/keygen.c:2858
+#: g10/keygen.c:2859
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Podpis je platný pro? (%s) "
 
-#: g10/keygen.c:2871 g10/keygen.c:2896
+#: g10/keygen.c:2875 g10/keygen.c:2900
 msgid "invalid value\n"
 msgstr "neplatná hodnota\n"
 
-#: g10/keygen.c:2878
+#: g10/keygen.c:2882
 msgid "Key does not expire at all\n"
 msgstr "Platnost klí�e nikdy neskon�í\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2883
 msgid "Signature does not expire at all\n"
 msgstr "Platnost podpisu nikdy neskon�í\n"
 
-#: g10/keygen.c:2884
+#: g10/keygen.c:2888
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Platnost klí�e skon�í v %s\n"
 
-#: g10/keygen.c:2885
+#: g10/keygen.c:2889
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Platnost podpisu skon�í v %s\n"
 
-#: g10/keygen.c:2889
+#: g10/keygen.c:2893
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5491,11 +5505,11 @@ msgstr ""
 "Váš systém neumí zobrazit data po roce 2038.\n"
 "V každém případě budou data korektně zpracovávána do roku 2106.\n"
 
-#: g10/keygen.c:2902
+#: g10/keygen.c:2906
 msgid "Is this correct? (y/N) "
 msgstr "Je to správně (a/N)? "
 
-#: g10/keygen.c:2970
+#: g10/keygen.c:2974
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5510,7 +5524,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2985
+#: g10/keygen.c:2989
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5526,49 +5540,49 @@ msgstr ""
 "    „Magda Prochazkova (student) <magda@domena.cz>“\n"
 "\n"
 
-#: g10/keygen.c:3004
+#: g10/keygen.c:3008
 msgid "Real name: "
 msgstr "Jméno a příjmení: "
 
-#: g10/keygen.c:3013
+#: g10/keygen.c:3017
 msgid "Invalid character in name\n"
 msgstr "Neplatný znak ve jméně\n"
 
-#: g10/keygen.c:3014
+#: g10/keygen.c:3018
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr "Znaky „%s“ a „%s“ se ve jméně nesmí objevit\n"
 
-#: g10/keygen.c:3018
+#: g10/keygen.c:3022
 msgid "Name may not start with a digit\n"
 msgstr "Jméno nemůže za�ínat �íslicí\n"
 
-#: g10/keygen.c:3021
+#: g10/keygen.c:3025
 msgid "Name must be at least 5 characters long\n"
 msgstr "Jméno musí být dlouhé alespoň 5 znaků\n"
 
-#: g10/keygen.c:3031
+#: g10/keygen.c:3035
 msgid "Email address: "
 msgstr "E-mailová adresa: "
 
-#: g10/keygen.c:3037
+#: g10/keygen.c:3041
 msgid "Not a valid email address\n"
 msgstr "Neplatná e-mailová adresa\n"
 
-#: g10/keygen.c:3046
+#: g10/keygen.c:3050
 msgid "Comment: "
 msgstr "Komentář: "
 
-#: g10/keygen.c:3052
+#: g10/keygen.c:3056
 msgid "Invalid character in comment\n"
 msgstr "Neplatný znak v komentáři\n"
 
-#: g10/keygen.c:3088
+#: g10/keygen.c:3092
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr "Používáte znakovou sadu „%s“.\n"
 
-#: g10/keygen.c:3094
+#: g10/keygen.c:3098
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5579,7 +5593,7 @@ msgstr ""
 "    „%s“\n"
 "\n"
 
-#: g10/keygen.c:3099
+#: g10/keygen.c:3103
 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"
 
@@ -5594,33 +5608,33 @@ msgstr "Do pole jméno nebo komentář nepište, prosím, e-mailovou adresu.\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3124
+#: g10/keygen.c:3128
 msgid "NnCcEeOoQq"
 msgstr "jJkKeEPpUu"
 
-#: g10/keygen.c:3134
+#: g10/keygen.c:3138
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Změnit (J)méno, (K)omentář, (E)-mail nebo (U)kon�it? "
 
-#: g10/keygen.c:3135
+#: g10/keygen.c:3139
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "Změnit (J)méno, (K)omentář, (E)-mail, (P)okra�ovat dál nebo (U)kon�it "
 "program? "
 
-#: g10/keygen.c:3140
+#: g10/keygen.c:3144
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Změnit (J)méno, (E)-mail nebo (U)kon�it? "
 
-#: g10/keygen.c:3141
+#: g10/keygen.c:3145
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "Změnit (J)méno, (E)-mail, (P)okra�ovat dál nebo (U)kon�it? "
 
-#: g10/keygen.c:3160
+#: g10/keygen.c:3164
 msgid "Please correct the error first\n"
 msgstr "Nejdřív, prosím, opravte chybu\n"
 
-#: g10/keygen.c:3206
+#: g10/keygen.c:3210
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -5633,18 +5647,18 @@ msgstr ""
 "používat disky); díky tomu má generátor lepší šanci získat dostatek "
 "entropie.\n"
 
-#: g10/keygen.c:3591
+#: g10/keygen.c:3595
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4590 g10/keygen.c:4663 g10/keygen.c:4681 g10/keygen.c:4710
-#: g10/keygen.c:5086 g10/keygen.c:5632 g10/keygen.c:5943 g10/keygen.c:6050
+#: g10/keygen.c:4594 g10/keygen.c:4667 g10/keygen.c:4685 g10/keygen.c:4714
+#: g10/keygen.c:5113 g10/keygen.c:5663 g10/keygen.c:5974 g10/keygen.c:6081
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Vytvoření klí�e se nepodařilo: %s\n"
 
-#: g10/keygen.c:4599
+#: g10/keygen.c:4603
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5655,64 +5669,64 @@ msgstr ""
 "    „%s“\n"
 "\n"
 
-#: g10/keygen.c:4601
+#: g10/keygen.c:4605
 msgid "Continue? (Y/n) "
 msgstr "Pokra�ovat (A/n) "
 
-#: g10/keygen.c:4622
+#: g10/keygen.c:4626
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "Klí� pro „%s“ již existuje\n"
 
-#: g10/keygen.c:4627
+#: g10/keygen.c:4631
 msgid "Create anyway? (y/N) "
 msgstr "Přesto vytvořit? (a/N) "
 
-#: g10/keygen.c:4633
+#: g10/keygen.c:4637
 #, c-format
 msgid "creating anyway\n"
 msgstr "přesto se vytváří\n"
 
-#: g10/keygen.c:5069
+#: g10/keygen.c:5096
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr "Poznámka: Pro komplexní tvorbu klí�e použijte „%s %s“.\n"
 
-#: g10/keygen.c:5118
+#: g10/keygen.c:5145
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Vytváření klí�e bylo zrušeno.\n"
 
-#: g10/keygen.c:5178
+#: g10/keygen.c:5205
 #, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "záložní soubor „%s“ nelze vytvořit: %s\n"
 
-#: g10/keygen.c:5198
+#: g10/keygen.c:5225
 #, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "Poznámka: záloha klí�e z karty uložena do „%s“\n"
 
-#: g10/keygen.c:5359 g10/keygen.c:5561
+#: g10/keygen.c:5389 g10/keygen.c:5591
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr "veřejný klí� se zapisuje do „%s“\n"
 
-#: g10/keygen.c:5555
+#: g10/keygen.c:5585
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "nenalezen zapisovatelný soubor veřejných klí�ů (pubring): %s\n"
 
-#: g10/keygen.c:5569
+#: g10/keygen.c:5599
 #, c-format
 msgid "error writing public keyring '%s': %s\n"
 msgstr "chyba při zápisu do souboru veřejných klí�ů „%s“: %s\n"
 
-#: g10/keygen.c:5603
+#: g10/keygen.c:5634
 msgid "public and secret key created and signed.\n"
 msgstr "veřejný a tajný klí� byly vytvořeny a podepsány.\n"
 
-#: g10/keygen.c:5619
+#: g10/keygen.c:5650
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -5720,7 +5734,7 @@ msgstr ""
 "Tento klí� nemůže být použitý pro šifrování. K vytvoření\n"
 "sekundárního klí�e pro tento ú�el můžete použít příkaz „--edit-key“.\n"
 
-#: g10/keygen.c:5801 g10/keygen.c:6000
+#: g10/keygen.c:5832 g10/keygen.c:6031
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5728,7 +5742,7 @@ msgstr ""
 "klí� byl vytvořen %lu sekund v budoucnosti (došlo ke změně �asu nebo\n"
 "je problém se systémovým �asem)\n"
 
-#: g10/keygen.c:5803 g10/keygen.c:6002
+#: g10/keygen.c:5834 g10/keygen.c:6033
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5736,22 +5750,22 @@ msgstr ""
 "klí� byl vytvořen %lu sekund v budoucnosti (došlo ke změně �asu nebo\n"
 "je problém se systémovým �asem)\n"
 
-#: g10/keygen.c:5814 g10/keygen.c:6013
+#: g10/keygen.c:5845 g10/keygen.c:6044
 #, c-format
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "Poznámka: vytvoření podklí�ů pro klí�e v3 není v souladu s OpenPGP\n"
 
-#: g10/keygen.c:5826 g10/keygen.c:5828
+#: g10/keygen.c:5857 g10/keygen.c:5859
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Tajné �ásti primárního klí�e nejsou dostupné.\n"
 
-#: g10/keygen.c:5835 g10/keygen.c:5837
+#: g10/keygen.c:5866 g10/keygen.c:5868
 #, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Tajná �ást primárního klí�e jsou uloženy na kartě.\n"
 
-#: g10/keygen.c:5857 g10/keygen.c:6027
+#: g10/keygen.c:5888 g10/keygen.c:6058
 msgid "Really create? (y/N) "
 msgstr "Opravdu vytvořit? (a/N) "
 
@@ -5833,12 +5847,12 @@ msgstr "          Otisk klí�e ="
 msgid "      Card serial no. ="
 msgstr "  Sériové �íslo karty ="
 
-#: g10/keyring.c:1467
+#: g10/keyring.c:1477
 #, c-format
 msgid "caching keyring '%s'\n"
 msgstr "zapamatovává se soubor klí�ů „%s“\n"
 
-#: g10/keyring.c:1541
+#: g10/keyring.c:1551
 #, c-format
 msgid "%lu keys cached so far (%lu signature)\n"
 msgid_plural "%lu keys cached so far (%lu signatures)\n"
@@ -5846,7 +5860,7 @@ msgstr[0] "%lu klí�ů již uloženo v keši (%lu podpis)\n"
 msgstr[1] "%lu klí�ů již uloženo v keši (%lu podpisy)\n"
 msgstr[2] "%lu klí�ů již uloženo v keši (%lu podpisů)\n"
 
-#: g10/keyring.c:1557
+#: g10/keyring.c:1567
 #, c-format
 msgid "%lu key cached"
 msgid_plural "%lu keys cached"
@@ -5854,7 +5868,7 @@ msgstr[0] "%lu klí� uložen v keši"
 msgstr[1] "%lu klí�e uloženy v keši"
 msgstr[2] "%lu klí�ů uloženo v keši"
 
-#: g10/keyring.c:1559
+#: g10/keyring.c:1569
 #, c-format
 msgid " (%lu signature)\n"
 msgid_plural " (%lu signatures)\n"
@@ -5862,7 +5876,7 @@ msgstr[0] " (%lu podpis)\n"
 msgstr[1] " (%lu podpisy)\n"
 msgstr[2] " (%lu podpisů)\n"
 
-#: g10/keyring.c:1636
+#: g10/keyring.c:1646
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: soubor klí�ů (keyring) vytvořen\n"
@@ -5891,25 +5905,25 @@ msgstr "automaticky získávat klí�e při ověřování podpisů"
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "respektovat URL upřednostňovaných serverů klí�ů daného klí�e"
 
-#: g10/keyserver.c:537
+#: g10/keyserver.c:360
 msgid "disabled"
 msgstr "zneplatněn"
 
-#: g10/keyserver.c:740
+#: g10/keyserver.c:563
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Vložte �íslo (�ísla), „N“ pro další, nebo „Q“ pro konec > "
 
-#: g10/keyserver.c:846
+#: g10/keyserver.c:669
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "neplatný protokol serveru klí�ů (naše %d!=obsluha %d)\n"
 
-#: g10/keyserver.c:986 g10/keyserver.c:1096
+#: g10/keyserver.c:809 g10/keyserver.c:919
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "„%s“ není ID klí�e: přesko�eno\n"
 
-#: g10/keyserver.c:1420 g10/keyserver.c:1453
+#: g10/keyserver.c:1217 g10/keyserver.c:1250
 #, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
@@ -5917,52 +5931,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:1427
+#: g10/keyserver.c:1224
 #, 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:1531
+#: g10/keyserver.c:1316
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "klí� „%s“ nebyl na serveru klí�ů nalezen\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1319
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "klí� nebyl na serveru klí�ů nalezen\n"
 
-#: g10/keyserver.c:1722
-#, c-format
-msgid "requesting key %s from %s server %s\n"
-msgstr "požaduji klí� %s z %s serveru %s\n"
-
-#: g10/keyserver.c:1726
+#: g10/keyserver.c:1481
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "požaduji klí� %s z %s\n"
 
-#: g10/keyserver.c:1841 g10/keyserver.c:2020
+#: g10/keyserver.c:1600 g10/keyserver.c:1793
 #, c-format
 msgid "no keyserver known\n"
 msgstr "není znám žádný server s klí�i\n"
 
-#: g10/keyserver.c:1856 g10/skclist.c:213 g10/skclist.c:241
+#: g10/keyserver.c:1615 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:1860
+#: g10/keyserver.c:1619
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "posílám klí� %s na %s\n"
 
-#: g10/keyserver.c:1901
+#: g10/keyserver.c:1662
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr "požaduje se klí� z „%s“\n"
 
-#: g10/keyserver.c:1917
+#: g10/keyserver.c:1680
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "VAROV�N�: URI %s nelze získat: %s\n"
@@ -5989,72 +5998,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:472
+#: g10/mainproc.c:473
 #, c-format
 msgid "public key is %s\n"
 msgstr "veřejný klí� je %s\n"
 
-#: g10/mainproc.c:524
+#: g10/mainproc.c:525
 #, 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:528 g10/pkclist.c:231
+#: g10/mainproc.c:529 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:532
+#: g10/mainproc.c:533
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "zašifrováno %s klí�em, ID %s\n"
 
-#: g10/mainproc.c:552 g10/mainproc.c:935
+#: g10/mainproc.c:553 g10/mainproc.c:937
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "VAROV�N�: zachyceno více prostých textů\n"
 
-#: g10/mainproc.c:560
+#: g10/mainproc.c:561
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "zašifrováno s heslem %lu\n"
 
-#: g10/mainproc.c:562
+#: g10/mainproc.c:563
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "zašifrováno jedním heslem\n"
 
-#: g10/mainproc.c:577 g10/mainproc.c:602
+#: g10/mainproc.c:578 g10/mainproc.c:603
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "dešifrování veřejným klí�em selhalo: %s\n"
 
-#: g10/mainproc.c:613
+#: g10/mainproc.c:614
 #, 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:642 g10/mainproc.c:663
+#: g10/mainproc.c:643 g10/mainproc.c:664
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "předpokládám %s šifrovaných dat\n"
 
-#: g10/mainproc.c:649
+#: g10/mainproc.c:650
 #, 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:742 g10/mainproc.c:780
+#: g10/mainproc.c:744 g10/mainproc.c:782
 #, 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:753
+#: g10/mainproc.c:755
 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"
@@ -6063,182 +6072,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:756
+#: g10/mainproc.c:758
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr "Dešifrování lze vynutit volbou „%s“.\n"
 
-#: g10/mainproc.c:761
+#: g10/mainproc.c:763
 #, c-format
 msgid "decryption forced to fail!\n"
 msgstr "vynucené dešifrování selhalo!\n"
 
-#: g10/mainproc.c:773
+#: g10/mainproc.c:775
 #, c-format
 msgid "decryption okay\n"
 msgstr "dešifrování o.k.\n"
 
-#: g10/mainproc.c:786
+#: g10/mainproc.c:788
 #, 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:804
+#: g10/mainproc.c:806
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dešifrování selhalo: %s\n"
 
-#: g10/mainproc.c:851
+#: g10/mainproc.c:853
 #, 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:858
+#: g10/mainproc.c:860
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "původní jméno souboru='%.*s'\n"
 
-#: g10/mainproc.c:1135
+#: g10/mainproc.c:1137
 #, 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:1440 g10/mainproc.c:1483
+#: g10/mainproc.c:1442 g10/mainproc.c:1485
 #, c-format
 msgid "no signature found\n"
 msgstr "nenalezen žádná podpis\n"
 
-#: g10/mainproc.c:1763
+#: g10/mainproc.c:1765
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ŠPATN� podpis od „%s“"
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1767
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Podpis s vypršenou platností od „%s“"
 
-#: g10/mainproc.c:1767
+#: g10/mainproc.c:1769
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Dobrý podpis od „%s“"
 
-#: g10/mainproc.c:1789
+#: g10/mainproc.c:1791
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "verifikace podpisu potla�ena\n"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1905
 #, 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:1919 g10/mainproc.c:1926
+#: g10/mainproc.c:1921 g10/mainproc.c:1928
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Podpis vytvořen %s\n"
 
-#: g10/mainproc.c:1920 g10/mainproc.c:1927 sm/verify.c:480
+#: g10/mainproc.c:1922 g10/mainproc.c:1929 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:1931
+#: g10/mainproc.c:1933
 #, 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:1937
+#: g10/mainproc.c:1939
 #, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "               vydavatel „%s“\n"
 
-#: g10/mainproc.c:1992
+#: g10/mainproc.c:1994
 #, c-format
 msgid "Key available at: "
 msgstr "Klí� k dispozici na: "
 
-#: g10/mainproc.c:2034
+#: g10/mainproc.c:2036
 #, 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:2234
+#: g10/mainproc.c:2236
 msgid "[uncertain]"
 msgstr "[nejistý]"
 
-#: g10/mainproc.c:2272
+#: g10/mainproc.c:2274
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                alias „%s“"
 
-#: g10/mainproc.c:2347
+#: g10/mainproc.c:2349
 #, 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:2363
+#: g10/mainproc.c:2365
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Platnost podpisu skon�ila %s\n"
 
-#: g10/mainproc.c:2368
+#: g10/mainproc.c:2370
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Platnost podpisu skon�í %s\n"
 
-#: g10/mainproc.c:2379
+#: g10/mainproc.c:2381
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "podpis %s, hashovací algoritmus %s%s%s\n"
 
-#: g10/mainproc.c:2380
+#: g10/mainproc.c:2382
 msgid "binary"
 msgstr "binární formát"
 
-#: g10/mainproc.c:2381
+#: g10/mainproc.c:2383
 msgid "textmode"
 msgstr "textový formát"
 
-#: g10/mainproc.c:2381 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2383 g10/trust.c:112 dirmngr/ocsp.c:793
 msgid "unknown"
 msgstr "neznámý formát"
 
-#: g10/mainproc.c:2383
+#: g10/mainproc.c:2385
 msgid ", key algorithm "
 msgstr ", algoritmus klí�e"
 
-#: g10/mainproc.c:2418
+#: g10/mainproc.c:2420
 #, 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:2457
+#: g10/mainproc.c:2459
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nemohu ověřit podpis: %s\n"
 
-#: g10/mainproc.c:2553 g10/mainproc.c:2572 g10/mainproc.c:2696
+#: g10/mainproc.c:2555 g10/mainproc.c:2574 g10/mainproc.c:2698
 #, c-format
 msgid "not a detached signature\n"
 msgstr "toto není podpis oddělený od dokumentu\n"
 
-#: g10/mainproc.c:2606
+#: g10/mainproc.c:2608
 #, 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:2615
+#: g10/mainproc.c:2617
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "samostatný podpis třídy 0x%02x\n"
 
-#: g10/mainproc.c:2700
+#: g10/mainproc.c:2702
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis starého typu (PGP 2.x)\n"
@@ -6420,45 +6429,51 @@ msgstr "Neznámá kritická notace podpisu: "
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpacket typu %d má nastavený kritický bit\n"
 
-#: g10/passphrase.c:208
+#: g10/passphrase.c:201 sm/decrypt.c:669
+#, fuzzy
+#| msgid "Please enter the new passphrase"
+msgid "Please enter the passphrase for decryption."
+msgstr "Prosím, zadejte nové heslo"
+
+#: g10/passphrase.c:203
 msgid "Enter passphrase\n"
 msgstr "Vložit heslo\n"
 
-#: g10/passphrase.c:219
+#: g10/passphrase.c:227
 #, c-format
 msgid "cancelled by user\n"
 msgstr "zrušeno uživatelem\n"
 
-#: g10/passphrase.c:460
+#: g10/passphrase.c:472
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (ID hlavního klí�e %s)"
 
-#: g10/passphrase.c:467
+#: g10/passphrase.c:479
 msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 msgstr "Prosím, zadejte heslo, abyste odemkli tajný klí� OpenPGP:"
 
-#: g10/passphrase.c:471
+#: g10/passphrase.c:483
 msgid "Please enter the passphrase to import the OpenPGP secret key:"
 msgstr "Prosím, zadejte heslo, abyste mohli importovat tajný klí� OpenPGP:"
 
-#: g10/passphrase.c:476
+#: g10/passphrase.c:488
 msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 msgstr "Prosím, zadejte heslo, abyste mohli exportovat tajný podklí� OpenPGP:"
 
-#: g10/passphrase.c:479
+#: g10/passphrase.c:491
 msgid "Please enter the passphrase to export the OpenPGP secret key:"
 msgstr "Prosím, zadejte heslo, abyste mohli exportovat tajný klí� OpenPGP:"
 
-#: g10/passphrase.c:484
+#: g10/passphrase.c:496
 msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 msgstr "Opravdu chcete trvale smazat tajný klí� podklí�e OpenPGP:"
 
-#: g10/passphrase.c:487
+#: g10/passphrase.c:499
 msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgstr "Opravdu chcete trvale smazat tajný klí� OpenPGP:"
 
-#: g10/passphrase.c:496
+#: g10/passphrase.c:508
 #, c-format
 msgid ""
 "%s\n"
@@ -6628,7 +6643,7 @@ msgstr ""
 "Minimální úroveň důvěry tohoto klí�e je: %s\n"
 "\n"
 
-#: g10/pkclist.c:313 g10/revoke.c:803
+#: g10/pkclist.c:313 g10/revoke.c:804
 msgid "Your decision? "
 msgstr "Vaše rozhodnutí? "
 
@@ -6921,7 +6936,7 @@ msgstr "nelze otevřít podepsaná data „%s“\n"
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "nelze otevřít podepsaná data na deskriptoru=%d: %s\n"
 
-#: g10/pubkey-enc.c:99 sm/decrypt.c:879
+#: g10/pubkey-enc.c:99 sm/decrypt.c:1329
 #, c-format
 msgid "key %s is not suitable for decryption in %s mode\n"
 msgstr "klí� %s se nehodí na rozšifrování v režimu %s\n"
@@ -6968,7 +6983,7 @@ msgid "Note: key has been revoked"
 msgstr "Poznámka: klí� byl odvolán"
 
 #: g10/revoke.c:100 g10/revoke.c:126 g10/revoke.c:172 g10/revoke.c:184
-#: g10/revoke.c:502
+#: g10/revoke.c:503
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "selhalo vytvoření paketu (build_packet): %s\n"
@@ -6994,11 +7009,11 @@ msgstr "Tajný klí� není dostupný.\n"
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Vytvořit pro tento klí� pověřený revoka�ní certifikát? (a/N)"
 
-#: g10/revoke.c:334 g10/revoke.c:744
+#: g10/revoke.c:334 g10/revoke.c:745
 msgid "ASCII armored output forced.\n"
 msgstr "nařízen výstup do formátu ASCII.\n"
 
-#: g10/revoke.c:350 g10/revoke.c:481
+#: g10/revoke.c:350 g10/revoke.c:482
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "vytvoření podepisovacího paketu (make_keysig_packet) selhalo: %s\n"
@@ -7012,11 +7027,11 @@ msgstr "Revoka�ní certifikát vytvořen.\n"
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "pro „%s“ nebyl nalezen žádný revoka�ní klí�\n"
 
-#: g10/revoke.c:567
+#: g10/revoke.c:568
 msgid "This is a revocation certificate for the OpenPGP key:"
 msgstr "Toto je revoka�ní certifikát pro OpenPGP klí�:"
 
-#: g10/revoke.c:583
+#: g10/revoke.c:584
 msgid ""
 "A revocation certificate is a kind of \"kill switch\" to publicly\n"
 "declare that a key shall not anymore be used.  It is not possible\n"
@@ -7026,7 +7041,7 @@ msgstr ""
 "veřejně prohlašuje, že klí� by se již neměl používat. Jednou zveřejněný\n"
 "odvolací certifikát již nelze vzít zpět."
 
-#: g10/revoke.c:586
+#: g10/revoke.c:587
 msgid ""
 "Use it to revoke this key in case of a compromise or loss of\n"
 "the secret key.  However, if the secret key is still accessible,\n"
@@ -7040,7 +7055,7 @@ msgstr ""
 "Podrobnosti naleznete v manuálu GnuPG u popisu příkazu\n"
 "„gpg --generate-revocation“."
 
-#: g10/revoke.c:592
+#: g10/revoke.c:593
 msgid ""
 "To avoid an accidental use of this file, a colon has been inserted\n"
 "before the 5 dashes below.  Remove this colon with a text editor\n"
@@ -7052,12 +7067,12 @@ msgstr ""
 "certifikátu\n"
 "odstraňte tuto dvojte�ku textovým editorem."
 
-#: g10/revoke.c:611
+#: g10/revoke.c:612
 #, c-format
 msgid "revocation certificate stored as '%s.rev'\n"
 msgstr "odvolací certifikát uložen jako „%s.rev“\n"
 
-#: g10/revoke.c:655
+#: g10/revoke.c:656
 #, c-format
 msgid "secret key \"%s\" not found\n"
 msgstr "tajný klí� „%s“ nenalezen\n"
@@ -7065,21 +7080,21 @@ msgstr "tajný klí� „%s“ nenalezen\n"
 #. TRANSLATORS: The %s prints a key specification which
 #. for example has been given at the command line.  Several lines
 #. lines with secret key infos are printed after this message.
-#: g10/revoke.c:680
+#: g10/revoke.c:681
 #, c-format
 msgid "'%s' matches multiple secret keys:\n"
 msgstr "„%s“ odpovídá více tajným klí�ům:\n"
 
-#: g10/revoke.c:705
+#: g10/revoke.c:706
 #, c-format
 msgid "error searching the keyring: %s\n"
 msgstr "chyba při prohledávání souboru klí�ů (keyring): %s\n"
 
-#: g10/revoke.c:728
+#: g10/revoke.c:729
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Vytvořit pro tento klí� revoka�ní certifikát? (a/N) "
 
-#: g10/revoke.c:752
+#: g10/revoke.c:753
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -7098,33 +7113,33 @@ msgstr ""
 "na vašem po�íta�i může ukládat data ur�ená k tisku a zpřístupnit je\n"
 "jiným uživatelům!\n"
 
-#: g10/revoke.c:786
+#: g10/revoke.c:787
 msgid "Please select the reason for the revocation:\n"
 msgstr "Prosím vyberte důvod revokace:\n"
 
-#: g10/revoke.c:796
+#: g10/revoke.c:797
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: g10/revoke.c:798
+#: g10/revoke.c:799
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Pravděpodobně zda chcete vybrat %d)\n"
 
-#: g10/revoke.c:839
+#: g10/revoke.c:843
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Můžete vložit další popis. Ukon�ete prázdným řádkem:\n"
 
-#: g10/revoke.c:867
+#: g10/revoke.c:871
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Důvod revokace: %s\n"
 
-#: g10/revoke.c:869
+#: g10/revoke.c:873
 msgid "(No description given)\n"
 msgstr "(Nebyl zadán Žádný popis)\n"
 
-#: g10/revoke.c:874
+#: g10/revoke.c:878
 msgid "Is this okay? (y/N) "
 msgstr "Je důvod revokace vybrán správně? (a/N) "
 
@@ -7307,24 +7322,24 @@ msgstr "podepisuji:"
 msgid "%s.%s encryption will be used\n"
 msgstr "bude použito šifrování %s\n"
 
-#: g10/skclist.c:172 g10/skclist.c:253
+#: g10/skclist.c:173 g10/skclist.c:254
 #, c-format
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "klí� není ozna�en jako nedostate�ně bezpe�ný – nemohu jej použít s falešným "
 "RNG!\n"
 
-#: g10/skclist.c:204
+#: g10/skclist.c:205
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "přesko�en „%s“: duplikován\n"
 
-#: g10/skclist.c:223
+#: g10/skclist.c:224
 #, c-format
 msgid "skipped: secret key already present\n"
 msgstr "přesko�eno: tajný klí� je už v databázi\n"
 
-#: g10/skclist.c:242
+#: g10/skclist.c:243
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "toto je PGP klí� vygenerovaný podle algoritmu Elgamal,\n"
@@ -7546,10 +7561,10 @@ msgstr "nepodporovaná verze databáze TOFU: %s\n"
 msgid "TOFU DB error"
 msgstr "Chyba databáze TOFU"
 
-#: g10/tofu.c:687 g10/tofu.c:2073 g10/tofu.c:2354 g10/tofu.c:2373
-#: g10/tofu.c:2386 g10/tofu.c:2398 g10/tofu.c:2413 g10/tofu.c:2425
-#: g10/tofu.c:3021 g10/tofu.c:3038 g10/tofu.c:3075 g10/tofu.c:3092
-#: g10/tofu.c:3404
+#: g10/tofu.c:687 g10/tofu.c:2077 g10/tofu.c:2358 g10/tofu.c:2377
+#: g10/tofu.c:2390 g10/tofu.c:2402 g10/tofu.c:2417 g10/tofu.c:2429
+#: g10/tofu.c:3025 g10/tofu.c:3042 g10/tofu.c:3079 g10/tofu.c:3096
+#: g10/tofu.c:3408
 #, c-format
 msgid "error reading TOFU database: %s\n"
 msgstr "chyba při �tení databáze TOFU: %s\n"
@@ -7569,7 +7584,7 @@ msgstr "chyba při inicializaci databáze TOFU: %s\n"
 msgid "error opening TOFU database '%s': %s\n"
 msgstr "chyba při otevírání databáze TOFU „%s“: %s\n"
 
-#: g10/tofu.c:1148 g10/tofu.c:3458 g10/tofu.c:3604
+#: g10/tofu.c:1148 g10/tofu.c:3462 g10/tofu.c:3608
 #, c-format
 msgid "error updating TOFU database: %s\n"
 msgstr "chyba při aktualizaci databáze TOFU: %s\n"
@@ -7611,17 +7626,17 @@ msgstr "chyba při sběru dalších ID uživatele: %s\n"
 msgid "This key's user IDs:\n"
 msgstr "ID uživatelů tohoto klí�e:\n"
 
-#: g10/tofu.c:1634 g10/tofu.c:1799
+#: g10/tofu.c:1634 g10/tofu.c:1801
 #, c-format
 msgid "policy: %s"
 msgstr "politika: %s"
 
-#: g10/tofu.c:1725
+#: g10/tofu.c:1727
 #, c-format
 msgid "error gathering signature stats: %s\n"
 msgstr "chyba při sběru údajů o podpisech: %s\n"
 
-#: g10/tofu.c:1729
+#: g10/tofu.c:1731
 #, c-format
 msgid "The email address \"%s\" is associated with %d key:\n"
 msgid_plural "The email address \"%s\" is associated with %d keys:\n"
@@ -7629,16 +7644,16 @@ msgstr[0] "E-mailová adresa „%s“ je spojena s %d klí�em:\n"
 msgstr[1] "E-mailová adresa „%s“ je spojena s %d klí�i:\n"
 msgstr[2] "E-mailová adresa „%s“ je spojena s %d klí�i:\n"
 
-#: g10/tofu.c:1747
+#: g10/tofu.c:1749
 #, c-format
 msgid "Statistics for keys with the email address \"%s\":\n"
 msgstr "Statistika pro klí�e s e-mailovou adresou „%s“:\n"
 
-#: g10/tofu.c:1797
+#: g10/tofu.c:1799
 msgid "this key"
 msgstr "tento klí�"
 
-#: g10/tofu.c:1823
+#: g10/tofu.c:1825
 #, c-format
 msgid "Verified %d message."
 msgid_plural "Verified %d messages."
@@ -7646,7 +7661,7 @@ msgstr[0] "%d zpráva ověřena."
 msgstr[1] "%d zprávy ověřeny."
 msgstr[2] "%d zpráv ověřeno."
 
-#: g10/tofu.c:1827
+#: g10/tofu.c:1829
 #, c-format
 msgid "Encrypted %d message."
 msgid_plural "Encrypted %d messages."
@@ -7654,7 +7669,7 @@ msgstr[0] "%d zpráva zašifrována."
 msgstr[1] "%d zprávy zašifrovány."
 msgstr[2] "%d zpráv zašifrováno."
 
-#: g10/tofu.c:1834
+#: g10/tofu.c:1836
 #, c-format
 msgid "Verified %d message in the future."
 msgid_plural "Verified %d messages in the future."
@@ -7662,7 +7677,7 @@ msgstr[0] "Ověřena %d zpráva v budoucnosti."
 msgstr[1] "Ověřeny %d zprávy v budoucnosti."
 msgstr[2] "Ověřeno %d zpráv v budoucnosti."
 
-#: g10/tofu.c:1838
+#: g10/tofu.c:1840
 #, c-format
 msgid "Encrypted %d message in the future."
 msgid_plural "Encrypted %d messages in the future."
@@ -7670,7 +7685,7 @@ msgstr[0] "Zašifrována %d zpráva v budoucnosti."
 msgstr[1] "Zašifrovány %d zprávy v budoucnosti."
 msgstr[2] "Zašifrováno %d zpráv v budoucnosti."
 
-#: g10/tofu.c:1852
+#: g10/tofu.c:1854
 #, c-format
 msgid "Messages verified over the past %d day: %d."
 msgid_plural "Messages verified over the past %d days: %d."
@@ -7678,7 +7693,7 @@ msgstr[0] "Ověřeno zpráv za poslední %d den: %d."
 msgstr[1] "Ověřeno zpráv za poslední %d dny: %d."
 msgstr[2] "Ověřeno zpráv za posledních %d dnů: %d."
 
-#: g10/tofu.c:1858
+#: g10/tofu.c:1860
 #, c-format
 msgid "Messages encrypted over the past %d day: %d."
 msgid_plural "Messages encrypted over the past %d days: %d."
@@ -7686,7 +7701,7 @@ msgstr[0] "Zašifrováno zpráv za poslední %d den: %d."
 msgstr[1] "Zašifrováno zpráv za poslední %d dny: %d."
 msgstr[2] "Zašifrováno zpráv za posledních %d dnů: %d."
 
-#: g10/tofu.c:1868
+#: g10/tofu.c:1870
 #, c-format
 msgid "Messages verified over the past %d month: %d."
 msgid_plural "Messages verified over the past %d months: %d."
@@ -7694,7 +7709,7 @@ msgstr[0] "Ověřeno zpráv za poslední %d měsíc: %d."
 msgstr[1] "Ověřeno zpráv za poslední %d měsíce: %d."
 msgstr[2] "Ověřeno zpráv za posledních %d měsíců: %d."
 
-#: g10/tofu.c:1874
+#: g10/tofu.c:1876
 #, c-format
 msgid "Messages encrypted over the past %d month: %d."
 msgid_plural "Messages encrypted over the past %d months: %d."
@@ -7702,7 +7717,7 @@ msgstr[0] "Zašifrováno zpráv za poslední %d měsíc: %d."
 msgstr[1] "Zašifrováno zpráv za poslední %d měsíce: %d."
 msgstr[2] "Zašifrováno zpráv za posledních %d měsíců: %d."
 
-#: g10/tofu.c:1884
+#: g10/tofu.c:1886
 #, c-format
 msgid "Messages verified over the past %d year: %d."
 msgid_plural "Messages verified over the past %d years: %d."
@@ -7710,7 +7725,7 @@ msgstr[0] "Zpráv ověřeno za poslední %d rok: %d."
 msgstr[1] "Zpráv ověřeno za poslední %d roky: %d."
 msgstr[2] "Zpráv ověřeno za posledních %d roků: %d."
 
-#: g10/tofu.c:1890
+#: g10/tofu.c:1892
 #, c-format
 msgid "Messages encrypted over the past %d year: %d."
 msgid_plural "Messages encrypted over the past %d years: %d."
@@ -7718,12 +7733,12 @@ msgstr[0] "Ověřeno zpráv za poslední %d rok: %d."
 msgstr[1] "Ověřeno zpráv za poslední %d roky: %d."
 msgstr[2] "Ověřeno zpráv za posledních %d roků: %d."
 
-#: g10/tofu.c:1898
+#: g10/tofu.c:1900
 #, c-format
 msgid "Messages verified in the past: %d."
 msgstr "Zpráv ověřeno v minulosti: %d."
 
-#: g10/tofu.c:1902
+#: g10/tofu.c:1904
 #, c-format
 msgid "Messages encrypted in the past: %d."
 msgstr "Zpráv zašifrováno v minulosti: %d."
@@ -7731,37 +7746,37 @@ msgstr "Zpráv zašifrováno v minulosti: %d."
 #. TRANSLATORS: Please translate the text found in the source
 #. * file below.  We don't directly internationalize that text so
 #. * that we can tweak it without breaking translations.
-#: g10/tofu.c:1919
+#: g10/tofu.c:1921
 msgid "TOFU detected a binding conflict"
 msgstr "TOFU objevilo konflikt ve vazbÄ›"
 
 #. TRANSLATORS: Two letters (normally the lower and upper case
 #. * version of the hotkey) for each of the five choices.  If
 #. * there is only one choice in your language, repeat it.
-#: g10/tofu.c:1961
+#: g10/tofu.c:1963
 msgid "gGaAuUrRbB"
 msgstr "gGaAuUrRbB"
 
-#: g10/tofu.c:1967
+#: g10/tofu.c:1969
 msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr "(D)obrý, (P)řijmout jednou, (N)eznámý, (O)dmítnout jednou, špa(T)ný? "
 
-#: g10/tofu.c:1975
+#: g10/tofu.c:1978
 msgid "Defaulting to unknown.\n"
 msgstr "Použije se výchozí volba neznámý.\n"
 
-#: g10/tofu.c:2093 g10/tofu.c:2228
+#: g10/tofu.c:2097 g10/tofu.c:2232
 #, c-format
 msgid "TOFU db corruption detected.\n"
 msgstr "Zjištěno poškození databáze TOFU.\n"
 
-#: g10/tofu.c:2829
+#: g10/tofu.c:2833
 #, c-format
 msgid "error changing TOFU policy: %s\n"
 msgstr "chyba při měnění politiky TOFU: %s\n"
 
 # These strings are used as an argument in "Verified 2 signatures in past %s."
-#: g10/tofu.c:2880
+#: g10/tofu.c:2884
 #, c-format
 msgid "%lld~year"
 msgid_plural "%lld~years"
@@ -7769,7 +7784,7 @@ msgstr[0] "%lld~roku"
 msgstr[1] "%lld~roků"
 msgstr[2] "%lld~roků"
 
-#: g10/tofu.c:2885
+#: g10/tofu.c:2889
 #, c-format
 msgid "%lld~month"
 msgid_plural "%lld~months"
@@ -7777,7 +7792,7 @@ msgstr[0] "%lld~měsíce"
 msgstr[1] "%lld~měsíců"
 msgstr[2] "%lld~měsíců"
 
-#: g10/tofu.c:2890
+#: g10/tofu.c:2894
 #, c-format
 msgid "%lld~week"
 msgid_plural "%lld~weeks"
@@ -7785,7 +7800,7 @@ msgstr[0] "%lld~týdne"
 msgstr[1] "%lld~týdnů"
 msgstr[2] "%lld~týdnů"
 
-#: g10/tofu.c:2895
+#: g10/tofu.c:2899
 #, c-format
 msgid "%lld~day"
 msgid_plural "%lld~days"
@@ -7793,7 +7808,7 @@ msgstr[0] "%lld~dne"
 msgstr[1] "%lld~dnů"
 msgstr[2] "%lld~dnů"
 
-#: g10/tofu.c:2900
+#: g10/tofu.c:2904
 #, c-format
 msgid "%lld~hour"
 msgid_plural "%lld~hours"
@@ -7801,7 +7816,7 @@ msgstr[0] "%lld~hodiny"
 msgstr[1] "%lld~hodin"
 msgstr[2] "%lld~hodin"
 
-#: g10/tofu.c:2905
+#: g10/tofu.c:2909
 #, c-format
 msgid "%lld~minute"
 msgid_plural "%lld~minutes"
@@ -7809,7 +7824,7 @@ msgstr[0] "%lld~minuty"
 msgstr[1] "%lld~minut"
 msgstr[2] "%lld~minut"
 
-#: g10/tofu.c:2907
+#: g10/tofu.c:2911
 #, c-format
 msgid "%lld~second"
 msgid_plural "%lld~seconds"
@@ -7817,26 +7832,26 @@ msgstr[0] "%lld~sekundy"
 msgstr[1] "%lld~sekund"
 msgstr[2] "%lld~sekund"
 
-#: g10/tofu.c:3145
+#: g10/tofu.c:3149
 #, c-format
 msgid "%s: Verified 0~signatures and encrypted 0~messages."
 msgstr "%s: Ověřeno 0~podpisů a zašifrováno 0~zpráv."
 
-#: g10/tofu.c:3151
+#: g10/tofu.c:3155
 #, c-format
 msgid "%s: Verified 0 signatures."
 msgstr "%s: Ověřeno 0 podpisů."
 
-#: g10/tofu.c:3165
+#: g10/tofu.c:3169
 msgid "Encrypted 0 messages."
 msgstr "Zašifrováno 0 zpráv."
 
-#: g10/tofu.c:3181
+#: g10/tofu.c:3185
 #, c-format
 msgid "(policy: %s)"
 msgstr "(politika: %s)"
 
-#: g10/tofu.c:3215
+#: g10/tofu.c:3219
 #, c-format
 msgid ""
 "Warning: we have yet to see a message signed using this key and user id!\n"
@@ -7844,7 +7859,7 @@ msgstr ""
 "Pozor: ještě musíme vidět zprávu podepsanou tímto klí�em a identitou "
 "uživatele!\n"
 
-#: g10/tofu.c:3218
+#: g10/tofu.c:3222
 #, c-format
 msgid ""
 "Warning: we've only seen one message signed using this key and user id!\n"
@@ -7852,17 +7867,17 @@ msgstr ""
 "Pozor: viděli jsme pouze jednu zprávu podepsanou tímto klí�em a identitou\n"
 "uživatele!\n"
 
-#: g10/tofu.c:3222
+#: g10/tofu.c:3226
 #, c-format
 msgid "Warning: you have yet to encrypt a message to this key!\n"
 msgstr "Pozor: ještě je třeba zašifrovat zprávu tímto klí�em!\n"
 
-#: g10/tofu.c:3225
+#: g10/tofu.c:3229
 #, c-format
 msgid "Warning: you have only encrypted one message to this key!\n"
 msgstr "Pozor: tímto klí�em jste zašifrovali pouze jednu zprávu!\n"
 
-#: g10/tofu.c:3254
+#: g10/tofu.c:3258
 #, c-format
 msgid ""
 "Warning: if you think you've seen more signatures by this key and user id, "
@@ -7895,13 +7910,13 @@ msgstr[2] ""
 "  %s\n"
 "k ozna�ení, že je špatný.\n"
 
-#: g10/tofu.c:3339 g10/tofu.c:3502 g10/tofu.c:3708 g10/tofu.c:3761
-#: g10/tofu.c:3902 g10/tofu.c:3979 g10/tofu.c:4017
+#: g10/tofu.c:3343 g10/tofu.c:3506 g10/tofu.c:3712 g10/tofu.c:3765
+#: g10/tofu.c:3906 g10/tofu.c:3983 g10/tofu.c:4021
 #, c-format
 msgid "error opening TOFU database: %s\n"
 msgstr "chyba při otevírání databáze TOFU: %s\n"
 
-#: g10/tofu.c:3535
+#: g10/tofu.c:3539
 #, c-format
 msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
 msgstr ""
@@ -7968,7 +7983,7 @@ msgstr "použití modelu důvěry %s\n"
 msgid "no need for a trustdb check\n"
 msgstr "není nutné kontrolovat databázi důvěry\n"
 
-#: g10/trustdb.c:601 g10/trustdb.c:2272
+#: g10/trustdb.c:601 g10/trustdb.c:2273
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "další kontrola databáze důvěry v %s\n"
@@ -7998,7 +8013,7 @@ msgstr "prosím prove�te --check-trustdb\n"
 msgid "checking the trustdb\n"
 msgstr "kontroluji databázi důvěry\n"
 
-#: g10/trustdb.c:1993
+#: g10/trustdb.c:1994
 #, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
@@ -8006,7 +8021,7 @@ msgstr[0] "zpracován %d klí�"
 msgstr[1] "zpracovány %d klí�e"
 msgstr[2] "zpracováno %d klí�ů"
 
-#: g10/trustdb.c:1996
+#: g10/trustdb.c:1997
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
@@ -8014,17 +8029,17 @@ msgstr[0] " (vymazáno %d po�ítadlo platnosti)\n"
 msgstr[1] " (vymazána %d po�ítadla platnosti)\n"
 msgstr[2] " (vymazáno %d po�ítadel platnosti)\n"
 
-#: g10/trustdb.c:2066
+#: g10/trustdb.c:2067
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "žádný absolutně důvěryhodný klí� nebyl nalezen\n"
 
-#: g10/trustdb.c:2080
+#: g10/trustdb.c:2081
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "veřejný klí� k absolutně důvěryhodnému klí�i %s nebyl nalezen\n"
 
-#: g10/trustdb.c:2198
+#: g10/trustdb.c:2199
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -8032,28 +8047,28 @@ msgstr ""
 "hloubka: %d  platných: %3d  podepsaných: %3d  důvěra: %d-, %dq, %dn, %dm, "
 "%df, %du\n"
 
-#: g10/trustdb.c:2279
+#: g10/trustdb.c:2280
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "nelze aktualizovat záznam v databázi důvěry: chyba při zápisu: %s\n"
 
-#: g10/trust.c:125
+#: g10/trust.c:114
 msgid "undefined"
 msgstr "nedefinována"
 
-#: g10/trust.c:126
+#: g10/trust.c:115
 msgid "never"
 msgstr "žádná"
 
-#: g10/trust.c:127
+#: g10/trust.c:116
 msgid "marginal"
 msgstr "�áste�ná"
 
-#: g10/trust.c:128
+#: g10/trust.c:117
 msgid "full"
 msgstr "plná"
 
-#: g10/trust.c:129
+#: g10/trust.c:118
 msgid "ultimate"
 msgstr "absolutní"
 
@@ -8065,40 +8080,40 @@ msgstr "absolutní"
 #. It gets passed to atoi() so everything after the number is
 #. essentially a comment and need not be translated.  Either key and
 #. uid are both NULL, or neither are NULL.
-#: g10/trust.c:166
+#: g10/trust.c:155
 msgid "10 translator see trust.c:uid_trust_string_fixed"
 msgstr "14 překladateli, podívej se na trustdb.c:uid_trust_string_fixed"
 
-#: g10/trust.c:169
+#: g10/trust.c:158
 msgid "[ revoked]"
 msgstr "[ revokován  ]"
 
 # TODO: use context to distinguish gender
-#: g10/trust.c:171 g10/trust.c:177
+#: g10/trust.c:160 g10/trust.c:166
 msgid "[ expired]"
 msgstr "[ prošlý(á)  ]"
 
-#: g10/trust.c:176
+#: g10/trust.c:165
 msgid "[ unknown]"
 msgstr "[  neznámá   ]"
 
-#: g10/trust.c:178
+#: g10/trust.c:167
 msgid "[  undef ]"
 msgstr "[nedefinovaná]"
 
-#: g10/trust.c:179
+#: g10/trust.c:168
 msgid "[  never ]"
 msgstr "[   nikdy    ]"
 
-#: g10/trust.c:180
+#: g10/trust.c:169
 msgid "[marginal]"
 msgstr "[  �áste�ná  ]"
 
-#: g10/trust.c:181
+#: g10/trust.c:170
 msgid "[  full  ]"
 msgstr "[    plná    ]"
 
-#: g10/trust.c:182
+#: g10/trust.c:171
 msgid "[ultimate]"
 msgstr "[  absolutní ]"
 
@@ -8158,16 +8173,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:4937 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2386
+#: scd/app-piv.c:1770 scd/app-p15.c:5035 scd/app-nks.c:1530
+#: scd/app-openpgp.c:2387
 #, 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:4956 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2402
+#: scd/app-piv.c:1787 scd/app-p15.c:5054 scd/app-nks.c:1549
+#: scd/app-openpgp.c:2403
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr "Zbývá pokusů: %d"
@@ -8208,10 +8223,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:2669
-#: scd/app-openpgp.c:2693 scd/app-openpgp.c:2871 scd/app-openpgp.c:2893
-#: scd/app-openpgp.c:3074 scd/app-openpgp.c:3361 scd/app-openpgp.c:3408
-#: scd/app-openpgp.c:3545 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2670
+#: scd/app-openpgp.c:2694 scd/app-openpgp.c:2872 scd/app-openpgp.c:2894
+#: scd/app-openpgp.c:3075 scd/app-openpgp.c:3362 scd/app-openpgp.c:3409
+#: scd/app-openpgp.c:3547 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "funkce PIN callback skon�ila chybou: %s\n"
@@ -8233,57 +8248,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:3616
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3618
 #, c-format
 msgid "key already exists\n"
 msgstr "klí� již existuje\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3620
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3622
 #, 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:3622
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3624
 #, c-format
 msgid "generating new key\n"
 msgstr "generování nového klí�e\n"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3624
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3626
 #, c-format
 msgid "writing new key\n"
 msgstr "nový klí� se zapisuje\n"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4484 scd/app-openpgp.c:4767
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4486 scd/app-openpgp.c:4761
 #, 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:1615
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1616
 #, 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:1622
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1623
 #, 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:1732
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1733
 #, 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:4943
+#: scd/app-piv.c:3279 scd/app-openpgp.c:4937
 #, 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:4951
+#: scd/app-piv.c:3294 scd/app-openpgp.c:4945
 #, 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:4957
+#: scd/app-piv.c:3300 scd/app-openpgp.c:4951
 #, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
@@ -8291,36 +8306,36 @@ 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:1842 scd/app-openpgp.c:4966
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1843 scd/app-openpgp.c:4960
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr "odpově� neobsahuje veřejný klí�\n"
 
-#: scd/app-p15.c:5035 scd/app-nks.c:2038
+#: scd/app-p15.c:5133 scd/app-nks.c:2038
 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:5038 scd/app-openpgp.c:2818
+#: scd/app-p15.c:5136 scd/app-openpgp.c:2819
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Prosím, zadejte PIN správce"
 
-#: scd/app-p15.c:5040 scd/app-nks.c:2028
+#: scd/app-p15.c:5138 scd/app-nks.c:2028
 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:5043 scd/app-nks.c:2019
+#: scd/app-p15.c:5141 scd/app-nks.c:2019
 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:4321
+#: scd/app-nks.c:1468 scd/app-openpgp.c:4323
 #, 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:4333
+#: scd/app-nks.c:1476 scd/app-openpgp.c:4335
 #, 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"
@@ -8367,27 +8382,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:3442 scd/app-dinsig.c:534
+#: scd/app-nks.c:2221 scd/app-openpgp.c:3443 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:943
+#: scd/app-openpgp.c:944
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "uložení otisku se nezdařilo: %s\n"
 
-#: scd/app-openpgp.c:956
+#: scd/app-openpgp.c:957
 #, 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:1427 scd/app-openpgp.c:3389 scd/app-openpgp.c:5715
+#: scd/app-openpgp.c:1428 scd/app-openpgp.c:3390 scd/app-openpgp.c:5709
 #, 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:1949
+#: scd/app-openpgp.c:1950
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "�tení veřejného klí�e se nezdařilo: %s\n"
@@ -8395,43 +8410,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:2373
+#: scd/app-openpgp.c:2374
 #, 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:2621
+#: scd/app-openpgp.c:2622
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "použije se výchozí PIN jako %s\n"
 
-#: scd/app-openpgp.c:2628
+#: scd/app-openpgp.c:2629
 #, 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:2641
+#: scd/app-openpgp.c:2642
 msgid "||Please unlock the card"
 msgstr "||Prosím, odemkněte kartu"
 
-#: scd/app-openpgp.c:2700 scd/app-openpgp.c:2900 scd/app-openpgp.c:3368
+#: scd/app-openpgp.c:2701 scd/app-openpgp.c:2901 scd/app-openpgp.c:3369
 #, 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:2717 scd/app-openpgp.c:2760 scd/app-openpgp.c:2917
-#: scd/app-openpgp.c:5325
+#: scd/app-openpgp.c:2718 scd/app-openpgp.c:2761 scd/app-openpgp.c:2918
+#: scd/app-openpgp.c:5319
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "ověření CHV%d se nezdařilo: %s\n"
 
-#: scd/app-openpgp.c:2804 scd/app-openpgp.c:5724
+#: scd/app-openpgp.c:2805 scd/app-openpgp.c:5718
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "karta je trvale uzam�ena!\n"
 
-#: scd/app-openpgp.c:2808
+#: scd/app-openpgp.c:2809
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8443,20 +8458,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:2841
+#: scd/app-openpgp.c:2842
 #, 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:3355
+#: scd/app-openpgp.c:3356
 msgid "||Please enter the PIN"
 msgstr "||Prosím vložte PIN"
 
-#: scd/app-openpgp.c:3404
+#: scd/app-openpgp.c:3405
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Prosím, zadejte reseta�ní kód karty"
 
-#: scd/app-openpgp.c:3414 scd/app-openpgp.c:3481
+#: scd/app-openpgp.c:3415 scd/app-openpgp.c:3484
 #, 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"
@@ -8464,78 +8479,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:3437
+#: scd/app-openpgp.c:3438
 msgid "|RN|New Reset Code"
 msgstr "|RN|Nový reseta�ní kód"
 
-#: scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3439
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Nový PIN správce"
 
-#: scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3439
 msgid "|N|New PIN"
 msgstr "|N|Nový PIN"
 
-#: scd/app-openpgp.c:3541
+#: scd/app-openpgp.c:3543
 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:3542
+#: scd/app-openpgp.c:3544
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Prosím, zadejte PIN a nový PIN"
 
-#: scd/app-openpgp.c:3600 scd/app-openpgp.c:5026
+#: scd/app-openpgp.c:3602 scd/app-openpgp.c:5020
 #, c-format
 msgid "error reading application data\n"
 msgstr "chyba při �tení aplika�ních dat\n"
 
-#: scd/app-openpgp.c:3606 scd/app-openpgp.c:5033
+#: scd/app-openpgp.c:3608 scd/app-openpgp.c:5027
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "chyba při �tení otisku DO\n"
 
-#: scd/app-openpgp.c:4302 scd/app-openpgp.c:4657
+#: scd/app-openpgp.c:4304 scd/app-openpgp.c:4653
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "chybí �asové razítko vytvoření\n"
 
-#: scd/app-openpgp.c:4343 scd/app-openpgp.c:4351
+#: scd/app-openpgp.c:4345 scd/app-openpgp.c:4353
 #, 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:4651
+#: scd/app-openpgp.c:4647
 #, c-format
 msgid "unsupported curve\n"
 msgstr "nepodporovaná křivka\n"
 
-#: scd/app-openpgp.c:4991
+#: scd/app-openpgp.c:4985
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "neplatná struktura OpenPGP karty (DO 0x93)\n"
 
-#: scd/app-openpgp.c:5041
+#: scd/app-openpgp.c:5035
 #, 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:5240
+#: scd/app-openpgp.c:5234
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "karta nepodporuje hashovací algoritmus %s\n"
 
-#: scd/app-openpgp.c:5298
+#: scd/app-openpgp.c:5292
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "dosud vytvořené podpisy: %lu\n"
 
-#: scd/app-openpgp.c:5729
+#: scd/app-openpgp.c:5723
 #, 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:6241 scd/app-openpgp.c:6252
+#: scd/app-openpgp.c:6250 scd/app-openpgp.c:6261
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "přístup na %s se nezdařil – vadná OpenPGP karta?\n"
@@ -8555,7 +8570,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:274 dirmngr/dirmngr.c:198
+#: scd/scdaemon.c:136 sm/gpgsm.c:274 dirmngr/dirmngr.c:199
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|ÚROVEŇ|nastaví ladicí úroveň na ÚROVEŇ"
 
@@ -8617,12 +8632,12 @@ 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:2104
+#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2143
 #, 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:2112
+#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2151
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "obsluha pro deskriptor %d ukon�ena\n"
@@ -8632,11 +8647,11 @@ msgstr "obsluha pro deskriptor %d ukon�ena\n"
 msgid "validation model requested by certificate: %s"
 msgstr "certifikátem vyžadovaný ověřovací model: %s"
 
-#: sm/certchain.c:199 sm/certchain.c:2172
+#: sm/certchain.c:199 sm/certchain.c:2174
 msgid "chain"
 msgstr "řetězený"
 
-#: sm/certchain.c:200 sm/certchain.c:2172
+#: sm/certchain.c:200 sm/certchain.c:2174
 msgid "shell"
 msgstr "jednovrstvý"
 
@@ -8669,224 +8684,224 @@ msgstr "Poznámka: nekritické certifika�ní politiky nejsou dovoleny"
 msgid "certificate policy not allowed"
 msgstr "certifika�ní politika není dovolena"
 
-#: sm/certchain.c:595 sm/keydb.c:1891 sm/keydb.c:1980
+#: sm/certchain.c:596 sm/keydb.c:1913 sm/keydb.c:2002
 #, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "otisk se nepodařilo získat\n"
 
-#: sm/certchain.c:624
+#: sm/certchain.c:625
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr "hledám vydavatele na jiném místě\n"
 
-#: sm/certchain.c:644
+#: sm/certchain.c:645
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "po�et odpovídajících vydavatelů: %d\n"
 
-#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#: sm/certchain.c:724 dirmngr/ocsp.c:683
 #, c-format
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "authorityInfoAccess nelze získat: %s\n"
 
-#: sm/certchain.c:791
+#: sm/certchain.c:792
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr "hledám vydavatele ve vyrovnávací paměti Dirmngr\n"
 
-#: sm/certchain.c:816
+#: sm/certchain.c:817
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "po�et odpovídajících certifikátů: %d\n"
 
-#: sm/certchain.c:819
+#: sm/certchain.c:820
 #, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "hledání klí�e pouze ve vyrovnávací paměti dirmngr neuspělo: %s\n"
 
-#: sm/certchain.c:1046 sm/certchain.c:1561 sm/certchain.c:2200 sm/decrypt.c:643
-#: sm/encrypt.c:620 sm/import.c:414 sm/keydb.c:1898 sm/keydb.c:1987
-#: sm/sign.c:428 sm/verify.c:117
+#: sm/certchain.c:1047 sm/certchain.c:1562 sm/certchain.c:2202
+#: sm/decrypt.c:1084 sm/encrypt.c:621 sm/import.c:414 sm/keydb.c:1920
+#: sm/keydb.c:2009 sm/sign.c:428 sm/verify.c:117
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "alokace popisova�e keyDB se nezdařila\n"
 
-#: sm/certchain.c:1232
+#: sm/certchain.c:1233
 msgid "certificate has been revoked"
 msgstr "certifikát byl odvolán"
 
-#: sm/certchain.c:1247
+#: sm/certchain.c:1248
 msgid "the status of the certificate is unknown"
 msgstr "status certifikáty není znám"
 
-#: sm/certchain.c:1254
+#: sm/certchain.c:1255
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr "prosím, ujistěte se, že „dirmngr“ je správně nainstalován\n"
 
-#: sm/certchain.c:1260
+#: sm/certchain.c:1261
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "kontrola CRL se nezdařila: %s"
 
-#: sm/certchain.c:1289 sm/certchain.c:1357 dirmngr/validate.c:497
+#: sm/certchain.c:1290 sm/certchain.c:1358 dirmngr/validate.c:497
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "certifikát s chybnou platností: %s"
 
-#: sm/certchain.c:1304 sm/certchain.c:1389 dirmngr/validate.c:515
+#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:515
 #, c-format
 msgid "certificate not yet valid"
 msgstr "certifikát ještě nenabyl platnosti"
 
-#: sm/certchain.c:1305 sm/certchain.c:1390
+#: sm/certchain.c:1306 sm/certchain.c:1391
 msgid "root certificate not yet valid"
 msgstr "kořenový certifikát ještě neza�al platit"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1307 sm/certchain.c:1392
 msgid "intermediate certificate not yet valid"
 msgstr "mezilehlý certifikát ještě neza�al platit"
 
-#: sm/certchain.c:1319 dirmngr/validate.c:526
+#: sm/certchain.c:1320 dirmngr/validate.c:526
 #, c-format
 msgid "certificate has expired"
 msgstr "certifikátu vypršela platnost"
 
-#: sm/certchain.c:1320
+#: sm/certchain.c:1321
 msgid "root certificate has expired"
 msgstr "kořenový certifikát je prošlý"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1322
 msgid "intermediate certificate has expired"
 msgstr "mezilehlý certifikát je prošlý"
 
-#: sm/certchain.c:1363
+#: sm/certchain.c:1364
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr "chybí povinné atributy certifikátu: %s%s%s"
 
-#: sm/certchain.c:1372
+#: sm/certchain.c:1373
 msgid "certificate with invalid validity"
 msgstr "certifikát s neplatnou platností"
 
-#: sm/certchain.c:1409
+#: sm/certchain.c:1410
 msgid "signature not created during lifetime of certificate"
 msgstr "podpis nebyl vytvořen v době životnosti certifikátu"
 
-#: sm/certchain.c:1411
+#: sm/certchain.c:1412
 msgid "certificate not created during lifetime of issuer"
 msgstr "certifikát nebyl vytvořen v době životnosti vydavatele"
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1413
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr "mezilehlý certifikát nebyl vytvořen v době životnosti vydavatele"
 
-#: sm/certchain.c:1416
+#: sm/certchain.c:1417
 #, c-format
 msgid "  (  signature created at "
 msgstr "  (       podpis vytvořen "
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1418
 #, c-format
 msgid "  (certificate created at "
 msgstr "  (   certifikát vytvořen "
 
-#: sm/certchain.c:1420
+#: sm/certchain.c:1421
 #, c-format
 msgid "  (certificate valid from "
 msgstr "  (   certifikát planý od "
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1422
 #, c-format
 msgid "  (     issuer valid from "
 msgstr "  (   vydavatel platný od "
 
-#: sm/certchain.c:1451 dirmngr/validate.c:577
+#: sm/certchain.c:1452 dirmngr/validate.c:577
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "otisk=%s\n"
 
-#: sm/certchain.c:1460
+#: sm/certchain.c:1461
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr "kořenový certifikát byl nyní ozna�en za důvěryhodný\n"
 
-#: sm/certchain.c:1473
+#: sm/certchain.c:1474
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr "v gpg-agentu není povoleno interaktivní ozna�ování za důvěryhodný\n"
 
-#: sm/certchain.c:1479
+#: sm/certchain.c:1480
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr "interaktivní ozna�ovaní jako důvěryhodný je pro tuto relaci zakázáno\n"
 
-#: sm/certchain.c:1538
+#: sm/certchain.c:1539
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr "VAROV�N�: datum vytvoření podpisu není známo – předpokládám sou�asnost"
 
-#: sm/certchain.c:1602
+#: sm/certchain.c:1603
 msgid "no issuer found in certificate"
 msgstr "v certifikátu nebyl nalezen vydavatel"
 
-#: sm/certchain.c:1680
+#: sm/certchain.c:1681
 msgid "self-signed certificate has a BAD signature"
 msgstr "certifikát podepsaný sám sebou má ŠPATN� podpis"
 
-#: sm/certchain.c:1749 dirmngr/validate.c:575
+#: sm/certchain.c:1750 dirmngr/validate.c:575
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "kořenový certifikát není ozna�en jako důvěryhodný"
 
-#: sm/certchain.c:1765
+#: sm/certchain.c:1766
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "kontrola seznamu důvěry se nepodařila: %s\n"
 
-#: sm/certchain.c:1796 sm/import.c:175 dirmngr/validate.c:630
+#: sm/certchain.c:1797 sm/import.c:175 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "řetěz certifikátů je příliš dlouhý\n"
 
-#: sm/certchain.c:1808 dirmngr/validate.c:642
+#: sm/certchain.c:1809 dirmngr/validate.c:642
 #, c-format
 msgid "issuer certificate not found"
 msgstr "certifikát vydavatele nebyl nalezen"
 
-#: sm/certchain.c:1842 dirmngr/validate.c:668
+#: sm/certchain.c:1844 dirmngr/validate.c:668
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr "certifikát má ŠPATN� podpis"
 
-#: sm/certchain.c:1874 dirmngr/validate.c:692
+#: sm/certchain.c:1876 dirmngr/validate.c:692
 msgid "found another possible matching CA certificate - trying again"
 msgstr "nalezen jiný možný odpovídající certifikát autority – zkusí se znovu"
 
-#: sm/certchain.c:1933 dirmngr/validate.c:717
+#: sm/certchain.c:1935 dirmngr/validate.c:717
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "řetěz certifikátů je delší než dovoluje CA (%d)"
 
-#: sm/certchain.c:1975 sm/certchain.c:2275 dirmngr/validate.c:747
+#: sm/certchain.c:1977 sm/certchain.c:2278 dirmngr/validate.c:747
 #, c-format
 msgid "certificate is good\n"
 msgstr "certifikát je v pořádku\n"
 
-#: sm/certchain.c:1976
+#: sm/certchain.c:1978
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "mezilehlý certifikát je v pořádku\n"
 
-#: sm/certchain.c:1977
+#: sm/certchain.c:1979
 #, c-format
 msgid "root certificate is good\n"
 msgstr "kořenový certifikát je v pořádku\n"
 
-#: sm/certchain.c:2159
+#: sm/certchain.c:2161
 msgid "switching to chain model"
 msgstr "přepínám do řetězeného modelu"
 
-#: sm/certchain.c:2168
+#: sm/certchain.c:2170
 #, c-format
 msgid "validation model used: %s"
 msgstr "použit ověřovací model: %s"
@@ -8898,13 +8913,13 @@ 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:1372 dirmngr/validate.c:903
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1411 dirmngr/validate.c:903
 #: dirmngr/validate.c:927
 #, c-format
 msgid "out of core\n"
 msgstr "nedostatek paměti\n"
 
-#: sm/certcheck.c:389 sm/verify.c:212
+#: sm/certcheck.c:388 sm/verify.c:212
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(toto je algoritmus MD2)\n"
@@ -8913,7 +8928,7 @@ msgstr "(toto je algoritmus MD2)\n"
 # none serial, none date
 # #-#-#-#-#  cs.po (dirmngr 1.0.3)  #-#-#-#-#
 # status
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:793
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:794
 msgid "none"
 msgstr "žádný"
 
@@ -9203,19 +9218,19 @@ msgstr "Hotovo. Nyní byste měli tuto žádost poslat svojí CA.\n"
 msgid "resource problem: out of core\n"
 msgstr "problém se zdroji: nedostatek paměti\n"
 
-#: sm/decrypt.c:719
+#: sm/decrypt.c:1159
 #, c-format
 msgid "(this is the RC2 algorithm)\n"
 msgstr "(toto je algoritmus RC2)\n"
 
-#: sm/decrypt.c:721
+#: sm/decrypt.c:1161
 #, c-format
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr "(toto nevypadá jako zašifrovaná zpráva)\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
 # [kw]
-#: sm/decrypt.c:868
+#: sm/decrypt.c:1318
 #, fuzzy, c-format
 #| msgid "encrypted with %s key, ID %s\n"
 msgid "encrypted to %s key %s\n"
@@ -9226,7 +9241,7 @@ msgstr "zašifrováno %s klí�em, ID %s\n"
 msgid "certificate '%s' not found: %s\n"
 msgstr "certifikát „%s“ nebyl nenalezen: %s\n"
 
-#: sm/delete.c:120 sm/keydb.c:1999 sm/keydb.c:2098
+#: sm/delete.c:120 sm/keydb.c:2021 sm/keydb.c:2120
 #, c-format
 msgid "error locking keybox: %s\n"
 msgstr "chyba při zamykání schránky na klí�e: %s\n"
@@ -9246,7 +9261,7 @@ msgstr "certifikát „%s“ smazán\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "smazání certifikátu „%s“ se nezdařilo: %s\n"
 
-#: sm/encrypt.c:606
+#: sm/encrypt.c:607
 #, c-format
 msgid "no valid recipients given\n"
 msgstr "(nebyli zadáni Žádní platní příjemci)\n"
@@ -9315,63 +9330,63 @@ msgstr "|ID_UŽIVATELE|použít ID_UŽIVATELE jako implicitní tajný klí�"
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|SOUBOR|přidat klí�enku na seznam klí�enek"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:352 dirmngr/dirmngr.c:265
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|SPEC|použít tento server pro dohledávání klí�ů"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:363
 msgid "fetch missing issuer certificates"
 msgstr "stahovat chybějící certifikáty vydavatelů"
 
-#: sm/gpgsm.c:364
+#: sm/gpgsm.c:365
 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:385
+#: sm/gpgsm.c:386
 msgid "never consult a CRL"
 msgstr "nikdy nenahlížet do CRL"
 
-#: sm/gpgsm.c:389
+#: sm/gpgsm.c:390
 msgid "do not check CRLs for root certificates"
 msgstr "neprověřovat kořenové certifikáty proti CRL"
 
-#: sm/gpgsm.c:393
+#: sm/gpgsm.c:394
 msgid "check validity using OCSP"
 msgstr "kontrolovat platnost pomocí OCSP"
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:396
 msgid "do not check certificate policies"
 msgstr "nekontrolovat politiky certifikátu"
 
-#: sm/gpgsm.c:398
+#: sm/gpgsm.c:399
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|N�ZEV|použít šifrovací algoritmus N�ZEV"
 
-#: sm/gpgsm.c:400
+#: sm/gpgsm.c:401
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|N�ZEV|použít hashovací algoritmus N�ZEV"
 
-#: sm/gpgsm.c:410
+#: sm/gpgsm.c:411
 msgid "batch mode: never ask"
 msgstr "dávkový režim: nikdy se neptat"
 
-#: sm/gpgsm.c:412
+#: sm/gpgsm.c:413
 msgid "assume yes on most questions"
 msgstr "předpokládat ano na většinu otázek"
 
-#: sm/gpgsm.c:413
+#: sm/gpgsm.c:414
 msgid "assume no on most questions"
 msgstr "předpokládat ne na většinu otázek"
 
-#: sm/gpgsm.c:430
+#: sm/gpgsm.c:431
 msgid "|FILE|write an audit log to FILE"
 msgstr "|SOUBOR|zapisovat auditní protokol do SOUBORU"
 
-#: sm/gpgsm.c:615
+#: sm/gpgsm.c:616
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Použití: @GPGSM@ [možnosti] [soubory] (-h pro pomoc)"
 
-#: sm/gpgsm.c:618
+#: sm/gpgsm.c:619
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -9381,52 +9396,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:826
+#: sm/gpgsm.c:827
 #, 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:837
+#: sm/gpgsm.c:838
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "neznámý model ověřování „%s“\n"
 
-#: sm/gpgsm.c:896 dirmngr/ldapserver.c:89
-#, c-format
-msgid "%s:%u: no hostname given\n"
-msgstr "%s:%u: nebyl zadán název stroje\n"
-
-#: sm/gpgsm.c:915 dirmngr/ldapserver.c:108
-#, c-format
-msgid "%s:%u: password given without user\n"
-msgstr "%s:%u: zadáno heslo bez uživatele\n"
-
-#: sm/gpgsm.c:946 dirmngr/ldapserver.c:139
-#, c-format
-msgid "%s:%u: ignoring unknown flag '%s'\n"
-msgstr ""
-
-#: sm/gpgsm.c:962 dirmngr/ldapserver.c:155
-#, c-format
-msgid "%s:%u: skipping this line\n"
-msgstr "%s:%u: přeskakuji tento řádek\n"
-
-#: sm/gpgsm.c:1550
-#, c-format
-msgid "could not parse keyserver\n"
-msgstr "nelze rozebrat serveru klí�ů\n"
-
-#: sm/gpgsm.c:1858
+#: sm/gpgsm.c:1711
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "importují se běžné certifikáty „%s“\n"
 
-#: sm/gpgsm.c:1904
+#: sm/gpgsm.c:1757
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "nelze podepsat pomocí „%s“: %s\n"
 
-#: sm/gpgsm.c:2273
+#: sm/gpgsm.c:2129
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "neplatný příkaz (neexistuje žádný implicitní příkaz)\n"
@@ -9446,53 +9436,53 @@ msgstr "chyba při ukládání certifikátu\n"
 msgid "basic certificate checks failed - not imported\n"
 msgstr "základní kontrola certifikátu selhala – neimportováno\n"
 
-#: sm/import.c:471 sm/keydb.c:2018 sm/keydb.c:2111
+#: sm/import.c:472 sm/keydb.c:2040 sm/keydb.c:2133
 #, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "chyba při získání uložených příznaků: %s\n"
 
-#: sm/import.c:530 sm/import.c:562
+#: sm/import.c:531 sm/import.c:563
 #, c-format
 msgid "error importing certificate: %s\n"
 msgstr "chyba při importování certifikátu: %s\n"
 
-#: sm/import.c:751 tools/gpg-connect-agent.c:1475
+#: sm/import.c:752 tools/gpg-connect-agent.c:1475
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "chyba při �tení vstupu: %s\n"
 
-#: sm/keydb.c:503
+#: sm/keydb.c:508
 #, fuzzy, c-format
 #| msgid "no dirmngr running in this session\n"
 msgid "no keyboxd running in this session\n"
 msgstr "v této relaci neběží žádný dirmngr\n"
 
-#: sm/keydb.c:595
+#: sm/keydb.c:600
 #, c-format
 msgid "error opening key DB: %s\n"
 msgstr "chyba při otevírání databáze klí�ů: %s\n"
 
-#: sm/keydb.c:1936
+#: sm/keydb.c:1958
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr "problém při hledání existujícího certifikátu: %s\n"
 
-#: sm/keydb.c:1948
+#: sm/keydb.c:1970
 #, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "chyba při hledání zapisovatelné keyDB: %s\n"
 
-#: sm/keydb.c:1956
+#: sm/keydb.c:1978
 #, c-format
 msgid "error storing certificate: %s\n"
 msgstr "chyba při ukládání certifikátu: %s\n"
 
-#: sm/keydb.c:2009
+#: sm/keydb.c:2031
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "problém při opakovaném hledání certifikátu: %s\n"
 
-#: sm/keydb.c:2030 sm/keydb.c:2122
+#: sm/keydb.c:2052 sm/keydb.c:2144
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr "chyba při ukládání příznaků: %s\n"
@@ -9679,59 +9669,59 @@ msgid "error loading certificate '%s': %s\n"
 msgstr "chyba při zavádění certifikátu „%s“: %s\n"
 
 # XXX: Align with msgid "runtime cached certificates:"
-#: dirmngr/certcache.c:819
+#: dirmngr/certcache.c:820
 #, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "     trvale zavedených certifikátů: %u\n"
 
 # XXX: Align with msgid "permanently loaded certificates:"
-#: dirmngr/certcache.c:821
+#: dirmngr/certcache.c:822
 #, c-format
 msgid "    runtime cached certificates: %u\n"
 msgstr "za běhu zapamatovaných certifikátů: %u\n"
 
 # XXX: Align with msgid "permanently loaded certificates:"
-#: dirmngr/certcache.c:823
+#: dirmngr/certcache.c:824
 #, c-format
 msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "         důvěryhodných certifikátů: %u (%u,%u,%u,%u)\n"
 
-#: dirmngr/certcache.c:851 dirmngr/dirmngr-client.c:392
+#: dirmngr/certcache.c:852 dirmngr/dirmngr-client.c:392
 #, c-format
 msgid "certificate already cached\n"
 msgstr "certifikát již v keši\n"
 
-#: dirmngr/certcache.c:853
+#: dirmngr/certcache.c:854
 #, c-format
 msgid "certificate cached\n"
 msgstr "certifikát uložen do keše\n"
 
-#: dirmngr/certcache.c:855 dirmngr/certcache.c:875 dirmngr/dirmngr-client.c:396
+#: dirmngr/certcache.c:856 dirmngr/certcache.c:876 dirmngr/dirmngr-client.c:396
 #, c-format
 msgid "error caching certificate: %s\n"
 msgstr "chyba při ukládání certifikátu do keše: %s\n"
 
-#: dirmngr/certcache.c:938
+#: dirmngr/certcache.c:939
 #, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "neplatný řetězec otisku SHA1 „%s“\n"
 
-#: dirmngr/certcache.c:1384 dirmngr/certcache.c:1393
+#: dirmngr/certcache.c:1385 dirmngr/certcache.c:1394
 #, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "chyba při stahování certifikátu ur�eného sériovým �íslem: %s\n"
 
-#: dirmngr/certcache.c:1579 dirmngr/certcache.c:1588
+#: dirmngr/certcache.c:1580 dirmngr/certcache.c:1589
 #, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "chyba při stahovaní certifikátu ur�eného subjektem: %s\n"
 
-#: dirmngr/certcache.c:1694 dirmngr/validate.c:483
+#: dirmngr/certcache.c:1695 dirmngr/validate.c:483
 #, c-format
 msgid "no issuer found in certificate\n"
 msgstr "v certifikátu nebyl nalezen vydavatel\n"
 
-#: dirmngr/certcache.c:1704
+#: dirmngr/certcache.c:1705
 #, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "chyba při zjišťování authorityKeyIdentifier: %s\n"
@@ -9766,7 +9756,7 @@ msgstr "odstraňuje se soubor keše „%s“\n"
 msgid "not removing file '%s'\n"
 msgstr "soubor „%s“ nebude neodstraněn\n"
 
-#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2380
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2383
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr "chyba při zavírání souboru keše: %s\n"
@@ -10007,13 +9997,13 @@ msgid "error getting data from cache file: %s\n"
 msgstr "chyba při získávání dat ze souboru keše: %s\n"
 
 #: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1672 dirmngr/crlcache.c:1697
-#: dirmngr/crlcache.c:1763
+#: dirmngr/crlcache.c:1766
 #, c-format
 msgid "got an invalid S-expression from libksba\n"
 msgstr "z libksba obdržen neplatný S-výraz\n"
 
 #: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1679 dirmngr/crlcache.c:1705
-#: dirmngr/crlcache.c:1770 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1773 dirmngr/misc.c:176
 #, c-format
 msgid "converting S-expression failed: %s\n"
 msgstr "převod S-výrazu se nezdařil: %s\n"
@@ -10028,134 +10018,134 @@ msgstr "neznámý hašovací algoritmus „%s“\n"
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr "gcry_md_open selhalo na algoritmu %d: %s\n"
 
-#: dirmngr/crlcache.c:1797 dirmngr/ocsp.c:478
+#: dirmngr/crlcache.c:1800 dirmngr/ocsp.c:478
 #, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "výroba S-výrazu selhala: %s\n"
 
-#: dirmngr/crlcache.c:1871
+#: dirmngr/crlcache.c:1874
 #, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "ksba_crl_parse selhal: %s\n"
 
-#: dirmngr/crlcache.c:1886
+#: dirmngr/crlcache.c:1889
 #, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "chyba při zjišťování �asů aktualizace CRL %s\n"
 
-#: dirmngr/crlcache.c:1893
+#: dirmngr/crlcache.c:1896
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr "�asy aktualizace tohoto CRL: tento=%s příští=%s\n"
 
-#: dirmngr/crlcache.c:1897
+#: dirmngr/crlcache.c:1900
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr "nextUpdate neuvedeno, předpokládaná perioda platnosti bude jeden den\n"
 
-#: dirmngr/crlcache.c:1917
+#: dirmngr/crlcache.c:1920
 #, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "chyba při získávání položky CRL: %s\n"
 
-#: dirmngr/crlcache.c:1932
+#: dirmngr/crlcache.c:1935
 #, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "chyba vkládání položky do do�asného souboru keše: %s\n"
 
-#: dirmngr/crlcache.c:1959
+#: dirmngr/crlcache.c:1962
 #, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "v CRL nebyl nalezen žádný vydavatel CRL: %s\n"
 
-#: dirmngr/crlcache.c:1974
+#: dirmngr/crlcache.c:1977
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr "certifikát vydavatele CRL bude hledán podle authorityKeyIdentifier\n"
 
-#: dirmngr/crlcache.c:2020
+#: dirmngr/crlcache.c:2023
 #, c-format
 msgid "CRL signature verification failed: %s\n"
 msgstr "ověřování podpisu CRL selhalo: %s\n"
 
-#: dirmngr/crlcache.c:2032
+#: dirmngr/crlcache.c:2035
 #, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "chyba při kontrole platnosti certifikátu vydavatele CRL: %s\n"
 
-#: dirmngr/crlcache.c:2174
+#: dirmngr/crlcache.c:2177
 #, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "volání ksba_crl_new selhalo: %s\n"
 
-#: dirmngr/crlcache.c:2181
+#: dirmngr/crlcache.c:2184
 #, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "volání ksba_crl_set_reader selhalo: %s\n"
 
-#: dirmngr/crlcache.c:2215
+#: dirmngr/crlcache.c:2218
 #, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "odstraněn zastaralý do�asný soubor keše „%s“\n"
 
-#: dirmngr/crlcache.c:2219
+#: dirmngr/crlcache.c:2222
 #, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "problém s odstraňováním zastaralého do�asného souboru keše „%s“: %s\n"
 
-#: dirmngr/crlcache.c:2229
+#: dirmngr/crlcache.c:2232
 #, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "chyba při vytváření do�asného souboru keše „%s“: %s\n"
 
-#: dirmngr/crlcache.c:2239
+#: dirmngr/crlcache.c:2242
 #, c-format
 msgid "crl_parse_insert failed: %s\n"
 msgstr "volání crl_parse_insert selhalo: %s\n"
 
-#: dirmngr/crlcache.c:2249
+#: dirmngr/crlcache.c:2252
 #, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "chyba při dokon�ování do�asného souboru keše „%s“: %s\n"
 
-#: dirmngr/crlcache.c:2256
+#: dirmngr/crlcache.c:2259
 #, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "chyba při uzavírání do�asného souboru keše „%s“: %s\n"
 
-#: dirmngr/crlcache.c:2281
+#: dirmngr/crlcache.c:2284
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 "POZOR: nový CRL je stále příliš starý; jeho platnost vypršela %s – stejně "
 "bude nahrán\n"
 
-#: dirmngr/crlcache.c:2285
+#: dirmngr/crlcache.c:2288
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr "nový CRL je stále příliš starý; jeho platnost vypršela %s\n"
 
-#: dirmngr/crlcache.c:2301
+#: dirmngr/crlcache.c:2304
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr "neznámé kritické rozšíření CRL %s\n"
 
-#: dirmngr/crlcache.c:2311
+#: dirmngr/crlcache.c:2314
 #, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "chyba při �tení rozšíření CRL: %s\n"
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2365
 #, c-format
 msgid "creating cache file '%s'\n"
 msgstr "vytváří se soubor keše „%s“\n"
 
-#: dirmngr/crlcache.c:2394
+#: dirmngr/crlcache.c:2397
 #, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "problém s přejmenováním „%s“ na „%s“: %s\n"
 
-#: dirmngr/crlcache.c:2408
+#: dirmngr/crlcache.c:2411
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
@@ -10164,66 +10154,66 @@ msgstr ""
 "aktualizace souboru DIR selhalo – záznam keše bude při příštím startu "
 "programu ztracen\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2448
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr "Zahajuje se výpis CRL (získán přes %s)\n"
 
-#: dirmngr/crlcache.c:2468
+#: dirmngr/crlcache.c:2471
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 msgstr ""
 " CHYBA: CRL nebude použit, protože i po aktualizaci byl příliš starý!\n"
 
-#: dirmngr/crlcache.c:2471
+#: dirmngr/crlcache.c:2474
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr " CHYBA: CRL nebude použit kvůli neznámému kritickému rozšíření!\n"
 
-#: dirmngr/crlcache.c:2474
+#: dirmngr/crlcache.c:2477
 msgid " ERROR: The CRL will not be used\n"
 msgstr " CHYBA: CRL nebude použit\n"
 
-#: dirmngr/crlcache.c:2481
+#: dirmngr/crlcache.c:2484
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr " CHYBA: Tento zapamatovaný CRL byl možná pozměněn!\n"
 
-#: dirmngr/crlcache.c:2499
+#: dirmngr/crlcache.c:2502
 #, c-format
 msgid " WARNING: invalid cache record length\n"
 msgstr " POZOR: neplatná délka záznamu keše\n"
 
-#: dirmngr/crlcache.c:2506
+#: dirmngr/crlcache.c:2509
 #, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "problém se �tením záznamu keše: %s\n"
 
-#: dirmngr/crlcache.c:2517
+#: dirmngr/crlcache.c:2520
 #, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "problém se �tením klí�e keše: %s\n"
 
-#: dirmngr/crlcache.c:2548
+#: dirmngr/crlcache.c:2551
 #, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "chyba při �tení položky keše z databáze: %s\n"
 
-#: dirmngr/crlcache.c:2551
+#: dirmngr/crlcache.c:2554
 msgid "End CRL dump\n"
 msgstr "Konec výpisu CRL\n"
 
-#: dirmngr/crlcache.c:2672
+#: dirmngr/crlcache.c:2675
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "volání crl_fetch přes DP selhalo: %s\n"
 
-#: dirmngr/crlcache.c:2683
+#: dirmngr/crlcache.c:2686
 #, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "volání crl_cache_insert přes DP selhalo: %s\n"
 
-#: dirmngr/crlcache.c:2743
+#: dirmngr/crlcache.c:2746
 #, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "volání crl_cache_insert přes vydavatele selhalo: %s\n"
@@ -10245,7 +10235,7 @@ msgstr "Přístup k CRL není možný kvůli vypnutému %s\n"
 msgid "error retrieving '%s': %s\n"
 msgstr "chyba při získávání „%s“: %s\n"
 
-#: dirmngr/crlfetch.c:218 dirmngr/ldap-wrapper.c:881 dirmngr/misc.c:573
+#: dirmngr/crlfetch.c:218 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
 #, c-format
 msgid "error initializing reader object: %s\n"
 msgstr "chyba při inicializaci �tecího objektu: %s\n"
@@ -10402,131 +10392,131 @@ msgstr "o�ekáván absolutní název souboru\n"
 msgid "looking up '%s'\n"
 msgstr "hledá se „%s“\n"
 
-#: dirmngr/dirmngr.c:175
+#: dirmngr/dirmngr.c:176
 msgid "list the contents of the CRL cache"
 msgstr "vypíše obsah CRL keše"
 
-#: dirmngr/dirmngr.c:176
+#: dirmngr/dirmngr.c:177
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|SOUBOR|zavede CRL ze SOUBORU do keše"
 
-#: dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr.c:178
 msgid "|URL|fetch a CRL from URL"
 msgstr "|URL|stáhne CRL z URL"
 
-#: dirmngr/dirmngr.c:178
+#: dirmngr/dirmngr.c:179
 msgid "shutdown the dirmngr"
 msgstr "vypne dirmngr"
 
-#: dirmngr/dirmngr.c:179
+#: dirmngr/dirmngr.c:180
 msgid "flush the cache"
 msgstr "vyprázdní keš"
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:213
 msgid "allow online software version check"
 msgstr "povolí kontrolu verze softwaru po síti"
 
-#: dirmngr/dirmngr.c:215
+#: dirmngr/dirmngr.c:216
 msgid "|N|do not return more than N items in one query"
 msgstr "|N|nevrací více jak N položek na jeden dotaz"
 
-#: dirmngr/dirmngr.c:221
+#: dirmngr/dirmngr.c:222
 msgid "Network related options"
 msgstr ""
 
-#: dirmngr/dirmngr.c:223
+#: dirmngr/dirmngr.c:224
 msgid "route all network traffic via Tor"
 msgstr "směrovat veškerý síťový provoz skrz Tor"
 
-#: dirmngr/dirmngr.c:235
+#: dirmngr/dirmngr.c:236
 msgid "Configuration for Keyservers"
 msgstr "Nastavení serverů klí�ů"
 
-#: dirmngr/dirmngr.c:238
+#: dirmngr/dirmngr.c:239
 msgid "|URL|use keyserver at URL"
 msgstr "|URL|používat server klí�ů na URL"
 
-#: dirmngr/dirmngr.c:240
+#: dirmngr/dirmngr.c:241
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr "|SOUBOR|pro HKP přes TLS použije certifikáty CA ze SOUBORU"
 
-#: dirmngr/dirmngr.c:242
+#: dirmngr/dirmngr.c:243
 msgid "Configuration for HTTP servers"
 msgstr "Nastavení HTTP serverů"
 
-#: dirmngr/dirmngr.c:244
+#: dirmngr/dirmngr.c:245
 msgid "inhibit the use of HTTP"
 msgstr "zakáže použití HTTP"
 
-#: dirmngr/dirmngr.c:246
+#: dirmngr/dirmngr.c:247
 msgid "ignore HTTP CRL distribution points"
 msgstr "ignoruje HTTP distribu�ní místa CRL "
 
-#: dirmngr/dirmngr.c:248
+#: dirmngr/dirmngr.c:249
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr "|URL|všechny HTTP požadavky přesměruje na URL"
 
-#: dirmngr/dirmngr.c:250
+#: dirmngr/dirmngr.c:251
 msgid "use system's HTTP proxy setting"
 msgstr "používat systémové nastavení HTTP proxy"
 
-#: dirmngr/dirmngr.c:254
+#: dirmngr/dirmngr.c:255
 msgid "Configuration of LDAP servers to use"
 msgstr "Nastavení používaných LDAP serverů"
 
-#: dirmngr/dirmngr.c:256
+#: dirmngr/dirmngr.c:257
 msgid "inhibit the use of LDAP"
 msgstr "zakáže použití LDAP"
 
-#: dirmngr/dirmngr.c:258
+#: dirmngr/dirmngr.c:259
 msgid "ignore LDAP CRL distribution points"
 msgstr "ignoruje LDAP distribu�ní místa CRL"
 
-#: dirmngr/dirmngr.c:260
+#: dirmngr/dirmngr.c:261
 msgid "|HOST|use HOST for LDAP queries"
 msgstr "|STROJ|pro LDAP dotazy použije STROJ"
 
-#: dirmngr/dirmngr.c:262
+#: dirmngr/dirmngr.c:263
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr "nepoužije náhradní stroje s --ldap-proxy"
 
-#: dirmngr/dirmngr.c:264
+#: dirmngr/dirmngr.c:267
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|SOUBOR|na�te seznam LDAP serverů ze SOUBORU"
 
-#: dirmngr/dirmngr.c:266
+#: dirmngr/dirmngr.c:269
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr "na seznam serverů přidá nové servery nalezené v místech distribuce CRL"
 
-#: dirmngr/dirmngr.c:269 dirmngr/dirmngr_ldap.c:104
+#: dirmngr/dirmngr.c:272
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|nastaví �asový limit pro LDAP na N sekund"
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:275
 msgid "Configuration for OCSP"
 msgstr "Nastavení OCSP"
 
-#: dirmngr/dirmngr.c:274
+#: dirmngr/dirmngr.c:277
 msgid "allow sending OCSP requests"
 msgstr "povolí odesílání OCSP dotazů"
 
-#: dirmngr/dirmngr.c:276
+#: dirmngr/dirmngr.c:279
 msgid "ignore certificate contained OCSP service URLs"
 msgstr "ignoruje URL služby OCSP uvedené v certifikátu"
 
-#: dirmngr/dirmngr.c:278
+#: dirmngr/dirmngr.c:281
 msgid "|URL|use OCSP responder at URL"
 msgstr "|URL|použije OCSP odpovída�e na URL"
 
-#: dirmngr/dirmngr.c:280
+#: dirmngr/dirmngr.c:283
 msgid "|FPR|OCSP response signed by FPR"
 msgstr "|OTISK|OCSP odpovědi podepsané podle OTISKU"
 
-#: dirmngr/dirmngr.c:288
+#: dirmngr/dirmngr.c:291
 msgid "force loading of outdated CRLs"
 msgstr "vynutí zavedení zastaralých CRL"
 
-#: dirmngr/dirmngr.c:299
+#: dirmngr/dirmngr.c:302
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
@@ -10535,11 +10525,11 @@ msgstr ""
 "@\n"
 "(Úplný seznam příkazů a voleb naleznete v „info“ manuálu.)\n"
 
-#: dirmngr/dirmngr.c:441
+#: dirmngr/dirmngr.c:449
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Použití: @DIRMNGR@ [volby] (-h pro nápovědu)"
 
-#: dirmngr/dirmngr.c:443
+#: dirmngr/dirmngr.c:451
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@ -10547,286 +10537,104 @@ msgstr ""
 "Syntaxe: @DIRMNGR@ [volby] [příkaz [argumenty]]\n"
 "Přístup k serveru s klí�i, CRL a OCSP z @GNUPG@\n"
 
-#: dirmngr/dirmngr.c:523
+#: dirmngr/dirmngr.c:531
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr "platné úrovně ladění jsou: %s\n"
 
-#: dirmngr/dirmngr.c:609 tools/gpgconf.c:667 tools/gpgconf.c:702
-#: tools/gpgconf.c:802
+#: dirmngr/dirmngr.c:617 tools/gpgconf.c:701 tools/gpgconf.c:736
+#: tools/gpgconf.c:836
 #, c-format
 msgid "usage: %s [options] "
 msgstr "použití: %s [volby] "
 
-#: dirmngr/dirmngr.c:1260
+#: dirmngr/dirmngr.c:1299
 #, 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:1495 dirmngr/server.c:1824
+#: dirmngr/dirmngr.c:1534 dirmngr/server.c:1878
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "stahování CRL z „%s“ selhalo: %s\n"
 
-#: dirmngr/dirmngr.c:1501 dirmngr/server.c:1830
+#: dirmngr/dirmngr.c:1540 dirmngr/server.c:1884
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "zpracování CRL z „%s“ selhalo: %s\n"
 
-#: dirmngr/dirmngr.c:1643
+#: dirmngr/dirmngr.c:1682
 #, 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:1698 dirmngr/dirmngr.c:1782
+#: dirmngr/dirmngr.c:1737 dirmngr/dirmngr.c:1821
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: zjištěn neplatný otisk\n"
 
-#: dirmngr/dirmngr.c:1734 dirmngr/dirmngr.c:1760 tools/gpgconf-comp.c:3539
+#: dirmngr/dirmngr.c:1773 dirmngr/dirmngr.c:1799 tools/gpgconf-comp.c:3549
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: chyba �tení: %s\n"
 
-#: dirmngr/dirmngr.c:1789
+#: dirmngr/dirmngr.c:1828
 #, 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:1876
+#: dirmngr/dirmngr.c:1915
 #, 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:1917
+#: dirmngr/dirmngr.c:1956
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "přijat SIGUSR2 – žádná akce nedefinována\n"
 
-#: dirmngr/dirmngr.c:1922
+#: dirmngr/dirmngr.c:1961
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "přijat SIGTERM – vypíná se…\n"
 
 # TODO: plural
-#: dirmngr/dirmngr.c:1924
+#: dirmngr/dirmngr.c:1963
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "přijat SIGTERM – stále aktivních spojení: %d\n"
 
-#: dirmngr/dirmngr.c:1929
+#: dirmngr/dirmngr.c:1968
 #, c-format
 msgid "shutdown forced\n"
 msgstr "vypnutí vynuceno\n"
 
-#: dirmngr/dirmngr.c:1937
+#: dirmngr/dirmngr.c:1976
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "přijat SIGINT – okamžité vypnutí\n"
 
-#: dirmngr/dirmngr.c:1944
+#: dirmngr/dirmngr.c:1983
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "přijat signál �. %d – žádná akce nedefinována\n"
 
-#: dirmngr/dirmngr_ldap.c:105
-msgid "return all values in a record oriented format"
-msgstr "vrátí všechny hodnoty v záznamově orientovaném formátu"
-
-#: dirmngr/dirmngr_ldap.c:108
-msgid "|NAME|ignore host part and connect through NAME"
-msgstr "|N�ZEV|ignoruje �ást se strojem a připojí se skrze N�ZEV"
-
-#: dirmngr/dirmngr_ldap.c:109
-msgid "force a TLS connection"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:110
-msgid "|NAME|connect to host NAME"
-msgstr "|N�ZEV|připojí se ke strojí N�ZEV"
-
-#: dirmngr/dirmngr_ldap.c:111
-msgid "|N|connect to port N"
-msgstr "|N|připojí se na port N"
-
-#: dirmngr/dirmngr_ldap.c:112
-msgid "|NAME|use user NAME for authentication"
-msgstr "|JMÉNO|pro autentizaci použije JMÉNO uživatele"
-
-#: dirmngr/dirmngr_ldap.c:113
-msgid "|PASS|use password PASS for authentication"
-msgstr "|HESLO|pro autentizaci použije HESLO"
-
-#: dirmngr/dirmngr_ldap.c:115
-msgid "take password from $DIRMNGR_LDAP_PASS"
-msgstr "heslo získá z $DIRMNGR_LDAP_PASS"
-
-#: dirmngr/dirmngr_ldap.c:116
-msgid "|STRING|query DN STRING"
-msgstr "|ŘETĚZEC|dotáže se na DN ŘETĚZEC"
-
-#: dirmngr/dirmngr_ldap.c:117
-msgid "|STRING|use STRING as filter expression"
-msgstr "|ŘETĚZEC|jako filtrující výraz použije ŘETĚZEC"
-
-#: dirmngr/dirmngr_ldap.c:118
-msgid "|STRING|return the attribute STRING"
-msgstr "|ŘETĚZEC|vrátí atribut ŘETĚZEC"
-
-#: dirmngr/dirmngr_ldap.c:179
-msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
-msgstr "Použití: dirmngr_ldap [volby] [URL] (-h pro nápovědu)\n"
-
-#: dirmngr/dirmngr_ldap.c:182
-msgid ""
-"Syntax: dirmngr_ldap [options] [URL]\n"
-"Internal LDAP helper for Dirmngr\n"
-"Interface and options may change without notice\n"
-msgstr ""
-"Syntaxe: dirmngr_ldap [volby] [URL]\n"
-"Vnitřní LDAP pomůcka pro pro Dirmngr.\n"
-"Rozhraní a volby se mohou bez upozornění změnit.\n"
-
-#: dirmngr/dirmngr_ldap.c:291
-#, c-format
-msgid "invalid port number %d\n"
-msgstr "neplatné �íslo portu %d\n"
-
-#: dirmngr/dirmngr_ldap.c:400
-#, c-format
-msgid "scanning result for attribute '%s'\n"
-msgstr "ve výsledku se hledá atribut „%s“\n"
-
-#: dirmngr/dirmngr_ldap.c:407 dirmngr/dirmngr_ldap.c:490
-#: dirmngr/dirmngr_ldap.c:514 dirmngr/dirmngr_ldap.c:526
-#: dirmngr/dirmngr_ldap.c:722
-#, c-format
-msgid "error writing to stdout: %s\n"
-msgstr "chyba při zápisu na standardní výstup: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:424
-#, c-format
-msgid "          available attribute '%s'\n"
-msgstr "          dostupný atribut „%s“\n"
-
-#: dirmngr/dirmngr_ldap.c:462
-#, c-format
-msgid "attribute '%s' not found\n"
-msgstr "atribut „%s“ nenalezen\n"
-
-#: dirmngr/dirmngr_ldap.c:469
-#, c-format
-msgid "found attribute '%s'\n"
-msgstr "nalezen atribut „%s“\n"
-
-#: dirmngr/dirmngr_ldap.c:581
-#, c-format
-msgid "processing url '%s'\n"
-msgstr "zpracovává se URL „%s“\n"
-
-#: dirmngr/dirmngr_ldap.c:588
-#, c-format
-msgid "          user '%s'\n"
-msgstr "          uživatel „%s“\n"
-
-#: dirmngr/dirmngr_ldap.c:590
-#, c-format
-msgid "          pass '%s'\n"
-msgstr "          heslo „%s“\n"
-
-#: dirmngr/dirmngr_ldap.c:592
-#, c-format
-msgid "          host '%s'\n"
-msgstr "          stroj „%s“\n"
-
-#: dirmngr/dirmngr_ldap.c:593
-#, c-format
-msgid "          port %d\n"
-msgstr "          port %d\n"
-
-#: dirmngr/dirmngr_ldap.c:595
-#, c-format
-msgid "            DN '%s'\n"
-msgstr "            DN „%s“\n"
-
-#: dirmngr/dirmngr_ldap.c:597
-#, c-format
-msgid "        filter '%s'\n"
-msgstr "        filtr „%s“\n"
-
-#: dirmngr/dirmngr_ldap.c:602 dirmngr/dirmngr_ldap.c:605
-#, c-format
-msgid "          attr '%s'\n"
-msgstr "          atribut „%s“\n"
-
-#: dirmngr/dirmngr_ldap.c:611
-#, c-format
-msgid "no host name in '%s'\n"
-msgstr "v „%s“ chybí název stroje\n"
-
-#: dirmngr/dirmngr_ldap.c:616
-#, c-format
-msgid "no attribute given for query '%s'\n"
-msgstr "u dotazu „%s“ nezadán žádný atribut\n"
-
-#: dirmngr/dirmngr_ldap.c:622
-#, c-format
-msgid "WARNING: using first attribute only\n"
-msgstr "POZOR: použije se pouze první atribut\n"
-
-#: dirmngr/dirmngr_ldap.c:637 dirmngr/dirmngr_ldap.c:678
-#, c-format
-msgid "LDAP init to '%s:%d' failed: %s\n"
-msgstr "Inicializace LDAP u „%s:%d“ selhala: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:659
-#, fuzzy, c-format
-#| msgid "LDAP init to '%s:%d' failed: %s\n"
-msgid "LDAP init to '%s' failed: %s\n"
-msgstr "Inicializace LDAP u „%s:%d“ selhala: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:665
-#, fuzzy, c-format
-#| msgid "LDAP init to '%s:%d' failed: %s\n"
-msgid "LDAP init to '%s' done\n"
-msgstr "Inicializace LDAP u „%s:%d“ selhala: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:704
-#, c-format
-msgid "binding to '%s:%d' failed: %s\n"
-msgstr "napojení k „%s:%d“ selhalo: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:728
-#, c-format
-msgid "searching '%s' failed: %s\n"
-msgstr "hledávání „%s“ neuspělo: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:759
-#, c-format
-msgid "'%s' is not an LDAP URL\n"
-msgstr "„%s“ není LDAP URL\n"
-
-#: dirmngr/dirmngr_ldap.c:765
-#, c-format
-msgid "'%s' is an invalid LDAP URL\n"
-msgstr "„%s“ není platné LDAP URL\n"
-
-#: dirmngr/http.c:1989 dirmngr/ocsp.c:255
+#: dirmngr/http.c:1998 dirmngr/ocsp.c:255
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "chyba přístupu k „%s“: status HTTP %u\n"
 
-#: dirmngr/http.c:3630 dirmngr/ocsp.c:229
+#: dirmngr/http.c:3652 dirmngr/ocsp.c:229
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr "URL „%s“ přesměrováno na „%s“ (%u)\n"
 
-#: dirmngr/http.c:3636 dirmngr/ocsp.c:246
+#: dirmngr/http.c:3658 dirmngr/ocsp.c:246
 #, c-format
 msgid "too many redirections\n"
 msgstr "příliš mnoho přesměrování\n"
 
-#: dirmngr/http.c:3748
+#: dirmngr/http.c:3768
 #, c-format
 msgid "redirection changed to '%s'\n"
 msgstr "přesměrování změněno na „%s“\n"
@@ -10866,31 +10674,51 @@ msgstr "�ekání na ldapovou obálku %d selhalo: %s\n"
 msgid "ldap wrapper %d stalled - killing\n"
 msgstr "ldapová obálka %d se zasekla – bude zabita\n"
 
-#: dirmngr/ldap.c:91
+#: dirmngr/ldap.c:92
 #, c-format
 msgid "invalid char 0x%02x in host name - not added\n"
 msgstr "v názvu stroje je neplatný znak 0x%02x – nepřidáno\n"
 
-#: dirmngr/ldap.c:95
+#: dirmngr/ldap.c:96
 #, c-format
 msgid "adding '%s:%d' to the ldap server list\n"
 msgstr "na seznam LDAP serverů se přidává „%s:%d“\n"
 
-#: dirmngr/ldap.c:98 dirmngr/misc.c:512
+#: dirmngr/ldap.c:99 dirmngr/misc.c:512
 #, c-format
 msgid "malloc failed: %s\n"
 msgstr "funkce malloc selhala: %s\n"
 
-#: dirmngr/ldap.c:634
+#: dirmngr/ldap.c:221
+#, c-format
+msgid "'%s' is not an LDAP URL\n"
+msgstr "„%s“ není LDAP URL\n"
+
+#: dirmngr/ldap.c:227 dirmngr/ldap.c:233
 #, c-format
-msgid "start_cert_fetch: invalid pattern '%s'\n"
-msgstr "start_cert_fetch: chybný vzor „%s“\n"
+msgid "'%s' is an invalid LDAP URL\n"
+msgstr "„%s“ není platné LDAP URL\n"
 
-#: dirmngr/ldap.c:846
+#: dirmngr/ldap.c:968
 #, c-format
 msgid "ldap_search hit the size limit of the server\n"
 msgstr "ldap_search přesáhl omezení velikosti serveru\n"
 
+#: dirmngr/ldapserver.c:119
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr "%s:%u: zadáno heslo bez uživatele\n"
+
+#: dirmngr/ldapserver.c:181
+#, c-format
+msgid "%s:%u: ignoring unknown flag '%s'\n"
+msgstr ""
+
+#: dirmngr/ldapserver.c:203
+#, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr "%s:%u: přeskakuji tento řádek\n"
+
 #: dirmngr/misc.c:172
 #, c-format
 msgid "invalid canonical S-expression found\n"
@@ -10981,87 +10809,87 @@ msgstr "nepodepsáno výchozím OCSP certifikátem podepisovatele"
 msgid "allocating list item failed: %s\n"
 msgstr "alokování prvku seznamu selhalo: %s\n"
 
-#: dirmngr/ocsp.c:537 dirmngr/ocsp.c:724
+#: dirmngr/ocsp.c:538 dirmngr/ocsp.c:725
 #, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "chyba při zjišťování ID odpovída�e: %s\n"
 
-#: dirmngr/ocsp.c:584
+#: dirmngr/ocsp.c:585
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr "žádný vhodný certifikát pro ověření OCSP odpovědi nebyl nalezen\n"
 
-#: dirmngr/ocsp.c:623 dirmngr/validate.c:648
+#: dirmngr/ocsp.c:624 dirmngr/validate.c:648
 #, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "certifikát vydavatele nenalezen: %s\n"
 
-#: dirmngr/ocsp.c:633
+#: dirmngr/ocsp.c:634
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr "volající nevrátil cílový certifikát\n"
 
-#: dirmngr/ocsp.c:640
+#: dirmngr/ocsp.c:641
 #, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "volající nevrátil vydávající certifikát\n"
 
-#: dirmngr/ocsp.c:650
+#: dirmngr/ocsp.c:651
 #, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "alokace OCSP kontextu selhala: %s\n"
 
-#: dirmngr/ocsp.c:689
+#: dirmngr/ocsp.c:690
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr "žádný výchozí OCSP odpovída� nedefinován\n"
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:696
 #, c-format
 msgid "no default OCSP signer defined\n"
 msgstr "žádný výchozí OCSP podepisovatel nedefinován\n"
 
-#: dirmngr/ocsp.c:702
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr "použije se výchozí OCSP odpovída� „%s“\n"
 
-#: dirmngr/ocsp.c:707
+#: dirmngr/ocsp.c:708
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "použije se OCSP odpovída� „%s“\n"
 
-#: dirmngr/ocsp.c:764
+#: dirmngr/ocsp.c:765
 #, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "chyba při zjišťování OCSP stavu cílového certifikátu: %s\n"
 
-#: dirmngr/ocsp.c:789
+#: dirmngr/ocsp.c:790
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr "stav certifikátu je: %s (nyní=%s, příště=%s)\n"
 
 # status
-#: dirmngr/ocsp.c:790
+#: dirmngr/ocsp.c:791
 msgid "good"
 msgstr "dobrý"
 
-#: dirmngr/ocsp.c:796
+#: dirmngr/ocsp.c:797
 #, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "certifikát byl odvolán kdy: %s, důvod: %s\n"
 
-#: dirmngr/ocsp.c:831
+#: dirmngr/ocsp.c:832
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr "OCSP odpovída� vrátil stav v budoucnosti\n"
 
-#: dirmngr/ocsp.c:843
+#: dirmngr/ocsp.c:844
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr "OCSP odpovída� vrátil ne sou�asný stav\n"
 
-#: dirmngr/ocsp.c:858
+#: dirmngr/ocsp.c:859
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr "OCSP odpovída� vrátil příliš starý stav\n"
@@ -11071,71 +10899,67 @@ msgstr "OCSP odpovída� vrátil příliš starý stav\n"
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "volání assuan_inquire(%s) selhalo: %s\n"
 
-#: dirmngr/server.c:1158
-msgid "ldapserver missing"
-msgstr "chybí ldapserver (LDAP server)"
-
-#: dirmngr/server.c:1224
+#: dirmngr/server.c:1277
 msgid "serialno missing in cert ID"
 msgstr "v ID certifikátu chybí serialno (sériové �íslo)"
 
-#: dirmngr/server.c:1387 dirmngr/server.c:1473 dirmngr/server.c:1909
-#: dirmngr/server.c:1980 dirmngr/server.c:2556 dirmngr/server.c:2571
+#: dirmngr/server.c:1440 dirmngr/server.c:1526 dirmngr/server.c:1963
+#: dirmngr/server.c:2034 dirmngr/server.c:2662 dirmngr/server.c:2677
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "volání assuan_inquire selhalo: %s\n"
 
-#: dirmngr/server.c:1516
+#: dirmngr/server.c:1569
 #, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "volání fetch_cert_by_url selhalo: %s\n"
 
-#: dirmngr/server.c:1528 dirmngr/server.c:1559 dirmngr/server.c:1718
+#: dirmngr/server.c:1581 dirmngr/server.c:1612 dirmngr/server.c:1772
 #, c-format
 msgid "error sending data: %s\n"
 msgstr "chyba při odesílání dat: %s\n"
 
-#: dirmngr/server.c:1666
+#: dirmngr/server.c:1720
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "volání start_cert_fetch selhalo: %s\n"
 
-#: dirmngr/server.c:1699
+#: dirmngr/server.c:1753
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "volání fetch_next_cert selhalo: %s\n"
 
-#: dirmngr/server.c:1726
+#: dirmngr/server.c:1780
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr "max_replies (max. odpovědí) %d překro�eno\n"
 
-#: dirmngr/server.c:2860
+#: dirmngr/server.c:2966
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "řídící strukturu nelze alokovat: %s\n"
 
-#: dirmngr/server.c:2871
+#: dirmngr/server.c:2977
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "alokace kontextu assuan selhala: %s\n"
 
-#: dirmngr/server.c:2892
+#: dirmngr/server.c:2998
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "inicializace serveru selhala: %s\n"
 
-#: dirmngr/server.c:2900
+#: dirmngr/server.c:3006
 #, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "registrace příkazu u Assuanu selhala: %s\n"
 
-#: dirmngr/server.c:2933
+#: dirmngr/server.c:3039
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "problém příjmu Assuanu: %s\n"
 
-#: dirmngr/server.c:2952
+#: dirmngr/server.c:3058
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "zpracování Assuanu se nezdařilo: %s\n"
@@ -11283,69 +11107,69 @@ msgstr "v této relaci neběží žádný dirmngr\n"
 msgid "error sending standard options: %s\n"
 msgstr "chyba při odesílání standardního parametru: %s\n"
 
-#: tools/gpgconf-comp.c:649
+#: tools/gpgconf-comp.c:655
 msgid "OpenPGP"
 msgstr "OpenPGP"
 
-#: tools/gpgconf-comp.c:653
+#: tools/gpgconf-comp.c:659
 msgid "S/MIME"
 msgstr "S/MIME"
 
-#: tools/gpgconf-comp.c:657
+#: tools/gpgconf-comp.c:663
 #, fuzzy
 #| msgid "public key is %s\n"
 msgid "Public Keys"
 msgstr "veřejný klí� je %s\n"
 
-#: tools/gpgconf-comp.c:661
+#: tools/gpgconf-comp.c:667
 msgid "Private Keys"
 msgstr "Soukromé klí�e"
 
-#: tools/gpgconf-comp.c:665
+#: tools/gpgconf-comp.c:671
 msgid "Smartcards"
 msgstr "Čipové karty"
 
-#: tools/gpgconf-comp.c:669
+#: tools/gpgconf-comp.c:676
 msgid "TPM"
 msgstr ""
 
-#: tools/gpgconf-comp.c:673
+#: tools/gpgconf-comp.c:681
 msgid "Network"
 msgstr "Síť"
 
-#: tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:685
 msgid "Passphrase Entry"
 msgstr "Pole pro heslo"
 
-#: tools/gpgconf-comp.c:941
+#: tools/gpgconf-comp.c:951
 msgid "Component not suitable for launching"
 msgstr "Komponenta není vhodná pro spuštění"
 
-#: tools/gpgconf-comp.c:947
+#: tools/gpgconf-comp.c:957
 #, c-format
 msgid "Configuration file of component %s is broken\n"
 msgstr "Konfigura�ní soubor komponenty %s je rozbitý\n"
 
-#: tools/gpgconf-comp.c:950
+#: tools/gpgconf-comp.c:960
 #, c-format
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr "Poznámka: Podrobnosti získáte příkazem „%s%s“.\n"
 
-#: tools/gpgconf-comp.c:2816
+#: tools/gpgconf-comp.c:2826
 #, c-format
 msgid "External verification of component %s failed"
 msgstr "Selhalo externí ověření komponenty %s"
 
-#: tools/gpgconf-comp.c:2946
+#: tools/gpgconf-comp.c:2956
 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:3543
+#: tools/gpgconf-comp.c:3553
 #, c-format
 msgid "error closing '%s'\n"
 msgstr "chyba při uzavírání „%s“\n"
 
-#: tools/gpgconf-comp.c:3545
+#: tools/gpgconf-comp.c:3555
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr "chyba při rozboru „%s“\n"
@@ -11426,15 +11250,15 @@ msgstr ""
 "Syntaxe: @GPGCONF@ [volby]\n"
 "Spravuje konfigura�ní volby nástrojů, které patří do systému @GNUPG@\n"
 
-#: tools/gpgconf.c:669 tools/gpgconf.c:704
+#: tools/gpgconf.c:703 tools/gpgconf.c:738
 msgid "Need one component argument"
 msgstr "Potřebuji jeden argument ur�ující komponentu"
 
-#: tools/gpgconf.c:678 tools/gpgconf.c:728 tools/gpgconf.c:778
+#: tools/gpgconf.c:712 tools/gpgconf.c:762 tools/gpgconf.c:812
 msgid "Component not found"
 msgstr "Komponenta nenalezena"
 
-#: tools/gpgconf.c:804
+#: tools/gpgconf.c:838
 msgid "No argument allowed"
 msgstr "Žádné argumenty nejsou povoleny"
 
@@ -11451,90 +11275,217 @@ msgstr ""
 "Syntaxe: gpg-check-pattern [volby] soubor_se_vzorem\n"
 "Prověří heslo zadané na vstupu proti souboru se vzory\n"
 
-#: tools/gpg-card.c:2390
+#: tools/gpg-card.c:2407
 #, fuzzy, c-format
 #| msgid "Note: keys are already stored on the card!\n"
 msgid "Note: key %s is already stored on the card!\n"
 msgstr "Poznámka: na kartě jsou již klí�e uloženy!\n"
 
-#: tools/gpg-card.c:2393
+#: tools/gpg-card.c:2410
 #, fuzzy, c-format
 #| msgid "Note: keys are already stored on the card!\n"
 msgid "Note: Keys are already stored on the card!\n"
 msgstr "Poznámka: na kartě jsou již klí�e uloženy!\n"
 
-#: tools/gpg-card.c:2396
+#: tools/gpg-card.c:2413
 #, fuzzy, c-format
 #| msgid "Replace existing keys? (y/N) "
 msgid "Replace existing key %s ? (y/N) "
 msgstr "Přepsat existující klí�e? (a/N) "
 
-#: tools/gpg-card.c:2549 tools/gpg-card.c:2712 tools/gpg-card.c:2935
-#: tools/gpg-card.c:3044
+#: tools/gpg-card.c:2566 tools/gpg-card.c:2729 tools/gpg-card.c:2952
+#: tools/gpg-card.c:3061
 #, fuzzy, c-format
 #| msgid "OpenPGP card no. %s detected\n"
 msgid "%s card no. %s detected\n"
 msgstr "Nalezena OpenPGP karta �íslo %s\n"
 
-#: tools/gpg-card.c:3396
+#: tools/gpg-card.c:3413
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3406 tools/gpg-card.c:3420
+#: tools/gpg-card.c:3423 tools/gpg-card.c:3437
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
 "         can only be reverted using a factory reset!\n"
 msgstr ""
 
-#: tools/gpg-card.c:3423
+#: tools/gpg-card.c:3440
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3669
+#: tools/gpg-card.c:3686
 #, fuzzy
 #| msgid "add a certificate to the cache"
 msgid "authenticate to the card"
 msgstr "přidá certifikát do keše"
 
-#: tools/gpg-card.c:3671
+#: tools/gpg-card.c:3688
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3673
+#: tools/gpg-card.c:3690
 msgid "setup KDF for PIN authentication"
 msgstr "nastavit KDF pro autentizaci kódem PIN"
 
-#: tools/gpg-card.c:3675
+#: tools/gpg-card.c:3692
 msgid "change a private data object"
 msgstr ""
 
-#: tools/gpg-card.c:3676
+#: tools/gpg-card.c:3693
 #, fuzzy
 #| msgid "add a certificate to the cache"
 msgid "read a certificate from a data object"
 msgstr "přidá certifikát do keše"
 
-#: tools/gpg-card.c:3677
+#: tools/gpg-card.c:3694
 #, fuzzy
 #| msgid "add a certificate to the cache"
 msgid "store a certificate to a data object"
 msgstr "přidá certifikát do keše"
 
-#: tools/gpg-card.c:3678
+#: tools/gpg-card.c:3695
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3679
+#: tools/gpg-card.c:3696
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3681
+#: tools/gpg-card.c:3698
 msgid "manage the command history"
 msgstr ""
 
+#~ msgid "requesting key %s from %s server %s\n"
+#~ msgstr "požaduji klí� %s z %s serveru %s\n"
+
+#~ msgid "%s:%u: no hostname given\n"
+#~ msgstr "%s:%u: nebyl zadán název stroje\n"
+
+#~ msgid "could not parse keyserver\n"
+#~ msgstr "nelze rozebrat serveru klí�ů\n"
+
+#~ msgid "return all values in a record oriented format"
+#~ msgstr "vrátí všechny hodnoty v záznamově orientovaném formátu"
+
+#~ msgid "|NAME|ignore host part and connect through NAME"
+#~ msgstr "|N�ZEV|ignoruje �ást se strojem a připojí se skrze N�ZEV"
+
+#~ msgid "|NAME|connect to host NAME"
+#~ msgstr "|N�ZEV|připojí se ke strojí N�ZEV"
+
+#~ msgid "|N|connect to port N"
+#~ msgstr "|N|připojí se na port N"
+
+#~ msgid "|NAME|use user NAME for authentication"
+#~ msgstr "|JMÉNO|pro autentizaci použije JMÉNO uživatele"
+
+#~ msgid "|PASS|use password PASS for authentication"
+#~ msgstr "|HESLO|pro autentizaci použije HESLO"
+
+#~ msgid "take password from $DIRMNGR_LDAP_PASS"
+#~ msgstr "heslo získá z $DIRMNGR_LDAP_PASS"
+
+#~ msgid "|STRING|query DN STRING"
+#~ msgstr "|ŘETĚZEC|dotáže se na DN ŘETĚZEC"
+
+#~ msgid "|STRING|use STRING as filter expression"
+#~ msgstr "|ŘETĚZEC|jako filtrující výraz použije ŘETĚZEC"
+
+#~ msgid "|STRING|return the attribute STRING"
+#~ msgstr "|ŘETĚZEC|vrátí atribut ŘETĚZEC"
+
+#~ msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
+#~ msgstr "Použití: dirmngr_ldap [volby] [URL] (-h pro nápovědu)\n"
+
+#~ msgid ""
+#~ "Syntax: dirmngr_ldap [options] [URL]\n"
+#~ "Internal LDAP helper for Dirmngr\n"
+#~ "Interface and options may change without notice\n"
+#~ msgstr ""
+#~ "Syntaxe: dirmngr_ldap [volby] [URL]\n"
+#~ "Vnitřní LDAP pomůcka pro pro Dirmngr.\n"
+#~ "Rozhraní a volby se mohou bez upozornění změnit.\n"
+
+#~ msgid "invalid port number %d\n"
+#~ msgstr "neplatné �íslo portu %d\n"
+
+#~ msgid "scanning result for attribute '%s'\n"
+#~ msgstr "ve výsledku se hledá atribut „%s“\n"
+
+#~ msgid "error writing to stdout: %s\n"
+#~ msgstr "chyba při zápisu na standardní výstup: %s\n"
+
+#~ msgid "          available attribute '%s'\n"
+#~ msgstr "          dostupný atribut „%s“\n"
+
+#~ msgid "attribute '%s' not found\n"
+#~ msgstr "atribut „%s“ nenalezen\n"
+
+#~ msgid "found attribute '%s'\n"
+#~ msgstr "nalezen atribut „%s“\n"
+
+#~ msgid "processing url '%s'\n"
+#~ msgstr "zpracovává se URL „%s“\n"
+
+#~ msgid "          user '%s'\n"
+#~ msgstr "          uživatel „%s“\n"
+
+#~ msgid "          pass '%s'\n"
+#~ msgstr "          heslo „%s“\n"
+
+#~ msgid "          host '%s'\n"
+#~ msgstr "          stroj „%s“\n"
+
+#~ msgid "          port %d\n"
+#~ msgstr "          port %d\n"
+
+#~ msgid "            DN '%s'\n"
+#~ msgstr "            DN „%s“\n"
+
+#~ msgid "        filter '%s'\n"
+#~ msgstr "        filtr „%s“\n"
+
+#~ msgid "          attr '%s'\n"
+#~ msgstr "          atribut „%s“\n"
+
+#~ msgid "no host name in '%s'\n"
+#~ msgstr "v „%s“ chybí název stroje\n"
+
+#~ msgid "no attribute given for query '%s'\n"
+#~ msgstr "u dotazu „%s“ nezadán žádný atribut\n"
+
+#~ msgid "WARNING: using first attribute only\n"
+#~ msgstr "POZOR: použije se pouze první atribut\n"
+
+#~ msgid "LDAP init to '%s:%d' failed: %s\n"
+#~ msgstr "Inicializace LDAP u „%s:%d“ selhala: %s\n"
+
+#, fuzzy
+#~| msgid "LDAP init to '%s:%d' failed: %s\n"
+#~ msgid "LDAP init to '%s' failed: %s\n"
+#~ msgstr "Inicializace LDAP u „%s:%d“ selhala: %s\n"
+
+#, fuzzy
+#~| msgid "LDAP init to '%s:%d' failed: %s\n"
+#~ msgid "LDAP init to '%s' done\n"
+#~ msgstr "Inicializace LDAP u „%s:%d“ selhala: %s\n"
+
+#~ msgid "binding to '%s:%d' failed: %s\n"
+#~ msgstr "napojení k „%s:%d“ selhalo: %s\n"
+
+#~ msgid "searching '%s' failed: %s\n"
+#~ msgstr "hledávání „%s“ neuspělo: %s\n"
+
+#~ msgid "start_cert_fetch: invalid pattern '%s'\n"
+#~ msgstr "start_cert_fetch: chybný vzor „%s“\n"
+
+#~ msgid "ldapserver missing"
+#~ msgstr "chybí ldapserver (LDAP server)"
+
 #, fuzzy
 #~| msgid "change a passphrase"
 #~ msgid "Suggest a random passphrase."
diff --git a/po/da.gmo b/po/da.gmo
index bd56db9..2a18a6c 100644
--- a/po/da.gmo
+++ b/po/da.gmo
diff --git a/po/da.po b/po/da.po
index 49ad6de..a5c5683 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: 2021-04-20 12:38+0200\n"
+"POT-Creation-Date: 2021-08-24 18:50+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:328
+#: agent/call-pinentry.c:338
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "kunne ikke indhente pinentry-lås: %s\n"
@@ -35,55 +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:546
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_OK"
 msgstr "_O.k."
 
-#: agent/call-pinentry.c:547
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_Cancel"
 msgstr "_Afbryd"
 
-#: agent/call-pinentry.c:548
+#: agent/call-pinentry.c:558
 #, fuzzy
 #| msgid "|pinentry-label|_OK"
 msgid "|pinentry-label|_Yes"
 msgstr "_O.k."
 
-#: agent/call-pinentry.c:549
+#: agent/call-pinentry.c:559
 #, fuzzy
 #| msgid "|pinentry-label|_OK"
 msgid "|pinentry-label|_No"
 msgstr "_O.k."
 
-#: agent/call-pinentry.c:550
+#: agent/call-pinentry.c:560
 msgid "|pinentry-label|PIN:"
 msgstr "PIN:"
 
-#: agent/call-pinentry.c:551
+#: agent/call-pinentry.c:561
 #, fuzzy
 #| msgid "|pinentry-label|_Cancel"
 msgid "|pinentry-label|_Save in password manager"
 msgstr "_Afbryd"
 
-#: agent/call-pinentry.c:552
+#: agent/call-pinentry.c:562
 #, 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:554
+#: agent/call-pinentry.c:564
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:555
+#: agent/call-pinentry.c:565
 #, fuzzy
 #| msgid "Enter new passphrase"
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "Indtast ny adgangsfrase"
 
+#: agent/call-pinentry.c:566
+msgid "Caps Lock is on"
+msgstr ""
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:944
+#: agent/call-pinentry.c:1022
 msgid "Suggest"
 msgstr ""
 
@@ -94,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:966
+#: agent/call-pinentry.c:1044
 #, fuzzy
 #| msgid "pinentry.qualitybar.tooltip"
 msgid "pinentry.genpin.tooltip"
@@ -105,9 +109,22 @@ msgstr ""
 "specialtegn. Spørg din administrator om mere præcis information om\n"
 "hvordan man anvender sikre adgangskoder."
 
+#: agent/call-pinentry.c:1072
+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
+#, fuzzy
+#| msgid "Passphrase too long"
+msgid "Passphrase Not Allowed"
+msgstr "Adgangsfrase er for lang"
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:998
+#: agent/call-pinentry.c:1198
 msgid "Quality:"
 msgstr "Kvalitet:"
 
@@ -117,7 +134,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:1019
+#: agent/call-pinentry.c:1219
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 "Denne række indikerer kvaliteten for ovenstående angivne adgangskode.\n"
@@ -126,7 +143,7 @@ msgstr ""
 "specialtegn. Spørg din administrator om mere præcis information om\n"
 "hvordan man anvender sikre adgangskoder."
 
-#: agent/call-pinentry.c:1263
+#: agent/call-pinentry.c:1477
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
@@ -134,7 +151,7 @@ msgstr ""
 "Indtast venligst din PIN, så at den hemmelige nøgle kan låses op for denne "
 "session"
 
-#: agent/call-pinentry.c:1266
+#: agent/call-pinentry.c:1480
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -142,76 +159,76 @@ msgstr ""
 "Indtast din adgangsfrase, så at den hemmelige nøgle kan låses op for denne "
 "session"
 
-#: agent/call-pinentry.c:1303 agent/call-pinentry.c:1506
+#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1303 agent/call-pinentry.c:1506
-#: agent/protect-tool.c:728
+#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/protect-tool.c:729
 msgid "Passphrase:"
 msgstr "Adgangsfrase:"
 
-#: agent/call-pinentry.c:1330 agent/call-pinentry.c:1580 agent/command.c:1799
-#: agent/command.c:1852 agent/command-ssh.c:3046 agent/genkey.c:398
+#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
+#: agent/command.c:1988 agent/command-ssh.c:3046 agent/genkey.c:442
 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:1351 agent/call-pinentry.c:1603
+#: agent/call-pinentry.c:1566 agent/call-pinentry.c:1830
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (forsøg %d af %d)"
 
-#: agent/call-pinentry.c:1362 agent/call-pinentry.c:1614
+#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
 msgid "Repeat:"
 msgstr ""
 
-#: agent/call-pinentry.c:1372 agent/call-pinentry.c:1384
-#: agent/call-pinentry.c:1624 agent/call-pinentry.c:1636
+#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
+#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
 msgid "PIN too long"
 msgstr "PIN er for lang"
 
-#: agent/call-pinentry.c:1373 agent/call-pinentry.c:1625
+#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
 msgid "Passphrase too long"
 msgstr "Adgangsfrase er for lang"
 
-#: agent/call-pinentry.c:1381 agent/call-pinentry.c:1633
+#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
 msgid "Invalid characters in PIN"
 msgstr "Ugyldige tegn i PIN"
 
-#: agent/call-pinentry.c:1386 agent/call-pinentry.c:1638
+#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
 msgid "PIN too short"
 msgstr "PIN er for kort"
 
-#: agent/call-pinentry.c:1405 agent/call-pinentry.c:1656
+#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
 msgid "Bad PIN"
 msgstr "Ugyldig PIN"
 
-#: agent/call-pinentry.c:1405 agent/call-pinentry.c:1656
+#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
 msgid "Bad Passphrase"
 msgstr "Ugyldig adgangsfrase"
 
-#: agent/command.c:697
+#: agent/command.c:823
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:698
+#: agent/command.c:824
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1106 g10/card-util.c:708 g10/card-util.c:729
+#: agent/command.c:1235 g10/card-util.c:713 g10/card-util.c:734
 #, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "fejl ved indhentelse af serielnummer for kort: %s\n"
 
-#: agent/command.c:1634 agent/command.c:1791 agent/command-ssh.c:2974
-#: agent/genkey.c:333
+#: agent/command.c:1756 agent/command.c:1921 agent/command-ssh.c:2974
+#: agent/genkey.c:377
 msgid "Please re-enter this passphrase"
 msgstr "Genindtast venligst denne adgangsfrase"
 
-#: agent/command.c:2567
+#: agent/command.c:2703
 #, fuzzy, c-format
 #| msgid ""
 #| "Please enter the passphrase to protect the imported object within the "
@@ -223,7 +240,7 @@ msgstr ""
 "Indtast venligst adgangsfrasen for at beskytte det importeret objekt inden i "
 "GnuPG-systemet."
 
-#: agent/command.c:2697
+#: agent/command.c:2833
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -234,26 +251,26 @@ msgstr ""
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ssh-nøgler større end %d bit er ikke understøttet\n"
 
-#: agent/command-ssh.c:872 common/dotlock.c:852 g10/card-util.c:953
-#: g10/export.c:1329 g10/gpg.c:1431 g10/keygen.c:5347 g10/keyring.c:1319
-#: g10/keyring.c:1632 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
+#: agent/command-ssh.c:872 common/dotlock.c:852 g10/card-util.c:963
+#: g10/export.c:1329 g10/gpg.c:1431 g10/keygen.c:5377 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
 #: g10/sign.c:1106 g10/sign.c:1443 g10/tdbio.c:753 tools/gpg-card.c:479
 #, fuzzy, c-format
 #| msgid "can't create `%s': %s\n"
 msgid "can't create '%s': %s\n"
 msgstr "kan ikke oprette »%s«: %s\n"
 
-#: agent/command-ssh.c:884 common/helpfile.c:57 g10/card-util.c:910
+#: agent/command-ssh.c:884 common/helpfile.c:57 g10/card-util.c:920
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
 #: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:721 g10/gpg.c:1432
-#: g10/import.c:371 g10/import.c:558 g10/import.c:793 g10/keygen.c:4322
-#: g10/keyring.c:1658 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
+#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4326
+#: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
 #: g10/plaintext.c:610 g10/sign.c:1086 g10/sign.c:1311 g10/sign.c:1424
 #: g10/sign.c:1596 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2380
-#: sm/gpgsm.c:2410 sm/gpgsm.c:2448 sm/keylist.c:1737 sm/qualified.c:65
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2236
+#: sm/gpgsm.c:2266 sm/gpgsm.c:2304 sm/keylist.c:1775 sm/qualified.c:65
 #: dirmngr/certcache.c:396 dirmngr/certcache.c:476 dirmngr/certcache.c:478
-#: dirmngr/crlcache.c:2588 dirmngr/dirmngr.c:1720 tools/gpg-card.c:408
+#: dirmngr/crlcache.c:2591 dirmngr/dirmngr.c:1759 tools/gpg-card.c:408
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
@@ -363,28 +380,28 @@ msgstr "PIN er ikke korrekt gentaget; prøv igen"
 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:109 sm/certreqgen-ui.c:433
+#: 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:116
+#: 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
+#: agent/genkey.c:191
 msgid "Enter new passphrase"
 msgstr "Indtast ny adgangsfrase"
 
-#: agent/genkey.c:184
+#: agent/genkey.c:227
 #, 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:186
+#: agent/genkey.c:229
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -393,11 +410,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:198
+#: agent/genkey.c:241
 msgid "Yes, protection is not needed"
 msgstr "Ja, beskyttelse er ikke krævet"
 
-#: agent/genkey.c:215
+#: agent/genkey.c:258
 #, 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 +422,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:234
+#: agent/genkey.c:277
 #, fuzzy, c-format
 #| msgid ""
 #| "Warning: You have entered an insecure passphrase.%%0AA passphrase should "
@@ -423,7 +440,7 @@ msgstr[1] ""
 "Advarsel: Du har indtastet en usikker adgangsfrase.%%0AEn adgangsfrase skal "
 "indeholde mindst %u cifre eller%%0specielle tegn."
 
-#: agent/genkey.c:260
+#: agent/genkey.c:304
 #, fuzzy, c-format
 #| msgid ""
 #| "Warning: You have entered an insecure passphrase.%%0AA passphrase may not "
@@ -433,7 +450,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:275
+#: agent/genkey.c:319
 #, fuzzy
 #| msgid ""
 #| "Warning: You have entered an insecure passphrase.%%0AA passphrase should "
@@ -446,245 +463,244 @@ msgstr ""
 "Advarsel: Du har indtastet en usikker adgangsfrase.%%0AEn adgangsfrase skal "
 "være mindst %u tegn langt."
 
-#: agent/genkey.c:296
+#: agent/genkey.c:340
 msgid "Take this one anyway"
 msgstr "Brug denne alligevel"
 
-#: agent/genkey.c:464
+#: agent/genkey.c:508
 #, 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:590
+#: agent/genkey.c:637
 msgid "Please enter the new passphrase"
 msgstr "Indtast venligst den nye adgangsfrase"
 
-#: agent/gpg-agent.c:162 scd/scdaemon.c:115 dirmngr/dirmngr.c:182
+#: agent/gpg-agent.c:164 scd/scdaemon.c:115 dirmngr/dirmngr.c:183
 #, fuzzy
 #| msgid "Options useful for debugging"
 msgid "Options used for startup"
 msgstr "Tilvalg nyttige for fejlsøgning"
 
-#: agent/gpg-agent.c:164 scd/scdaemon.c:120 dirmngr/dirmngr.c:171
+#: agent/gpg-agent.c:166 scd/scdaemon.c:120 dirmngr/dirmngr.c:172
 msgid "run in daemon mode (background)"
 msgstr "kør i dæmontilstand (baggrunden)"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:117 dirmngr/dirmngr.c:170
+#: agent/gpg-agent.c:167 scd/scdaemon.c:117 dirmngr/dirmngr.c:171
 msgid "run in server mode (foreground)"
 msgstr "kør i servertilstand (forgrunden)"
 
-#: agent/gpg-agent.c:167 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:169 dirmngr/dirmngr.c:174
 #, fuzzy
 #| msgid "run in server mode"
 msgid "run in supervised mode"
 msgstr "kør i servertilstand"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:121 dirmngr/dirmngr.c:184
+#: agent/gpg-agent.c:171 scd/scdaemon.c:121 dirmngr/dirmngr.c:185
 msgid "do not detach from the console"
 msgstr "frakobl ikke fra konsollen"
 
-#: agent/gpg-agent.c:170 scd/scdaemon.c:122 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:172 scd/scdaemon.c:122 dirmngr/dirmngr.c:186
 msgid "sh-style command output"
 msgstr "kommandoresultat i sh-stil"
 
-#: agent/gpg-agent.c:171 scd/scdaemon.c:123 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:173 scd/scdaemon.c:123 dirmngr/dirmngr.c:187
 msgid "csh-style command output"
 msgstr "kommandoresultat i csh-stil"
 
-#: agent/gpg-agent.c:179 g10/gpg.c:589 scd/scdaemon.c:125 sm/gpgsm.c:422
-#: dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:181 g10/gpg.c:589 scd/scdaemon.c:125 sm/gpgsm.c:423
+#: dirmngr/dirmngr.c:189
 msgid "|FILE|read options from FILE"
 msgstr "|FIL|læs tilvalg fra FIL"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:574 scd/scdaemon.c:129 sm/gpgsm.c:265
-#: dirmngr/dirmngr.c:192
+#: agent/gpg-agent.c:185 g10/gpg.c:574 scd/scdaemon.c:129 sm/gpgsm.c:265
+#: dirmngr/dirmngr.c:193
 msgid "Options controlling the diagnostic output"
 msgstr "Tilvalg der kontrollerer det diagnostiske resultat"
 
-#: agent/gpg-agent.c:185 g10/gpg.c:576 g10/gpgv.c:78 kbx/kbxutil.c:89
+#: agent/gpg-agent.c:187 g10/gpg.c:576 g10/gpgv.c:78 kbx/kbxutil.c:89
 #: scd/scdaemon.c:131 sm/gpgsm.c:267 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:194 dirmngr/dirmngr_ldap.c:102
-#: tools/gpg-connect-agent.c:85 tools/gpgconf.c:111
+#: dirmngr/dirmngr.c:195 tools/gpg-connect-agent.c:85 tools/gpgconf.c:111
 msgid "verbose"
 msgstr "uddybende"
 
-#: agent/gpg-agent.c:186 g10/gpg.c:578 g10/gpgv.c:79 kbx/kbxutil.c:90
+#: agent/gpg-agent.c:188 g10/gpg.c:578 g10/gpgv.c:79 kbx/kbxutil.c:90
 #: scd/scdaemon.c:132 sm/gpgsm.c:269 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:195 dirmngr/dirmngr_ldap.c:103
+#: dirmngr/dirmngr.c:196
 msgid "be somewhat more quiet"
 msgstr "vær mindre uddybende"
 
-#: agent/gpg-agent.c:194 g10/gpg.c:593 sm/gpgsm.c:283 dirmngr/dirmngr.c:205
+#: agent/gpg-agent.c:196 g10/gpg.c:593 sm/gpgsm.c:283 dirmngr/dirmngr.c:206
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FILE|skriv servertilstandslogge til FIL"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 scd/scdaemon.c:146 sm/gpgsm.c:290
-#: dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:599 scd/scdaemon.c:146 sm/gpgsm.c:290
+#: dirmngr/dirmngr.c:210
 msgid "Options controlling the configuration"
 msgstr "Tilvalg der kontrollerer konfigurationen"
 
-#: agent/gpg-agent.c:201
+#: agent/gpg-agent.c:203
 msgid "do not use the SCdaemon"
 msgstr "brug ikke SCdaemon'en"
 
-#: agent/gpg-agent.c:203
+#: agent/gpg-agent.c:205
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|brug PGM som SCdaemon-program"
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 #, 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:209
+#: agent/gpg-agent.c:211
 #, 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:213
+#: agent/gpg-agent.c:215
 msgid "ignore requests to change the TTY"
 msgstr "ignorer forespørgsler om at ændre TTY'en"
 
-#: agent/gpg-agent.c:215
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the X display"
 msgstr "ignorer forespørgsler om at ændre X-skærmen"
 
-#: agent/gpg-agent.c:216
+#: agent/gpg-agent.c:218
 #, fuzzy
 #| msgid "enable ssh-agent emulation"
 msgid "enable ssh support"
 msgstr "aktiver ssh-agent-emulering"
 
-#: agent/gpg-agent.c:218
+#: agent/gpg-agent.c:220
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:221
+#: agent/gpg-agent.c:223
 msgid "enable putty support"
 msgstr ""
 
-#: agent/gpg-agent.c:233 g10/gpg.c:844 scd/scdaemon.c:176 sm/gpgsm.c:382
+#: agent/gpg-agent.c:235 g10/gpg.c:844 scd/scdaemon.c:176 sm/gpgsm.c:383
 msgid "Options controlling the security"
 msgstr "Tilvalg der kontrollerer sikkerheden"
 
-#: agent/gpg-agent.c:236
+#: agent/gpg-agent.c:238
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|udløb mellemlagrede PIN'er efter N sekunder"
 
-#: agent/gpg-agent.c:238
+#: agent/gpg-agent.c:240
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|udløb SSH-nøgler efter N sekunder"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:242
 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:242
+#: agent/gpg-agent.c:244
 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:244
+#: agent/gpg-agent.c:246
 msgid "do not use the PIN cache when signing"
 msgstr "brug ikke PIN-mellemlageret når der underskrives"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:248
 #, 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:248
+#: agent/gpg-agent.c:250
 #, 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:251
+#: agent/gpg-agent.c:253
 msgid "allow presetting passphrase"
 msgstr "tillad forhåndsindstilling af adgangsfrase"
 
-#: agent/gpg-agent.c:256
+#: agent/gpg-agent.c:258
 msgid "Options enforcing a passphrase policy"
 msgstr "Tilvalg der fremtvinger en adgangsfrasepolitik"
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:261
 msgid "do not allow bypassing the passphrase policy"
 msgstr "tillad ikke omgåelse af adgangsfrasepolitikken"
 
-#: agent/gpg-agent.c:261
+#: agent/gpg-agent.c:263
 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:263
+#: agent/gpg-agent.c:265
 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:266
+#: agent/gpg-agent.c:268
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr "|FILE|kontroller nye adgangsfraser mod mønstre i FIL"
 
-#: agent/gpg-agent.c:268
+#: agent/gpg-agent.c:272
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|giv adgangsfrasen udløb efter N dage"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:274
 msgid "do not allow the reuse of old passphrases"
 msgstr "tillad ikke genbrug af gamle adgangsfraser"
 
-#: agent/gpg-agent.c:273
+#: agent/gpg-agent.c:277
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the PIN-Entry"
 msgstr "Tilvalg der kontrollerer sikkerheden"
 
-#: agent/gpg-agent.c:275
+#: agent/gpg-agent.c:279
 msgid "never use the PIN-entry"
 msgstr ""
 
-#: agent/gpg-agent.c:277
+#: agent/gpg-agent.c:281
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:283
 #, 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:282
+#: agent/gpg-agent.c:286
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|brug PGM som PIN-Entry-program"
 
-#: agent/gpg-agent.c:286
+#: agent/gpg-agent.c:290
 #, 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:288
+#: agent/gpg-agent.c:294
 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:551 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: agent/gpg-agent.c:557 agent/preset-passphrase.c:99 agent/protect-tool.c:154
 #: g10/gpg.c:1132 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:612 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:438
-#: dirmngr/dirmngr_ldap.c:175 tools/gpg-connect-agent.c:220 tools/gpgconf.c:151
+#: sm/gpgsm.c:613 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:446
+#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:151
 #: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Rapporter venligst fejl til <@EMAIL@>.\n"
 
-#: agent/gpg-agent.c:560
+#: agent/gpg-agent.c:566
 #, 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:562
+#: agent/gpg-agent.c:568
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg-agent [options] [command [args]]\n"
@@ -696,143 +712,143 @@ msgstr ""
 "Syntaks: gpg-agent [tilvalg] [kommando [parametre]]\n"
 "Hemmelig nøglehåndtering for GnuPG\n"
 
-#: agent/gpg-agent.c:607 g10/gpg.c:1337 scd/scdaemon.c:384 sm/gpgsm.c:760
-#: dirmngr/dirmngr.c:522
+#: agent/gpg-agent.c:613 g10/gpg.c:1337 scd/scdaemon.c:384 sm/gpgsm.c:761
+#: dirmngr/dirmngr.c:530
 #, 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:972 g10/gpg.c:3910 g10/gpg.c:3934 sm/gpgsm.c:1769
-#: sm/gpgsm.c:1775
+#: agent/gpg-agent.c:986 g10/gpg.c:3907 g10/gpg.c:3931 sm/gpgsm.c:1622
+#: sm/gpgsm.c:1628
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "valgt sammendragsalgoritme er ugyldig\n"
 
-#: agent/gpg-agent.c:1196 agent/gpg-agent.c:2019 common/comopt.c:93
-#: g10/gpg.c:2591 scd/scdaemon.c:549 sm/gpgsm.c:1155 dirmngr/dirmngr.c:989
-#: dirmngr/dirmngr.c:1840
+#: agent/gpg-agent.c:1210 agent/gpg-agent.c:2035 common/comopt.c:93
+#: g10/gpg.c:2594 scd/scdaemon.c:549 sm/gpgsm.c:1028 dirmngr/dirmngr.c:1029
+#: dirmngr/dirmngr.c:1879
 #, 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:1335 g10/gpg.c:3861 scd/scdaemon.c:687 sm/gpgsm.c:1709
-#: dirmngr/dirmngr.c:1108 tools/gpg-connect-agent.c:1270 tools/gpgconf.c:634
+#: agent/gpg-agent.c:1349 g10/gpg.c:3858 scd/scdaemon.c:687 sm/gpgsm.c:1562
+#: dirmngr/dirmngr.c:1145 tools/gpg-connect-agent.c:1270 tools/gpgconf.c:668
 #, 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:2172 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1267
+#: agent/gpg-agent.c:2188 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1306
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "kan ikke oprette sokkel: %s\n"
 
-#: agent/gpg-agent.c:2189 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1280
+#: agent/gpg-agent.c:2205 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1319
 #, 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:2228
+#: agent/gpg-agent.c:2244
 #, 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:2239 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1312
+#: agent/gpg-agent.c:2255 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1351
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "fejl ved indhentelse af nonce for soklen\n"
 
-#: agent/gpg-agent.c:2244 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1315
+#: agent/gpg-agent.c:2260 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1354
 #, 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:2255 agent/gpg-agent.c:2295 agent/gpg-agent.c:2304
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1324
+#: agent/gpg-agent.c:2271 agent/gpg-agent.c:2311 agent/gpg-agent.c:2320
+#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1363
 #, 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:2269 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1336
+#: agent/gpg-agent.c:2285 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1375
 #, 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:2289 agent/gpg-agent.c:2342 common/homedir.c:517
+#: agent/gpg-agent.c:2305 agent/gpg-agent.c:2358 common/homedir.c:537
 #: 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:2292 agent/gpg-agent.c:2347 common/homedir.c:520
+#: agent/gpg-agent.c:2308 agent/gpg-agent.c:2363 common/homedir.c:540
 #: 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:2353
+#: agent/gpg-agent.c:2369
 #, 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:2357
+#: agent/gpg-agent.c:2373
 #, 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:2512 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2069
+#: agent/gpg-agent.c:2528 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2108
 #, 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:2719
+#: agent/gpg-agent.c:2735
 #, 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:2724
+#: agent/gpg-agent.c:2740
 #, 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:2799
+#: agent/gpg-agent.c:2815
 #, 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:2804
+#: agent/gpg-agent.c:2820
 #, 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:3026 scd/scdaemon.c:1374 dirmngr/dirmngr.c:2283
+#: agent/gpg-agent.c:3042 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2322
 #, 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:3114 scd/scdaemon.c:1439
+#: agent/gpg-agent.c:3130 scd/scdaemon.c:1441
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s stoppet\n"
 
-#: agent/gpg-agent.c:3252 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3271 common/simple-pwquery.c:247 g10/call-agent.c:260
 #: sm/call-agent.c:131 tools/gpg-connect-agent.c:2319 tools/card-call-scd.c:311
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "ingen gpg-agent kører i denne session\n"
 
-#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:70
+#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:66
 msgid ""
 "@Options:\n"
 " "
@@ -853,7 +869,7 @@ msgstr ""
 "Adgangskode for mellemlagervedligeholdelse\n"
 
 #: agent/protect-tool.c:107 g10/gpg.c:448 kbx/kbxutil.c:72 sm/gpgsm.c:215
-#: dirmngr/dirmngr.c:168 tools/gpgconf.c:81
+#: dirmngr/dirmngr.c:169 tools/gpgconf.c:81
 msgid ""
 "@Commands:\n"
 " "
@@ -884,17 +900,17 @@ msgstr ""
 "Syntaks: gpg-protect-tool [tilvalg] [parametre]\n"
 "Vedligeholdelsesværktøj for hemmelig nøgle\n"
 
-#: agent/protect-tool.c:707
+#: agent/protect-tool.c:708 sm/import.c:775
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr ""
 "Indtast venligst adgangsfrasen for at fjerne beskyttelsen på PKCS#12-"
 "objektet."
 
-#: agent/protect-tool.c:712
+#: agent/protect-tool.c:713 sm/export.c:727
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Indtast venligst adgangsfrasen for at beskytte det nye PKCS#12-objekt."
 
-#: agent/protect-tool.c:718
+#: agent/protect-tool.c:719
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
@@ -902,7 +918,7 @@ msgstr ""
 "Indtast venligst adgangsfrasen for at beskytte det importeret objekt inden i "
 "GnuPG-systemet."
 
-#: agent/protect-tool.c:723
+#: agent/protect-tool.c:724
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -910,17 +926,17 @@ msgstr ""
 "Indtast venligst adgangsfrasen eller PIN'en\n"
 "krævet for at færdiggøre denne handling."
 
-#: agent/protect-tool.c:734
+#: agent/protect-tool.c:735
 #, c-format
 msgid "cancelled\n"
 msgstr "afbrudt\n"
 
-#: agent/protect-tool.c:736
+#: agent/protect-tool.c:737
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "fejl ved oprettelse af adgangsfrasen: %s\n"
 
-#: agent/trustlist.c:153 agent/trustlist.c:363 tools/gpgconf.c:424
+#: agent/trustlist.c:153 agent/trustlist.c:363 tools/gpgconf.c:458
 #, fuzzy, c-format
 #| msgid "error opening `%s': %s\n"
 msgid "error opening '%s': %s\n"
@@ -1089,7 +1105,7 @@ msgstr "kontrol af oprettet underskrift mislykkedes: %s\n"
 msgid "secret key parts are not available\n"
 msgstr "hemmelige nøgledele er ikke tilgængelige\n"
 
-#: agent/cvt-openpgp.c:343 g10/card-util.c:1562
+#: agent/cvt-openpgp.c:343 g10/card-util.c:1575
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -1122,7 +1138,7 @@ msgid "error creating a stream for a pipe: %s\n"
 msgstr "fejl ved oprettelse af datakanal: %s\n"
 
 #: common/exechelp-posix.c:505 common/exechelp-posix.c:580
-#: common/exechelp-posix.c:866 dirmngr/dirmngr.c:1354
+#: common/exechelp-posix.c:866 dirmngr/dirmngr.c:1393
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "fejl ved forgrening af proces: %s\n"
@@ -1201,7 +1217,7 @@ msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "omdøbelse af »%s« til »%s« mislykkedes: %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3082
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3099
 msgid "yes"
 msgstr "ja"
 
@@ -1255,7 +1271,7 @@ msgstr "ikke nok kerne i sikker hukommelse under allokering af %lu byte"
 msgid "out of core while allocating %lu bytes"
 msgstr "ikke nok kerne under allokering af %lu byte"
 
-#: common/miscellaneous.c:115 g10/card-util.c:917 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:927 tools/no-libgcrypt.c:30
 #: tools/gpg-card.c:416
 #, c-format
 msgid "error allocating enough memory: %s\n"
@@ -1336,7 +1352,7 @@ msgstr "fejl ved oprettelse af nøglering »%s«: %s\n"
 msgid "server '%s' is older than us (%s < %s)"
 msgstr ""
 
-#: common/asshelp.c:737 g10/call-dirmngr.c:408
+#: common/asshelp.c:737 g10/call-dirmngr.c:407
 #, fuzzy, c-format
 #| msgid "WARNING: %s overrides %s\n"
 msgid "WARNING: %s\n"
@@ -1421,7 +1437,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:4212
+#: scd/app-openpgp.c:4214
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "ikke understøttet algoritme: %s"
@@ -1496,11 +1512,11 @@ msgstr "Certifikatkæde er gyldig"
 msgid "Root certificate trustworthy"
 msgstr "Rodcertifikat er troværdigt"
 
-#: common/audit.c:1112 sm/certchain.c:1242
+#: common/audit.c:1112 sm/certchain.c:1243
 msgid "no CRL found for certificate"
 msgstr "ingen CRL fundet for certifikat"
 
-#: common/audit.c:1115 sm/certchain.c:1252
+#: common/audit.c:1115 sm/certchain.c:1253
 msgid "the available CRL is too old"
 msgstr "den tilgængelige CRL er for gammel"
 
@@ -1547,22 +1563,22 @@ msgstr "[ingen]"
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "ugyldigt radix64-tegn %02x udeladt\n"
 
-#: common/ttyio.c:433
+#: common/ttyio.c:447
 #, c-format
 msgid "Sorry, we are in batchmode - can't get input\n"
 msgstr ""
 
-#: common/ttyio.c:439
+#: common/ttyio.c:453
 #, c-format
 msgid "Sorry, no terminal at all requested - can't get input\n"
 msgstr ""
 
-#: common/ttyio.c:474 common/ttyio.c:484
+#: common/ttyio.c:488 common/ttyio.c:498
 #, c-format
 msgid "too many errors; giving up\n"
 msgstr ""
 
-#: common/ttyio.c:536
+#: common/ttyio.c:550
 #, c-format
 msgid "Control-D detected\n"
 msgstr ""
@@ -1621,8 +1637,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:1036 dirmngr/dirmngr.c:895
-#: dirmngr/dirmngr.c:904
+#: common/init.c:191 sm/gpgsm.c:909 dirmngr/dirmngr.c:935 dirmngr/dirmngr.c:944
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s er for gammel (kræver %s, har %s)\n"
@@ -1782,7 +1797,7 @@ msgid "Enter passphrase: "
 msgstr "Indtast adgangsfrase\n"
 
 #: g10/call-agent.c:318 g10/encrypt.c:282 g10/encrypt.c:818 g10/sign.c:473
-#: sm/call-agent.c:180 sm/encrypt.c:701 sm/sign.c:436
+#: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
 #, fuzzy, c-format
 #| msgid "%s does not yet work with %s\n"
 msgid "%s is not compliant with %s mode\n"
@@ -1794,223 +1809,223 @@ msgstr "%s virker endnu ikke med %s\n"
 msgid "error from TPM: %s\n"
 msgstr "fejl ved læsning fra %s: %s\n"
 
-#: g10/call-agent.c:2123 g10/passphrase.c:225 g10/passphrase.c:258
-#: tools/card-call-scd.c:1751
+#: g10/call-agent.c:2135 g10/passphrase.c:233 g10/passphrase.c:266
+#: tools/card-call-scd.c:1755
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problem med agenten: %s\n"
 
-#: g10/call-dirmngr.c:179 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2316
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2316
 #, fuzzy, c-format
 #| msgid "no gpg-agent running in this session\n"
 msgid "no dirmngr running in this session\n"
 msgstr "ingen gpg-agent kører i denne session\n"
 
-#: g10/call-dirmngr.c:213
+#: g10/call-dirmngr.c:212
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "keyserver option \"honor-keyserver-url\" may not be used in Tor mode\n"
 msgstr "du kan ikke bruge %s i tilstanden %s\n"
 
-#: g10/call-dirmngr.c:386
+#: g10/call-dirmngr.c:385
 msgid "WKD uses a cached result"
 msgstr ""
 
-#: g10/call-dirmngr.c:389
+#: g10/call-dirmngr.c:388
 msgid "Tor is not running"
 msgstr ""
 
-#: g10/call-dirmngr.c:391
+#: g10/call-dirmngr.c:390
 #, fuzzy
 #| msgid "invalid fingerprint"
 msgid "Tor is not properly configured"
 msgstr "ugyldig fingeraftryk"
 
-#: g10/call-dirmngr.c:393
+#: g10/call-dirmngr.c:392
 #, fuzzy
 #| msgid "invalid fingerprint"
 msgid "DNS is not properly configured"
 msgstr "ugyldig fingeraftryk"
 
-#: g10/call-dirmngr.c:395
+#: g10/call-dirmngr.c:394
 msgid "unacceptable HTTP redirect from server"
 msgstr ""
 
-#: g10/call-dirmngr.c:397
+#: g10/call-dirmngr.c:396
 msgid "unacceptable HTTP redirect from server was cleaned up"
 msgstr ""
 
-#: g10/call-dirmngr.c:399
+#: g10/call-dirmngr.c:398
 #, fuzzy
 #| msgid "generate a revocation certificate"
 msgid "server uses an invalid certificate"
 msgstr "opret et tilbagekaldscertifikat"
 
-#: g10/call-dirmngr.c:406 g10/gpg.c:4599
+#: g10/call-dirmngr.c:405 g10/gpg.c:4596
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "panser: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:369 g10/card-util.c:1924
-#: tools/gpg-card.c:3039
+#: g10/card-util.c:86 g10/card-util.c:374 g10/card-util.c:1937
+#: tools/gpg-card.c:3056
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP-kort er ikke tilgængeligt: %s\n"
 
-#: g10/card-util.c:91 g10/card-util.c:1930
+#: g10/card-util.c:91 g10/card-util.c:1943
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP-kortnr. %s detekteret\n"
 
-#: g10/card-util.c:97 g10/card-util.c:2309 g10/delkey.c:164 g10/keyedit.c:1428
-#: g10/keygen.c:4791 g10/revoke.c:214 g10/revoke.c:638
+#: g10/card-util.c:97 g10/card-util.c:2322 g10/delkey.c:164 g10/keyedit.c:1428
+#: g10/keygen.c:4795 g10/revoke.c:214 g10/revoke.c:639
 #, c-format
 msgid "can't do this in batch mode\n"
 msgstr "kan ikke udføre dette i jobtilstand\n"
 
-#: g10/card-util.c:105 tools/gpg-card.c:2943
+#: g10/card-util.c:105 tools/gpg-card.c:2960
 #, c-format
 msgid "This command is only available for version 2 cards\n"
 msgstr "Denne kommando er kun tilgængelig for version 2-kort\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3398 tools/gpg-card.c:2948
+#: g10/card-util.c:107 scd/app-openpgp.c:3399 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"
 
-#: g10/card-util.c:140 g10/card-util.c:1448 g10/card-util.c:1710
-#: g10/card-util.c:1802 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1991 g10/keygen.c:2165 g10/keygen.c:2385 g10/keygen.c:2685
+#: g10/card-util.c:140 g10/card-util.c:1458 g10/card-util.c:1723
+#: g10/card-util.c:1815 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/keygen.c:1992 g10/keygen.c:2166 g10/keygen.c:2386 g10/keygen.c:2686
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
 #: tools/gpg-card.c:510
 msgid "Your selection? "
 msgstr "Dit valg? "
 
-#: g10/card-util.c:262 g10/card-util.c:313 tools/gpg-card.c:596
+#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:596
 #: tools/gpg-card.c:636
 msgid "[not set]"
 msgstr "[ikke indstillet]"
 
-#: g10/card-util.c:558 tools/gpg-card.c:903
+#: g10/card-util.c:563 tools/gpg-card.c:905
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:559 tools/gpg-card.c:904
+#: g10/card-util.c:564 tools/gpg-card.c:906
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:586 tools/gpg-card.c:931
+#: g10/card-util.c:591 tools/gpg-card.c:933
 msgid "not forced"
 msgstr "ikke tvunget"
 
-#: g10/card-util.c:586 tools/gpg-card.c:931
+#: g10/card-util.c:591 tools/gpg-card.c:933
 msgid "forced"
 msgstr "tvunget"
 
-#: g10/card-util.c:768 tools/gpg-card.c:1468
+#: g10/card-util.c:773 tools/gpg-card.c:1484
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Fejl: Kun ren ASCII er tilladt i øjeblikket.\n"
 
-#: g10/card-util.c:770 tools/gpg-card.c:1470
+#: g10/card-util.c:775 tools/gpg-card.c:1486
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Fejl: Tegnet »<« må ikke bruges.\n"
 
-#: g10/card-util.c:772 tools/gpg-card.c:1472
+#: g10/card-util.c:777 tools/gpg-card.c:1488
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Fejl: Dobbelt mellemrum er ikke tilladt.\n"
 
-#: g10/card-util.c:789 tools/gpg-card.c:1505
+#: g10/card-util.c:795 tools/gpg-card.c:1521
 msgid "Cardholder's surname: "
 msgstr "Kortholders efternavn: "
 
-#: g10/card-util.c:791 tools/gpg-card.c:1506
+#: g10/card-util.c:797 tools/gpg-card.c:1522
 msgid "Cardholder's given name: "
 msgstr "Kortholders fornavn: "
 
-#: g10/card-util.c:809 tools/gpg-card.c:1523
+#: g10/card-util.c:816 tools/gpg-card.c:1539
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Fejl: Kombineret navn er for langt (begrænsningen er på %d tegn).\n"
 
-#: g10/card-util.c:830 tools/gpg-card.c:1561
+#: g10/card-util.c:840 tools/gpg-card.c:1577
 msgid "URL to retrieve public key: "
 msgstr "Adresse hvor offentlig nøgle skal hentes: "
 
-#: g10/card-util.c:926 g10/decrypt-data.c:495 g10/import.c:406 g10/import.c:756
-#: g10/import.c:815 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1666
-#: tools/gpgconf.c:437 tools/gpgconf.c:483 tools/gpg-card.c:426
+#: g10/card-util.c:936 g10/decrypt-data.c:495 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:1705
+#: tools/gpgconf.c:471 tools/gpgconf.c:517 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:959 g10/decrypt-data.c:498 g10/export.c:2496
+#: g10/card-util.c:969 g10/decrypt-data.c:498 g10/export.c:2496
 #: dirmngr/crlcache.c:925 tools/gpg-card.c:486 tools/gpg-card.c:493
 #, fuzzy, c-format
 #| msgid "error writing `%s': %s\n"
 msgid "error writing '%s': %s\n"
 msgstr "fejl ved skrivning af »%s«: %s\n"
 
-#: g10/card-util.c:986 tools/gpg-card.c:1650
+#: g10/card-util.c:996 tools/gpg-card.c:1666
 msgid "Login data (account name): "
 msgstr "Loginddata (kontonavn): "
 
-#: g10/card-util.c:1024 tools/gpg-card.c:1945
+#: g10/card-util.c:1034 tools/gpg-card.c:1962
 msgid "Private DO data: "
 msgstr "Private DO-data: "
 
-#: g10/card-util.c:1109 tools/gpg-card.c:1699
+#: g10/card-util.c:1119 tools/gpg-card.c:1715
 msgid "Language preferences: "
 msgstr "Sprogpræferencer: "
 
-#: g10/card-util.c:1117 tools/gpg-card.c:1710
+#: g10/card-util.c:1127 tools/gpg-card.c:1726
 #, c-format
 msgid "Error: invalid length of preference string.\n"
 msgstr "Fejl: ugyldig længde for præferencestreng.\n"
 
-#: g10/card-util.c:1126 tools/gpg-card.c:1719
+#: g10/card-util.c:1136 tools/gpg-card.c:1735
 #, c-format
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Fejl: ugyldige tegn i præferencestreng.\n"
 
-#: g10/card-util.c:1148 tools/gpg-card.c:1753
+#: g10/card-util.c:1158 tools/gpg-card.c:1769
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1162 tools/gpg-card.c:1770
+#: g10/card-util.c:1172 tools/gpg-card.c:1786
 msgid "Error: invalid response.\n"
 msgstr "Fejl: ugyldigt svar.\n"
 
-#: g10/card-util.c:1185 tools/gpg-card.c:1835
+#: g10/card-util.c:1195 tools/gpg-card.c:1852
 msgid "CA fingerprint: "
 msgstr "CA-fingeraftryk: "
 
-#: g10/card-util.c:1209 tools/gpg-card.c:1861
+#: g10/card-util.c:1219 tools/gpg-card.c:1878
 #, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Fejl: Ugyldigt formateret fingeraftryk.\n"
 
-#: g10/card-util.c:1259
+#: g10/card-util.c:1269
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "nøglehandling er ikke mulig: %s\n"
 
-#: g10/card-util.c:1260
+#: g10/card-util.c:1270
 msgid "not an OpenPGP card"
 msgstr "ikke et OpenPGP-kort"
 
-#: g10/card-util.c:1273 g10/keygen.c:4811 g10/keygen.c:5972
+#: g10/card-util.c:1283 g10/keygen.c:4815 g10/keygen.c:6003
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "fejl ved indhentelse af aktuel nøgleinformation: %s\n"
 
-#: g10/card-util.c:1358
+#: g10/card-util.c:1368
 msgid "Replace existing key? (y/N) "
 msgstr "Erstat eksisterende nøgle? (j/N) "
 
-#: g10/card-util.c:1375 tools/gpg-card.c:3328
+#: g10/card-util.c:1385 tools/gpg-card.c:3345
 #, fuzzy
 #| msgid ""
 #| "Note: There is no guarantee that the card supports the requested size.\n"
@@ -2027,112 +2042,112 @@ msgstr ""
 "        dokumentationen for dit kort for at se hvilke størrelser, der\n"
 "        er tilladt.\n"
 
-#: g10/card-util.c:1396 g10/keygen.c:2570 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1406 g10/keygen.c:2571 sm/certreqgen-ui.c:180
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Hvilken nøglestørrelse ønsker du? (%u) "
 
-#: g10/card-util.c:1406 g10/keygen.c:2493 g10/keygen.c:2525
+#: g10/card-util.c:1416 g10/keygen.c:2494 g10/keygen.c:2526
 #: sm/certreqgen-ui.c:195
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "afrundet op til %u bit\n"
 
-#: g10/card-util.c:1414 g10/keygen.c:2578 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1424 g10/keygen.c:2579 sm/certreqgen-ui.c:185
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s nøglestørrelser skal være i intervallet %u-%u\n"
 
-#: g10/card-util.c:1433
+#: g10/card-util.c:1443
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1435
+#: g10/card-util.c:1445
 #, fuzzy
 #| msgid "   (1) Signature key\n"
 msgid "Signature key\n"
 msgstr "   (1) Underskriftsnøgle\n"
 
-#: g10/card-util.c:1437
+#: g10/card-util.c:1447
 #, fuzzy
 #| msgid "   (2) Encryption key\n"
 msgid "Encryption key\n"
 msgstr "   (2) Krypteringsnøgle\n"
 
-#: g10/card-util.c:1439
+#: g10/card-util.c:1449
 #, fuzzy
 #| msgid "   (3) Authentication key\n"
 msgid "Authentication key\n"
 msgstr "   (3) Godkendelsesnøgle\n"
 
-#: g10/card-util.c:1441 g10/keygen.c:2112 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1451 g10/keygen.c:2113 sm/certreqgen-ui.c:158
 msgid "Please select what kind of key you want:\n"
 msgstr "Vælg venligst hvilken slags nøgle du vil have:\n"
 
-#: g10/card-util.c:1442 sm/certreqgen-ui.c:159
+#: g10/card-util.c:1452 sm/certreqgen-ui.c:159
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1443
+#: g10/card-util.c:1453
 #, fuzzy, c-format
 #| msgid "   (%d) DSA and Elgamal\n"
 msgid "   (%d) ECC\n"
 msgstr "   (%d) DSA og Elgamal\n"
 
-#: g10/card-util.c:1455 g10/card-util.c:1722 g10/card-util.c:1822
-#: g10/keyedit.c:900 g10/keygen.c:2017 g10/keygen.c:2045 g10/keygen.c:2172
-#: g10/keygen.c:2425 g10/keygen.c:2713 g10/revoke.c:836
+#: g10/card-util.c:1468 g10/card-util.c:1735 g10/card-util.c:1835
+#: g10/keyedit.c:900 g10/keygen.c:2018 g10/keygen.c:2046 g10/keygen.c:2173
+#: g10/keygen.c:2426 g10/keygen.c:2714 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Ugyldigt valg.\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1541
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr "Kortet vil nu blive omkonfigureret til at oprette en nøgle på %u bit\n"
 
-#: g10/card-util.c:1533
+#: g10/card-util.c:1546
 #, fuzzy, c-format
 #| msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr "Kortet vil nu blive omkonfigureret til at oprette en nøgle på %u bit\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1582
 #, fuzzy, c-format
 #| msgid "error changing size of key %d to %u bits: %s\n"
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "fejl ved ændring af størrelsen på nøglen %d til %u bit: %s\n"
 
-#: g10/card-util.c:1585 g10/card-util.c:2106 g10/card-util.c:2162
+#: g10/card-util.c:1598 g10/card-util.c:2119 g10/card-util.c:2175
 #, fuzzy, c-format
 #| msgid "error getting current key info: %s\n"
 msgid "error getting card info: %s\n"
 msgstr "fejl ved indhentelse af aktuel nøgleinformation: %s\n"
 
-#: g10/card-util.c:1591 g10/card-util.c:1936 g10/card-util.c:2112
-#: g10/card-util.c:2171 tools/gpg-card.c:3057 tools/gpg-card.c:3296
-#: tools/gpg-card.c:3354
+#: g10/card-util.c:1604 g10/card-util.c:1949 g10/card-util.c:2125
+#: g10/card-util.c:2184 tools/gpg-card.c:3074 tools/gpg-card.c:3313
+#: tools/gpg-card.c:3371
 #, fuzzy, c-format
 #| msgid "This command is not allowed while in %s mode.\n"
 msgid "This command is not supported by this card\n"
 msgstr "Denne kommando er ikke tilladt i tilstanden %s.\n"
 
-#: g10/card-util.c:1637 tools/gpg-card.c:2426
+#: g10/card-util.c:1650 tools/gpg-card.c:2443
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 "Lav sikkerhedskopi et andet sted end på kortet for krypteringsnøglen? (J/n) "
 
-#: g10/card-util.c:1651
+#: g10/card-util.c:1664
 #, fuzzy, c-format
 #| msgid "NOTE: keys are already stored on the card!\n"
 msgid "Note: keys are already stored on the card!\n"
 msgstr "BEMÆRK: Nøgler er allerede gemt på kortet!\n"
 
-#: g10/card-util.c:1654 tools/gpg-card.c:2398
+#: g10/card-util.c:1667 tools/gpg-card.c:2415
 msgid "Replace existing keys? (y/N) "
 msgstr "Erstat eksisterende nøgler (j/N) "
 
-#: g10/card-util.c:1666 tools/gpg-card.c:2457
+#: g10/card-util.c:1679 tools/gpg-card.c:2474
 #, fuzzy, c-format
 #| msgid ""
 #| "Please note that the factory settings of the PINs are\n"
@@ -2147,164 +2162,164 @@ msgstr ""
 "   PIN = »%s«     Admin-PIN = »%s«\n"
 "Du bør ændre dem med kommandoen --change-pin\n"
 
-#: g10/card-util.c:1701
+#: g10/card-util.c:1714
 msgid "Please select the type of key to generate:\n"
 msgstr "Vælg venligst hvilken slags nøgle der skal oprettes:\n"
 
-#: g10/card-util.c:1703 g10/card-util.c:1793
+#: g10/card-util.c:1716 g10/card-util.c:1806
 msgid "   (1) Signature key\n"
 msgstr "   (1) Underskriftsnøgle\n"
 
-#: g10/card-util.c:1704 g10/card-util.c:1795
+#: g10/card-util.c:1717 g10/card-util.c:1808
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Krypteringsnøgle\n"
 
-#: g10/card-util.c:1705 g10/card-util.c:1797
+#: g10/card-util.c:1718 g10/card-util.c:1810
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Godkendelsesnøgle\n"
 
-#: g10/card-util.c:1790
+#: g10/card-util.c:1803
 msgid "Please select where to store the key:\n"
 msgstr "Vælg venligst hvor nøglen skal gemmes:\n"
 
-#: g10/card-util.c:1836
+#: g10/card-util.c:1849
 #, fuzzy, c-format
 #| msgid "read failed: %s\n"
 msgid "KEYTOCARD failed: %s\n"
 msgstr "læsning mislykkedes: %s\n"
 
-#: g10/card-util.c:1941 tools/gpg-card.c:3065
+#: g10/card-util.c:1954 tools/gpg-card.c:3082
 #, fuzzy, c-format
 #| msgid "NOTE: keys are already stored on the card!\n"
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr "BEMÆRK: Nøgler er allerede gemt på kortet!\n"
 
-#: g10/card-util.c:1944 tools/gpg-card.c:3068 tools/gpg-card.c:3409
+#: g10/card-util.c:1957 tools/gpg-card.c:3085 tools/gpg-card.c:3426
 #, fuzzy
 #| msgid "Sign it? (y/N) "
 msgid "Continue? (y/N) "
 msgstr "Underskriv? (j/N) "
 
-#: g10/card-util.c:1949 tools/gpg-card.c:3079
+#: g10/card-util.c:1962 tools/gpg-card.c:3096
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2142
+#: g10/card-util.c:2155
 #, fuzzy, c-format
 #| msgid "error closing %s: %s\n"
 msgid "error for setup KDF: %s\n"
 msgstr "fejl ved lukning af %s: %s\n"
 
-#: g10/card-util.c:2188
+#: g10/card-util.c:2201
 #, fuzzy, c-format
 #| msgid "error closing %s: %s\n"
 msgid "error for setup UIF: %s\n"
 msgstr "fejl ved lukning af %s: %s\n"
 
-#: g10/card-util.c:2212 g10/keyedit.c:1263 tools/gpg-card.c:3649
+#: g10/card-util.c:2225 g10/keyedit.c:1263 tools/gpg-card.c:3666
 msgid "quit this menu"
 msgstr "afslut denne menu"
 
-#: g10/card-util.c:2214
+#: g10/card-util.c:2227
 msgid "show admin commands"
 msgstr "vis administratorkommandoer"
 
-#: g10/card-util.c:2215 g10/keyedit.c:1266 tools/gpg-card.c:3652
+#: g10/card-util.c:2228 g10/keyedit.c:1266 tools/gpg-card.c:3669
 msgid "show this help"
 msgstr "vis denne hjælpetekst"
 
-#: g10/card-util.c:2217 tools/gpg-card.c:3654
+#: g10/card-util.c:2230 tools/gpg-card.c:3671
 msgid "list all available data"
 msgstr "vis alle tilgængelige data"
 
-#: g10/card-util.c:2220 tools/gpg-card.c:3656
+#: g10/card-util.c:2233 tools/gpg-card.c:3673
 msgid "change card holder's name"
 msgstr "ændr kortholders navn"
 
-#: g10/card-util.c:2221 tools/gpg-card.c:3657
+#: g10/card-util.c:2234 tools/gpg-card.c:3674
 msgid "change URL to retrieve key"
 msgstr "ændr adresse for at indhente nøgle"
 
-#: g10/card-util.c:2222 tools/gpg-card.c:3658
+#: g10/card-util.c:2235 tools/gpg-card.c:3675
 msgid "fetch the key specified in the card URL"
 msgstr "hent nøglen angivet i kortadressen"
 
-#: g10/card-util.c:2223 tools/gpg-card.c:3659
+#: g10/card-util.c:2236 tools/gpg-card.c:3676
 msgid "change the login name"
 msgstr "ændr logindnavnet"
 
-#: g10/card-util.c:2224 tools/gpg-card.c:3660
+#: g10/card-util.c:2237 tools/gpg-card.c:3677
 msgid "change the language preferences"
 msgstr "ændr sprogpræferencerne"
 
-#: g10/card-util.c:2225 tools/gpg-card.c:3661
+#: g10/card-util.c:2238 tools/gpg-card.c:3678
 #, fuzzy
 #| msgid "change card holder's sex"
 msgid "change card holder's salutation"
 msgstr "ændr kortholders køn"
 
-#: g10/card-util.c:2227 tools/gpg-card.c:3663
+#: g10/card-util.c:2240 tools/gpg-card.c:3680
 msgid "change a CA fingerprint"
 msgstr "ændr et CA-fingeraftryk"
 
-#: g10/card-util.c:2228 tools/gpg-card.c:3664
+#: g10/card-util.c:2241 tools/gpg-card.c:3681
 msgid "toggle the signature force PIN flag"
 msgstr "skift force PIN-flag for underskriften"
 
-#: g10/card-util.c:2229 tools/gpg-card.c:3665
+#: g10/card-util.c:2242 tools/gpg-card.c:3682
 msgid "generate new keys"
 msgstr "opret nye nøgler"
 
-#: g10/card-util.c:2230 tools/gpg-card.c:3666
+#: g10/card-util.c:2243 tools/gpg-card.c:3683
 msgid "menu to change or unblock the PIN"
 msgstr "menu til at ændre eller fjerne blokering for PIN'en"
 
-#: g10/card-util.c:2231 tools/gpg-card.c:3667
+#: g10/card-util.c:2244 tools/gpg-card.c:3684
 msgid "verify the PIN and list all data"
 msgstr "verificer PIN'en og vis alle data"
 
-#: g10/card-util.c:2232 tools/gpg-card.c:3668
+#: g10/card-util.c:2245 tools/gpg-card.c:3685
 msgid "unblock the PIN using a Reset Code"
 msgstr "fjern blokering for PIN'en med en nulstillingskode"
 
-#: g10/card-util.c:2233 tools/gpg-card.c:3672
+#: g10/card-util.c:2246 tools/gpg-card.c:3689
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2235
+#: g10/card-util.c:2248
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr ""
 
-#: g10/card-util.c:2236
+#: g10/card-util.c:2249
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "ændr ejertroværdigheden"
 
-#: g10/card-util.c:2237 tools/gpg-card.c:3674
+#: g10/card-util.c:2250 tools/gpg-card.c:3691
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the User Interaction Flag"
 msgstr "ændr ejertroværdigheden"
 
-#: g10/card-util.c:2361 tools/gpg-card.c:3924
+#: g10/card-util.c:2374 tools/gpg-card.c:3941
 msgid "gpg/card> "
 msgstr "gpg/card> "
 
-#: g10/card-util.c:2402
+#: g10/card-util.c:2415
 msgid "Admin-only command\n"
 msgstr "Kommandoer kun for administratoren\n"
 
-#: g10/card-util.c:2433
+#: g10/card-util.c:2446
 msgid "Admin commands are allowed\n"
 msgstr "Administratorkommandoer er tilladt\n"
 
-#: g10/card-util.c:2435
+#: g10/card-util.c:2448
 msgid "Admin commands are not allowed\n"
 msgstr "Administratorkommandoer er ikke tilladt\n"
 
-#: g10/card-util.c:2546 g10/keyedit.c:2275 tools/gpg-card.c:3814
-#: tools/gpg-card.c:4072
+#: g10/card-util.c:2559 g10/keyedit.c:2275 tools/gpg-card.c:3831
+#: tools/gpg-card.c:4089
 #, c-format
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ugyldig kommando (prøv »help«)\n"
@@ -2314,23 +2329,23 @@ msgstr "Ugyldig kommando (prøv »help«)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output virker ikke for denne kommando\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5293 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5292 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:1934 g10/export.c:2342 g10/export.c:2463
-#: g10/getkey.c:1907 g10/gpg.c:5238 g10/keyedit.c:1450 g10/keyedit.c:2382
-#: g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:703 g10/keyserver.c:1240
-#: g10/revoke.c:230 g10/tofu.c:2168
+#: g10/getkey.c:2032 g10/gpg.c:5237 g10/keyedit.c:1450 g10/keyedit.c:2382
+#: g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:703 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:2002 g10/getkey.c:1915 g10/getkey.c:4330
-#: g10/gpg.c:5247 g10/keyedit.c:2354 g10/keyserver.c:1258 g10/revoke.c:236
-#: g10/revoke.c:665 g10/tofu.c:2176
+#: g10/delkey.c:90 g10/export.c:2002 g10/getkey.c:2040 g10/getkey.c:4455
+#: g10/gpg.c:5246 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"
 msgstr "fejl ved læsning af nøgleblok: %s\n"
@@ -2457,15 +2472,15 @@ msgstr "du må ikke bruge chifferalgoritmen »%s« i tilstanden %s\n"
 msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:555 g10/encrypt.c:808 g10/decrypt-data.c:261 g10/gpg.c:4083
-#: g10/gpg.c:4130 sm/decrypt.c:742 sm/encrypt.c:691 sm/gpgsm.c:1793
+#: g10/encrypt.c:555 g10/encrypt.c:808 g10/decrypt-data.c:261 g10/gpg.c:4080
+#: g10/gpg.c:4127 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1646
 #, 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:564 g10/gpg.c:4095 g10/gpg.c:4142 g10/sig-check.c:155
-#: g10/sign.c:452 sm/gpgsm.c:1803 sm/gpgsm.c:1813 sm/sign.c:596 sm/verify.c:510
+#: g10/encrypt.c:564 g10/gpg.c:4092 g10/gpg.c:4139 g10/sig-check.c:155
+#: g10/sign.c:452 sm/gpgsm.c:1656 sm/gpgsm.c:1666 sm/sign.c:596 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"
@@ -2485,7 +2500,7 @@ msgstr ""
 "ADVARSEL: Tvang for symmetrisk chiffer %s (%d) overtræder modtagerens "
 "præferencer\n"
 
-#: g10/encrypt.c:838 sm/encrypt.c:766
+#: g10/encrypt.c:838 sm/encrypt.c:767
 #, fuzzy, c-format
 #| msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
@@ -2518,7 +2533,7 @@ msgstr "%s/%s krypteret for: »%s«\n"
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "du kan ikke bruge %s i tilstanden %s\n"
 
-#: g10/decrypt-data.c:239 g10/mainproc.c:380 sm/decrypt.c:494
+#: g10/decrypt-data.c:239 g10/mainproc.c:380 sm/decrypt.c:892
 #, fuzzy, c-format
 #| msgid "%s encrypted data\n"
 msgid "%s.%s encrypted data\n"
@@ -2529,7 +2544,7 @@ msgstr "%s krypterede data\n"
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "krypteret med ukendt algoritme %d\n"
 
-#: g10/decrypt-data.c:361 g10/decrypt-data.c:414 sm/decrypt.c:508
+#: g10/decrypt-data.c:361 g10/decrypt-data.c:414 sm/decrypt.c:906
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2572,7 +2587,7 @@ msgstr ""
 msgid " - skipped"
 msgstr "%s: udelod: %s\n"
 
-#: g10/export.c:1333 g10/import.c:2124 g10/openfile.c:202 g10/openfile.c:296
+#: g10/export.c:1333 g10/import.c:2132 g10/openfile.c:202 g10/openfile.c:296
 #: g10/sign.c:1110 g10/sign.c:1447
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
@@ -2610,66 +2625,66 @@ msgstr "fejl ved oprettelse af »%s«: %s\n"
 msgid "[User ID not found]"
 msgstr "[Bruger-id blev ikke fundet]"
 
-#: g10/getkey.c:1199
+#: g10/getkey.c:1324
 #, fuzzy, c-format
 #| msgid "automatically retrieved `%s' via %s\n"
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "hentede automatisk »%s« via %s\n"
 
-#: g10/getkey.c:1205
+#: g10/getkey.c:1330
 #, fuzzy, c-format
 #| msgid "error retrieving `%s' via %s: %s\n"
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "fejl ved indhentelse af »%s« via %s: %s\n"
 
-#: g10/getkey.c:1207
+#: g10/getkey.c:1332
 msgid "No fingerprint"
 msgstr "Ingen fingeraftryk"
 
-#: g10/getkey.c:1449
+#: g10/getkey.c:1574
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1884 g10/revoke.c:657 g10/revoke.c:718
+#: g10/getkey.c:2009 g10/revoke.c:658 g10/revoke.c:719
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "hemmelig nøgle »%s« blev ikke fundet: %s\n"
 
-#: g10/getkey.c:1887 g10/pkclist.c:1012
+#: g10/getkey.c:2012 g10/pkclist.c:1012
 #, fuzzy, c-format
 #| msgid "missing argument for option \"%.50s\"\n"
 msgid "(check argument of option '%s')\n"
 msgstr "manglende parameter for indstilling »%.50s«\n"
 
-#: g10/getkey.c:1965
+#: g10/getkey.c:2090
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "|NAME|brug NAVN som hemmelig standardnøgle"
 
-#: g10/getkey.c:1973
+#: g10/getkey.c:2098
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "|NAME|brug NAVN som hemmelig standardnøgle"
 
-#: g10/getkey.c:1980
+#: g10/getkey.c:2105
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr ""
 
-#: g10/getkey.c:2837
+#: g10/getkey.c:2962
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Ugyldig nøgle %s gjort gyldig med --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:3703
+#: g10/getkey.c:3828
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "bruger undernøgle %s i stedet for primær nøgle %s\n"
 
-#: g10/getkey.c:4259 g10/gpg.c:2167
+#: g10/getkey.c:4384 g10/gpg.c:2168
 #, fuzzy, c-format
 #| msgid "missing argument for option \"%.50s\"\n"
 msgid "valid values for option '%s':\n"
@@ -2869,7 +2884,7 @@ msgstr "|SPEC|opsæt e-post-aliasser"
 msgid "use strict OpenPGP behavior"
 msgstr "brug streng OpenPGP-opførsel"
 
-#: g10/gpg.c:651 kbx/kbxutil.c:91 sm/gpgsm.c:424 tools/gpgconf.c:113
+#: g10/gpg.c:651 kbx/kbxutil.c:91 sm/gpgsm.c:425 tools/gpgconf.c:113
 msgid "do not make any changes"
 msgstr "lav ingen ændringer"
 
@@ -2905,7 +2920,7 @@ msgstr "brug kanonisk teksttilstand"
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|sæt komprimeringsniveauet til N (0 deaktiverer)"
 
-#: g10/gpg.c:762 sm/gpgsm.c:357
+#: g10/gpg.c:762 sm/gpgsm.c:358
 #, fuzzy
 #| msgid "Options controlling the interactivity and enforcement"
 msgid "Options controlling key import and export"
@@ -2927,11 +2942,11 @@ msgstr "importer nøgler fra en nøgleserver"
 msgid "include the public key in signatures"
 msgstr "vis og kontroller nøgleunderskrifter"
 
-#: g10/gpg.c:776 sm/gpgsm.c:360
+#: g10/gpg.c:776 sm/gpgsm.c:361
 msgid "disable all access to the dirmngr"
 msgstr "deaktiver al adgang til dirmngr"
 
-#: g10/gpg.c:788 sm/gpgsm.c:367
+#: g10/gpg.c:788 sm/gpgsm.c:368
 #, fuzzy
 #| msgid "Options controlling the configuration"
 msgid "Options controlling key listings"
@@ -2951,15 +2966,15 @@ msgstr "|USER-ID|krypter for BRUGER-ID"
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|USER-ID|brug BRUGER-ID til at underskrive eller afkryptere"
 
-#: g10/gpg.c:876 sm/gpgsm.c:408
+#: g10/gpg.c:876 sm/gpgsm.c:409
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:895 sm/gpgsm.c:420 dirmngr/dirmngr.c:286
+#: g10/gpg.c:895 sm/gpgsm.c:421 dirmngr/dirmngr.c:289
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:966 sm/gpgsm.c:453
+#: g10/gpg.c:966 sm/gpgsm.c:454
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -3019,7 +3034,7 @@ msgstr ""
 "Sign, check, encrypt eller decrypt\n"
 "standardhandling afhænger af inddata\n"
 
-#: g10/gpg.c:1168 sm/gpgsm.c:636
+#: g10/gpg.c:1168 sm/gpgsm.c:637
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -3043,13 +3058,13 @@ msgstr "Hash: "
 msgid "Compression: "
 msgstr "Komprimering: "
 
-#: g10/gpg.c:1274 sm/gpgsm.c:710
+#: g10/gpg.c:1274 sm/gpgsm.c:711
 #, fuzzy, c-format
 #| msgid "usage: gpgsm [options] "
 msgid "usage: %s [options] %s\n"
 msgstr "brug: gpgsm [tilvalg] "
 
-#: g10/gpg.c:1467 sm/gpgsm.c:803
+#: g10/gpg.c:1467 sm/gpgsm.c:804
 #, c-format
 msgid "conflicting commands\n"
 msgstr "kommandoer er i konflikt\n"
@@ -3060,49 +3075,49 @@ msgstr "kommandoer er i konflikt\n"
 msgid "no = sign found in group definition '%s'\n"
 msgstr "ingen = tegn fundet i gruppedefinition »%s«\n"
 
-#: g10/gpg.c:1683
+#: g10/gpg.c:1684
 #, 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:1686
+#: g10/gpg.c:1687
 #, 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:1689
+#: g10/gpg.c:1690
 #, 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:1695
+#: g10/gpg.c:1696
 #, 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:1698
+#: g10/gpg.c:1699
 #, 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:1701
+#: g10/gpg.c:1702
 #, 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:1707
+#: g10/gpg.c:1708
 #, 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:1710
+#: g10/gpg.c:1711
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -3111,19 +3126,19 @@ msgid ""
 msgstr ""
 "ADVARSEL: Usikkert indelukket mappeejerskab på konfigurationsfil »%s«\n"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1714
 #, 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:1719
+#: g10/gpg.c:1720
 #, 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:1722
+#: g10/gpg.c:1723
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@ -3133,487 +3148,487 @@ msgid ""
 msgstr ""
 "ADVARSEL: Usikre indelukkede mapperettigheder på konfigurationsfil »%s«\n"
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1726
 #, 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:1941
+#: g10/gpg.c:1942
 #, fuzzy, c-format
 #| msgid "unknown configuration item `%s'\n"
 msgid "unknown configuration item '%s'\n"
 msgstr "ukendt konfigurationspunkt »%s«\n"
 
-#: g10/gpg.c:2037
+#: g10/gpg.c:2038
 msgid "display photo IDs during key listings"
 msgstr "vis billed-id'er under nøglevisninger"
 
-#: g10/gpg.c:2039
+#: g10/gpg.c:2040
 #, 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:2041
+#: g10/gpg.c:2042
 msgid "show policy URLs during signature listings"
 msgstr "vil politikadresser under underskriftvisninger"
 
-#: g10/gpg.c:2043
+#: g10/gpg.c:2044
 msgid "show all notations during signature listings"
 msgstr "vis alle notationer under underskriftvisninger"
 
-#: g10/gpg.c:2045
+#: g10/gpg.c:2046
 msgid "show IETF standard notations during signature listings"
 msgstr "vis IETF-standardnotationer under underskriftvisninger"
 
-#: g10/gpg.c:2049
+#: g10/gpg.c:2050
 msgid "show user-supplied notations during signature listings"
 msgstr "vis brugerangivne notationer under underskriftvisninger"
 
-#: g10/gpg.c:2051
+#: g10/gpg.c:2052
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "vis foretrukne nøgleserveradresser under underskriftvisninger"
 
-#: g10/gpg.c:2053
+#: g10/gpg.c:2054
 msgid "show user ID validity during key listings"
 msgstr "vis bruger-id-validitet under nøglevisninger"
 
-#: g10/gpg.c:2055
+#: g10/gpg.c:2056
 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:2057
+#: g10/gpg.c:2058
 msgid "show revoked and expired subkeys in key listings"
 msgstr "vis tilbagekaldte og udløbne undernøgler i nøglevisninger"
 
-#: g10/gpg.c:2059
+#: g10/gpg.c:2060
 msgid "show the keyring name in key listings"
 msgstr "vis nøgleringsnavnet i nøglevisninger"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2062
 msgid "show expiration dates during signature listings"
 msgstr "vis udløbsdatoer under underskriftvisninger"
 
-#: g10/gpg.c:2178
+#: g10/gpg.c:2179
 #, fuzzy, c-format
 #| msgid "unknown option `%s'\n"
 msgid "unknown TOFU policy '%s'\n"
 msgstr "ukendt tilvalg »%s«\n"
 
-#: g10/gpg.c:2180
+#: g10/gpg.c:2181
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2975 g10/gpg.c:3828 g10/gpg.c:3840
+#: g10/gpg.c:2978 g10/gpg.c:3825 g10/gpg.c:3837
 #, 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:3151 g10/gpg.c:3163
+#: g10/gpg.c:3154 g10/gpg.c:3166
 #, 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:3185
+#: g10/gpg.c:3188
 #, 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:3217 sm/gpgsm.c:1270
+#: g10/gpg.c:3220 sm/gpgsm.c:1143
 #, 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:3223 sm/gpgsm.c:1276
+#: g10/gpg.c:3226 sm/gpgsm.c:1149
 #, 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:3280
+#: g10/gpg.c:3283
 #, 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:3302 g10/gpg.c:3511 g10/keyedit.c:5319
+#: g10/gpg.c:3305 g10/gpg.c:3514 g10/keyedit.c:5322
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "kunne ikke fortolke nøgleserveradresse\n"
 
-#: g10/gpg.c:3320
+#: g10/gpg.c:3323
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ugyldige indstillinger for nøgleserver\n"
 
-#: g10/gpg.c:3323
+#: g10/gpg.c:3326
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "ugyldige indstillinger for nøgleserver\n"
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3333
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ugyldige importindstillinger\n"
 
-#: g10/gpg.c:3333
+#: g10/gpg.c:3336
 #, c-format
 msgid "invalid import options\n"
 msgstr "ugyldige importindstillinger\n"
 
-#: g10/gpg.c:3339 g10/gpg.c:3354
+#: g10/gpg.c:3342 g10/gpg.c:3357
 #, fuzzy, c-format
 #| msgid "invalid list options\n"
 msgid "invalid filter option: %s\n"
 msgstr "ugyldige listeindstillinger\n"
 
-#: g10/gpg.c:3345
+#: g10/gpg.c:3348
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ugyldige eksportindstillinger\n"
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3351
 #, c-format
 msgid "invalid export options\n"
 msgstr "ugyldige eksportindstillinger\n"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3363
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ugyldige listeindstillinger\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3366
 #, c-format
 msgid "invalid list options\n"
 msgstr "ugyldige listeindstillinger\n"
 
-#: g10/gpg.c:3371
+#: g10/gpg.c:3374
 msgid "display photo IDs during signature verification"
 msgstr "vis billed-id'er under underskriftverificering"
 
-#: g10/gpg.c:3373
+#: g10/gpg.c:3376
 msgid "show policy URLs during signature verification"
 msgstr "vis politikadresser under underskriftverificering"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3378
 msgid "show all notations during signature verification"
 msgstr "vis alle notationer under underskriftverificering"
 
-#: g10/gpg.c:3377
+#: g10/gpg.c:3380
 msgid "show IETF standard notations during signature verification"
 msgstr "vis IETF-standardnotationer under underskriftverificering"
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3384
 msgid "show user-supplied notations during signature verification"
 msgstr "vis brugerangivne notationer under underskriftverificering"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3386
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "vis foretrukne nøgleserveradresser under underskriftverificering"
 
-#: g10/gpg.c:3385
+#: g10/gpg.c:3388
 msgid "show user ID validity during signature verification"
 msgstr "vis bruger-id-validitet under underskriftverificering"
 
-#: g10/gpg.c:3387
+#: g10/gpg.c:3390
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "vis tilbagekaldte og udløbne bruger-id'er i underskriftverificering"
 
-#: g10/gpg.c:3389
+#: g10/gpg.c:3392
 msgid "show only the primary user ID in signature verification"
 msgstr "vis kun den primære bruger-id i underskriftverificering"
 
-#: g10/gpg.c:3396
+#: g10/gpg.c:3399
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ugyldige verificeringsindstillinger\n"
 
-#: g10/gpg.c:3399
+#: g10/gpg.c:3402
 #, c-format
 msgid "invalid verify options\n"
 msgstr "ugyldige verificeringsindstillinger\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3409
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "kunne ikke angive kørselssti til %s\n"
 
-#: g10/gpg.c:3613
+#: g10/gpg.c:3616
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ugyldig liste for auto-key-locate\n"
 
-#: g10/gpg.c:3616
+#: g10/gpg.c:3619
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "ugyldig liste for auto-key-locate\n"
 
-#: g10/gpg.c:3625
+#: g10/gpg.c:3628
 #, 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:3807 sm/gpgsm.c:1675
+#: g10/gpg.c:3804 sm/gpgsm.c:1528
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "ADVARSEL: program kan oprette en kernefil!\n"
 
-#: g10/gpg.c:3821
+#: g10/gpg.c:3818
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ADVARSEL: %s overskriver %s\n"
 
-#: g10/gpg.c:3830
+#: g10/gpg.c:3827
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ikke tilladt med %s!\n"
 
-#: g10/gpg.c:3833
+#: g10/gpg.c:3830
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er meningsløs sammen med %s!\n"
 
-#: g10/gpg.c:3848 sm/gpgsm.c:1696 dirmngr/dirmngr.c:1123
+#: g10/gpg.c:3845 sm/gpgsm.c:1549 dirmngr/dirmngr.c:1160
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "ADVARSEL: kører med forfalsket systemtid: "
 
-#: g10/gpg.c:3869
+#: g10/gpg.c:3866
 #, 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:3897 g10/gpg.c:3928 sm/gpgsm.c:1763
+#: g10/gpg.c:3894 g10/gpg.c:3925 sm/gpgsm.c:1616
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgt chifferalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3901
 #, 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:3916
+#: g10/gpg.c:3913
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "valgt komprimeringsalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3922
+#: g10/gpg.c:3919
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valgt algoritme for certifikationssammendrag er ugyldig\n"
 
-#: g10/gpg.c:3937
+#: g10/gpg.c:3934
 #, 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:3939
+#: g10/gpg.c:3936
 #, 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:3941
+#: g10/gpg.c:3938
 #, 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:3943
+#: g10/gpg.c:3940
 #, 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:3945
+#: g10/gpg.c:3942
 #, 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:3949
+#: g10/gpg.c:3946
 #, 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:3953
+#: g10/gpg.c:3950
 #, 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:3960
+#: g10/gpg.c:3957
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "ugyldige standardpræferencer\n"
 
-#: g10/gpg.c:3964
+#: g10/gpg.c:3961
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "ugyldige præferencer for personlig chiffer\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3964
 #, 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:3971
+#: g10/gpg.c:3968
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "ugyldige præferencer for personlig sammendrag\n"
 
-#: g10/gpg.c:3975
+#: g10/gpg.c:3972
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "ugyldige præferencer for personlig komprimering\n"
 
-#: g10/gpg.c:3984 g10/gpg.c:3989
+#: g10/gpg.c:3981 g10/gpg.c:3986
 #, 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:4026
+#: g10/gpg.c:4023
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s virker endnu ikke med %s\n"
 
-#: g10/gpg.c:4089
+#: g10/gpg.c:4086
 #, 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:4101
+#: g10/gpg.c:4098
 #, 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:4256
+#: g10/gpg.c:4253
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "kunne ikke initialisere TrustDB: %s\n"
 
-#: g10/gpg.c:4268
+#: g10/gpg.c:4265
 #, 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:4340
+#: g10/gpg.c:4337
 #, 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:4369
+#: g10/gpg.c:4366
 #, 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:4372
+#: g10/gpg.c:4369
 #, 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:4430
+#: g10/gpg.c:4427
 #, 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:4433
+#: g10/gpg.c:4430
 #, 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:4821 g10/keyserver.c:1870
+#: g10/gpg.c:4818 g10/keyserver.c:1629
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "nøgleserver send mislykkedes: %s\n"
 
-#: g10/gpg.c:4826
+#: g10/gpg.c:4823
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "nøgleserver modtag mislykkedes: %s\n"
 
-#: g10/gpg.c:4832
+#: g10/gpg.c:4829
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "nøgleeksport mislykkedes: %s\n"
 
-#: g10/gpg.c:4845
+#: g10/gpg.c:4842
 #, 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:4857
+#: g10/gpg.c:4854
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "nøgleserver søg mislykkedes: %s\n"
 
-#: g10/gpg.c:4870
+#: g10/gpg.c:4867
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "nøgleserver opdater mislykkedes: %s\n"
 
-#: g10/gpg.c:4937
+#: g10/gpg.c:4936
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "fjernelse af panser mislykkedes: %s\n"
 
-#: g10/gpg.c:4948
+#: g10/gpg.c:4947
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "påklædning af panser mislykkedes: %s\n"
 
-#: g10/gpg.c:5053
+#: g10/gpg.c:5052
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "ugyldig hash-algoritme »%s«\n"
 
-#: g10/gpg.c:5205 g10/tofu.c:2156
+#: g10/gpg.c:5204 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:5216
+#: g10/gpg.c:5215
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5272
+#: g10/gpg.c:5271
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5283
+#: g10/gpg.c:5282
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "GÃ¥ til sagen og skriv meddelelsen ...\n"
 
-#: g10/gpg.c:5630
+#: g10/gpg.c:5629
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "den angivne adresse for certifikatpolitik er ugyldig\n"
 
-#: g10/gpg.c:5632
+#: g10/gpg.c:5631
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "den angivne adresse for underskriftpolitik er ugyldig\n"
 
-#: g10/gpg.c:5665
+#: g10/gpg.c:5664
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den angivne adresse for foretrukken nøgleserver er ugyldig\n"
@@ -3626,7 +3641,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:414 tools/gpgconf.c:116 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:415 tools/gpgconf.c:116 tools/gpg-card.c:95
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinformation til denne FD"
 
@@ -3722,98 +3737,98 @@ msgstr "antag inddata er i binært format"
 msgid "repair keys on import"
 msgstr "vis nøglefingeraftryk"
 
-#: g10/import.c:399 g10/import.c:721
+#: g10/import.c:407 g10/import.c:729
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "     udelader bloktype %d\n"
 
-#: g10/import.c:738
+#: g10/import.c:746
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "     %lu-nøgler behandlet\n"
 
-#: g10/import.c:831
+#: g10/import.c:839
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr " Totalt antal behandl.: %lu\n"
 
-#: g10/import.c:834
+#: g10/import.c:842
 #, fuzzy, c-format
 #| msgid "      skipped new keys: %lu\n"
 msgid "    skipped PGP-2 keys: %lu\n"
 msgstr "   udeladte nye nøgler: %lu\n"
 
-#: g10/import.c:836
+#: g10/import.c:844
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "   udeladte nye nøgler: %lu\n"
 
-#: g10/import.c:839
+#: g10/import.c:847
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "      w/o bruger-id'er: %lu\n"
 
-#: g10/import.c:842 sm/import.c:129
+#: g10/import.c:850 sm/import.c:129
 #, c-format
 msgid "              imported: %lu"
 msgstr "           importerede: %lu"
 
-#: g10/import.c:846 sm/import.c:133
+#: g10/import.c:854 sm/import.c:133
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "              uændrede: %lu\n"
 
-#: g10/import.c:848
+#: g10/import.c:856
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "       nye bruger-id'er: %lu\n"
 
-#: g10/import.c:850
+#: g10/import.c:858
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "       nye undernøgler: %lu\n"
 
-#: g10/import.c:852
+#: g10/import.c:860
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "     nye underskrifter: %lu\n"
 
-#: g10/import.c:854
+#: g10/import.c:862
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "  nye nøgletilbagekald: %lu\n"
 
-#: g10/import.c:856 sm/import.c:135
+#: g10/import.c:864 sm/import.c:135
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr " hemmelige nøgler læst: %lu\n"
 
-#: g10/import.c:858 sm/import.c:137
+#: g10/import.c:866 sm/import.c:137
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr " hemmel. nøgler import: %lu\n"
 
-#: g10/import.c:860 sm/import.c:139
+#: g10/import.c:868 sm/import.c:139
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "hemmel. nøgler uændret: %lu\n"
 
-#: g10/import.c:862 sm/import.c:141
+#: g10/import.c:870 sm/import.c:141
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "      ikke importerede: %lu\n"
 
-#: g10/import.c:864
+#: g10/import.c:872
 #, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "  underskrifter ryddet: %lu\n"
 
-#: g10/import.c:866
+#: g10/import.c:874
 #, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "   bruger-id'er ryddet: %lu\n"
 
-#: g10/import.c:1291
+#: g10/import.c:1299
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
@@ -3822,177 +3837,177 @@ msgstr ""
 "ADVARSEL: nøgle %s indeholder præferencer for utilgængelige\n"
 "algoritmer på disse bruger-id'er:\n"
 
-#: g10/import.c:1333
+#: g10/import.c:1341
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "        »%s«: præference for chifferalgoritme %s\n"
 
-#: g10/import.c:1351
+#: g10/import.c:1359
 #, fuzzy, c-format
 #| msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgid "         \"%s\": preference for AEAD algorithm %s\n"
 msgstr "        »%s«: præference for chifferalgoritme %s\n"
 
-#: g10/import.c:1366
+#: g10/import.c:1374
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "        »%s«: præference for sammendragsalgortime %s\n"
 
-#: g10/import.c:1378
+#: g10/import.c:1386
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "        »%s«: præference for komprimeringsalgortime %s\n"
 
-#: g10/import.c:1391
+#: g10/import.c:1399
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "det anbefales på det stærkeste, at du opdaterer dine præferencer og\n"
 
-#: g10/import.c:1393
+#: g10/import.c:1401
 #, c-format
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "gendistribuerer denne nøgle for at undgå potentielle problemer med rod i\n"
 "algoritmen\n"
 
-#: g10/import.c:1418
+#: g10/import.c:1426
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "du kan opdatere dine præferencer med: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:1932 g10/import.c:3053
+#: g10/import.c:1940 g10/import.c:3061
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "nøgle %s: ingen bruger-id\n"
 
-#: g10/import.c:1938
+#: g10/import.c:1946
 #, fuzzy, c-format
 #| msgid "skipped \"%s\": %s\n"
 msgid "key %s: %s\n"
 msgstr "udelod »%s«: %s\n"
 
-#: g10/import.c:1939 g10/import.c:3025
+#: g10/import.c:1947 g10/import.c:3033
 msgid "rejected by import screener"
 msgstr ""
 
-#: g10/import.c:1988
+#: g10/import.c:1996
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "nøgle %s: korruption af PKS-undernøgle er repareret!\n"
 
-#: g10/import.c:2009
+#: g10/import.c:2017
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "nøgle %s: accepteret ikke egenunderskrevet bruger-id »%s«\n"
 
-#: g10/import.c:2020 g10/import.c:2051
+#: g10/import.c:2028 g10/import.c:2059
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "nøgle %s: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:2022
+#: g10/import.c:2030
 #, c-format
 msgid "this may be caused by a missing self-signature\n"
 msgstr "dette kan skyldes en manglende egenunderskrift\n"
 
-#: g10/import.c:2101 g10/import.c:3439
+#: g10/import.c:2109 g10/import.c:3447
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "nøgle %s: offentlig nøgle blev ikke fundet: %s\n"
 
-#: g10/import.c:2107
+#: g10/import.c:2115
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "nøgle %s: ny nøgle - udeladt\n"
 
-#: g10/import.c:2119
+#: g10/import.c:2127
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "ingen skrivbar nøglering fundet: %s\n"
 
-#: g10/import.c:2151 g10/import.c:2253 g10/import.c:3514
+#: g10/import.c:2159 g10/import.c:2261 g10/import.c:3522
 #, fuzzy, c-format
 #| msgid "error writing keyring `%s': %s\n"
 msgid "error writing keyring '%s': %s\n"
 msgstr "fejl ved skrivning af nøglering »%s«: %s\n"
 
-#: g10/import.c:2174
+#: g10/import.c:2182
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "nøgle %s: offentlig nøgle »%s« importeret\n"
 
-#: g10/import.c:2201
+#: g10/import.c:2209
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "nøgle %s: stemmer ikke med vores kopi\n"
 
-#: g10/import.c:2269
+#: g10/import.c:2277
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "nøgle %s: »%s« 1 ny bruger-id\n"
 
-#: g10/import.c:2272
+#: g10/import.c:2280
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "nøgle %s: »%s« %d nye bruger-id'er\n"
 
-#: g10/import.c:2275
+#: g10/import.c:2283
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "nøgle %s: »%s« 1 ny underskrift\n"
 
-#: g10/import.c:2278
+#: g10/import.c:2286
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "nøgle %s: »%s« %d nye underskrifter\n"
 
-#: g10/import.c:2281
+#: g10/import.c:2289
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "nøgle %s: »%s« 1 ny undernøgle\n"
 
-#: g10/import.c:2284
+#: g10/import.c:2292
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "nøgle %s: »%s« %d nye undernøgler\n"
 
-#: g10/import.c:2287
+#: g10/import.c:2295
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "nøgle %s: »%s« %d underskrift renset\n"
 
-#: g10/import.c:2290
+#: g10/import.c:2298
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "nøgle %s: »%s« %d underskrifter renset\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2301
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "nøgle %s: »%s« %d bruger-id renset\n"
 
-#: g10/import.c:2296
+#: g10/import.c:2304
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "nøgle %s: »%s« %d bruger-id'er renset\n"
 
-#: g10/import.c:2332
+#: g10/import.c:2340
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "nøgle %s: »%s« ikke ændret\n"
 
-#: g10/import.c:2692 g10/import.c:2887
+#: g10/import.c:2700 g10/import.c:2895
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "nøgle %s: hemmelig nøgle importeret\n"
 
-#: g10/import.c:2700
+#: g10/import.c:2708
 #, fuzzy, c-format
 #| msgid "skipped: secret key already present\n"
 msgid "key %s: secret key already exists\n"
 msgstr "udelod: hemmelig nøgle er allerede til stede\n"
 
-#: g10/import.c:2708
+#: g10/import.c:2716
 #, fuzzy, c-format
 #| msgid "error sending %s command: %s\n"
 msgid "key %s: error sending to agent: %s\n"
@@ -4006,210 +4021,209 @@ msgstr "fejl under afsendelse af %s-kommando: %s\n"
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2877
+#: g10/import.c:2885
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:3024
+#: g10/import.c:3032
 #, fuzzy, c-format
 #| msgid "secret key \"%s\" not found: %s\n"
 msgid "secret key %s: %s\n"
 msgstr "hemmelig nøgle »%s« blev ikke fundet: %s\n"
 
-#: g10/import.c:3045 g10/import.c:3084
+#: g10/import.c:3053 g10/import.c:3092
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "import af hemmelige nøgler er ikke tilladt\n"
 
-#: g10/import.c:3072
+#: g10/import.c:3080
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "nøgle %s: hemmelig nøgle med ugyldig chiffer %d - udeladt\n"
 
-#: g10/import.c:3234 g10/pkclist.c:75 g10/revoke.c:774
+#: g10/import.c:3242 g10/pkclist.c:75 g10/revoke.c:775
 msgid "No reason specified"
 msgstr "Ingen årsag angivet"
 
-#: g10/import.c:3235 g10/pkclist.c:77 g10/revoke.c:776
+#: g10/import.c:3243 g10/pkclist.c:77 g10/revoke.c:777
 msgid "Key is superseded"
 msgstr "Nøglen er blevet afløst"
 
-#: g10/import.c:3236 g10/pkclist.c:79 g10/revoke.c:775
+#: g10/import.c:3244 g10/pkclist.c:79 g10/revoke.c:776
 msgid "Key has been compromised"
 msgstr "Nøglen er blevet kompromitteret"
 
-#: g10/import.c:3237 g10/pkclist.c:81 g10/revoke.c:777
+#: g10/import.c:3245 g10/pkclist.c:81 g10/revoke.c:778
 msgid "Key is no longer used"
 msgstr "Nøglen bruges ikke længere"
 
-#: g10/import.c:3238 g10/pkclist.c:83 g10/revoke.c:778
+#: g10/import.c:3246 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "Bruger-id er ikke længere gyldigt"
 
-#: g10/import.c:3363 g10/keylist.c:1105 g10/pkclist.c:87
+#: g10/import.c:3371 g10/keylist.c:1105 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "Ã¥rsag for tilbagekald: "
 
-#: g10/import.c:3382 g10/keylist.c:1124 g10/pkclist.c:103
+#: g10/import.c:3390 g10/keylist.c:1124 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "tilbagekaldskommentar: "
 
-#: g10/import.c:3432
+#: g10/import.c:3440
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "nøgle %s: ingen offentlig nøgle - kan ikke anvende tilbagekaldscertifikat\n"
 
-#: g10/import.c:3461
+#: g10/import.c:3469
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "nøgle %s: kan ikke lokalisere original nøgleblok: %s\n"
 
-#: g10/import.c:3468
+#: g10/import.c:3476
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "nøgle %s: kan ikke læse original nøgleblok: %s\n"
 
-#: g10/import.c:3488
+#: g10/import.c:3496
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "nøgle %s: ugyldigt tilbagekaldscertifikat: %s - afvist\n"
 
-#: g10/import.c:3523
+#: g10/import.c:3531
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "nøgle %s: »%s« tilbagekaldscertifikat importeret\n"
 
-#: g10/import.c:3609
+#: g10/import.c:3617
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "nøgle %s: ingen bruger-id for underskrift\n"
 
-#: g10/import.c:3626
+#: g10/import.c:3634
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "nøgle %s: ikke understøttet offentlig nøglealgoritme på bruger-id »%s«\n"
 
-#: g10/import.c:3628
+#: g10/import.c:3636
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "nøgle %s: ugyldig egenunderskrift på bruger-id »%s«\n"
 
-#: g10/import.c:3645 g10/import.c:3673 g10/import.c:3729
+#: g10/import.c:3653 g10/import.c:3681 g10/import.c:3737
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "nøgle %s: ikke understøttet offentlig nøglealgoritme\n"
 
-#: g10/import.c:3646
+#: g10/import.c:3654
 #, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "nøgle %s: ugyldig direkte nøgleunderskrift\n"
 
-#: g10/import.c:3660
+#: g10/import.c:3668
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "nøgle %s: ingen undernøgle for nøglebinding\n"
 
-#: g10/import.c:3675
+#: g10/import.c:3683
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "nøgle %s: ugyldig undernøglebinding\n"
 
-#: g10/import.c:3694
+#: g10/import.c:3702
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "nøgle %s: fjernet flerundernøglebinding\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3726
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "nøgle %s: ingen undernøgle for nøgletilbagekald\n"
 
-#: g10/import.c:3731
+#: g10/import.c:3739
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "nøgle %s: ugyldig undernøgletilbagekald\n"
 
-#: g10/import.c:3746
+#: g10/import.c:3754
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "nøgle %s: fjernet flerundernøgletilbagekald\n"
 
-#: g10/import.c:3790
+#: g10/import.c:3798
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "nøgle %s: udeladt bruger-id »%s«\n"
 
-#: g10/import.c:3817
+#: g10/import.c:3825
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "nøgle %s: udeladt undernøgle\n"
 
-#: g10/import.c:3849
+#: g10/import.c:3857
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr ""
 "nøgle %s: underskrift der ikke kan eksporteres (klasse 0x%02X) - udeladt\n"
 
-#: g10/import.c:3860
+#: g10/import.c:3868
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "nøgle %s: tilbagekaldscertifikat på forkert sted - udeladt\n"
 
-#: g10/import.c:3878
+#: g10/import.c:3886
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "nøgle %s: ugyldigt tilbagekaldscertifikat: %s - udeladt\n"
 
-#: g10/import.c:3892
+#: g10/import.c:3900
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "nøgle %s: undernøgleunderskrift på forkert sted - udeladt\n"
 
-#: g10/import.c:3900
+#: g10/import.c:3908
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "nøgle %s: uventet underskriftklasse (0x%02X) - udeladt\n"
 
-#: g10/import.c:4073
+#: g10/import.c:4081
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "nøgle %s: duplikeret bruger-id detekteret - sammenføjet\n"
 
-#: g10/import.c:4180
+#: g10/import.c:4188
 #, fuzzy, c-format
 #| msgid "key %s: duplicated user ID detected - merged\n"
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr "nøgle %s: duplikeret bruger-id detekteret - sammenføjet\n"
 
-#: g10/import.c:4245
+#: g10/import.c:4253
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "ADVARSEL: nøgle %s kan tilbagekaldes: henter tilbagekaldsnøgle %s\n"
 
-#: g10/import.c:4261
+#: g10/import.c:4269
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "ADVARSEL: nøgle %s kan tilbagekaldes: tilbagekaldsnøgle %s er ikke til "
 "stede.\n"
 
-#: g10/import.c:4327
+#: g10/import.c:4335
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "nøgle %s: »%s« tilbagekaldscertifikat tilføjet\n"
 
-#: g10/import.c:4365
+#: g10/import.c:4373
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "nøgle %s: direkte nøgleunderskrift tilføjet\n"
 
-#: g10/key-check.c:133 dirmngr/dirmngr_ldap.c:650 dirmngr/ldap-wrapper.c:835
-#: dirmngr/ldap-wrapper.c:852
+#: g10/key-check.c:133 dirmngr/ldap-wrapper.c:835 dirmngr/ldap-wrapper.c:852
 #, fuzzy, c-format
 #| msgid "error allocating enough memory: %s\n"
 msgid "error allocating memory: %s\n"
@@ -4279,7 +4293,7 @@ msgid ""
 "all signatures.\n"
 msgstr ""
 
-#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:284 sm/keydb.c:297
+#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:289 sm/keydb.c:302
 #, fuzzy, c-format
 #| msgid "error creating keybox `%s': %s\n"
 msgid "error creating keybox '%s': %s\n"
@@ -4291,7 +4305,7 @@ msgstr "fejl ved oprettelse af nøgleboks »%s«: %s\n"
 msgid "error creating keyring '%s': %s\n"
 msgstr "fejl ved oprettelse af nøglering »%s«: %s\n"
 
-#: g10/keydb.c:388 sm/keydb.c:303
+#: g10/keydb.c:388 sm/keydb.c:308
 #, fuzzy, c-format
 #| msgid "keybox `%s' created\n"
 msgid "keybox '%s' created\n"
@@ -4558,8 +4572,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:6192 g10/keyedit.c:6275 g10/keyedit.c:6404
-#: g10/keyedit.c:6466 g10/sign.c:528
+#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
+#: g10/keyedit.c:6474 g10/sign.c:528
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "underskrift mislykkedes: %s\n"
@@ -4962,7 +4976,7 @@ msgstr "Ingen sådan bruger-id.\n"
 msgid "Nothing to sign.\n"
 msgstr "Intet at underskrive med nøgle %s\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6057
+#: g10/keyedit.c:2973 g10/keyedit.c:6065
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "Ikke underskrevet af dig.\n"
@@ -5033,7 +5047,7 @@ msgstr "Denne nøgle er tilbagekaldt af %s nøgle %s"
 msgid "(sensitive)"
 msgstr "(sensitiv)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:525
+#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "oprettet: %s"
@@ -5049,7 +5063,7 @@ msgid "expired: %s"
 msgstr "udløbet: %s"
 
 #: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2262
-#: g10/keyserver.c:531
+#: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "udløber: %s"
@@ -5085,13 +5099,13 @@ 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:535
-#: g10/mainproc.c:2280 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
+#: g10/mainproc.c:2282 g10/tofu.c:1789 g10/trust.c:426 dirmngr/ocsp.c:792
 msgid "revoked"
 msgstr "tilbagekaldt"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:539
-#: g10/mainproc.c:2282 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
+#: g10/mainproc.c:2284 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "udløbet"
 
@@ -5133,7 +5147,7 @@ msgstr "Er du sikker på, at du stadig ønsker at tilføje den? (j/N) "
 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:3107
+#: g10/keyedit.c:4273 g10/keygen.c:3111
 msgid "Such a user ID already exists on this key!\n"
 msgstr "Sådant et bruger-id findes allerede på denne nøgle!\n"
 
@@ -5290,7 +5304,7 @@ msgstr ""
 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:5357 g10/keyedit.c:5495
+#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "udelader v3 egenunderskrift på bruger-id »%s«\n"
@@ -5299,130 +5313,130 @@ msgstr "udelader v3 egenunderskrift på bruger-id »%s«\n"
 msgid "Enter your preferred keyserver URL: "
 msgstr "Indtast din foretrukne nøglerserveradresse: "
 
-#: g10/keyedit.c:5380
+#: g10/keyedit.c:5383
 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:5381
+#: g10/keyedit.c:5384
 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:5441
+#: g10/keyedit.c:5449
 msgid "Enter the notation: "
 msgstr "Indtast notationen: "
 
-#: g10/keyedit.c:5588
+#: g10/keyedit.c:5596
 msgid "Proceed? (y/N) "
 msgstr "Fortsæt? (j/N) "
 
-#: g10/keyedit.c:5658
+#: g10/keyedit.c:5666
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:5720
+#: g10/keyedit.c:5728
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Ingen bruger-id med hash %s\n"
 
-#: g10/keyedit.c:5821
+#: g10/keyedit.c:5829
 #, 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:5843
+#: g10/keyedit.c:5851
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Ingen undernøgle med indeks %d\n"
 
-#: g10/keyedit.c:5984
+#: g10/keyedit.c:5992
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "bruger-id: »%s«\n"
 
-#: g10/keyedit.c:5987 g10/keyedit.c:6089 g10/keyedit.c:6137
+#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
 #, 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:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
+#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
 msgid " (non-exportable)"
 msgstr " (kan ikke eksporteres)"
 
-#: g10/keyedit.c:5993
+#: g10/keyedit.c:6001
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denne underskrift udløb den %s.\n"
 
-#: g10/keyedit.c:5998
+#: g10/keyedit.c:6006
 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:6003
+#: g10/keyedit.c:6011
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Opret et tilbagekaldscertifikat for denne underskrift? (j/N) "
 
-#: g10/keyedit.c:6063
+#: g10/keyedit.c:6071
 #, 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:6092
+#: g10/keyedit.c:6100
 msgid " (non-revocable)"
 msgstr " (kan ikke tilbagekaldes)"
 
-#: g10/keyedit.c:6099
+#: g10/keyedit.c:6107
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "tilbagekaldt af din nøgle %s på %s\n"
 
-#: g10/keyedit.c:6124
+#: g10/keyedit.c:6132
 msgid "You are about to revoke these signatures:\n"
 msgstr "Du er i gang med at tilbagekalde disse underskrifter:\n"
 
-#: g10/keyedit.c:6147
+#: g10/keyedit.c:6155
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Opret tilbagekaldscertifikaterne? (j/N) "
 
-#: g10/keyedit.c:6180
+#: g10/keyedit.c:6188
 #, c-format
 msgid "no secret key\n"
 msgstr "ingen hemmelig nøgle\n"
 
-#: g10/keyedit.c:6228
+#: g10/keyedit.c:6236
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6238
+#: g10/keyedit.c:6246
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "bruger-id »%s« er allerede tilbagekaldt\n"
 
-#: g10/keyedit.c:6255
+#: g10/keyedit.c:6263
 #, 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:6351
+#: g10/keyedit.c:6359
 #, 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:6389
+#: g10/keyedit.c:6397
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Nøgle %s er allerede tilbagekaldt.\n"
 
-#: g10/keyedit.c:6451
+#: g10/keyedit.c:6459
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Undernøgle %s er allerede tilbagekaldt.\n"
 
-#: g10/keyedit.c:6548
+#: g10/keyedit.c:6556
 #, 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"
@@ -5433,66 +5447,66 @@ msgstr "Viser %s billed'id med størrelse %ld for nøgle %s (uid %d)\n"
 msgid "invalid value for option '%s'\n"
 msgstr "manglende parameter for indstilling »%.50s«\n"
 
-#: g10/keygen.c:338
+#: g10/keygen.c:339
 #, fuzzy, c-format
 #| msgid "preference `%s' duplicated\n"
 msgid "preference '%s' duplicated\n"
 msgstr "præference »%s« duplikeret\n"
 
-#: g10/keygen.c:345
+#: g10/keygen.c:346
 #, c-format
 msgid "too many cipher preferences\n"
 msgstr "for mange chifferpræferencer\n"
 
-#: g10/keygen.c:347
+#: g10/keygen.c:348
 #, c-format
 msgid "too many digest preferences\n"
 msgstr "for mange sammendragpræferencer\n"
 
-#: g10/keygen.c:349
+#: g10/keygen.c:350
 #, c-format
 msgid "too many compression preferences\n"
 msgstr "for mange komprimeringspræferencer\n"
 
-#: g10/keygen.c:351
+#: g10/keygen.c:352
 #, fuzzy, c-format
 #| msgid "too many cipher preferences\n"
 msgid "too many AEAD preferences\n"
 msgstr "for mange chifferpræferencer\n"
 
-#: g10/keygen.c:521
+#: g10/keygen.c:522
 #, fuzzy, c-format
 #| msgid "invalid item `%s' in preference string\n"
 msgid "invalid item '%s' in preference string\n"
 msgstr "ugyldigt punkt »%s« i præferencestreng\n"
 
-#: g10/keygen.c:1130
+#: g10/keygen.c:1131
 #, c-format
 msgid "writing direct signature\n"
 msgstr "skriver direkte underskrift\n"
 
-#: g10/keygen.c:1176
+#: g10/keygen.c:1177
 #, c-format
 msgid "writing self signature\n"
 msgstr "skriver egenunderskrift\n"
 
-#: g10/keygen.c:1233
+#: g10/keygen.c:1234
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "skriver underskrift for nøglebinding\n"
 
-#: g10/keygen.c:1598 g10/keygen.c:1603 g10/keygen.c:1655 g10/keygen.c:1660
-#: g10/keygen.c:1832 g10/keygen.c:1837
+#: g10/keygen.c:1599 g10/keygen.c:1604 g10/keygen.c:1656 g10/keygen.c:1661
+#: g10/keygen.c:1833 g10/keygen.c:1838
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "nøglestørrelse er ugyldig; bruger %u bit\n"
 
-#: g10/keygen.c:1609 g10/keygen.c:1666 g10/keygen.c:1674 g10/keygen.c:1843
+#: g10/keygen.c:1610 g10/keygen.c:1667 g10/keygen.c:1675 g10/keygen.c:1844
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "nøglestørrelse afrundet op til %u bit\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1701
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
@@ -5500,19 +5514,19 @@ msgstr ""
 "ADVARSEL: Nogle OpenPGP-programmer kan ikke håndtere en DS-nøgle med denne\n"
 "sammendragsstørrelse\n"
 
-#: g10/keygen.c:1899
+#: g10/keygen.c:1900
 msgid "Sign"
 msgstr "Underskriv"
 
-#: g10/keygen.c:1902
+#: g10/keygen.c:1903
 msgid "Certify"
 msgstr "Certificer"
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1906
 msgid "Encrypt"
 msgstr "Krypter"
 
-#: g10/keygen.c:1908
+#: g10/keygen.c:1909
 msgid "Authenticate"
 msgstr "Godkend"
 
@@ -5526,123 +5540,123 @@ msgstr "Godkend"
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1929
+#: g10/keygen.c:1930
 msgid "SsEeAaQq"
 msgstr "UuKkGfAa"
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1967
 #, fuzzy, c-format
 #| msgid "Possible actions for a %s key: "
 msgid "Possible actions for this %s key: "
 msgstr "Mulige handligner for en %s-nøgle: "
 
-#: g10/keygen.c:1973
+#: g10/keygen.c:1974
 msgid "Current allowed actions: "
 msgstr "Aktuelt tilladte handlinger: "
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1979
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Skift evnen til at underskrive\n"
 
-#: g10/keygen.c:1981
+#: g10/keygen.c:1982
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Skift evnen til at kryptere\n"
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1985
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Skift evnen til at godkende\n"
 
-#: g10/keygen.c:1987
+#: g10/keygen.c:1988
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Afsluttet\n"
 
-#: g10/keygen.c:2116
+#: g10/keygen.c:2117
 #, fuzzy, c-format
 #| msgid "   (%d) RSA and RSA (default)\n"
 msgid "   (%d) RSA and RSA%s\n"
 msgstr "   (%d) RSA og RSA (standard)\n"
 
-#: g10/keygen.c:2120
+#: g10/keygen.c:2121
 #, fuzzy, c-format
 #| msgid "   (%d) DSA and Elgamal\n"
 msgid "   (%d) DSA and Elgamal%s\n"
 msgstr "   (%d) DSA og Elgamal\n"
 
-#: g10/keygen.c:2123
+#: g10/keygen.c:2124
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "   (%d) DSA (sign only)%s\n"
 msgstr "   (%d) DSA (kun underskriv)\n"
 
-#: g10/keygen.c:2125
+#: g10/keygen.c:2126
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (sign only)\n"
 msgid "   (%d) RSA (sign only)%s\n"
 msgstr "   (%d) RSA (kun underskriv)\n"
 
-#: g10/keygen.c:2131
+#: g10/keygen.c:2132
 #, fuzzy, c-format
 #| msgid "   (%d) Elgamal (encrypt only)\n"
 msgid "   (%d) Elgamal (encrypt only)%s\n"
 msgstr "   (%d) Elgamal (kun krypter)\n"
 
-#: g10/keygen.c:2133
+#: g10/keygen.c:2134
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (encrypt only)\n"
 msgid "   (%d) RSA (encrypt only)%s\n"
 msgstr "   (%d) RSA (kun krypter)\n"
 
-#: g10/keygen.c:2139
+#: g10/keygen.c:2140
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (set your own capabilities)\n"
 msgid "   (%d) DSA (set your own capabilities)%s\n"
 msgstr "   (%d) DSA (angiv dine egne evner)\n"
 
-#: g10/keygen.c:2141
+#: g10/keygen.c:2142
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (set your own capabilities)\n"
 msgid "   (%d) RSA (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (angiv dine egne evner)\n"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2148
 #, fuzzy, c-format
 #| msgid "   (%d) sign, encrypt\n"
 msgid "   (%d) ECC (sign and encrypt)%s\n"
 msgstr "   (%d) underskriv, krypter\n"
 
-#: g10/keygen.c:2147 g10/keygen.c:2678
+#: g10/keygen.c:2148 g10/keygen.c:2679
 msgid " *default*"
 msgstr ""
 
-#: g10/keygen.c:2148
+#: g10/keygen.c:2149
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "  (%d) ECC (sign only)\n"
 msgstr "   (%d) DSA (kun underskriv)\n"
 
-#: g10/keygen.c:2150
+#: g10/keygen.c:2151
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (set your own capabilities)\n"
 msgid "  (%d) ECC (set your own capabilities)%s\n"
 msgstr "   (%d) DSA (angiv dine egne evner)\n"
 
-#: g10/keygen.c:2152
+#: g10/keygen.c:2153
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (encrypt only)\n"
 msgid "  (%d) ECC (encrypt only)%s\n"
 msgstr "   (%d) RSA (kun krypter)\n"
 
-#: g10/keygen.c:2156
+#: g10/keygen.c:2157
 #, fuzzy, c-format
 #| msgid "   (%d) Existing key\n"
 msgid "  (%d) Existing key%s\n"
 msgstr "   (%d) Eksisterende nøgle\n"
 
-#: g10/keygen.c:2158
+#: g10/keygen.c:2159
 #, fuzzy, c-format
 #| msgid "   (%d) Existing key from card\n"
 msgid "  (%d) Existing key from card%s\n"
@@ -5651,62 +5665,62 @@ msgstr "   (%d) Eksisterende nøgle fra kort\n"
 # key grip
 # chiefly  ( US ) See also grip the person in charge of moving and setting up camera
 # tracks and scenery in a film or television studio
-#: g10/keygen.c:2254 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2255 sm/certreqgen-ui.c:203
 msgid "Enter the keygrip: "
 msgstr "Indtst nøglegrebet: "
 
-#: g10/keygen.c:2267 sm/certreqgen-ui.c:211 tools/gpg-card.c:2280
+#: g10/keygen.c:2268 sm/certreqgen-ui.c:211 tools/gpg-card.c:2297
 #, c-format
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr "Ikke et gyldigt nøglegreb (forventer 40 hex cifre)\n"
 
-#: g10/keygen.c:2269 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2270 sm/certreqgen-ui.c:213
 msgid "No key with this keygrip\n"
 msgstr "Ingen nøgle med dette nøglegreb\n"
 
-#: g10/keygen.c:2288 g10/keygen.c:2298 g10/keygen.c:3440 g10/keygen.c:3451
+#: g10/keygen.c:2289 g10/keygen.c:2299 g10/keygen.c:3444 g10/keygen.c:3455
 #: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
 #, c-format
 msgid "error reading the card: %s\n"
 msgstr "fejl ved læsning af kort: %s\n"
 
-#: g10/keygen.c:2292 g10/keygen.c:3444 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2293 g10/keygen.c:3448 sm/certreqgen-ui.c:234
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "Serielnummer for kortet: %s\n"
 
-#: g10/keygen.c:2311 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2312 sm/certreqgen-ui.c:246
 msgid "Available keys:\n"
 msgstr "Tilgængelige nøgler:\n"
 
-#: g10/keygen.c:2504 g10/keygen.c:2518
+#: g10/keygen.c:2505 g10/keygen.c:2519
 #, fuzzy, c-format
 #| msgid "rounded up to %u bits\n"
 msgid "rounded to %u bits\n"
 msgstr "afrundet op til %u bit\n"
 
-#: g10/keygen.c:2559
+#: g10/keygen.c:2560
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s nøgler kan være mellem %u og %u bit lange.\n"
 
-#: g10/keygen.c:2567
+#: g10/keygen.c:2568
 #, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Hvilken nøglestørrelse ønsker du for undernøglen? (%u) "
 
-#: g10/keygen.c:2584 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2585 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Ønsket nøglestørrelse er %u bit\n"
 
-#: g10/keygen.c:2630
+#: g10/keygen.c:2631
 #, fuzzy
 #| msgid "Please select what kind of key you want:\n"
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Vælg venligst hvilken slags nøgle du vil have:\n"
 
-#: g10/keygen.c:2819
+#: g10/keygen.c:2820
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5722,7 +5736,7 @@ msgstr ""
 "      <n>m = nøgle udløber om n måneder\n"
 "      <n>y = nøgle udløber om n år\n"
 
-#: g10/keygen.c:2830
+#: g10/keygen.c:2831
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5738,38 +5752,38 @@ msgstr ""
 "      <n>m = underskriften udløber om n måneder\n"
 "      <n>y = underskriften udløber om n år\n"
 
-#: g10/keygen.c:2853
+#: g10/keygen.c:2854
 msgid "Key is valid for? (0) "
 msgstr "Nøgle er gyldig for? (0) "
 
-#: g10/keygen.c:2858
+#: g10/keygen.c:2859
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Underskrift er gyldig for? (%s) "
 
-#: g10/keygen.c:2871 g10/keygen.c:2896
+#: g10/keygen.c:2875 g10/keygen.c:2900
 msgid "invalid value\n"
 msgstr "ugyldig værdi\n"
 
-#: g10/keygen.c:2878
+#: g10/keygen.c:2882
 msgid "Key does not expire at all\n"
 msgstr "Nøglen udløber aldrig\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2883
 msgid "Signature does not expire at all\n"
 msgstr "Underskriften udløber aldrig\n"
 
-#: g10/keygen.c:2884
+#: g10/keygen.c:2888
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Nøglen udløber den %s\n"
 
-#: g10/keygen.c:2885
+#: g10/keygen.c:2889
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Underskriften udløber den %s\n"
 
-#: g10/keygen.c:2889
+#: g10/keygen.c:2893
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5777,11 +5791,11 @@ msgstr ""
 "Dit system kan ikke vise datoer efter 2038.\n"
 "Det vil dog blive korrekt håndteret op til 2106.\n"
 
-#: g10/keygen.c:2902
+#: g10/keygen.c:2906
 msgid "Is this correct? (y/N) "
 msgstr "Er dette korrekt? (j/N) "
 
-#: g10/keygen.c:2970
+#: g10/keygen.c:2974
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5795,7 +5809,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2985
+#: g10/keygen.c:2989
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5811,50 +5825,50 @@ msgstr ""
 "    »Heinrich Heine (digteren) <heinrichh@duesseldorf.de>«\n"
 "\n"
 
-#: g10/keygen.c:3004
+#: g10/keygen.c:3008
 msgid "Real name: "
 msgstr "Fødselsnavn: "
 
-#: g10/keygen.c:3013
+#: g10/keygen.c:3017
 msgid "Invalid character in name\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/keygen.c:3014
+#: g10/keygen.c:3018
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:3018
+#: g10/keygen.c:3022
 msgid "Name may not start with a digit\n"
 msgstr "Navn må ikke starte med et tal\n"
 
-#: g10/keygen.c:3021
+#: g10/keygen.c:3025
 msgid "Name must be at least 5 characters long\n"
 msgstr "Navn skal være mindst 5 bogstaver langt\n"
 
-#: g10/keygen.c:3031
+#: g10/keygen.c:3035
 msgid "Email address: "
 msgstr "E-post-adresse: "
 
-#: g10/keygen.c:3037
+#: g10/keygen.c:3041
 msgid "Not a valid email address\n"
 msgstr "Ikke en gyldig e-post-adresse\n"
 
-#: g10/keygen.c:3046
+#: g10/keygen.c:3050
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:3052
+#: g10/keygen.c:3056
 msgid "Invalid character in comment\n"
 msgstr "Ugyldigt tegn i kommentar\n"
 
-#: g10/keygen.c:3088
+#: g10/keygen.c:3092
 #, fuzzy, c-format
 #| msgid "You are using the `%s' character set.\n"
 msgid "You are using the '%s' character set.\n"
 msgstr "Du bruger tegnsættet »%s«.\n"
 
-#: g10/keygen.c:3094
+#: g10/keygen.c:3098
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5865,7 +5879,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3099
+#: g10/keygen.c:3103
 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"
 
@@ -5880,35 +5894,35 @@ msgstr "Placer ikke e-post-adressen i fødselsnavnet eller kommentaren\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3124
+#: g10/keygen.c:3128
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:3134
+#: g10/keygen.c:3138
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Ændr (N)avn, (K)ommentar, (E)-post eller afslut(Q)? "
 
-#: g10/keygen.c:3135
+#: g10/keygen.c:3139
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Ændr (N)avn, (K)ommentar, (E)post eller (O)kay/afslut(Q)? "
 
-#: g10/keygen.c:3140
+#: g10/keygen.c:3144
 #, fuzzy
 #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Ændr (N)avn, (K)ommentar, (E)-post eller afslut(Q)? "
 
-#: g10/keygen.c:3141
+#: g10/keygen.c:3145
 #, fuzzy
 #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "Ændr (N)avn, (K)ommentar, (E)post eller (O)kay/afslut(Q)? "
 
-#: g10/keygen.c:3160
+#: g10/keygen.c:3164
 msgid "Please correct the error first\n"
 msgstr "Ret venligst fejlen først\n"
 
-#: g10/keygen.c:3206
+#: g10/keygen.c:3210
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -5920,18 +5934,18 @@ msgstr ""
 "under oprettelse af primtallet; dette giver det vilkårlig\n"
 "taloprettelsesprogram en bedre mulighed for at opnå nok entropi.\n"
 
-#: g10/keygen.c:3591
+#: g10/keygen.c:3595
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4590 g10/keygen.c:4663 g10/keygen.c:4681 g10/keygen.c:4710
-#: g10/keygen.c:5086 g10/keygen.c:5632 g10/keygen.c:5943 g10/keygen.c:6050
+#: g10/keygen.c:4594 g10/keygen.c:4667 g10/keygen.c:4685 g10/keygen.c:4714
+#: g10/keygen.c:5113 g10/keygen.c:5663 g10/keygen.c:5974 g10/keygen.c:6081
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Nøgleoprettelse mislykkedes: %s\n"
 
-#: g10/keygen.c:4599
+#: g10/keygen.c:4603
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5939,72 +5953,72 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:4601
+#: g10/keygen.c:4605
 msgid "Continue? (Y/n) "
 msgstr ""
 
-#: g10/keygen.c:4622
+#: g10/keygen.c:4626
 #, fuzzy, c-format
 #| msgid "key already exists\n"
 msgid "A key for \"%s\" already exists\n"
 msgstr "nøgle findes allerede\n"
 
-#: g10/keygen.c:4627
+#: g10/keygen.c:4631
 #, fuzzy
 #| msgid "Use this key anyway? (y/N) "
 msgid "Create anyway? (y/N) "
 msgstr "Brug denne nøgle alligevel? (j/N) "
 
-#: g10/keygen.c:4633
+#: g10/keygen.c:4637
 #, fuzzy, c-format
 #| msgid "generating new key\n"
 msgid "creating anyway\n"
 msgstr "opretter ny nøgle\n"
 
-#: g10/keygen.c:5069
+#: g10/keygen.c:5096
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 
-#: g10/keygen.c:5118
+#: g10/keygen.c:5145
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Nøgleoprettelse annulleret.\n"
 
-#: g10/keygen.c:5178
+#: g10/keygen.c:5205
 #, fuzzy, c-format
 #| msgid "can't create backup file `%s': %s\n"
 msgid "can't create backup file '%s': %s\n"
 msgstr "kan ikke oprette sikkerhedskopifil »%s«: %s\n"
 
-#: g10/keygen.c:5198
+#: g10/keygen.c:5225
 #, fuzzy, c-format
 #| msgid "NOTE: backup of card key saved to `%s'\n"
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "BEMÆRK: sikkerhedskopi af kortnøgle gemt på »%s«\n"
 
-#: g10/keygen.c:5359 g10/keygen.c:5561
+#: g10/keygen.c:5389 g10/keygen.c:5591
 #, fuzzy, c-format
 #| msgid "writing public key to `%s'\n"
 msgid "writing public key to '%s'\n"
 msgstr "skriver offentlig nøgle til »%s«\n"
 
-#: g10/keygen.c:5555
+#: g10/keygen.c:5585
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "ingen skrivbar offentlig nøglering fundet: %s\n"
 
-#: g10/keygen.c:5569
+#: g10/keygen.c:5599
 #, fuzzy, c-format
 #| msgid "error writing public keyring `%s': %s\n"
 msgid "error writing public keyring '%s': %s\n"
 msgstr "fejl ved skrivning af offentlig nøglering »%s«: %s\n"
 
-#: g10/keygen.c:5603
+#: g10/keygen.c:5634
 msgid "public and secret key created and signed.\n"
 msgstr "offentlig og hemmelig nøgle oprettet og underskrevet.\n"
 
-#: g10/keygen.c:5619
+#: g10/keygen.c:5650
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -6012,7 +6026,7 @@ msgstr ""
 "Bemærk at denne nøgle ikke kan bruges til kryptering. Du kan bruge\n"
 "kommandoen »--edit-key« til at oprette en undernøgle til dette formål.\n"
 
-#: g10/keygen.c:5801 g10/keygen.c:6000
+#: g10/keygen.c:5832 g10/keygen.c:6031
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -6020,7 +6034,7 @@ msgstr ""
 "nøgle er blevet oprettet %lu sekund i fremtiden (tidsforskydning eller "
 "urproblem)\n"
 
-#: g10/keygen.c:5803 g10/keygen.c:6002
+#: g10/keygen.c:5834 g10/keygen.c:6033
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -6028,24 +6042,24 @@ msgstr ""
 "nøgle er blevet oprettet %lu sekunder i fremtiden (tidsforskydning eller "
 "urproblem)\n"
 
-#: g10/keygen.c:5814 g10/keygen.c:6013
+#: g10/keygen.c:5845 g10/keygen.c:6044
 #, fuzzy, c-format
 #| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "BEMÆRK: Oprettelse af undernøgler for v3-nøgler overholder ikke OpenPGP\n"
 
-#: g10/keygen.c:5826 g10/keygen.c:5828
+#: g10/keygen.c:5857 g10/keygen.c:5859
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Hemmelige dele for primær nøgle er ikke tilgængelige.\n"
 
-#: g10/keygen.c:5835 g10/keygen.c:5837
+#: g10/keygen.c:5866 g10/keygen.c:5868
 #, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Hemmelige dele for primær nøgle gemmes på kortet.\n"
 
-#: g10/keygen.c:5857 g10/keygen.c:6027
+#: g10/keygen.c:5888 g10/keygen.c:6058
 msgid "Really create? (y/N) "
 msgstr "Vil du virkelig oprette? (j/N) "
 
@@ -6126,13 +6140,13 @@ msgstr "    Nøglefingeraftryk ="
 msgid "      Card serial no. ="
 msgstr "   Serielnr. for kort ="
 
-#: g10/keyring.c:1467
+#: g10/keyring.c:1477
 #, fuzzy, c-format
 #| msgid "caching keyring `%s'\n"
 msgid "caching keyring '%s'\n"
 msgstr "mellemlagrer nøglering »%s«\n"
 
-#: g10/keyring.c:1541
+#: g10/keyring.c:1551
 #, fuzzy, c-format
 #| msgid "%lu keys cached so far (%lu signatures)\n"
 msgid "%lu keys cached so far (%lu signature)\n"
@@ -6140,14 +6154,14 @@ msgid_plural "%lu keys cached so far (%lu signatures)\n"
 msgstr[0] "%lu nøgler mellemlagret indtil nu (%lu underskrifter)\n"
 msgstr[1] "%lu nøgler mellemlagret indtil nu (%lu underskrifter)\n"
 
-#: g10/keyring.c:1557
+#: g10/keyring.c:1567
 #, c-format
 msgid "%lu key cached"
 msgid_plural "%lu keys cached"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/keyring.c:1559
+#: g10/keyring.c:1569
 #, fuzzy, c-format
 #| msgid "1 bad signature\n"
 msgid " (%lu signature)\n"
@@ -6155,7 +6169,7 @@ msgid_plural " (%lu signatures)\n"
 msgstr[0] "1 ugyldig underskrift\n"
 msgstr[1] "1 ugyldig underskrift\n"
 
-#: g10/keyring.c:1636
+#: g10/keyring.c:1646
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: nøglering oprettet\n"
@@ -6184,25 +6198,25 @@ msgstr "hent automatisk nøgler når der verificeres underskrifter"
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "overhold den foretrukne nøglerserveradresse angivet på nøglen"
 
-#: g10/keyserver.c:537
+#: g10/keyserver.c:360
 msgid "disabled"
 msgstr "deaktiveret"
 
-#: g10/keyserver.c:740
+#: g10/keyserver.c:563
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Indtal tal, N)æste eller Q) for Afslut > "
 
-#: g10/keyserver.c:846
+#: g10/keyserver.c:669
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "ugyldig nøgleserverprotokol (os %d!=håndtag %d)\n"
 
-#: g10/keyserver.c:986 g10/keyserver.c:1096
+#: g10/keyserver.c:809 g10/keyserver.c:919
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "»%s« er ikke et nøgle-id: udelader\n"
 
-#: g10/keyserver.c:1420 g10/keyserver.c:1453
+#: g10/keyserver.c:1217 g10/keyserver.c:1250
 #, fuzzy, c-format
 #| msgid "refreshing %d keys from %s\n"
 msgid "refreshing %d key from %s\n"
@@ -6210,54 +6224,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:1427
+#: g10/keyserver.c:1224
 #, 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:1531
+#: g10/keyserver.c:1316
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "nøgle »%s« blev ikke fundet på nøgleserver\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1319
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "nøgle blev ikke fundet på nøgleserver\n"
 
-#: g10/keyserver.c:1722
-#, c-format
-msgid "requesting key %s from %s server %s\n"
-msgstr "anmoder om nøgle %s fra %s server %s\n"
-
-#: g10/keyserver.c:1726
+#: g10/keyserver.c:1481
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "anmoder om nøgle %s fra %s\n"
 
-#: g10/keyserver.c:1841 g10/keyserver.c:2020
+#: g10/keyserver.c:1600 g10/keyserver.c:1793
 #, fuzzy, c-format
 #| msgid "no keyserver action!\n"
 msgid "no keyserver known\n"
 msgstr "ingen nøgleserverhandling!\n"
 
-#: g10/keyserver.c:1856 g10/skclist.c:213 g10/skclist.c:241
+#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "udelod »%s«: %s\n"
 
-#: g10/keyserver.c:1860
+#: g10/keyserver.c:1619
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "sender nøgle %s til %s\n"
 
-#: g10/keyserver.c:1901
+#: g10/keyserver.c:1662
 #, 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:1917
+#: g10/keyserver.c:1680
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "ADVARSEL: kan ikke hente URI %s: %s\n"
@@ -6284,244 +6293,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:472
+#: g10/mainproc.c:473
 #, c-format
 msgid "public key is %s\n"
 msgstr "offentlig nøgle er %s\n"
 
-#: g10/mainproc.c:524
+#: g10/mainproc.c:525
 #, 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:528 g10/pkclist.c:231
+#: g10/mainproc.c:529 g10/pkclist.c:231
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      »%s«\n"
 
-#: g10/mainproc.c:532
+#: g10/mainproc.c:533
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "krypteret med %s nøgle, id %s\n"
 
-#: g10/mainproc.c:552 g10/mainproc.c:935
+#: g10/mainproc.c:553 g10/mainproc.c:937
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "ADVARSEL: flere klartekster set\n"
 
-#: g10/mainproc.c:560
+#: g10/mainproc.c:561
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "krypteret med %lu adgangsfraser\n"
 
-#: g10/mainproc.c:562
+#: g10/mainproc.c:563
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "krypteret med 1 adgangsfrase\n"
 
-#: g10/mainproc.c:577 g10/mainproc.c:602
+#: g10/mainproc.c:578 g10/mainproc.c:603
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "afkryptering af offentlig nøgle mislykkedes: %s\n"
 
-#: g10/mainproc.c:613
+#: g10/mainproc.c:614
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "krypterede data for offentlig nøgle: god DEK\n"
 
-#: g10/mainproc.c:642 g10/mainproc.c:663
+#: g10/mainproc.c:643 g10/mainproc.c:664
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "antager %s krypterede data\n"
 
-#: g10/mainproc.c:649
+#: g10/mainproc.c:650
 #, 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:742 g10/mainproc.c:780
+#: g10/mainproc.c:744 g10/mainproc.c:782
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ADVARSEL: besked var ikke integritetsbeskyttet\n"
 
-#: g10/mainproc.c:753
+#: g10/mainproc.c:755
 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:756
+#: g10/mainproc.c:758
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:761
+#: g10/mainproc.c:763
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "afkryptering mislykkedes: %s\n"
 
-#: g10/mainproc.c:773
+#: g10/mainproc.c:775
 #, c-format
 msgid "decryption okay\n"
 msgstr "afkryptering okay\n"
 
-#: g10/mainproc.c:786
+#: g10/mainproc.c:788
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ADVARSEL: krypteret besked er blevet manipuleret!\n"
 
-#: g10/mainproc.c:804
+#: g10/mainproc.c:806
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "afkryptering mislykkedes: %s\n"
 
-#: g10/mainproc.c:851
+#: g10/mainproc.c:853
 #, 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:858
+#: g10/mainproc.c:860
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "oprindeligt filnavn=»%.*s«\n"
 
-#: g10/mainproc.c:1135
+#: g10/mainproc.c:1137
 #, 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:1440 g10/mainproc.c:1483
+#: g10/mainproc.c:1442 g10/mainproc.c:1485
 #, c-format
 msgid "no signature found\n"
 msgstr "ingen underskrift fundet\n"
 
-#: g10/mainproc.c:1763
+#: g10/mainproc.c:1765
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "UGYLDIG underskrift fra »%s«"
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1767
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Udløbet underskrift fra »%s«"
 
-#: g10/mainproc.c:1767
+#: g10/mainproc.c:1769
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "God underskrift fra »%s«"
 
-#: g10/mainproc.c:1789
+#: g10/mainproc.c:1791
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "underskriftverificering undertrykt\n"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1905
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "kan ikke håndtere disse tvetydige underskriftdata\n"
 
-#: g10/mainproc.c:1919 g10/mainproc.c:1926
+#: g10/mainproc.c:1921 g10/mainproc.c:1928
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Underskrift lavet %s\n"
 
-#: g10/mainproc.c:1920 g10/mainproc.c:1927 sm/verify.c:480
+#: g10/mainproc.c:1922 g10/mainproc.c:1929 sm/verify.c:480
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               bruger %s nøgle %s\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1933
 #, 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:1937
+#: g10/mainproc.c:1939
 #, fuzzy, c-format
 #| msgid "                aka \"%s\""
 msgid "               issuer \"%s\"\n"
 msgstr "       også kendt som »%s«"
 
-#: g10/mainproc.c:1992
+#: g10/mainproc.c:1994
 #, c-format
 msgid "Key available at: "
 msgstr "Nøgle tilgængelig på: "
 
-#: g10/mainproc.c:2034
+#: g10/mainproc.c:2036
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2234
+#: g10/mainproc.c:2236
 msgid "[uncertain]"
 msgstr "[usikker]"
 
-#: g10/mainproc.c:2272
+#: g10/mainproc.c:2274
 #, c-format
 msgid "                aka \"%s\""
 msgstr "       også kendt som »%s«"
 
-#: g10/mainproc.c:2347
+#: g10/mainproc.c:2349
 #, 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:2363
+#: g10/mainproc.c:2365
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Underskrift udløbet %s\n"
 
-#: g10/mainproc.c:2368
+#: g10/mainproc.c:2370
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Underskrift udløber %s\n"
 
-#: g10/mainproc.c:2379
+#: g10/mainproc.c:2381
 #, 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:2380
+#: g10/mainproc.c:2382
 msgid "binary"
 msgstr "binær"
 
-#: g10/mainproc.c:2381
+#: g10/mainproc.c:2383
 msgid "textmode"
 msgstr "tekstilstand"
 
-#: g10/mainproc.c:2381 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2383 g10/trust.c:112 dirmngr/ocsp.c:793
 msgid "unknown"
 msgstr "ukendt"
 
-#: g10/mainproc.c:2383
+#: g10/mainproc.c:2385
 #, fuzzy
 #| msgid "algorithm: %s"
 msgid ", key algorithm "
 msgstr "algoritme: %s"
 
-#: g10/mainproc.c:2418
+#: g10/mainproc.c:2420
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2457
+#: g10/mainproc.c:2459
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan ikke kontrollere underskrift: %s\n"
 
-#: g10/mainproc.c:2553 g10/mainproc.c:2572 g10/mainproc.c:2696
+#: g10/mainproc.c:2555 g10/mainproc.c:2574 g10/mainproc.c:2698
 #, c-format
 msgid "not a detached signature\n"
 msgstr "ikke en frakoblet underskrift\n"
 
-#: g10/mainproc.c:2606
+#: g10/mainproc.c:2608
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
@@ -6529,12 +6538,12 @@ msgstr ""
 "ADVARSEL: flere underskrifter detekteret. Kun den første vil blive "
 "kontrolleret.\n"
 
-#: g10/mainproc.c:2615
+#: g10/mainproc.c:2617
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "uafhængig underskrift for klasse 0x%02x\n"
 
-#: g10/mainproc.c:2700
+#: g10/mainproc.c:2702
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "gammeldags (PGP 2.x) underskrift\n"
@@ -6726,21 +6735,27 @@ msgstr "Kritisk underskriftnotation: "
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "underpakke af typen %d har kritiske bitsæt\n"
 
-#: g10/passphrase.c:208
+#: g10/passphrase.c:201 sm/decrypt.c:669
+#, fuzzy
+#| msgid "Please enter the new passphrase"
+msgid "Please enter the passphrase for decryption."
+msgstr "Indtast venligst den nye adgangsfrase"
+
+#: g10/passphrase.c:203
 msgid "Enter passphrase\n"
 msgstr "Indtast adgangsfrase\n"
 
-#: g10/passphrase.c:219
+#: g10/passphrase.c:227
 #, c-format
 msgid "cancelled by user\n"
 msgstr "afbrudt af bruger\n"
 
-#: g10/passphrase.c:460
+#: g10/passphrase.c:472
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (hovednøgle-id %s)"
 
-#: g10/passphrase.c:467
+#: g10/passphrase.c:479
 #, fuzzy
 #| msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
@@ -6748,37 +6763,37 @@ msgstr ""
 "Indtast venligst adgangsfrasen for at fjerne beskyttelsen på PKCS#12-"
 "objektet."
 
-#: g10/passphrase.c:471
+#: g10/passphrase.c:483
 #, fuzzy
 #| msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgid "Please enter the passphrase to import the OpenPGP secret key:"
 msgstr "Indtast venligst adgangsfrasen for at beskytte det nye PKCS#12-objekt."
 
-#: g10/passphrase.c:476
+#: g10/passphrase.c:488
 #, fuzzy
 #| msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 msgstr "Indtast venligst adgangsfrasen for at beskytte det nye PKCS#12-objekt."
 
-#: g10/passphrase.c:479
+#: g10/passphrase.c:491
 #, fuzzy
 #| msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgid "Please enter the passphrase to export the OpenPGP secret key:"
 msgstr "Indtast venligst adgangsfrasen for at beskytte det nye PKCS#12-objekt."
 
-#: g10/passphrase.c:484
+#: g10/passphrase.c:496
 #, fuzzy
 #| msgid "Do you really want to delete the selected keys? (y/N) "
 msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 msgstr "Vil du virkelig slette de valgte nøgler? (j/N) "
 
-#: g10/passphrase.c:487
+#: g10/passphrase.c:499
 #, fuzzy
 #| msgid "Do you really want to delete the selected keys? (y/N) "
 msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgstr "Vil du virkelig slette de valgte nøgler? (j/N) "
 
-#: g10/passphrase.c:496
+#: g10/passphrase.c:508
 #, fuzzy, c-format
 #| msgid "%u-bit %s key, ID %s, created %s"
 msgid ""
@@ -6951,7 +6966,7 @@ msgstr ""
 "Minimumstroværdighedsniveau for denne nøgle er: %s\n"
 "\n"
 
-#: g10/pkclist.c:313 g10/revoke.c:803
+#: g10/pkclist.c:313 g10/revoke.c:804
 msgid "Your decision? "
 msgstr "Dit valg? "
 
@@ -7263,7 +7278,7 @@ msgstr "kan ikke åbne underskrevne data »%s«\n"
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "kan ikke åbne underskrevne data fd=%d: %s\n"
 
-#: g10/pubkey-enc.c:99 sm/decrypt.c:879
+#: g10/pubkey-enc.c:99 sm/decrypt.c:1329
 #, fuzzy, c-format
 #| msgid "certificate is not usable for encryption\n"
 msgid "key %s is not suitable for decryption in %s mode\n"
@@ -7313,7 +7328,7 @@ msgid "Note: key has been revoked"
 msgstr "BEMÆRK: nøgle er blevet tilbagekaldt"
 
 #: g10/revoke.c:100 g10/revoke.c:126 g10/revoke.c:172 g10/revoke.c:184
-#: g10/revoke.c:502
+#: g10/revoke.c:503
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet mislykkedes: %s\n"
@@ -7341,11 +7356,11 @@ msgstr "Hemmelig nøgle er tilgængelig.\n"
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Opret et designet tilbagekaldscertifikat for denne nøgle? (j/N) "
 
-#: g10/revoke.c:334 g10/revoke.c:744
+#: g10/revoke.c:334 g10/revoke.c:745
 msgid "ASCII armored output forced.\n"
 msgstr "ASCII-pansret resultat er tvunget.\n"
 
-#: g10/revoke.c:350 g10/revoke.c:481
+#: g10/revoke.c:350 g10/revoke.c:482
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet mislykkedes: %s\n"
@@ -7359,20 +7374,20 @@ msgstr "Tilbagekaldscertifikat oprettet.\n"
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "ingen tilbagekaldsnøgler fundet for »%s«\n"
 
-#: g10/revoke.c:567
+#: g10/revoke.c:568
 #, fuzzy
 #| msgid "Create a revocation certificate for this key? (y/N) "
 msgid "This is a revocation certificate for the OpenPGP key:"
 msgstr "Opret et tilbagekaldscertifikat for denne nøgle? (j/N) "
 
-#: g10/revoke.c:583
+#: g10/revoke.c:584
 msgid ""
 "A revocation certificate is a kind of \"kill switch\" to publicly\n"
 "declare that a key shall not anymore be used.  It is not possible\n"
 "to retract such a revocation certificate once it has been published."
 msgstr ""
 
-#: g10/revoke.c:586
+#: g10/revoke.c:587
 msgid ""
 "Use it to revoke this key in case of a compromise or loss of\n"
 "the secret key.  However, if the secret key is still accessible,\n"
@@ -7381,20 +7396,20 @@ msgid ""
 "of the gpg command \"--generate-revocation\" in the GnuPG manual."
 msgstr ""
 
-#: g10/revoke.c:592
+#: g10/revoke.c:593
 msgid ""
 "To avoid an accidental use of this file, a colon has been inserted\n"
 "before the 5 dashes below.  Remove this colon with a text editor\n"
 "before importing and publishing this revocation certificate."
 msgstr ""
 
-#: g10/revoke.c:611
+#: g10/revoke.c:612
 #, fuzzy, c-format
 #| msgid "Revocation certificate created.\n"
 msgid "revocation certificate stored as '%s.rev'\n"
 msgstr "Tilbagekaldscertifikat oprettet.\n"
 
-#: g10/revoke.c:655
+#: g10/revoke.c:656
 #, fuzzy, c-format
 #| msgid "secret key \"%s\" not found: %s\n"
 msgid "secret key \"%s\" not found\n"
@@ -7403,22 +7418,22 @@ msgstr "hemmelig nøgle »%s« blev ikke fundet: %s\n"
 #. TRANSLATORS: The %s prints a key specification which
 #. for example has been given at the command line.  Several lines
 #. lines with secret key infos are printed after this message.
-#: g10/revoke.c:680
+#: g10/revoke.c:681
 #, c-format
 msgid "'%s' matches multiple secret keys:\n"
 msgstr ""
 
-#: g10/revoke.c:705
+#: g10/revoke.c:706
 #, fuzzy, c-format
 #| msgid "error creating keyring `%s': %s\n"
 msgid "error searching the keyring: %s\n"
 msgstr "fejl ved oprettelse af nøglering »%s«: %s\n"
 
-#: g10/revoke.c:728
+#: g10/revoke.c:729
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Opret et tilbagekaldscertifikat for denne nøgle? (j/N) "
 
-#: g10/revoke.c:752
+#: g10/revoke.c:753
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -7437,33 +7452,33 @@ msgstr ""
 "forsigtig: Dit udskrivningssystem kan gemme dataene og gøre dem\n"
 "tilgængelige for andre!\n"
 
-#: g10/revoke.c:786
+#: g10/revoke.c:787
 msgid "Please select the reason for the revocation:\n"
 msgstr "Vælg venligst årsagen for tilbagekaldet:\n"
 
-#: g10/revoke.c:796
+#: g10/revoke.c:797
 msgid "Cancel"
 msgstr "Afbryd"
 
-#: g10/revoke.c:798
+#: g10/revoke.c:799
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Du vil sikkert vælge %d her)\n"
 
-#: g10/revoke.c:839
+#: g10/revoke.c:843
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Indtast en valgfri beskrivelse; afslut den med en tom linje:\n"
 
-#: g10/revoke.c:867
+#: g10/revoke.c:871
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Ã…rsag for tilbagekald: %s\n"
 
-#: g10/revoke.c:869
+#: g10/revoke.c:873
 msgid "(No description given)\n"
 msgstr "(Ingen beskrivelse angivet)\n"
 
-#: g10/revoke.c:874
+#: g10/revoke.c:878
 msgid "Is this okay? (y/N) "
 msgstr "Er dette okay? (j/N) "
 
@@ -7649,23 +7664,23 @@ msgstr "underskriver:"
 msgid "%s.%s encryption will be used\n"
 msgstr "%s-kryptering vil blive brugt\n"
 
-#: g10/skclist.c:172 g10/skclist.c:253
+#: g10/skclist.c:173 g10/skclist.c:254
 #, c-format
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "nøgle er ikke markeret som usikker - kan ikke bruge den med falsk RNG!\n"
 
-#: g10/skclist.c:204
+#: g10/skclist.c:205
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "udelod »%s«: duplikeret\n"
 
-#: g10/skclist.c:223
+#: g10/skclist.c:224
 #, c-format
 msgid "skipped: secret key already present\n"
 msgstr "udelod: hemmelig nøgle er allerede til stede\n"
 
-#: g10/skclist.c:242
+#: g10/skclist.c:243
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "dette er en PGP-oprettet Elgamalnøgle som ikke er sikker for underskrifter!"
@@ -7895,10 +7910,10 @@ msgstr "ikke understøttet algoritme: %s"
 msgid "TOFU DB error"
 msgstr ""
 
-#: g10/tofu.c:687 g10/tofu.c:2073 g10/tofu.c:2354 g10/tofu.c:2373
-#: g10/tofu.c:2386 g10/tofu.c:2398 g10/tofu.c:2413 g10/tofu.c:2425
-#: g10/tofu.c:3021 g10/tofu.c:3038 g10/tofu.c:3075 g10/tofu.c:3092
-#: g10/tofu.c:3404
+#: g10/tofu.c:687 g10/tofu.c:2077 g10/tofu.c:2358 g10/tofu.c:2377
+#: g10/tofu.c:2390 g10/tofu.c:2402 g10/tofu.c:2417 g10/tofu.c:2429
+#: g10/tofu.c:3025 g10/tofu.c:3042 g10/tofu.c:3079 g10/tofu.c:3096
+#: g10/tofu.c:3408
 #, fuzzy, c-format
 #| msgid "error sending %s command: %s\n"
 msgid "error reading TOFU database: %s\n"
@@ -7922,7 +7937,7 @@ msgstr "%s: fejl ved skrivning af mappepost: %s\n"
 msgid "error opening TOFU database '%s': %s\n"
 msgstr "fejl ved åbning af »%s«: %s\n"
 
-#: g10/tofu.c:1148 g10/tofu.c:3458 g10/tofu.c:3604
+#: g10/tofu.c:1148 g10/tofu.c:3462 g10/tofu.c:3608
 #, fuzzy, c-format
 #| msgid "error sending %s command: %s\n"
 msgid "error updating TOFU database: %s\n"
@@ -7964,37 +7979,37 @@ msgstr "fejl ved indhentelse af ny PIN: %s\n"
 msgid "This key's user IDs:\n"
 msgstr "vis nøgle og bruger-id'er"
 
-#: g10/tofu.c:1634 g10/tofu.c:1799
+#: g10/tofu.c:1634 g10/tofu.c:1801
 #, fuzzy, c-format
 #| msgid "validity: %s"
 msgid "policy: %s"
 msgstr "validitet: %s"
 
-#: g10/tofu.c:1725
+#: g10/tofu.c:1727
 #, fuzzy, c-format
 #| msgid "error getting stored flags: %s\n"
 msgid "error gathering signature stats: %s\n"
 msgstr "fejl ved indhentelse af gemte flag: %s\n"
 
-#: g10/tofu.c:1729
+#: g10/tofu.c:1731
 #, c-format
 msgid "The email address \"%s\" is associated with %d key:\n"
 msgid_plural "The email address \"%s\" is associated with %d keys:\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1747
+#: g10/tofu.c:1749
 #, c-format
 msgid "Statistics for keys with the email address \"%s\":\n"
 msgstr ""
 
-#: g10/tofu.c:1797
+#: g10/tofu.c:1799
 #, fuzzy
 #| msgid "list keys"
 msgid "this key"
 msgstr "vis nøgler"
 
-#: g10/tofu.c:1823
+#: g10/tofu.c:1825
 #, fuzzy, c-format
 #| msgid "print message digests"
 msgid "Verified %d message."
@@ -8002,7 +8017,7 @@ msgid_plural "Verified %d messages."
 msgstr[0] "vis beskedsammendrag"
 msgstr[1] "vis beskedsammendrag"
 
-#: g10/tofu.c:1827
+#: g10/tofu.c:1829
 #, fuzzy, c-format
 #| msgid "encrypted with %lu passphrases\n"
 msgid "Encrypted %d message."
@@ -8010,7 +8025,7 @@ msgid_plural "Encrypted %d messages."
 msgstr[0] "krypteret med %lu adgangsfraser\n"
 msgstr[1] "krypteret med %lu adgangsfraser\n"
 
-#: g10/tofu.c:1834
+#: g10/tofu.c:1836
 #, fuzzy, c-format
 #| msgid "print message digests"
 msgid "Verified %d message in the future."
@@ -8018,7 +8033,7 @@ msgid_plural "Verified %d messages in the future."
 msgstr[0] "vis beskedsammendrag"
 msgstr[1] "vis beskedsammendrag"
 
-#: g10/tofu.c:1838
+#: g10/tofu.c:1840
 #, fuzzy, c-format
 #| msgid "print message digests"
 msgid "Encrypted %d message in the future."
@@ -8026,54 +8041,54 @@ msgid_plural "Encrypted %d messages in the future."
 msgstr[0] "vis beskedsammendrag"
 msgstr[1] "vis beskedsammendrag"
 
-#: g10/tofu.c:1852
+#: g10/tofu.c:1854
 #, c-format
 msgid "Messages verified over the past %d day: %d."
 msgid_plural "Messages verified over the past %d days: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1858
+#: g10/tofu.c:1860
 #, c-format
 msgid "Messages encrypted over the past %d day: %d."
 msgid_plural "Messages encrypted over the past %d days: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1868
+#: g10/tofu.c:1870
 #, c-format
 msgid "Messages verified over the past %d month: %d."
 msgid_plural "Messages verified over the past %d months: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1874
+#: g10/tofu.c:1876
 #, c-format
 msgid "Messages encrypted over the past %d month: %d."
 msgid_plural "Messages encrypted over the past %d months: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1884
+#: g10/tofu.c:1886
 #, c-format
 msgid "Messages verified over the past %d year: %d."
 msgid_plural "Messages verified over the past %d years: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1890
+#: g10/tofu.c:1892
 #, c-format
 msgid "Messages encrypted over the past %d year: %d."
 msgid_plural "Messages encrypted over the past %d years: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1898
+#: g10/tofu.c:1900
 #, c-format
 msgid "Messages verified in the past: %d."
 msgstr ""
 
-#: g10/tofu.c:1902
+#: g10/tofu.c:1904
 #, fuzzy, c-format
 #| msgid "print message digests"
 msgid "Messages encrypted in the past: %d."
@@ -8082,131 +8097,131 @@ msgstr "vis beskedsammendrag"
 #. TRANSLATORS: Please translate the text found in the source
 #. * file below.  We don't directly internationalize that text so
 #. * that we can tweak it without breaking translations.
-#: g10/tofu.c:1919
+#: g10/tofu.c:1921
 msgid "TOFU detected a binding conflict"
 msgstr ""
 
 #. TRANSLATORS: Two letters (normally the lower and upper case
 #. * version of the hotkey) for each of the five choices.  If
 #. * there is only one choice in your language, repeat it.
-#: g10/tofu.c:1961
+#: g10/tofu.c:1963
 msgid "gGaAuUrRbB"
 msgstr ""
 
-#: g10/tofu.c:1967
+#: g10/tofu.c:1969
 msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 
-#: g10/tofu.c:1975
+#: g10/tofu.c:1978
 msgid "Defaulting to unknown.\n"
 msgstr ""
 
-#: g10/tofu.c:2093 g10/tofu.c:2228
+#: g10/tofu.c:2097 g10/tofu.c:2232
 #, c-format
 msgid "TOFU db corruption detected.\n"
 msgstr ""
 
-#: g10/tofu.c:2829
+#: g10/tofu.c:2833
 #, fuzzy, c-format
 #| msgid "error creating a pipe: %s\n"
 msgid "error changing TOFU policy: %s\n"
 msgstr "fejl ved oprettelse af datakanal: %s\n"
 
-#: g10/tofu.c:2880
+#: g10/tofu.c:2884
 #, c-format
 msgid "%lld~year"
 msgid_plural "%lld~years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2885
+#: g10/tofu.c:2889
 #, c-format
 msgid "%lld~month"
 msgid_plural "%lld~months"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2890
+#: g10/tofu.c:2894
 #, c-format
 msgid "%lld~week"
 msgid_plural "%lld~weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2895
+#: g10/tofu.c:2899
 #, c-format
 msgid "%lld~day"
 msgid_plural "%lld~days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2900
+#: g10/tofu.c:2904
 #, c-format
 msgid "%lld~hour"
 msgid_plural "%lld~hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2905
+#: g10/tofu.c:2909
 #, c-format
 msgid "%lld~minute"
 msgid_plural "%lld~minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2907
+#: g10/tofu.c:2911
 #, c-format
 msgid "%lld~second"
 msgid_plural "%lld~seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:3145
+#: g10/tofu.c:3149
 #, c-format
 msgid "%s: Verified 0~signatures and encrypted 0~messages."
 msgstr ""
 
-#: g10/tofu.c:3151
+#: g10/tofu.c:3155
 #, fuzzy, c-format
 #| msgid "Deleted %d signatures.\n"
 msgid "%s: Verified 0 signatures."
 msgstr "Slettede %d underskrifter.\n"
 
-#: g10/tofu.c:3165
+#: g10/tofu.c:3169
 #, fuzzy
 #| msgid "encrypted with %lu passphrases\n"
 msgid "Encrypted 0 messages."
 msgstr "krypteret med %lu adgangsfraser\n"
 
-#: g10/tofu.c:3181
+#: g10/tofu.c:3185
 #, fuzzy, c-format
 #| msgid "validity: %s"
 msgid "(policy: %s)"
 msgstr "validitet: %s"
 
-#: g10/tofu.c:3215
+#: g10/tofu.c:3219
 #, c-format
 msgid ""
 "Warning: we have yet to see a message signed using this key and user id!\n"
 msgstr ""
 
-#: g10/tofu.c:3218
+#: g10/tofu.c:3222
 #, c-format
 msgid ""
 "Warning: we've only seen one message signed using this key and user id!\n"
 msgstr ""
 
-#: g10/tofu.c:3222
+#: g10/tofu.c:3226
 #, c-format
 msgid "Warning: you have yet to encrypt a message to this key!\n"
 msgstr ""
 
-#: g10/tofu.c:3225
+#: g10/tofu.c:3229
 #, c-format
 msgid "Warning: you have only encrypted one message to this key!\n"
 msgstr ""
 
-#: g10/tofu.c:3254
+#: g10/tofu.c:3258
 #, c-format
 msgid ""
 "Warning: if you think you've seen more signatures by this key and user id, "
@@ -8223,14 +8238,14 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:3339 g10/tofu.c:3502 g10/tofu.c:3708 g10/tofu.c:3761
-#: g10/tofu.c:3902 g10/tofu.c:3979 g10/tofu.c:4017
+#: g10/tofu.c:3343 g10/tofu.c:3506 g10/tofu.c:3712 g10/tofu.c:3765
+#: g10/tofu.c:3906 g10/tofu.c:3983 g10/tofu.c:4021
 #, fuzzy, c-format
 #| msgid "error sending %s command: %s\n"
 msgid "error opening TOFU database: %s\n"
 msgstr "fejl under afsendelse af %s-kommando: %s\n"
 
-#: g10/tofu.c:3535
+#: g10/tofu.c:3539
 #, c-format
 msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
 msgstr ""
@@ -8298,7 +8313,7 @@ msgstr "bruger %s troværdighedsmodel\n"
 msgid "no need for a trustdb check\n"
 msgstr "intet behov for kontrol af trustdb\n"
 
-#: g10/trustdb.c:601 g10/trustdb.c:2272
+#: g10/trustdb.c:601 g10/trustdb.c:2273
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "næste kontrol af trustdb sker den %s\n"
@@ -8331,7 +8346,7 @@ msgstr "udfør venligst en --check-trustdb\n"
 msgid "checking the trustdb\n"
 msgstr "kontrollerer trustdb\n"
 
-#: g10/trustdb.c:1993
+#: g10/trustdb.c:1994
 #, fuzzy, c-format
 #| msgid "%lu keys processed so far\n"
 msgid "%d key processed"
@@ -8339,7 +8354,7 @@ msgid_plural "%d keys processed"
 msgstr[0] "     %lu-nøgler behandlet\n"
 msgstr[1] "     %lu-nøgler behandlet\n"
 
-#: g10/trustdb.c:1996
+#: g10/trustdb.c:1997
 #, fuzzy, c-format
 #| msgid "%d keys processed (%d validity counts cleared)\n"
 msgid " (%d validity count cleared)\n"
@@ -8347,17 +8362,17 @@ msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] "%d nøgler behandlet (%d validiteter ryddet)\n"
 msgstr[1] "%d nøgler behandlet (%d validiteter ryddet)\n"
 
-#: g10/trustdb.c:2066
+#: g10/trustdb.c:2067
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "ingen ultimativ troværdige nøgler fundet\n"
 
-#: g10/trustdb.c:2080
+#: g10/trustdb.c:2081
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "offentlig nøgle for ultimativ troværdig nøgle %s blev ikke fundet\n"
 
-#: g10/trustdb.c:2198
+#: g10/trustdb.c:2199
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -8365,28 +8380,28 @@ msgstr ""
 "dybde: %d  gyldig: %3d  underskrevet: %3d  troværdighed: %d-, %dq, %dn, %dm, "
 "%df, %du\n"
 
-#: g10/trustdb.c:2279
+#: g10/trustdb.c:2280
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "kan ikke opdatere trustdb-versionspost: skrivning mislykkedes: %s\n"
 
-#: g10/trust.c:125
+#: g10/trust.c:114
 msgid "undefined"
 msgstr "ej defineret"
 
-#: g10/trust.c:126
+#: g10/trust.c:115
 msgid "never"
 msgstr "aldrig"
 
-#: g10/trust.c:127
+#: g10/trust.c:116
 msgid "marginal"
 msgstr "marginal"
 
-#: g10/trust.c:128
+#: g10/trust.c:117
 msgid "full"
 msgstr "fuld"
 
-#: g10/trust.c:129
+#: g10/trust.c:118
 msgid "ultimate"
 msgstr "ultimativ"
 
@@ -8398,43 +8413,43 @@ msgstr "ultimativ"
 #. It gets passed to atoi() so everything after the number is
 #. essentially a comment and need not be translated.  Either key and
 #. uid are both NULL, or neither are NULL.
-#: g10/trust.c:166
+#: g10/trust.c:155
 #, fuzzy
 #| msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgid "10 translator see trust.c:uid_trust_string_fixed"
 msgstr "10 oversætter se trustdb.c:uid_trust_string_fixed"
 
-#: g10/trust.c:169
+#: g10/trust.c:158
 msgid "[ revoked]"
 msgstr "[   tilb.]"
 
-#: g10/trust.c:171 g10/trust.c:177
+#: g10/trust.c:160 g10/trust.c:166
 msgid "[ expired]"
 msgstr "[ udløbet]"
 
-#: g10/trust.c:176
+#: g10/trust.c:165
 msgid "[ unknown]"
 msgstr "[  ukendt]"
 
-#: g10/trust.c:178
+#: g10/trust.c:167
 msgid "[  undef ]"
 msgstr "[  ej def]"
 
-#: g10/trust.c:179
+#: g10/trust.c:168
 #, fuzzy
 #| msgid "never"
 msgid "[  never ]"
 msgstr "aldrig"
 
-#: g10/trust.c:180
+#: g10/trust.c:169
 msgid "[marginal]"
 msgstr "[marginal]"
 
-#: g10/trust.c:181
+#: g10/trust.c:170
 msgid "[  full  ]"
 msgstr "[  fuld  ]"
 
-#: g10/trust.c:182
+#: g10/trust.c:171
 msgid "[ultimate]"
 msgstr "[ ultim. ]"
 
@@ -8494,16 +8509,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:4937 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2386
+#: scd/app-piv.c:1770 scd/app-p15.c:5035 scd/app-nks.c:1530
+#: scd/app-openpgp.c:2387
 #, 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:4956 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2402
+#: scd/app-piv.c:1787 scd/app-p15.c:5054 scd/app-nks.c:1549
+#: scd/app-openpgp.c:2403
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
@@ -8544,10 +8559,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:2669
-#: scd/app-openpgp.c:2693 scd/app-openpgp.c:2871 scd/app-openpgp.c:2893
-#: scd/app-openpgp.c:3074 scd/app-openpgp.c:3361 scd/app-openpgp.c:3408
-#: scd/app-openpgp.c:3545 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2670
+#: scd/app-openpgp.c:2694 scd/app-openpgp.c:2872 scd/app-openpgp.c:2894
+#: scd/app-openpgp.c:3075 scd/app-openpgp.c:3362 scd/app-openpgp.c:3409
+#: scd/app-openpgp.c:3547 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN-tilbagekald returnerede fejl: %s\n"
@@ -8569,58 +8584,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:3616
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3618
 #, c-format
 msgid "key already exists\n"
 msgstr "nøgle findes allerede\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3620
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3622
 #, 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:3622
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3624
 #, c-format
 msgid "generating new key\n"
 msgstr "opretter ny nøgle\n"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3624
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3626
 #, c-format
 msgid "writing new key\n"
 msgstr "skriver ny nøgle\n"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4484 scd/app-openpgp.c:4767
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4486 scd/app-openpgp.c:4761
 #, 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:1615
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1616
 #, 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:1622
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1623
 #, 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:1732
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1733
 #, 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:4943
+#: scd/app-piv.c:3279 scd/app-openpgp.c:4937
 #, 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:4951
+#: scd/app-piv.c:3294 scd/app-openpgp.c:4945
 #, c-format
 msgid "generating key failed\n"
 msgstr "oprettelse af nøgle mislykkedes\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4957
+#: scd/app-piv.c:3300 scd/app-openpgp.c:4951
 #, fuzzy, c-format
 #| msgid "key generation completed (%d seconds)\n"
 msgid "key generation completed (%d second)\n"
@@ -8628,12 +8643,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:1842 scd/app-openpgp.c:4966
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1843 scd/app-openpgp.c:4960
 #, 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:5035 scd/app-nks.c:2038
+#: scd/app-p15.c:5133 scd/app-nks.c:2038
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 "||Indtast venligst PIN'en for nøglen til at oprette kvalificerede "
@@ -8641,24 +8656,24 @@ 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:5038 scd/app-openpgp.c:2818
+#: scd/app-p15.c:5136 scd/app-openpgp.c:2819
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Indtast venligst administrator-PIN'en"
 
-#: scd/app-p15.c:5040 scd/app-nks.c:2028
+#: scd/app-p15.c:5138 scd/app-nks.c:2028
 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:5043 scd/app-nks.c:2019
+#: scd/app-p15.c:5141 scd/app-nks.c:2019
 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:4321
+#: scd/app-nks.c:1468 scd/app-openpgp.c:4323
 #, 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:4333
+#: scd/app-nks.c:1476 scd/app-openpgp.c:4335
 #, 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"
@@ -8705,27 +8720,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:3442 scd/app-dinsig.c:534
+#: scd/app-nks.c:2221 scd/app-openpgp.c:3443 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:943
+#: scd/app-openpgp.c:944
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "kunne ikke gemme fingeraftrykket: %s\n"
 
-#: scd/app-openpgp.c:956
+#: scd/app-openpgp.c:957
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "kunne ikke gemme oprettelsesdatoen: %s\n"
 
-#: scd/app-openpgp.c:1427 scd/app-openpgp.c:3389 scd/app-openpgp.c:5715
+#: scd/app-openpgp.c:1428 scd/app-openpgp.c:3390 scd/app-openpgp.c:5709
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "fejl ved indhentelse af CHV-status fra kort\n"
 
-#: scd/app-openpgp.c:1949
+#: scd/app-openpgp.c:1950
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "læsning af offentlig nøgle mislykkedes: %s\n"
@@ -8733,46 +8748,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:2373
+#: scd/app-openpgp.c:2374
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2621
+#: scd/app-openpgp.c:2622
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "bruger standard-PIN som %s\n"
 
-#: scd/app-openpgp.c:2628
+#: scd/app-openpgp.c:2629
 #, 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:2641
+#: scd/app-openpgp.c:2642
 #, fuzzy
 #| msgid "||Please enter the PIN"
 msgid "||Please unlock the card"
 msgstr "||Indtast venligst PIN'en"
 
-#: scd/app-openpgp.c:2700 scd/app-openpgp.c:2900 scd/app-openpgp.c:3368
+#: scd/app-openpgp.c:2701 scd/app-openpgp.c:2901 scd/app-openpgp.c:3369
 #, 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:2717 scd/app-openpgp.c:2760 scd/app-openpgp.c:2917
-#: scd/app-openpgp.c:5325
+#: scd/app-openpgp.c:2718 scd/app-openpgp.c:2761 scd/app-openpgp.c:2918
+#: scd/app-openpgp.c:5319
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "verificering af CHV%d mislykkedes: %s\n"
 
-#: scd/app-openpgp.c:2804 scd/app-openpgp.c:5724
+#: scd/app-openpgp.c:2805 scd/app-openpgp.c:5718
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "kort er permanent låst!\n"
 
-#: scd/app-openpgp.c:2808
+#: scd/app-openpgp.c:2809
 #, 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"
@@ -8781,20 +8796,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:2841
+#: scd/app-openpgp.c:2842
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr "adgang til administratorkommandoer er ikke konfigureret\n"
 
-#: scd/app-openpgp.c:3355
+#: scd/app-openpgp.c:3356
 msgid "||Please enter the PIN"
 msgstr "||Indtast venligst PIN'en"
 
-#: scd/app-openpgp.c:3404
+#: scd/app-openpgp.c:3405
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Indtast venligst nulstillingskoden for kortet"
 
-#: scd/app-openpgp.c:3414 scd/app-openpgp.c:3481
+#: scd/app-openpgp.c:3415 scd/app-openpgp.c:3484
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "Nulstillingskode er for kort; minimumlængde er %d\n"
@@ -8802,73 +8817,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:3437
+#: scd/app-openpgp.c:3438
 msgid "|RN|New Reset Code"
 msgstr "|RN|Ny nulstillingskode"
 
-#: scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3439
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Ny administrator-PIN"
 
-#: scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3439
 msgid "|N|New PIN"
 msgstr "|N|Ny PIN"
 
-#: scd/app-openpgp.c:3541
+#: scd/app-openpgp.c:3543
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "||Indtast venligst administrator-PIN'en og ny administrator-PIN"
 
-#: scd/app-openpgp.c:3542
+#: scd/app-openpgp.c:3544
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Indtast venligst PIN'en og ny PIN"
 
-#: scd/app-openpgp.c:3600 scd/app-openpgp.c:5026
+#: scd/app-openpgp.c:3602 scd/app-openpgp.c:5020
 #, c-format
 msgid "error reading application data\n"
 msgstr "fejl ved læsning af programdata\n"
 
-#: scd/app-openpgp.c:3606 scd/app-openpgp.c:5033
+#: scd/app-openpgp.c:3608 scd/app-openpgp.c:5027
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "fejl ved læsning af fingeraftryk DO\n"
 
-#: scd/app-openpgp.c:4302 scd/app-openpgp.c:4657
+#: scd/app-openpgp.c:4304 scd/app-openpgp.c:4653
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "oprettelsestidsstempel mangler\n"
 
-#: scd/app-openpgp.c:4343 scd/app-openpgp.c:4351
+#: scd/app-openpgp.c:4345 scd/app-openpgp.c:4353
 #, 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:4651
+#: scd/app-openpgp.c:4647
 #, fuzzy, c-format
 #| msgid "unsupported algorithm: %s"
 msgid "unsupported curve\n"
 msgstr "ikke understøttet algoritme: %s"
 
-#: scd/app-openpgp.c:4991
+#: scd/app-openpgp.c:4985
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "ugyldig struktur for OpenPGP-kort (DO 0x93)\n"
 
-#: scd/app-openpgp.c:5041
+#: scd/app-openpgp.c:5035
 #, 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:5240
+#: scd/app-openpgp.c:5234
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "kort understøtter ikke sammendragsalgoritme %s\n"
 
-#: scd/app-openpgp.c:5298
+#: scd/app-openpgp.c:5292
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "underskrifter oprettet indtil videre: %lu\n"
 
-#: scd/app-openpgp.c:5729
+#: scd/app-openpgp.c:5723
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
@@ -8876,7 +8891,7 @@ msgstr ""
 "verifikation af administrator-PIN er i øjeblikket forbudt via denne "
 "kommando\n"
 
-#: scd/app-openpgp.c:6241 scd/app-openpgp.c:6252
+#: scd/app-openpgp.c:6250 scd/app-openpgp.c:6261
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "kan ikke tilgå %s - ugyldig OpenPGP-kort?\n"
@@ -8896,7 +8911,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:274 dirmngr/dirmngr.c:198
+#: scd/scdaemon.c:136 sm/gpgsm.c:274 dirmngr/dirmngr.c:199
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LEVEL|angiv fejlsøgningsniveau til NIVEAU"
 
@@ -8966,12 +8981,12 @@ 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:2104
+#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2143
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "håndtering for fd %d startet\n"
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2112
+#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2151
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "håndtering for fd %d termineret\n"
@@ -8981,11 +8996,11 @@ msgstr "håndtering for fd %d termineret\n"
 msgid "validation model requested by certificate: %s"
 msgstr "anmodt om valideringsmodel af certifikat: %s"
 
-#: sm/certchain.c:199 sm/certchain.c:2172
+#: sm/certchain.c:199 sm/certchain.c:2174
 msgid "chain"
 msgstr "kæde"
 
-#: sm/certchain.c:200 sm/certchain.c:2172
+#: sm/certchain.c:200 sm/certchain.c:2174
 msgid "shell"
 msgstr "skal"
 
@@ -9020,228 +9035,228 @@ msgstr "bemærk: ikkekritisk certifikatpolitik er ikke tilladt"
 msgid "certificate policy not allowed"
 msgstr "certifikatpolitik er ikke tilladt"
 
-#: sm/certchain.c:595 sm/keydb.c:1891 sm/keydb.c:1980
+#: sm/certchain.c:596 sm/keydb.c:1913 sm/keydb.c:2002
 #, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "kunne ikke indhente fingeraftrykket\n"
 
-#: sm/certchain.c:624
+#: sm/certchain.c:625
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr "slår udsteder op på ekstern placering\n"
 
-#: sm/certchain.c:644
+#: sm/certchain.c:645
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "antallet af udstedere der matcher: %d\n"
 
-#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#: sm/certchain.c:724 dirmngr/ocsp.c:683
 #, fuzzy, c-format
 #| msgid "can't access `%s': %s\n"
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "kan ikke tilgå »%s«: %s\n"
 
-#: sm/certchain.c:791
+#: sm/certchain.c:792
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr "slår udsteder op fra Dirmngr-mellemlageret\n"
 
-#: sm/certchain.c:816
+#: sm/certchain.c:817
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "antallet af matchende certifikater: %d\n"
 
-#: sm/certchain.c:819
+#: sm/certchain.c:820
 #, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "dirmngr cache-only-nøgleopslag mislykkedes: %s\n"
 
-#: sm/certchain.c:1046 sm/certchain.c:1561 sm/certchain.c:2200 sm/decrypt.c:643
-#: sm/encrypt.c:620 sm/import.c:414 sm/keydb.c:1898 sm/keydb.c:1987
-#: sm/sign.c:428 sm/verify.c:117
+#: sm/certchain.c:1047 sm/certchain.c:1562 sm/certchain.c:2202
+#: sm/decrypt.c:1084 sm/encrypt.c:621 sm/import.c:414 sm/keydb.c:1920
+#: sm/keydb.c:2009 sm/sign.c:428 sm/verify.c:117
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "kunne ikke allokere keyDB-håndtag\n"
 
-#: sm/certchain.c:1232
+#: sm/certchain.c:1233
 msgid "certificate has been revoked"
 msgstr "certifikat er blevet tilbagekaldt"
 
-#: sm/certchain.c:1247
+#: sm/certchain.c:1248
 msgid "the status of the certificate is unknown"
 msgstr "status for certifikatet er ukendt"
 
-#: sm/certchain.c:1254
+#: sm/certchain.c:1255
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr "sikr dig at »dirmngr« er korrekt installeret\n"
 
-#: sm/certchain.c:1260
+#: sm/certchain.c:1261
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "kontrol af CRL'en mislykkedes: %s"
 
-#: sm/certchain.c:1289 sm/certchain.c:1357 dirmngr/validate.c:497
+#: sm/certchain.c:1290 sm/certchain.c:1358 dirmngr/validate.c:497
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "certifikat med ugyldig validitet: %s"
 
-#: sm/certchain.c:1304 sm/certchain.c:1389 dirmngr/validate.c:515
+#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:515
 #, c-format
 msgid "certificate not yet valid"
 msgstr "certifikat er endnu ikke gyldigt"
 
-#: sm/certchain.c:1305 sm/certchain.c:1390
+#: sm/certchain.c:1306 sm/certchain.c:1391
 msgid "root certificate not yet valid"
 msgstr "rodcertifikat er endnu ikke gyldigt"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1307 sm/certchain.c:1392
 msgid "intermediate certificate not yet valid"
 msgstr "mellemliggende certifikat er endnu ikke gyldigt"
 
-#: sm/certchain.c:1319 dirmngr/validate.c:526
+#: sm/certchain.c:1320 dirmngr/validate.c:526
 #, c-format
 msgid "certificate has expired"
 msgstr "certifikat er udløbet"
 
-#: sm/certchain.c:1320
+#: sm/certchain.c:1321
 msgid "root certificate has expired"
 msgstr "rodcertifikat er udløbet"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1322
 msgid "intermediate certificate has expired"
 msgstr "mellemliggende certifikat er udløbet"
 
-#: sm/certchain.c:1363
+#: sm/certchain.c:1364
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr "krævede certifikatattributter mangler: %s%s%s"
 
-#: sm/certchain.c:1372
+#: sm/certchain.c:1373
 msgid "certificate with invalid validity"
 msgstr "certifikat med ugyldig validitet"
 
-#: sm/certchain.c:1409
+#: sm/certchain.c:1410
 msgid "signature not created during lifetime of certificate"
 msgstr "underskrift blev ikke oprettet under certifikatets livsforløb"
 
-#: sm/certchain.c:1411
+#: sm/certchain.c:1412
 msgid "certificate not created during lifetime of issuer"
 msgstr "certifikat blev ikke oprettet under udsteders livsforløb"
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1413
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
 "mellemliggende certifikat blev ikke oprettet under udsteders livsforløb"
 
-#: sm/certchain.c:1416
+#: sm/certchain.c:1417
 #, c-format
 msgid "  (  signature created at "
 msgstr "  (underskr. oprettet den "
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1418
 #, c-format
 msgid "  (certificate created at "
 msgstr "  (certifkat oprettet den "
 
-#: sm/certchain.c:1420
+#: sm/certchain.c:1421
 #, c-format
 msgid "  (certificate valid from "
 msgstr "  (certifikat gyldigt fra "
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1422
 #, c-format
 msgid "  (     issuer valid from "
 msgstr "  (   udsteder gyldig fra "
 
-#: sm/certchain.c:1451 dirmngr/validate.c:577
+#: sm/certchain.c:1452 dirmngr/validate.c:577
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "fingeraftryk=%s\n"
 
-#: sm/certchain.c:1460
+#: sm/certchain.c:1461
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr "rodcertifikat er nu blevet markeret som troværdig\n"
 
-#: sm/certchain.c:1473
+#: sm/certchain.c:1474
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr "interaktiv markering som troværdig er ikke aktiveret i gpg-agent\n"
 
-#: sm/certchain.c:1479
+#: sm/certchain.c:1480
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr "interaktiv markering som troværdig deaktiveret for denne session\n"
 
-#: sm/certchain.c:1538
+#: sm/certchain.c:1539
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 "ADVARSEL: oprettelsestidspunkt for underskrift er ukendt - antager aktuelt "
 "tidspunkt"
 
-#: sm/certchain.c:1602
+#: sm/certchain.c:1603
 msgid "no issuer found in certificate"
 msgstr "ingen udsteder fundet i certifikat"
 
-#: sm/certchain.c:1680
+#: sm/certchain.c:1681
 msgid "self-signed certificate has a BAD signature"
 msgstr "egenunderskrevet certifikat har en UGYLDIG underskrift"
 
-#: sm/certchain.c:1749 dirmngr/validate.c:575
+#: sm/certchain.c:1750 dirmngr/validate.c:575
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "rodcertifikat er ikke markeret som troværdig"
 
-#: sm/certchain.c:1765
+#: sm/certchain.c:1766
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "kontrol af troværdighedslisten mislykkedes: %s\n"
 
-#: sm/certchain.c:1796 sm/import.c:175 dirmngr/validate.c:630
+#: sm/certchain.c:1797 sm/import.c:175 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "certifikatkæde er for lang\n"
 
-#: sm/certchain.c:1808 dirmngr/validate.c:642
+#: sm/certchain.c:1809 dirmngr/validate.c:642
 #, c-format
 msgid "issuer certificate not found"
 msgstr "udstedercertifikat blev ikke fundet"
 
-#: sm/certchain.c:1842 dirmngr/validate.c:668
+#: sm/certchain.c:1844 dirmngr/validate.c:668
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr "certifikat har en UGYLDIG underskrift"
 
-#: sm/certchain.c:1874 dirmngr/validate.c:692
+#: sm/certchain.c:1876 dirmngr/validate.c:692
 msgid "found another possible matching CA certificate - trying again"
 msgstr "fandt et andet mulig matchende CA-certifikat - prøver igen"
 
-#: sm/certchain.c:1933 dirmngr/validate.c:717
+#: sm/certchain.c:1935 dirmngr/validate.c:717
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "certifikatkæde er længere end tilladt af CA (%d)"
 
-#: sm/certchain.c:1975 sm/certchain.c:2275 dirmngr/validate.c:747
+#: sm/certchain.c:1977 sm/certchain.c:2278 dirmngr/validate.c:747
 #, c-format
 msgid "certificate is good\n"
 msgstr "certifikat er gyldigt\n"
 
-#: sm/certchain.c:1976
+#: sm/certchain.c:1978
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "mellemliggende certifikat er gyldigt\n"
 
-#: sm/certchain.c:1977
+#: sm/certchain.c:1979
 #, c-format
 msgid "root certificate is good\n"
 msgstr "rodcertifikat er gyldigt\n"
 
-#: sm/certchain.c:2159
+#: sm/certchain.c:2161
 msgid "switching to chain model"
 msgstr "skifter til kædemodel"
 
-#: sm/certchain.c:2168
+#: sm/certchain.c:2170
 #, c-format
 msgid "validation model used: %s"
 msgstr "valideringsmodel brugt: %s"
@@ -9252,18 +9267,18 @@ 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:1372 dirmngr/validate.c:903
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1411 dirmngr/validate.c:903
 #: dirmngr/validate.c:927
 #, c-format
 msgid "out of core\n"
 msgstr "uden for kerne\n"
 
-#: sm/certcheck.c:389 sm/verify.c:212
+#: sm/certcheck.c:388 sm/verify.c:212
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(dette er MD2-algoritmen)\n"
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:793
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:794
 msgid "none"
 msgstr "ingen"
 
@@ -9573,17 +9588,17 @@ msgstr "Klar. Du skal nu sende denne forespørgsel til din CA.\n"
 msgid "resource problem: out of core\n"
 msgstr "ressourceproblem: ikke nok kerne\n"
 
-#: sm/decrypt.c:719
+#: sm/decrypt.c:1159
 #, c-format
 msgid "(this is the RC2 algorithm)\n"
 msgstr "(dette er RC2-algoritmen)\n"
 
-#: sm/decrypt.c:721
+#: sm/decrypt.c:1161
 #, c-format
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr "(dette ser ikke ud til at være en krypteret besked)\n"
 
-#: sm/decrypt.c:868
+#: sm/decrypt.c:1318
 #, fuzzy, c-format
 #| msgid "encrypted with %s key, ID %s\n"
 msgid "encrypted to %s key %s\n"
@@ -9595,7 +9610,7 @@ msgstr "krypteret med %s nøgle, id %s\n"
 msgid "certificate '%s' not found: %s\n"
 msgstr "certifikat »%s« blev ikke fundet: %s\n"
 
-#: sm/delete.c:120 sm/keydb.c:1999 sm/keydb.c:2098
+#: sm/delete.c:120 sm/keydb.c:2021 sm/keydb.c:2120
 #, c-format
 msgid "error locking keybox: %s\n"
 msgstr "fejl ved låsning af nøgleboks: %s\n"
@@ -9617,7 +9632,7 @@ msgstr "certifikat »%s« slettet\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "sletning af certifikat »%s« mislykkedes: %s\n"
 
-#: sm/encrypt.c:606
+#: sm/encrypt.c:607
 #, c-format
 msgid "no valid recipients given\n"
 msgstr "ingen gyldige modtagere angivet\n"
@@ -9686,65 +9701,65 @@ msgstr "|USER-ID|brug BRUGER-ID som hemmelig standardnøgle"
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|FILE|tilføj nøglering til nøgleringslisten"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:352 dirmngr/dirmngr.c:265
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|SPEC|brug denne nøgleserver til at slå nøgler op"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:363
 msgid "fetch missing issuer certificates"
 msgstr "hent manglende udstedercertifikater"
 
-#: sm/gpgsm.c:364
+#: sm/gpgsm.c:365
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NAME|brug kodnings-NAVN for PKCS#12-adgangsfraser"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:386
 msgid "never consult a CRL"
 msgstr "konsulter aldrig en CRL"
 
-#: sm/gpgsm.c:389
+#: sm/gpgsm.c:390
 msgid "do not check CRLs for root certificates"
 msgstr "kontroller ikke CRL'er for rodcertifikater"
 
-#: sm/gpgsm.c:393
+#: sm/gpgsm.c:394
 msgid "check validity using OCSP"
 msgstr "kontroller validitet med OCSP"
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:396
 msgid "do not check certificate policies"
 msgstr "kontroller ikke certifikatpolitikker"
 
-#: sm/gpgsm.c:398
+#: sm/gpgsm.c:399
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|brug chifferalgoritme NAVN"
 
-#: sm/gpgsm.c:400
+#: sm/gpgsm.c:401
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|brug beskedsammendragsalgoritme NAVN"
 
-#: sm/gpgsm.c:410
+#: sm/gpgsm.c:411
 msgid "batch mode: never ask"
 msgstr "kørselstilstand: spørg aldrig"
 
-#: sm/gpgsm.c:412
+#: sm/gpgsm.c:413
 msgid "assume yes on most questions"
 msgstr "forvent ja til de fleste spørgsmål"
 
-#: sm/gpgsm.c:413
+#: sm/gpgsm.c:414
 msgid "assume no on most questions"
 msgstr "forvent nej til de fleste spørgsmål"
 
-#: sm/gpgsm.c:430
+#: sm/gpgsm.c:431
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FILE|skriv en revisionslog til FIL"
 
-#: sm/gpgsm.c:615
+#: sm/gpgsm.c:616
 #, 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:618
+#: sm/gpgsm.c:619
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpgsm [options] [files]\n"
@@ -9759,56 +9774,31 @@ msgstr ""
 "Sign, check, encrypt eller decrypt med S/MIME-protokollen\n"
 "standardhandling afhænger af inddata\n"
 
-#: sm/gpgsm.c:826
+#: sm/gpgsm.c:827
 #, 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:837
+#: sm/gpgsm.c:838
 #, fuzzy, c-format
 #| msgid "unknown validation model `%s'\n"
 msgid "unknown validation model '%s'\n"
 msgstr "ukendt valideringsmodel »%s«\n"
 
-#: sm/gpgsm.c:896 dirmngr/ldapserver.c:89
-#, c-format
-msgid "%s:%u: no hostname given\n"
-msgstr "%s:%u: intet værtsnavn angivet\n"
-
-#: sm/gpgsm.c:915 dirmngr/ldapserver.c:108
-#, c-format
-msgid "%s:%u: password given without user\n"
-msgstr "%s:%u: adgangskode angivet uden bruger\n"
-
-#: sm/gpgsm.c:946 dirmngr/ldapserver.c:139
-#, c-format
-msgid "%s:%u: ignoring unknown flag '%s'\n"
-msgstr ""
-
-#: sm/gpgsm.c:962 dirmngr/ldapserver.c:155
-#, c-format
-msgid "%s:%u: skipping this line\n"
-msgstr "%s:%u: udelader denne linje\n"
-
-#: sm/gpgsm.c:1550
-#, c-format
-msgid "could not parse keyserver\n"
-msgstr "kunne ikke fortolke nøgleserver\n"
-
-#: sm/gpgsm.c:1858
+#: sm/gpgsm.c:1711
 #, 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:1904
+#: sm/gpgsm.c:1757
 #, 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:2273
+#: sm/gpgsm.c:2129
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "ugyldig kommando (der er ingen implict kommando)\n"
@@ -9828,54 +9818,54 @@ msgstr "fejl ved lagring af certifikat\n"
 msgid "basic certificate checks failed - not imported\n"
 msgstr "grundlæggende certifikatkontroller mislykkedes - ikke importeret\n"
 
-#: sm/import.c:471 sm/keydb.c:2018 sm/keydb.c:2111
+#: sm/import.c:472 sm/keydb.c:2040 sm/keydb.c:2133
 #, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "fejl ved indhentelse af gemte flag: %s\n"
 
-#: sm/import.c:530 sm/import.c:562
+#: sm/import.c:531 sm/import.c:563
 #, c-format
 msgid "error importing certificate: %s\n"
 msgstr "fejl under import af certifikat: %s\n"
 
-#: sm/import.c:751 tools/gpg-connect-agent.c:1475
+#: sm/import.c:752 tools/gpg-connect-agent.c:1475
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "fejl ved læsning af inddata: %s\n"
 
-#: sm/keydb.c:503
+#: sm/keydb.c:508
 #, fuzzy, c-format
 #| msgid "no gpg-agent running in this session\n"
 msgid "no keyboxd running in this session\n"
 msgstr "ingen gpg-agent kører i denne session\n"
 
-#: sm/keydb.c:595
+#: sm/keydb.c:600
 #, fuzzy, c-format
 #| msgid "error opening `%s': %s\n"
 msgid "error opening key DB: %s\n"
 msgstr "fejl ved åbning af »%s«: %s\n"
 
-#: sm/keydb.c:1936
+#: sm/keydb.c:1958
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr "problem under udkig efter eksisterende certifikat: %s\n"
 
-#: sm/keydb.c:1948
+#: sm/keydb.c:1970
 #, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "fejl under søgning efter skrivbar keyDB (nøgledatabase): %s\n"
 
-#: sm/keydb.c:1956
+#: sm/keydb.c:1978
 #, c-format
 msgid "error storing certificate: %s\n"
 msgstr "fejl ved lagring af certifikat: %s\n"
 
-#: sm/keydb.c:2009
+#: sm/keydb.c:2031
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "problem under gensøgning af certifikat: %s\n"
 
-#: sm/keydb.c:2030 sm/keydb.c:2122
+#: sm/keydb.c:2052 sm/keydb.c:2144
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr "fejl ved lagring af flag: %s\n"
@@ -10071,67 +10061,67 @@ msgstr ""
 msgid "error loading certificate '%s': %s\n"
 msgstr "fejl ved lagring af certifikat: %s\n"
 
-#: dirmngr/certcache.c:819
+#: dirmngr/certcache.c:820
 #, fuzzy, c-format
 #| msgid "Included certificates"
 msgid "permanently loaded certificates: %u\n"
 msgstr "Inkluderede certifikater"
 
-#: dirmngr/certcache.c:821
+#: dirmngr/certcache.c:822
 #, fuzzy, c-format
 #| msgid "number of matching certificates: %d\n"
 msgid "    runtime cached certificates: %u\n"
 msgstr "antallet af matchende certifikater: %d\n"
 
-#: dirmngr/certcache.c:823
+#: dirmngr/certcache.c:824
 #, fuzzy, c-format
 #| msgid "number of matching certificates: %d\n"
 msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "antallet af matchende certifikater: %d\n"
 
-#: dirmngr/certcache.c:851 dirmngr/dirmngr-client.c:392
+#: dirmngr/certcache.c:852 dirmngr/dirmngr-client.c:392
 #, fuzzy, c-format
 #| msgid "  (certificate created at "
 msgid "certificate already cached\n"
 msgstr "  (certifkat oprettet den "
 
-#: dirmngr/certcache.c:853
+#: dirmngr/certcache.c:854
 #, fuzzy, c-format
 #| msgid "certificate is good\n"
 msgid "certificate cached\n"
 msgstr "certifikat er gyldigt\n"
 
-#: dirmngr/certcache.c:855 dirmngr/certcache.c:875 dirmngr/dirmngr-client.c:396
+#: dirmngr/certcache.c:856 dirmngr/certcache.c:876 dirmngr/dirmngr-client.c:396
 #, fuzzy, c-format
 #| msgid "error storing certificate: %s\n"
 msgid "error caching certificate: %s\n"
 msgstr "fejl ved lagring af certifikat: %s\n"
 
-#: dirmngr/certcache.c:938
+#: dirmngr/certcache.c:939
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "ugyldig fingeraftryk"
 
-#: dirmngr/certcache.c:1384 dirmngr/certcache.c:1393
+#: dirmngr/certcache.c:1385 dirmngr/certcache.c:1394
 #, fuzzy, c-format
 #| msgid "error storing certificate: %s\n"
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "fejl ved lagring af certifikat: %s\n"
 
-#: dirmngr/certcache.c:1579 dirmngr/certcache.c:1588
+#: dirmngr/certcache.c:1580 dirmngr/certcache.c:1589
 #, fuzzy, c-format
 #| msgid "error storing certificate: %s\n"
 msgid "error fetching certificate by subject: %s\n"
 msgstr "fejl ved lagring af certifikat: %s\n"
 
-#: dirmngr/certcache.c:1694 dirmngr/validate.c:483
+#: dirmngr/certcache.c:1695 dirmngr/validate.c:483
 #, fuzzy, c-format
 #| msgid "no issuer found in certificate"
 msgid "no issuer found in certificate\n"
 msgstr "ingen udsteder fundet i certifikat"
 
-#: dirmngr/certcache.c:1704
+#: dirmngr/certcache.c:1705
 #, fuzzy, c-format
 #| msgid "error getting stored flags: %s\n"
 msgid "error getting authorityKeyIdentifier: %s\n"
@@ -10173,7 +10163,7 @@ msgstr "modtagelse af linje mislykkedes: %s\n"
 msgid "not removing file '%s'\n"
 msgstr "påklædning af panser mislykkedes: %s\n"
 
-#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2380
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2383
 #, fuzzy, c-format
 #| msgid "error closing %s: %s\n"
 msgid "error closing cache file: %s\n"
@@ -10427,13 +10417,13 @@ msgid "error getting data from cache file: %s\n"
 msgstr "fejl ved indhentelse af gemte flag: %s\n"
 
 #: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1672 dirmngr/crlcache.c:1697
-#: dirmngr/crlcache.c:1763
+#: dirmngr/crlcache.c:1766
 #, c-format
 msgid "got an invalid S-expression from libksba\n"
 msgstr ""
 
 #: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1679 dirmngr/crlcache.c:1705
-#: dirmngr/crlcache.c:1770 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1773 dirmngr/misc.c:176
 #, fuzzy, c-format
 #| msgid "iconv_open failed: %s\n"
 msgid "converting S-expression failed: %s\n"
@@ -10450,222 +10440,222 @@ msgstr "ugyldig hash-algoritme »%s«\n"
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1797 dirmngr/ocsp.c:478
+#: dirmngr/crlcache.c:1800 dirmngr/ocsp.c:478
 #, fuzzy, c-format
 #| msgid "receiving line failed: %s\n"
 msgid "creating S-expression failed: %s\n"
 msgstr "modtagelse af linje mislykkedes: %s\n"
 
-#: dirmngr/crlcache.c:1871
+#: dirmngr/crlcache.c:1874
 #, fuzzy, c-format
 #| msgid "build_packet failed: %s\n"
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "build_packet mislykkedes: %s\n"
 
-#: dirmngr/crlcache.c:1886
+#: dirmngr/crlcache.c:1889
 #, fuzzy, c-format
 #| msgid "error getting serial number of card: %s\n"
 msgid "error getting update times of CRL: %s\n"
 msgstr "fejl ved indhentelse af serielnummer for kort: %s\n"
 
-#: dirmngr/crlcache.c:1893
+#: dirmngr/crlcache.c:1896
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1897
+#: dirmngr/crlcache.c:1900
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1917
+#: dirmngr/crlcache.c:1920
 #, fuzzy, c-format
 #| msgid "error getting new PIN: %s\n"
 msgid "error getting CRL item: %s\n"
 msgstr "fejl ved indhentelse af ny PIN: %s\n"
 
-#: dirmngr/crlcache.c:1932
+#: dirmngr/crlcache.c:1935
 #, fuzzy, c-format
 #| msgid "error writing to temporary file: %s\n"
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "fejl ved skrivning til midlertidig fil: %s\n"
 
-#: dirmngr/crlcache.c:1959
+#: dirmngr/crlcache.c:1962
 #, fuzzy, c-format
 #| msgid "no issuer found in certificate"
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "ingen udsteder fundet i certifikat"
 
-#: dirmngr/crlcache.c:1974
+#: dirmngr/crlcache.c:1977
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2020
+#: dirmngr/crlcache.c:2023
 #, fuzzy, c-format
 #| msgid "signature verification suppressed\n"
 msgid "CRL signature verification failed: %s\n"
 msgstr "underskriftverificering undertrykt\n"
 
-#: dirmngr/crlcache.c:2032
+#: dirmngr/crlcache.c:2035
 #, fuzzy, c-format
 #| msgid "error reading list of trusted root certificates\n"
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "fejl ved læsning af liste over betroede rodcertifikater\n"
 
-#: dirmngr/crlcache.c:2174
+#: dirmngr/crlcache.c:2177
 #, fuzzy, c-format
 #| msgid "select failed: %s\n"
 msgid "ksba_crl_new failed: %s\n"
 msgstr "select mislykkedes: %s\n"
 
-#: dirmngr/crlcache.c:2181
+#: dirmngr/crlcache.c:2184
 #, fuzzy, c-format
 #| msgid "read failed: %s\n"
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "læsning mislykkedes: %s\n"
 
-#: dirmngr/crlcache.c:2215
+#: dirmngr/crlcache.c:2218
 #, fuzzy, c-format
 #| msgid "failed to create temporary file `%s': %s\n"
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "kunne ikke oprette midlertidig fil »%s«: %s\n"
 
-#: dirmngr/crlcache.c:2219
+#: dirmngr/crlcache.c:2222
 #, fuzzy, c-format
 #| msgid "failed to create temporary file `%s': %s\n"
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "kunne ikke oprette midlertidig fil »%s«: %s\n"
 
-#: dirmngr/crlcache.c:2229
+#: dirmngr/crlcache.c:2232
 #, fuzzy, c-format
 #| msgid "error creating temporary file: %s\n"
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "fejl ved oprettelse af midlertidig fil: %s\n"
 
-#: dirmngr/crlcache.c:2239
+#: dirmngr/crlcache.c:2242
 #, fuzzy, c-format
 #| msgid "update secret failed: %s\n"
 msgid "crl_parse_insert failed: %s\n"
 msgstr "opdatering af hemmelighed mislykkedes: %s\n"
 
-#: dirmngr/crlcache.c:2249
+#: dirmngr/crlcache.c:2252
 #, fuzzy, c-format
 #| msgid "error writing to temporary file: %s\n"
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "fejl ved skrivning til midlertidig fil: %s\n"
 
-#: dirmngr/crlcache.c:2256
+#: dirmngr/crlcache.c:2259
 #, fuzzy, c-format
 #| msgid "error creating temporary file: %s\n"
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "fejl ved oprettelse af midlertidig fil: %s\n"
 
-#: dirmngr/crlcache.c:2281
+#: dirmngr/crlcache.c:2284
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2285
+#: dirmngr/crlcache.c:2288
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2301
+#: dirmngr/crlcache.c:2304
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2311
+#: dirmngr/crlcache.c:2314
 #, fuzzy, c-format
 #| msgid "error reading input: %s\n"
 msgid "error reading CRL extensions: %s\n"
 msgstr "fejl ved læsning af inddata: %s\n"
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2365
 #, fuzzy, c-format
 #| msgid "error creating a pipe: %s\n"
 msgid "creating cache file '%s'\n"
 msgstr "fejl ved oprettelse af datakanal: %s\n"
 
-#: dirmngr/crlcache.c:2394
+#: dirmngr/crlcache.c:2397
 #, fuzzy, c-format
 #| msgid "renaming `%s' to `%s' failed: %s\n"
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "omdøbelse af »%s« til »%s« mislykkedes: %s\n"
 
-#: dirmngr/crlcache.c:2408
+#: dirmngr/crlcache.c:2411
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
 "program start\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2448
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2468
+#: dirmngr/crlcache.c:2471
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2471
+#: dirmngr/crlcache.c:2474
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2474
+#: dirmngr/crlcache.c:2477
 msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2481
+#: dirmngr/crlcache.c:2484
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2499
+#: dirmngr/crlcache.c:2502
 #, fuzzy, c-format
 #| msgid "WARNING: invalid notation data found\n"
 msgid " WARNING: invalid cache record length\n"
 msgstr "ADVARSEL: Ingen notationsdata fundet\n"
 
-#: dirmngr/crlcache.c:2506
+#: dirmngr/crlcache.c:2509
 #, fuzzy, c-format
 #| msgid "error reading the card: %s\n"
 msgid "problem reading cache record: %s\n"
 msgstr "fejl ved læsning af kort: %s\n"
 
-#: dirmngr/crlcache.c:2517
+#: dirmngr/crlcache.c:2520
 #, fuzzy, c-format
 #| msgid "problem re-searching certificate: %s\n"
 msgid "problem reading cache key: %s\n"
 msgstr "problem under gensøgning af certifikat: %s\n"
 
-#: dirmngr/crlcache.c:2548
+#: dirmngr/crlcache.c:2551
 #, fuzzy, c-format
 #| msgid "error reading nonce on fd %d: %s\n"
 msgid "error reading cache entry from db: %s\n"
 msgstr "fejl ved læsning af nonce på fd %d: %s\n"
 
-#: dirmngr/crlcache.c:2551
+#: dirmngr/crlcache.c:2554
 msgid "End CRL dump\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2672
+#: dirmngr/crlcache.c:2675
 #, fuzzy, c-format
 #| msgid "read failed: %s\n"
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "læsning mislykkedes: %s\n"
 
-#: dirmngr/crlcache.c:2683
+#: dirmngr/crlcache.c:2686
 #, fuzzy, c-format
 #| msgid "checking the trust list failed: %s\n"
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "kontrol af troværdighedslisten mislykkedes: %s\n"
 
-#: dirmngr/crlcache.c:2743
+#: dirmngr/crlcache.c:2746
 #, fuzzy, c-format
 #| msgid "receiving line failed: %s\n"
 msgid "crl_cache_insert via issuer failed: %s\n"
@@ -10688,7 +10678,7 @@ msgstr ""
 msgid "error retrieving '%s': %s\n"
 msgstr "fejl ved indhentelse af »%s« via %s: %s\n"
 
-#: dirmngr/crlfetch.c:218 dirmngr/ldap-wrapper.c:881 dirmngr/misc.c:573
+#: dirmngr/crlfetch.c:218 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
 #, fuzzy, c-format
 #| msgid "%s: error writing dir record: %s\n"
 msgid "error initializing reader object: %s\n"
@@ -10870,143 +10860,143 @@ msgstr ""
 msgid "looking up '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:175
+#: dirmngr/dirmngr.c:176
 msgid "list the contents of the CRL cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:176
+#: dirmngr/dirmngr.c:177
 #, fuzzy
 #| msgid "|FILE|run commands from FILE on startup"
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|FILE|kør kommandoer fra FIL ved opstart"
 
-#: dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr.c:178
 msgid "|URL|fetch a CRL from URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:178
+#: dirmngr/dirmngr.c:179
 #, fuzzy
 #| msgid "pass a command to the dirmngr"
 msgid "shutdown the dirmngr"
 msgstr "send en kommando til dirmngr'en"
 
-#: dirmngr/dirmngr.c:179
+#: dirmngr/dirmngr.c:180
 msgid "flush the cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:213
 msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:215
+#: dirmngr/dirmngr.c:216
 msgid "|N|do not return more than N items in one query"
 msgstr ""
 
-#: dirmngr/dirmngr.c:221
+#: dirmngr/dirmngr.c:222
 msgid "Network related options"
 msgstr ""
 
-#: dirmngr/dirmngr.c:223
+#: dirmngr/dirmngr.c:224
 msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:235
+#: dirmngr/dirmngr.c:236
 msgid "Configuration for Keyservers"
 msgstr "Konfiguration for nøgleservere"
 
-#: dirmngr/dirmngr.c:238
+#: dirmngr/dirmngr.c:239
 msgid "|URL|use keyserver at URL"
 msgstr "|URL|brug nøgleserver på adressen"
 
-#: dirmngr/dirmngr.c:240
+#: dirmngr/dirmngr.c:241
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-#: dirmngr/dirmngr.c:242
+#: dirmngr/dirmngr.c:243
 msgid "Configuration for HTTP servers"
 msgstr "Konfiguration for HTTP-servere"
 
-#: dirmngr/dirmngr.c:244
+#: dirmngr/dirmngr.c:245
 msgid "inhibit the use of HTTP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:246
+#: dirmngr/dirmngr.c:247
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:248
+#: dirmngr/dirmngr.c:249
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:250
+#: dirmngr/dirmngr.c:251
 msgid "use system's HTTP proxy setting"
 msgstr "brug systemets HTTP-proxyopsætning"
 
-#: dirmngr/dirmngr.c:254
+#: dirmngr/dirmngr.c:255
 msgid "Configuration of LDAP servers to use"
 msgstr "Konfiguraiton af LDAP-servere der skal bruges"
 
-#: dirmngr/dirmngr.c:256
+#: dirmngr/dirmngr.c:257
 msgid "inhibit the use of LDAP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:258
+#: dirmngr/dirmngr.c:259
 msgid "ignore LDAP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:260
+#: dirmngr/dirmngr.c:261
 msgid "|HOST|use HOST for LDAP queries"
 msgstr ""
 
-#: dirmngr/dirmngr.c:262
+#: dirmngr/dirmngr.c:263
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr ""
 
-#: dirmngr/dirmngr.c:264
+#: dirmngr/dirmngr.c:267
 #, fuzzy
 #| msgid "|FILE|read options from FILE"
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FIL|læs tilvalg fra FIL"
 
-#: dirmngr/dirmngr.c:266
+#: dirmngr/dirmngr.c:269
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 
-#: dirmngr/dirmngr.c:269 dirmngr/dirmngr_ldap.c:104
+#: dirmngr/dirmngr.c:272
 #, fuzzy
 #| msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|angive maksimal livsforløb for PIN-mellemlager til N sekunder"
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:275
 msgid "Configuration for OCSP"
 msgstr "Konfiguration for OCSP"
 
-#: dirmngr/dirmngr.c:274
+#: dirmngr/dirmngr.c:277
 #, fuzzy
 #| msgid "allow PKA lookups (DNS requests)"
 msgid "allow sending OCSP requests"
 msgstr "tillad PKA-opslag (DNS-forespørgsler)"
 
-#: dirmngr/dirmngr.c:276
+#: dirmngr/dirmngr.c:279
 msgid "ignore certificate contained OCSP service URLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:278
+#: dirmngr/dirmngr.c:281
 #, fuzzy
 #| msgid "|URL|use keyserver at URL"
 msgid "|URL|use OCSP responder at URL"
 msgstr "|URL|brug nøgleserver på adressen"
 
-#: dirmngr/dirmngr.c:280
+#: dirmngr/dirmngr.c:283
 msgid "|FPR|OCSP response signed by FPR"
 msgstr ""
 
-#: dirmngr/dirmngr.c:288
+#: dirmngr/dirmngr.c:291
 msgid "force loading of outdated CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:299
+#: dirmngr/dirmngr.c:302
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -11019,13 +11009,13 @@ msgstr ""
 "@\n"
 "(Se manualsiden for en fuldstændig liste over alle kommandoer og tilvalg)\n"
 
-#: dirmngr/dirmngr.c:441
+#: dirmngr/dirmngr.c:449
 #, fuzzy
 #| msgid "Usage: gpgconf [options] (-h for help)"
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Brug: gpgconf [tilvalg] (-h for hjælp)"
 
-#: dirmngr/dirmngr.c:443
+#: dirmngr/dirmngr.c:451
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg-agent [options] [command [args]]\n"
@@ -11037,315 +11027,114 @@ msgstr ""
 "Syntaks: gpg-agent [tilvalg] [kommando [parametre]]\n"
 "Hemmelig nøglehåndtering for GnuPG\n"
 
-#: dirmngr/dirmngr.c:523
+#: dirmngr/dirmngr.c:531
 #, fuzzy, c-format
 #| msgid "invalid debug-level `%s' given\n"
 msgid "valid debug levels are: %s\n"
 msgstr "ugyldigt fejlsøgningsniveau »%s« angivet\n"
 
-#: dirmngr/dirmngr.c:609 tools/gpgconf.c:667 tools/gpgconf.c:702
-#: tools/gpgconf.c:802
+#: dirmngr/dirmngr.c:617 tools/gpgconf.c:701 tools/gpgconf.c:736
+#: tools/gpgconf.c:836
 #, fuzzy, c-format
 #| msgid "usage: gpgsm [options] "
 msgid "usage: %s [options] "
 msgstr "brug: gpgsm [tilvalg] "
 
-#: dirmngr/dirmngr.c:1260
+#: dirmngr/dirmngr.c:1299
 #, 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:1495 dirmngr/server.c:1824
+#: dirmngr/dirmngr.c:1534 dirmngr/server.c:1878
 #, 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:1501 dirmngr/server.c:1830
+#: dirmngr/dirmngr.c:1540 dirmngr/server.c:1884
 #, 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:1643
+#: dirmngr/dirmngr.c:1682
 #, 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:1698 dirmngr/dirmngr.c:1782
+#: dirmngr/dirmngr.c:1737 dirmngr/dirmngr.c:1821
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "ugyldig fingeraftryk"
 
-#: dirmngr/dirmngr.c:1734 dirmngr/dirmngr.c:1760 tools/gpgconf-comp.c:3539
+#: dirmngr/dirmngr.c:1773 dirmngr/dirmngr.c:1799 tools/gpgconf-comp.c:3549
 #, 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:1789
+#: dirmngr/dirmngr.c:1828
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1876
+#: dirmngr/dirmngr.c:1915
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1917
+#: dirmngr/dirmngr.c:1956
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1922
+#: dirmngr/dirmngr.c:1961
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1924
+#: dirmngr/dirmngr.c:1963
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1929
+#: dirmngr/dirmngr.c:1968
 #, fuzzy, c-format
 #| msgid "not forced"
 msgid "shutdown forced\n"
 msgstr "ikke tvunget"
 
-#: dirmngr/dirmngr.c:1937
+#: dirmngr/dirmngr.c:1976
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1944
+#: dirmngr/dirmngr.c:1983
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:105
-msgid "return all values in a record oriented format"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:108
-msgid "|NAME|ignore host part and connect through NAME"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:109
-msgid "force a TLS connection"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:110
-#, fuzzy
-#| msgid "|NAME|connect to Assuan socket NAME"
-msgid "|NAME|connect to host NAME"
-msgstr "|NAME|forbind til Assuansokkel NAVN"
-
-#: dirmngr/dirmngr_ldap.c:111
-#, fuzzy
-#| msgid "|N|connect to reader at port N"
-msgid "|N|connect to port N"
-msgstr "|N|forbind til læser på port N"
-
-#: dirmngr/dirmngr_ldap.c:112
-msgid "|NAME|use user NAME for authentication"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:113
-msgid "|PASS|use password PASS for authentication"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:115
-msgid "take password from $DIRMNGR_LDAP_PASS"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:116
-msgid "|STRING|query DN STRING"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:117
-msgid "|STRING|use STRING as filter expression"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:118
-msgid "|STRING|return the attribute STRING"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:179
-#, fuzzy
-#| msgid "Usage: gpg [options] [files] (-h for help)"
-msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
-msgstr "Brug: gpg [flag] [filer] (-h for hjælp)"
-
-#: dirmngr/dirmngr_ldap.c:182
-msgid ""
-"Syntax: dirmngr_ldap [options] [URL]\n"
-"Internal LDAP helper for Dirmngr\n"
-"Interface and options may change without notice\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:291
-#, fuzzy, c-format
-#| msgid "invalid import options\n"
-msgid "invalid port number %d\n"
-msgstr "ugyldige importindstillinger\n"
-
-#: dirmngr/dirmngr_ldap.c:400
-#, c-format
-msgid "scanning result for attribute '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:407 dirmngr/dirmngr_ldap.c:490
-#: dirmngr/dirmngr_ldap.c:514 dirmngr/dirmngr_ldap.c:526
-#: dirmngr/dirmngr_ldap.c:722
-#, fuzzy, c-format
-#| msgid "error writing to %s: %s\n"
-msgid "error writing to stdout: %s\n"
-msgstr "fejl ved skrivning til »%s«: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:424
-#, c-format
-msgid "          available attribute '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:462
-#, fuzzy, c-format
-#| msgid "certificate `%s' not found: %s\n"
-msgid "attribute '%s' not found\n"
-msgstr "certifikat »%s« blev ikke fundet: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:469
-#, c-format
-msgid "found attribute '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:581
-#, fuzzy, c-format
-#| msgid "reading from `%s'\n"
-msgid "processing url '%s'\n"
-msgstr "læser fra »%s«\n"
-
-#: dirmngr/dirmngr_ldap.c:588
-#, fuzzy, c-format
-#| msgid "          w/o user IDs: %lu\n"
-msgid "          user '%s'\n"
-msgstr "      w/o bruger-id'er: %lu\n"
-
-#: dirmngr/dirmngr_ldap.c:590
-#, fuzzy, c-format
-#| msgid "                aka \"%s\""
-msgid "          pass '%s'\n"
-msgstr "       også kendt som »%s«"
-
-#: dirmngr/dirmngr_ldap.c:592
-#, fuzzy, c-format
-#| msgid "          w/o user IDs: %lu\n"
-msgid "          host '%s'\n"
-msgstr "      w/o bruger-id'er: %lu\n"
-
-#: dirmngr/dirmngr_ldap.c:593
-#, fuzzy, c-format
-#| msgid "          not imported: %lu\n"
-msgid "          port %d\n"
-msgstr "      ikke importerede: %lu\n"
-
-#: dirmngr/dirmngr_ldap.c:595
-#, fuzzy, c-format
-#| msgid "                aka \"%s\""
-msgid "            DN '%s'\n"
-msgstr "       også kendt som »%s«"
-
-#: dirmngr/dirmngr_ldap.c:597
-#, c-format
-msgid "        filter '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:602 dirmngr/dirmngr_ldap.c:605
-#, fuzzy, c-format
-#| msgid "                aka \"%s\""
-msgid "          attr '%s'\n"
-msgstr "       også kendt som »%s«"
-
-#: dirmngr/dirmngr_ldap.c:611
-#, fuzzy, c-format
-#| msgid "%s:%u: no hostname given\n"
-msgid "no host name in '%s'\n"
-msgstr "%s:%u: intet værtsnavn angivet\n"
-
-#: dirmngr/dirmngr_ldap.c:616
-#, c-format
-msgid "no attribute given for query '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:622
-#, fuzzy, c-format
-#| msgid "WARNING: Using untrusted key!\n"
-msgid "WARNING: using first attribute only\n"
-msgstr "ADVARSEL: Bruger nøgle uden troværdighed!\n"
-
-#: dirmngr/dirmngr_ldap.c:637 dirmngr/dirmngr_ldap.c:678
-#, fuzzy, c-format
-#| msgid "renaming `%s' to `%s' failed: %s\n"
-msgid "LDAP init to '%s:%d' failed: %s\n"
-msgstr "omdøbelse af »%s« til »%s« mislykkedes: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:659
-#, fuzzy, c-format
-#| msgid "renaming `%s' to `%s' failed: %s\n"
-msgid "LDAP init to '%s' failed: %s\n"
-msgstr "omdøbelse af »%s« til »%s« mislykkedes: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:665
-#, fuzzy, c-format
-#| msgid "renaming `%s' to `%s' failed: %s\n"
-msgid "LDAP init to '%s' done\n"
-msgstr "omdøbelse af »%s« til »%s« mislykkedes: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:704
-#, fuzzy, c-format
-#| msgid "renaming `%s' to `%s' failed: %s\n"
-msgid "binding to '%s:%d' failed: %s\n"
-msgstr "omdøbelse af »%s« til »%s« mislykkedes: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:728
-#, fuzzy, c-format
-#| msgid "dearmoring failed: %s\n"
-msgid "searching '%s' failed: %s\n"
-msgstr "fjernelse af panser mislykkedes: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:759
-#, fuzzy, c-format
-#| msgid "`%s' is not a JPEG file\n"
-msgid "'%s' is not an LDAP URL\n"
-msgstr "»%s« er ikke en JPEG-fil\n"
-
-#: dirmngr/dirmngr_ldap.c:765
-#, c-format
-msgid "'%s' is an invalid LDAP URL\n"
-msgstr ""
-
-#: dirmngr/http.c:1989 dirmngr/ocsp.c:255
+#: dirmngr/http.c:1998 dirmngr/ocsp.c:255
 #, fuzzy, c-format
 #| msgid "error running `%s': exit status %d\n"
 msgid "error accessing '%s': http status %u\n"
 msgstr "fejl ved kørsel af »%s«: afslutningsstatus %d\n"
 
-#: dirmngr/http.c:3630 dirmngr/ocsp.c:229
+#: dirmngr/http.c:3652 dirmngr/ocsp.c:229
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr ""
 
-#: dirmngr/http.c:3636 dirmngr/ocsp.c:246
+#: dirmngr/http.c:3658 dirmngr/ocsp.c:246
 #, fuzzy, c-format
 #| msgid "too many cipher preferences\n"
 msgid "too many redirections\n"
 msgstr "for mange chifferpræferencer\n"
 
-#: dirmngr/http.c:3748
+#: dirmngr/http.c:3768
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "redirection changed to '%s'\n"
@@ -11389,33 +11178,54 @@ msgstr "ventning på at proces %d skulle terminere mislykkedes: %s\n"
 msgid "ldap wrapper %d stalled - killing\n"
 msgstr ""
 
-#: dirmngr/ldap.c:91
+#: dirmngr/ldap.c:92
 #, c-format
 msgid "invalid char 0x%02x in host name - not added\n"
 msgstr ""
 
-#: dirmngr/ldap.c:95
+#: dirmngr/ldap.c:96
 #, fuzzy, c-format
 #| msgid "sending key %s to %s server %s\n"
 msgid "adding '%s:%d' to the ldap server list\n"
 msgstr "sender nøgle %s til %s server %s\n"
 
-#: dirmngr/ldap.c:98 dirmngr/misc.c:512
+#: dirmngr/ldap.c:99 dirmngr/misc.c:512
 #, fuzzy, c-format
 #| msgid "select failed: %s\n"
 msgid "malloc failed: %s\n"
 msgstr "select mislykkedes: %s\n"
 
-#: dirmngr/ldap.c:634
+#: dirmngr/ldap.c:221
+#, fuzzy, c-format
+#| msgid "`%s' is not a JPEG file\n"
+msgid "'%s' is not an LDAP URL\n"
+msgstr "»%s« er ikke en JPEG-fil\n"
+
+#: dirmngr/ldap.c:227 dirmngr/ldap.c:233
 #, c-format
-msgid "start_cert_fetch: invalid pattern '%s'\n"
+msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
-#: dirmngr/ldap.c:846
+#: dirmngr/ldap.c:968
 #, c-format
 msgid "ldap_search hit the size limit of the server\n"
 msgstr ""
 
+#: dirmngr/ldapserver.c:119
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr "%s:%u: adgangskode angivet uden bruger\n"
+
+#: dirmngr/ldapserver.c:181
+#, c-format
+msgid "%s:%u: ignoring unknown flag '%s'\n"
+msgstr ""
+
+#: dirmngr/ldapserver.c:203
+#, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr "%s:%u: udelader denne linje\n"
+
 #: dirmngr/misc.c:172
 #, fuzzy, c-format
 #| msgid "%s: invalid file version %d\n"
@@ -11519,97 +11329,97 @@ msgstr ""
 msgid "allocating list item failed: %s\n"
 msgstr "modtagelse af linje mislykkedes: %s\n"
 
-#: dirmngr/ocsp.c:537 dirmngr/ocsp.c:724
+#: dirmngr/ocsp.c:538 dirmngr/ocsp.c:725
 #, fuzzy, c-format
 #| msgid "error getting new PIN: %s\n"
 msgid "error getting responder ID: %s\n"
 msgstr "fejl ved indhentelse af ny PIN: %s\n"
 
-#: dirmngr/ocsp.c:584
+#: dirmngr/ocsp.c:585
 #, fuzzy, c-format
 #| msgid "certificate should not have been used for OCSP response signing\n"
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr "certifikat burde ikke være brugt for OCSP-svarunderskrivning\n"
 
-#: dirmngr/ocsp.c:623 dirmngr/validate.c:648
+#: dirmngr/ocsp.c:624 dirmngr/validate.c:648
 #, fuzzy, c-format
 #| msgid "issuer certificate not found"
 msgid "issuer certificate not found: %s\n"
 msgstr "udstedercertifikat blev ikke fundet"
 
-#: dirmngr/ocsp.c:633
+#: dirmngr/ocsp.c:634
 #, fuzzy, c-format
 #| msgid "error reading list of trusted root certificates\n"
 msgid "caller did not return the target certificate\n"
 msgstr "fejl ved læsning af liste over betroede rodcertifikater\n"
 
-#: dirmngr/ocsp.c:640
+#: dirmngr/ocsp.c:641
 #, fuzzy, c-format
 #| msgid "error storing certificate\n"
 msgid "caller did not return the issuing certificate\n"
 msgstr "fejl ved lagring af certifikat\n"
 
-#: dirmngr/ocsp.c:650
+#: dirmngr/ocsp.c:651
 #, fuzzy, c-format
 #| msgid "failed to allocate keyDB handle\n"
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "kunne ikke allokere keyDB-håndtag\n"
 
-#: dirmngr/ocsp.c:689
+#: dirmngr/ocsp.c:690
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:696
 #, fuzzy, c-format
 #| msgid "no default secret keyring: %s\n"
 msgid "no default OCSP signer defined\n"
 msgstr "ingen hemmelig standardnøglering: %s\n"
 
-#: dirmngr/ocsp.c:702
+#: dirmngr/ocsp.c:703
 #, fuzzy, c-format
 #| msgid "using default PIN as %s\n"
 msgid "using default OCSP responder '%s'\n"
 msgstr "bruger standard-PIN som %s\n"
 
-#: dirmngr/ocsp.c:707
+#: dirmngr/ocsp.c:708
 #, fuzzy, c-format
 #| msgid "using cipher %s\n"
 msgid "using OCSP responder '%s'\n"
 msgstr "bruger chiffer %s\n"
 
-#: dirmngr/ocsp.c:764
+#: dirmngr/ocsp.c:765
 #, fuzzy, c-format
 #| msgid "error storing certificate: %s\n"
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "fejl ved lagring af certifikat: %s\n"
 
-#: dirmngr/ocsp.c:789
+#: dirmngr/ocsp.c:790
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:790
+#: dirmngr/ocsp.c:791
 msgid "good"
 msgstr ""
 
-#: dirmngr/ocsp.c:796
+#: dirmngr/ocsp.c:797
 #, fuzzy, c-format
 #| msgid "certificate has been revoked"
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "certifikat er blevet tilbagekaldt"
 
-#: dirmngr/ocsp.c:831
+#: dirmngr/ocsp.c:832
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:843
+#: dirmngr/ocsp.c:844
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:858
+#: dirmngr/ocsp.c:859
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr ""
@@ -11620,80 +11430,76 @@ msgstr ""
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "afsendelse af linje mislykkedes: %s\n"
 
-#: dirmngr/server.c:1158
-msgid "ldapserver missing"
-msgstr ""
-
-#: dirmngr/server.c:1224
+#: dirmngr/server.c:1277
 msgid "serialno missing in cert ID"
 msgstr ""
 
-#: dirmngr/server.c:1387 dirmngr/server.c:1473 dirmngr/server.c:1909
-#: dirmngr/server.c:1980 dirmngr/server.c:2556 dirmngr/server.c:2571
+#: dirmngr/server.c:1440 dirmngr/server.c:1526 dirmngr/server.c:1963
+#: dirmngr/server.c:2034 dirmngr/server.c:2662 dirmngr/server.c:2677
 #, fuzzy, c-format
 #| msgid "sending line failed: %s\n"
 msgid "assuan_inquire failed: %s\n"
 msgstr "afsendelse af linje mislykkedes: %s\n"
 
-#: dirmngr/server.c:1516
+#: dirmngr/server.c:1569
 #, fuzzy, c-format
 #| msgid "select failed: %s\n"
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "select mislykkedes: %s\n"
 
-#: dirmngr/server.c:1528 dirmngr/server.c:1559 dirmngr/server.c:1718
+#: dirmngr/server.c:1581 dirmngr/server.c:1612 dirmngr/server.c:1772
 #, fuzzy, c-format
 #| msgid "error sending %s command: %s\n"
 msgid "error sending data: %s\n"
 msgstr "fejl under afsendelse af %s-kommando: %s\n"
 
-#: dirmngr/server.c:1666
+#: dirmngr/server.c:1720
 #, fuzzy, c-format
 #| msgid "select failed: %s\n"
 msgid "start_cert_fetch failed: %s\n"
 msgstr "select mislykkedes: %s\n"
 
-#: dirmngr/server.c:1699
+#: dirmngr/server.c:1753
 #, fuzzy, c-format
 #| msgid "select failed: %s\n"
 msgid "fetch_next_cert failed: %s\n"
 msgstr "select mislykkedes: %s\n"
 
-#: dirmngr/server.c:1726
+#: dirmngr/server.c:1780
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:2860
+#: dirmngr/server.c:2966
 #, fuzzy, c-format
 #| msgid "cannot allocate outfile string: %s\n"
 msgid "can't allocate control structure: %s\n"
 msgstr "kan ikke allokere outfile-streng: %s\n"
 
-#: dirmngr/server.c:2871
+#: dirmngr/server.c:2977
 #, fuzzy, c-format
 #| msgid "failed to create stream from socket: %s\n"
 msgid "failed to allocate assuan context: %s\n"
 msgstr "kunne ikke oprette strøm fra sokkel: %s\n"
 
-#: dirmngr/server.c:2892
+#: dirmngr/server.c:2998
 #, fuzzy, c-format
 #| msgid "failed to initialize the TrustDB: %s\n"
 msgid "failed to initialize the server: %s\n"
 msgstr "kunne ikke initialisere TrustDB: %s\n"
 
-#: dirmngr/server.c:2900
+#: dirmngr/server.c:3006
 #, fuzzy, c-format
 #| msgid "failed to store the creation date: %s\n"
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "kunne ikke gemme oprettelsesdatoen: %s\n"
 
-#: dirmngr/server.c:2933
+#: dirmngr/server.c:3039
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:2952
+#: dirmngr/server.c:3058
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -11861,76 +11667,76 @@ msgstr "ingen gpg-agent kører i denne session\n"
 msgid "error sending standard options: %s\n"
 msgstr "fejl under afsendelse af standardtilvalg: %s\n"
 
-#: tools/gpgconf-comp.c:649
+#: tools/gpgconf-comp.c:655
 msgid "OpenPGP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:653
+#: tools/gpgconf-comp.c:659
 msgid "S/MIME"
 msgstr ""
 
-#: tools/gpgconf-comp.c:657
+#: tools/gpgconf-comp.c:663
 #, fuzzy
 #| msgid "public key is %s\n"
 msgid "Public Keys"
 msgstr "offentlig nøgle er %s\n"
 
-#: tools/gpgconf-comp.c:661
+#: tools/gpgconf-comp.c:667
 msgid "Private Keys"
 msgstr ""
 
-#: tools/gpgconf-comp.c:665
+#: tools/gpgconf-comp.c:671
 msgid "Smartcards"
 msgstr ""
 
-#: tools/gpgconf-comp.c:669
+#: tools/gpgconf-comp.c:676
 msgid "TPM"
 msgstr ""
 
-#: tools/gpgconf-comp.c:673
+#: tools/gpgconf-comp.c:681
 msgid "Network"
 msgstr ""
 
-#: tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:685
 #, fuzzy
 #| msgid "Bad Passphrase"
 msgid "Passphrase Entry"
 msgstr "Ugyldig adgangsfrase"
 
-#: tools/gpgconf-comp.c:941
+#: tools/gpgconf-comp.c:951
 #, fuzzy
 #| msgid "Component not found"
 msgid "Component not suitable for launching"
 msgstr "Komponent blev ikke fundet"
 
-#: tools/gpgconf-comp.c:947
+#: tools/gpgconf-comp.c:957
 #, fuzzy, c-format
 #| msgid "External verification of component %s failed"
 msgid "Configuration file of component %s is broken\n"
 msgstr "Ekstern verifikation af komponent %s mislykkedes"
 
-#: tools/gpgconf-comp.c:950
+#: tools/gpgconf-comp.c:960
 #, fuzzy, c-format
 #| msgid "Please use the command \"toggle\" first.\n"
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr "Brug venligst kommandoen »toggle« først.\n"
 
-#: tools/gpgconf-comp.c:2816
+#: tools/gpgconf-comp.c:2826
 #, c-format
 msgid "External verification of component %s failed"
 msgstr "Ekstern verifikation af komponent %s mislykkedes"
 
-#: tools/gpgconf-comp.c:2946
+#: tools/gpgconf-comp.c:2956
 msgid "Note that group specifications are ignored\n"
 msgstr "Bemærk at gruppespecifikationer ignoreres\n"
 
-#: tools/gpgconf-comp.c:3543
+#: tools/gpgconf-comp.c:3553
 #, 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:3545
+#: tools/gpgconf-comp.c:3555
 #, fuzzy, c-format
 #| msgid "error in `%s': %s\n"
 msgid "error parsing '%s'\n"
@@ -12030,15 +11836,15 @@ msgstr ""
 "Syntaks: gpgconf [tilvalg]\n"
 "Håndter konfigurationsindstillinger for værktøjer i GnuPG-systemet\n"
 
-#: tools/gpgconf.c:669 tools/gpgconf.c:704
+#: tools/gpgconf.c:703 tools/gpgconf.c:738
 msgid "Need one component argument"
 msgstr "Kræver en kompomentparameter"
 
-#: tools/gpgconf.c:678 tools/gpgconf.c:728 tools/gpgconf.c:778
+#: tools/gpgconf.c:712 tools/gpgconf.c:762 tools/gpgconf.c:812
 msgid "Component not found"
 msgstr "Komponent blev ikke fundet"
 
-#: tools/gpgconf.c:804
+#: tools/gpgconf.c:838
 msgid "No argument allowed"
 msgstr "Ingen parameter tilladt"
 
@@ -12054,90 +11860,199 @@ msgstr ""
 "Syntaks: gpg-check-pattern [tilvalg] mønsterfil\n"
 "Kontroller en adgangsfrase angivet på stdin mod mønsterfilen\n"
 
-#: tools/gpg-card.c:2390
+#: tools/gpg-card.c:2407
 #, fuzzy, c-format
 #| msgid "NOTE: keys are already stored on the card!\n"
 msgid "Note: key %s is already stored on the card!\n"
 msgstr "BEMÆRK: Nøgler er allerede gemt på kortet!\n"
 
-#: tools/gpg-card.c:2393
+#: tools/gpg-card.c:2410
 #, fuzzy, c-format
 #| msgid "NOTE: keys are already stored on the card!\n"
 msgid "Note: Keys are already stored on the card!\n"
 msgstr "BEMÆRK: Nøgler er allerede gemt på kortet!\n"
 
-#: tools/gpg-card.c:2396
+#: tools/gpg-card.c:2413
 #, fuzzy, c-format
 #| msgid "Replace existing keys? (y/N) "
 msgid "Replace existing key %s ? (y/N) "
 msgstr "Erstat eksisterende nøgler (j/N) "
 
-#: tools/gpg-card.c:2549 tools/gpg-card.c:2712 tools/gpg-card.c:2935
-#: tools/gpg-card.c:3044
+#: tools/gpg-card.c:2566 tools/gpg-card.c:2729 tools/gpg-card.c:2952
+#: tools/gpg-card.c:3061
 #, fuzzy, c-format
 #| msgid "OpenPGP card no. %s detected\n"
 msgid "%s card no. %s detected\n"
 msgstr "OpenPGP-kortnr. %s detekteret\n"
 
-#: tools/gpg-card.c:3396
+#: tools/gpg-card.c:3413
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3406 tools/gpg-card.c:3420
+#: tools/gpg-card.c:3423 tools/gpg-card.c:3437
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
 "         can only be reverted using a factory reset!\n"
 msgstr ""
 
-#: tools/gpg-card.c:3423
+#: tools/gpg-card.c:3440
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3669
+#: tools/gpg-card.c:3686
 #, fuzzy
 #| msgid "  (certificate created at "
 msgid "authenticate to the card"
 msgstr "  (certifkat oprettet den "
 
-#: tools/gpg-card.c:3671
+#: tools/gpg-card.c:3688
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3673
+#: tools/gpg-card.c:3690
 msgid "setup KDF for PIN authentication"
 msgstr ""
 
-#: tools/gpg-card.c:3675
+#: tools/gpg-card.c:3692
 msgid "change a private data object"
 msgstr ""
 
-#: tools/gpg-card.c:3676
+#: tools/gpg-card.c:3693
 #, fuzzy
 #| msgid "  (certificate created at "
 msgid "read a certificate from a data object"
 msgstr "  (certifkat oprettet den "
 
-#: tools/gpg-card.c:3677
+#: tools/gpg-card.c:3694
 #, fuzzy
 #| msgid "  (certificate created at "
 msgid "store a certificate to a data object"
 msgstr "  (certifkat oprettet den "
 
-#: tools/gpg-card.c:3678
+#: tools/gpg-card.c:3695
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3679
+#: tools/gpg-card.c:3696
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3681
+#: tools/gpg-card.c:3698
 msgid "manage the command history"
 msgstr ""
 
+#~ msgid "requesting key %s from %s server %s\n"
+#~ msgstr "anmoder om nøgle %s fra %s server %s\n"
+
+#~ msgid "%s:%u: no hostname given\n"
+#~ msgstr "%s:%u: intet værtsnavn angivet\n"
+
+#~ msgid "could not parse keyserver\n"
+#~ msgstr "kunne ikke fortolke nøgleserver\n"
+
+#, fuzzy
+#~| msgid "|NAME|connect to Assuan socket NAME"
+#~ msgid "|NAME|connect to host NAME"
+#~ msgstr "|NAME|forbind til Assuansokkel NAVN"
+
+#, fuzzy
+#~| msgid "|N|connect to reader at port N"
+#~ msgid "|N|connect to port N"
+#~ msgstr "|N|forbind til læser på port N"
+
+#, fuzzy
+#~| msgid "Usage: gpg [options] [files] (-h for help)"
+#~ msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
+#~ msgstr "Brug: gpg [flag] [filer] (-h for hjælp)"
+
+#, fuzzy
+#~| msgid "invalid import options\n"
+#~ msgid "invalid port number %d\n"
+#~ msgstr "ugyldige importindstillinger\n"
+
+#, fuzzy
+#~| msgid "error writing to %s: %s\n"
+#~ msgid "error writing to stdout: %s\n"
+#~ msgstr "fejl ved skrivning til »%s«: %s\n"
+
+#, fuzzy
+#~| msgid "certificate `%s' not found: %s\n"
+#~ msgid "attribute '%s' not found\n"
+#~ msgstr "certifikat »%s« blev ikke fundet: %s\n"
+
+#, fuzzy
+#~| msgid "reading from `%s'\n"
+#~ msgid "processing url '%s'\n"
+#~ msgstr "læser fra »%s«\n"
+
+#, fuzzy
+#~| msgid "          w/o user IDs: %lu\n"
+#~ msgid "          user '%s'\n"
+#~ msgstr "      w/o bruger-id'er: %lu\n"
+
+#, fuzzy
+#~| msgid "                aka \"%s\""
+#~ msgid "          pass '%s'\n"
+#~ msgstr "       også kendt som »%s«"
+
+#, fuzzy
+#~| msgid "          w/o user IDs: %lu\n"
+#~ msgid "          host '%s'\n"
+#~ msgstr "      w/o bruger-id'er: %lu\n"
+
+#, fuzzy
+#~| msgid "          not imported: %lu\n"
+#~ msgid "          port %d\n"
+#~ msgstr "      ikke importerede: %lu\n"
+
+#, fuzzy
+#~| msgid "                aka \"%s\""
+#~ msgid "            DN '%s'\n"
+#~ msgstr "       også kendt som »%s«"
+
+#, fuzzy
+#~| msgid "                aka \"%s\""
+#~ msgid "          attr '%s'\n"
+#~ msgstr "       også kendt som »%s«"
+
+#, fuzzy
+#~| msgid "%s:%u: no hostname given\n"
+#~ msgid "no host name in '%s'\n"
+#~ msgstr "%s:%u: intet værtsnavn angivet\n"
+
+#, fuzzy
+#~| msgid "WARNING: Using untrusted key!\n"
+#~ msgid "WARNING: using first attribute only\n"
+#~ msgstr "ADVARSEL: Bruger nøgle uden troværdighed!\n"
+
+#, fuzzy
+#~| msgid "renaming `%s' to `%s' failed: %s\n"
+#~ msgid "LDAP init to '%s:%d' failed: %s\n"
+#~ msgstr "omdøbelse af »%s« til »%s« mislykkedes: %s\n"
+
+#, fuzzy
+#~| msgid "renaming `%s' to `%s' failed: %s\n"
+#~ msgid "LDAP init to '%s' failed: %s\n"
+#~ msgstr "omdøbelse af »%s« til »%s« mislykkedes: %s\n"
+
+#, fuzzy
+#~| msgid "renaming `%s' to `%s' failed: %s\n"
+#~ msgid "LDAP init to '%s' done\n"
+#~ msgstr "omdøbelse af »%s« til »%s« mislykkedes: %s\n"
+
+#, fuzzy
+#~| msgid "renaming `%s' to `%s' failed: %s\n"
+#~ msgid "binding to '%s:%d' failed: %s\n"
+#~ msgstr "omdøbelse af »%s« til »%s« mislykkedes: %s\n"
+
+#, fuzzy
+#~| msgid "dearmoring failed: %s\n"
+#~ msgid "searching '%s' failed: %s\n"
+#~ msgstr "fjernelse af panser mislykkedes: %s\n"
+
 #, fuzzy
 #~| msgid "change a passphrase"
 #~ msgid "Suggest a random passphrase."
diff --git a/po/de.gmo b/po/de.gmo
index f209c3f..9184943 100644
--- a/po/de.gmo
+++ b/po/de.gmo
diff --git a/po/de.po b/po/de.po
index 5b23ad0..34fa39f 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: 2021-04-20 12:38+0200\n"
-"PO-Revision-Date: 2021-04-20 12:24+0200\n"
+"POT-Creation-Date: 2021-08-24 18:50+0200\n"
+"PO-Revision-Date: 2021-08-24 14:48+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:328
+#: agent/call-pinentry.c:338
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "Die Sperre für das Pinentry kann nicht gesetzt werden: %s\n"
@@ -30,47 +30,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:546
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_OK"
 msgstr "_OK"
 
-#: agent/call-pinentry.c:547
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_Cancel"
 msgstr "_Abbrechen"
 
-#: agent/call-pinentry.c:548
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|_Yes"
 msgstr "_Ja"
 
-#: agent/call-pinentry.c:549
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_No"
 msgstr "_Nein"
 
-#: agent/call-pinentry.c:550
+#: agent/call-pinentry.c:560
 msgid "|pinentry-label|PIN:"
 msgstr "PIN:"
 
-#: agent/call-pinentry.c:551
+#: agent/call-pinentry.c:561
 msgid "|pinentry-label|_Save in password manager"
 msgstr "Im Passwordmanager _speichern"
 
-#: agent/call-pinentry.c:552
+#: agent/call-pinentry.c:562
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr ""
-"Möchten Sie die eingegebene Passphrase wirklich auf dem Bildschirm sichtbar "
+"Möchten Sie das eingegebene Passwort wirklich auf dem Bildschirm sichtbar "
 "machen?"
 
-#: agent/call-pinentry.c:554
+#: agent/call-pinentry.c:564
 msgid "|pinentry-tt|Make passphrase visible"
-msgstr "Die Passphrase sichtbar machen"
+msgstr "Das Passwort sichtbar machen"
 
-#: agent/call-pinentry.c:555
+#: agent/call-pinentry.c:565
 msgid "|pinentry-tt|Hide passphrase"
-msgstr "Passphrase unsichtbar machen"
+msgstr "Das Passwort unsichtbar machen"
+
+#: agent/call-pinentry.c:566
+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:944
+#: agent/call-pinentry.c:1022
 msgid "Suggest"
 msgstr "Vorschlag"
 
@@ -81,13 +85,24 @@ 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:966
+#: agent/call-pinentry.c:1044
 msgid "pinentry.genpin.tooltip"
-msgstr "Einen Vorschlag für eine gute Passpharse erzeugen."
+msgstr "Einen Vorschlag für ein gutes Passwort erzeugen."
+
+#: agent/call-pinentry.c:1072
+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
+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:998
+#: agent/call-pinentry.c:1198
 msgid "Quality:"
 msgstr "Qualität:"
 
@@ -97,14 +112,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:1019
+#: agent/call-pinentry.c:1219
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
-"Die Qualität der Passphrase, die Sie oben eingegeben haben.\n"
+"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:1263
+#: agent/call-pinentry.c:1477
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
@@ -112,124 +127,124 @@ msgstr ""
 "Bitte geben Sie Ihre PIN ein, so daß der geheime Schlüssel benutzt werden "
 "kann"
 
-#: agent/call-pinentry.c:1266
+#: agent/call-pinentry.c:1480
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr ""
-"Bitte geben Sie Ihre Passphrase ein, so daß der geheime Schlüssel benutzt "
+"Bitte geben Sie Ihr Passwort ein, so daß der geheime Schlüssel benutzt "
 "werden kann."
 
-#: agent/call-pinentry.c:1303 agent/call-pinentry.c:1506
+#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
 msgid "PIN:"
 msgstr "PIN:"
 
-#: agent/call-pinentry.c:1303 agent/call-pinentry.c:1506
-#: agent/protect-tool.c:728
+#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/protect-tool.c:729
 msgid "Passphrase:"
-msgstr "Passphrase:"
+msgstr "Passwort:"
 
-#: agent/call-pinentry.c:1330 agent/call-pinentry.c:1580 agent/command.c:1799
-#: agent/command.c:1852 agent/command-ssh.c:3046 agent/genkey.c:398
+#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
+#: agent/command.c:1988 agent/command-ssh.c:3046 agent/genkey.c:442
 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:1351 agent/call-pinentry.c:1603
+#: agent/call-pinentry.c:1566 agent/call-pinentry.c:1830
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (Versuch %d von %d)"
 
-#: agent/call-pinentry.c:1362 agent/call-pinentry.c:1614
+#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
 msgid "Repeat:"
 msgstr "Nochmal:"
 
-#: agent/call-pinentry.c:1372 agent/call-pinentry.c:1384
-#: agent/call-pinentry.c:1624 agent/call-pinentry.c:1636
+#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
+#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
 msgid "PIN too long"
 msgstr "Die PIN ist zu lang"
 
-#: agent/call-pinentry.c:1373 agent/call-pinentry.c:1625
+#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
 msgid "Passphrase too long"
-msgstr "Das Mantra (Passphrase) ist zu lang!"
+msgstr "Das Passwort ist zu lang!"
 
-#: agent/call-pinentry.c:1381 agent/call-pinentry.c:1633
+#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
 msgid "Invalid characters in PIN"
 msgstr "Ungültige Zeichen in der PIN!"
 
-#: agent/call-pinentry.c:1386 agent/call-pinentry.c:1638
+#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
 msgid "PIN too short"
 msgstr "Die PIN ist zu kurz!"
 
-#: agent/call-pinentry.c:1405 agent/call-pinentry.c:1656
+#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
 msgid "Bad PIN"
 msgstr "Falsche PIN!"
 
-#: agent/call-pinentry.c:1405 agent/call-pinentry.c:1656
+#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
 msgid "Bad Passphrase"
-msgstr "Falsche Passphrase!"
+msgstr "Falsches Passwort!"
 
-#: agent/command.c:697
+#: agent/command.c:823
 msgid "Note: Request from the web browser."
 msgstr "Hinweis: Anfrage vom Webbrowser."
 
-#: agent/command.c:698
+#: agent/command.c:824
 msgid "Note: Request from a remote site."
 msgstr "Hinweis: Anfrage von einem anderen Rechner."
 
-#: agent/command.c:1106 g10/card-util.c:708 g10/card-util.c:729
+#: agent/command.c:1235 g10/card-util.c:713 g10/card-util.c:734
 #, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "Fehler beim Holen der Karten-Seriennummer: %s\n"
 
-#: agent/command.c:1634 agent/command.c:1791 agent/command-ssh.c:2974
-#: agent/genkey.c:333
+#: agent/command.c:1756 agent/command.c:1921 agent/command-ssh.c:2974
+#: agent/genkey.c:377
 msgid "Please re-enter this passphrase"
-msgstr "Bitte geben Sie die Passphrase noch einmal ein:"
+msgstr "Bitte geben Sie das Passwort noch einmal ein:"
 
-#: agent/command.c:2567
+#: agent/command.c:2703
 #, c-format
 msgid ""
 "Please enter the passphrase to protect the imported object within the %s "
 "system."
 msgstr ""
-"Bitte geben Sie die Passphrase ein, um das importierte Objekt im %s System "
-"zu schützen."
+"Bitte geben Sie das Passwort ein, um das importierte Objekt im %s System zu "
+"schützen."
 
-#: agent/command.c:2697
+#: agent/command.c:2833
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
 msgstr ""
-"Dieser (Unter-)Schlüssel ist nicht mit einer Passphrase geschützt.\n"
-"Bitte geben Sie eine neue Passphrase für den Export an."
+"Dieser (Unter-)Schlüssel ist nicht mit einem Passwort geschützt.\n"
+"Bitte geben Sie ein neuse Passwort für den Export an."
 
 #: agent/command-ssh.c:675 agent/command-ssh.c:764
 #, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "SSH Schlüssel von mehr als %d Bits werden nicht unterstützt\n"
 
-#: agent/command-ssh.c:872 common/dotlock.c:852 g10/card-util.c:953
-#: g10/export.c:1329 g10/gpg.c:1431 g10/keygen.c:5347 g10/keyring.c:1319
-#: g10/keyring.c:1632 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
+#: agent/command-ssh.c:872 common/dotlock.c:852 g10/card-util.c:963
+#: g10/export.c:1329 g10/gpg.c:1431 g10/keygen.c:5377 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
 #: g10/sign.c:1106 g10/sign.c:1443 g10/tdbio.c:753 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:884 common/helpfile.c:57 g10/card-util.c:910
+#: agent/command-ssh.c:884 common/helpfile.c:57 g10/card-util.c:920
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
 #: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:721 g10/gpg.c:1432
-#: g10/import.c:371 g10/import.c:558 g10/import.c:793 g10/keygen.c:4322
-#: g10/keyring.c:1658 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
+#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4326
+#: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
 #: g10/plaintext.c:610 g10/sign.c:1086 g10/sign.c:1311 g10/sign.c:1424
 #: g10/sign.c:1596 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2380
-#: sm/gpgsm.c:2410 sm/gpgsm.c:2448 sm/keylist.c:1737 sm/qualified.c:65
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2236
+#: sm/gpgsm.c:2266 sm/gpgsm.c:2304 sm/keylist.c:1775 sm/qualified.c:65
 #: dirmngr/certcache.c:396 dirmngr/certcache.c:476 dirmngr/certcache.c:478
-#: dirmngr/crlcache.c:2588 dirmngr/dirmngr.c:1720 tools/gpg-card.c:408
+#: dirmngr/crlcache.c:2591 dirmngr/dirmngr.c:1759 tools/gpg-card.c:408
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "'%s' kann nicht geöffnet werden: %s\n"
@@ -265,8 +280,7 @@ msgstr "Verweigern"
 #, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr ""
-"Bitte geben Sie die Passphrase für den SSH-Schlüssel%%0A  %F%%0A  "
-"(%c)%%0Aein."
+"Bitte geben Sie das Passwort für den SSH-Schlüssel%%0A  %F%%0A  (%c)%%0Aein."
 
 #: agent/command-ssh.c:3001
 #, c-format
@@ -274,7 +288,7 @@ msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
 "%s%%0Awithin gpg-agent's key storage"
 msgstr ""
-"Bitte geben Sie eine Passphrase ein, um den empfangenen geheimen\n"
+"Bitte geben Sie ein Passwort ein, um den empfangenen geheimen\n"
 "Schlüssel%%0A   %s%%0A  %s%%0Aim Schlüsselspeicher des Gpg-Agenten zu "
 "schützen."
 
@@ -338,291 +352,289 @@ msgstr "PIN wurde nicht richtig wiederholt; noch einmal versuchen"
 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:109 sm/certreqgen-ui.c:433
+#: 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:116
+#: agent/genkey.c:150
 #, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "Fehler beim Schreiben auf eine temporäre Datei: %s\n"
 
-#: agent/genkey.c:154
+#: agent/genkey.c:191
 msgid "Enter new passphrase"
-msgstr "Neue Passphrase eingeben"
+msgstr "Neues Passwort eingeben"
 
-#: agent/genkey.c:184
+#: agent/genkey.c:227
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
-"Sie haben keine Passphrase eingegeben!%0AEine leere Passphrase ist nicht "
-"erlaubt."
+"Sie haben kein Passwort eingegeben!%0AEine leeres Passwort ist nicht erlaubt."
 
-#: agent/genkey.c:186
+#: agent/genkey.c:229
 #, 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 ""
-"Sie möchten keine Passphrase - Dies ist *nicht* zu empfehlen!%0ABitte\n"
-"bestätigen Sie, daß sie auf jeden Schutz Ihres privaten Schlüssels\n"
-"verzichten."
+"Sie möchten kein Passwort - Dies ist nicht unbedingt zu empfehlen!%0A\n"
+"Bitte bestätigen Sie, daß sie auf den lokalen Schutz Ihres privaten\n"
+"Schlüssels verzichten."
 
-#: agent/genkey.c:198
+#: agent/genkey.c:241
 msgid "Yes, protection is not needed"
 msgstr "Ja, ein Schutz ist nicht notwendig"
 
-#: agent/genkey.c:215
+#: agent/genkey.c:258
 #, 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] "Eine Passphrase sollte mindestens %u Zeichen lang sein."
-msgstr[1] "Eine Passphrase sollte mindestens %u Zeichen lang sein."
+msgstr[0] "Ein Passwort sollte mindestens %u Zeichen lang sein."
+msgstr[1] "Ein Passwort sollte mindestens %u Zeichen lang sein."
 
-#: agent/genkey.c:234
+#: agent/genkey.c:277
 #, 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] ""
-"Eine Passphrase sollte mindestens %u Sonderzeichen oder%%0Aeine Ziffer "
+"Ein Passwort sollte mindestens %u Sonderzeichen oder%%0Aeine Ziffer "
 "enthalten."
 msgstr[1] ""
-"Eine Passphrase sollte mindestens %u Sonderzeichen oder%%0AZiffern enthalten."
+"Ein Passwort sollte mindestens %u Sonderzeichen oder%%0AZiffern enthalten."
 
-#: agent/genkey.c:260
+#: agent/genkey.c:304
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
-"Eine Passphrase sollte kein bekanntes Wort sein oder%%0Anach bekannten "
-"Regeln aufgebaut sein."
+"Ein Passwort sollte kein bekanntes Wort sein oder%%0Anach bekannten Regeln "
+"aufgebaut sein."
 
-#: agent/genkey.c:275
+#: agent/genkey.c:319
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
-"WARNUNG:  Sie haben eine offensichtlich unsichere%0APassphrase eingegeben."
+"WARNUNG:  Sie haben ein offensichtlich unsicheres%0APasswort eingegeben."
 
-#: agent/genkey.c:296
+#: agent/genkey.c:340
 msgid "Take this one anyway"
 msgstr "Diese trotzdem benutzen"
 
-#: agent/genkey.c:464
+#: agent/genkey.c:508
 #, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
-msgstr "Bitte geben Sie die Passphrase ein,%0Aum Ihren Schlüssel zu schützen."
+msgstr "Bitte geben Sie das Passwort ein,%0Aum Ihren Schlüssel zu schützen."
 
-#: agent/genkey.c:590
+#: agent/genkey.c:637
 msgid "Please enter the new passphrase"
-msgstr "Bitte geben Sie die Passphrase ein:"
+msgstr "Bitte geben Sie das Passwort ein:"
 
-#: agent/gpg-agent.c:162 scd/scdaemon.c:115 dirmngr/dirmngr.c:182
+#: agent/gpg-agent.c:164 scd/scdaemon.c:115 dirmngr/dirmngr.c:183
 msgid "Options used for startup"
 msgstr "Optionen zum Start des Programms"
 
-#: agent/gpg-agent.c:164 scd/scdaemon.c:120 dirmngr/dirmngr.c:171
+#: agent/gpg-agent.c:166 scd/scdaemon.c:120 dirmngr/dirmngr.c:172
 msgid "run in daemon mode (background)"
 msgstr "Im Daemon Modus ausführen"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:117 dirmngr/dirmngr.c:170
+#: agent/gpg-agent.c:167 scd/scdaemon.c:117 dirmngr/dirmngr.c:171
 msgid "run in server mode (foreground)"
 msgstr "Im Server Modus ausführen"
 
-#: agent/gpg-agent.c:167 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:169 dirmngr/dirmngr.c:174
 msgid "run in supervised mode"
 msgstr "Im \"Supervised\" Modus ausführen"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:121 dirmngr/dirmngr.c:184
+#: agent/gpg-agent.c:171 scd/scdaemon.c:121 dirmngr/dirmngr.c:185
 msgid "do not detach from the console"
 msgstr "Im Vordergrund laufen lassen"
 
-#: agent/gpg-agent.c:170 scd/scdaemon.c:122 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:172 scd/scdaemon.c:122 dirmngr/dirmngr.c:186
 msgid "sh-style command output"
 msgstr "Ausgabe für /bin/sh"
 
-#: agent/gpg-agent.c:171 scd/scdaemon.c:123 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:173 scd/scdaemon.c:123 dirmngr/dirmngr.c:187
 msgid "csh-style command output"
 msgstr "Ausgabe für /bin/csh"
 
-#: agent/gpg-agent.c:179 g10/gpg.c:589 scd/scdaemon.c:125 sm/gpgsm.c:422
-#: dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:181 g10/gpg.c:589 scd/scdaemon.c:125 sm/gpgsm.c:423
+#: dirmngr/dirmngr.c:189
 msgid "|FILE|read options from FILE"
 msgstr "|DATEI|Konfigurationsoptionen aus DATEI lesen"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:574 scd/scdaemon.c:129 sm/gpgsm.c:265
-#: dirmngr/dirmngr.c:192
+#: agent/gpg-agent.c:185 g10/gpg.c:574 scd/scdaemon.c:129 sm/gpgsm.c:265
+#: dirmngr/dirmngr.c:193
 msgid "Options controlling the diagnostic output"
 msgstr "Optionen zur Einstellung der Diagnoseausgaben"
 
-#: agent/gpg-agent.c:185 g10/gpg.c:576 g10/gpgv.c:78 kbx/kbxutil.c:89
+#: agent/gpg-agent.c:187 g10/gpg.c:576 g10/gpgv.c:78 kbx/kbxutil.c:89
 #: scd/scdaemon.c:131 sm/gpgsm.c:267 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:194 dirmngr/dirmngr_ldap.c:102
-#: tools/gpg-connect-agent.c:85 tools/gpgconf.c:111
+#: dirmngr/dirmngr.c:195 tools/gpg-connect-agent.c:85 tools/gpgconf.c:111
 msgid "verbose"
 msgstr "Detaillierte Informationen"
 
-#: agent/gpg-agent.c:186 g10/gpg.c:578 g10/gpgv.c:79 kbx/kbxutil.c:90
+#: agent/gpg-agent.c:188 g10/gpg.c:578 g10/gpgv.c:79 kbx/kbxutil.c:90
 #: scd/scdaemon.c:132 sm/gpgsm.c:269 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:195 dirmngr/dirmngr_ldap.c:103
+#: dirmngr/dirmngr.c:196
 msgid "be somewhat more quiet"
 msgstr "Reduzierte Informationen"
 
-#: agent/gpg-agent.c:194 g10/gpg.c:593 sm/gpgsm.c:283 dirmngr/dirmngr.c:205
+#: agent/gpg-agent.c:196 g10/gpg.c:593 sm/gpgsm.c:283 dirmngr/dirmngr.c:206
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|DATEI|Schreibe im Servermodus Logs auf DATEI"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 scd/scdaemon.c:146 sm/gpgsm.c:290
-#: dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:599 scd/scdaemon.c:146 sm/gpgsm.c:290
+#: dirmngr/dirmngr.c:210
 msgid "Options controlling the configuration"
 msgstr "Optionen zur Einstellung der Konfiguration"
 
-#: agent/gpg-agent.c:201
+#: agent/gpg-agent.c:203
 msgid "do not use the SCdaemon"
 msgstr "Den SCdaemon-basierten Kartenzugriff nicht nutzen"
 
-#: agent/gpg-agent.c:203
+#: agent/gpg-agent.c:205
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|Benutze PGM als SCdaemon"
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr "|PGM|Benutze PGM als tpm2daemon"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|Einige Kommandos über NAME annehmen"
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 msgid "ignore requests to change the TTY"
 msgstr "Ignoriere Anfragen, das TTY zu wechseln"
 
-#: agent/gpg-agent.c:215
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the X display"
 msgstr "Ignoriere Anfragen, das X-Display zu wechseln"
 
-#: agent/gpg-agent.c:216
+#: agent/gpg-agent.c:218
 msgid "enable ssh support"
 msgstr "SSH Unterstützung einschalten"
 
-#: agent/gpg-agent.c:218
+#: agent/gpg-agent.c:220
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "Verwende ALGO für SSH Fingerabdrücke"
 
-#: agent/gpg-agent.c:221
+#: agent/gpg-agent.c:223
 msgid "enable putty support"
 msgstr "PuTTY Unterstützung einschalten"
 
-#: agent/gpg-agent.c:233 g10/gpg.c:844 scd/scdaemon.c:176 sm/gpgsm.c:382
+#: agent/gpg-agent.c:235 g10/gpg.c:844 scd/scdaemon.c:176 sm/gpgsm.c:383
 msgid "Options controlling the security"
 msgstr "Optionen zur Einstellung der Sicherheit"
 
-#: agent/gpg-agent.c:236
+#: agent/gpg-agent.c:238
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|Lasse PINs im Cache nach N Sekunden verfallen"
 
-#: agent/gpg-agent.c:238
+#: agent/gpg-agent.c:240
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|lasse SSH Schlüssel im Cache nach N Sekunden verfallen"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:242
 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:242
+#: agent/gpg-agent.c:244
 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:244
+#: agent/gpg-agent.c:246
 msgid "do not use the PIN cache when signing"
 msgstr "Benutze PINs im Cache nicht beim Signieren"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:248
 msgid "disallow the use of an external password cache"
 msgstr "Verbiete die Verwendung eines externen Passwordmanagers"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:250
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "Verbiete Aufrufern Schlüssel als \"vertrauenswürdig\" zu markieren"
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:253
 msgid "allow presetting passphrase"
-msgstr "Erlaube ein \"preset\" von Passphrases"
+msgstr "Erlaube ein \"preset\" der Passwörter"
 
-#: agent/gpg-agent.c:256
+#: agent/gpg-agent.c:258
 msgid "Options enforcing a passphrase policy"
-msgstr "Optionen für eine Passphrase-Policy"
+msgstr "Optionen für Passwort Regeln"
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:261
 msgid "do not allow bypassing the passphrase policy"
-msgstr "Einhaltung der Passphrase-Policy erzwingen"
+msgstr "Einhaltung der Passwort Regeln erzwingen"
 
-#: agent/gpg-agent.c:261
+#: agent/gpg-agent.c:263
 msgid "|N|set minimal required length for new passphrases to N"
-msgstr "|N|setze die kleinste erlaubte Länge von Passphrasen auf N"
+msgstr "|N|setze die kleinste erlaubte Länge von Passwörtern auf N"
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:265
 msgid "|N|require at least N non-alpha characters for a new passphrase"
-msgstr "|N|Verlange mindestens N Nicht-Buchstaben für eine neue Passphrase"
+msgstr "|N|Verlange mindestens N Nicht-Buchstaben für ein neues Passwort"
 
-#: agent/gpg-agent.c:266
+#: agent/gpg-agent.c:268
 msgid "|FILE|check new passphrases against pattern in FILE"
-msgstr "|DATEI|Prüfe neue Passphrases gegen die Regelen in DATEI"
+msgstr "|DATEI|Prüfe neue Passwörter gegen die Regeln in DATEI"
 
-#: agent/gpg-agent.c:268
+#: agent/gpg-agent.c:272
 msgid "|N|expire the passphrase after N days"
-msgstr "|N|Lasse die Passphrase nach N Tagen verfallen"
+msgstr "|N|Lasse das Passwort nach N Tagen verfallen"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:274
 msgid "do not allow the reuse of old passphrases"
-msgstr "Verbiete die Wiedernutzung alter Passphrases."
+msgstr "Verbiete die Wiedernutzung alter Passwörter."
 
-#: agent/gpg-agent.c:273
+#: agent/gpg-agent.c:277
 msgid "Options controlling the PIN-Entry"
 msgstr "Optionen für das Pinentry"
 
-#: agent/gpg-agent.c:275
+#: agent/gpg-agent.c:279
 msgid "never use the PIN-entry"
 msgstr "Niemals das Pinentry benutzen"
 
-#: agent/gpg-agent.c:277
+#: agent/gpg-agent.c:281
 msgid "disallow caller to override the pinentry"
 msgstr "Aufrufer darf das Pinentry nicht ersetzen"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:283
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr "Tastatur und Maus \"grabben\""
 
-#: agent/gpg-agent.c:282
+#: agent/gpg-agent.c:286
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|Benutze PGM as PIN-Entry"
 
-#: agent/gpg-agent.c:286
+#: agent/gpg-agent.c:290
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|Setze die Pinentry Zeitüberschreitung auf N Sekunden"
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:294
 msgid "allow passphrase to be prompted through Emacs"
-msgstr "Erlaube die Eingabe einer Passphrase über 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:551 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: agent/gpg-agent.c:557 agent/preset-passphrase.c:99 agent/protect-tool.c:154
 #: g10/gpg.c:1132 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:612 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:438
-#: dirmngr/dirmngr_ldap.c:175 tools/gpg-connect-agent.c:220 tools/gpgconf.c:151
+#: sm/gpgsm.c:613 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:446
+#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:151
 #: 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:560
+#: agent/gpg-agent.c:566
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Gebrauch: @GPG_AGENT@ [Optionen] [Kommando [Argumente]]"
 
-#: agent/gpg-agent.c:562
+#: agent/gpg-agent.c:568
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -630,131 +642,131 @@ msgstr ""
 "Syntax: @GPG_AGENT@ [Optionen] [Befehl [Argumente]]\n"
 "Verwaltung von geheimen Schlüsseln für @GNUPG@\n"
 
-#: agent/gpg-agent.c:607 g10/gpg.c:1337 scd/scdaemon.c:384 sm/gpgsm.c:760
-#: dirmngr/dirmngr.c:522
+#: agent/gpg-agent.c:613 g10/gpg.c:1337 scd/scdaemon.c:384 sm/gpgsm.c:761
+#: dirmngr/dirmngr.c:530
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "ungültige Debugebene `%s' angegeben\n"
 
-#: agent/gpg-agent.c:972 g10/gpg.c:3910 g10/gpg.c:3934 sm/gpgsm.c:1769
-#: sm/gpgsm.c:1775
+#: agent/gpg-agent.c:986 g10/gpg.c:3907 g10/gpg.c:3931 sm/gpgsm.c:1622
+#: sm/gpgsm.c:1628
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
 
-#: agent/gpg-agent.c:1196 agent/gpg-agent.c:2019 common/comopt.c:93
-#: g10/gpg.c:2591 scd/scdaemon.c:549 sm/gpgsm.c:1155 dirmngr/dirmngr.c:989
-#: dirmngr/dirmngr.c:1840
+#: agent/gpg-agent.c:1210 agent/gpg-agent.c:2035 common/comopt.c:93
+#: g10/gpg.c:2594 scd/scdaemon.c:549 sm/gpgsm.c:1028 dirmngr/dirmngr.c:1029
+#: dirmngr/dirmngr.c:1879
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
 
-#: agent/gpg-agent.c:1335 g10/gpg.c:3861 scd/scdaemon.c:687 sm/gpgsm.c:1709
-#: dirmngr/dirmngr.c:1108 tools/gpg-connect-agent.c:1270 tools/gpgconf.c:634
+#: agent/gpg-agent.c:1349 g10/gpg.c:3858 scd/scdaemon.c:687 sm/gpgsm.c:1562
+#: dirmngr/dirmngr.c:1145 tools/gpg-connect-agent.c:1270 tools/gpgconf.c:668
 #, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr "Hinweis: `%s' wird nicht als Option betrachtet\n"
 
-#: agent/gpg-agent.c:2172 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1267
+#: agent/gpg-agent.c:2188 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1306
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "Socket kann nicht erzeugt werden: %s\n"
 
-#: agent/gpg-agent.c:2189 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1280
+#: agent/gpg-agent.c:2205 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1319
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "Der Name des Sockets `%s' ist zu lang\n"
 
-#: agent/gpg-agent.c:2228
+#: agent/gpg-agent.c:2244
 #, 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:2239 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1312
+#: agent/gpg-agent.c:2255 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1351
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "Fehler beim Ermitteln der \"Nonce\" dieses Sockets\n"
 
-#: agent/gpg-agent.c:2244 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1315
+#: agent/gpg-agent.c:2260 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1354
 #, 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:2255 agent/gpg-agent.c:2295 agent/gpg-agent.c:2304
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1324
+#: agent/gpg-agent.c:2271 agent/gpg-agent.c:2311 agent/gpg-agent.c:2320
+#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1363
 #, 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:2269 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1336
+#: agent/gpg-agent.c:2285 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1375
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "Es wird auf Socket `%s' gehört\n"
 
-#: agent/gpg-agent.c:2289 agent/gpg-agent.c:2342 common/homedir.c:517
+#: agent/gpg-agent.c:2305 agent/gpg-agent.c:2358 common/homedir.c:537
 #: 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:2292 agent/gpg-agent.c:2347 common/homedir.c:520
+#: agent/gpg-agent.c:2308 agent/gpg-agent.c:2363 common/homedir.c:540
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "Verzeichnis `%s' erzeugt\n"
 
-#: agent/gpg-agent.c:2353
+#: agent/gpg-agent.c:2369
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "stat()-Aufruf für `%s' fehlgeschlagen: %s\n"
 
-#: agent/gpg-agent.c:2357
+#: agent/gpg-agent.c:2373
 #, 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:2512 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2069
+#: agent/gpg-agent.c:2528 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2108
 #, 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:2719
+#: agent/gpg-agent.c:2735
 #, 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:2724
+#: agent/gpg-agent.c:2740
 #, 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:2799
+#: agent/gpg-agent.c:2815
 #, 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:2804
+#: agent/gpg-agent.c:2820
 #, 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:3026 scd/scdaemon.c:1374 dirmngr/dirmngr.c:2283
+#: agent/gpg-agent.c:3042 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2322
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "npth_select()-Aufruf fehlgeschlagen: %s - warte 1s\n"
 
-#: agent/gpg-agent.c:3114 scd/scdaemon.c:1439
+#: agent/gpg-agent.c:3130 scd/scdaemon.c:1441
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s angehalten\n"
 
-#: agent/gpg-agent.c:3252 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3271 common/simple-pwquery.c:247 g10/call-agent.c:260
 #: sm/call-agent.c:131 tools/gpg-connect-agent.c:2319 tools/card-call-scd.c:311
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "Der gpg-agent läuft nicht für diese Session\n"
 
-#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:70
+#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:66
 msgid ""
 "@Options:\n"
 " "
@@ -772,10 +784,10 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 "Syntax: gpg-preset-passphrase [Optionen] KEYGRIP\n"
-"Kennwortpuffer-Pflege\n"
+"Pflege des Passwortpuffers\n"
 
 #: agent/protect-tool.c:107 g10/gpg.c:448 kbx/kbxutil.c:72 sm/gpgsm.c:215
-#: dirmngr/dirmngr.c:168 tools/gpgconf.c:81
+#: dirmngr/dirmngr.c:169 tools/gpgconf.c:81
 msgid ""
 "@Commands:\n"
 " "
@@ -806,42 +818,42 @@ msgstr ""
 "Syntax: gpg-protect-tool [Optionen] [Argumente]\n"
 "Werkzeug zum Bearbeiten von geheimen Schlüsseln\n"
 
-#: agent/protect-tool.c:707
+#: agent/protect-tool.c:708 sm/import.c:775
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
-msgstr "Bitte geben Sie die Passphrase zum Entsperren des PKCS#12 Objekts ein."
+msgstr "Bitte geben Sie das Passwort zum Entsperren des PKCS#12 Objekts ein."
 
-#: agent/protect-tool.c:712
+#: agent/protect-tool.c:713 sm/export.c:727
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr ""
-"Bitte geben Sie die Passphrase zum Schützen des neuen PKCS#12 Objekts ein."
+"Bitte geben Sie das Passwort zum Schützen des neuen PKCS#12 Objekts ein."
 
-#: agent/protect-tool.c:718
+#: agent/protect-tool.c:719
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
-"Bitte geben Sie die Passphrase ein, um das importierte Objekt im GnuPG "
-"System zu schützen."
+"Bitte geben Sie das Passwort ein, um das importierte Objekt im GnuPG System "
+"zu schützen."
 
-#: agent/protect-tool.c:723
+#: agent/protect-tool.c:724
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr ""
-"Die Eingabe der Passphrase bzw. der PIN\n"
+"Die Eingabe des Passwortes bzw. der PIN\n"
 "wird benötigt, um diese Aktion auszuführen."
 
-#: agent/protect-tool.c:734
+#: agent/protect-tool.c:735
 #, c-format
 msgid "cancelled\n"
 msgstr "Vom Benutzer abgebrochen\n"
 
-#: agent/protect-tool.c:736
+#: agent/protect-tool.c:737
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
-msgstr "Fehler bei der Abfrage der Passphrase: %s\n"
+msgstr "Fehler bei der Abfrage des Passwortes: %s\n"
 
-#: agent/trustlist.c:153 agent/trustlist.c:363 tools/gpgconf.c:424
+#: agent/trustlist.c:153 agent/trustlist.c:363 tools/gpgconf.c:458
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "Fehler beim Öffnen von `%s': %s\n"
@@ -943,7 +955,7 @@ msgstr "Falsch"
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
-"Hinweis: Diese Passphrase wurde noch nie geändert/%0ABitte ändern Sie sie "
+"Hinweis: Dieses Passwort wurde noch nie geändert/%0ABitte ändern Sie sie "
 "jetzt."
 
 #: agent/findkey.c:383
@@ -952,12 +964,12 @@ msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 "it now."
 msgstr ""
-"Diese Passphrase wurde seit dem %.4s-%.2s-%.2s nicht%%0A\n"
+"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
 msgid "Change passphrase"
-msgstr "Die Passphrase ändern"
+msgstr "Das Passwort ändern"
 
 #: agent/findkey.c:405
 msgid "I'll change it later"
@@ -1011,7 +1023,7 @@ msgstr "Prüfung der erstellten Signatur ist fehlgeschlagen: %s\n"
 msgid "secret key parts are not available\n"
 msgstr "Teile des geheimen Schlüssels sind nicht vorhanden\n"
 
-#: agent/cvt-openpgp.c:343 g10/card-util.c:1562
+#: agent/cvt-openpgp.c:343 g10/card-util.c:1575
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr "Public-Key-Verfahren %d (%s) wird nicht unterstützt\n"
@@ -1040,7 +1052,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:505 common/exechelp-posix.c:580
-#: common/exechelp-posix.c:866 dirmngr/dirmngr.c:1354
+#: common/exechelp-posix.c:866 dirmngr/dirmngr.c:1393
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "Fehler beim \"Forken\" des Prozess: %s\n"
@@ -1112,7 +1124,7 @@ msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "umbenennen von `%s' nach `%s' schlug fehl: %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3082
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3099
 msgid "yes"
 msgstr "ja"
 
@@ -1167,7 +1179,7 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr "Kein Speicher mehr vorhanden, als %lu Byte zugewiesen werden sollten"
 
-#: common/miscellaneous.c:115 g10/card-util.c:917 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:927 tools/no-libgcrypt.c:30
 #: tools/gpg-card.c:416
 #, c-format
 msgid "error allocating enough memory: %s\n"
@@ -1238,7 +1250,7 @@ msgstr "Fehler beim Holen der Version von '%s': %s\n"
 msgid "server '%s' is older than us (%s < %s)"
 msgstr "Der Server '%s' is älter als wir selbst (Version %s < %s)"
 
-#: common/asshelp.c:737 g10/call-dirmngr.c:408
+#: common/asshelp.c:737 g10/call-dirmngr.c:407
 #, c-format
 msgid "WARNING: %s\n"
 msgstr "WARNUNG: %s\n"
@@ -1322,7 +1334,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:4212
+#: scd/app-openpgp.c:4214
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "Nicht unterstütztes Verfahren: %s"
@@ -1397,11 +1409,11 @@ msgstr "Zertifikatkette gültig"
 msgid "Root certificate trustworthy"
 msgstr "Wurzelzertifikat vertrauenswürdig"
 
-#: common/audit.c:1112 sm/certchain.c:1242
+#: common/audit.c:1112 sm/certchain.c:1243
 msgid "no CRL found for certificate"
 msgstr "Keine CRL für das Zertifikat gefunden"
 
-#: common/audit.c:1115 sm/certchain.c:1252
+#: common/audit.c:1115 sm/certchain.c:1253
 msgid "the available CRL is too old"
 msgstr "Die vorhandene CRL ist zu alt"
 
@@ -1447,22 +1459,22 @@ msgstr "[keine]"
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "Ungültiges Basis-64 Zeichen %02X wurde übersprungen\n"
 
-#: common/ttyio.c:433
+#: common/ttyio.c:447
 #, c-format
 msgid "Sorry, we are in batchmode - can't get input\n"
-msgstr "Leider sind wir im \"--batch\" Modus - Engabe nicht möglich\n"
+msgstr "Leider sind wir im \"--batch\" Modus - Eingabe nicht möglich\n"
 
-#: common/ttyio.c:439
+#: common/ttyio.c:453
 #, c-format
 msgid "Sorry, no terminal at all requested - can't get input\n"
 msgstr "Leider ist kein Terminal vorhanden - Eingabe nicht möglich\n"
 
-#: common/ttyio.c:474 common/ttyio.c:484
+#: common/ttyio.c:488 common/ttyio.c:498
 #, c-format
 msgid "too many errors; giving up\n"
 msgstr "Zu viele Fehler; Verarbeitung wird abbgebrochen\n"
 
-#: common/ttyio.c:536
+#: common/ttyio.c:550
 #, c-format
 msgid "Control-D detected\n"
 msgstr "Control-D Zeichen erkannt\n"
@@ -1516,8 +1528,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:1036 dirmngr/dirmngr.c:895
-#: dirmngr/dirmngr.c:904
+#: common/init.c:191 sm/gpgsm.c:909 dirmngr/dirmngr.c:935 dirmngr/dirmngr.c:944
 #, 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"
@@ -1668,10 +1679,10 @@ msgstr "Die %s \"inquiry\" konnte nicht an den Client weitergeleitet werden\n"
 
 #: g10/call-agent.c:181
 msgid "Enter passphrase: "
-msgstr "Geben Sie die Passphrase ein: "
+msgstr "Geben Sie das Passwort ein: "
 
 #: g10/call-agent.c:318 g10/encrypt.c:282 g10/encrypt.c:818 g10/sign.c:473
-#: sm/call-agent.c:180 sm/encrypt.c:701 sm/sign.c:436
+#: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
 #, c-format
 msgid "%s is not compliant with %s mode\n"
 msgstr "%s is nicht konform mit dem %s Modus\n"
@@ -1681,215 +1692,215 @@ msgstr "%s is nicht konform mit dem %s Modus\n"
 msgid "error from TPM: %s\n"
 msgstr "Fehler vom TPM: %s\n"
 
-#: g10/call-agent.c:2123 g10/passphrase.c:225 g10/passphrase.c:258
-#: tools/card-call-scd.c:1751
+#: g10/call-agent.c:2135 g10/passphrase.c:233 g10/passphrase.c:266
+#: tools/card-call-scd.c:1755
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "Problem mit dem Agenten: %s\n"
 
-#: g10/call-dirmngr.c:179 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2316
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2316
 #, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "Der Dirmngr läuft nicht für diese Session\n"
 
-#: g10/call-dirmngr.c:213
+#: g10/call-dirmngr.c:212
 #, c-format
 msgid "keyserver option \"honor-keyserver-url\" may not be used in Tor mode\n"
 msgstr ""
 "Die Schlüsselserveroption \"honor-keyserver-url\" ist im Tor-Modus nicht "
 "erlaubt.\n"
 
-#: g10/call-dirmngr.c:386
+#: g10/call-dirmngr.c:385
 msgid "WKD uses a cached result"
 msgstr "WKD Abfrage wurde aus dem Cache bedient"
 
-#: g10/call-dirmngr.c:389
+#: g10/call-dirmngr.c:388
 msgid "Tor is not running"
 msgstr "Der Tor Dienst läuft nicht"
 
-#: g10/call-dirmngr.c:391
+#: g10/call-dirmngr.c:390
 msgid "Tor is not properly configured"
 msgstr "Der Tor Dienst ist falsch konfiguriert"
 
-#: g10/call-dirmngr.c:393
+#: g10/call-dirmngr.c:392
 msgid "DNS is not properly configured"
 msgstr "DNS is falsch konfiguriert"
 
-#: g10/call-dirmngr.c:395
+#: g10/call-dirmngr.c:394
 msgid "unacceptable HTTP redirect from server"
 msgstr "HTTP Weiterleitung kann nicht akzeptiert werden"
 
-#: g10/call-dirmngr.c:397
+#: g10/call-dirmngr.c:396
 msgid "unacceptable HTTP redirect from server was cleaned up"
 msgstr "HTTP Weiterleitung wurde gesäubert"
 
-#: g10/call-dirmngr.c:399
+#: g10/call-dirmngr.c:398
 msgid "server uses an invalid certificate"
 msgstr "Der Server benutzt eine ungültiges Zertifikat"
 
-#: g10/call-dirmngr.c:406 g10/gpg.c:4599
+#: g10/call-dirmngr.c:405 g10/gpg.c:4596
 #, c-format
 msgid "Note: %s\n"
 msgstr "Hinweis: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:369 g10/card-util.c:1924
-#: tools/gpg-card.c:3039
+#: g10/card-util.c:86 g10/card-util.c:374 g10/card-util.c:1937
+#: tools/gpg-card.c:3056
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP Karte ist nicht vorhanden: %s\n"
 
-#: g10/card-util.c:91 g10/card-util.c:1930
+#: g10/card-util.c:91 g10/card-util.c:1943
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP Karte Nr. %s erkannt\n"
 
-#: g10/card-util.c:97 g10/card-util.c:2309 g10/delkey.c:164 g10/keyedit.c:1428
-#: g10/keygen.c:4791 g10/revoke.c:214 g10/revoke.c:638
+#: g10/card-util.c:97 g10/card-util.c:2322 g10/delkey.c:164 g10/keyedit.c:1428
+#: g10/keygen.c:4795 g10/revoke.c:214 g10/revoke.c:639
 #, c-format
 msgid "can't do this in batch mode\n"
 msgstr "Dies kann im Batchmodus nicht durchgeführt werden.\n"
 
-#: g10/card-util.c:105 tools/gpg-card.c:2943
+#: g10/card-util.c:105 tools/gpg-card.c:2960
 #, c-format
 msgid "This command is only available for version 2 cards\n"
 msgstr "Dieser Befehl ist nur für Karten ab Version 2 möglich.\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3398 tools/gpg-card.c:2948
+#: g10/card-util.c:107 scd/app-openpgp.c:3399 tools/gpg-card.c:2965
 #, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "Der Rückstellcode ist nicht vorhanden\n"
 
-#: g10/card-util.c:140 g10/card-util.c:1448 g10/card-util.c:1710
-#: g10/card-util.c:1802 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1991 g10/keygen.c:2165 g10/keygen.c:2385 g10/keygen.c:2685
+#: g10/card-util.c:140 g10/card-util.c:1458 g10/card-util.c:1723
+#: g10/card-util.c:1815 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/keygen.c:1992 g10/keygen.c:2166 g10/keygen.c:2386 g10/keygen.c:2686
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
 #: tools/gpg-card.c:510
 msgid "Your selection? "
 msgstr "Ihre Auswahl? "
 
-#: g10/card-util.c:262 g10/card-util.c:313 tools/gpg-card.c:596
+#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:596
 #: tools/gpg-card.c:636
 msgid "[not set]"
 msgstr "[nicht gesetzt]"
 
-#: g10/card-util.c:558 tools/gpg-card.c:903
+#: g10/card-util.c:563 tools/gpg-card.c:905
 msgid "Mr."
 msgstr "Hr."
 
-#: g10/card-util.c:559 tools/gpg-card.c:904
+#: g10/card-util.c:564 tools/gpg-card.c:906
 msgid "Ms."
 msgstr "Fr."
 
-#: g10/card-util.c:586 tools/gpg-card.c:931
+#: g10/card-util.c:591 tools/gpg-card.c:933
 msgid "not forced"
 msgstr "nicht zwingend"
 
-#: g10/card-util.c:586 tools/gpg-card.c:931
+#: g10/card-util.c:591 tools/gpg-card.c:933
 msgid "forced"
 msgstr "zwingend"
 
-#: g10/card-util.c:768 tools/gpg-card.c:1468
+#: g10/card-util.c:773 tools/gpg-card.c:1484
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Fehler: Nur reines ASCII ist derzeit erlaubt.\n"
 
-#: g10/card-util.c:770 tools/gpg-card.c:1470
+#: g10/card-util.c:775 tools/gpg-card.c:1486
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Fehler: Das Zeichen \"<\" kann nicht benutzt werden.\n"
 
-#: g10/card-util.c:772 tools/gpg-card.c:1472
+#: g10/card-util.c:777 tools/gpg-card.c:1488
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Fehler: Doppelte Leerzeichen sind nicht erlaubt.\n"
 
-#: g10/card-util.c:789 tools/gpg-card.c:1505
+#: g10/card-util.c:795 tools/gpg-card.c:1521
 msgid "Cardholder's surname: "
 msgstr "Familienname des Kartenbesitzers:"
 
-#: g10/card-util.c:791 tools/gpg-card.c:1506
+#: g10/card-util.c:797 tools/gpg-card.c:1522
 msgid "Cardholder's given name: "
 msgstr "Vorname des Kartenbesitzers:"
 
-#: g10/card-util.c:809 tools/gpg-card.c:1523
+#: g10/card-util.c:816 tools/gpg-card.c:1539
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 "Fehler: Der zusammengesetzte Name ist zu lang (Grenze beträgt %d Zeichen).\n"
 
-#: g10/card-util.c:830 tools/gpg-card.c:1561
+#: g10/card-util.c:840 tools/gpg-card.c:1577
 msgid "URL to retrieve public key: "
 msgstr "URL um den öffentlichen Schlüssel zu holen: "
 
-#: g10/card-util.c:926 g10/decrypt-data.c:495 g10/import.c:406 g10/import.c:756
-#: g10/import.c:815 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1666
-#: tools/gpgconf.c:437 tools/gpgconf.c:483 tools/gpg-card.c:426
+#: g10/card-util.c:936 g10/decrypt-data.c:495 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:1705
+#: tools/gpgconf.c:471 tools/gpgconf.c:517 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:959 g10/decrypt-data.c:498 g10/export.c:2496
+#: g10/card-util.c:969 g10/decrypt-data.c:498 g10/export.c:2496
 #: dirmngr/crlcache.c:925 tools/gpg-card.c:486 tools/gpg-card.c:493
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr "Fehler beim Schreiben von %s: %s\n"
 
-#: g10/card-util.c:986 tools/gpg-card.c:1650
+#: g10/card-util.c:996 tools/gpg-card.c:1666
 msgid "Login data (account name): "
 msgstr "Logindaten (Kontenname): "
 
-#: g10/card-util.c:1024 tools/gpg-card.c:1945
+#: g10/card-util.c:1034 tools/gpg-card.c:1962
 msgid "Private DO data: "
 msgstr "Geheime DO-Daten: "
 
-#: g10/card-util.c:1109 tools/gpg-card.c:1699
+#: g10/card-util.c:1119 tools/gpg-card.c:1715
 msgid "Language preferences: "
 msgstr "Spracheinstellungen"
 
-#: g10/card-util.c:1117 tools/gpg-card.c:1710
+#: g10/card-util.c:1127 tools/gpg-card.c:1726
 #, c-format
 msgid "Error: invalid length of preference string.\n"
 msgstr "Fehler: Ungültige Länge der Einstellungs-Zeichenfolge.\n"
 
-#: g10/card-util.c:1126 tools/gpg-card.c:1719
+#: g10/card-util.c:1136 tools/gpg-card.c:1735
 #, c-format
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Fehler: Ungültige Zeichen in der Einstellungs-Zeichenfolge\n"
 
-#: g10/card-util.c:1148 tools/gpg-card.c:1753
+#: g10/card-util.c:1158 tools/gpg-card.c:1769
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr "Anrede (M=Hr., F=Fr. oder Leerzeichen): "
 
-#: g10/card-util.c:1162 tools/gpg-card.c:1770
+#: g10/card-util.c:1172 tools/gpg-card.c:1786
 msgid "Error: invalid response.\n"
 msgstr "Fehler: ungültige Antwort.\n"
 
-#: g10/card-util.c:1185 tools/gpg-card.c:1835
+#: g10/card-util.c:1195 tools/gpg-card.c:1852
 msgid "CA fingerprint: "
 msgstr "CA-Fingerabdruck: "
 
-#: g10/card-util.c:1209 tools/gpg-card.c:1861
+#: g10/card-util.c:1219 tools/gpg-card.c:1878
 #, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Fehler: ungültig geformter Fingerabdruck.\n"
 
-#: g10/card-util.c:1259
+#: g10/card-util.c:1269
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Schlüsseloperation nicht möglich: %s\n"
 
-#: g10/card-util.c:1260
+#: g10/card-util.c:1270
 msgid "not an OpenPGP card"
 msgstr "Keine gültige OpenPGP-Karte"
 
-#: g10/card-util.c:1273 g10/keygen.c:4811 g10/keygen.c:5972
+#: g10/card-util.c:1283 g10/keygen.c:4815 g10/keygen.c:6003
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "Fehler beim Holen der aktuellen Schlüsselinfo: %s\n"
 
-#: g10/card-util.c:1358
+#: g10/card-util.c:1368
 msgid "Replace existing key? (y/N) "
 msgstr "Vorhandenen Schlüssel ersetzen? (j/N) "
 
-#: g10/card-util.c:1375 tools/gpg-card.c:3328
+#: g10/card-util.c:1385 tools/gpg-card.c:3345
 msgid ""
 "Note: There is no guarantee that the card supports the requested\n"
 "      key type or size.  If the key generation does not succeed,\n"
@@ -1902,102 +1913,102 @@ msgstr ""
 "         fehlschlagen, so ziehen Sie bitte die Dokumentation Ihrer Karte\n"
 "         zu Rate.\n"
 
-#: g10/card-util.c:1396 g10/keygen.c:2570 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1406 g10/keygen.c:2571 sm/certreqgen-ui.c:180
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Welche Schlüssellänge wünschen Sie? (%u) "
 
-#: g10/card-util.c:1406 g10/keygen.c:2493 g10/keygen.c:2525
+#: g10/card-util.c:1416 g10/keygen.c:2494 g10/keygen.c:2526
 #: sm/certreqgen-ui.c:195
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "aufgerundet auf %u Bit\n"
 
-#: g10/card-util.c:1414 g10/keygen.c:2578 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1424 g10/keygen.c:2579 sm/certreqgen-ui.c:185
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s-Schlüssellängen müssen im Bereich %u-%u sein\n"
 
-#: g10/card-util.c:1433
+#: g10/card-util.c:1443
 msgid "Changing card key attribute for: "
 msgstr "Ändern des Schlüsselattributs für den: "
 
-#: g10/card-util.c:1435
+#: g10/card-util.c:1445
 msgid "Signature key\n"
 msgstr "Signatur-Schlüssel\n"
 
-#: g10/card-util.c:1437
+#: g10/card-util.c:1447
 msgid "Encryption key\n"
 msgstr "Verschlüsselungs-Schlüssel\n"
 
-#: g10/card-util.c:1439
+#: g10/card-util.c:1449
 msgid "Authentication key\n"
 msgstr "Authentisierungs-Schlüssel\n"
 
-#: g10/card-util.c:1441 g10/keygen.c:2112 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1451 g10/keygen.c:2113 sm/certreqgen-ui.c:158
 msgid "Please select what kind of key you want:\n"
 msgstr "Bitte wählen Sie, welche Art von Schlüssel Sie möchten:\n"
 
-#: g10/card-util.c:1442 sm/certreqgen-ui.c:159
+#: g10/card-util.c:1452 sm/certreqgen-ui.c:159
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1443
+#: g10/card-util.c:1453
 #, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) ECC\n"
 
-#: g10/card-util.c:1455 g10/card-util.c:1722 g10/card-util.c:1822
-#: g10/keyedit.c:900 g10/keygen.c:2017 g10/keygen.c:2045 g10/keygen.c:2172
-#: g10/keygen.c:2425 g10/keygen.c:2713 g10/revoke.c:836
+#: g10/card-util.c:1468 g10/card-util.c:1735 g10/card-util.c:1835
+#: g10/keyedit.c:900 g10/keygen.c:2018 g10/keygen.c:2046 g10/keygen.c:2173
+#: g10/keygen.c:2426 g10/keygen.c:2714 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Ungültige Auswahl.\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1541
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 "Die Karte wird nun rekonfiguriert, um einen Schlüssel von %u Bit zu "
 "erzeugen\n"
 
-#: g10/card-util.c:1533
+#: g10/card-util.c:1546
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr "Die Karte wird nun rekonfiguriert für einen Schlüssel des Typs: %s\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1582
 #, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "Fehler beim Ändern der Attributs des Schlüssels %d: %s\n"
 
-#: g10/card-util.c:1585 g10/card-util.c:2106 g10/card-util.c:2162
+#: g10/card-util.c:1598 g10/card-util.c:2119 g10/card-util.c:2175
 #, c-format
 msgid "error getting card info: %s\n"
 msgstr "Fehler beim Holen der aktuellen Schlüsselinfo: %s\n"
 
-#: g10/card-util.c:1591 g10/card-util.c:1936 g10/card-util.c:2112
-#: g10/card-util.c:2171 tools/gpg-card.c:3057 tools/gpg-card.c:3296
-#: tools/gpg-card.c:3354
+#: g10/card-util.c:1604 g10/card-util.c:1949 g10/card-util.c:2125
+#: g10/card-util.c:2184 tools/gpg-card.c:3074 tools/gpg-card.c:3313
+#: tools/gpg-card.c:3371
 #, c-format
 msgid "This command is not supported by this card\n"
 msgstr "Dieser Befehl wird von dieser Karte nicht unterstützt.\n"
 
-#: g10/card-util.c:1637 tools/gpg-card.c:2426
+#: g10/card-util.c:1650 tools/gpg-card.c:2443
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 "Sicherung des Verschlüsselungsschlüssel außerhalb der Karte erstellen? (J/n) "
 
-#: g10/card-util.c:1651
+#: g10/card-util.c:1664
 #, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "Hinweis: Auf der Karte sind bereits Schlüssel gespeichert!\n"
 
-#: g10/card-util.c:1654 tools/gpg-card.c:2398
+#: g10/card-util.c:1667 tools/gpg-card.c:2415
 msgid "Replace existing keys? (y/N) "
 msgstr "Vorhandene Schlüssel ersetzen? (j/N) "
 
-#: g10/card-util.c:1666 tools/gpg-card.c:2457
+#: g10/card-util.c:1679 tools/gpg-card.c:2474
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2008,154 +2019,154 @@ msgstr ""
 "   PIN = '%s'     Admin-PIN = '%s'\n"
 "Sie sollten sie mittels des Befehls --change-pin ändern\n"
 
-#: g10/card-util.c:1701
+#: g10/card-util.c:1714
 msgid "Please select the type of key to generate:\n"
 msgstr "Bitte wählen Sie die Art des Schlüssel, der erzeugt werden soll:\n"
 
-#: g10/card-util.c:1703 g10/card-util.c:1793
+#: g10/card-util.c:1716 g10/card-util.c:1806
 msgid "   (1) Signature key\n"
 msgstr "   (1) Signatur-Schlüssel\n"
 
-#: g10/card-util.c:1704 g10/card-util.c:1795
+#: g10/card-util.c:1717 g10/card-util.c:1808
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Verschlüsselungs-Schlüssel\n"
 
-#: g10/card-util.c:1705 g10/card-util.c:1797
+#: g10/card-util.c:1718 g10/card-util.c:1810
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Authentisierungs-Schlüssel\n"
 
-#: g10/card-util.c:1790
+#: g10/card-util.c:1803
 msgid "Please select where to store the key:\n"
 msgstr "Wählen Sie den Speicherort für den Schlüssel:\n"
 
-#: g10/card-util.c:1836
+#: g10/card-util.c:1849
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "Das KEYTOCARD Kommando schlug fehl: %s\n"
 
-#: g10/card-util.c:1941 tools/gpg-card.c:3065
+#: g10/card-util.c:1954 tools/gpg-card.c:3082
 #, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr ""
 "Hinweis: Dieses Kommando zerstörrt alle auf der Karte gespeicherten "
 "Schlüssel!\n"
 
-#: g10/card-util.c:1944 tools/gpg-card.c:3068 tools/gpg-card.c:3409
+#: g10/card-util.c:1957 tools/gpg-card.c:3085 tools/gpg-card.c:3426
 msgid "Continue? (y/N) "
 msgstr "Fortsetzen? (j/N) "
 
-#: g10/card-util.c:1949 tools/gpg-card.c:3079
+#: g10/card-util.c:1962 tools/gpg-card.c:3096
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr "Möchten Sie die Karte wirklich komplett löschen? (\"yes\" eingeben) "
 
-#: g10/card-util.c:2142
+#: g10/card-util.c:2155
 #, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "Fehler beim Einstellen der KDF: %s\n"
 
-#: g10/card-util.c:2188
+#: g10/card-util.c:2201
 #, c-format
 msgid "error for setup UIF: %s\n"
 msgstr "Fehler beim Einstellen des UIF: %s\n"
 
-#: g10/card-util.c:2212 g10/keyedit.c:1263 tools/gpg-card.c:3649
+#: g10/card-util.c:2225 g10/keyedit.c:1263 tools/gpg-card.c:3666
 msgid "quit this menu"
 msgstr "Menü verlassen"
 
-#: g10/card-util.c:2214
+#: g10/card-util.c:2227
 msgid "show admin commands"
 msgstr "Zeige Admin-Befehle"
 
-#: g10/card-util.c:2215 g10/keyedit.c:1266 tools/gpg-card.c:3652
+#: g10/card-util.c:2228 g10/keyedit.c:1266 tools/gpg-card.c:3669
 msgid "show this help"
 msgstr "Diese Hilfe zeigen"
 
-#: g10/card-util.c:2217 tools/gpg-card.c:3654
+#: g10/card-util.c:2230 tools/gpg-card.c:3671
 msgid "list all available data"
 msgstr "Alle vorhandenen Daten auflisten"
 
-#: g10/card-util.c:2220 tools/gpg-card.c:3656
+#: g10/card-util.c:2233 tools/gpg-card.c:3673
 msgid "change card holder's name"
 msgstr "Kartenbesitzernamen ändern"
 
-#: g10/card-util.c:2221 tools/gpg-card.c:3657
+#: g10/card-util.c:2234 tools/gpg-card.c:3674
 msgid "change URL to retrieve key"
 msgstr "Schlüssel-holen-URL ändern"
 
-#: g10/card-util.c:2222 tools/gpg-card.c:3658
+#: g10/card-util.c:2235 tools/gpg-card.c:3675
 msgid "fetch the key specified in the card URL"
 msgstr "Holen des Schlüssels mittels der URL auf der Karte"
 
-#: g10/card-util.c:2223 tools/gpg-card.c:3659
+#: g10/card-util.c:2236 tools/gpg-card.c:3676
 msgid "change the login name"
 msgstr "Ändern der Logindaten"
 
-#: g10/card-util.c:2224 tools/gpg-card.c:3660
+#: g10/card-util.c:2237 tools/gpg-card.c:3677
 msgid "change the language preferences"
 msgstr "Ändern der Spracheinstellungen"
 
-#: g10/card-util.c:2225 tools/gpg-card.c:3661
+#: g10/card-util.c:2238 tools/gpg-card.c:3678
 msgid "change card holder's salutation"
 msgstr "Ändern der Anrede des Kartenbesitzers"
 
-#: g10/card-util.c:2227 tools/gpg-card.c:3663
+#: g10/card-util.c:2240 tools/gpg-card.c:3680
 msgid "change a CA fingerprint"
 msgstr "Ändern des CA-Fingerabdrucks"
 
-#: g10/card-util.c:2228 tools/gpg-card.c:3664
+#: g10/card-util.c:2241 tools/gpg-card.c:3681
 msgid "toggle the signature force PIN flag"
 msgstr "Umschalten des \"Signature-force-PIN\"-Schalters"
 
-#: g10/card-util.c:2229 tools/gpg-card.c:3665
+#: g10/card-util.c:2242 tools/gpg-card.c:3682
 msgid "generate new keys"
 msgstr "neue Schlüssel erzeugen"
 
-#: g10/card-util.c:2230 tools/gpg-card.c:3666
+#: g10/card-util.c:2243 tools/gpg-card.c:3683
 msgid "menu to change or unblock the PIN"
 msgstr "Menü für Ändern oder Entsperren der PIN"
 
-#: g10/card-util.c:2231 tools/gpg-card.c:3667
+#: g10/card-util.c:2244 tools/gpg-card.c:3684
 msgid "verify the PIN and list all data"
 msgstr "überprüfe die PIN und liste alle Daten auf"
 
-#: g10/card-util.c:2232 tools/gpg-card.c:3668
+#: g10/card-util.c:2245 tools/gpg-card.c:3685
 msgid "unblock the PIN using a Reset Code"
 msgstr "die PIN mit dem Rückstellcode wieder freigeben"
 
-#: g10/card-util.c:2233 tools/gpg-card.c:3672
+#: g10/card-util.c:2246 tools/gpg-card.c:3689
 msgid "destroy all keys and data"
 msgstr "alle Schlüssel und Daten löschen"
 
-#: g10/card-util.c:2235
+#: g10/card-util.c:2248
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr "Einrichten der KDF zur Authentifizierung (on/single/off)"
 
-#: g10/card-util.c:2236
+#: g10/card-util.c:2249
 msgid "change the key attribute"
 msgstr "Das Schlüsselattribut ändern"
 
-#: g10/card-util.c:2237 tools/gpg-card.c:3674
+#: g10/card-util.c:2250 tools/gpg-card.c:3691
 msgid "change the User Interaction Flag"
 msgstr "Das User Interaction Flag (UIF) ändern"
 
-#: g10/card-util.c:2361 tools/gpg-card.c:3924
+#: g10/card-util.c:2374 tools/gpg-card.c:3941
 msgid "gpg/card> "
 msgstr "gpg/card> "
 
-#: g10/card-util.c:2402
+#: g10/card-util.c:2415
 msgid "Admin-only command\n"
 msgstr "nur-Admin Befehl\n"
 
-#: g10/card-util.c:2433
+#: g10/card-util.c:2446
 msgid "Admin commands are allowed\n"
 msgstr "Admin-Befehle sind erlaubt\n"
 
-#: g10/card-util.c:2435
+#: g10/card-util.c:2448
 msgid "Admin commands are not allowed\n"
 msgstr "Admin-Befehle sind nicht erlaubt\n"
 
-#: g10/card-util.c:2546 g10/keyedit.c:2275 tools/gpg-card.c:3814
-#: tools/gpg-card.c:4072
+#: g10/card-util.c:2559 g10/keyedit.c:2275 tools/gpg-card.c:3831
+#: tools/gpg-card.c:4089
 #, c-format
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ungültiger Befehl (versuchen Sie's mal mit \"help\")\n"
@@ -2165,22 +2176,22 @@ msgstr "Ungültiger Befehl (versuchen Sie's mal mit \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output funktioniert nicht bei diesem Befehl\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5293 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5292 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:1934 g10/export.c:2342 g10/export.c:2463
-#: g10/getkey.c:1907 g10/gpg.c:5238 g10/keyedit.c:1450 g10/keyedit.c:2382
-#: g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:703 g10/keyserver.c:1240
-#: g10/revoke.c:230 g10/tofu.c:2168
+#: g10/getkey.c:2032 g10/gpg.c:5237 g10/keyedit.c:1450 g10/keyedit.c:2382
+#: g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:703 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:2002 g10/getkey.c:1915 g10/getkey.c:4330
-#: g10/gpg.c:5247 g10/keyedit.c:2354 g10/keyserver.c:1258 g10/revoke.c:236
-#: g10/revoke.c:665 g10/tofu.c:2176
+#: g10/delkey.c:90 g10/export.c:2002 g10/getkey.c:2040 g10/getkey.c:4455
+#: g10/gpg.c:5246 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"
 msgstr "Fehler beim Lesen des Schlüsselblocks: %s\n"
@@ -2276,7 +2287,7 @@ msgstr ""
 #: g10/encrypt.c:332 g10/sign.c:1613
 #, c-format
 msgid "error creating passphrase: %s\n"
-msgstr "Fehler beim Erzeugen der Passphrase: %s\n"
+msgstr "Fehler beim Erzeugen des Passwortes: %s\n"
 
 #: g10/encrypt.c:339
 #, c-format
@@ -2312,15 +2323,15 @@ msgstr ""
 msgid "(use option \"%s\" to override)\n"
 msgstr "(benutze Option \"%s\" zum hinwegsetzen)\n"
 
-#: g10/encrypt.c:555 g10/encrypt.c:808 g10/decrypt-data.c:261 g10/gpg.c:4083
-#: g10/gpg.c:4130 sm/decrypt.c:742 sm/encrypt.c:691 sm/gpgsm.c:1793
+#: g10/encrypt.c:555 g10/encrypt.c:808 g10/decrypt-data.c:261 g10/gpg.c:4080
+#: g10/gpg.c:4127 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1646
 #, 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:564 g10/gpg.c:4095 g10/gpg.c:4142 g10/sig-check.c:155
-#: g10/sign.c:452 sm/gpgsm.c:1803 sm/gpgsm.c:1813 sm/sign.c:596 sm/verify.c:510
+#: g10/encrypt.c:564 g10/gpg.c:4092 g10/gpg.c:4139 g10/sig-check.c:155
+#: g10/sign.c:452 sm/gpgsm.c:1656 sm/gpgsm.c:1666 sm/sign.c:596 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"
@@ -2338,7 +2349,7 @@ msgstr ""
 "WARNUNG: Erzwungene Verwendung des symmetrischen Verschlüsselungsverfahren "
 "%s (%d) verletzt die Empfängervoreinstellungen\n"
 
-#: g10/encrypt.c:838 sm/encrypt.c:766
+#: g10/encrypt.c:838 sm/encrypt.c:767
 #, c-format
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr ""
@@ -2370,7 +2381,7 @@ msgstr "%s/%s.%s verschlüsselt für: \"%s\"\n"
 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:239 g10/mainproc.c:380 sm/decrypt.c:494
+#: g10/decrypt-data.c:239 g10/mainproc.c:380 sm/decrypt.c:892
 #, c-format
 msgid "%s.%s encrypted data\n"
 msgstr "%s.%s verschlüsselte Daten\n"
@@ -2380,7 +2391,7 @@ msgstr "%s.%s verschlüsselte Daten\n"
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "Mit unbekanntem Verfahren verschlüsselt %d\n"
 
-#: g10/decrypt-data.c:361 g10/decrypt-data.c:414 sm/decrypt.c:508
+#: g10/decrypt-data.c:361 g10/decrypt-data.c:414 sm/decrypt.c:906
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2420,7 +2431,7 @@ msgstr "Das GnuPG Datensicherungsformat für Schlüssel benutzen"
 msgid " - skipped"
 msgstr " - übersprungen"
 
-#: g10/export.c:1333 g10/import.c:2124 g10/openfile.c:202 g10/openfile.c:296
+#: g10/export.c:1333 g10/import.c:2132 g10/openfile.c:202 g10/openfile.c:296
 #: g10/sign.c:1110 g10/sign.c:1447
 #, c-format
 msgid "writing to '%s'\n"
@@ -2456,65 +2467,65 @@ msgstr "Fehler beim Erstellen von `%s': %s\n"
 msgid "[User ID not found]"
 msgstr "[User-ID nicht gefunden]"
 
-#: g10/getkey.c:1199
+#: g10/getkey.c:1324
 #, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "`%s' automatisch via %s geholt\n"
 
-#: g10/getkey.c:1205
+#: g10/getkey.c:1330
 #, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "Fehler beim automatischen holen von `%s' über `%s': %s\n"
 
-#: g10/getkey.c:1207
+#: g10/getkey.c:1332
 msgid "No fingerprint"
 msgstr "Kein Fingerabdruck vorhanden"
 
-#: g10/getkey.c:1449
+#: g10/getkey.c:1574
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 "Prüfe auf eine aktuellere Kopie eines abgelaufenen Schlüssels über %s\n"
 
-#: g10/getkey.c:1884 g10/revoke.c:657 g10/revoke.c:718
+#: g10/getkey.c:2009 g10/revoke.c:658 g10/revoke.c:719
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "Geheimer Schlüssel \"%s\" nicht gefunden: %s\n"
 
-#: g10/getkey.c:1887 g10/pkclist.c:1012
+#: g10/getkey.c:2012 g10/pkclist.c:1012
 #, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "(Prüfe das Argument der Option '%s')\n"
 
-#: g10/getkey.c:1965
+#: g10/getkey.c:2090
 #, c-format
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr ""
 "WARNUNG: \"%s\" wird nicht als voreingestellter geheimer Schlüssel benutzt: "
 "%s\n"
 
-#: g10/getkey.c:1973
+#: g10/getkey.c:2098
 #, c-format
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "\"%s\" wird als voreingestellter geheimer Signaturschlüssel benutzt\n"
 
-#: g10/getkey.c:1980
+#: g10/getkey.c:2105
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr "Alle für '%s' angegebenen Werte wurden ignoriert\n"
 
-#: g10/getkey.c:2837
+#: g10/getkey.c:2962
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Ungültiger Schlüssel %s, gültig gemacht per --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:3703
+#: g10/getkey.c:3828
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "der Unterschlüssel %s wird anstelle des Hauptschlüssels %s verwendet\n"
 
-#: g10/getkey.c:4259 g10/gpg.c:2167
+#: g10/getkey.c:4384 g10/gpg.c:2168
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "Gültige Argumente für Option '%s':\n"
@@ -2629,7 +2640,7 @@ msgstr "Signieren oder bearbeiten eines Schlüssels"
 
 #: g10/gpg.c:508 sm/gpgsm.c:251
 msgid "change a passphrase"
-msgstr "Die Passphrase ändern"
+msgstr "Das Passwort ändern"
 
 #: g10/gpg.c:512
 msgid "export keys"
@@ -2699,7 +2710,7 @@ msgstr "|SPEC|Email Alias festlegen"
 msgid "use strict OpenPGP behavior"
 msgstr "OpenPGP-Verhalten strikt beachten"
 
-#: g10/gpg.c:651 kbx/kbxutil.c:91 sm/gpgsm.c:424 tools/gpgconf.c:113
+#: g10/gpg.c:651 kbx/kbxutil.c:91 sm/gpgsm.c:425 tools/gpgconf.c:113
 msgid "do not make any changes"
 msgstr "Keine wirklichen Änderungen durchführen"
 
@@ -2731,7 +2742,7 @@ msgstr "Textmodus benutzen"
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|Kompressionsstufe auf N setzen (0=keine)"
 
-#: g10/gpg.c:762 sm/gpgsm.c:357
+#: g10/gpg.c:762 sm/gpgsm.c:358
 msgid "Options controlling key import and export"
 msgstr "Optionen für den Schlüsselimport und -export"
 
@@ -2749,11 +2760,11 @@ msgstr "Schlüssel aus der Signatur importieren"
 msgid "include the public key in signatures"
 msgstr "Schlüssel mit in die Signatur packen"
 
-#: g10/gpg.c:776 sm/gpgsm.c:360
+#: g10/gpg.c:776 sm/gpgsm.c:361
 msgid "disable all access to the dirmngr"
 msgstr "Jeglichen Zugriff auf den Dirmngr verhindern"
 
-#: g10/gpg.c:788 sm/gpgsm.c:367
+#: g10/gpg.c:788 sm/gpgsm.c:368
 msgid "Options controlling key listings"
 msgstr "Optionen für das Auflisten der Schlüssel"
 
@@ -2769,15 +2780,15 @@ msgstr "|USER-ID|Verschlüsseln für USER-ID"
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|USER-ID|Mit USER-ID signieren bzw. entschlüsseln"
 
-#: g10/gpg.c:876 sm/gpgsm.c:408
+#: g10/gpg.c:876 sm/gpgsm.c:409
 msgid "Options for unattended use"
 msgstr "Optionen für die Verwendung in Scripts"
 
-#: g10/gpg.c:895 sm/gpgsm.c:420 dirmngr/dirmngr.c:286
+#: g10/gpg.c:895 sm/gpgsm.c:421 dirmngr/dirmngr.c:289
 msgid "Other options"
 msgstr "Weitere Optionen"
 
-#: g10/gpg.c:966 sm/gpgsm.c:453
+#: g10/gpg.c:966 sm/gpgsm.c:454
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2820,7 +2831,7 @@ msgstr ""
 "Signieren, prüfen, verschlüsseln, entschlüsseln.\n"
 "Die voreingestellte Operation ist abhängig von den Eingabedaten\n"
 
-#: g10/gpg.c:1168 sm/gpgsm.c:636
+#: g10/gpg.c:1168 sm/gpgsm.c:637
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2844,12 +2855,12 @@ msgstr "Hash: "
 msgid "Compression: "
 msgstr "Komprimierung: "
 
-#: g10/gpg.c:1274 sm/gpgsm.c:710
+#: g10/gpg.c:1274 sm/gpgsm.c:711
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "Aufruf: %s [Optionen] %s\n"
 
-#: g10/gpg.c:1467 sm/gpgsm.c:803
+#: g10/gpg.c:1467 sm/gpgsm.c:804
 #, c-format
 msgid "conflicting commands\n"
 msgstr "Widersprüchliche Befehle\n"
@@ -2859,44 +2870,44 @@ msgstr "Widersprüchliche Befehle\n"
 msgid "no = sign found in group definition '%s'\n"
 msgstr "Kein '='-Zeichen in der Gruppendefinition gefunden `%s'\n"
 
-#: g10/gpg.c:1683
+#: g10/gpg.c:1684
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "WARNUNG: Unsicheres Besitzverhältnis des Home-Verzeichnis `%s'\n"
 
-#: g10/gpg.c:1686
+#: g10/gpg.c:1687
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "WARNUNG: Unsicheres Besitzverhältnis der Konfigurationsdatei `%s'\n"
 
-#: g10/gpg.c:1689
+#: g10/gpg.c:1690
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "WARNUNG: Unsicheres Besitzverhältnis auf die Erweiterung `%s'\n"
 
-#: g10/gpg.c:1695
+#: g10/gpg.c:1696
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte des Home-Verzeichnis `%s'\n"
 
-#: g10/gpg.c:1698
+#: g10/gpg.c:1699
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte der Konfigurationsdatei `%s'\n"
 
-#: g10/gpg.c:1701
+#: g10/gpg.c:1702
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte auf die Erweiterung `%s'\n"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1708
 #, 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:1710
+#: g10/gpg.c:1711
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@ -2904,20 +2915,20 @@ msgstr ""
 "WARNUNG: Unsicheres Besitzverhältnis des umgebenden Verzeichnisses der "
 "Konfigurationsdatei '%s'\n"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1714
 #, 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:1719
+#: g10/gpg.c:1720
 #, 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:1722
+#: g10/gpg.c:1723
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@ -2925,474 +2936,474 @@ msgstr ""
 "WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses der "
 "Konfigurationsdatei '%s'\n"
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1726
 #, 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:1941
+#: g10/gpg.c:1942
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "Unbekanntes Konfigurationselement `%s'\n"
 
-#: g10/gpg.c:2037
+#: g10/gpg.c:2038
 msgid "display photo IDs during key listings"
 msgstr "Anzeigen der Foto-ID in den Schlüssellisten"
 
-#: g10/gpg.c:2039
+#: g10/gpg.c:2040
 msgid "show key usage information during key listings"
 msgstr "Schlüsselverwendungszwecke mit den Schlüsseln anlisten"
 
-#: g10/gpg.c:2041
+#: g10/gpg.c:2042
 msgid "show policy URLs during signature listings"
 msgstr "Richtlinien-URL mit den Signaturen anlisten"
 
-#: g10/gpg.c:2043
+#: g10/gpg.c:2044
 msgid "show all notations during signature listings"
 msgstr "Alle Notationen mit den Signaturen anlisten"
 
-#: g10/gpg.c:2045
+#: g10/gpg.c:2046
 msgid "show IETF standard notations during signature listings"
 msgstr "Standard Notationen mit den Signaturen anlisten"
 
-#: g10/gpg.c:2049
+#: g10/gpg.c:2050
 msgid "show user-supplied notations during signature listings"
 msgstr "Benutzer-Notationen mit den Signaturen anlisten"
 
-#: g10/gpg.c:2051
+#: g10/gpg.c:2052
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "Bevorzugten Schlüsselserver mit den Signaturen anlisten"
 
-#: g10/gpg.c:2053
+#: g10/gpg.c:2054
 msgid "show user ID validity during key listings"
 msgstr "Zeige Gültigkeit der User-ID in den Schlüssellisten"
 
-#: g10/gpg.c:2055
+#: g10/gpg.c:2056
 msgid "show revoked and expired user IDs in key listings"
 msgstr "Zeige widerrufene und verfallene User-ID in den Schlüssellisten"
 
-#: g10/gpg.c:2057
+#: g10/gpg.c:2058
 msgid "show revoked and expired subkeys in key listings"
 msgstr "Zeige widerrufene und verfallene Unterschlüssel in den Schlüssellisten"
 
-#: g10/gpg.c:2059
+#: g10/gpg.c:2060
 msgid "show the keyring name in key listings"
 msgstr "Anzeigen des Schlüsselbundes, in dem ein Schlüssel drin ist"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2062
 msgid "show expiration dates during signature listings"
 msgstr "Das Ablaufdatum mit den Signaturen anlisten"
 
-#: g10/gpg.c:2178
+#: g10/gpg.c:2179
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "Unbekannte TOFU Regel '%s'\n"
 
-#: g10/gpg.c:2180
+#: g10/gpg.c:2181
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(\"help\" um mögliche Werte anzuzeigen)\n"
 
-#: g10/gpg.c:2975 g10/gpg.c:3828 g10/gpg.c:3840
+#: g10/gpg.c:2978 g10/gpg.c:3825 g10/gpg.c:3837
 #, 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:3151 g10/gpg.c:3163
+#: g10/gpg.c:3154 g10/gpg.c:3166
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "`%s' ist kein gültiges Signaturablaufdatum\n"
 
-#: g10/gpg.c:3185
+#: g10/gpg.c:3188
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "\"%s\" ist keine gültige E-Mailadresse\n"
 
-#: g10/gpg.c:3217 sm/gpgsm.c:1270
+#: g10/gpg.c:3220 sm/gpgsm.c:1143
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "Ungültiger Subjekt-Name '%s'\n"
 
-#: g10/gpg.c:3223 sm/gpgsm.c:1276
+#: g10/gpg.c:3226 sm/gpgsm.c:1149
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "Ungültiges \"Herkunft\"-Argument '%s'\n"
 
-#: g10/gpg.c:3280
+#: g10/gpg.c:3283
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "`%s' ist kein gültiger Zeichensatz\n"
 
-#: g10/gpg.c:3302 g10/gpg.c:3511 g10/keyedit.c:5319
+#: g10/gpg.c:3305 g10/gpg.c:3514 g10/keyedit.c:5322
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "Schlüsselserver-URL konnte nicht analysiert werden\n"
 
-#: g10/gpg.c:3320
+#: g10/gpg.c:3323
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ungültige Schlüsselserver-Option\n"
 
-#: g10/gpg.c:3323
+#: g10/gpg.c:3326
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "Ungültige Schlüsselserver-Option\n"
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3333
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ungültige Import-Option\n"
 
-#: g10/gpg.c:3333
+#: g10/gpg.c:3336
 #, c-format
 msgid "invalid import options\n"
 msgstr "Ungültige Import-Option\n"
 
-#: g10/gpg.c:3339 g10/gpg.c:3354
+#: g10/gpg.c:3342 g10/gpg.c:3357
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "Ungültige Filter-Option: %s\n"
 
-#: g10/gpg.c:3345
+#: g10/gpg.c:3348
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ungültige Export-Option.\n"
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3351
 #, c-format
 msgid "invalid export options\n"
 msgstr "Ungültige Export-Option\n"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3363
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ungültige Listen-Option.\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3366
 #, c-format
 msgid "invalid list options\n"
 msgstr "Ungültige Listen-Option\n"
 
-#: g10/gpg.c:3371
+#: g10/gpg.c:3374
 msgid "display photo IDs during signature verification"
 msgstr "Foto-ID während der Signaturprüfung anzeigen"
 
-#: g10/gpg.c:3373
+#: g10/gpg.c:3376
 msgid "show policy URLs during signature verification"
 msgstr "Richtlinien-URLs während der Signaturprüfung anzeigen"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3378
 msgid "show all notations during signature verification"
 msgstr "Alle Notationen während der Signaturprüfung anzeigen"
 
-#: g10/gpg.c:3377
+#: g10/gpg.c:3380
 msgid "show IETF standard notations during signature verification"
 msgstr "Standard-Notationen während der Signaturprüfung anzeigen"
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3384
 msgid "show user-supplied notations during signature verification"
 msgstr "Benutzer-Notationen während der Signaturprüfung anzeigen"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3386
 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:3385
+#: g10/gpg.c:3388
 msgid "show user ID validity during signature verification"
 msgstr "Die Gültigkeit der User-ID während der Signaturprüfung anzeigen"
 
-#: g10/gpg.c:3387
+#: g10/gpg.c:3390
 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:3389
+#: g10/gpg.c:3392
 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:3396
+#: g10/gpg.c:3399
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ungültige Überprüfungs-Option.\n"
 
-#: g10/gpg.c:3399
+#: g10/gpg.c:3402
 #, c-format
 msgid "invalid verify options\n"
 msgstr "Ungültige Überprüfungs-Option\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3409
 #, 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:3613
+#: g10/gpg.c:3616
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ungültige \"auto-key-locate\"-Liste\n"
 
-#: g10/gpg.c:3616
+#: g10/gpg.c:3619
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "ungültige \"auto-key-locate\"-Liste\n"
 
-#: g10/gpg.c:3625
+#: g10/gpg.c:3628
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "Ungültiges Argument für Option \"%.50s\"\n"
 
-#: g10/gpg.c:3807 sm/gpgsm.c:1675
+#: g10/gpg.c:3804 sm/gpgsm.c:1528
 #, 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:3821
+#: g10/gpg.c:3818
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "WARNUNG: %s ersetzt %s\n"
 
-#: g10/gpg.c:3830
+#: g10/gpg.c:3827
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s zusammen mit %s ist nicht erlaubt!\n"
 
-#: g10/gpg.c:3833
+#: g10/gpg.c:3830
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
 
-#: g10/gpg.c:3848 sm/gpgsm.c:1696 dirmngr/dirmngr.c:1123
+#: g10/gpg.c:3845 sm/gpgsm.c:1549 dirmngr/dirmngr.c:1160
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "WARNUNG: Ausführung mit gefälschter Systemzeit: "
 
-#: g10/gpg.c:3869
+#: g10/gpg.c:3866
 #, 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:3897 g10/gpg.c:3928 sm/gpgsm.c:1763
+#: g10/gpg.c:3894 g10/gpg.c:3925 sm/gpgsm.c:1616
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "Das ausgewählte Verschlüsselungsverfahren ist ungültig\n"
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3901
 #, c-format
 msgid "selected AEAD algorithm is invalid\n"
 msgstr "Das ausgewählte AEAD-Verfahren ist ungültig\n"
 
-#: g10/gpg.c:3916
+#: g10/gpg.c:3913
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "Das ausgewählte Komprimierungsverfahren ist ungültig\n"
 
-#: g10/gpg.c:3922
+#: g10/gpg.c:3919
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
 
-#: g10/gpg.c:3937
+#: g10/gpg.c:3934
 #, 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:3939
+#: g10/gpg.c:3936
 #, 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:3941
+#: g10/gpg.c:3938
 #, 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:3943
+#: g10/gpg.c:3940
 #, 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:3945
+#: g10/gpg.c:3942
 #, 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:3949
+#: g10/gpg.c:3946
 #, 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:3953
+#: g10/gpg.c:3950
 #, 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:3960
+#: g10/gpg.c:3957
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "ungültige Standard-Voreinstellungen\n"
 
-#: g10/gpg.c:3964
+#: g10/gpg.c:3961
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "ungültige private Verschlüsselungsvoreinstellungen\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3964
 #, c-format
 msgid "invalid personal AEAD preferences\n"
 msgstr "ungültige private AEAD-Voreinstellungen\n"
 
-#: g10/gpg.c:3971
+#: g10/gpg.c:3968
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "ungültige private Hashvoreinstellungen\n"
 
-#: g10/gpg.c:3975
+#: g10/gpg.c:3972
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "ungültige private Komprimierungsvoreinstellungen\n"
 
-#: g10/gpg.c:3984 g10/gpg.c:3989
+#: g10/gpg.c:3981 g10/gpg.c:3986
 #, c-format
 msgid "chunk size invalid - using %d\n"
 msgstr "Ungültige \"Chunk\"-Größe; %d wird verwendet\n"
 
-#: g10/gpg.c:4026
+#: g10/gpg.c:4023
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s arbeitet noch nicht mit %s zusammen\n"
 
-#: g10/gpg.c:4089
+#: g10/gpg.c:4086
 #, 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:4101
+#: g10/gpg.c:4098
 #, 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:4256
+#: g10/gpg.c:4253
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 
-#: g10/gpg.c:4268
+#: g10/gpg.c:4265
 #, 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:4340
+#: g10/gpg.c:4337
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "Symmetrische Entschlüsselung von `%s' fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:4369
+#: g10/gpg.c:4366
 #, 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:4372
+#: g10/gpg.c:4369
 #, 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:4430
+#: g10/gpg.c:4427
 #, 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:4433
+#: g10/gpg.c:4430
 #, 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:4821 g10/keyserver.c:1870
+#: g10/gpg.c:4818 g10/keyserver.c:1629
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Senden an Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:4826
+#: g10/gpg.c:4823
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Empfangen vom Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:4832
+#: g10/gpg.c:4829
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Schlüsselexport fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:4845
+#: g10/gpg.c:4842
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "Schlüsselexport im SSH Format fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:4857
+#: g10/gpg.c:4854
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Suche auf dem Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:4870
+#: g10/gpg.c:4867
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh vom Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:4937
+#: g10/gpg.c:4936
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Entfernen der ASCII-Hülle ist fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:4948
+#: g10/gpg.c:4947
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Anbringen der ASCII-Hülle ist fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:5053
+#: g10/gpg.c:5052
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "Ungültiges Hashverfahren '%s'\n"
 
-#: g10/gpg.c:5205 g10/tofu.c:2156
+#: g10/gpg.c:5204 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:5216
+#: g10/gpg.c:5215
 #, 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:5272
+#: g10/gpg.c:5271
 #, 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:5283
+#: g10/gpg.c:5282
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Auf geht's - Botschaft eintippen ...\n"
 
-#: g10/gpg.c:5630
+#: g10/gpg.c:5629
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "Die angegebene Zertifikat-Richtlinien-URL ist ungültig\n"
 
-#: g10/gpg.c:5632
+#: g10/gpg.c:5631
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "Die angegebene Signatur-Richtlinien-URL ist ungültig\n"
 
-#: g10/gpg.c:5665
+#: g10/gpg.c:5664
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "Die angegebene URL des bevorzugten Schlüsselserver ist ungültig\n"
@@ -3405,7 +3416,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:414 tools/gpgconf.c:116 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:415 tools/gpgconf.c:116 tools/gpg-card.c:95
 msgid "|FD|write status info to this FD"
 msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben"
 
@@ -3490,97 +3501,97 @@ msgstr "Eingabedaten sind im GnuPG Datensicherungsformat für Schlüssel"
 msgid "repair keys on import"
 msgstr "Schlüssel beim Import reparieren"
 
-#: g10/import.c:399 g10/import.c:721
+#: g10/import.c:407 g10/import.c:729
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "überspringe den Block vom Typ %d\n"
 
-#: g10/import.c:738
+#: g10/import.c:746
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu Schlüssel bislang bearbeitet\n"
 
-#: g10/import.c:831
+#: g10/import.c:839
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Anzahl insgesamt bearbeiteter Schlüssel: %lu\n"
 
-#: g10/import.c:834
+#: g10/import.c:842
 #, c-format
 msgid "    skipped PGP-2 keys: %lu\n"
 msgstr "             ignorierte PGP-2 Schlüssel: %lu\n"
 
-#: g10/import.c:836
+#: g10/import.c:844
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "              ignorierte neue Schlüssel: %lu\n"
 
-#: g10/import.c:839
+#: g10/import.c:847
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "                           ohne User-ID: %lu\n"
 
-#: g10/import.c:842 sm/import.c:129
+#: g10/import.c:850 sm/import.c:129
 #, c-format
 msgid "              imported: %lu"
 msgstr "                             importiert: %lu"
 
-#: g10/import.c:846 sm/import.c:133
+#: g10/import.c:854 sm/import.c:133
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                            unverändert: %lu\n"
 
-#: g10/import.c:848
+#: g10/import.c:856
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "                          neue User-IDs: %lu\n"
 
-#: g10/import.c:850
+#: g10/import.c:858
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "                    neue Unterschlüssel: %lu\n"
 
-#: g10/import.c:852
+#: g10/import.c:860
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "                        neue Signaturen: %lu\n"
 
-#: g10/import.c:854
+#: g10/import.c:862
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "                neue Schlüsselwiderrufe: %lu\n"
 
-#: g10/import.c:856 sm/import.c:135
+#: g10/import.c:864 sm/import.c:135
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "             gelesene geheime Schlüssel: %lu\n"
 
-#: g10/import.c:858 sm/import.c:137
+#: g10/import.c:866 sm/import.c:137
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "           geheime Schlüssel importiert: %lu\n"
 
-#: g10/import.c:860 sm/import.c:139
+#: g10/import.c:868 sm/import.c:139
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "                unveränderte geh. Schl.: %lu\n"
 
-#: g10/import.c:862 sm/import.c:141
+#: g10/import.c:870 sm/import.c:141
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "                       nicht importiert: %lu\n"
 
-#: g10/import.c:864
+#: g10/import.c:872
 #, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "    Signaturen bereinigt: %lu\n"
 
-#: g10/import.c:866
+#: g10/import.c:874
 #, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "      User-IDs bereinigt: %lu\n"
 
-#: g10/import.c:1291
+#: g10/import.c:1299
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
@@ -3589,175 +3600,175 @@ msgstr ""
 "WARNUNG: Schlüssel %s hat Einstellungen zu nicht verfügbaren\n"
 "Verfahren für folgende User-ID:\n"
 
-#: g10/import.c:1333
+#: g10/import.c:1341
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": Einstellungen des Verschlüsselungsverfahren %s\n"
 
-#: g10/import.c:1351
+#: g10/import.c:1359
 #, c-format
 msgid "         \"%s\": preference for AEAD algorithm %s\n"
 msgstr "         \"%s\": Einstellungen des AEAD-Verfahrens %s\n"
 
-#: g10/import.c:1366
+#: g10/import.c:1374
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": Einstellungen der Hashmethode %s\n"
 
-#: g10/import.c:1378
+#: g10/import.c:1386
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": Einstellungen der Komprimierungsverfahren %s\n"
 
-#: g10/import.c:1391
+#: g10/import.c:1399
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "es ist extrem empfehlenswert Ihre Einstellungen zu ändern und\n"
 
-#: g10/import.c:1393
+#: g10/import.c:1401
 #, c-format
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "diesen Schlüssel wieder zu verteilen, um mögliche Probleme durch unpassende "
 "Verfahrenskombinationen zu vermeiden\n"
 
-#: g10/import.c:1418
+#: g10/import.c:1426
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 "Sie können Ihren Einstellungen mittels \"gpg --edit-key %s updpref save\" "
 "ändern\n"
 
-#: g10/import.c:1932 g10/import.c:3053
+#: g10/import.c:1940 g10/import.c:3061
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "Schlüssel %s: Keine User-ID\n"
 
-#: g10/import.c:1938
+#: g10/import.c:1946
 #, c-format
 msgid "key %s: %s\n"
 msgstr "Schlüssel %s: %s\n"
 
-#: g10/import.c:1939 g10/import.c:3025
+#: g10/import.c:1947 g10/import.c:3033
 msgid "rejected by import screener"
 msgstr "vom Import-Aufpasser zurückgewiesen"
 
-#: g10/import.c:1988
+#: g10/import.c:1996
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "Schlüssel %s: PKS Unterschlüsseldefekt repariert\n"
 
-#: g10/import.c:2009
+#: g10/import.c:2017
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "Schlüssel %s: Nicht eigenbeglaubigte User-ID `%s' übernommen\n"
 
-#: g10/import.c:2020 g10/import.c:2051
+#: g10/import.c:2028 g10/import.c:2059
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "Schlüssel %s: Keine gültigen User-IDs\n"
 
-#: g10/import.c:2022
+#: g10/import.c:2030
 #, c-format
 msgid "this may be caused by a missing self-signature\n"
 msgstr "dies könnte durch fehlende Eigenbeglaubigung verursacht worden sein\n"
 
-#: g10/import.c:2101 g10/import.c:3439
+#: g10/import.c:2109 g10/import.c:3447
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "Schlüssel %s: Öffentlicher Schlüssel nicht gefunden: %s\n"
 
-#: g10/import.c:2107
+#: g10/import.c:2115
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "Schlüssel %s: neuer Schlüssel - übersprungen\n"
 
-#: g10/import.c:2119
+#: g10/import.c:2127
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "kein schreibbarer Schlüsselbund gefunden: %s\n"
 
-#: g10/import.c:2151 g10/import.c:2253 g10/import.c:3514
+#: g10/import.c:2159 g10/import.c:2261 g10/import.c:3522
 #, c-format
 msgid "error writing keyring '%s': %s\n"
 msgstr "Fehler beim Schreiben des Schlüsselbundes `%s': %s\n"
 
-#: g10/import.c:2174
+#: g10/import.c:2182
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "Schlüssel %s: Öffentlicher Schlüssel \"%s\" importiert\n"
 
-#: g10/import.c:2201
+#: g10/import.c:2209
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "Schlüssel %s: Stimmt nicht mit unserer Kopie überein\n"
 
-#: g10/import.c:2269
+#: g10/import.c:2277
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "Schlüssel %s: \"%s\" 1 neue User-ID\n"
 
-#: g10/import.c:2272
+#: g10/import.c:2280
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "Schlüssel %s: \"%s\" %d neue User-IDs\n"
 
-#: g10/import.c:2275
+#: g10/import.c:2283
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "Schlüssel %s: \"%s\" 1 neue Signatur\n"
 
-#: g10/import.c:2278
+#: g10/import.c:2286
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "Schlüssel %s: \"%s\" %d neue Signaturen\n"
 
-#: g10/import.c:2281
+#: g10/import.c:2289
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "Schlüssel %s: \"%s\" 1 neuer Unterschlüssel\n"
 
-#: g10/import.c:2284
+#: g10/import.c:2292
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "Schlüssel %s: \"%s\" %d neue Unterschlüssel\n"
 
-#: g10/import.c:2287
+#: g10/import.c:2295
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "Schlüssel %s: \"%s\" %d Signaturen bereinigt\n"
 
-#: g10/import.c:2290
+#: g10/import.c:2298
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "Schlüssel %s: \"%s\" %d Signaturen bereinigt\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2301
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "Schlüssel %s: \"%s\" %d User-ID bereinigt\n"
 
-#: g10/import.c:2296
+#: g10/import.c:2304
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "Schlüssel %s: \"%s\" %d User-IDs bereinigt\n"
 
-#: g10/import.c:2332
+#: g10/import.c:2340
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "Schlüssel %s: \"%s\" nicht geändert\n"
 
-#: g10/import.c:2692 g10/import.c:2887
+#: g10/import.c:2700 g10/import.c:2895
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "Schlüssel %s: geheimer Schlüssel importiert\n"
 
-#: g10/import.c:2700
+#: g10/import.c:2708
 #, c-format
 msgid "key %s: secret key already exists\n"
 msgstr "Schlüssel %s: geheimer Schlüssel bereits vorhanden\n"
 
-#: g10/import.c:2708
+#: g10/import.c:2716
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "Schlüssel %s: Fehler beim Senden zum gpg-agent: %s\n"
@@ -3770,214 +3781,213 @@ msgstr "Schlüssel %s: Fehler beim Senden zum gpg-agent: %s\n"
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2877
+#: g10/import.c:2885
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 "Um '%s' zu migrieren sollte für jede Smartcard \"%s\" aufgerufen werden.\n"
 
-#: g10/import.c:3024
+#: g10/import.c:3032
 #, c-format
 msgid "secret key %s: %s\n"
 msgstr "Geheimer Schlüssel %s: %s\n"
 
-#: g10/import.c:3045 g10/import.c:3084
+#: g10/import.c:3053 g10/import.c:3092
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "Importieren geheimer Schlüssel ist nicht erlaubt\n"
 
-#: g10/import.c:3072
+#: g10/import.c:3080
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr ""
 "Schlüssel %s: geheimer Schlüssel mit ungültiger Verschlüsselung %d - "
 "übersprungen\n"
 
-#: g10/import.c:3234 g10/pkclist.c:75 g10/revoke.c:774
+#: g10/import.c:3242 g10/pkclist.c:75 g10/revoke.c:775
 msgid "No reason specified"
 msgstr "Kein Grund angegeben"
 
-#: g10/import.c:3235 g10/pkclist.c:77 g10/revoke.c:776
+#: g10/import.c:3243 g10/pkclist.c:77 g10/revoke.c:777
 msgid "Key is superseded"
 msgstr "Schlüssel ist überholt"
 
-#: g10/import.c:3236 g10/pkclist.c:79 g10/revoke.c:775
+#: g10/import.c:3244 g10/pkclist.c:79 g10/revoke.c:776
 msgid "Key has been compromised"
 msgstr "Hinweis: Dieser Schlüssel ist nicht mehr sicher"
 
-#: g10/import.c:3237 g10/pkclist.c:81 g10/revoke.c:777
+#: g10/import.c:3245 g10/pkclist.c:81 g10/revoke.c:778
 msgid "Key is no longer used"
 msgstr "Schlüssel wird nicht mehr benutzt"
 
-#: g10/import.c:3238 g10/pkclist.c:83 g10/revoke.c:778
+#: g10/import.c:3246 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "User-ID ist nicht mehr gültig"
 
-#: g10/import.c:3363 g10/keylist.c:1105 g10/pkclist.c:87
+#: g10/import.c:3371 g10/keylist.c:1105 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "Grund für Widerruf: "
 
-#: g10/import.c:3382 g10/keylist.c:1124 g10/pkclist.c:103
+#: g10/import.c:3390 g10/keylist.c:1124 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "Widerruf-Bemerkung: "
 
-#: g10/import.c:3432
+#: g10/import.c:3440
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "Schlüssel %s: Kein öffentlicher Schlüssel - der Schlüsselwiderruf kann nicht "
 "angebracht werden\n"
 
-#: g10/import.c:3461
+#: g10/import.c:3469
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "Schlüssel %s: der originale Schlüsselblock wurde nicht gefunden: %s\n"
 
-#: g10/import.c:3468
+#: g10/import.c:3476
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "Schlüssel %s: Lesefehler im originalen Schlüsselblock: %s\n"
 
-#: g10/import.c:3488
+#: g10/import.c:3496
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "Schlüssel %s: Ungültiges Widerrufzertifikat: %s - zurückgewiesen\n"
 
-#: g10/import.c:3523
+#: g10/import.c:3531
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "Schlüssel %s: \"%s\" Widerrufzertifikat importiert\n"
 
-#: g10/import.c:3609
+#: g10/import.c:3617
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "Schlüssel %s: Keine User-ID für Signatur\n"
 
-#: g10/import.c:3626
+#: g10/import.c:3634
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "Schlüssel %s: Nicht unterstütztes Public-Key-Verfahren für User-ID \"%s\"\n"
 
-#: g10/import.c:3628
+#: g10/import.c:3636
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "Schlüssel %s: Ungültige Eigenbeglaubigung für User-ID \"%s\"\n"
 
-#: g10/import.c:3645 g10/import.c:3673 g10/import.c:3729
+#: g10/import.c:3653 g10/import.c:3681 g10/import.c:3737
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "Schlüssel %s: Nicht unterstütztes Public-Key-Verfahren\n"
 
-#: g10/import.c:3646
+#: g10/import.c:3654
 #, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "Schlüssel %s: Ungültige \"direct-key\"-Signatur\n"
 
-#: g10/import.c:3660
+#: g10/import.c:3668
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "Schlüssel %s: Kein Unterschlüssel für die Unterschlüsselanbindung\n"
 
-#: g10/import.c:3675
+#: g10/import.c:3683
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "Schlüssel %s: Ungültige Unterschlüssel-Anbindung\n"
 
-#: g10/import.c:3694
+#: g10/import.c:3702
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "Schlüssel %s: Mehrfache Unterschlüssel-Anbindung entfernt\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3726
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "Schlüssel %s: Kein Unterschlüssel für Schlüsselwiderruf\n"
 
-#: g10/import.c:3731
+#: g10/import.c:3739
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "Schlüssel %s: Ungültiger Unterschlüsselwiderruf\n"
 
-#: g10/import.c:3746
+#: g10/import.c:3754
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "Schlüssel %s: Mehrfacher Unterschlüsselwiderruf entfernt\n"
 
-#: g10/import.c:3790
+#: g10/import.c:3798
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "Schlüssel %s: User-ID übersprungen \"%s\"\n"
 
-#: g10/import.c:3817
+#: g10/import.c:3825
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "Schlüssel %s: Unterschlüssel übersprungen\n"
 
-#: g10/import.c:3849
+#: g10/import.c:3857
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr ""
 "Schlüssel %s: Nicht exportfähige Signatur (Klasse %02x) - übersprungen\n"
 
-#: g10/import.c:3860
+#: g10/import.c:3868
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "Schlüssel %s: Widerrufzertifikat an falschem Platz - übersprungen\n"
 
-#: g10/import.c:3878
+#: g10/import.c:3886
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "Schlüssel %s: Ungültiges Widerrufzertifikat: %s - übersprungen\n"
 
-#: g10/import.c:3892
+#: g10/import.c:3900
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr ""
 "Schlüssel %s: Unterschlüssel-Widerrufzertifikat an falschem Platz - "
 "übersprungen\n"
 
-#: g10/import.c:3900
+#: g10/import.c:3908
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "Schlüssel %s: unerwartete Signaturklasse (0x%02x) - übersprungen\n"
 
-#: g10/import.c:4073
+#: g10/import.c:4081
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "Schlüssel %s: Doppelte User-ID entdeckt - zusammengeführt\n"
 
-#: g10/import.c:4180
+#: g10/import.c:4188
 #, c-format
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr "Schlüssel %s: Doppelte Unterschlüssel entdeckt - zusammengeführt\n"
 
-#: g10/import.c:4245
+#: g10/import.c:4253
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "WARNUNG: Schlüssel %s ist u.U. widerrufen: hole Widerrufschlüssel %s\n"
 
-#: g10/import.c:4261
+#: g10/import.c:4269
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "WARNUNG: Schlüssel %s ist u.U. widerrufen: Widerrufschlüssel %s ist nicht "
 "vorhanden\n"
 
-#: g10/import.c:4327
+#: g10/import.c:4335
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "Schlüssel %s: \"%s\" Widerrufzertifikat hinzugefügt\n"
 
-#: g10/import.c:4365
+#: g10/import.c:4373
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "Schlüssel %s: \"direct-key\"-Signaturen hinzugefügt\n"
 
-#: g10/key-check.c:133 dirmngr/dirmngr_ldap.c:650 dirmngr/ldap-wrapper.c:835
-#: dirmngr/ldap-wrapper.c:852
+#: g10/key-check.c:133 dirmngr/ldap-wrapper.c:835 dirmngr/ldap-wrapper.c:852
 #, c-format
 msgid "error allocating memory: %s\n"
 msgstr "Fehler beim Allozieren von Speicher: %s\n"
@@ -4043,7 +4053,7 @@ msgstr ""
 "WARNUNG: Es wurden Fehler gefunden aber nur Eigenbeglaubigungen geprüft; um "
 "alle Beglaubigungen zu prüfen das Kommando '%s' verwenden.\n"
 
-#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:284 sm/keydb.c:297
+#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:289 sm/keydb.c:302
 #, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "Die \"Keybox\" `%s' konnte nicht erstellt werden: %s\n"
@@ -4053,7 +4063,7 @@ msgstr "Die \"Keybox\" `%s' konnte nicht erstellt werden: %s\n"
 msgid "error creating keyring '%s': %s\n"
 msgstr "Fehler beim Erzeugen des Schlüsselbundes `%s': %s\n"
 
-#: g10/keydb.c:388 sm/keydb.c:303
+#: g10/keydb.c:388 sm/keydb.c:308
 #, c-format
 msgid "keybox '%s' created\n"
 msgstr "Die \"Keybox\" `%s' wurde erstellt\n"
@@ -4314,8 +4324,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:6192 g10/keyedit.c:6275 g10/keyedit.c:6404
-#: g10/keyedit.c:6466 g10/sign.c:528
+#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
+#: g10/keyedit.c:6474 g10/sign.c:528
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Beglaubigung fehlgeschlagen: %s\n"
@@ -4323,13 +4333,13 @@ msgstr "Beglaubigung fehlgeschlagen: %s\n"
 #: g10/keyedit.c:1119
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
-"Der Schlüssel enthält nur \"stub\"- oder \"on-card\"-Schlüsselelemente- "
-"keine Passphrase ist zu ändern.\n"
+"Der Schlüssel enthält nur \"stub\"- oder \"on-card\"-Schlüsselelemente- kein "
+"Passwort ist zu ändern.\n"
 
 #: g10/keyedit.c:1151
 #, c-format
 msgid "key %s: error changing passphrase: %s\n"
-msgstr "Schlüssel %s: Fehler beim Ändern der Passphrase: %s\n"
+msgstr "Schlüssel %s: Fehler beim Ändern des Passwortes: %s\n"
 
 #: g10/keyedit.c:1265
 msgid "save and quit"
@@ -4421,8 +4431,7 @@ msgstr "Beglaubigungen der ausgewählten User-IDs entfernen"
 
 #: g10/keyedit.c:1313
 msgid "change the expiration date for the key or selected subkeys"
-msgstr ""
-"das Verfallsdatum des Schlüssel oder ausgewählter Unterschlüssels ändern"
+msgstr "Verfallsdatum des Schlüssel oder ausgewählter Unterschlüssels ändern"
 
 #: g10/keyedit.c:1315
 msgid "flag the selected user ID as primary"
@@ -4451,7 +4460,7 @@ msgstr "Eine Notation für die ausgewählten User-IDs setzen"
 
 #: g10/keyedit.c:1328
 msgid "change the passphrase"
-msgstr "Die Passphrase ändern"
+msgstr "Das Passwort ändern"
 
 #: g10/keyedit.c:1331
 msgid "change the ownertrust"
@@ -4693,7 +4702,7 @@ msgstr "Keine passende User-ID"
 msgid "Nothing to sign.\n"
 msgstr "Nichts zu beglaubigen\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6057
+#: g10/keyedit.c:2973 g10/keyedit.c:6065
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "Nicht von Ihnen signiert.\n"
@@ -4760,7 +4769,7 @@ msgstr "Dieser Schlüssel kann von %s-Schlüssel %s widerrufen werden"
 msgid "(sensitive)"
 msgstr "(empfindlich)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:525
+#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "erzeugt: %s"
@@ -4776,7 +4785,7 @@ msgid "expired: %s"
 msgstr "verfallen: %s"
 
 #: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2262
-#: g10/keyserver.c:531
+#: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "verfällt: %s"
@@ -4812,13 +4821,13 @@ 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:535
-#: g10/mainproc.c:2280 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
+#: g10/mainproc.c:2282 g10/tofu.c:1789 g10/trust.c:426 dirmngr/ocsp.c:792
 msgid "revoked"
 msgstr "widerrufen"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:539
-#: g10/mainproc.c:2282 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
+#: g10/mainproc.c:2284 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "verfallen"
 
@@ -4860,7 +4869,7 @@ msgstr "Wollen Sie ihn immer noch hinzufügen? (j/N) "
 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:3107
+#: g10/keyedit.c:4273 g10/keygen.c:3111
 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"
 
@@ -5011,7 +5020,7 @@ msgstr ""
 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:5357 g10/keyedit.c:5495
+#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "Ãœberspringen der v3 Eigenbeglaubigung von User-ID \"%s\"\n"
@@ -5020,128 +5029,128 @@ msgstr "Ãœberspringen der v3 Eigenbeglaubigung von User-ID \"%s\"\n"
 msgid "Enter your preferred keyserver URL: "
 msgstr "Geben Sie die URL Ihres bevorzugten Schlüsselservers ein: "
 
-#: g10/keyedit.c:5380
+#: g10/keyedit.c:5383
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Wollen Sie ihn wirklich ersetzen? (j/N) "
 
-#: g10/keyedit.c:5381
+#: g10/keyedit.c:5384
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Wollen Sie ihn wirklich löschen? (j/N) "
 
-#: g10/keyedit.c:5441
+#: g10/keyedit.c:5449
 msgid "Enter the notation: "
 msgstr "Geben Sie die \"Notation\" ein: "
 
-#: g10/keyedit.c:5588
+#: g10/keyedit.c:5596
 msgid "Proceed? (y/N) "
 msgstr "Fortfahren (j/N)? "
 
-#: g10/keyedit.c:5658
+#: g10/keyedit.c:5666
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Keine User-ID mit Index %d\n"
 
-#: g10/keyedit.c:5720
+#: g10/keyedit.c:5728
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Keine User-ID mit Hash %s\n"
 
-#: g10/keyedit.c:5821
+#: g10/keyedit.c:5829
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Kein Unterschlüssel mit Schlüssel-ID '%s'.\n"
 
-#: g10/keyedit.c:5843
+#: g10/keyedit.c:5851
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Kein Unterschlüssel mit Index %d\n"
 
-#: g10/keyedit.c:5984
+#: g10/keyedit.c:5992
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "User-ID: \"%s\"\n"
 
-#: g10/keyedit.c:5987 g10/keyedit.c:6089 g10/keyedit.c:6137
+#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
 #, 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:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
+#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
 msgid " (non-exportable)"
 msgstr " (nicht-exportierbar)"
 
-#: g10/keyedit.c:5993
+#: g10/keyedit.c:6001
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Diese Signatur ist seit %s verfallen.\n"
 
-#: g10/keyedit.c:5998
+#: g10/keyedit.c:6006
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Wollen Sie ihn immer noch widerrufen? (j/N) "
 
-#: g10/keyedit.c:6003
+#: g10/keyedit.c:6011
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Ein Widerrufszertifikat für diese Signatur erzeugen (j/N)"
 
-#: g10/keyedit.c:6063
+#: g10/keyedit.c:6071
 #, 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:6092
+#: g10/keyedit.c:6100
 msgid " (non-revocable)"
 msgstr " (unwiderrufbar)"
 
-#: g10/keyedit.c:6099
+#: g10/keyedit.c:6107
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "widerrufen durch Ihren Schlüssel %s um %s\n"
 
-#: g10/keyedit.c:6124
+#: g10/keyedit.c:6132
 msgid "You are about to revoke these signatures:\n"
 msgstr "Es werden nun folgende Beglaubigungen entfernt:\n"
 
-#: g10/keyedit.c:6147
+#: g10/keyedit.c:6155
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Wirklich ein Signatur-Widerrufszertifikat erzeugen? (j/N) "
 
-#: g10/keyedit.c:6180
+#: g10/keyedit.c:6188
 #, c-format
 msgid "no secret key\n"
 msgstr "Kein geheimer Schlüssel\n"
 
-#: g10/keyedit.c:6228
+#: g10/keyedit.c:6236
 #, 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:6238
+#: g10/keyedit.c:6246
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User-ID \"%s\" ist bereits widerrufen\n"
 
-#: g10/keyedit.c:6255
+#: g10/keyedit.c:6263
 #, 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:6351
+#: g10/keyedit.c:6359
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Die letzte User-ID kann nicht widerrufen werden!\n"
 
-#: g10/keyedit.c:6389
+#: g10/keyedit.c:6397
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Schlüssel %s ist bereits widerrufen\n"
 
-#: g10/keyedit.c:6451
+#: g10/keyedit.c:6459
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Unterschlüssel %s ist bereits widerrufen\n"
 
-#: g10/keyedit.c:6548
+#: g10/keyedit.c:6556
 #, 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"
@@ -5151,63 +5160,63 @@ msgstr "Anzeigen einer %s Foto-ID (Größe %ld) für Schlüssel %s (User-ID %d)\
 msgid "invalid value for option '%s'\n"
 msgstr "Ungültiges Argument für Option '%s'\n"
 
-#: g10/keygen.c:338
+#: g10/keygen.c:339
 #, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "Voreinstellung `%s' ist doppelt\n"
 
-#: g10/keygen.c:345
+#: g10/keygen.c:346
 #, c-format
 msgid "too many cipher preferences\n"
 msgstr "zu viele Verschlüsselungeinstellungen\n"
 
-#: g10/keygen.c:347
+#: g10/keygen.c:348
 #, c-format
 msgid "too many digest preferences\n"
 msgstr "zu viele Hashvoreinstellungen\n"
 
-#: g10/keygen.c:349
+#: g10/keygen.c:350
 #, c-format
 msgid "too many compression preferences\n"
 msgstr "zu viele Komprimierungsvoreinstellungen\n"
 
-#: g10/keygen.c:351
+#: g10/keygen.c:352
 #, c-format
 msgid "too many AEAD preferences\n"
 msgstr "zu viele AEAD-Einstellungen\n"
 
-#: g10/keygen.c:521
+#: g10/keygen.c:522
 #, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "Ungültiges Feld `%s' in der Voreinstellungszeichenkette\n"
 
-#: g10/keygen.c:1130
+#: g10/keygen.c:1131
 #, c-format
 msgid "writing direct signature\n"
 msgstr "Die \"Direct Key Signature\" wird geschrieben\n"
 
-#: g10/keygen.c:1176
+#: g10/keygen.c:1177
 #, c-format
 msgid "writing self signature\n"
 msgstr "Die Eigenbeglaubigung wird geschrieben\n"
 
-#: g10/keygen.c:1233
+#: g10/keygen.c:1234
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "Schreiben der \"key-binding\" Signatur\n"
 
-#: g10/keygen.c:1598 g10/keygen.c:1603 g10/keygen.c:1655 g10/keygen.c:1660
-#: g10/keygen.c:1832 g10/keygen.c:1837
+#: g10/keygen.c:1599 g10/keygen.c:1604 g10/keygen.c:1656 g10/keygen.c:1661
+#: g10/keygen.c:1833 g10/keygen.c:1838
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Ungültige Schlüssellänge; %u Bit werden verwendet\n"
 
-#: g10/keygen.c:1609 g10/keygen.c:1666 g10/keygen.c:1674 g10/keygen.c:1843
+#: g10/keygen.c:1610 g10/keygen.c:1667 g10/keygen.c:1675 g10/keygen.c:1844
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "Schlüssellänge auf %u Bit aufgerundet\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1701
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
@@ -5215,19 +5224,19 @@ msgstr ""
 "WARNUNG: Einige OpenPGP-Programme können einen DSA-Schlüssel dieser "
 "Digestlänge nicht verwenden\n"
 
-#: g10/keygen.c:1899
+#: g10/keygen.c:1900
 msgid "Sign"
 msgstr "Signieren"
 
-#: g10/keygen.c:1902
+#: g10/keygen.c:1903
 msgid "Certify"
 msgstr "Zertif."
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1906
 msgid "Encrypt"
 msgstr "Verschl."
 
-#: g10/keygen.c:1908
+#: g10/keygen.c:1909
 msgid "Authenticate"
 msgstr "Authentisierung"
 
@@ -5241,166 +5250,166 @@ msgstr "Authentisierung"
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1929
+#: g10/keygen.c:1930
 msgid "SsEeAaQq"
 msgstr "SsVvAaQq"
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1967
 #, c-format
 msgid "Possible actions for this %s key: "
 msgstr "Mögliche Aktionen für diesen %s Schlüssel: "
 
-#: g10/keygen.c:1973
+#: g10/keygen.c:1974
 msgid "Current allowed actions: "
 msgstr "Derzeit erlaubte Vorgänge: "
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1979
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Umschalten der Signaturnutzbarkeit\n"
 
-#: g10/keygen.c:1981
+#: g10/keygen.c:1982
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Umschalten der Verschlüsselungsnutzbarkeit\n"
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1985
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Umschalten der Authentisierungsnutzbarkeit\n"
 
-#: g10/keygen.c:1987
+#: g10/keygen.c:1988
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Beenden\n"
 
-#: g10/keygen.c:2116
+#: g10/keygen.c:2117
 #, c-format
 msgid "   (%d) RSA and RSA%s\n"
 msgstr "   (%d) RSA und RSA%s\n"
 
-#: g10/keygen.c:2120
+#: g10/keygen.c:2121
 #, c-format
 msgid "   (%d) DSA and Elgamal%s\n"
 msgstr "   (%d) DSA und Elgamal%s\n"
 
-#: g10/keygen.c:2123
+#: g10/keygen.c:2124
 #, c-format
 msgid "   (%d) DSA (sign only)%s\n"
 msgstr "   (%d) DSA (nur signieren)%s\n"
 
-#: g10/keygen.c:2125
+#: g10/keygen.c:2126
 #, c-format
 msgid "   (%d) RSA (sign only)%s\n"
 msgstr "   (%d) RSA (nur signieren)%s\n"
 
-#: g10/keygen.c:2131
+#: g10/keygen.c:2132
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)%s\n"
 msgstr "   (%d) Elgamal (nur verschlüsseln)%s\n"
 
-#: g10/keygen.c:2133
+#: g10/keygen.c:2134
 #, c-format
 msgid "   (%d) RSA (encrypt only)%s\n"
 msgstr "   (%d) RSA (nur verschlüsseln)%s\n"
 
-#: g10/keygen.c:2139
+#: g10/keygen.c:2140
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)%s\n"
 msgstr "   (%d) DSA (Nutzung selber einstellbar)%s\n"
 
-#: g10/keygen.c:2141
+#: g10/keygen.c:2142
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (Nutzung selber einstellbar)%s\n"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2148
 #, c-format
 msgid "   (%d) ECC (sign and encrypt)%s\n"
 msgstr "   (%d) ECC (signieren, verschlüsseln)%s\n"
 
-#: g10/keygen.c:2147 g10/keygen.c:2678
+#: g10/keygen.c:2148 g10/keygen.c:2679
 msgid " *default*"
 msgstr " *standard*"
 
-#: g10/keygen.c:2148
+#: g10/keygen.c:2149
 #, c-format
 msgid "  (%d) ECC (sign only)\n"
 msgstr "  (%d) ECC (nur signieren)\n"
 
-#: g10/keygen.c:2150
+#: g10/keygen.c:2151
 #, c-format
 msgid "  (%d) ECC (set your own capabilities)%s\n"
 msgstr "  (%d) ECC (Nutzung selber einstellbar)%s\n"
 
-#: g10/keygen.c:2152
+#: g10/keygen.c:2153
 #, c-format
 msgid "  (%d) ECC (encrypt only)%s\n"
 msgstr "  (%d) ECC (nur verschlüsseln)%s\n"
 
-#: g10/keygen.c:2156
+#: g10/keygen.c:2157
 #, c-format
 msgid "  (%d) Existing key%s\n"
 msgstr "   (%d) Vorhandener Schlüssel%s\n"
 
-#: g10/keygen.c:2158
+#: g10/keygen.c:2159
 #, c-format
 msgid "  (%d) Existing key from card%s\n"
 msgstr "   (%d) Vorhandener Schlüssel auf der Karte%s\n"
 
-#: g10/keygen.c:2254 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2255 sm/certreqgen-ui.c:203
 msgid "Enter the keygrip: "
 msgstr "Geben Sie den \"Keygrip\" ein: "
 
-#: g10/keygen.c:2267 sm/certreqgen-ui.c:211 tools/gpg-card.c:2280
+#: g10/keygen.c:2268 sm/certreqgen-ui.c:211 tools/gpg-card.c:2297
 #, c-format
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr "Kein gültiger \"Keygrip\" (40 Hex-Ziffern werden erwartet)\n"
 
-#: g10/keygen.c:2269 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2270 sm/certreqgen-ui.c:213
 msgid "No key with this keygrip\n"
 msgstr "Kein Schlüssel mit diesem \"Keygrip\"\n"
 
-#: g10/keygen.c:2288 g10/keygen.c:2298 g10/keygen.c:3440 g10/keygen.c:3451
+#: g10/keygen.c:2289 g10/keygen.c:2299 g10/keygen.c:3444 g10/keygen.c:3455
 #: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
 #, c-format
 msgid "error reading the card: %s\n"
 msgstr "Fehler beim Lesen von der Karte: %s\n"
 
-#: g10/keygen.c:2292 g10/keygen.c:3444 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2293 g10/keygen.c:3448 sm/certreqgen-ui.c:234
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "Karten-Seriennummer: %s\n"
 
-#: g10/keygen.c:2311 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2312 sm/certreqgen-ui.c:246
 msgid "Available keys:\n"
 msgstr "Vorhandene Schlüssel:\n"
 
-#: g10/keygen.c:2504 g10/keygen.c:2518
+#: g10/keygen.c:2505 g10/keygen.c:2519
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr "gerundet auf %u Bit\n"
 
-#: g10/keygen.c:2559
+#: g10/keygen.c:2560
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s-Schlüssel können zwischen %u und %u Bit lang sein.\n"
 
-#: g10/keygen.c:2567
+#: g10/keygen.c:2568
 #, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Welche Schlüssellänge wünschen Sie für den Unterschlüssel? (%u) "
 
-#: g10/keygen.c:2584 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2585 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Die verlangte Schlüssellänge beträgt %u Bit\n"
 
-#: g10/keygen.c:2630
+#: g10/keygen.c:2631
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Bitte wählen Sie, welche elliptische Kurve Sie möchten:\n"
 
-#: g10/keygen.c:2819
+#: g10/keygen.c:2820
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5416,7 +5425,7 @@ msgstr ""
 "      <n>m = Schlüssel verfällt nach n Monaten\n"
 "      <n>y = Schlüssel verfällt nach n Jahren\n"
 
-#: g10/keygen.c:2830
+#: g10/keygen.c:2831
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5432,38 +5441,38 @@ msgstr ""
 "      <n>m = Schlüssel verfällt nach n Monaten\n"
 "      <n>y = Schlüssel verfällt nach n Jahren\n"
 
-#: g10/keygen.c:2853
+#: g10/keygen.c:2854
 msgid "Key is valid for? (0) "
 msgstr "Wie lange bleibt der Schlüssel gültig? (0) "
 
-#: g10/keygen.c:2858
+#: g10/keygen.c:2859
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Wie lange bleibt die Beglaubigung gültig? (%s) "
 
-#: g10/keygen.c:2871 g10/keygen.c:2896
+#: g10/keygen.c:2875 g10/keygen.c:2900
 msgid "invalid value\n"
 msgstr "Ungültiger Wert.\n"
 
-#: g10/keygen.c:2878
+#: g10/keygen.c:2882
 msgid "Key does not expire at all\n"
 msgstr "Schlüssel verfällt nie\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2883
 msgid "Signature does not expire at all\n"
 msgstr "Signature verfällt nie\n"
 
-#: g10/keygen.c:2884
+#: g10/keygen.c:2888
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Key verfällt am %s\n"
 
-#: g10/keygen.c:2885
+#: g10/keygen.c:2889
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Signatur verfällt am %s\n"
 
-#: g10/keygen.c:2889
+#: g10/keygen.c:2893
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5471,11 +5480,11 @@ msgstr ""
 "Ihr Rechner kann Daten jenseits des Jahres 2038 nicht anzeigen.\n"
 "Trotzdem werden Daten bis 2106 korrekt verarbeitet.\n"
 
-#: g10/keygen.c:2902
+#: g10/keygen.c:2906
 msgid "Is this correct? (y/N) "
 msgstr "Ist dies richtig? (j/N) "
 
-#: g10/keygen.c:2970
+#: g10/keygen.c:2974
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5489,7 +5498,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2985
+#: g10/keygen.c:2989
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5505,49 +5514,49 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:3004
+#: g10/keygen.c:3008
 msgid "Real name: "
 msgstr "Ihr Name (\"Vorname Nachname\"): "
 
-#: g10/keygen.c:3013
+#: g10/keygen.c:3017
 msgid "Invalid character in name\n"
 msgstr "Ungültiges Zeichen im Namen\n"
 
-#: g10/keygen.c:3014
+#: g10/keygen.c:3018
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr "Die Zeichen '%s' und '%s' dürfen in einem Namen nicht vorkommen\n"
 
-#: g10/keygen.c:3018
+#: g10/keygen.c:3022
 msgid "Name may not start with a digit\n"
 msgstr "Der Name darf nicht mit einer Ziffer beginnen.\n"
 
-#: g10/keygen.c:3021
+#: g10/keygen.c:3025
 msgid "Name must be at least 5 characters long\n"
 msgstr "Der Name muß min. 5 Zeichen lang sein.\n"
 
-#: g10/keygen.c:3031
+#: g10/keygen.c:3035
 msgid "Email address: "
 msgstr "Email-Adresse: "
 
-#: g10/keygen.c:3037
+#: g10/keygen.c:3041
 msgid "Not a valid email address\n"
 msgstr "Diese Email-Adresse ist ungültig\n"
 
-#: g10/keygen.c:3046
+#: g10/keygen.c:3050
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:3052
+#: g10/keygen.c:3056
 msgid "Invalid character in comment\n"
 msgstr "Ungültiges Zeichen im Kommentar.\n"
 
-#: g10/keygen.c:3088
+#: g10/keygen.c:3092
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr "Sie benutzen den Zeichensatz `%s'\n"
 
-#: g10/keygen.c:3094
+#: g10/keygen.c:3098
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5558,7 +5567,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3099
+#: g10/keygen.c:3103
 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"
 
@@ -5573,31 +5582,31 @@ msgstr "Bitte keine Emailadressen als Namen oder Kommentar verwenden\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3124
+#: g10/keygen.c:3128
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeFfAa"
 
-#: g10/keygen.c:3134
+#: g10/keygen.c:3138
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Ändern: (N)ame, (K)ommentar, (E)-Mail oder (A)bbrechen? "
 
-#: g10/keygen.c:3135
+#: g10/keygen.c:3139
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Ändern: (N)ame, (K)ommentar, (E)-Mail oder (F)ertig/(A)bbrechen? "
 
-#: g10/keygen.c:3140
+#: g10/keygen.c:3144
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Ändern: (N)ame, (E)-Mail oder (A)bbrechen? "
 
-#: g10/keygen.c:3141
+#: g10/keygen.c:3145
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "Ändern: (N)ame, (E)-Mail oder (F)ertig/(A)bbrechen? "
 
-#: g10/keygen.c:3160
+#: g10/keygen.c:3164
 msgid "Please correct the error first\n"
 msgstr "Bitte beseitigen Sie zuerst den Fehler\n"
 
-#: g10/keygen.c:3206
+#: g10/keygen.c:3210
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -5608,19 +5617,19 @@ msgstr ""
 "unterstützen, indem Sie z.B. in einem anderen Fenster/Konsole irgendetwas\n"
 "tippen, die Maus verwenden oder irgendwelche anderen Programme benutzen.\n"
 
-#: g10/keygen.c:3591
+#: g10/keygen.c:3595
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 "WARNUNG: Der angefragte v4 Schlüssel wurde durch einen v5 Schlüssel ersetzt\n"
 
-#: g10/keygen.c:4590 g10/keygen.c:4663 g10/keygen.c:4681 g10/keygen.c:4710
-#: g10/keygen.c:5086 g10/keygen.c:5632 g10/keygen.c:5943 g10/keygen.c:6050
+#: g10/keygen.c:4594 g10/keygen.c:4667 g10/keygen.c:4685 g10/keygen.c:4714
+#: g10/keygen.c:5113 g10/keygen.c:5663 g10/keygen.c:5974 g10/keygen.c:6081
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Schlüsselerzeugung fehlgeschlagen: %s\n"
 
-#: g10/keygen.c:4599
+#: g10/keygen.c:4603
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5631,64 +5640,64 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:4601
+#: g10/keygen.c:4605
 msgid "Continue? (Y/n) "
 msgstr "Fortsetzen? (J/n) "
 
-#: g10/keygen.c:4622
+#: g10/keygen.c:4626
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "Ein Schlüssel für \"%s\" existiert bereits\n"
 
-#: g10/keygen.c:4627
+#: g10/keygen.c:4631
 msgid "Create anyway? (y/N) "
 msgstr "Trotzdem erzeugen? (j/N) "
 
-#: g10/keygen.c:4633
+#: g10/keygen.c:4637
 #, c-format
 msgid "creating anyway\n"
 msgstr "wird trotzdem erzeugt\n"
 
-#: g10/keygen.c:5069
+#: g10/keygen.c:5096
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr "Hinweis: \"%s %s\" ruft den erweiterten Dialog auf.\n"
 
-#: g10/keygen.c:5118
+#: g10/keygen.c:5145
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Schlüsselerzeugung abgebrochen.\n"
 
-#: g10/keygen.c:5178
+#: g10/keygen.c:5205
 #, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "Sicherungsdatei '%s' kann nicht erzeugt werden: %s\n"
 
-#: g10/keygen.c:5198
+#: g10/keygen.c:5225
 #, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "Hinweis: Sicherung des Kartenschlüssels wurde auf `%s' gespeichert\n"
 
-#: g10/keygen.c:5359 g10/keygen.c:5561
+#: g10/keygen.c:5389 g10/keygen.c:5591
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr "schreiben des öffentlichen Schlüssels nach '%s'\n"
 
-#: g10/keygen.c:5555
+#: g10/keygen.c:5585
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kein schreibbarer öffentlicher Schlüsselbund gefunden: %s\n"
 
-#: g10/keygen.c:5569
+#: g10/keygen.c:5599
 #, c-format
 msgid "error writing public keyring '%s': %s\n"
 msgstr "Fehler beim Schreiben des öff. Schlüsselbundes `%s': %s\n"
 
-#: g10/keygen.c:5603
+#: g10/keygen.c:5634
 msgid "public and secret key created and signed.\n"
 msgstr "Öffentlichen und geheimen Schlüssel erzeugt und signiert.\n"
 
-#: g10/keygen.c:5619
+#: g10/keygen.c:5650
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -5697,7 +5706,7 @@ msgstr ""
 "werden kann.  Sie können aber mit dem Befehl \"--edit-key\" einen\n"
 "Unterschlüssel für diesem Zweck erzeugen.\n"
 
-#: g10/keygen.c:5801 g10/keygen.c:6000
+#: g10/keygen.c:5832 g10/keygen.c:6031
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5705,7 +5714,7 @@ msgstr ""
 "Der Schlüssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren "
 "stimmen nicht überein)\n"
 
-#: g10/keygen.c:5803 g10/keygen.c:6002
+#: g10/keygen.c:5834 g10/keygen.c:6033
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5713,22 +5722,22 @@ msgstr ""
 "Der Schlüssel wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
 "Uhren stimmen nicht überein)\n"
 
-#: g10/keygen.c:5814 g10/keygen.c:6013
+#: g10/keygen.c:5845 g10/keygen.c:6044
 #, c-format
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "Hinweis: Unterschlüssel für v3-Schlüssel sind nicht OpenPGP-konform\n"
 
-#: g10/keygen.c:5826 g10/keygen.c:5828
+#: g10/keygen.c:5857 g10/keygen.c:5859
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Geheime Teile des Hauptschlüssels sind nicht vorhanden.\n"
 
-#: g10/keygen.c:5835 g10/keygen.c:5837
+#: g10/keygen.c:5866 g10/keygen.c:5868
 #, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Geheime Teile des Hauptschlüssels sind auf der Karte gespeichert.\n"
 
-#: g10/keygen.c:5857 g10/keygen.c:6027
+#: g10/keygen.c:5888 g10/keygen.c:6058
 msgid "Really create? (y/N) "
 msgstr "Wirklich erzeugen? (j/N) "
 
@@ -5807,33 +5816,33 @@ msgstr "  Schl.-Fingerabdruck ="
 msgid "      Card serial no. ="
 msgstr "      Kartenseriennr. ="
 
-#: g10/keyring.c:1467
+#: g10/keyring.c:1477
 #, c-format
 msgid "caching keyring '%s'\n"
 msgstr "Puffern des Schlüsselbundes `%s'\n"
 
-#: g10/keyring.c:1541
+#: g10/keyring.c:1551
 #, c-format
 msgid "%lu keys cached so far (%lu signature)\n"
 msgid_plural "%lu keys cached so far (%lu signatures)\n"
 msgstr[0] "%lu Schlüssel bislang gepuffert (%lu Beglaubigung)\n"
 msgstr[1] "%lu Schlüssel bislang gepuffert (%lu Beglaubigungen)\n"
 
-#: g10/keyring.c:1557
+#: g10/keyring.c:1567
 #, c-format
 msgid "%lu key cached"
 msgid_plural "%lu keys cached"
 msgstr[0] "%lu Schlüssel gepuffert"
 msgstr[1] "%lu Schlüssel gepuffert"
 
-#: g10/keyring.c:1559
+#: g10/keyring.c:1569
 #, c-format
 msgid " (%lu signature)\n"
 msgid_plural " (%lu signatures)\n"
 msgstr[0] " (%lu Beglaubigung)\n"
 msgstr[1] " (%lu Beglaubigungen)\n"
 
-#: g10/keyring.c:1636
+#: g10/keyring.c:1646
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: Schlüsselbund erstellt\n"
@@ -5863,77 +5872,72 @@ msgid "honor the preferred keyserver URL set on the key"
 msgstr ""
 "Die im Schlüssel enthaltene bevorzugte URL für Schlüsselserver beachten"
 
-#: g10/keyserver.c:537
+#: g10/keyserver.c:360
 msgid "disabled"
 msgstr "abgeschaltet"
 
-#: g10/keyserver.c:740
+#: g10/keyserver.c:563
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Eingabe von Nummern, Nächste (N) oder Abbrechen (Q) > "
 
-#: g10/keyserver.c:846
+#: g10/keyserver.c:669
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "Ungültiges Schlüsselserverprotokoll (wir %d!=Handhabungsroutine %d)\n"
 
-#: g10/keyserver.c:986 g10/keyserver.c:1096
+#: g10/keyserver.c:809 g10/keyserver.c:919
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" ist keine Schlüssel-ID: überspringe\n"
 
-#: g10/keyserver.c:1420 g10/keyserver.c:1453
+#: g10/keyserver.c:1217 g10/keyserver.c:1250
 #, 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:1427
+#: g10/keyserver.c:1224
 #, 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:1531
+#: g10/keyserver.c:1316
 #, 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:1534
+#: g10/keyserver.c:1319
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "Schlüssel wurde auf dem Schlüsselserver nicht gefunden\n"
 
-#: g10/keyserver.c:1722
-#, c-format
-msgid "requesting key %s from %s server %s\n"
-msgstr "fordere Schlüssel %s von %s-Server %s an\n"
-
-#: g10/keyserver.c:1726
+#: g10/keyserver.c:1481
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "fordere Schlüssel %s von %s an\n"
 
-#: g10/keyserver.c:1841 g10/keyserver.c:2020
+#: g10/keyserver.c:1600 g10/keyserver.c:1793
 #, c-format
 msgid "no keyserver known\n"
 msgstr "Kein Schlüsselserver bekannt\n"
 
-#: g10/keyserver.c:1856 g10/skclist.c:213 g10/skclist.c:241
+#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "übersprungen \"%s\": %s\n"
 
-#: g10/keyserver.c:1860
+#: g10/keyserver.c:1619
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "sende Schlüssel %s auf %s\n"
 
-#: g10/keyserver.c:1901
+#: g10/keyserver.c:1662
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr "fordere Schlüssel von %s an\n"
 
-#: g10/keyserver.c:1917
+#: g10/keyserver.c:1680
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "WARNUNG: die URI %s kann nicht geholt werden: %s\n"
@@ -5956,70 +5960,70 @@ msgstr "Mit unbekanntem Verfahren verschlüsselt %d.%s\n"
 #: g10/mainproc.c:391
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
-msgstr "Passphrase wurde mit unbekanntem Hashverfahren %d erstellt\n"
+msgstr "Das Passwort wurde mit unbekanntem Hashverfahren %d erstellt\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:473
 #, c-format
 msgid "public key is %s\n"
 msgstr "Öffentlicher Schlüssel ist %s\n"
 
-#: g10/mainproc.c:524
+#: g10/mainproc.c:525
 #, 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:528 g10/pkclist.c:231
+#: g10/mainproc.c:529 g10/pkclist.c:231
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:532
+#: g10/mainproc.c:533
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "verschlüsselt mit %s Schlüssel, ID %s\n"
 
-#: g10/mainproc.c:552 g10/mainproc.c:935
+#: g10/mainproc.c:553 g10/mainproc.c:937
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "WARNUNG: Mehr als ein Klartext erkannt\n"
 
-#: g10/mainproc.c:560
+#: g10/mainproc.c:561
 #, c-format
 msgid "encrypted with %lu passphrases\n"
-msgstr "Verschlüsselt mit %lu Passphrases\n"
+msgstr "Verschlüsselt mit %lu Passwörtern\n"
 
-#: g10/mainproc.c:562
+#: g10/mainproc.c:563
 #, c-format
 msgid "encrypted with 1 passphrase\n"
-msgstr "Verschlüsselt mit einer Passphrase\n"
+msgstr "Verschlüsselt mit einem Passwort\n"
 
-#: g10/mainproc.c:577 g10/mainproc.c:602
+#: g10/mainproc.c:578 g10/mainproc.c:603
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "Entschlüsselung mit Public-Key-Verfahren fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:613
+#: g10/mainproc.c:614
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "Mit öffentlichem Schlüssel verschlüsselte Daten: Korrekte DEK\n"
 
-#: g10/mainproc.c:642 g10/mainproc.c:663
+#: g10/mainproc.c:643 g10/mainproc.c:664
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "vermutlich %s-verschlüsselte Daten\n"
 
-#: g10/mainproc.c:649
+#: g10/mainproc.c:650
 #, 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:742 g10/mainproc.c:780
+#: g10/mainproc.c:744 g10/mainproc.c:782
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr ""
 "WARNUNG: Botschaft wurde nicht integritätsgeschützt (integrity protected)\n"
 
-#: g10/mainproc.c:753
+#: g10/mainproc.c:755
 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"
@@ -6029,184 +6033,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:756
+#: g10/mainproc.c:758
 #, 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:761
+#: g10/mainproc.c:763
 #, c-format
 msgid "decryption forced to fail!\n"
 msgstr "Entschlüsselungs-Fehler erzwungen!\n"
 
-#: g10/mainproc.c:773
+#: g10/mainproc.c:775
 #, c-format
 msgid "decryption okay\n"
 msgstr "Entschlüsselung erfolgreich\n"
 
-#: g10/mainproc.c:786
+#: g10/mainproc.c:788
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "WARNUNG: Verschlüsselte Botschaft ist manipuliert worden!\n"
 
-#: g10/mainproc.c:804
+#: g10/mainproc.c:806
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "Entschlüsselung fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:851
+#: g10/mainproc.c:853
 #, 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:858
+#: g10/mainproc.c:860
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "Ursprünglicher Dateiname='%.*s'\n"
 
-#: g10/mainproc.c:1135
+#: g10/mainproc.c:1137
 #, 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:1440 g10/mainproc.c:1483
+#: g10/mainproc.c:1442 g10/mainproc.c:1485
 #, c-format
 msgid "no signature found\n"
 msgstr "Keine Signatur gefunden\n"
 
-#: g10/mainproc.c:1763
+#: g10/mainproc.c:1765
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "FALSCHE Signatur von \"%s\""
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1767
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Verfallene Signatur von \"%s\""
 
-#: g10/mainproc.c:1767
+#: g10/mainproc.c:1769
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Korrekte Signatur von \"%s\""
 
-#: g10/mainproc.c:1789
+#: g10/mainproc.c:1791
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "Signaturüberprüfung unterdrückt\n"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1905
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "diese mehrdeutige Signaturdaten können nicht bearbeitet werden\n"
 
-#: g10/mainproc.c:1919 g10/mainproc.c:1926
+#: g10/mainproc.c:1921 g10/mainproc.c:1928
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Signatur vom %s\n"
 
-#: g10/mainproc.c:1920 g10/mainproc.c:1927 sm/verify.c:480
+#: g10/mainproc.c:1922 g10/mainproc.c:1929 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:1931
+#: g10/mainproc.c:1933
 #, 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:1937
+#: g10/mainproc.c:1939
 #, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "               Aussteller \"%s\"\n"
 
-#: g10/mainproc.c:1992
+#: g10/mainproc.c:1994
 #, c-format
 msgid "Key available at: "
 msgstr "Schlüssel erhältlich bei: "
 
-#: g10/mainproc.c:2034
+#: g10/mainproc.c:2036
 #, 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:2234
+#: g10/mainproc.c:2236
 msgid "[uncertain]"
 msgstr "[ungewiß]  "
 
-#: g10/mainproc.c:2272
+#: g10/mainproc.c:2274
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                    alias \"%s\""
 
-#: g10/mainproc.c:2347
+#: g10/mainproc.c:2349
 #, 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:2363
+#: g10/mainproc.c:2365
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Diese Signatur ist seit %s verfallen.\n"
 
-#: g10/mainproc.c:2368
+#: g10/mainproc.c:2370
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Diese Signatur verfällt am %s.\n"
 
-#: g10/mainproc.c:2379
+#: g10/mainproc.c:2381
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s Signatur, Hashmethode %s%s%s\n"
 
-#: g10/mainproc.c:2380
+#: g10/mainproc.c:2382
 msgid "binary"
 msgstr "Binäre"
 
-#: g10/mainproc.c:2381
+#: g10/mainproc.c:2383
 msgid "textmode"
 msgstr "Textmodus"
 
-#: g10/mainproc.c:2381 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2383 g10/trust.c:112 dirmngr/ocsp.c:793
 msgid "unknown"
 msgstr "unbekannt"
 
-#: g10/mainproc.c:2383
+#: g10/mainproc.c:2385
 msgid ", key algorithm "
 msgstr ", Schlüsselverfahren "
 
-#: g10/mainproc.c:2418
+#: g10/mainproc.c:2420
 #, 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:2457
+#: g10/mainproc.c:2459
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Signatur kann nicht geprüft werden: %s\n"
 
-#: g10/mainproc.c:2553 g10/mainproc.c:2572 g10/mainproc.c:2696
+#: g10/mainproc.c:2555 g10/mainproc.c:2574 g10/mainproc.c:2698
 #, c-format
 msgid "not a detached signature\n"
 msgstr "keine abgetrennte Signatur\n"
 
-#: g10/mainproc.c:2606
+#: g10/mainproc.c:2608
 #, 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:2615
+#: g10/mainproc.c:2617
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "Einzelne Signatur der Klasse 0x%02x\n"
 
-#: g10/mainproc.c:2700
+#: g10/mainproc.c:2702
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Signatur nach alter (PGP 2.x) Art\n"
@@ -6396,57 +6400,58 @@ msgstr "Unbekannte Entscheidende Beglaubigungs-\"Notation\": "
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "Im Unterpaket des Typs %d ist das \"critical bit\" gesetzt\n"
 
-#: g10/passphrase.c:208
+#: g10/passphrase.c:201 sm/decrypt.c:669
+msgid "Please enter the passphrase for decryption."
+msgstr "Bitte geben Sie das Passwort zur Entschlüsselung ein:"
+
+#: g10/passphrase.c:203
 msgid "Enter passphrase\n"
-msgstr "Geben Sie die Passphrase ein\n"
+msgstr "Geben Sie das Passwort ein\n"
 
-#: g10/passphrase.c:219
+#: g10/passphrase.c:227
 #, c-format
 msgid "cancelled by user\n"
 msgstr "Abbruch durch Benutzer\n"
 
-#: g10/passphrase.c:460
+#: g10/passphrase.c:472
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (Hauptschlüssel-ID %s)"
 
-#: g10/passphrase.c:467
+#: g10/passphrase.c:479
 msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 msgstr ""
-"Sie benötigen eine Passphrase, um den geheimen OpenPGP Schlüssel zu "
-"entsperren:"
+"Sie benötigen ein Passwort, um den geheimen OpenPGP Schlüssel zu entsperren:"
 
-#: g10/passphrase.c:471
+#: g10/passphrase.c:483
 msgid "Please enter the passphrase to import the OpenPGP secret key:"
 msgstr ""
-"Sie benötigen eine Passphrase, um den geheimen OpenPGP Schlüssel zu "
-"importieren:"
+"Sie benötigen ein Passwort, um den geheimen OpenPGP Schlüssel zu importieren:"
 
-#: g10/passphrase.c:476
+#: g10/passphrase.c:488
 msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 msgstr ""
-"Sie benötigen eine Passphrase, um den geheimen OpenPGP Unterschlüssel zu "
+"Sie benötigen ein Passwort, um den geheimen OpenPGP Unterschlüssel zu "
 "exportieren:"
 
-#: g10/passphrase.c:479
+#: g10/passphrase.c:491
 msgid "Please enter the passphrase to export the OpenPGP secret key:"
 msgstr ""
-"Sie benötigen eine Passphrase, um den geheimen OpenPGP Schlüssel zu "
-"exportieren:"
+"Sie benötigen ein Passwort, um den geheimen OpenPGP Schlüssel zu exportieren:"
 
-#: g10/passphrase.c:484
+#: g10/passphrase.c:496
 msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 msgstr ""
 "Möchten Sie den ausgewählten geheimen OpenPGP Unterschlüssel wirklich "
 "dauerhaft entfernen? (j/N) "
 
-#: g10/passphrase.c:487
+#: g10/passphrase.c:499
 msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgstr ""
 "Möchten Sie den ausgewählten geheimen OpenPGP Schlüssel wirklich dauerhaft "
 "entfernen? (j/N) "
 
-#: g10/passphrase.c:496
+#: g10/passphrase.c:508
 #, c-format
 msgid ""
 "%s\n"
@@ -6619,7 +6624,7 @@ msgid ""
 "\n"
 msgstr "Die minimale Trust-Ebene für diesen Schlüssel beträgt: %s\n"
 
-#: g10/pkclist.c:313 g10/revoke.c:803
+#: g10/pkclist.c:313 g10/revoke.c:804
 msgid "Your decision? "
 msgstr "Ihre Auswahl? "
 
@@ -6924,7 +6929,7 @@ msgstr "kann signierte Datei '%s' nicht öffnen.\n"
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "kann signierte Daten auf fd=%d nicht öffnen: %s\n"
 
-#: g10/pubkey-enc.c:99 sm/decrypt.c:879
+#: g10/pubkey-enc.c:99 sm/decrypt.c:1329
 #, c-format
 msgid "key %s is not suitable for decryption in %s mode\n"
 msgstr "Schlüssel \"%s\" ist zum Entschlüsseln im %s Modus nicht geeignet.\n"
@@ -6972,7 +6977,7 @@ msgid "Note: key has been revoked"
 msgstr "Hinweis: Schlüssel wurde widerrufen"
 
 #: g10/revoke.c:100 g10/revoke.c:126 g10/revoke.c:172 g10/revoke.c:184
-#: g10/revoke.c:502
+#: g10/revoke.c:503
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "\"build_packet\" fehlgeschlagen: %s\n"
@@ -6999,11 +7004,11 @@ msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr ""
 "Ein vorgesehenes Widerrufszertifikat für diesen Schlüssel erzeugen? (j/N) "
 
-#: g10/revoke.c:334 g10/revoke.c:744
+#: g10/revoke.c:334 g10/revoke.c:745
 msgid "ASCII armored output forced.\n"
 msgstr "Ausgabe mit ASCII Hülle erzwungen\n"
 
-#: g10/revoke.c:350 g10/revoke.c:481
+#: g10/revoke.c:350 g10/revoke.c:482
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "\"make_keysig_packet\" fehlgeschlagen: %s\n"
@@ -7017,11 +7022,11 @@ msgstr "Widerrufzertifikat erzeugt.\n"
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "keine Widerrufsschlüssel für \"%s\" gefunden\n"
 
-#: g10/revoke.c:567
+#: g10/revoke.c:568
 msgid "This is a revocation certificate for the OpenPGP key:"
 msgstr "Dies ist ein Widerrufszertifikat für den OpenPGP Schlüssel:"
 
-#: g10/revoke.c:583
+#: g10/revoke.c:584
 msgid ""
 "A revocation certificate is a kind of \"kill switch\" to publicly\n"
 "declare that a key shall not anymore be used.  It is not possible\n"
@@ -7032,7 +7037,7 @@ msgstr ""
 "nicht möglich, ein einmal veröffentlichtes Widerrufszertifikat wieder\n"
 "zurückzuziehen."
 
-#: g10/revoke.c:586
+#: g10/revoke.c:587
 msgid ""
 "Use it to revoke this key in case of a compromise or loss of\n"
 "the secret key.  However, if the secret key is still accessible,\n"
@@ -7047,7 +7052,7 @@ msgstr ""
 "mit angeben zu können.  Weitere Informationen finden Sie im GnuPG\n"
 "Handbuch unter der Beschreibung des gpg Kommandos \"--generate-revocation\"."
 
-#: g10/revoke.c:592
+#: g10/revoke.c:593
 msgid ""
 "To avoid an accidental use of this file, a colon has been inserted\n"
 "before the 5 dashes below.  Remove this colon with a text editor\n"
@@ -7058,12 +7063,12 @@ msgstr ""
 "unten eingefügt.  Vor dem Import dieses Widerrufszertifikats\n"
 "entfernen Sie bitte diesen Doppelpunkt mittels eines Texteditors."
 
-#: g10/revoke.c:611
+#: g10/revoke.c:612
 #, c-format
 msgid "revocation certificate stored as '%s.rev'\n"
 msgstr "Widerrufzertifikat wurde als '%s.rev' gespeichert.\n"
 
-#: g10/revoke.c:655
+#: g10/revoke.c:656
 #, c-format
 msgid "secret key \"%s\" not found\n"
 msgstr "Geheimer Schlüssel \"%s\" nicht gefunden\n"
@@ -7071,22 +7076,22 @@ msgstr "Geheimer Schlüssel \"%s\" nicht gefunden\n"
 #. TRANSLATORS: The %s prints a key specification which
 #. for example has been given at the command line.  Several lines
 #. lines with secret key infos are printed after this message.
-#: g10/revoke.c:680
+#: g10/revoke.c:681
 #, c-format
 msgid "'%s' matches multiple secret keys:\n"
 msgstr "'%s' trifft auf mehrere geheime Schlüssel zu:\n"
 
-#: g10/revoke.c:705
+#: g10/revoke.c:706
 #, c-format
 msgid "error searching the keyring: %s\n"
 msgstr "Fehler beim Suchen im Schlüsselbund: %s\n"
 
-#: g10/revoke.c:728
+#: g10/revoke.c:729
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Ein Widerrufszertifikat für diesen Schlüssel erzeugen? (j/N) "
 
 # translated by wk
-#: g10/revoke.c:752
+#: g10/revoke.c:753
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -7106,34 +7111,34 @@ msgstr ""
 "Drucksystem kann unter Umständen eine Kopie anderen Nutzern zugänglich\n"
 "machen.\n"
 
-#: g10/revoke.c:786
+#: g10/revoke.c:787
 msgid "Please select the reason for the revocation:\n"
 msgstr "Grund für den Widerruf:\n"
 
-#: g10/revoke.c:796
+#: g10/revoke.c:797
 msgid "Cancel"
 msgstr "Abbruch"
 
-#: g10/revoke.c:798
+#: g10/revoke.c:799
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Wahrscheinlich möchten Sie hier %d auswählen)\n"
 
-#: g10/revoke.c:839
+#: g10/revoke.c:843
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 "Geben Sie eine optionale Beschreibung ein. Beenden mit einer leeren Zeile:\n"
 
-#: g10/revoke.c:867
+#: g10/revoke.c:871
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Grund für Widerruf: %s\n"
 
-#: g10/revoke.c:869
+#: g10/revoke.c:873
 msgid "(No description given)\n"
 msgstr "(Keine Beschreibung angegeben)\n"
 
-#: g10/revoke.c:874
+#: g10/revoke.c:878
 msgid "Is this okay? (y/N) "
 msgstr "Ist das OK? (j/N) "
 
@@ -7314,24 +7319,24 @@ msgstr "signiere:"
 msgid "%s.%s encryption will be used\n"
 msgstr "%s.%s Verschlüsselung wird verwendet\n"
 
-#: g10/skclist.c:172 g10/skclist.c:253
+#: g10/skclist.c:173 g10/skclist.c:254
 #, c-format
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "Schlüssel ist nicht als unsicher gekennzeichnet - er ist nur mit einem\n"
 "echten Zufallsgenerator verwendbar\n"
 
-#: g10/skclist.c:204
+#: g10/skclist.c:205
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "übersprungen \"%s\": doppelt\n"
 
-#: g10/skclist.c:223
+#: g10/skclist.c:224
 #, c-format
 msgid "skipped: secret key already present\n"
 msgstr "übersprungen: geheimer Schlüssel bereits vorhanden\n"
 
-#: g10/skclist.c:242
+#: g10/skclist.c:243
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "Dies ist ein durch PGP erzeugter Elgamal-Schlüssel. Das ist für Signaturen "
@@ -7554,10 +7559,10 @@ msgstr "Nicht unterstützte TOFU Datenbank Version: %s\n"
 msgid "TOFU DB error"
 msgstr "TOFU (Trust on First Use) database error"
 
-#: g10/tofu.c:687 g10/tofu.c:2073 g10/tofu.c:2354 g10/tofu.c:2373
-#: g10/tofu.c:2386 g10/tofu.c:2398 g10/tofu.c:2413 g10/tofu.c:2425
-#: g10/tofu.c:3021 g10/tofu.c:3038 g10/tofu.c:3075 g10/tofu.c:3092
-#: g10/tofu.c:3404
+#: g10/tofu.c:687 g10/tofu.c:2077 g10/tofu.c:2358 g10/tofu.c:2377
+#: g10/tofu.c:2390 g10/tofu.c:2402 g10/tofu.c:2417 g10/tofu.c:2429
+#: g10/tofu.c:3025 g10/tofu.c:3042 g10/tofu.c:3079 g10/tofu.c:3096
+#: g10/tofu.c:3408
 #, c-format
 msgid "error reading TOFU database: %s\n"
 msgstr "Fehler beim Lesen der TOFU Datenbank: %s\n"
@@ -7577,7 +7582,7 @@ msgstr "Fehler beim Initialisieren der TOFU Datenbank: %s\n"
 msgid "error opening TOFU database '%s': %s\n"
 msgstr "Fehler beim Öffner der TOFU Datenbank '%s': %s\n"
 
-#: g10/tofu.c:1148 g10/tofu.c:3458 g10/tofu.c:3604
+#: g10/tofu.c:1148 g10/tofu.c:3462 g10/tofu.c:3608
 #, c-format
 msgid "error updating TOFU database: %s\n"
 msgstr "Fehler beim Schreiben der TOFU Datenbank: %s\n"
@@ -7618,61 +7623,61 @@ msgstr "Fehler beim Einsammeln der übrigen User-IDs: %s\n"
 msgid "This key's user IDs:\n"
 msgstr "Die User-IDs dieses Schlüssels sind:\n"
 
-#: g10/tofu.c:1634 g10/tofu.c:1799
+#: g10/tofu.c:1634 g10/tofu.c:1801
 #, c-format
 msgid "policy: %s"
 msgstr "Richtlinie: %s"
 
-#: g10/tofu.c:1725
+#: g10/tofu.c:1727
 #, c-format
 msgid "error gathering signature stats: %s\n"
 msgstr "Fehler beim Einsammeln der Signaturstatistik: %s\n"
 
-#: g10/tofu.c:1729
+#: g10/tofu.c:1731
 #, c-format
 msgid "The email address \"%s\" is associated with %d key:\n"
 msgid_plural "The email address \"%s\" is associated with %d keys:\n"
 msgstr[0] "Die Email-Adresse \"%s\" ist mit einem Schlüssel assoziert:\n"
 msgstr[1] "Die Email-Adresse \"%s\" ist mit %d Schlüsseln assoziert:\n"
 
-#: g10/tofu.c:1747
+#: g10/tofu.c:1749
 #, c-format
 msgid "Statistics for keys with the email address \"%s\":\n"
 msgstr "Statistik für Schlüssel mit der Email-Adresse \"%s\":\n"
 
-#: g10/tofu.c:1797
+#: g10/tofu.c:1799
 msgid "this key"
 msgstr "dieser Schlüssel"
 
-#: g10/tofu.c:1823
+#: g10/tofu.c:1825
 #, c-format
 msgid "Verified %d message."
 msgid_plural "Verified %d messages."
 msgstr[0] "%d überprüfte Botschaft."
 msgstr[1] "%d überprüfte Botschaften."
 
-#: g10/tofu.c:1827
+#: g10/tofu.c:1829
 #, c-format
 msgid "Encrypted %d message."
 msgid_plural "Encrypted %d messages."
 msgstr[0] "%d Botschaft wurde verschlüsselt."
 msgstr[1] "%d Botschaften wurden verschlüsselt."
 
-#: g10/tofu.c:1834
+#: g10/tofu.c:1836
 #, c-format
 msgid "Verified %d message in the future."
 msgid_plural "Verified %d messages in the future."
 msgstr[0] "%d Botschaft in der Zukunft signiert."
 msgstr[1] "%d Botschaften in der Zukunft signiert."
 
-#: g10/tofu.c:1838
+#: g10/tofu.c:1840
 #, c-format
 msgid "Encrypted %d message in the future."
 msgid_plural "Encrypted %d messages in the future."
 msgstr[0] "%d Botschaft in der Zukunft verschlüsselt."
 msgstr[1] "%d Botschaften in der Zukunft verschlüsselt."
 
-#: g10/tofu.c:1852
+#: g10/tofu.c:1854
 #, c-format
 msgid "Messages verified over the past %d day: %d."
 msgid_plural "Messages verified over the past %d days: %d."
@@ -7680,7 +7685,7 @@ msgstr[0] ""
 "Botschaften die innerhalb des letzten %d Tages überprüft wurden: %d."
 msgstr[1] "Botschaften die innerhalb der letzten %d Tage überprüft wurden: %d."
 
-#: g10/tofu.c:1858
+#: g10/tofu.c:1860
 #, c-format
 msgid "Messages encrypted over the past %d day: %d."
 msgid_plural "Messages encrypted over the past %d days: %d."
@@ -7689,7 +7694,7 @@ msgstr[0] ""
 msgstr[1] ""
 "Botschaften die innerhalb der letzten %d Tage verschlüsselt wurden: %d."
 
-#: g10/tofu.c:1868
+#: g10/tofu.c:1870
 #, c-format
 msgid "Messages verified over the past %d month: %d."
 msgid_plural "Messages verified over the past %d months: %d."
@@ -7698,7 +7703,7 @@ msgstr[0] ""
 msgstr[1] ""
 "Botschaften die innerhalb der letzten %d Monate überprüft wurden: %d."
 
-#: g10/tofu.c:1874
+#: g10/tofu.c:1876
 #, c-format
 msgid "Messages encrypted over the past %d month: %d."
 msgid_plural "Messages encrypted over the past %d months: %d."
@@ -7707,7 +7712,7 @@ msgstr[0] ""
 msgstr[1] ""
 "Botschaften die innerhalb der letzten %d Monate verschlüsselt wurden: %d."
 
-#: g10/tofu.c:1884
+#: g10/tofu.c:1886
 #, c-format
 msgid "Messages verified over the past %d year: %d."
 msgid_plural "Messages verified over the past %d years: %d."
@@ -7716,7 +7721,7 @@ msgstr[0] ""
 msgstr[1] ""
 "Botschaften die innerhalb der letzten %d Jahre überprüft wurden: %d."
 
-#: g10/tofu.c:1890
+#: g10/tofu.c:1892
 #, c-format
 msgid "Messages encrypted over the past %d year: %d."
 msgid_plural "Messages encrypted over the past %d years: %d."
@@ -7725,12 +7730,12 @@ msgstr[0] ""
 msgstr[1] ""
 "Botschaften die innerhalb der letzten %d Jahre verschlüsselt wurden: %d."
 
-#: g10/tofu.c:1898
+#: g10/tofu.c:1900
 #, c-format
 msgid "Messages verified in the past: %d."
 msgstr "Botschaften die in der Vergangenheit überprüft wurden: %d."
 
-#: g10/tofu.c:1902
+#: g10/tofu.c:1904
 #, c-format
 msgid "Messages encrypted in the past: %d."
 msgstr "Botschaften die in der Vergangenheit verschlüsselt wurden: %d."
@@ -7738,7 +7743,7 @@ msgstr "Botschaften die in der Vergangenheit verschlüsselt wurden: %d."
 #. TRANSLATORS: Please translate the text found in the source
 #. * file below.  We don't directly internationalize that text so
 #. * that we can tweak it without breaking translations.
-#: g10/tofu.c:1919
+#: g10/tofu.c:1921
 msgid "TOFU detected a binding conflict"
 msgstr ""
 "Normalerweise ist lediglich ein Schlüssel mit einer Email-Adresse "
@@ -7752,97 +7757,97 @@ msgstr ""
 #. TRANSLATORS: Two letters (normally the lower and upper case
 #. * version of the hotkey) for each of the five choices.  If
 #. * there is only one choice in your language, repeat it.
-#: g10/tofu.c:1961
+#: g10/tofu.c:1963
 msgid "gGaAuUrRbB"
 msgstr "gGaAuUlLfF"
 
-#: g10/tofu.c:1967
+#: g10/tofu.c:1969
 msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr "(G)ut, einmal (A)kzeptieren, (U)nbekannt, einmal ab(L)ehnen, (F)alsch?"
 
-#: g10/tofu.c:1975
+#: g10/tofu.c:1978
 msgid "Defaulting to unknown.\n"
 msgstr "Als Voreinstellung wird 'Unbekannt' verwendet.\n"
 
-#: g10/tofu.c:2093 g10/tofu.c:2228
+#: g10/tofu.c:2097 g10/tofu.c:2232
 #, c-format
 msgid "TOFU db corruption detected.\n"
 msgstr "TOFU Datenbank ist defekt.\n"
 
-#: g10/tofu.c:2829
+#: g10/tofu.c:2833
 #, c-format
 msgid "error changing TOFU policy: %s\n"
 msgstr "Fehler beim Ändern der TOFU Richtlinie: %s\n"
 
-#: g10/tofu.c:2880
+#: g10/tofu.c:2884
 #, c-format
 msgid "%lld~year"
 msgid_plural "%lld~years"
 msgstr[0] "%lld~Jahr"
 msgstr[1] "%lld~Jahre"
 
-#: g10/tofu.c:2885
+#: g10/tofu.c:2889
 #, c-format
 msgid "%lld~month"
 msgid_plural "%lld~months"
 msgstr[0] "%lld~Monat"
 msgstr[1] "%lld~Monate"
 
-#: g10/tofu.c:2890
+#: g10/tofu.c:2894
 #, c-format
 msgid "%lld~week"
 msgid_plural "%lld~weeks"
 msgstr[0] "%lld~Woche"
 msgstr[1] "%lld Wochen"
 
-#: g10/tofu.c:2895
+#: g10/tofu.c:2899
 #, c-format
 msgid "%lld~day"
 msgid_plural "%lld~days"
 msgstr[0] "%lld~Tag"
 msgstr[1] "%lld~Tage"
 
-#: g10/tofu.c:2900
+#: g10/tofu.c:2904
 #, c-format
 msgid "%lld~hour"
 msgid_plural "%lld~hours"
 msgstr[0] "%lld~Stunde"
 msgstr[1] "%lld~Stunden"
 
-#: g10/tofu.c:2905
+#: g10/tofu.c:2909
 #, c-format
 msgid "%lld~minute"
 msgid_plural "%lld~minutes"
 msgstr[0] "%lld~Minute"
 msgstr[1] "%lld~Minuten"
 
-#: g10/tofu.c:2907
+#: g10/tofu.c:2911
 #, c-format
 msgid "%lld~second"
 msgid_plural "%lld~seconds"
 msgstr[0] "%lld~Sekunde"
 msgstr[1] "%lld~Sekunden"
 
-#: g10/tofu.c:3145
+#: g10/tofu.c:3149
 #, c-format
 msgid "%s: Verified 0~signatures and encrypted 0~messages."
 msgstr "%s: 0~Signaturen und 0~Botschaften verschlüsselt."
 
-#: g10/tofu.c:3151
+#: g10/tofu.c:3155
 #, c-format
 msgid "%s: Verified 0 signatures."
 msgstr "%s: 0~Signaturen überprüft."
 
-#: g10/tofu.c:3165
+#: g10/tofu.c:3169
 msgid "Encrypted 0 messages."
 msgstr "0 Botschaften verschlüsselt."
 
-#: g10/tofu.c:3181
+#: g10/tofu.c:3185
 #, c-format
 msgid "(policy: %s)"
 msgstr "(Richtlinie: %s)"
 
-#: g10/tofu.c:3215
+#: g10/tofu.c:3219
 #, c-format
 msgid ""
 "Warning: we have yet to see a message signed using this key and user id!\n"
@@ -7850,7 +7855,7 @@ msgstr ""
 "WARNUNG: Wir müssen noch eine mit diesem Schlüssel und User-ID signierte "
 "Botschaft sehen.\n"
 
-#: g10/tofu.c:3218
+#: g10/tofu.c:3222
 #, c-format
 msgid ""
 "Warning: we've only seen one message signed using this key and user id!\n"
@@ -7858,21 +7863,21 @@ msgstr ""
 "WARNUNG: Wir haben nur eine einzige mit diesem Schlüssel signierte Botschaft "
 "gesehen.\n"
 
-#: g10/tofu.c:3222
+#: g10/tofu.c:3226
 #, c-format
 msgid "Warning: you have yet to encrypt a message to this key!\n"
 msgstr ""
 "WARNUNG: Sie müssen noch eine verschlüselte Botschaft an diesen Schlüssel "
 "senden!\n"
 
-#: g10/tofu.c:3225
+#: g10/tofu.c:3229
 #, c-format
 msgid "Warning: you have only encrypted one message to this key!\n"
 msgstr ""
 "WARNUNG: Sie haben nur eine verschlüsselte Botschaft an diesen Schlüssel "
 "erstellt!\n"
 
-#: g10/tofu.c:3254
+#: g10/tofu.c:3258
 #, c-format
 msgid ""
 "Warning: if you think you've seen more signatures by this key and user id, "
@@ -7903,13 +7908,13 @@ msgstr[1] ""
 "   %s\n"
 "um den Schlüssel als Fälschung zu markieren.\n"
 
-#: g10/tofu.c:3339 g10/tofu.c:3502 g10/tofu.c:3708 g10/tofu.c:3761
-#: g10/tofu.c:3902 g10/tofu.c:3979 g10/tofu.c:4017
+#: g10/tofu.c:3343 g10/tofu.c:3506 g10/tofu.c:3712 g10/tofu.c:3765
+#: g10/tofu.c:3906 g10/tofu.c:3983 g10/tofu.c:4021
 #, c-format
 msgid "error opening TOFU database: %s\n"
 msgstr "Fehler beim Öffnen der TOFU Datenbank: %s\n"
 
-#: g10/tofu.c:3535
+#: g10/tofu.c:3539
 #, c-format
 msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
 msgstr ""
@@ -7981,7 +7986,7 @@ msgstr "verwende Vertrauensmodell %s\n"
 msgid "no need for a trustdb check\n"
 msgstr "\"Trust-DB\"-Überprüfung nicht nötig\n"
 
-#: g10/trustdb.c:601 g10/trustdb.c:2272
+#: g10/trustdb.c:601 g10/trustdb.c:2273
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "nächste \"Trust-DB\"-Pflichtüberprüfung am %s\n"
@@ -8011,7 +8016,7 @@ msgstr "Bitte ein --check-trustdb durchführen\n"
 msgid "checking the trustdb\n"
 msgstr "\"Trust-DB\" wird überprüft\n"
 
-#: g10/trustdb.c:1993
+#: g10/trustdb.c:1994
 #, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
@@ -8019,24 +8024,24 @@ msgstr[0] "%d Schlüssel bislang bearbeitet"
 msgstr[1] "%d Schlüssel bislang bearbeitet"
 
 # translated by wk
-#: g10/trustdb.c:1996
+#: g10/trustdb.c:1997
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] " (%d Validity Zähler gelöscht)\n"
 msgstr[1] " (%d Validity Zähler gelöscht)\n"
 
-#: g10/trustdb.c:2066
+#: g10/trustdb.c:2067
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "keine ultimativ vertrauenswürdigen Schlüssel gefunden\n"
 
-#: g10/trustdb.c:2080
+#: g10/trustdb.c:2081
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "öff. Schlüssel des ultimativ vertrauten Schlüssel %s nicht gefunden\n"
 
-#: g10/trustdb.c:2198
+#: g10/trustdb.c:2199
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -8044,30 +8049,30 @@ msgstr ""
 "Tiefe: %d  gültig: %3d  signiert: %3d  Vertrauen: %d-, %dq, %dn, %dm, %df, "
 "%du\n"
 
-#: g10/trustdb.c:2279
+#: g10/trustdb.c:2280
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
 "\"Trust-DB\"-Versions-Satz kann nicht geändert werden: Schreiben "
 "fehlgeschlagen: %s\n"
 
-#: g10/trust.c:125
+#: g10/trust.c:114
 msgid "undefined"
 msgstr "unbestimmt"
 
-#: g10/trust.c:126
+#: g10/trust.c:115
 msgid "never"
 msgstr "niemals"
 
-#: g10/trust.c:127
+#: g10/trust.c:116
 msgid "marginal"
 msgstr "marginal"
 
-#: g10/trust.c:128
+#: g10/trust.c:117
 msgid "full"
 msgstr "vollständig"
 
-#: g10/trust.c:129
+#: g10/trust.c:118
 msgid "ultimate"
 msgstr "ultimativ"
 
@@ -8079,39 +8084,39 @@ msgstr "ultimativ"
 #. It gets passed to atoi() so everything after the number is
 #. essentially a comment and need not be translated.  Either key and
 #. uid are both NULL, or neither are NULL.
-#: g10/trust.c:166
+#: g10/trust.c:155
 msgid "10 translator see trust.c:uid_trust_string_fixed"
 msgstr "13"
 
-#: g10/trust.c:169
+#: g10/trust.c:158
 msgid "[ revoked]"
 msgstr "[ widerrufen]"
 
-#: g10/trust.c:171 g10/trust.c:177
+#: g10/trust.c:160 g10/trust.c:166
 msgid "[ expired]"
 msgstr "[ verfallen ]"
 
-#: g10/trust.c:176
+#: g10/trust.c:165
 msgid "[ unknown]"
 msgstr "[ unbekannt ]"
 
-#: g10/trust.c:178
+#: g10/trust.c:167
 msgid "[  undef ]"
 msgstr "[undefiniert]"
 
-#: g10/trust.c:179
+#: g10/trust.c:168
 msgid "[  never ]"
 msgstr "[  niemals  ]"
 
-#: g10/trust.c:180
+#: g10/trust.c:169
 msgid "[marginal]"
 msgstr "[  marginal ]"
 
-#: g10/trust.c:181
+#: g10/trust.c:170
 msgid "[  full  ]"
 msgstr "[vollständig]"
 
-#: g10/trust.c:182
+#: g10/trust.c:171
 msgid "[ultimate]"
 msgstr "[ ultimativ ]"
 
@@ -8169,16 +8174,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:4937 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2386
+#: scd/app-piv.c:1770 scd/app-p15.c:5035 scd/app-nks.c:1530
+#: scd/app-openpgp.c:2387
 #, 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:4956 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2402
+#: scd/app-piv.c:1787 scd/app-p15.c:5054 scd/app-nks.c:1549
+#: scd/app-openpgp.c:2403
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr "Verbliebene Versuche: %d"
@@ -8207,10 +8212,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:2669
-#: scd/app-openpgp.c:2693 scd/app-openpgp.c:2871 scd/app-openpgp.c:2893
-#: scd/app-openpgp.c:3074 scd/app-openpgp.c:3361 scd/app-openpgp.c:3408
-#: scd/app-openpgp.c:3545 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2670
+#: scd/app-openpgp.c:2694 scd/app-openpgp.c:2872 scd/app-openpgp.c:2894
+#: scd/app-openpgp.c:3075 scd/app-openpgp.c:3362 scd/app-openpgp.c:3409
+#: scd/app-openpgp.c:3547 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN-Callback meldete Fehler: %s\n"
@@ -8230,69 +8235,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:3616
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3618
 #, c-format
 msgid "key already exists\n"
 msgstr "Schlüssel existiert bereits\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3620
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3622
 #, 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:3622
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3624
 #, c-format
 msgid "generating new key\n"
 msgstr "neue Schlüssel werden erzeugt\n"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3624
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3626
 #, c-format
 msgid "writing new key\n"
 msgstr "der neue Schlüssel wird geschrieben\n"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4484 scd/app-openpgp.c:4767
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4486 scd/app-openpgp.c:4761
 #, 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:1615
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1616
 #, 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:1622
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1623
 #, 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:1732
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1733
 #, 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:4943
+#: scd/app-piv.c:3279 scd/app-openpgp.c:4937
 #, 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:4951
+#: scd/app-piv.c:3294 scd/app-openpgp.c:4945
 #, c-format
 msgid "generating key failed\n"
 msgstr "Schlüsselerzeugung fehlgeschlagen\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4957
+#: scd/app-piv.c:3300 scd/app-openpgp.c:4951
 #, 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:1842 scd/app-openpgp.c:4966
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1843 scd/app-openpgp.c:4960
 #, 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:5035 scd/app-nks.c:2038
+#: scd/app-p15.c:5133 scd/app-nks.c:2038
 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 "
@@ -8300,25 +8305,25 @@ 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:5038 scd/app-openpgp.c:2818
+#: scd/app-p15.c:5136 scd/app-openpgp.c:2819
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Bitte die Admin-PIN eingeben."
 
-#: scd/app-p15.c:5040 scd/app-nks.c:2028
+#: scd/app-p15.c:5138 scd/app-nks.c:2028
 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:5043 scd/app-nks.c:2019
+#: scd/app-p15.c:5141 scd/app-nks.c:2019
 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:4321
+#: scd/app-nks.c:1468 scd/app-openpgp.c:4323
 #, 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:4333
+#: scd/app-nks.c:1476 scd/app-openpgp.c:4335
 #, 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"
@@ -8364,27 +8369,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:3442 scd/app-dinsig.c:534
+#: scd/app-nks.c:2221 scd/app-openpgp.c:3443 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:943
+#: scd/app-openpgp.c:944
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "Der Fingerabdruck kann nicht gespeichert werden: %s\n"
 
-#: scd/app-openpgp.c:956
+#: scd/app-openpgp.c:957
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "Das Erzeugungsdatum konnte nicht gespeichert werden: %s\n"
 
-#: scd/app-openpgp.c:1427 scd/app-openpgp.c:3389 scd/app-openpgp.c:5715
+#: scd/app-openpgp.c:1428 scd/app-openpgp.c:3390 scd/app-openpgp.c:5709
 #, 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:1949
+#: scd/app-openpgp.c:1950
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "Lesen des öffentlichen Schlüssels fehlgeschlagen: %s\n"
@@ -8392,44 +8397,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:2373
+#: scd/app-openpgp.c:2374
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr "%sNummer: %s%%0ABesitzer: %s%%0AAnzahl: %lu%s"
 
-#: scd/app-openpgp.c:2621
+#: scd/app-openpgp.c:2622
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "Die Standard PIN wird für %s benutzt\n"
 
-#: scd/app-openpgp.c:2628
+#: scd/app-openpgp.c:2629
 #, 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:2641
+#: scd/app-openpgp.c:2642
 msgid "||Please unlock the card"
 msgstr "||Bitte entsperren Sie die Karte"
 
-#: scd/app-openpgp.c:2700 scd/app-openpgp.c:2900 scd/app-openpgp.c:3368
+#: scd/app-openpgp.c:2701 scd/app-openpgp.c:2901 scd/app-openpgp.c:3369
 #, 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:2717 scd/app-openpgp.c:2760 scd/app-openpgp.c:2917
-#: scd/app-openpgp.c:5325
+#: scd/app-openpgp.c:2718 scd/app-openpgp.c:2761 scd/app-openpgp.c:2918
+#: scd/app-openpgp.c:5319
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "Prüfung des CHV%d fehlgeschlagen: %s\n"
 
-#: scd/app-openpgp.c:2804 scd/app-openpgp.c:5724
+#: scd/app-openpgp.c:2805 scd/app-openpgp.c:5718
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "Karte ist dauerhaft gesperrt!\n"
 
-#: scd/app-openpgp.c:2808
+#: scd/app-openpgp.c:2809
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8437,20 +8442,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:2841
+#: scd/app-openpgp.c:2842
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr "Zugriff auf Admin-Befehle ist nicht eingerichtet\n"
 
-#: scd/app-openpgp.c:3355
+#: scd/app-openpgp.c:3356
 msgid "||Please enter the PIN"
 msgstr "||Bitte die PIN eingeben"
 
-#: scd/app-openpgp.c:3404
+#: scd/app-openpgp.c:3405
 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:3414 scd/app-openpgp.c:3481
+#: scd/app-openpgp.c:3415 scd/app-openpgp.c:3484
 #, 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"
@@ -8458,72 +8463,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:3437
+#: scd/app-openpgp.c:3438
 msgid "|RN|New Reset Code"
 msgstr "|RN|Neuer Rückstellcode"
 
-#: scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3439
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Neue Admin-PIN"
 
-#: scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3439
 msgid "|N|New PIN"
 msgstr "|N|Neue PIN"
 
-#: scd/app-openpgp.c:3541
+#: scd/app-openpgp.c:3543
 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:3542
+#: scd/app-openpgp.c:3544
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Bitte die PIN sowie die neue PIN eingeben"
 
-#: scd/app-openpgp.c:3600 scd/app-openpgp.c:5026
+#: scd/app-openpgp.c:3602 scd/app-openpgp.c:5020
 #, c-format
 msgid "error reading application data\n"
 msgstr "Fehler beim Lesen der Anwendungsdaten\n"
 
-#: scd/app-openpgp.c:3606 scd/app-openpgp.c:5033
+#: scd/app-openpgp.c:3608 scd/app-openpgp.c:5027
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "Fehler beim Lesen des Fingerabdrucks DO\n"
 
-#: scd/app-openpgp.c:4302 scd/app-openpgp.c:4657
+#: scd/app-openpgp.c:4304 scd/app-openpgp.c:4653
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "Erzeugungsdatum fehlt\n"
 
-#: scd/app-openpgp.c:4343 scd/app-openpgp.c:4351
+#: scd/app-openpgp.c:4345 scd/app-openpgp.c:4353
 #, 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:4651
+#: scd/app-openpgp.c:4647
 #, c-format
 msgid "unsupported curve\n"
 msgstr "Nicht unterstützte Kurve\n"
 
-#: scd/app-openpgp.c:4991
+#: scd/app-openpgp.c:4985
 #, 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:5041
+#: scd/app-openpgp.c:5035
 #, 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:5240
+#: scd/app-openpgp.c:5234
 #, 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:5298
+#: scd/app-openpgp.c:5292
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "Anzahl bereits erzeugter Signaturen: %lu\n"
 
-#: scd/app-openpgp.c:5729
+#: scd/app-openpgp.c:5723
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
@@ -8531,7 +8536,7 @@ msgstr ""
 "Die Überprüfung der Admin PIN ist momentan durch einen Befehl verboten "
 "worden\n"
 
-#: scd/app-openpgp.c:6241 scd/app-openpgp.c:6252
+#: scd/app-openpgp.c:6250 scd/app-openpgp.c:6261
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Kann auf %s nicht zugreifen - ungültige OpenPGP-Karte?\n"
@@ -8551,7 +8556,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:274 dirmngr/dirmngr.c:198
+#: scd/scdaemon.c:136 sm/gpgsm.c:274 dirmngr/dirmngr.c:199
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|NAME|Die Debugstufe auf NAME setzen"
 
@@ -8614,12 +8619,12 @@ msgstr ""
 "Bitte die Option `--daemon' nutzen, um das Programm im Hintergund "
 "auszuführen\n"
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2104
+#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2143
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "Handhabungsroutine für fd %d gestartet\n"
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2112
+#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2151
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "Handhabungsroutine für den fd %d beendet\n"
@@ -8629,11 +8634,11 @@ msgstr "Handhabungsroutine für den fd %d beendet\n"
 msgid "validation model requested by certificate: %s"
 msgstr "Durch Zertifikat angefordertes Gültigkeitsmodell: %s"
 
-#: sm/certchain.c:199 sm/certchain.c:2172
+#: sm/certchain.c:199 sm/certchain.c:2174
 msgid "chain"
 msgstr "Kette"
 
-#: sm/certchain.c:200 sm/certchain.c:2172
+#: sm/certchain.c:200 sm/certchain.c:2174
 msgid "shell"
 msgstr "Schale"
 
@@ -8666,235 +8671,235 @@ msgstr "Hinweis: Die unkritische Zertifikatsrichtlinie ist nicht erlaubt"
 msgid "certificate policy not allowed"
 msgstr "Die Zertifikatsrichtlinie ist nicht erlaubt"
 
-#: sm/certchain.c:595 sm/keydb.c:1891 sm/keydb.c:1980
+#: sm/certchain.c:596 sm/keydb.c:1913 sm/keydb.c:2002
 #, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "Kann den Fingerprint nicht ermitteln\n"
 
-#: sm/certchain.c:624
+#: sm/certchain.c:625
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr "Der Herausgeber wird von einer externen Stelle gesucht\n"
 
-#: sm/certchain.c:644
+#: sm/certchain.c:645
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "Anzahl der übereinstimmenden Herausgeber: %d\n"
 
-#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#: sm/certchain.c:724 dirmngr/ocsp.c:683
 #, c-format
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "authorityInfoAccess kann nicht geholt werden: %s\n"
 
-#: sm/certchain.c:791
+#: sm/certchain.c:792
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr "Der Herausgeber wird im Cache des Dirmngr gesucht\n"
 
-#: sm/certchain.c:816
+#: sm/certchain.c:817
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "Anzahl der übereinstimmenden Zertifikate: %d\n"
 
-#: sm/certchain.c:819
+#: sm/certchain.c:820
 #, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "Schlüsselsuche im Cache des Dirmngr schlug fehl: %s\n"
 
-#: sm/certchain.c:1046 sm/certchain.c:1561 sm/certchain.c:2200 sm/decrypt.c:643
-#: sm/encrypt.c:620 sm/import.c:414 sm/keydb.c:1898 sm/keydb.c:1987
-#: sm/sign.c:428 sm/verify.c:117
+#: sm/certchain.c:1047 sm/certchain.c:1562 sm/certchain.c:2202
+#: sm/decrypt.c:1084 sm/encrypt.c:621 sm/import.c:414 sm/keydb.c:1920
+#: sm/keydb.c:2009 sm/sign.c:428 sm/verify.c:117
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "Kann keinen KeyDB Handler bereitstellen\n"
 
-#: sm/certchain.c:1232
+#: sm/certchain.c:1233
 msgid "certificate has been revoked"
 msgstr "Das Zertifikat wurde widerrufen"
 
-#: sm/certchain.c:1247
+#: sm/certchain.c:1248
 msgid "the status of the certificate is unknown"
 msgstr "Der Status des Zertifikats ist nicht bekannt"
 
-#: sm/certchain.c:1254
+#: sm/certchain.c:1255
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 "Bitte vergewissern Sie sich, daß der \"dirmngr\" richtig installiert ist\n"
 
-#: sm/certchain.c:1260
+#: sm/certchain.c:1261
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "Die CRL konnte nicht geprüft werden: %s"
 
-#: sm/certchain.c:1289 sm/certchain.c:1357 dirmngr/validate.c:497
+#: sm/certchain.c:1290 sm/certchain.c:1358 dirmngr/validate.c:497
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "Zertifikat mit unzulässiger Gültigkeit: %s"
 
-#: sm/certchain.c:1304 sm/certchain.c:1389 dirmngr/validate.c:515
+#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:515
 #, c-format
 msgid "certificate not yet valid"
 msgstr "Das Zertifikat ist noch nicht gültig"
 
-#: sm/certchain.c:1305 sm/certchain.c:1390
+#: sm/certchain.c:1306 sm/certchain.c:1391
 msgid "root certificate not yet valid"
 msgstr "Das Wurzelzertifikat ist noch nicht gültig"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1307 sm/certchain.c:1392
 msgid "intermediate certificate not yet valid"
 msgstr "Das Zwischenzertifikat ist noch nicht gültig"
 
-#: sm/certchain.c:1319 dirmngr/validate.c:526
+#: sm/certchain.c:1320 dirmngr/validate.c:526
 #, c-format
 msgid "certificate has expired"
 msgstr "Das Zertifikat ist abgelaufen"
 
-#: sm/certchain.c:1320
+#: sm/certchain.c:1321
 msgid "root certificate has expired"
 msgstr "Das Wurzelzertifikat ist abgelaufen"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1322
 msgid "intermediate certificate has expired"
 msgstr "Das Zwischenzertifikat ist abgelaufen"
 
-#: sm/certchain.c:1363
+#: sm/certchain.c:1364
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr "Notwendige Zertifikatattribute fehlen: %s%s%s"
 
-#: sm/certchain.c:1372
+#: sm/certchain.c:1373
 msgid "certificate with invalid validity"
 msgstr "Zertifikat mit unzulässiger Gültigkeit"
 
-#: sm/certchain.c:1409
+#: sm/certchain.c:1410
 msgid "signature not created during lifetime of certificate"
 msgstr "Die Signatur wurde nicht in der Gültigkeitszeit des Zertifikat erzeugt"
 
-#: sm/certchain.c:1411
+#: sm/certchain.c:1412
 msgid "certificate not created during lifetime of issuer"
 msgstr ""
 "Das Zertifikat wurde nicht während der Gültigkeitszeit des Herausgebers "
 "erzeugt"
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1413
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
 "Das Zwischenzertifikat wurde nicht während der Gültigkeitszeit des "
 "Herausgebers erzeugt"
 
-#: sm/certchain.c:1416
+#: sm/certchain.c:1417
 #, c-format
 msgid "  (  signature created at "
 msgstr "  (    Signatur erzeugt am "
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1418
 #, c-format
 msgid "  (certificate created at "
 msgstr "  (  Zertifikat erzeugt am "
 
-#: sm/certchain.c:1420
+#: sm/certchain.c:1421
 #, c-format
 msgid "  (certificate valid from "
 msgstr "  (  Zertifikat gültig von "
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1422
 #, c-format
 msgid "  (     issuer valid from "
 msgstr "  ( Herausgeber gültig von "
 
-#: sm/certchain.c:1451 dirmngr/validate.c:577
+#: sm/certchain.c:1452 dirmngr/validate.c:577
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "Fingerprint=%s\n"
 
-#: sm/certchain.c:1460
+#: sm/certchain.c:1461
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr "Das Wurzelzertifikat wurde nun als vertrauenswürdig markiert\n"
 
-#: sm/certchain.c:1473
+#: sm/certchain.c:1474
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 "Interaktives vertrauenswürdig-Markieren ist in gpg-agent ausgeschaltet\n"
 
-#: sm/certchain.c:1479
+#: sm/certchain.c:1480
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 "Interaktives vertrauenswürdig-Markieren ist in dieser Sitzung ausgeschaltet\n"
 
-#: sm/certchain.c:1538
+#: sm/certchain.c:1539
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 "WARNUNG: Der Erzeugungszeitpunkt der Signatur ist nicht bekannt - Nehme die "
 "aktuelle Zeit an"
 
-#: sm/certchain.c:1602
+#: sm/certchain.c:1603
 msgid "no issuer found in certificate"
 msgstr "Im Zertifikat ist kein Herausgeber enthalten"
 
-#: sm/certchain.c:1680
+#: sm/certchain.c:1681
 msgid "self-signed certificate has a BAD signature"
 msgstr "Das eigenbeglaubigte Zertifikat hat eine FALSCHE Signatur"
 
-#: sm/certchain.c:1749 dirmngr/validate.c:575
+#: sm/certchain.c:1750 dirmngr/validate.c:575
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "Das Wurzelzertifikat ist nicht als vertrauenswürdig markiert"
 
-#: sm/certchain.c:1765
+#: sm/certchain.c:1766
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "Fehler beim Prüfen der vertrauenswürdigen Zertifikate: %s\n"
 
-#: sm/certchain.c:1796 sm/import.c:175 dirmngr/validate.c:630
+#: sm/certchain.c:1797 sm/import.c:175 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "Der Zertifikatkette ist zu lang\n"
 
-#: sm/certchain.c:1808 dirmngr/validate.c:642
+#: sm/certchain.c:1809 dirmngr/validate.c:642
 #, c-format
 msgid "issuer certificate not found"
 msgstr "Herausgeberzertifikat nicht gefunden"
 
-#: sm/certchain.c:1842 dirmngr/validate.c:668
+#: sm/certchain.c:1844 dirmngr/validate.c:668
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr "Das Zertifikat hat eine FALSCHE Signatur"
 
-#: sm/certchain.c:1874 dirmngr/validate.c:692
+#: sm/certchain.c:1876 dirmngr/validate.c:692
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 "Eine anderes möglicherweise passendes CA-Zertifikat gefunden - versuche "
 "nochmal"
 
-#: sm/certchain.c:1933 dirmngr/validate.c:717
+#: sm/certchain.c:1935 dirmngr/validate.c:717
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "Die Zertifikatkette ist länger als von der CA erlaubt (%d)"
 
-#: sm/certchain.c:1975 sm/certchain.c:2275 dirmngr/validate.c:747
+#: sm/certchain.c:1977 sm/certchain.c:2278 dirmngr/validate.c:747
 #, c-format
 msgid "certificate is good\n"
 msgstr "Das Zertifikat ist korrekt\n"
 
-#: sm/certchain.c:1976
+#: sm/certchain.c:1978
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "Das Zwischenzertifikat ist korrekt\n"
 
-#: sm/certchain.c:1977
+#: sm/certchain.c:1979
 #, c-format
 msgid "root certificate is good\n"
 msgstr "Das Wurzelzertifikat ist korrekt\n"
 
-#: sm/certchain.c:2159
+#: sm/certchain.c:2161
 msgid "switching to chain model"
 msgstr "Umgeschaltet auf das Kettenmodell"
 
-#: sm/certchain.c:2168
+#: sm/certchain.c:2170
 #, c-format
 msgid "validation model used: %s"
 msgstr "Benutztes Gültigkeitsmodell: %s"
@@ -8906,18 +8911,18 @@ 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:1372 dirmngr/validate.c:903
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1411 dirmngr/validate.c:903
 #: dirmngr/validate.c:927
 #, c-format
 msgid "out of core\n"
 msgstr "Nicht genügend Speicher\n"
 
-#: sm/certcheck.c:389 sm/verify.c:212
+#: sm/certcheck.c:388 sm/verify.c:212
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(Dies ist der MD2 Algorithmus)\n"
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:793
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:794
 msgid "none"
 msgstr "keine"
 
@@ -8946,7 +8951,7 @@ msgid ""
 "S/N %s, ID 0x%08lX,\n"
 "created %s, expires %s.\n"
 msgstr ""
-"Bitte geben Sie die Passphrase an, um den geheimen Schlüssel des X.509 "
+"Bitte geben Sie das Passwort an, um den geheimen Schlüssel des X.509 "
 "Zertifikats:\n"
 "\"%s\"\n"
 "S/N %s, ID 0x%08lX,\n"
@@ -9098,7 +9103,7 @@ msgid ""
 "you just created once more.\n"
 msgstr ""
 "Um die Zertifikatsanforderung fertigzustellen, geben Sie nun bitte\n"
-"noch einmal die Passphrase des soeben erzeugten Schlüssels ein.\n"
+"noch einmal das Passwort des soeben erzeugten Schlüssels ein.\n"
 
 #: sm/certreqgen-ui.c:160
 #, c-format
@@ -9210,29 +9215,29 @@ msgstr "Fertig.  Sie sollten nun diese Anforderung an die CA senden.\n"
 msgid "resource problem: out of core\n"
 msgstr "Resourcenproblem: Nicht genügend Hauptspeicher\n"
 
-#: sm/decrypt.c:719
+#: sm/decrypt.c:1159
 #, c-format
 msgid "(this is the RC2 algorithm)\n"
 msgstr "(Dies ist der RC-2 Algorithmus)\n"
 
-#: sm/decrypt.c:721
+#: sm/decrypt.c:1161
 #, c-format
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr "(dies ist wahrscheinlich keine verschlüsselte Botschaft)\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
 # [kw]
-#: sm/decrypt.c:868
+#: sm/decrypt.c:1318
 #, c-format
 msgid "encrypted to %s key %s\n"
-msgstr "verschlüsselt an %s Schlüssel %s\n"
+msgstr "verschlüsselt an %s Schlüssel, ID %s\n"
 
 #: sm/delete.c:50 sm/delete.c:109
 #, c-format
 msgid "certificate '%s' not found: %s\n"
 msgstr "Zertifikat `%s' nicht gefunden: %s\n"
 
-#: sm/delete.c:120 sm/keydb.c:1999 sm/keydb.c:2098
+#: sm/delete.c:120 sm/keydb.c:2021 sm/keydb.c:2120
 #, c-format
 msgid "error locking keybox: %s\n"
 msgstr "Fehler beim Sperren der Keybox: %s\n"
@@ -9252,7 +9257,7 @@ msgstr "Zertifikat `%s' gelöscht\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "Fehler beim Löschen des Zertifikats \"%s\": %s\n"
 
-#: sm/encrypt.c:606
+#: sm/encrypt.c:607
 #, c-format
 msgid "no valid recipients given\n"
 msgstr "Keine gültigen Empfänger angegeben\n"
@@ -9321,63 +9326,63 @@ msgstr "|USER-ID|USER-ID als voreingestellten Schlüssel benutzen"
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|DATEI|DATEI als öffentlichen Schlüsselbund mitbenutzen"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:352 dirmngr/dirmngr.c:265
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|SPEC|Schlüssel bei diesem Server nachschlagen"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:363
 msgid "fetch missing issuer certificates"
 msgstr "Fehlende Zertifikate automatisch holen"
 
-#: sm/gpgsm.c:364
+#: sm/gpgsm.c:365
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
-msgstr "|NAME|Benutze die Kodierung NAME für PKCS#12 Passphrasen"
+msgstr "|NAME|Benutze die Kodierung NAME für PKCS#12 Passwörter"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:386
 msgid "never consult a CRL"
 msgstr "Niemals eine CRL konsultieren"
 
-#: sm/gpgsm.c:389
+#: sm/gpgsm.c:390
 msgid "do not check CRLs for root certificates"
 msgstr "CRL bei Wurzelzertifikaten nicht überprüfen"
 
-#: sm/gpgsm.c:393
+#: sm/gpgsm.c:394
 msgid "check validity using OCSP"
 msgstr "Die Gültigkeit mittels OCSP prüfen"
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:396
 msgid "do not check certificate policies"
 msgstr "Zertifikatsrichtlinien nicht überprüfen"
 
-#: sm/gpgsm.c:398
+#: sm/gpgsm.c:399
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|Verschlüsselungsverfahren NAME benutzen"
 
-#: sm/gpgsm.c:400
+#: sm/gpgsm.c:401
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|Hashverfahren NAME benutzen"
 
-#: sm/gpgsm.c:410
+#: sm/gpgsm.c:411
 msgid "batch mode: never ask"
 msgstr "Stapelmodus: Keine Abfragen"
 
-#: sm/gpgsm.c:412
+#: sm/gpgsm.c:413
 msgid "assume yes on most questions"
 msgstr "\"Ja\" als Standardantwort annehmen"
 
-#: sm/gpgsm.c:413
+#: sm/gpgsm.c:414
 msgid "assume no on most questions"
 msgstr "\"Nein\" als Standardantwort annehmen"
 
-#: sm/gpgsm.c:430
+#: sm/gpgsm.c:431
 msgid "|FILE|write an audit log to FILE"
 msgstr "|DATEI|Schreibe ein Audit-Log auf DATEI"
 
-#: sm/gpgsm.c:615
+#: sm/gpgsm.c:616
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Aufruf: @GPGSM@ [Optionen] [Dateien] (-h für Hilfe)"
 
-#: sm/gpgsm.c:618
+#: sm/gpgsm.c:619
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -9386,52 +9391,27 @@ msgstr ""
 "Syntax: @GPGSM@ [Optionen] [Dateien]\n"
 "Signieren, prüfen, ver- und entschlüsseln mittels S/MIME Protokoll\n"
 
-#: sm/gpgsm.c:826
+#: sm/gpgsm.c:827
 #, 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:837
+#: sm/gpgsm.c:838
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "Unbekanntes Gültigkeitsmodell '%s'\n"
 
-#: sm/gpgsm.c:896 dirmngr/ldapserver.c:89
-#, c-format
-msgid "%s:%u: no hostname given\n"
-msgstr "%s:%u: Kein Server-Name angegeben\n"
-
-#: sm/gpgsm.c:915 dirmngr/ldapserver.c:108
-#, c-format
-msgid "%s:%u: password given without user\n"
-msgstr "%s:%u: Passwort ohne Benutzer\n"
-
-#: sm/gpgsm.c:946 dirmngr/ldapserver.c:139
-#, c-format
-msgid "%s:%u: ignoring unknown flag '%s'\n"
-msgstr "%s:%u: Unbekanntes Flag '%s' wird  nicht beachtet\n"
-
-#: sm/gpgsm.c:962 dirmngr/ldapserver.c:155
-#, c-format
-msgid "%s:%u: skipping this line\n"
-msgstr "%s:%u: Zeile wird übersprungen\n"
-
-#: sm/gpgsm.c:1550
-#, c-format
-msgid "could not parse keyserver\n"
-msgstr "Schlüsselserver-URL konnte nicht analysiert werden\n"
-
-#: sm/gpgsm.c:1858
+#: sm/gpgsm.c:1711
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "Importiere allgemeine Zertifikate: %s\n"
 
-#: sm/gpgsm.c:1904
+#: sm/gpgsm.c:1757
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "Signieren mit `%s' nicht möglich: %s\n"
 
-#: sm/gpgsm.c:2273
+#: sm/gpgsm.c:2129
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "Ungültiger Befehl (Es gibt keinen implizierten Befehl)\n"
@@ -9451,52 +9431,52 @@ msgstr "Fehler beim Speichern des Zertifikats\n"
 msgid "basic certificate checks failed - not imported\n"
 msgstr "Grundlegende Zertifikatprüfungen fehlgeschlagen - nicht importiert\n"
 
-#: sm/import.c:471 sm/keydb.c:2018 sm/keydb.c:2111
+#: sm/import.c:472 sm/keydb.c:2040 sm/keydb.c:2133
 #, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "Fehler beim Holen der gespeicherten Flags: %s\n"
 
-#: sm/import.c:530 sm/import.c:562
+#: sm/import.c:531 sm/import.c:563
 #, c-format
 msgid "error importing certificate: %s\n"
 msgstr "Fehler beim Importieren des Zertifikats: %s\n"
 
-#: sm/import.c:751 tools/gpg-connect-agent.c:1475
+#: sm/import.c:752 tools/gpg-connect-agent.c:1475
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "Fehler beim Lesen der Eingabe: %s\n"
 
-#: sm/keydb.c:503
+#: sm/keydb.c:508
 #, c-format
 msgid "no keyboxd running in this session\n"
 msgstr "Der Keyboxd läuft nicht für diese Session\n"
 
-#: sm/keydb.c:595
+#: sm/keydb.c:600
 #, c-format
 msgid "error opening key DB: %s\n"
 msgstr "Fehler beim Öffnen der Schlüsseldatenbank: %s\n"
 
-#: sm/keydb.c:1936
+#: sm/keydb.c:1958
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr "Problem bei der Suche nach vorhandenem Zertifikat: %s\n"
 
-#: sm/keydb.c:1948
+#: sm/keydb.c:1970
 #, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "Fehler bei der Suche nach einer schreibbaren KeyDB: %s\n"
 
-#: sm/keydb.c:1956
+#: sm/keydb.c:1978
 #, c-format
 msgid "error storing certificate: %s\n"
 msgstr "Fehler beim Speichern des Zertifikats: %s\n"
 
-#: sm/keydb.c:2009
+#: sm/keydb.c:2031
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "Problem bei Wiederfinden des Zertifikats: %s\n"
 
-#: sm/keydb.c:2030 sm/keydb.c:2122
+#: sm/keydb.c:2052 sm/keydb.c:2144
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr "Fehler beim Speichern der Flags: %s\n"
@@ -9689,57 +9669,57 @@ msgstr "  Subjekt ="
 msgid "error loading certificate '%s': %s\n"
 msgstr "Fehler beim Laden des Zertifikats `%s': %s\n"
 
-#: dirmngr/certcache.c:819
+#: dirmngr/certcache.c:820
 #, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "   dauerhaft geladene Zertifikate: %u\n"
 
-#: dirmngr/certcache.c:821
+#: dirmngr/certcache.c:822
 #, c-format
 msgid "    runtime cached certificates: %u\n"
 msgstr " zwischengespeicherte Zertifikate: %u\n"
 
-#: dirmngr/certcache.c:823
+#: dirmngr/certcache.c:824
 #, c-format
 msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "    vertrauenswürdige Zertifikate: %u (%u,%u,%u,%u)\n"
 
-#: dirmngr/certcache.c:851 dirmngr/dirmngr-client.c:392
+#: dirmngr/certcache.c:852 dirmngr/dirmngr-client.c:392
 #, c-format
 msgid "certificate already cached\n"
 msgstr "Zertifikat ist bereits im Zwischenspeicher\n"
 
-#: dirmngr/certcache.c:853
+#: dirmngr/certcache.c:854
 #, c-format
 msgid "certificate cached\n"
 msgstr "Zertifikat wurde zwischengespeichert\n"
 
-#: dirmngr/certcache.c:855 dirmngr/certcache.c:875 dirmngr/dirmngr-client.c:396
+#: dirmngr/certcache.c:856 dirmngr/certcache.c:876 dirmngr/dirmngr-client.c:396
 #, c-format
 msgid "error caching certificate: %s\n"
 msgstr "Fehler beim Zwischenspeichern des Zertifikats: %s\n"
 
-#: dirmngr/certcache.c:938
+#: dirmngr/certcache.c:939
 #, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "ungültiger SHA1 Fingerabdruck `%s'\n"
 
-#: dirmngr/certcache.c:1384 dirmngr/certcache.c:1393
+#: dirmngr/certcache.c:1385 dirmngr/certcache.c:1394
 #, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "Fehler beim Holen des Zertifikats mittels Seriennummer: %s\n"
 
-#: dirmngr/certcache.c:1579 dirmngr/certcache.c:1588
+#: dirmngr/certcache.c:1580 dirmngr/certcache.c:1589
 #, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "Fehler beim Holen des Zertifikats mittels Subject: %s\n"
 
-#: dirmngr/certcache.c:1694 dirmngr/validate.c:483
+#: dirmngr/certcache.c:1695 dirmngr/validate.c:483
 #, c-format
 msgid "no issuer found in certificate\n"
 msgstr "Im Zertifikat ist kein Herausgeber enthalten\n"
 
-#: dirmngr/certcache.c:1704
+#: dirmngr/certcache.c:1705
 #, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "Fehler beim Holen des \"authorityKeyIdentifier\": %s\n"
@@ -9774,7 +9754,7 @@ msgstr "Die Zwischenspeicherdatei `%s' wird entfernt\n"
 msgid "not removing file '%s'\n"
 msgstr "Die Datei `%s' wird nicht gelöscht\n"
 
-#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2380
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2383
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr "Fehler beim Schließen der Zwischenspeicherdatei: %s\n"
@@ -10022,13 +10002,13 @@ msgid "error getting data from cache file: %s\n"
 msgstr "Fehler beim Holen der Daten aus der Zwischenspeicherdatei: %s\n"
 
 #: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1672 dirmngr/crlcache.c:1697
-#: dirmngr/crlcache.c:1763
+#: dirmngr/crlcache.c:1766
 #, c-format
 msgid "got an invalid S-expression from libksba\n"
 msgstr "Ungültige S-Expression von Libksba erhalten\n"
 
 #: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1679 dirmngr/crlcache.c:1705
-#: dirmngr/crlcache.c:1770 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1773 dirmngr/misc.c:176
 #, c-format
 msgid "converting S-expression failed: %s\n"
 msgstr "Konvertierung der S-Expression fehlgeschlagen: %s\n"
@@ -10043,138 +10023,138 @@ msgstr "Ungültige Hashmethode `%s'\n"
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr "gcry_md_open für Methode %d fehlgeschlagen: %s\n"
 
-#: dirmngr/crlcache.c:1797 dirmngr/ocsp.c:478
+#: dirmngr/crlcache.c:1800 dirmngr/ocsp.c:478
 #, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "Erzeugen der S-Expression fehlgeschlagen: %s\n"
 
-#: dirmngr/crlcache.c:1871
+#: dirmngr/crlcache.c:1874
 #, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "ksba_crl_parse fehlgeschlagen: %s\n"
 
-#: dirmngr/crlcache.c:1886
+#: dirmngr/crlcache.c:1889
 #, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "Die \"Update Times\" konnte nicht aus der CRL bestimmt werden: %s\n"
 
-#: dirmngr/crlcache.c:1893
+#: dirmngr/crlcache.c:1896
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr "Die \"Update Times\" dieser CRL sind: this=%s next=%s\n"
 
-#: dirmngr/crlcache.c:1897
+#: dirmngr/crlcache.c:1900
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr "\"nextUpdate\" fehlt; wir nehmen eine Gültigkeit von einem Tag an\n"
 
-#: dirmngr/crlcache.c:1917
+#: dirmngr/crlcache.c:1920
 #, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "Fehler beim Holen eines CRL Items: %s\n"
 
-#: dirmngr/crlcache.c:1932
+#: dirmngr/crlcache.c:1935
 #, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr ""
 "Fehler beim Einfügen eines Items in die temporäre Zwischenspeicherdatei: %s\n"
 
-#: dirmngr/crlcache.c:1959
+#: dirmngr/crlcache.c:1962
 #, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "In der CRL wurde kein CRL Herausgeber gefunden: %s\n"
 
-#: dirmngr/crlcache.c:1974
+#: dirmngr/crlcache.c:1977
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 "CRL Herausgeberzertifikat wird über \"authorityKeyIdentifier\" geholt\n"
 
-#: dirmngr/crlcache.c:2020
+#: dirmngr/crlcache.c:2023
 #, c-format
 msgid "CRL signature verification failed: %s\n"
 msgstr "Signaturprüfung der CRL ist fehlgeschlagen: %s\n"
 
-#: dirmngr/crlcache.c:2032
+#: dirmngr/crlcache.c:2035
 #, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "Fehler beim Püfen des CRL Herausgeberzertifikats: %s\n"
 
-#: dirmngr/crlcache.c:2174
+#: dirmngr/crlcache.c:2177
 #, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "ksba_crl_new fehlgeschlagen: %s\n"
 
-#: dirmngr/crlcache.c:2181
+#: dirmngr/crlcache.c:2184
 #, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "ksba_crl_set_reader fehlgeschlagen: %s\n"
 
-#: dirmngr/crlcache.c:2215
+#: dirmngr/crlcache.c:2218
 #, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "Die alte temporäre Zwischenspeicherdatei `%s' wurde entfernt\n"
 
-#: dirmngr/crlcache.c:2219
+#: dirmngr/crlcache.c:2222
 #, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr ""
 "Problem beim Löschen der alten temporären Zwischenspeicherdatei `%s': %s\n"
 
-#: dirmngr/crlcache.c:2229
+#: dirmngr/crlcache.c:2232
 #, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "Fehler beim Erzeugen der temporären Zwischenspeicherdatei `%s': %s\n"
 
-#: dirmngr/crlcache.c:2239
+#: dirmngr/crlcache.c:2242
 #, c-format
 msgid "crl_parse_insert failed: %s\n"
 msgstr "crl_parse_insert fehlgeschlagen: %s\n"
 
-#: dirmngr/crlcache.c:2249
+#: dirmngr/crlcache.c:2252
 #, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr ""
 "Fehler beim Fertigstellen der temporären Zwischenspeicherdatei `%s': %s\n"
 
-#: dirmngr/crlcache.c:2256
+#: dirmngr/crlcache.c:2259
 #, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "Fehler beim Schließen der temporären Zwischenspeicherdatei `%s': %s\n"
 
-#: dirmngr/crlcache.c:2281
+#: dirmngr/crlcache.c:2284
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 "WARNUNG: Neue CRL ist immer noch zu alt; sie verfiel am %s - wird trotzdem "
 "geladen\n"
 
-#: dirmngr/crlcache.c:2285
+#: dirmngr/crlcache.c:2288
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr "Neue CRL ist immer noch zu alt; sie verviel am %s\n"
 
-#: dirmngr/crlcache.c:2301
+#: dirmngr/crlcache.c:2304
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr "Unbekannte kritische CRL Erweiterung %s\n"
 
-#: dirmngr/crlcache.c:2311
+#: dirmngr/crlcache.c:2314
 #, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "Fehler beim Lesen einer CRL Erweiterung: %s\n"
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2365
 #, c-format
 msgid "creating cache file '%s'\n"
 msgstr "Zwischenspeicherdatei `%s' wird erzeugt\n"
 
-#: dirmngr/crlcache.c:2394
+#: dirmngr/crlcache.c:2397
 #, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "Problem beim Umbenennen von `%s' nach `%s': %s\n"
 
-#: dirmngr/crlcache.c:2408
+#: dirmngr/crlcache.c:2411
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
@@ -10183,70 +10163,70 @@ msgstr ""
 "Update der Zwischenspeicherverzeichnisdatei fehlgeschlagen - "
 "Zwischenspeichereintrag wird mit dem nächste Programmstart verloren gehen\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2448
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr "Anfang CRL Ausgabe (geholt via %s)\n"
 
-#: dirmngr/crlcache.c:2468
+#: dirmngr/crlcache.c:2471
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 msgstr ""
 " FEHLER: Die CRL wird nicht benutzt, da sie trotz eines Updates zu alt war!\n"
 
-#: dirmngr/crlcache.c:2471
+#: dirmngr/crlcache.c:2474
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 " FEHLER: Die CRL wird nicht benutzt, da sie eine unbekannte kritische CRL "
 "Erweiterung trägt!\n"
 
-#: dirmngr/crlcache.c:2474
+#: dirmngr/crlcache.c:2477
 msgid " ERROR: The CRL will not be used\n"
 msgstr " FEHLER: Die CRL wird nicht benutzt\n"
 
-#: dirmngr/crlcache.c:2481
+#: dirmngr/crlcache.c:2484
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 " FEHLER: Diese zwischengespeicherte CRL ist möglicherweise abgeändert "
 "worden!\n"
 
-#: dirmngr/crlcache.c:2499
+#: dirmngr/crlcache.c:2502
 #, c-format
 msgid " WARNING: invalid cache record length\n"
 msgstr " WARNUNG: Ungültige Länge eines Zwischenspeicherdatensatzes\n"
 
-#: dirmngr/crlcache.c:2506
+#: dirmngr/crlcache.c:2509
 #, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "Problem beim Lesen eines Zwischenspeicherdatensatzes: %s\n"
 
-#: dirmngr/crlcache.c:2517
+#: dirmngr/crlcache.c:2520
 #, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "Problem beim Lesen eines Zwischenspeicherschlüssels: %s\n"
 
-#: dirmngr/crlcache.c:2548
+#: dirmngr/crlcache.c:2551
 #, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "Fehler beim Lesen eine Zwischenspeichereintrags aus der DB: %s\n"
 
-#: dirmngr/crlcache.c:2551
+#: dirmngr/crlcache.c:2554
 msgid "End CRL dump\n"
 msgstr "Ende CRL Ausgabe\n"
 
-#: dirmngr/crlcache.c:2672
+#: dirmngr/crlcache.c:2675
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "crl_fetch über den DP fehlgeschlagen: %s\n"
 
-#: dirmngr/crlcache.c:2683
+#: dirmngr/crlcache.c:2686
 #, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "crl_cache_insert über den DP fehlgeschlagen: %s\n"
 
-#: dirmngr/crlcache.c:2743
+#: dirmngr/crlcache.c:2746
 #, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "crl_cache_insert über den Issuer fehlgeschlagen: %s\n"
@@ -10267,7 +10247,7 @@ msgstr "CRL Zugriff nicht möglich da %s abgeschaltet ist\n"
 msgid "error retrieving '%s': %s\n"
 msgstr "Fehler beim Holen von `%s': %s\n"
 
-#: dirmngr/crlfetch.c:218 dirmngr/ldap-wrapper.c:881 dirmngr/misc.c:573
+#: dirmngr/crlfetch.c:218 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
 #, c-format
 msgid "error initializing reader object: %s\n"
 msgstr "Fehler beim Initialisieren des \"reader\" Objekts: %s\n"
@@ -10425,131 +10405,131 @@ msgstr "Absoluter Dateiname erwartet\n"
 msgid "looking up '%s'\n"
 msgstr "Auffinden von `%s'\n"
 
-#: dirmngr/dirmngr.c:175
+#: dirmngr/dirmngr.c:176
 msgid "list the contents of the CRL cache"
 msgstr "Den Inhalt des CRL Zwischenspeichers anzeigen"
 
-#: dirmngr/dirmngr.c:176
+#: dirmngr/dirmngr.c:177
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|DATEI|Lade die CRL aus der DATEI in den Zwischenspeicher"
 
-#: dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr.c:178
 msgid "|URL|fetch a CRL from URL"
 msgstr "|URL|Hole eine CRL von dieser URL"
 
-#: dirmngr/dirmngr.c:178
+#: dirmngr/dirmngr.c:179
 msgid "shutdown the dirmngr"
 msgstr "Den Dirmngr herunterfahren"
 
-#: dirmngr/dirmngr.c:179
+#: dirmngr/dirmngr.c:180
 msgid "flush the cache"
 msgstr "Den Zwischenspeicher löschen"
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:213
 msgid "allow online software version check"
 msgstr "Online Softwareversionstest erlauben"
 
-#: dirmngr/dirmngr.c:215
+#: dirmngr/dirmngr.c:216
 msgid "|N|do not return more than N items in one query"
 msgstr "|N|Nicht mehr als N Angaben in einer Anfrage zurückgeben"
 
-#: dirmngr/dirmngr.c:221
+#: dirmngr/dirmngr.c:222
 msgid "Network related options"
 msgstr "Netzwerkbezogene Optionen"
 
-#: dirmngr/dirmngr.c:223
+#: dirmngr/dirmngr.c:224
 msgid "route all network traffic via Tor"
 msgstr "Netzzugriff nur über Tor"
 
-#: dirmngr/dirmngr.c:235
+#: dirmngr/dirmngr.c:236
 msgid "Configuration for Keyservers"
 msgstr "Konfiguration der Schlüsselserver"
 
-#: dirmngr/dirmngr.c:238
+#: dirmngr/dirmngr.c:239
 msgid "|URL|use keyserver at URL"
 msgstr "Benutze Schlüsselserver unter der URL"
 
-#: dirmngr/dirmngr.c:240
+#: dirmngr/dirmngr.c:241
 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:242
+#: dirmngr/dirmngr.c:243
 msgid "Configuration for HTTP servers"
 msgstr "Konfiguration für HTTP Server"
 
-#: dirmngr/dirmngr.c:244
+#: dirmngr/dirmngr.c:245
 msgid "inhibit the use of HTTP"
 msgstr "Sperre die Benutzung von HTTP"
 
-#: dirmngr/dirmngr.c:246
+#: dirmngr/dirmngr.c:247
 msgid "ignore HTTP CRL distribution points"
 msgstr "Ãœbergehe HTTP CRL Distribution Points"
 
-#: dirmngr/dirmngr.c:248
+#: dirmngr/dirmngr.c:249
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr "|URL|Leite alle HTTP Anfragen über URL"
 
-#: dirmngr/dirmngr.c:250
+#: dirmngr/dirmngr.c:251
 msgid "use system's HTTP proxy setting"
 msgstr "Benutze die HTTP Proxy Einstellung des Systems"
 
-#: dirmngr/dirmngr.c:254
+#: dirmngr/dirmngr.c:255
 msgid "Configuration of LDAP servers to use"
 msgstr "Konfiguration der zu nutzenden LDAP-Server"
 
-#: dirmngr/dirmngr.c:256
+#: dirmngr/dirmngr.c:257
 msgid "inhibit the use of LDAP"
 msgstr "Sperre die Benutzung von LDAP"
 
-#: dirmngr/dirmngr.c:258
+#: dirmngr/dirmngr.c:259
 msgid "ignore LDAP CRL distribution points"
 msgstr "Ãœbergehe LDAP CRL Distribution Points"
 
-#: dirmngr/dirmngr.c:260
+#: dirmngr/dirmngr.c:261
 msgid "|HOST|use HOST for LDAP queries"
 msgstr "|HOST|Benutze HOST für LDAP Anfragen"
 
-#: dirmngr/dirmngr.c:262
+#: dirmngr/dirmngr.c:263
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr "Keine Benutzung der Rückgriffshosts mit --ldap-proxy"
 
-#: dirmngr/dirmngr.c:264
+#: dirmngr/dirmngr.c:267
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|DATEI|Lese die LDAP Serverliste aus DATEI"
 
-#: dirmngr/dirmngr.c:266
+#: dirmngr/dirmngr.c:269
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr "Füge neue Server aus den CRL Distribution Points der Serverliste hinzu"
 
-#: dirmngr/dirmngr.c:269 dirmngr/dirmngr_ldap.c:104
+#: dirmngr/dirmngr.c:272
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|Setze die LDAP Zeitüberschreitung auf N Sekunden"
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:275
 msgid "Configuration for OCSP"
 msgstr "Konfiguration zu OCSP"
 
-#: dirmngr/dirmngr.c:274
+#: dirmngr/dirmngr.c:277
 msgid "allow sending OCSP requests"
 msgstr "OCSP Anfragen erlauben"
 
-#: dirmngr/dirmngr.c:276
+#: dirmngr/dirmngr.c:279
 msgid "ignore certificate contained OCSP service URLs"
 msgstr "Ãœbergehe im Zertifikat enthaltene OCSP Service URLs"
 
-#: dirmngr/dirmngr.c:278
+#: dirmngr/dirmngr.c:281
 msgid "|URL|use OCSP responder at URL"
 msgstr "|URL|Benutze den OCSP Responder mit dieser URL"
 
-#: dirmngr/dirmngr.c:280
+#: dirmngr/dirmngr.c:283
 msgid "|FPR|OCSP response signed by FPR"
 msgstr "|FPR|OCSP Antwort ist durch FPR signiert"
 
-#: dirmngr/dirmngr.c:288
+#: dirmngr/dirmngr.c:291
 msgid "force loading of outdated CRLs"
 msgstr "Laden von abgelaufenen CRLs erzwingen"
 
-#: dirmngr/dirmngr.c:299
+#: dirmngr/dirmngr.c:302
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
@@ -10559,11 +10539,11 @@ msgstr ""
 "(Im \"info\"-Handbuch findet sich eine vollständige Liste aller Kommandos "
 "und Optionen)\n"
 
-#: dirmngr/dirmngr.c:441
+#: dirmngr/dirmngr.c:449
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Gebrauch: @DIRMNGR@ [Optionen]"
 
-#: dirmngr/dirmngr.c:443
+#: dirmngr/dirmngr.c:451
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@ -10571,285 +10551,105 @@ msgstr ""
 "Syntax: @DIRMNGR@ [Optionen] [Kommando [Argumente]]\n"
 "Keyserver, CRL und OCSP Zugriff für @GNUPG@\n"
 
-#: dirmngr/dirmngr.c:523
+#: dirmngr/dirmngr.c:531
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr "Gültige Debugebenen sind: %s\n"
 
-#: dirmngr/dirmngr.c:609 tools/gpgconf.c:667 tools/gpgconf.c:702
-#: tools/gpgconf.c:802
+#: dirmngr/dirmngr.c:617 tools/gpgconf.c:701 tools/gpgconf.c:736
+#: tools/gpgconf.c:836
 #, c-format
 msgid "usage: %s [options] "
 msgstr "Aufruf: %s [Optionen] "
 
-#: dirmngr/dirmngr.c:1260
+#: dirmngr/dirmngr.c:1299
 #, 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:1495 dirmngr/server.c:1824
+#: dirmngr/dirmngr.c:1534 dirmngr/server.c:1878
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "Holen der CRL von `%s' fehlgeschlagen: %s\n"
 
-#: dirmngr/dirmngr.c:1501 dirmngr/server.c:1830
+#: dirmngr/dirmngr.c:1540 dirmngr/server.c:1884
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "Verarbeitung der CRL von `%s' fehlgeschlagen: %s\n"
 
-#: dirmngr/dirmngr.c:1643
+#: dirmngr/dirmngr.c:1682
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: Zeile ist zu lang - übergangen\n"
 
-#: dirmngr/dirmngr.c:1698 dirmngr/dirmngr.c:1782
+#: dirmngr/dirmngr.c:1737 dirmngr/dirmngr.c:1821
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: ungültiger Fingerabdruck erkannt\n"
 
-#: dirmngr/dirmngr.c:1734 dirmngr/dirmngr.c:1760 tools/gpgconf-comp.c:3539
+#: dirmngr/dirmngr.c:1773 dirmngr/dirmngr.c:1799 tools/gpgconf-comp.c:3549
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: Lesefehler: %s\n"
 
-#: dirmngr/dirmngr.c:1789
+#: dirmngr/dirmngr.c:1828
 #, 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:1876
+#: dirmngr/dirmngr.c:1915
 #, 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:1917
+#: dirmngr/dirmngr.c:1956
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "SIGUSR2 empfangen - keine Aktion definiert\n"
 
-#: dirmngr/dirmngr.c:1922
+#: dirmngr/dirmngr.c:1961
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "SIGTERM empfangen - wird heruntergefahren ...\n"
 
-#: dirmngr/dirmngr.c:1924
+#: dirmngr/dirmngr.c:1963
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "SIGTERM empfangen - immer noch %d Verbindungen aktiv\n"
 
-#: dirmngr/dirmngr.c:1929
+#: dirmngr/dirmngr.c:1968
 #, c-format
 msgid "shutdown forced\n"
 msgstr "Herunterfahren wurde erzwungen\n"
 
-#: dirmngr/dirmngr.c:1937
+#: dirmngr/dirmngr.c:1976
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "SIGINT empfangen - wird sofort heruntergefahren\n"
 
-#: dirmngr/dirmngr.c:1944
+#: dirmngr/dirmngr.c:1983
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "Signal %d empfangen - keine Aktion definiert\n"
 
-#: dirmngr/dirmngr_ldap.c:105
-msgid "return all values in a record oriented format"
-msgstr "Alle Werte in einem Record Format zurückgeben"
-
-#: dirmngr/dirmngr_ldap.c:108
-msgid "|NAME|ignore host part and connect through NAME"
-msgstr "|NAME|Host Teil ignorieren und über NAME verbinden"
-
-#: dirmngr/dirmngr_ldap.c:109
-msgid "force a TLS connection"
-msgstr "Eine TLS Verbindung erzwingen"
-
-#: dirmngr/dirmngr_ldap.c:110
-msgid "|NAME|connect to host NAME"
-msgstr "|NAME|Verbinde mit dem Host NAME"
-
-#: dirmngr/dirmngr_ldap.c:111
-msgid "|N|connect to port N"
-msgstr "|N|Verbinde mit dem Port N"
-
-#: dirmngr/dirmngr_ldap.c:112
-msgid "|NAME|use user NAME for authentication"
-msgstr "|NAME|Benutze NAME zur Authentifizierung"
-
-#: dirmngr/dirmngr_ldap.c:113
-msgid "|PASS|use password PASS for authentication"
-msgstr "Benutze Passwort PASS zur Authentifizierung"
-
-#: dirmngr/dirmngr_ldap.c:115
-msgid "take password from $DIRMNGR_LDAP_PASS"
-msgstr "Nimm das Passwort von $DIRMNGR_LDAP_PASS"
-
-#: dirmngr/dirmngr_ldap.c:116
-msgid "|STRING|query DN STRING"
-msgstr "|STRING|Frage den DN STRING ab"
-
-#: dirmngr/dirmngr_ldap.c:117
-msgid "|STRING|use STRING as filter expression"
-msgstr "|STRING|Benutze STRING als Filterausdruck"
-
-#: dirmngr/dirmngr_ldap.c:118
-msgid "|STRING|return the attribute STRING"
-msgstr "|STRING|Gib das Attribut STRING zurück"
-
-#: dirmngr/dirmngr_ldap.c:179
-msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
-msgstr "Gebrauch: dirmngr_ldap [Optionen] [URL] (-h für Hilfe)\n"
-
-#: dirmngr/dirmngr_ldap.c:182
-msgid ""
-"Syntax: dirmngr_ldap [options] [URL]\n"
-"Internal LDAP helper for Dirmngr\n"
-"Interface and options may change without notice\n"
-msgstr ""
-"Gebrauch: dirmngr_ldap [Optionen] [URL] (-h für Hilfe)\n"
-"Internes LDAP-Hilfsprogramm für Dirmngr.\n"
-"Interface und Optionen können sich mit jedem Release ändern.\n"
-
-#: dirmngr/dirmngr_ldap.c:291
-#, c-format
-msgid "invalid port number %d\n"
-msgstr "Ungültige Portnummer %d\n"
-
-#: dirmngr/dirmngr_ldap.c:400
-#, c-format
-msgid "scanning result for attribute '%s'\n"
-msgstr "Absuchen des Ergebnisses nach Attribut `%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:407 dirmngr/dirmngr_ldap.c:490
-#: dirmngr/dirmngr_ldap.c:514 dirmngr/dirmngr_ldap.c:526
-#: dirmngr/dirmngr_ldap.c:722
-#, c-format
-msgid "error writing to stdout: %s\n"
-msgstr "Fehler beim Schreiben auf Standardausgabe: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:424
-#, c-format
-msgid "          available attribute '%s'\n"
-msgstr "        verfügbare Attribute `%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:462
-#, c-format
-msgid "attribute '%s' not found\n"
-msgstr "Attribut `%s' nicht gefunden\n"
-
-#: dirmngr/dirmngr_ldap.c:469
-#, c-format
-msgid "found attribute '%s'\n"
-msgstr "Attribut `%s' gefunden\n"
-
-#: dirmngr/dirmngr_ldap.c:581
-#, c-format
-msgid "processing url '%s'\n"
-msgstr "Verarbeiten der URL `%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:588
-#, c-format
-msgid "          user '%s'\n"
-msgstr "           Benutzer `%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:590
-#, c-format
-msgid "          pass '%s'\n"
-msgstr "           Passwort `%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:592
-#, c-format
-msgid "          host '%s'\n"
-msgstr "               Host `%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:593
-#, c-format
-msgid "          port %d\n"
-msgstr "               Port %d\n"
-
-#: dirmngr/dirmngr_ldap.c:595
-#, c-format
-msgid "            DN '%s'\n"
-msgstr "                 DN `%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:597
-#, c-format
-msgid "        filter '%s'\n"
-msgstr "             Filter `%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:602 dirmngr/dirmngr_ldap.c:605
-#, c-format
-msgid "          attr '%s'\n"
-msgstr "           Attribut `%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:611
-#, c-format
-msgid "no host name in '%s'\n"
-msgstr "Kein Hostname in `%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:616
-#, c-format
-msgid "no attribute given for query '%s'\n"
-msgstr "Kein Attribut für Abfrage `%s' angegeben\n"
-
-#: dirmngr/dirmngr_ldap.c:622
-#, c-format
-msgid "WARNING: using first attribute only\n"
-msgstr "WARNUNG: Es wird nur das erste Attribut benutzt\n"
-
-#: dirmngr/dirmngr_ldap.c:637 dirmngr/dirmngr_ldap.c:678
-#, c-format
-msgid "LDAP init to '%s:%d' failed: %s\n"
-msgstr "LDAP Initialisierung von `%s:%d' fehlgeschlagen: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:659
-#, c-format
-msgid "LDAP init to '%s' failed: %s\n"
-msgstr "LDAP Initialisierung nach `%s' fehlgeschlagen: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:665
-#, c-format
-msgid "LDAP init to '%s' done\n"
-msgstr "LDAP Initialisierung nach `%s' durchgeführt\n"
-
-#: dirmngr/dirmngr_ldap.c:704
-#, c-format
-msgid "binding to '%s:%d' failed: %s\n"
-msgstr "Anbindung an `%s:%d' fehlgeschlagen: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:728
-#, c-format
-msgid "searching '%s' failed: %s\n"
-msgstr "Suche mit `%s' fehlgeschlagen: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:759
-#, c-format
-msgid "'%s' is not an LDAP URL\n"
-msgstr "`%s' ist kein LDAP URL\n"
-
-#: dirmngr/dirmngr_ldap.c:765
-#, c-format
-msgid "'%s' is an invalid LDAP URL\n"
-msgstr "`%s' ist ein ungültiger LDAP URL\n"
-
-#: dirmngr/http.c:1989 dirmngr/ocsp.c:255
+#: dirmngr/http.c:1998 dirmngr/ocsp.c:255
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "Fehler beim Zugreifen auf `%s': HTTP Status %u\n"
 
-#: dirmngr/http.c:3630 dirmngr/ocsp.c:229
+#: dirmngr/http.c:3652 dirmngr/ocsp.c:229
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr "URL `%s' nach `%s' umgeleitet (%u)\n"
 
-#: dirmngr/http.c:3636 dirmngr/ocsp.c:246
+#: dirmngr/http.c:3658 dirmngr/ocsp.c:246
 #, c-format
 msgid "too many redirections\n"
 msgstr "zu viele verschachtelte Umleitungen\n"
 
-#: dirmngr/http.c:3748
+#: dirmngr/http.c:3768
 #, c-format
 msgid "redirection changed to '%s'\n"
 msgstr "\"Redirection\" geändert auf '%s'\n"
@@ -10889,31 +10689,51 @@ msgstr "Warten auf den LDAP Wrapper %d fehlgeschlagen: %s\n"
 msgid "ldap wrapper %d stalled - killing\n"
 msgstr "LDAP Wrapper %d versackt - abgeschossen\n"
 
-#: dirmngr/ldap.c:91
+#: dirmngr/ldap.c:92
 #, c-format
 msgid "invalid char 0x%02x in host name - not added\n"
 msgstr "Ungültiges Zeichen 0x%02X im Hostnamen - nicht hinzugefügt\n"
 
-#: dirmngr/ldap.c:95
+#: dirmngr/ldap.c:96
 #, c-format
 msgid "adding '%s:%d' to the ldap server list\n"
 msgstr "`%s:%d' wird der LDAP Serverliste hinzugefügt\n"
 
-#: dirmngr/ldap.c:98 dirmngr/misc.c:512
+#: dirmngr/ldap.c:99 dirmngr/misc.c:512
 #, c-format
 msgid "malloc failed: %s\n"
 msgstr "malloc() fehlgeschlagen: %s\n"
 
-#: dirmngr/ldap.c:634
+#: dirmngr/ldap.c:221
 #, c-format
-msgid "start_cert_fetch: invalid pattern '%s'\n"
-msgstr "start_cert_fetch: Ungültiges Muster `%s'\n"
+msgid "'%s' is not an LDAP URL\n"
+msgstr "`%s' ist kein LDAP URL\n"
+
+#: dirmngr/ldap.c:227 dirmngr/ldap.c:233
+#, c-format
+msgid "'%s' is an invalid LDAP URL\n"
+msgstr "`%s' ist ein ungültiger LDAP URL\n"
 
-#: dirmngr/ldap.c:846
+#: dirmngr/ldap.c:968
 #, c-format
 msgid "ldap_search hit the size limit of the server\n"
 msgstr "ldap_search erreichte die Größengrenze des Servers\n"
 
+#: dirmngr/ldapserver.c:119
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr "%s:%u: Passwort ohne Benutzer\n"
+
+#: dirmngr/ldapserver.c:181
+#, c-format
+msgid "%s:%u: ignoring unknown flag '%s'\n"
+msgstr "%s:%u: Unbekanntes Flag '%s' wird  nicht beachtet\n"
+
+#: dirmngr/ldapserver.c:203
+#, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr "%s:%u: Zeile wird übersprungen\n"
+
 #: dirmngr/misc.c:172
 #, c-format
 msgid "invalid canonical S-expression found\n"
@@ -11004,87 +10824,87 @@ msgstr "Nicht durch voreingestelltes OCSP \"Signer-Zertifikat\" signiert"
 msgid "allocating list item failed: %s\n"
 msgstr "malloc() fehlgeschlagen: %s\n"
 
-#: dirmngr/ocsp.c:537 dirmngr/ocsp.c:724
+#: dirmngr/ocsp.c:538 dirmngr/ocsp.c:725
 #, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "Fehler beim Holen der Responder-ID: %s\n"
 
-#: dirmngr/ocsp.c:584
+#: dirmngr/ocsp.c:585
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr ""
 "Kein benutzbares Zertifikat zur Überprüfung der OCSP Antwort gefunden\n"
 
-#: dirmngr/ocsp.c:623 dirmngr/validate.c:648
+#: dirmngr/ocsp.c:624 dirmngr/validate.c:648
 #, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "Herausgeberzertifikat nicht gefunden: %s\n"
 
-#: dirmngr/ocsp.c:633
+#: dirmngr/ocsp.c:634
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr "Aufrufer gab das Ziel Zertifikat nicht zurück\n"
 
-#: dirmngr/ocsp.c:640
+#: dirmngr/ocsp.c:641
 #, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "Aufrufer gab das Issuer Zertifikat nicht zurück\n"
 
-#: dirmngr/ocsp.c:650
+#: dirmngr/ocsp.c:651
 #, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "Fehler beim Bereitstellen eines OCSP Kontext: %s\n"
 
-#: dirmngr/ocsp.c:689
+#: dirmngr/ocsp.c:690
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr "Kein  voreingestellter OCSP Responder definiert\n"
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:696
 #, c-format
 msgid "no default OCSP signer defined\n"
 msgstr "Kein voreingestellter OCSP \"Signer\" definiert\n"
 
-#: dirmngr/ocsp.c:702
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr "Der voreingestellte OCSP Responder `%s' wird benutzt\n"
 
-#: dirmngr/ocsp.c:707
+#: dirmngr/ocsp.c:708
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "Der OCSP Responder `%s' wird benutzt\n"
 
-#: dirmngr/ocsp.c:764
+#: dirmngr/ocsp.c:765
 #, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "Fehler beim Holen des OCSP Status für das Zielzertifikat: %s\n"
 
-#: dirmngr/ocsp.c:789
+#: dirmngr/ocsp.c:790
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr "Zertifikatstatus ist: %s  (this=%s  next=%s)\n"
 
-#: dirmngr/ocsp.c:790
+#: dirmngr/ocsp.c:791
 msgid "good"
 msgstr "Gut"
 
-#: dirmngr/ocsp.c:796
+#: dirmngr/ocsp.c:797
 #, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "Zertifikat wurde widerrufen am: %s wegen: %s\n"
 
-#: dirmngr/ocsp.c:831
+#: dirmngr/ocsp.c:832
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr "OCSP Responder gab einen Status in der Zukunft zurück\n"
 
-#: dirmngr/ocsp.c:843
+#: dirmngr/ocsp.c:844
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr "OCSP Responder gab einen nicht aktuellen Status zurück\n"
 
-#: dirmngr/ocsp.c:858
+#: dirmngr/ocsp.c:859
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr "OCSP Responder gab einen zu alten Status zurück\n"
@@ -11094,71 +10914,67 @@ msgstr "OCSP Responder gab einen zu alten Status zurück\n"
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "assuan_inquire(%s) fehlgeschlagen: %s\n"
 
-#: dirmngr/server.c:1158
-msgid "ldapserver missing"
-msgstr "LDAP Server fehlt"
-
-#: dirmngr/server.c:1224
+#: dirmngr/server.c:1277
 msgid "serialno missing in cert ID"
 msgstr "Seriennummer fehlt in der Cert-ID"
 
-#: dirmngr/server.c:1387 dirmngr/server.c:1473 dirmngr/server.c:1909
-#: dirmngr/server.c:1980 dirmngr/server.c:2556 dirmngr/server.c:2571
+#: dirmngr/server.c:1440 dirmngr/server.c:1526 dirmngr/server.c:1963
+#: dirmngr/server.c:2034 dirmngr/server.c:2662 dirmngr/server.c:2677
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "assuan_inquire fehlgeschlagen: %s\n"
 
-#: dirmngr/server.c:1516
+#: dirmngr/server.c:1569
 #, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "fetch_cert_by_url() fehlgeschlagen: %s\n"
 
-#: dirmngr/server.c:1528 dirmngr/server.c:1559 dirmngr/server.c:1718
+#: dirmngr/server.c:1581 dirmngr/server.c:1612 dirmngr/server.c:1772
 #, c-format
 msgid "error sending data: %s\n"
 msgstr "Fehler beim Senden der Daten: %s\n"
 
-#: dirmngr/server.c:1666
+#: dirmngr/server.c:1720
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "start_cert_fetch fehlgeschlagen: %s\n"
 
-#: dirmngr/server.c:1699
+#: dirmngr/server.c:1753
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "fetch_next_cert fehlgeschlagen: %s\n"
 
-#: dirmngr/server.c:1726
+#: dirmngr/server.c:1780
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr "max_replies %d überschritten\n"
 
-#: dirmngr/server.c:2860
+#: dirmngr/server.c:2966
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "Fehler beim Erzeugen der Kontrollstruktur: %s\n"
 
-#: dirmngr/server.c:2871
+#: dirmngr/server.c:2977
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "Fehler beim Bereitstellen eines Assuan Kontext: %s\n"
 
-#: dirmngr/server.c:2892
+#: dirmngr/server.c:2998
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "Fehler beim Initialisieren des Servers: %s\n"
 
-#: dirmngr/server.c:2900
+#: dirmngr/server.c:3006
 #, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "Fehler beim Registrieren der Kommandos gegen Assuan: %s\n"
 
-#: dirmngr/server.c:2933
+#: dirmngr/server.c:3039
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "Assuan accept Problem: %s\n"
 
-#: dirmngr/server.c:2952
+#: dirmngr/server.c:3058
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "Assuan Verarbeitung fehlgeschlagen: %s\n"
@@ -11306,67 +11122,67 @@ msgstr "Der Keyboxd läuft nicht für diese Session\n"
 msgid "error sending standard options: %s\n"
 msgstr "Fehler beim Senden der Standardoptionen: %s\n"
 
-#: tools/gpgconf-comp.c:649
+#: tools/gpgconf-comp.c:655
 msgid "OpenPGP"
 msgstr "OpenPGP"
 
-#: tools/gpgconf-comp.c:653
+#: tools/gpgconf-comp.c:659
 msgid "S/MIME"
 msgstr "S/MIME"
 
-#: tools/gpgconf-comp.c:657
+#: tools/gpgconf-comp.c:663
 msgid "Public Keys"
 msgstr "Öffentliche Schlüssel"
 
-#: tools/gpgconf-comp.c:661
+#: tools/gpgconf-comp.c:667
 msgid "Private Keys"
 msgstr "Geheime Schlüssel"
 
-#: tools/gpgconf-comp.c:665
+#: tools/gpgconf-comp.c:671
 msgid "Smartcards"
 msgstr "Smartcard"
 
-#: tools/gpgconf-comp.c:669
+#: tools/gpgconf-comp.c:676
 msgid "TPM"
 msgstr "TPM"
 
-#: tools/gpgconf-comp.c:673
+#: tools/gpgconf-comp.c:681
 msgid "Network"
 msgstr "Netz"
 
-#: tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:685
 msgid "Passphrase Entry"
-msgstr "Passphrase Eingabe"
+msgstr "Passwort Eingabe"
 
-#: tools/gpgconf-comp.c:941
+#: tools/gpgconf-comp.c:951
 msgid "Component not suitable for launching"
 msgstr "Komponente unterstützt kein direktes starten"
 
-#: tools/gpgconf-comp.c:947
+#: tools/gpgconf-comp.c:957
 #, c-format
 msgid "Configuration file of component %s is broken\n"
 msgstr "Die Konfigurationsdatei der Komponente %s ist defekt\n"
 
-#: tools/gpgconf-comp.c:950
+#: tools/gpgconf-comp.c:960
 #, c-format
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr "Hinweis: Für Details bitte das Kommando \"%s%s\" verwenden.\n"
 
-#: tools/gpgconf-comp.c:2816
+#: tools/gpgconf-comp.c:2826
 #, c-format
 msgid "External verification of component %s failed"
 msgstr "Die externe Überprüfung der Komponente %s war nicht erfolgreich"
 
-#: tools/gpgconf-comp.c:2946
+#: tools/gpgconf-comp.c:2956
 msgid "Note that group specifications are ignored\n"
 msgstr "Beachten Sie, daß Gruppenspezifiaktionen ignoriert werden\n"
 
-#: tools/gpgconf-comp.c:3543
+#: tools/gpgconf-comp.c:3553
 #, c-format
 msgid "error closing '%s'\n"
 msgstr "Fehler beim Schließen von '%s'\n"
 
-#: tools/gpgconf-comp.c:3545
+#: tools/gpgconf-comp.c:3555
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr "Fehler beim Hashen von '%s'\n"
@@ -11447,15 +11263,15 @@ msgstr ""
 "Syntax: @GPGCONF@ {Optionen]\n"
 "Verwalte Konfigurationsoptionen für Programme des @GNUPG@ Systems\n"
 
-#: tools/gpgconf.c:669 tools/gpgconf.c:704
+#: tools/gpgconf.c:703 tools/gpgconf.c:738
 msgid "Need one component argument"
 msgstr "Benötige ein Komponentenargument"
 
-#: tools/gpgconf.c:678 tools/gpgconf.c:728 tools/gpgconf.c:778
+#: tools/gpgconf.c:712 tools/gpgconf.c:762 tools/gpgconf.c:812
 msgid "Component not found"
 msgstr "Komponente nicht gefunden"
 
-#: tools/gpgconf.c:804
+#: tools/gpgconf.c:838
 msgid "No argument allowed"
 msgstr "Argumente sind nicht erlaubt"
 
@@ -11469,36 +11285,36 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 "Syntax: gpg-check-pattern [optionen] Musterdatei\n"
-"Die von stdin gelesene Passphrase gegen die Musterdatei prüfen\n"
+"Das von stdin gelesene Passwort gegen die Musterdatei prüfen\n"
 
-#: tools/gpg-card.c:2390
+#: tools/gpg-card.c:2407
 #, c-format
 msgid "Note: key %s is already stored on the card!\n"
 msgstr "Hinweis: Schlüssel %s ist bereits auf der Karte gespeichert!\n"
 
-#: tools/gpg-card.c:2393
+#: tools/gpg-card.c:2410
 #, c-format
 msgid "Note: Keys are already stored on the card!\n"
 msgstr "Hinweis: Auf der Karte sind bereits Schlüssel gespeichert!\n"
 
-#: tools/gpg-card.c:2396
+#: tools/gpg-card.c:2413
 #, c-format
 msgid "Replace existing key %s ? (y/N) "
 msgstr "Vorhandenen Schlüssel %s ersetzen? (j/N) "
 
-#: tools/gpg-card.c:2549 tools/gpg-card.c:2712 tools/gpg-card.c:2935
-#: tools/gpg-card.c:3044
+#: tools/gpg-card.c:2566 tools/gpg-card.c:2729 tools/gpg-card.c:2952
+#: tools/gpg-card.c:3061
 #, c-format
 msgid "%s card no. %s detected\n"
 msgstr "%s Karte Nr. %s erkannt\n"
 
-#: tools/gpg-card.c:3396
+#: tools/gpg-card.c:3413
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 "User Interaction Flag ist auf \"%s\" gesetzt - Änderung nicht möglich\n"
 
-#: tools/gpg-card.c:3406 tools/gpg-card.c:3420
+#: tools/gpg-card.c:3423 tools/gpg-card.c:3437
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
@@ -11507,51 +11323,194 @@ msgstr ""
 "WARNUNG: Das Setzen des User Interaction Flags auf \"%s\" kann\n"
 "         nur durch ein \"factory-reset\" rückgängig gemacht werden!\n"
 
-#: tools/gpg-card.c:3423
+#: tools/gpg-card.c:3440
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr "Bitte \"uif --yes %d %s\" benutzen\n"
 
-#: tools/gpg-card.c:3669
+#: tools/gpg-card.c:3686
 msgid "authenticate to the card"
 msgstr "Gegen die Karte authentifizieren"
 
-#: tools/gpg-card.c:3671
+#: tools/gpg-card.c:3688
 msgid "send a reset to the card daemon"
 msgstr "Ein Reset an den SCdaemon senden"
 
-#: tools/gpg-card.c:3673
+#: tools/gpg-card.c:3690
 msgid "setup KDF for PIN authentication"
 msgstr "Einrichten der KDF zur Authentifizierung"
 
-#: tools/gpg-card.c:3675
+#: tools/gpg-card.c:3692
 msgid "change a private data object"
 msgstr "Ein privates Datenobjekt ändern"
 
-#: tools/gpg-card.c:3676
+#: tools/gpg-card.c:3693
 msgid "read a certificate from a data object"
 msgstr "Ein Zertifikat aus einem Datenobjekt lesen"
 
-#: tools/gpg-card.c:3677
+#: tools/gpg-card.c:3694
 msgid "store a certificate to a data object"
 msgstr "Ein Zertifikat in einem Datenobjekt speichern"
 
-#: tools/gpg-card.c:3678
+#: tools/gpg-card.c:3695
 msgid "store a private key to a data object"
 msgstr "Privaten Schlüssel in einem Datenobjekt speichern"
 
-#: tools/gpg-card.c:3679
+#: tools/gpg-card.c:3696
 msgid "Yubikey management commands"
 msgstr "Verwaltungskommandos für Yubikeys"
 
-#: tools/gpg-card.c:3681
+#: tools/gpg-card.c:3698
 msgid "manage the command history"
 msgstr "Verwaltung der Kommandohistorie"
 
+#~ msgid "Options useful for debugging"
+#~ msgstr "Nützliche Optionen zur Fehlersuche"
+
+#~ msgid "allow PKA lookups (DNS requests)"
+#~ msgstr "Erlaube PKA Zugriffe (DNS Anfragen)"
+
+#~ msgid "Options controlling the format of the output"
+#~ msgstr "Optionen zum Einstellen der Ausgabeformate"
+
+#~ msgid "Options controlling the interactivity and enforcement"
+#~ msgstr "Optionen zur Einstellung der Interaktivität und Geltendmachung"
+
+#~ msgid "Options controlling the use of Tor"
+#~ msgstr "Optionen zur Benutzung von Tor"
+
+#~ msgid "LDAP server list"
+#~ msgstr "Liste der LDAP Server"
+
+#~ msgid "requesting key %s from %s server %s\n"
+#~ msgstr "fordere Schlüssel %s von %s-Server %s an\n"
+
+#~ msgid "%s:%u: no hostname given\n"
+#~ msgstr "%s:%u: Kein Server-Name angegeben\n"
+
+#~ msgid "could not parse keyserver\n"
+#~ msgstr "Schlüsselserver-URL konnte nicht analysiert werden\n"
+
+#~ msgid "return all values in a record oriented format"
+#~ msgstr "Alle Werte in einem Record Format zurückgeben"
+
+#~ msgid "|NAME|ignore host part and connect through NAME"
+#~ msgstr "|NAME|Host Teil ignorieren und über NAME verbinden"
+
+#~ msgid "force a TLS connection"
+#~ msgstr "Eine TLS Verbindung erzwingen"
+
+#~ msgid "|NAME|connect to host NAME"
+#~ msgstr "|NAME|Verbinde mit dem Host NAME"
+
+#~ msgid "|N|connect to port N"
+#~ msgstr "|N|Verbinde mit dem Port N"
+
+#~ msgid "|NAME|use user NAME for authentication"
+#~ msgstr "|NAME|Benutze NAME zur Authentifizierung"
+
+#~ msgid "|PASS|use password PASS for authentication"
+#~ msgstr "Benutze Passwort PASS zur Authentifizierung"
+
+#~ msgid "take password from $DIRMNGR_LDAP_PASS"
+#~ msgstr "Nimm das Passwort von $DIRMNGR_LDAP_PASS"
+
+#~ msgid "|STRING|query DN STRING"
+#~ msgstr "|STRING|Frage den DN STRING ab"
+
+#~ msgid "|STRING|use STRING as filter expression"
+#~ msgstr "|STRING|Benutze STRING als Filterausdruck"
+
+#~ msgid "|STRING|return the attribute STRING"
+#~ msgstr "|STRING|Gib das Attribut STRING zurück"
+
+#~ msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
+#~ msgstr "Gebrauch: dirmngr_ldap [Optionen] [URL] (-h für Hilfe)\n"
+
+#~ msgid ""
+#~ "Syntax: dirmngr_ldap [options] [URL]\n"
+#~ "Internal LDAP helper for Dirmngr\n"
+#~ "Interface and options may change without notice\n"
+#~ msgstr ""
+#~ "Gebrauch: dirmngr_ldap [Optionen] [URL] (-h für Hilfe)\n"
+#~ "Internes LDAP-Hilfsprogramm für Dirmngr.\n"
+#~ "Interface und Optionen können sich mit jedem Release ändern.\n"
+
+#~ msgid "invalid port number %d\n"
+#~ msgstr "Ungültige Portnummer %d\n"
+
+#~ msgid "scanning result for attribute '%s'\n"
+#~ msgstr "Absuchen des Ergebnisses nach Attribut `%s'\n"
+
+#~ msgid "error writing to stdout: %s\n"
+#~ msgstr "Fehler beim Schreiben auf Standardausgabe: %s\n"
+
+#~ msgid "          available attribute '%s'\n"
+#~ msgstr "        verfügbare Attribute `%s'\n"
+
+#~ msgid "attribute '%s' not found\n"
+#~ msgstr "Attribut `%s' nicht gefunden\n"
+
+#~ msgid "found attribute '%s'\n"
+#~ msgstr "Attribut `%s' gefunden\n"
+
+#~ msgid "processing url '%s'\n"
+#~ msgstr "Verarbeiten der URL `%s'\n"
+
+#~ msgid "          user '%s'\n"
+#~ msgstr "           Benutzer `%s'\n"
+
+#~ msgid "          pass '%s'\n"
+#~ msgstr "           Passwort `%s'\n"
+
+#~ msgid "          host '%s'\n"
+#~ msgstr "               Host `%s'\n"
+
+#~ msgid "          port %d\n"
+#~ msgstr "               Port %d\n"
+
+#~ msgid "            DN '%s'\n"
+#~ msgstr "                 DN `%s'\n"
+
+#~ msgid "        filter '%s'\n"
+#~ msgstr "             Filter `%s'\n"
+
+#~ msgid "          attr '%s'\n"
+#~ msgstr "           Attribut `%s'\n"
+
+#~ msgid "no host name in '%s'\n"
+#~ msgstr "Kein Hostname in `%s'\n"
+
+#~ msgid "no attribute given for query '%s'\n"
+#~ msgstr "Kein Attribut für Abfrage `%s' angegeben\n"
+
+#~ msgid "WARNING: using first attribute only\n"
+#~ msgstr "WARNUNG: Es wird nur das erste Attribut benutzt\n"
+
+#~ msgid "LDAP init to '%s:%d' failed: %s\n"
+#~ msgstr "LDAP Initialisierung von `%s:%d' fehlgeschlagen: %s\n"
+
+#~ msgid "LDAP init to '%s' failed: %s\n"
+#~ msgstr "LDAP Initialisierung nach `%s' fehlgeschlagen: %s\n"
+
+#~ msgid "LDAP init to '%s' done\n"
+#~ msgstr "LDAP Initialisierung nach `%s' durchgeführt\n"
+
+#~ msgid "binding to '%s:%d' failed: %s\n"
+#~ msgstr "Anbindung an `%s:%d' fehlgeschlagen: %s\n"
+
+#~ msgid "searching '%s' failed: %s\n"
+#~ msgstr "Suche mit `%s' fehlgeschlagen: %s\n"
+
+#~ msgid "start_cert_fetch: invalid pattern '%s'\n"
+#~ msgstr "start_cert_fetch: Ungültiges Muster `%s'\n"
+
+#~ msgid "ldapserver missing"
+#~ msgstr "LDAP Server fehlt"
+
 #, fuzzy
-#~| msgid "change a passphrase"
 #~ msgid "Suggest a random passphrase."
-#~ msgstr "Die Passphrase ändern"
+#~ msgstr "Das Passwort ändern"
 
 #~ msgid "detected card with S/N: %s\n"
 #~ msgstr "Erkannte Karte hat die Seriennummer: %s\n"
@@ -11685,18 +11644,6 @@ msgstr "Verwaltung der Kommandohistorie"
 #~ msgid "run without asking a user"
 #~ msgstr "Ausführung ohne Benutzernachfrage"
 
-#~ msgid "allow PKA lookups (DNS requests)"
-#~ msgstr "Erlaube PKA Zugriffe (DNS Anfragen)"
-
-#~ msgid "Options controlling the format of the output"
-#~ msgstr "Optionen zum Einstellen der Ausgabeformate"
-
-#~ msgid "Options controlling the use of Tor"
-#~ msgstr "Optionen zur Benutzung von Tor"
-
-#~ msgid "LDAP server list"
-#~ msgstr "Liste der LDAP Server"
-
 #~ msgid "Note: old default options file '%s' ignored\n"
 #~ msgstr "Hinweis: Alte voreingestellte Optionendatei '%s' wurde ignoriert\n"
 
@@ -12116,7 +12063,7 @@ msgstr "Verwaltung der Kommandohistorie"
 #~ "%u-bit %s key, ID %s,\n"
 #~ "created %s%s.\n"
 #~ msgstr ""
-#~ "Sie benötigen eine Passphrase, um den geheimen OpenPGP Schlüssel zu "
+#~ "Sie benötigen ein Passwort, um den geheimen OpenPGP Schlüssel zu "
 #~ "entsperren.\n"
 #~ "Benutzer: \"%.*s\"\n"
 #~ "%u-bit %s Schlüssel, ID %s, erzeugt %s%s\n"
@@ -12125,7 +12072,7 @@ msgstr "Verwaltung der Kommandohistorie"
 #~ "You need a passphrase to unlock the secret key for\n"
 #~ "user: \"%s\"\n"
 #~ msgstr ""
-#~ "Sie benötigen eine Passphrase, um den geheimen Schlüssel zu entsperren.\n"
+#~ "Sie benötigen ein Passwort, um den geheimen Schlüssel zu entsperren.\n"
 #~ "Benutzer: \"%s\"\n"
 
 #~ msgid "%u-bit %s key, ID %s, created %s"
@@ -12250,18 +12197,18 @@ msgstr "Verwaltung der Kommandohistorie"
 #~ "You need a Passphrase to protect your secret key.\n"
 #~ "\n"
 #~ msgstr ""
-#~ "Sie benötigen eine Passphrase, um den geheimen Schlüssel zu schützen.\n"
+#~ "Sie benötigen ein Passwort, um den geheimen Schlüssel zu schützen.\n"
 #~ "\n"
 
 #~ msgid ""
 #~ "Please enter a passphrase to protect the off-card backup of the new "
 #~ "encryption key."
 #~ msgstr ""
-#~ "Bitte geben Sie die Passphrase ein, um die Sicherheitskopie des neuen "
+#~ "Bitte geben Sie das Passwort ein, um die Sicherheitskopie des neuen "
 #~ "Verschlüsselungsschlüssel der Karte zu schützen."
 
 #~ msgid "passphrase not correctly repeated; try again"
-#~ msgstr "Passphrase wurde nicht richtig wiederholt; noch einmal versuchen"
+#~ msgstr "Das Passwort wurde nicht richtig wiederholt; noch einmal versuchen"
 
 #~ msgid "%s.\n"
 #~ msgstr "%s.\n"
@@ -12272,8 +12219,8 @@ msgstr "Verwaltung der Kommandohistorie"
 #~ "using this program with the option \"--edit-key\".\n"
 #~ "\n"
 #~ msgstr ""
-#~ "Sie möchten keine Passphrase - Dies ist *nicht* zu empfehlen!\n"
-#~ "Es ist trotzdem möglich.  Sie können Ihre Passphrase jederzeit\n"
+#~ "Sie möchten kein Passwort - Dies ist *nicht* zu empfehlen!\n"
+#~ "Es ist trotzdem möglich.  Sie können Ihr Passwort jederzeit\n"
 #~ "ändern, indem sie dieses Programm mit dem Befehl \"--edit-key\"\n"
 #~ "aufrufen.\n"
 #~ "\n"
@@ -12305,7 +12252,7 @@ msgstr "Verwaltung der Kommandohistorie"
 #~ msgstr "%d marginal-needed, %d complete-needed, %s Vertrauensmodell\n"
 
 #~ msgid "cleared passphrase cached with ID: %s\n"
-#~ msgstr "Passphrase aus dem Cache gelöscht.  Cache ID: %s\n"
+#~ msgstr "Passwort aus dem Cache gelöscht.  Cache ID: %s\n"
 
 #~ msgid "Failed to open the keyring DB\n"
 #~ msgstr "Fehler beim Öffnen der Schlüsseldatenbank\n"
@@ -12348,7 +12295,7 @@ msgstr "Verwaltung der Kommandohistorie"
 #~ "Umschalten zwischen dem Auflisten geheimer und öffentlicher Schlüssel"
 
 #~ msgid "Passphrase"
-#~ msgstr "Passphrase"
+#~ msgstr "Passwort"
 
 #~ msgid "use temporary files to pass data to keyserver helpers"
 #~ msgstr ""
@@ -12605,14 +12552,14 @@ msgstr "Verwaltung der Kommandohistorie"
 #~ "Enter the new passphrase for this secret key.\n"
 #~ "\n"
 #~ msgstr ""
-#~ "Geben Sie die neue Passphrase für diesen geheimen Schlüssel ein.\n"
+#~ "Geben Sie das neue Passwort für diesen geheimen Schlüssel ein.\n"
 #~ "\n"
 
 #~ msgid ""
 #~ "You don't want a passphrase - this is probably a *bad* idea!\n"
 #~ "\n"
 #~ msgstr ""
-#~ "Sie wollen keine Passphrase - dies ist *nicht* zu empfehlen!\n"
+#~ "Sie wollen kein Passwort - dies ist *nicht* zu empfehlen!\n"
 #~ "\n"
 
 #~ msgid "Do you really want to do this? (y/N) "
@@ -12643,7 +12590,7 @@ msgstr "Verwaltung der Kommandohistorie"
 #~ msgstr "Fehler beim Schreiben des Schlüssels auf die Karte: %s\n"
 
 #~ msgid "remove the passphrase from exported subkeys"
-#~ msgstr "Die Passphrase von exportierten Unterschlüssel entfernen"
+#~ msgstr "Das Passwort von exportierten Unterschlüssel entfernen"
 
 #~ msgid "key %s: not protected - skipped\n"
 #~ msgstr "Schlüssel %s: ungeschützt - übersprungen\n"
@@ -12733,7 +12680,7 @@ msgstr "Verwaltung der Kommandohistorie"
 #~ msgstr "Dieser Schlüssel ist nicht geschützt.\n"
 
 #~ msgid "Invalid passphrase; please try again"
-#~ msgstr "Ungültige Passphrase; versuchen Sie es bitte noch einmal"
+#~ msgstr "Ungültiges Passwort; versuchen Sie es bitte noch einmal"
 
 #~ msgid "%s ...\n"
 #~ msgstr "%s ...\n"
@@ -12741,7 +12688,7 @@ msgstr "Verwaltung der Kommandohistorie"
 #~ msgid "WARNING: Weak key detected - please change passphrase again.\n"
 #~ msgstr ""
 #~ "WARNUNG: Unsicherer Schlüssel entdeckt -\n"
-#~ "         bitte Passphrase nochmals wechseln.\n"
+#~ "         bitte Passwort nochmals wechseln.\n"
 
 #~ msgid ""
 #~ "generating the deprecated 16-bit checksum for secret key protection\n"
@@ -12773,7 +12720,7 @@ msgstr "Verwaltung der Kommandohistorie"
 #~ msgstr "Dieser Befehl wurde noch nicht implementiert\n"
 
 #~ msgid "Repeat passphrase\n"
-#~ msgstr "Geben Sie die Passphrase nochmal ein\n"
+#~ msgstr "Geben Sie das Passwort nochmal ein\n"
 
 #~ msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 #~ msgstr ""
@@ -13103,15 +13050,15 @@ msgstr "Verwaltung der Kommandohistorie"
 #~ "Eigenbeglaubigungen werden um eine Sekunde vorgestellt.\n"
 
 #~ msgid "Please enter the passphrase; this is a secret sentence \n"
-#~ msgstr "Bitte geben Sie die Passphrase ein. Dies ist ein geheimer Satz \n"
+#~ msgstr "Bitte geben Sie das Passwort ein. Dies ist ein geheimer Satz \n"
 
 #~ msgid ""
 #~ "Please repeat the last passphrase, so you are sure what you typed in."
 #~ msgstr ""
-#~ "Um sicher zu gehen, daß Sie sich bei der Eingabe der Passphrase nicht\n"
-#~ "vertippt haben, geben Sie diese bitte nochmal ein.  Nur wenn beide "
+#~ "Um sicher zu gehen, daß Sie sich bei der Eingabe des Passwortes nicht\n"
+#~ "vertippt haben, geben Sie dieses bitte nochmal ein.  Nur wenn beide "
 #~ "Eingaben\n"
-#~ "übereinstimmen, wird die Passphrase akzeptiert."
+#~ "übereinstimmen, wird das Passwort akzeptiert."
 
 #~ msgid "Give the name of the file to which the signature applies"
 #~ msgstr ""
diff --git a/po/el.po b/po/el.po
index 2dd06c7..31a9afc 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: 2021-04-20 12:38+0200\n"
+"POT-Creation-Date: 2021-08-24 18:50+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:328
+#: agent/call-pinentry.c:338
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "αποτυχία α�χικοποίησης της TrustDB: %s\n"
@@ -29,48 +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:546
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_OK"
 msgstr ""
 
-#: agent/call-pinentry.c:547
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
-#: agent/call-pinentry.c:548
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|_Yes"
 msgstr ""
 
-#: agent/call-pinentry.c:549
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_No"
 msgstr ""
 
-#: agent/call-pinentry.c:550
+#: agent/call-pinentry.c:560
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:551
+#: agent/call-pinentry.c:561
 msgid "|pinentry-label|_Save in password manager"
 msgstr ""
 
-#: agent/call-pinentry.c:552
+#: agent/call-pinentry.c:562
 #, fuzzy
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "Σίγου�α θέλετε να διαγ�αφο�ν τα επιλεγμένα κλειδιά; "
 
-#: agent/call-pinentry.c:554
+#: agent/call-pinentry.c:564
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:555
+#: agent/call-pinentry.c:565
 #, fuzzy
 #| msgid "invalid passphrase"
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "μη έγκυ�η φ�άση κλειδί"
 
+#: agent/call-pinentry.c:566
+msgid "Caps Lock is on"
+msgstr ""
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:944
+#: agent/call-pinentry.c:1022
 msgid "Suggest"
 msgstr ""
 
@@ -81,13 +85,25 @@ 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:966
+#: agent/call-pinentry.c:1044
 msgid "pinentry.genpin.tooltip"
 msgstr ""
 
+#: agent/call-pinentry.c:1072
+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
+#, 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:998
+#: agent/call-pinentry.c:1198
 msgid "Quality:"
 msgstr ""
 
@@ -97,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:1019
+#: agent/call-pinentry.c:1219
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:1263
+#: agent/call-pinentry.c:1477
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:1266
+#: agent/call-pinentry.c:1480
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Πληκτ�ολογήστε τη φ�άση κλειδί· αυτή είναι μια μυστική π�όταση \n"
 
-#: agent/call-pinentry.c:1303 agent/call-pinentry.c:1506
+#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1303 agent/call-pinentry.c:1506
-#: agent/protect-tool.c:728
+#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/protect-tool.c:729
 #, fuzzy
 msgid "Passphrase:"
 msgstr "κακή φ�άση κλειδί"
 
-#: agent/call-pinentry.c:1330 agent/call-pinentry.c:1580 agent/command.c:1799
-#: agent/command.c:1852 agent/command-ssh.c:3046 agent/genkey.c:398
+#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
+#: agent/command.c:1988 agent/command-ssh.c:3046 agent/genkey.c:442
 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:1351 agent/call-pinentry.c:1603
+#: agent/call-pinentry.c:1566 agent/call-pinentry.c:1830
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:1362 agent/call-pinentry.c:1614
+#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
 msgid "Repeat:"
 msgstr ""
 
-#: agent/call-pinentry.c:1372 agent/call-pinentry.c:1384
-#: agent/call-pinentry.c:1624 agent/call-pinentry.c:1636
+#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
+#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
 #, fuzzy
 msgid "PIN too long"
 msgstr "η γ�αμμή είναι πολ� μεγάλη\n"
 
-#: agent/call-pinentry.c:1373 agent/call-pinentry.c:1625
+#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "η φ�άση κλειδί είναι πολ� μεγάλη\n"
 
-#: agent/call-pinentry.c:1381 agent/call-pinentry.c:1633
+#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Μη έγκυ�ος χα�ακτή�ας στο όνομα\n"
 
-#: agent/call-pinentry.c:1386 agent/call-pinentry.c:1638
+#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:1405 agent/call-pinentry.c:1656
+#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
 #, fuzzy
 msgid "Bad PIN"
 msgstr "κακό MPI"
 
-#: agent/call-pinentry.c:1405 agent/call-pinentry.c:1656
+#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "κακή φ�άση κλειδί"
 
-#: agent/command.c:697
+#: agent/command.c:823
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:698
+#: agent/command.c:824
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1106 g10/card-util.c:708 g10/card-util.c:729
+#: agent/command.c:1235 g10/card-util.c:713 g10/card-util.c:734
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: agent/command.c:1634 agent/command.c:1791 agent/command-ssh.c:2974
-#: agent/genkey.c:333
+#: agent/command.c:1756 agent/command.c:1921 agent/command-ssh.c:2974
+#: agent/genkey.c:377
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "αλλαγή της φ�άσης κλειδί"
 
-#: agent/command.c:2567
+#: agent/command.c:2703
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to protect the imported object within the %s "
 "system."
 msgstr "Πληκτ�ολογήστε τη φ�άση κλειδί· αυτή είναι μια μυστική π�όταση \n"
 
-#: agent/command.c:2697
+#: agent/command.c:2833
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -208,26 +224,26 @@ msgstr ""
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "δεν υποστη�ίζεται ο αλγό�ιθμος π�οστασίας %d%s\n"
 
-#: agent/command-ssh.c:872 common/dotlock.c:852 g10/card-util.c:953
-#: g10/export.c:1329 g10/gpg.c:1431 g10/keygen.c:5347 g10/keyring.c:1319
-#: g10/keyring.c:1632 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
+#: agent/command-ssh.c:872 common/dotlock.c:852 g10/card-util.c:963
+#: g10/export.c:1329 g10/gpg.c:1431 g10/keygen.c:5377 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
 #: g10/sign.c:1106 g10/sign.c:1443 g10/tdbio.c:753 tools/gpg-card.c:479
 #, fuzzy, c-format
 #| msgid "can't create `%s': %s\n"
 msgid "can't create '%s': %s\n"
 msgstr "αδυναμία δημιου�γίας του `%s': %s\n"
 
-#: agent/command-ssh.c:884 common/helpfile.c:57 g10/card-util.c:910
+#: agent/command-ssh.c:884 common/helpfile.c:57 g10/card-util.c:920
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
 #: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:721 g10/gpg.c:1432
-#: g10/import.c:371 g10/import.c:558 g10/import.c:793 g10/keygen.c:4322
-#: g10/keyring.c:1658 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
+#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4326
+#: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
 #: g10/plaintext.c:610 g10/sign.c:1086 g10/sign.c:1311 g10/sign.c:1424
 #: g10/sign.c:1596 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2380
-#: sm/gpgsm.c:2410 sm/gpgsm.c:2448 sm/keylist.c:1737 sm/qualified.c:65
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2236
+#: sm/gpgsm.c:2266 sm/gpgsm.c:2304 sm/keylist.c:1775 sm/qualified.c:65
 #: dirmngr/certcache.c:396 dirmngr/certcache.c:476 dirmngr/certcache.c:478
-#: dirmngr/crlcache.c:2588 dirmngr/dirmngr.c:1720 tools/gpg-card.c:408
+#: dirmngr/crlcache.c:2591 dirmngr/dirmngr.c:1759 tools/gpg-card.c:408
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
@@ -336,39 +352,39 @@ msgstr "η φÏ�άση κλειδί δεν επαναλήφθηκε σωστά. Î
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:109 sm/certreqgen-ui.c:433
+#: 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:116
+#: agent/genkey.c:150
 #, fuzzy, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "εγγ�αφή στο  `%s'\n"
 
-#: agent/genkey.c:154
+#: agent/genkey.c:191
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Πληκτ�ολογήστε τη φ�άση κλειδί\n"
 
-#: agent/genkey.c:184
+#: agent/genkey.c:227
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:186
+#: agent/genkey.c:229
 #, 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:198
+#: agent/genkey.c:241
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:215
+#: agent/genkey.c:258
 #, fuzzy, c-format
 #| msgid "Name must be at least 5 characters long\n"
 msgid "A passphrase should be at least %u character long."
@@ -376,7 +392,7 @@ msgid_plural "A passphrase should be at least %u characters long."
 msgstr[0] "Το όνομα π�έπει να έχει τουλάχιστον 5 χα�ακτή�ες\n"
 msgstr[1] "Το όνομα π�έπει να έχει τουλάχιστον 5 χα�ακτή�ες\n"
 
-#: agent/genkey.c:234
+#: agent/genkey.c:277
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -384,387 +400,386 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:260
+#: agent/genkey.c:304
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:275
+#: agent/genkey.c:319
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
-#: agent/genkey.c:296
+#: agent/genkey.c:340
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "Χ�ήση οπωσδήποτε αυτο� του κλειδιο�; "
 
-#: agent/genkey.c:464
+#: agent/genkey.c:508
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr ""
 "Χ�ειάζεστε μια Φ�άση κλειδί για να π�οστατε�σετε το μυστικό κλειδί.\n"
 "\n"
 
-#: agent/genkey.c:590
+#: agent/genkey.c:637
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "αλλαγή της φ�άσης κλειδί"
 
-#: agent/gpg-agent.c:162 scd/scdaemon.c:115 dirmngr/dirmngr.c:182
+#: agent/gpg-agent.c:164 scd/scdaemon.c:115 dirmngr/dirmngr.c:183
 msgid "Options used for startup"
 msgstr ""
 
-#: agent/gpg-agent.c:164 scd/scdaemon.c:120 dirmngr/dirmngr.c:171
+#: agent/gpg-agent.c:166 scd/scdaemon.c:120 dirmngr/dirmngr.c:172
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:117 dirmngr/dirmngr.c:170
+#: agent/gpg-agent.c:167 scd/scdaemon.c:117 dirmngr/dirmngr.c:171
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:167 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:169 dirmngr/dirmngr.c:174
 #, fuzzy
 #| msgid "Key is superseded"
 msgid "run in supervised mode"
 msgstr "Το κλειδί έχει πα�ακαμθεί"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:121 dirmngr/dirmngr.c:184
+#: agent/gpg-agent.c:171 scd/scdaemon.c:121 dirmngr/dirmngr.c:185
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:170 scd/scdaemon.c:122 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:172 scd/scdaemon.c:122 dirmngr/dirmngr.c:186
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:171 scd/scdaemon.c:123 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:173 scd/scdaemon.c:123 dirmngr/dirmngr.c:187
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:179 g10/gpg.c:589 scd/scdaemon.c:125 sm/gpgsm.c:422
-#: dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:181 g10/gpg.c:589 scd/scdaemon.c:125 sm/gpgsm.c:423
+#: dirmngr/dirmngr.c:189
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|ΑΡΧΕΙΟ|φό�τωμα του α�θ�ώματος επέκτασης ΑΡΧΕΙΟ"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:574 scd/scdaemon.c:129 sm/gpgsm.c:265
-#: dirmngr/dirmngr.c:192
+#: agent/gpg-agent.c:185 g10/gpg.c:574 scd/scdaemon.c:129 sm/gpgsm.c:265
+#: dirmngr/dirmngr.c:193
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: agent/gpg-agent.c:185 g10/gpg.c:576 g10/gpgv.c:78 kbx/kbxutil.c:89
+#: agent/gpg-agent.c:187 g10/gpg.c:576 g10/gpgv.c:78 kbx/kbxutil.c:89
 #: scd/scdaemon.c:131 sm/gpgsm.c:267 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:194 dirmngr/dirmngr_ldap.c:102
-#: tools/gpg-connect-agent.c:85 tools/gpgconf.c:111
+#: dirmngr/dirmngr.c:195 tools/gpg-connect-agent.c:85 tools/gpgconf.c:111
 msgid "verbose"
 msgstr "αναλυτικά"
 
-#: agent/gpg-agent.c:186 g10/gpg.c:578 g10/gpgv.c:79 kbx/kbxutil.c:90
+#: agent/gpg-agent.c:188 g10/gpg.c:578 g10/gpgv.c:79 kbx/kbxutil.c:90
 #: scd/scdaemon.c:132 sm/gpgsm.c:269 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:195 dirmngr/dirmngr_ldap.c:103
+#: dirmngr/dirmngr.c:196
 msgid "be somewhat more quiet"
 msgstr "ήσυχη έξοδος"
 
-#: agent/gpg-agent.c:194 g10/gpg.c:593 sm/gpgsm.c:283 dirmngr/dirmngr.c:205
+#: agent/gpg-agent.c:196 g10/gpg.c:593 sm/gpgsm.c:283 dirmngr/dirmngr.c:206
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 scd/scdaemon.c:146 sm/gpgsm.c:290
-#: dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:599 scd/scdaemon.c:146 sm/gpgsm.c:290
+#: dirmngr/dirmngr.c:210
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: agent/gpg-agent.c:201
+#: agent/gpg-agent.c:203
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "ανανέωση της βάσης δεδομένων εμπιστοσ�νης"
 
-#: agent/gpg-agent.c:203
+#: agent/gpg-agent.c:205
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 #, fuzzy
 #| msgid "|NAME|set terminal charset to NAME"
 msgid "|NAME|accept some commands via NAME"
 msgstr "|Ο�ΟΜΑ|καθο�ισμός του σετ χα�ακτή�ων τε�ματικο� σε Ο�ΟΜΑ"
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:215
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:216
+#: agent/gpg-agent.c:218
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
 msgstr "δεν υποστη�ίζεται"
 
-#: agent/gpg-agent.c:218
+#: agent/gpg-agent.c:220
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:221
+#: agent/gpg-agent.c:223
 #, fuzzy
 #| msgid "not supported"
 msgid "enable putty support"
 msgstr "δεν υποστη�ίζεται"
 
-#: agent/gpg-agent.c:233 g10/gpg.c:844 scd/scdaemon.c:176 sm/gpgsm.c:382
+#: agent/gpg-agent.c:235 g10/gpg.c:844 scd/scdaemon.c:176 sm/gpgsm.c:383
 msgid "Options controlling the security"
 msgstr ""
 
-#: agent/gpg-agent.c:236
+#: agent/gpg-agent.c:238
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:238
+#: agent/gpg-agent.c:240
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:242
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:244
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:246
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:248
 #, fuzzy
 msgid "disallow the use of an external password cache"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:250
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:253
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: agent/gpg-agent.c:256
+#: agent/gpg-agent.c:258
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:261
 msgid "do not allow bypassing the passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:261
+#: agent/gpg-agent.c:263
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:265
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:266
+#: agent/gpg-agent.c:268
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:268
+#: agent/gpg-agent.c:272
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|χ�ήση της κατάστασης φ�άσης κλειδί N"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:274
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: agent/gpg-agent.c:273
+#: agent/gpg-agent.c:277
 msgid "Options controlling the PIN-Entry"
 msgstr ""
 
-#: agent/gpg-agent.c:275
+#: agent/gpg-agent.c:279
 #, fuzzy
 #| msgid "use the gpg-agent"
 msgid "never use the PIN-entry"
 msgstr "χ�ήση του gpg-agent"
 
-#: agent/gpg-agent.c:277
+#: agent/gpg-agent.c:281
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:283
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:282
+#: agent/gpg-agent.c:286
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:286
+#: agent/gpg-agent.c:290
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:294
 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:551 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: agent/gpg-agent.c:557 agent/preset-passphrase.c:99 agent/protect-tool.c:154
 #: g10/gpg.c:1132 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:612 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:438
-#: dirmngr/dirmngr_ldap.c:175 tools/gpg-connect-agent.c:220 tools/gpgconf.c:151
+#: sm/gpgsm.c:613 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:446
+#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:151
 #: tools/gpg-check-pattern.c:143
 #, fuzzy
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Αναφέ�ετε τα π�οβλήματα στο <gnupg-bugs@gnu.org>\n"
 
-#: agent/gpg-agent.c:560
+#: agent/gpg-agent.c:566
 #, fuzzy
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Χ�ήση: gpg [επιλογές] [α�χεία] (-h για βοήθεια)"
 
-#: agent/gpg-agent.c:562
+#: agent/gpg-agent.c:568
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:607 g10/gpg.c:1337 scd/scdaemon.c:384 sm/gpgsm.c:760
-#: dirmngr/dirmngr.c:522
+#: agent/gpg-agent.c:613 g10/gpg.c:1337 scd/scdaemon.c:384 sm/gpgsm.c:761
+#: dirmngr/dirmngr.c:530
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:972 g10/gpg.c:3910 g10/gpg.c:3934 sm/gpgsm.c:1769
-#: sm/gpgsm.c:1775
+#: agent/gpg-agent.c:986 g10/gpg.c:3907 g10/gpg.c:3931 sm/gpgsm.c:1622
+#: sm/gpgsm.c:1628
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "ο επιλεγμένος αλγό�ιθμος πε�ίληψης δεν είναι έγκυ�ος\n"
 
-#: agent/gpg-agent.c:1196 agent/gpg-agent.c:2019 common/comopt.c:93
-#: g10/gpg.c:2591 scd/scdaemon.c:549 sm/gpgsm.c:1155 dirmngr/dirmngr.c:989
-#: dirmngr/dirmngr.c:1840
+#: agent/gpg-agent.c:1210 agent/gpg-agent.c:2035 common/comopt.c:93
+#: g10/gpg.c:2594 scd/scdaemon.c:549 sm/gpgsm.c:1028 dirmngr/dirmngr.c:1029
+#: dirmngr/dirmngr.c:1879
 #, fuzzy, c-format
 #| msgid "reading options from `%s'\n"
 msgid "reading options from '%s'\n"
 msgstr "ανάγνωση επιλογών από `%s'\n"
 
-#: agent/gpg-agent.c:1335 g10/gpg.c:3861 scd/scdaemon.c:687 sm/gpgsm.c:1709
-#: dirmngr/dirmngr.c:1108 tools/gpg-connect-agent.c:1270 tools/gpgconf.c:634
+#: agent/gpg-agent.c:1349 g10/gpg.c:3858 scd/scdaemon.c:687 sm/gpgsm.c:1562
+#: dirmngr/dirmngr.c:1145 tools/gpg-connect-agent.c:1270 tools/gpgconf.c:668
 #, 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:2172 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1267
+#: agent/gpg-agent.c:2188 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1306
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "αδυναμία δημιου�γίας του %s: %s\n"
 
-#: agent/gpg-agent.c:2189 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1280
+#: agent/gpg-agent.c:2205 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1319
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2228
+#: agent/gpg-agent.c:2244
 #, fuzzy, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "ο gpg-agent δεν είναι διαθέσιμος σε αυτή τη συνεδ�ία\n"
 
-#: agent/gpg-agent.c:2239 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1312
+#: agent/gpg-agent.c:2255 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1351
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: agent/gpg-agent.c:2244 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1315
+#: agent/gpg-agent.c:2260 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1354
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "σφάλμα στη αποστολή π�ος το `%s': %s\n"
 
-#: agent/gpg-agent.c:2255 agent/gpg-agent.c:2295 agent/gpg-agent.c:2304
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1324
+#: agent/gpg-agent.c:2271 agent/gpg-agent.c:2311 agent/gpg-agent.c:2320
+#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1363
 #, fuzzy, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες στο %s \"%s\"\n"
 
-#: agent/gpg-agent.c:2269 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1336
+#: agent/gpg-agent.c:2285 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1375
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "εγγ�αφή του μυστικο� κλειδιο� στο `%s'\n"
 
-#: agent/gpg-agent.c:2289 agent/gpg-agent.c:2342 common/homedir.c:517
+#: agent/gpg-agent.c:2305 agent/gpg-agent.c:2358 common/homedir.c:537
 #: 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:2292 agent/gpg-agent.c:2347 common/homedir.c:520
+#: agent/gpg-agent.c:2308 agent/gpg-agent.c:2363 common/homedir.c:540
 #: g10/openfile.c:402
 #, fuzzy, c-format
 msgid "directory '%s' created\n"
 msgstr "%s: κατάλογος δημιου�γήθηκε\n"
 
-#: agent/gpg-agent.c:2353
+#: agent/gpg-agent.c:2369
 #, fuzzy, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "trustdb: read απέτυχε (n=%d): %s\n"
 
-#: agent/gpg-agent.c:2357
+#: agent/gpg-agent.c:2373
 #, fuzzy, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "%s: αδυναμία δημιου�γίας καταλόγου: %s\n"
 
-#: agent/gpg-agent.c:2512 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2069
+#: agent/gpg-agent.c:2528 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2108
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: agent/gpg-agent.c:2719
+#: agent/gpg-agent.c:2735
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2724
+#: agent/gpg-agent.c:2740
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2799
+#: agent/gpg-agent.c:2815
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2804
+#: agent/gpg-agent.c:2820
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3026 scd/scdaemon.c:1374 dirmngr/dirmngr.c:2283
+#: agent/gpg-agent.c:3042 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2322
 #, fuzzy, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "η ενημέ�ωση μυστικο� απέτυχε: %s\n"
 
-#: agent/gpg-agent.c:3114 scd/scdaemon.c:1439
+#: agent/gpg-agent.c:3130 scd/scdaemon.c:1441
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: πα�αλείφθηκε: %s\n"
 
-#: agent/gpg-agent.c:3252 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3271 common/simple-pwquery.c:247 g10/call-agent.c:260
 #: sm/call-agent.c:131 tools/gpg-connect-agent.c:2319 tools/card-call-scd.c:311
 #, fuzzy, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "ο gpg-agent δεν είναι διαθέσιμος σε αυτή τη συνεδ�ία\n"
 
-#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:70
+#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:66
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -786,7 +801,7 @@ msgid ""
 msgstr ""
 
 #: agent/protect-tool.c:107 g10/gpg.c:448 kbx/kbxutil.c:72 sm/gpgsm.c:215
-#: dirmngr/dirmngr.c:168 tools/gpgconf.c:81
+#: dirmngr/dirmngr.c:169 tools/gpgconf.c:81
 msgid ""
 "@Commands:\n"
 " "
@@ -816,40 +831,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:707
+#: agent/protect-tool.c:708 sm/import.c:775
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Πληκτ�ολογήστε τη φ�άση κλειδί· αυτή είναι μια μυστική π�όταση \n"
 
-#: agent/protect-tool.c:712
+#: agent/protect-tool.c:713 sm/export.c:727
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Πληκτ�ολογήστε τη φ�άση κλειδί· αυτή είναι μια μυστική π�όταση \n"
 
-#: agent/protect-tool.c:718
+#: agent/protect-tool.c:719
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:723
+#: agent/protect-tool.c:724
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Πληκτ�ολογήστε τη φ�άση κλειδί· αυτή είναι μια μυστική π�όταση \n"
 
-#: agent/protect-tool.c:734
+#: agent/protect-tool.c:735
 #, fuzzy, c-format
 msgid "cancelled\n"
 msgstr "Ακ��ωση"
 
-#: agent/protect-tool.c:736
+#: agent/protect-tool.c:737
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: agent/trustlist.c:153 agent/trustlist.c:363 tools/gpgconf.c:424
+#: agent/trustlist.c:153 agent/trustlist.c:363 tools/gpgconf.c:458
 #, fuzzy, c-format
 msgid "error opening '%s': %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
@@ -1004,7 +1019,7 @@ msgstr "απέτυχε ο έλεγχος της υπογ�αφής που δημ
 msgid "secret key parts are not available\n"
 msgstr "τμήματα του μυστικο� κλειδιο� δεν είναι διαθέσιμα\n"
 
-#: agent/cvt-openpgp.c:343 g10/card-util.c:1562
+#: agent/cvt-openpgp.c:343 g10/card-util.c:1575
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -1036,7 +1051,7 @@ msgid "error creating a stream for a pipe: %s\n"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
 #: common/exechelp-posix.c:505 common/exechelp-posix.c:580
-#: common/exechelp-posix.c:866 dirmngr/dirmngr.c:1354
+#: common/exechelp-posix.c:866 dirmngr/dirmngr.c:1393
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
@@ -1109,7 +1124,7 @@ msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "θω�άκιση απέτυχε: %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3082
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3099
 msgid "yes"
 msgstr "ναι|ναί"
 
@@ -1164,7 +1179,7 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:115 g10/card-util.c:917 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:927 tools/no-libgcrypt.c:30
 #: tools/gpg-card.c:416
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
@@ -1236,7 +1251,7 @@ msgstr "αδυναμία δημιου�γίας της κλειδοθήκης `%
 msgid "server '%s' is older than us (%s < %s)"
 msgstr ""
 
-#: common/asshelp.c:737 g10/call-dirmngr.c:408
+#: common/asshelp.c:737 g10/call-dirmngr.c:407
 #, fuzzy, c-format
 #| msgid "WARNING: %s overrides %s\n"
 msgid "WARNING: %s\n"
@@ -1331,7 +1346,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:4212
+#: scd/app-openpgp.c:4214
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
@@ -1415,12 +1430,12 @@ msgstr "Αυτό το κλειδί έχει λήξει!"
 msgid "Root certificate trustworthy"
 msgstr "κακό πιστοποιητικό"
 
-#: common/audit.c:1112 sm/certchain.c:1242
+#: common/audit.c:1112 sm/certchain.c:1243
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "κακό πιστοποιητικό"
 
-#: common/audit.c:1115 sm/certchain.c:1252
+#: common/audit.c:1115 sm/certchain.c:1253
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Κλειδί διαθέσιμο στο: "
@@ -1472,22 +1487,22 @@ msgstr "άγνωστο"
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "μη έγκυ�ος radix64 χα�ακτή�ας %02x πα�άβλεψη\n"
 
-#: common/ttyio.c:433
+#: common/ttyio.c:447
 #, c-format
 msgid "Sorry, we are in batchmode - can't get input\n"
 msgstr ""
 
-#: common/ttyio.c:439
+#: common/ttyio.c:453
 #, c-format
 msgid "Sorry, no terminal at all requested - can't get input\n"
 msgstr ""
 
-#: common/ttyio.c:474 common/ttyio.c:484
+#: common/ttyio.c:488 common/ttyio.c:498
 #, c-format
 msgid "too many errors; giving up\n"
 msgstr ""
 
-#: common/ttyio.c:536
+#: common/ttyio.c:550
 #, c-format
 msgid "Control-D detected\n"
 msgstr ""
@@ -1541,8 +1556,7 @@ msgstr "το δημόσιο κλειδί %08lX δεν β�έθηκε: %s\n"
 msgid "waiting for lock %s...\n"
 msgstr "εγγ�αφή του μυστικο� κλειδιο� στο `%s'\n"
 
-#: common/init.c:191 sm/gpgsm.c:1036 dirmngr/dirmngr.c:895
-#: dirmngr/dirmngr.c:904
+#: common/init.c:191 sm/gpgsm.c:909 dirmngr/dirmngr.c:935 dirmngr/dirmngr.c:944
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
@@ -1700,7 +1714,7 @@ msgid "Enter passphrase: "
 msgstr "Πληκτ�ολογήστε τη φ�άση κλειδί: "
 
 #: g10/call-agent.c:318 g10/encrypt.c:282 g10/encrypt.c:818 g10/sign.c:473
-#: sm/call-agent.c:180 sm/encrypt.c:701 sm/sign.c:436
+#: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
 #, fuzzy, c-format
 #| msgid "%s does not yet work with %s\n"
 msgid "%s is not compliant with %s mode\n"
@@ -1711,225 +1725,225 @@ msgstr "το %s ακόμα δε λειτου�γεί μαζί με το %s\n"
 msgid "error from TPM: %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: g10/call-agent.c:2123 g10/passphrase.c:225 g10/passphrase.c:258
-#: tools/card-call-scd.c:1751
+#: g10/call-agent.c:2135 g10/passphrase.c:233 g10/passphrase.c:266
+#: tools/card-call-scd.c:1755
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "π�όβλημα με τον agent: agent επιστ�έφει 0x%lx\n"
 
-#: g10/call-dirmngr.c:179 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2316
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2316
 #, fuzzy, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "ο gpg-agent δεν είναι διαθέσιμος σε αυτή τη συνεδ�ία\n"
 
-#: g10/call-dirmngr.c:213
+#: g10/call-dirmngr.c:212
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "keyserver option \"honor-keyserver-url\" may not be used in Tor mode\n"
 msgstr "απαγο�ε�ετε η χ�ήση του %s στην κατάσταση %s.\n"
 
-#: g10/call-dirmngr.c:386
+#: g10/call-dirmngr.c:385
 msgid "WKD uses a cached result"
 msgstr ""
 
-#: g10/call-dirmngr.c:389
+#: g10/call-dirmngr.c:388
 msgid "Tor is not running"
 msgstr ""
 
-#: g10/call-dirmngr.c:391
+#: g10/call-dirmngr.c:390
 #, fuzzy
 msgid "Tor is not properly configured"
 msgstr "σφάλμα: μη έγκυ�ο αποτ�πωμα\n"
 
-#: g10/call-dirmngr.c:393
+#: g10/call-dirmngr.c:392
 #, fuzzy
 msgid "DNS is not properly configured"
 msgstr "σφάλμα: μη έγκυ�ο αποτ�πωμα\n"
 
-#: g10/call-dirmngr.c:395
+#: g10/call-dirmngr.c:394
 msgid "unacceptable HTTP redirect from server"
 msgstr ""
 
-#: g10/call-dirmngr.c:397
+#: g10/call-dirmngr.c:396
 msgid "unacceptable HTTP redirect from server was cleaned up"
 msgstr ""
 
-#: g10/call-dirmngr.c:399
+#: g10/call-dirmngr.c:398
 #, fuzzy
 #| msgid "generate a revocation certificate"
 msgid "server uses an invalid certificate"
 msgstr "δημιου�γία ενός πιστοποιητικο� ανάκλησης"
 
-#: g10/call-dirmngr.c:406 g10/gpg.c:4599
+#: g10/call-dirmngr.c:405 g10/gpg.c:4596
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "θω�άκιση: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:369 g10/card-util.c:1924
-#: tools/gpg-card.c:3039
+#: g10/card-util.c:86 g10/card-util.c:374 g10/card-util.c:1937
+#: tools/gpg-card.c:3056
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "το μυστικό κλειδί δεν είναι διαθέσιμο"
 
-#: g10/card-util.c:91 g10/card-util.c:1930
+#: g10/card-util.c:91 g10/card-util.c:1943
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:97 g10/card-util.c:2309 g10/delkey.c:164 g10/keyedit.c:1428
-#: g10/keygen.c:4791 g10/revoke.c:214 g10/revoke.c:638
+#: g10/card-util.c:97 g10/card-util.c:2322 g10/delkey.c:164 g10/keyedit.c:1428
+#: g10/keygen.c:4795 g10/revoke.c:214 g10/revoke.c:639
 #, fuzzy, c-format
 msgid "can't do this in batch mode\n"
 msgstr "δεν μπο�εί να γίνει αυτό σε κατάσταση δέσμης (batchmode)\n"
 
-#: g10/card-util.c:105 tools/gpg-card.c:2943
+#: g10/card-util.c:105 tools/gpg-card.c:2960
 #, fuzzy, c-format
 msgid "This command is only available for version 2 cards\n"
 msgstr "Αυτή η εντολή απαγο�ε�ετε σε αυτή την κατάσταση %s.\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3398 tools/gpg-card.c:2948
+#: g10/card-util.c:107 scd/app-openpgp.c:3399 tools/gpg-card.c:2965
 #, fuzzy, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "τμήματα του μυστικο� κλειδιο� δεν είναι διαθέσιμα\n"
 
-#: g10/card-util.c:140 g10/card-util.c:1448 g10/card-util.c:1710
-#: g10/card-util.c:1802 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1991 g10/keygen.c:2165 g10/keygen.c:2385 g10/keygen.c:2685
+#: g10/card-util.c:140 g10/card-util.c:1458 g10/card-util.c:1723
+#: g10/card-util.c:1815 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/keygen.c:1992 g10/keygen.c:2166 g10/keygen.c:2386 g10/keygen.c:2686
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
 #: tools/gpg-card.c:510
 msgid "Your selection? "
 msgstr "Η επιλογή σας; "
 
-#: g10/card-util.c:262 g10/card-util.c:313 tools/gpg-card.c:596
+#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:596
 #: tools/gpg-card.c:636
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:558 tools/gpg-card.c:903
+#: g10/card-util.c:563 tools/gpg-card.c:905
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:559 tools/gpg-card.c:904
+#: g10/card-util.c:564 tools/gpg-card.c:906
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:586 tools/gpg-card.c:931
+#: g10/card-util.c:591 tools/gpg-card.c:933
 #, fuzzy
 msgid "not forced"
 msgstr "μη επεξε�γασμένο"
 
-#: g10/card-util.c:586 tools/gpg-card.c:931
+#: g10/card-util.c:591 tools/gpg-card.c:933
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:768 tools/gpg-card.c:1468
+#: g10/card-util.c:773 tools/gpg-card.c:1484
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:770 tools/gpg-card.c:1470
+#: g10/card-util.c:775 tools/gpg-card.c:1486
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:772 tools/gpg-card.c:1472
+#: g10/card-util.c:777 tools/gpg-card.c:1488
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:789 tools/gpg-card.c:1505
+#: g10/card-util.c:795 tools/gpg-card.c:1521
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:791 tools/gpg-card.c:1506
+#: g10/card-util.c:797 tools/gpg-card.c:1522
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:809 tools/gpg-card.c:1523
+#: g10/card-util.c:816 tools/gpg-card.c:1539
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:830 tools/gpg-card.c:1561
+#: g10/card-util.c:840 tools/gpg-card.c:1577
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "κανένα αντίστιχο δημόσιο κλειδί: %s\n"
 
-#: g10/card-util.c:926 g10/decrypt-data.c:495 g10/import.c:406 g10/import.c:756
-#: g10/import.c:815 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1666
-#: tools/gpgconf.c:437 tools/gpgconf.c:483 tools/gpg-card.c:426
+#: g10/card-util.c:936 g10/decrypt-data.c:495 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:1705
+#: tools/gpgconf.c:471 tools/gpgconf.c:517 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:959 g10/decrypt-data.c:498 g10/export.c:2496
+#: g10/card-util.c:969 g10/decrypt-data.c:498 g10/export.c:2496
 #: dirmngr/crlcache.c:925 tools/gpg-card.c:486 tools/gpg-card.c:493
 #, fuzzy, c-format
 msgid "error writing '%s': %s\n"
 msgstr "αδυναμία εγγ�αφής της κλειδοθήκης `%s': %s\n"
 
-#: g10/card-util.c:986 tools/gpg-card.c:1650
+#: g10/card-util.c:996 tools/gpg-card.c:1666
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:1024 tools/gpg-card.c:1945
+#: g10/card-util.c:1034 tools/gpg-card.c:1962
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:1109 tools/gpg-card.c:1699
+#: g10/card-util.c:1119 tools/gpg-card.c:1715
 #, fuzzy
 msgid "Language preferences: "
 msgstr "αναωεωμένες επιλογές"
 
-#: g10/card-util.c:1117 tools/gpg-card.c:1710
+#: g10/card-util.c:1127 tools/gpg-card.c:1726
 #, fuzzy, c-format
 msgid "Error: invalid length of preference string.\n"
 msgstr "μη έγκυ�ος χα�ακτή�ας στο \"κο�δόνι\" της επιλογής\n"
 
-#: g10/card-util.c:1126 tools/gpg-card.c:1719
+#: g10/card-util.c:1136 tools/gpg-card.c:1735
 #, fuzzy, c-format
 msgid "Error: invalid characters in preference string.\n"
 msgstr "μη έγκυ�ος χα�ακτή�ας στο \"κο�δόνι\" της επιλογής\n"
 
-#: g10/card-util.c:1148 tools/gpg-card.c:1753
+#: g10/card-util.c:1158 tools/gpg-card.c:1769
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1162 tools/gpg-card.c:1770
+#: g10/card-util.c:1172 tools/gpg-card.c:1786
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "σφάλμα: μη έγκυ�ο αποτ�πωμα\n"
 
-#: g10/card-util.c:1185 tools/gpg-card.c:1835
+#: g10/card-util.c:1195 tools/gpg-card.c:1852
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "απεικόνιση του fingerprint"
 
-#: g10/card-util.c:1209 tools/gpg-card.c:1861
+#: g10/card-util.c:1219 tools/gpg-card.c:1878
 #, fuzzy, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "σφάλμα: μη έγκυ�ο αποτ�πωμα\n"
 
-#: g10/card-util.c:1259
+#: g10/card-util.c:1269
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Η δημιου�γία κλειδιο� απέτυχε: %s\n"
 
-#: g10/card-util.c:1260
+#: g10/card-util.c:1270
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "δε β�έθηκαν έγκυ�α OpenPGP δεδομένα.\n"
 
-#: g10/card-util.c:1273 g10/keygen.c:4811 g10/keygen.c:5972
+#: g10/card-util.c:1283 g10/keygen.c:4815 g10/keygen.c:6003
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "αδυναμία εγγ�αφής μυστικής κλειδοθήκης `%s': %s\n"
 
-#: g10/card-util.c:1358
+#: g10/card-util.c:1368
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1375 tools/gpg-card.c:3328
+#: g10/card-util.c:1385 tools/gpg-card.c:3345
 msgid ""
 "Note: There is no guarantee that the card supports the requested\n"
 "      key type or size.  If the key generation does not succeed,\n"
@@ -1937,102 +1951,102 @@ msgid ""
 "      key types and sizes are supported.\n"
 msgstr ""
 
-#: g10/card-util.c:1396 g10/keygen.c:2570 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1406 g10/keygen.c:2571 sm/certreqgen-ui.c:180
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Τι μέγεθος κλειδιο� θα θέλατε; (1024) "
 
-#: g10/card-util.c:1406 g10/keygen.c:2493 g10/keygen.c:2525
+#: g10/card-util.c:1416 g10/keygen.c:2494 g10/keygen.c:2526
 #: sm/certreqgen-ui.c:195
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "στ�ογγυλοποιήθηκε έως τα %u bits\n"
 
-#: g10/card-util.c:1414 g10/keygen.c:2578 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1424 g10/keygen.c:2579 sm/certreqgen-ui.c:185
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/card-util.c:1433
+#: g10/card-util.c:1443
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1435
+#: g10/card-util.c:1445
 #, fuzzy
 msgid "Signature key\n"
 msgstr "Υπογ�αφή έληξε στις %s.\n"
 
-#: g10/card-util.c:1437
+#: g10/card-util.c:1447
 #, fuzzy
 msgid "Encryption key\n"
 msgstr "   (%d) RSA (για κ�υπτογ�άφηση μόνο)\n"
 
-#: g10/card-util.c:1439
+#: g10/card-util.c:1449
 msgid "Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1441 g10/keygen.c:2112 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1451 g10/keygen.c:2113 sm/certreqgen-ui.c:158
 msgid "Please select what kind of key you want:\n"
 msgstr "Πα�ακαλώ επιλέξτε τον τ�πο του κλειδιο� που θέλετε:\n"
 
-#: g10/card-util.c:1442 sm/certreqgen-ui.c:159
+#: g10/card-util.c:1452 sm/certreqgen-ui.c:159
 #, fuzzy, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA (για υπογ�αφή μόνο)\n"
 
-#: g10/card-util.c:1443
+#: g10/card-util.c:1453
 #, fuzzy, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) DSA και ElGamal (π�οκαθο�ισμένο)\n"
 
-#: g10/card-util.c:1455 g10/card-util.c:1722 g10/card-util.c:1822
-#: g10/keyedit.c:900 g10/keygen.c:2017 g10/keygen.c:2045 g10/keygen.c:2172
-#: g10/keygen.c:2425 g10/keygen.c:2713 g10/revoke.c:836
+#: g10/card-util.c:1468 g10/card-util.c:1735 g10/card-util.c:1835
+#: g10/keyedit.c:900 g10/keygen.c:2018 g10/keygen.c:2046 g10/keygen.c:2173
+#: g10/keygen.c:2426 g10/keygen.c:2714 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Μη έγκυ�η επιλογή.\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1541
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 
-#: g10/card-util.c:1533
+#: g10/card-util.c:1546
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1582
 #, fuzzy, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "σφάλμα στη αποστολή π�ος το `%s': %s\n"
 
-#: g10/card-util.c:1585 g10/card-util.c:2106 g10/card-util.c:2162
+#: g10/card-util.c:1598 g10/card-util.c:2119 g10/card-util.c:2175
 #, fuzzy, c-format
 msgid "error getting card info: %s\n"
 msgstr "αδυναμία εγγ�αφής μυστικής κλειδοθήκης `%s': %s\n"
 
-#: g10/card-util.c:1591 g10/card-util.c:1936 g10/card-util.c:2112
-#: g10/card-util.c:2171 tools/gpg-card.c:3057 tools/gpg-card.c:3296
-#: tools/gpg-card.c:3354
+#: g10/card-util.c:1604 g10/card-util.c:1949 g10/card-util.c:2125
+#: g10/card-util.c:2184 tools/gpg-card.c:3074 tools/gpg-card.c:3313
+#: tools/gpg-card.c:3371
 #, fuzzy, c-format
 #| msgid "This command is not allowed while in %s mode.\n"
 msgid "This command is not supported by this card\n"
 msgstr "Αυτή η εντολή απαγο�ε�ετε σε αυτή την κατάσταση %s.\n"
 
-#: g10/card-util.c:1637 tools/gpg-card.c:2426
+#: g10/card-util.c:1650 tools/gpg-card.c:2443
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1651
+#: g10/card-util.c:1664
 #, fuzzy, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "πα�αλείφθηκε: μυστικό κλειδί ήδη πα�ών\n"
 
-#: g10/card-util.c:1654 tools/gpg-card.c:2398
+#: g10/card-util.c:1667 tools/gpg-card.c:2415
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1666 tools/gpg-card.c:2457
+#: g10/card-util.c:1679 tools/gpg-card.c:2474
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2040,172 +2054,172 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1701
+#: g10/card-util.c:1714
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Πα�ακαλώ επιλέξτε τον τ�πο του κλειδιο� που θέλετε:\n"
 
-#: g10/card-util.c:1703 g10/card-util.c:1793
+#: g10/card-util.c:1716 g10/card-util.c:1806
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Υπογ�αφή έληξε στις %s.\n"
 
-#: g10/card-util.c:1704 g10/card-util.c:1795
+#: g10/card-util.c:1717 g10/card-util.c:1808
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (για κ�υπτογ�άφηση μόνο)\n"
 
-#: g10/card-util.c:1705 g10/card-util.c:1797
+#: g10/card-util.c:1718 g10/card-util.c:1810
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1790
+#: g10/card-util.c:1803
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Πα�ακαλώ επιλέξτε την αιτία για την ανάκληση:\n"
 
-#: g10/card-util.c:1836
+#: g10/card-util.c:1849
 #, fuzzy, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "η ενημέ�ωση απέτυχε: %s\n"
 
-#: g10/card-util.c:1941 tools/gpg-card.c:3065
+#: g10/card-util.c:1954 tools/gpg-card.c:3082
 #, fuzzy, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr "πα�αλείφθηκε: μυστικό κλειδί ήδη πα�ών\n"
 
-#: g10/card-util.c:1944 tools/gpg-card.c:3068 tools/gpg-card.c:3409
+#: g10/card-util.c:1957 tools/gpg-card.c:3085 tools/gpg-card.c:3426
 #, fuzzy
 msgid "Continue? (y/N) "
 msgstr "Σίγου�α να υπογ�αφεί; "
 
-#: g10/card-util.c:1949 tools/gpg-card.c:3079
+#: g10/card-util.c:1962 tools/gpg-card.c:3096
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2142
+#: g10/card-util.c:2155
 #, fuzzy, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: g10/card-util.c:2188
+#: g10/card-util.c:2201
 #, fuzzy, c-format
 msgid "error for setup UIF: %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: g10/card-util.c:2212 g10/keyedit.c:1263 tools/gpg-card.c:3649
+#: g10/card-util.c:2225 g10/keyedit.c:1263 tools/gpg-card.c:3666
 msgid "quit this menu"
 msgstr "τε�ματισμός αυτο� του μενο�"
 
-#: g10/card-util.c:2214
+#: g10/card-util.c:2227
 #, fuzzy
 msgid "show admin commands"
 msgstr "συγκ�ουόμενες εντολές\n"
 
-#: g10/card-util.c:2215 g10/keyedit.c:1266 tools/gpg-card.c:3652
+#: g10/card-util.c:2228 g10/keyedit.c:1266 tools/gpg-card.c:3669
 msgid "show this help"
 msgstr "απεικόνιση αυτής της βοήθειας"
 
-#: g10/card-util.c:2217 tools/gpg-card.c:3654
+#: g10/card-util.c:2230 tools/gpg-card.c:3671
 #, fuzzy
 msgid "list all available data"
 msgstr "Κλειδί διαθέσιμο στο: "
 
-#: g10/card-util.c:2220 tools/gpg-card.c:3656
+#: g10/card-util.c:2233 tools/gpg-card.c:3673
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:2221 tools/gpg-card.c:3657
+#: g10/card-util.c:2234 tools/gpg-card.c:3674
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:2222 tools/gpg-card.c:3658
+#: g10/card-util.c:2235 tools/gpg-card.c:3675
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:2223 tools/gpg-card.c:3659
+#: g10/card-util.c:2236 tools/gpg-card.c:3676
 #, fuzzy
 msgid "change the login name"
 msgstr "αλλαγή της ημε�ομηνίας λήξης"
 
-#: g10/card-util.c:2224 tools/gpg-card.c:3660
+#: g10/card-util.c:2237 tools/gpg-card.c:3677
 #, fuzzy
 msgid "change the language preferences"
 msgstr "αλλαγή της εμπιστοσ�νης ιδιοκτήτη"
 
-#: g10/card-util.c:2225 tools/gpg-card.c:3661
+#: g10/card-util.c:2238 tools/gpg-card.c:3678
 msgid "change card holder's salutation"
 msgstr ""
 
-#: g10/card-util.c:2227 tools/gpg-card.c:3663
+#: g10/card-util.c:2240 tools/gpg-card.c:3680
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "απεικόνιση του fingerprint"
 
-#: g10/card-util.c:2228 tools/gpg-card.c:3664
+#: g10/card-util.c:2241 tools/gpg-card.c:3681
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:2229 tools/gpg-card.c:3665
+#: g10/card-util.c:2242 tools/gpg-card.c:3682
 #, fuzzy
 msgid "generate new keys"
 msgstr "δημιου�γία ενός νέου ζε�γους κλειδιών"
 
-#: g10/card-util.c:2230 tools/gpg-card.c:3666
+#: g10/card-util.c:2243 tools/gpg-card.c:3683
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:2231 tools/gpg-card.c:3667
+#: g10/card-util.c:2244 tools/gpg-card.c:3684
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:2232 tools/gpg-card.c:3668
+#: g10/card-util.c:2245 tools/gpg-card.c:3685
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:2233 tools/gpg-card.c:3672
+#: g10/card-util.c:2246 tools/gpg-card.c:3689
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2235
+#: g10/card-util.c:2248
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr "|Ο�ΟΜΑ|χ�ήση του Ο�ΟΜΑτος ως π�οκαθο�ισμένου πα�αλήπτη"
 
-#: g10/card-util.c:2236
+#: g10/card-util.c:2249
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "αλλαγή της εμπιστοσ�νης ιδιοκτήτη"
 
-#: g10/card-util.c:2237 tools/gpg-card.c:3674
+#: g10/card-util.c:2250 tools/gpg-card.c:3691
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the User Interaction Flag"
 msgstr "αλλαγή της εμπιστοσ�νης ιδιοκτήτη"
 
-#: g10/card-util.c:2361 tools/gpg-card.c:3924
+#: g10/card-util.c:2374 tools/gpg-card.c:3941
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2402
+#: g10/card-util.c:2415
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "συγκ�ουόμενες εντολές\n"
 
-#: g10/card-util.c:2433
+#: g10/card-util.c:2446
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "συγκ�ουόμενες εντολές\n"
 
-#: g10/card-util.c:2435
+#: g10/card-util.c:2448
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "εγγ�αφή του μυστικο� κλειδιο� στο `%s'\n"
 
-#: g10/card-util.c:2546 g10/keyedit.c:2275 tools/gpg-card.c:3814
-#: tools/gpg-card.c:4072
+#: g10/card-util.c:2559 g10/keyedit.c:2275 tools/gpg-card.c:3831
+#: tools/gpg-card.c:4089
 #, c-format
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Μη έγκυ�η εντολή  (δοκιμάστε \"help\")\n"
@@ -2215,23 +2229,23 @@ msgstr "Μη έγκυ�η εντολή  (δοκιμάστε \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output δεν λειτου�γεί για αυτή την εντολή\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5293 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5292 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:1934 g10/export.c:2342 g10/export.c:2463
-#: g10/getkey.c:1907 g10/gpg.c:5238 g10/keyedit.c:1450 g10/keyedit.c:2382
-#: g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:703 g10/keyserver.c:1240
-#: g10/revoke.c:230 g10/tofu.c:2168
+#: g10/getkey.c:2032 g10/gpg.c:5237 g10/keyedit.c:1450 g10/keyedit.c:2382
+#: g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:703 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:2002 g10/getkey.c:1915 g10/getkey.c:4330
-#: g10/gpg.c:5247 g10/keyedit.c:2354 g10/keyserver.c:1258 g10/revoke.c:236
-#: g10/revoke.c:665 g10/tofu.c:2176
+#: g10/delkey.c:90 g10/export.c:2002 g10/getkey.c:2040 g10/getkey.c:4455
+#: g10/gpg.c:5246 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"
 msgstr "σφάλμα κατά την ανάγνωση του μπλοκ κλειδιών: %s\n"
@@ -2358,14 +2372,14 @@ msgstr "απαγο�ε�ετε η χ�ήση του κ�υπταλγό�ιθμο
 msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:555 g10/encrypt.c:808 g10/decrypt-data.c:261 g10/gpg.c:4083
-#: g10/gpg.c:4130 sm/decrypt.c:742 sm/encrypt.c:691 sm/gpgsm.c:1793
+#: g10/encrypt.c:555 g10/encrypt.c:808 g10/decrypt-data.c:261 g10/gpg.c:4080
+#: g10/gpg.c:4127 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1646
 #, fuzzy, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "απαγο�ε�ετε η χ�ήση του κ�υπταλγό�ιθμου \"%s\" στην κατάσταση %s\n"
 
-#: g10/encrypt.c:564 g10/gpg.c:4095 g10/gpg.c:4142 g10/sig-check.c:155
-#: g10/sign.c:452 sm/gpgsm.c:1803 sm/gpgsm.c:1813 sm/sign.c:596 sm/verify.c:510
+#: g10/encrypt.c:564 g10/gpg.c:4092 g10/gpg.c:4139 g10/sig-check.c:155
+#: g10/sign.c:452 sm/gpgsm.c:1656 sm/gpgsm.c:1666 sm/sign.c:596 sm/verify.c:510
 #, fuzzy, c-format
 msgid "digest algorithm '%s' may not be used in %s mode\n"
 msgstr ""
@@ -2385,7 +2399,7 @@ msgstr ""
 "ο εξαναγκασμός συμμετ�ικο� αλγό�ιθμου %s (%d) πα�αβιάζει τις\n"
 "επιλογές του πα�αλήπτη\n"
 
-#: g10/encrypt.c:838 sm/encrypt.c:766
+#: g10/encrypt.c:838 sm/encrypt.c:767
 #, fuzzy, c-format
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: \"%s\" είναι μια μη συνειστώμενη επιλογή\n"
@@ -2418,7 +2432,7 @@ msgstr "%s/%s κ�υπτογ�αφήθηκε για: \"%s\"\n"
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "απαγο�ε�ετε η χ�ήση του %s στην κατάσταση %s.\n"
 
-#: g10/decrypt-data.c:239 g10/mainproc.c:380 sm/decrypt.c:494
+#: g10/decrypt-data.c:239 g10/mainproc.c:380 sm/decrypt.c:892
 #, fuzzy, c-format
 #| msgid "%s encrypted data\n"
 msgid "%s.%s encrypted data\n"
@@ -2429,7 +2443,7 @@ msgstr "%s κ�υπτογ�αφημένα δεδομένα\n"
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "κ�υπτογ�αφημένο με άγνωστο αλγό�ιθμο %d\n"
 
-#: g10/decrypt-data.c:361 g10/decrypt-data.c:414 sm/decrypt.c:508
+#: g10/decrypt-data.c:361 g10/decrypt-data.c:414 sm/decrypt.c:906
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2478,7 +2492,7 @@ msgstr ""
 msgid " - skipped"
 msgstr "%s: πα�αλείφθηκε: %s\n"
 
-#: g10/export.c:1333 g10/import.c:2124 g10/openfile.c:202 g10/openfile.c:296
+#: g10/export.c:1333 g10/import.c:2132 g10/openfile.c:202 g10/openfile.c:296
 #: g10/sign.c:1110 g10/sign.c:1447
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
@@ -2518,65 +2532,65 @@ msgstr "σφάλμα κατά τη δημιου�γία του `%s': %s\n"
 msgid "[User ID not found]"
 msgstr "[User id δεν β�έθηκε]"
 
-#: g10/getkey.c:1199
+#: g10/getkey.c:1324
 #, fuzzy, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "σφάλμα κατά τη δημιου�γία του `%s': %s\n"
 
-#: g10/getkey.c:1205
+#: g10/getkey.c:1330
 #, fuzzy, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "σφάλμα κατά τη δημιου�γία του `%s': %s\n"
 
-#: g10/getkey.c:1207
+#: g10/getkey.c:1332
 #, fuzzy
 msgid "No fingerprint"
 msgstr "απεικόνιση του fingerprint"
 
-#: g10/getkey.c:1449
+#: g10/getkey.c:1574
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1884 g10/revoke.c:657 g10/revoke.c:718
+#: g10/getkey.c:2009 g10/revoke.c:658 g10/revoke.c:719
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "το μυστικό κλειδί `%s' δε β�έθηκε: %s\n"
 
-#: g10/getkey.c:1887 g10/pkclist.c:1012
+#: g10/getkey.c:2012 g10/pkclist.c:1012
 #, fuzzy, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "μη έγκυ�ες επιλογές ειγαγωγής\n"
 
-#: g10/getkey.c:1965
+#: g10/getkey.c:2090
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "|Ο�ΟΜΑ|χ�ήση Ο�ΟΜΑτος σαν π�οκαθο�ισμένο μυστικό κλειδί"
 
-#: g10/getkey.c:1973
+#: g10/getkey.c:2098
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "|Ο�ΟΜΑ|χ�ήση Ο�ΟΜΑτος σαν π�οκαθο�ισμένο μυστικό κλειδί"
 
-#: g10/getkey.c:1980
+#: g10/getkey.c:2105
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr ""
 
-#: g10/getkey.c:2837
+#: g10/getkey.c:2962
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Μη έγκυ�ο κλειδί %08lX έγινε έγκυ�ο από το --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:3703
+#: g10/getkey.c:3828
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "χ�ήση του δευτε�ε�οντος κλειδιο� %08lX αντί του π�ωτε�οντος %08lX\n"
 
-#: g10/getkey.c:4259 g10/gpg.c:2167
+#: g10/getkey.c:4384 g10/gpg.c:2168
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "μη έγκυ�ες επιλογές ειγαγωγής\n"
@@ -2781,7 +2795,7 @@ msgstr ""
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:651 kbx/kbxutil.c:91 sm/gpgsm.c:424 tools/gpgconf.c:113
+#: g10/gpg.c:651 kbx/kbxutil.c:91 sm/gpgsm.c:425 tools/gpgconf.c:113
 msgid "do not make any changes"
 msgstr "να μη γίνει καμμία αλλαγή"
 
@@ -2815,7 +2829,7 @@ msgstr "χ�ήση κανονικής κατάστασης κειμένου"
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|καθο�ισμός επιπέδου συμπίεσης N (0 απενε�γοποιεί)"
 
-#: g10/gpg.c:762 sm/gpgsm.c:357
+#: g10/gpg.c:762 sm/gpgsm.c:358
 msgid "Options controlling key import and export"
 msgstr ""
 
@@ -2834,11 +2848,11 @@ msgstr "εισαγωγή κλειδιών από ένα διακομιστή κÎ
 msgid "include the public key in signatures"
 msgstr "έλεγχος υπογ�αφής κλειδιο�"
 
-#: g10/gpg.c:776 sm/gpgsm.c:360
+#: g10/gpg.c:776 sm/gpgsm.c:361
 msgid "disable all access to the dirmngr"
 msgstr ""
 
-#: g10/gpg.c:788 sm/gpgsm.c:367
+#: g10/gpg.c:788 sm/gpgsm.c:368
 msgid "Options controlling key listings"
 msgstr ""
 
@@ -2858,15 +2872,15 @@ msgstr "|Ο�ΟΜΑ|κ�υπτογ�άφηση για Ο�ΟΜΑ"
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "χ�ήση αυτής της ταυτότητας (user id) για υπογ�αφή ή αποκ�υπτογ�άφηση"
 
-#: g10/gpg.c:876 sm/gpgsm.c:408
+#: g10/gpg.c:876 sm/gpgsm.c:409
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:895 sm/gpgsm.c:420 dirmngr/dirmngr.c:286
+#: g10/gpg.c:895 sm/gpgsm.c:421 dirmngr/dirmngr.c:289
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:966 sm/gpgsm.c:453
+#: g10/gpg.c:966 sm/gpgsm.c:454
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2925,7 +2939,7 @@ msgstr ""
 "υπογ�αφή, έλεγχος, κ�υπτογ�άφηση ή αποκ�υπτογ�άφηση\n"
 "η π�οκαθο�ισμένη λειτου�γία εξα�τάται από τα δεδομένα εισόδου\n"
 
-#: g10/gpg.c:1168 sm/gpgsm.c:636
+#: g10/gpg.c:1168 sm/gpgsm.c:637
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2949,12 +2963,12 @@ msgstr "Hash: "
 msgid "Compression: "
 msgstr "Συμπίεση: "
 
-#: g10/gpg.c:1274 sm/gpgsm.c:710
+#: g10/gpg.c:1274 sm/gpgsm.c:711
 #, fuzzy, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "χ�ήση: gpg [επιλογές] "
 
-#: g10/gpg.c:1467 sm/gpgsm.c:803
+#: g10/gpg.c:1467 sm/gpgsm.c:804
 #, c-format
 msgid "conflicting commands\n"
 msgstr "συγκ�ουόμενες εντολές\n"
@@ -2964,542 +2978,542 @@ msgstr "συγκ�ουόμενες εντολές\n"
 msgid "no = sign found in group definition '%s'\n"
 msgstr "δεν β�έθηκε το σ�μβολο = στον ο�ισμό της ομάδας \"%s\"\n"
 
-#: g10/gpg.c:1683
+#: g10/gpg.c:1684
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησία στο %s \"%s\"\n"
 
-#: g10/gpg.c:1686
+#: g10/gpg.c:1687
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησία στο %s \"%s\"\n"
 
-#: g10/gpg.c:1689
+#: g10/gpg.c:1690
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησία στο %s \"%s\"\n"
 
-#: g10/gpg.c:1695
+#: g10/gpg.c:1696
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες στο %s \"%s\"\n"
 
-#: g10/gpg.c:1698
+#: g10/gpg.c:1699
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες στο %s \"%s\"\n"
 
-#: g10/gpg.c:1701
+#: g10/gpg.c:1702
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες στο %s \"%s\"\n"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1708
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησίαεσώκλειστου φακέλου στο %s \"%s\"\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1711
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησίαεσώκλειστου φακέλου στο %s \"%s\"\n"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1714
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησίαεσώκλειστου φακέλου στο %s \"%s\"\n"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1720
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες εσώκλειστου φακέλου στο %s \"%s\"\n"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1723
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες εσώκλειστου φακέλου στο %s \"%s\"\n"
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1726
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες εσώκλειστου φακέλου στο %s \"%s\"\n"
 
-#: g10/gpg.c:1941
+#: g10/gpg.c:1942
 #, fuzzy, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "άγνωστο αντικείμενο �υθμίσεως \"%s\"\n"
 
-#: g10/gpg.c:2037
+#: g10/gpg.c:2038
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:2039
+#: g10/gpg.c:2040
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "Δεν β�έθηκε αντίστοιχη υπογ�αφή στη μυστική κλειδοθήκη\n"
 
-#: g10/gpg.c:2041
+#: g10/gpg.c:2042
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2043
+#: g10/gpg.c:2044
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Δεν β�έθηκε αντίστοιχη υπογ�αφή στη μυστική κλειδοθήκη\n"
 
-#: g10/gpg.c:2045
+#: g10/gpg.c:2046
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2049
+#: g10/gpg.c:2050
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2051
+#: g10/gpg.c:2052
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "το URL πολιτικής υπογ�αφής που δόθηκε δεν είναι έγκυ�ο\n"
 
-#: g10/gpg.c:2053
+#: g10/gpg.c:2054
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:2055
+#: g10/gpg.c:2056
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:2057
+#: g10/gpg.c:2058
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:2059
+#: g10/gpg.c:2060
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "απεικόνιση της κλειδοθήκης στην οποία αναφέ�ετε το κλειδί"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2062
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Δεν β�έθηκε αντίστοιχη υπογ�αφή στη μυστική κλειδοθήκη\n"
 
-#: g10/gpg.c:2178
+#: g10/gpg.c:2179
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "άγνωστος π�οκαθο�ισμένος πα�αλήπτης `%s'\n"
 
-#: g10/gpg.c:2180
+#: g10/gpg.c:2181
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2975 g10/gpg.c:3828 g10/gpg.c:3840
+#: g10/gpg.c:2978 g10/gpg.c:3825 g10/gpg.c:3837
 #, 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:3151 g10/gpg.c:3163
+#: g10/gpg.c:3154 g10/gpg.c:3166
 #, fuzzy, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "το %s δεν είναι έγκυ�ο σετ χα�ακτή�ων\n"
 
-#: g10/gpg.c:3185
+#: g10/gpg.c:3188
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "Μη έγκυ�η διε�θυνση Email\n"
 
-#: g10/gpg.c:3217 sm/gpgsm.c:1270
+#: g10/gpg.c:3220 sm/gpgsm.c:1143
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "μη έγκυ�ος αλγό�ιθμος  hash `%s'\n"
 
-#: g10/gpg.c:3223 sm/gpgsm.c:1276
+#: g10/gpg.c:3226 sm/gpgsm.c:1149
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "μη έγκυ�ες επιλογές ειγαγωγής\n"
 
-#: g10/gpg.c:3280
+#: g10/gpg.c:3283
 #, fuzzy, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "το %s δεν είναι έγκυ�ο σετ χα�ακτή�ων\n"
 
-#: g10/gpg.c:3302 g10/gpg.c:3511 g10/keyedit.c:5319
+#: g10/gpg.c:3305 g10/gpg.c:3514 g10/keyedit.c:5322
 #, fuzzy, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "αδυναμία επεξε�γασίας του URI του διακομιση κλειδιών\n"
 
-#: g10/gpg.c:3320
+#: g10/gpg.c:3323
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: μη έγκυ�ες επιλογές εξαγωγής\n"
 
-#: g10/gpg.c:3323
+#: g10/gpg.c:3326
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "μη έγκυ�ες επιλογές εξαγωγής\n"
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3333
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: μη έγκυ�ες επιλογές ειγαγωγής\n"
 
-#: g10/gpg.c:3333
+#: g10/gpg.c:3336
 #, c-format
 msgid "invalid import options\n"
 msgstr "μη έγκυ�ες επιλογές ειγαγωγής\n"
 
-#: g10/gpg.c:3339 g10/gpg.c:3354
+#: g10/gpg.c:3342 g10/gpg.c:3357
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "μη έγκυ�ες επιλογές ειγαγωγής\n"
 
-#: g10/gpg.c:3345
+#: g10/gpg.c:3348
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: μη έγκυ�ες επιλογές εξαγωγής\n"
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3351
 #, c-format
 msgid "invalid export options\n"
 msgstr "μη έγκυ�ες επιλογές εξαγωγής\n"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3363
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: μη έγκυ�ες επιλογές ειγαγωγής\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3366
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "μη έγκυ�ες επιλογές ειγαγωγής\n"
 
-#: g10/gpg.c:3371
+#: g10/gpg.c:3374
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3373
+#: g10/gpg.c:3376
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3378
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "το %s δεν είναι έγκυ�ο σετ χα�ακτή�ων\n"
 
-#: g10/gpg.c:3377
+#: g10/gpg.c:3380
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3384
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3386
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "το URL πολιτικής υπογ�αφής που δόθηκε δεν είναι έγκυ�ο\n"
 
-#: g10/gpg.c:3385
+#: g10/gpg.c:3388
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "το %s δεν είναι έγκυ�ο σετ χα�ακτή�ων\n"
 
-#: g10/gpg.c:3387
+#: g10/gpg.c:3390
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3389
+#: g10/gpg.c:3392
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "το %s δεν είναι έγκυ�ο σετ χα�ακτή�ων\n"
 
-#: g10/gpg.c:3396
+#: g10/gpg.c:3399
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: μη έγκυ�ες επιλογές εξαγωγής\n"
 
-#: g10/gpg.c:3399
+#: g10/gpg.c:3402
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "μη έγκυ�ες επιλογές εξαγωγής\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3409
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "αδυναμία ο�ισμο� του exec-path σε %s\n"
 
-#: g10/gpg.c:3613
+#: g10/gpg.c:3616
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: μη έγκυ�ες επιλογές εξαγωγής\n"
 
-#: g10/gpg.c:3616
+#: g10/gpg.c:3619
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3625
+#: g10/gpg.c:3628
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "μη έγκυ�ες επιλογές ειγαγωγής\n"
 
-#: g10/gpg.c:3807 sm/gpgsm.c:1675
+#: g10/gpg.c:3804 sm/gpgsm.c:1528
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το π�όγ�αμμα ίσως δημιου�γήσει α�χείο core!\n"
 
-#: g10/gpg.c:3821
+#: g10/gpg.c:3818
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το %s πα�ακάμπτει το %s\n"
 
-#: g10/gpg.c:3830
+#: g10/gpg.c:3827
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "το %s δεν επιτ�έπεται με το %s!\n"
 
-#: g10/gpg.c:3833
+#: g10/gpg.c:3830
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "το %s δεν έχει καμμία έννοια μαζί με το %s!\n"
 
-#: g10/gpg.c:3848 sm/gpgsm.c:1696 dirmngr/dirmngr.c:1123
+#: g10/gpg.c:3845 sm/gpgsm.c:1549 dirmngr/dirmngr.c:1160
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3869
+#: g10/gpg.c:3866
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "εγγ�αφή του μυστικο� κλειδιο� στο `%s'\n"
 
-#: g10/gpg.c:3897 g10/gpg.c:3928 sm/gpgsm.c:1763
+#: g10/gpg.c:3894 g10/gpg.c:3925 sm/gpgsm.c:1616
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "ο επιλεγμένος αλγό�ιθμος κ�υπτογ�άφησης δεν είναι έγκυ�ος\n"
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3901
 #, fuzzy, c-format
 #| msgid "selected digest algorithm is invalid\n"
 msgid "selected AEAD algorithm is invalid\n"
 msgstr "ο επιλεγμένος αλγό�ιθμος πε�ίληψης δεν είναι έγκυ�ος\n"
 
-#: g10/gpg.c:3916
+#: g10/gpg.c:3913
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "ο επιλεγμένος αλγό�ιθμος κ�υπτογ�άφησης δεν είναι έγκυ�ος\n"
 
-#: g10/gpg.c:3922
+#: g10/gpg.c:3919
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 "ο επιλεγμένος αλγό�ιθμος πε�ίληψης για πιστοποίηση\n"
 "δεν είναι έγκυ�ος\n"
 
-#: g10/gpg.c:3937
+#: g10/gpg.c:3934
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed π�έπει να είναι μεγαλ�τε�α από 0\n"
 
-#: g10/gpg.c:3939
+#: g10/gpg.c:3936
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed π�έπει να είναι μεγαλ�τε�α από 1\n"
 
-#: g10/gpg.c:3941
+#: g10/gpg.c:3938
 #, 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:3943
+#: g10/gpg.c:3940
 #, 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:3945
+#: g10/gpg.c:3942
 #, 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:3949
+#: g10/gpg.c:3946
 #, 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:3953
+#: g10/gpg.c:3950
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "μη έγκυ�η κατάσταση S2K; π�έπει να είναι 0, 1 ή 3\n"
 
-#: g10/gpg.c:3960
+#: g10/gpg.c:3957
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "μη έγκυ�ες π�οεπιλογές\n"
 
-#: g10/gpg.c:3964
+#: g10/gpg.c:3961
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "μη έγκυ�ες π�οεπιλογές π�οσωπικο� κ�υπταλγό�ιθμου\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3964
 #, fuzzy, c-format
 #| msgid "invalid personal cipher preferences\n"
 msgid "invalid personal AEAD preferences\n"
 msgstr "μη έγκυ�ες π�οεπιλογές π�οσωπικο� κ�υπταλγό�ιθμου\n"
 
-#: g10/gpg.c:3971
+#: g10/gpg.c:3968
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "μη έγκυ�ες π�οεπιλογές π�οσωπικο� αλγό�ιθμου πε�ίληψης\n"
 
-#: g10/gpg.c:3975
+#: g10/gpg.c:3972
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "μη έγκυ�ες π�οεπιλογές π�οσωπικο� αλγό�ιθμου συμπίεσης\n"
 
-#: g10/gpg.c:3984 g10/gpg.c:3989
+#: g10/gpg.c:3981 g10/gpg.c:3986
 #, fuzzy, c-format
 #| msgid "keysize invalid; using %u bits\n"
 msgid "chunk size invalid - using %d\n"
 msgstr "μη έγκυ�ο μέγεθος κλειδιο�, χ�ήση %u bits\n"
 
-#: g10/gpg.c:4026
+#: g10/gpg.c:4023
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "το %s ακόμα δε λειτου�γεί μαζί με το %s\n"
 
-#: g10/gpg.c:4089
+#: g10/gpg.c:4086
 #, fuzzy, c-format
 msgid "AEAD algorithm '%s' may not be used in %s mode\n"
 msgstr "απαγο�ε�ετε η χ�ήση του κ�υπταλγό�ιθμου \"%s\" στην κατάσταση %s\n"
 
-#: g10/gpg.c:4101
+#: g10/gpg.c:4098
 #, fuzzy, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr ""
 "απαγο�ε�ετε η χ�ήση του αλγό�ιθμου συμπίεσης \"%s\" στην κατάσταση %s\n"
 
-#: g10/gpg.c:4256
+#: g10/gpg.c:4253
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "αποτυχία α�χικοποίησης της TrustDB: %s\n"
 
-#: g10/gpg.c:4268
+#: g10/gpg.c:4265
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: δώθηκαν πα�αλήπτες (-r) χώ�ις χ�ήση κ�υπτογ�άφησης\n"
 "δημοσίου κλειδιο�\n"
 
-#: g10/gpg.c:4340
+#: g10/gpg.c:4337
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "αποκ�υπτογ�άφηση απέτυχε: %s\n"
 
-#: g10/gpg.c:4369
+#: g10/gpg.c:4366
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4372
+#: g10/gpg.c:4369
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "απαγο�ε�ετε η χ�ήση του %s στην κατάσταση %s.\n"
 
-#: g10/gpg.c:4430
+#: g10/gpg.c:4427
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4433
+#: g10/gpg.c:4430
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "απαγο�ε�ετε η χ�ήση του %s στην κατάσταση %s.\n"
 
-#: g10/gpg.c:4821 g10/keyserver.c:1870
+#: g10/gpg.c:4818 g10/keyserver.c:1629
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "keyserver αποστολή απέτυχε: %s\n"
 
-#: g10/gpg.c:4826
+#: g10/gpg.c:4823
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "keyserver λήψη απέτυχε: %s\n"
 
-#: g10/gpg.c:4832
+#: g10/gpg.c:4829
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "εξαγωγή κλειδιο� απέτυχε: %s\n"
 
-#: g10/gpg.c:4845
+#: g10/gpg.c:4842
 #, fuzzy, c-format
 #| msgid "key export failed: %s\n"
 msgid "export as ssh key failed: %s\n"
 msgstr "εξαγωγή κλειδιο� απέτυχε: %s\n"
 
-#: g10/gpg.c:4857
+#: g10/gpg.c:4854
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "keyserver αναζήτηση απέτυχε: %s\n"
 
-#: g10/gpg.c:4870
+#: g10/gpg.c:4867
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "keyserver ανανέωση απέτυχε: %s\n"
 
-#: g10/gpg.c:4937
+#: g10/gpg.c:4936
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "αποθω�άκιση απέτυχε: %s\n"
 
-#: g10/gpg.c:4948
+#: g10/gpg.c:4947
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "θω�άκιση απέτυχε: %s\n"
 
-#: g10/gpg.c:5053
+#: g10/gpg.c:5052
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "μη έγκυ�ος αλγό�ιθμος  hash `%s'\n"
 
-#: g10/gpg.c:5205 g10/tofu.c:2156
+#: g10/gpg.c:5204 g10/tofu.c:2160
 #, fuzzy, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: g10/gpg.c:5216
+#: g10/gpg.c:5215
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5272
+#: g10/gpg.c:5271
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5283
+#: g10/gpg.c:5282
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Μπο�είτε τώ�α να εισαγάγετε το μήνυμα σας ...\n"
 
-#: g10/gpg.c:5630
+#: g10/gpg.c:5629
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "το URL πολιτικής πιστοποιητικο� που δόθηκε δεν είναι έγκυ�ο\n"
 
-#: g10/gpg.c:5632
+#: g10/gpg.c:5631
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "το URL πολιτικής υπογ�αφής που δόθηκε δεν είναι έγκυ�ο\n"
 
-#: g10/gpg.c:5665
+#: g10/gpg.c:5664
 #, fuzzy, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "το URL πολιτικής υπογ�αφής που δόθηκε δεν είναι έγκυ�ο\n"
@@ -3513,7 +3527,7 @@ msgstr "εξαγωγή των κλειδιών από αυτή τη κλειδο
 msgid "make timestamp conflicts only a warning"
 msgstr "ο�ισμός των συγκ�ο�σεων ώ�ας (timestamp) μόνο σαν π�οειδοποίηση"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:414 tools/gpgconf.c:116 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:415 tools/gpgconf.c:116 tools/gpg-card.c:95
 msgid "|FD|write status info to this FD"
 msgstr "|FD|εγγ�αφή των πλη�οφο�ιών κατάστασης στο FD"
 
@@ -3608,271 +3622,271 @@ msgstr ""
 msgid "repair keys on import"
 msgstr "απεικόνιση του fingerprint"
 
-#: g10/import.c:399 g10/import.c:721
+#: g10/import.c:407 g10/import.c:729
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "πα�άλειψη τμήματος του τ�που %d\n"
 
-#: g10/import.c:738
+#: g10/import.c:746
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu κλειδιά έχουν μέχ�ι τώ�α επεξε�γαστεί\n"
 
-#: g10/import.c:831
+#: g10/import.c:839
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Συνολικός α�ιθμός που επεξε�γάστηκαν: %lu\n"
 
-#: g10/import.c:834
+#: g10/import.c:842
 #, fuzzy, c-format
 #| msgid "      skipped new keys: %lu\n"
 msgid "    skipped PGP-2 keys: %lu\n"
 msgstr "      νέα κλειδιά που πα�αλείφθηκαν: %lu\n"
 
-#: g10/import.c:836
+#: g10/import.c:844
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      νέα κλειδιά που πα�αλείφθηκαν: %lu\n"
 
-#: g10/import.c:839
+#: g10/import.c:847
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          χω�ίς user ID: %lu\n"
 
-#: g10/import.c:842 sm/import.c:129
+#: g10/import.c:850 sm/import.c:129
 #, c-format
 msgid "              imported: %lu"
 msgstr "              εισαχθέντα: %lu"
 
-#: g10/import.c:846 sm/import.c:133
+#: g10/import.c:854 sm/import.c:133
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             αμετάβλητα: %lu\n"
 
-#: g10/import.c:848
+#: g10/import.c:856
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          νέα user ID: %lu\n"
 
-#: g10/import.c:850
+#: g10/import.c:858
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           νέα υποκλειδιά: %lu\n"
 
-#: g10/import.c:852
+#: g10/import.c:860
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        νέες υπογ�αφές: %lu\n"
 
-#: g10/import.c:854
+#: g10/import.c:862
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   νέες ανακλήσεις κλειδιών: %lu\n"
 
-#: g10/import.c:856 sm/import.c:135
+#: g10/import.c:864 sm/import.c:135
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      αναγνωσμένα μυστικά κλειδιά: %lu\n"
 
-#: g10/import.c:858 sm/import.c:137
+#: g10/import.c:866 sm/import.c:137
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  εισαχθέντα μυστικά κλειδιά: %lu\n"
 
-#: g10/import.c:860 sm/import.c:139
+#: g10/import.c:868 sm/import.c:139
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " αμετάβλητα μυστικά κλειδιά: %lu\n"
 
-#: g10/import.c:862 sm/import.c:141
+#: g10/import.c:870 sm/import.c:141
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "          μη  εισαχθέντα: %lu\n"
 
-#: g10/import.c:864
+#: g10/import.c:872
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "        νέες υπογ�αφές: %lu\n"
 
-#: g10/import.c:866
+#: g10/import.c:874
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "      αναγνωσμένα μυστικά κλειδιά: %lu\n"
 
-#: g10/import.c:1291
+#: g10/import.c:1299
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:1333
+#: g10/import.c:1341
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:1351
+#: g10/import.c:1359
 #, fuzzy, c-format
 msgid "         \"%s\": preference for AEAD algorithm %s\n"
 msgstr "%s υπογ�αφή, αλγό�ιθμος πε�ίληψης %s\n"
 
-#: g10/import.c:1366
+#: g10/import.c:1374
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s υπογ�αφή, αλγό�ιθμος πε�ίληψης %s\n"
 
-#: g10/import.c:1378
+#: g10/import.c:1386
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:1391
+#: g10/import.c:1399
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:1393
+#: g10/import.c:1401
 #, c-format
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:1418
+#: g10/import.c:1426
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:1932 g10/import.c:3053
+#: g10/import.c:1940 g10/import.c:3061
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "κλειδί %08lX: δεν υπά�χει αυτό το user ID\n"
 
-#: g10/import.c:1938
+#: g10/import.c:1946
 #, fuzzy, c-format
 msgid "key %s: %s\n"
 msgstr "πα�αλείφθηκε `%s': %s\n"
 
-#: g10/import.c:1939 g10/import.c:3025
+#: g10/import.c:1947 g10/import.c:3033
 msgid "rejected by import screener"
 msgstr ""
 
-#: g10/import.c:1988
+#: g10/import.c:1996
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "κλειδί %08lX: επιδιό�θωση φθα�μένου υποκλειδιο� HKP\n"
 
-#: g10/import.c:2009
+#: g10/import.c:2017
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "κλειδί %08lX: δεκτό μη ιδιο-υπογεγ�αμμένο user ID '%s'\n"
 
-#: g10/import.c:2020 g10/import.c:2051
+#: g10/import.c:2028 g10/import.c:2059
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "κλειδί %08lX: δεν έχει έγκυ�α user ID\n"
 
-#: g10/import.c:2022
+#: g10/import.c:2030
 #, c-format
 msgid "this may be caused by a missing self-signature\n"
 msgstr "αυτό μπο�εί να συνέβει από μια απο�σα ιδιοϋπογ�αφή\n"
 
-#: g10/import.c:2101 g10/import.c:3439
+#: g10/import.c:2109 g10/import.c:3447
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "κλειδί %08lX: μυστικό κλειδί που δε β�έθηκε: %s\n"
 
-#: g10/import.c:2107
+#: g10/import.c:2115
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "κλειδί %08lX:  νέο κλειδί - πα�αλείφθηκε\n"
 
-#: g10/import.c:2119
+#: g10/import.c:2127
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "δεν β�εθηκε εγγ�άψιμη κλειδοθήκη: %s\n"
 
-#: g10/import.c:2151 g10/import.c:2253 g10/import.c:3514
+#: g10/import.c:2159 g10/import.c:2261 g10/import.c:3522
 #, fuzzy, c-format
 #| msgid "error writing keyring `%s': %s\n"
 msgid "error writing keyring '%s': %s\n"
 msgstr "αδυναμία εγγ�αφής της κλειδοθήκης `%s': %s\n"
 
-#: g10/import.c:2174
+#: g10/import.c:2182
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "κλειδί %08lX: το δημόσιο κλειδί \"%s\" έχει εισαχθεί\n"
 
-#: g10/import.c:2201
+#: g10/import.c:2209
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "κλειδί %08lX: δεν ται�ιάζει με το αντίγ�αφο μας\n"
 
-#: g10/import.c:2269
+#: g10/import.c:2277
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "κλειδί %08lX: \"%s\" 1 νέο user ID\n"
 
-#: g10/import.c:2272
+#: g10/import.c:2280
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "κλειδί %08lX: \"%s\" %d νέα user ID\n"
 
-#: g10/import.c:2275
+#: g10/import.c:2283
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "κλειδί %08lX: \"%s\" 1 νέα υπογ�αφή\n"
 
-#: g10/import.c:2278
+#: g10/import.c:2286
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "κλειδί %08lX: \"%s\" %d νέες υπογ�αφές\n"
 
-#: g10/import.c:2281
+#: g10/import.c:2289
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "κλειδί %08lX: \"%s\" 1 νέο υποκλειδί\n"
 
-#: g10/import.c:2284
+#: g10/import.c:2292
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "κλειδί %08lX: \"%s\" %d νέα υποκλειδιά\n"
 
-#: g10/import.c:2287
+#: g10/import.c:2295
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "κλειδί %08lX: \"%s\" %d νέες υπογ�αφές\n"
 
-#: g10/import.c:2290
+#: g10/import.c:2298
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "κλειδί %08lX: \"%s\" %d νέες υπογ�αφές\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2301
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "κλειδί %08lX: \"%s\" %d νέα user ID\n"
 
-#: g10/import.c:2296
+#: g10/import.c:2304
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "κλειδί %08lX: \"%s\" %d νέα user ID\n"
 
-#: g10/import.c:2332
+#: g10/import.c:2340
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "κλειδί %08lX: \"%s\" αμετάβλητο\n"
 
-#: g10/import.c:2692 g10/import.c:2887
+#: g10/import.c:2700 g10/import.c:2895
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "κλειδί %08lX: μυστικό κλειδί εισήχθηκε\n"
 
-#: g10/import.c:2700
+#: g10/import.c:2708
 #, fuzzy, c-format
 #| msgid "skipped: secret key already present\n"
 msgid "key %s: secret key already exists\n"
 msgstr "πα�αλείφθηκε: μυστικό κλειδί ήδη πα�ών\n"
 
-#: g10/import.c:2708
+#: g10/import.c:2716
 #, fuzzy, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "σφάλμα στη αποστολή π�ος το `%s': %s\n"
@@ -3885,213 +3899,212 @@ msgstr "σφάλμα στη αποστολή π�ος το `%s': %s\n"
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2877
+#: g10/import.c:2885
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:3024
+#: g10/import.c:3032
 #, fuzzy, c-format
 msgid "secret key %s: %s\n"
 msgstr "το μυστικό κλειδί `%s' δε β�έθηκε: %s\n"
 
-#: g10/import.c:3045 g10/import.c:3084
+#: g10/import.c:3053 g10/import.c:3092
 #, fuzzy, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "εγγ�αφή του μυστικο� κλειδιο� στο `%s'\n"
 
-#: g10/import.c:3072
+#: g10/import.c:3080
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "κλειδί %08lX: μυστικό κλειδί με άκυ�ο κ�υπταλγ. %d - πα�αλείφθηκε\n"
 
-#: g10/import.c:3234 g10/pkclist.c:75 g10/revoke.c:774
+#: g10/import.c:3242 g10/pkclist.c:75 g10/revoke.c:775
 msgid "No reason specified"
 msgstr "Δεν έχει ο�ιστεί αιτία"
 
-#: g10/import.c:3235 g10/pkclist.c:77 g10/revoke.c:776
+#: g10/import.c:3243 g10/pkclist.c:77 g10/revoke.c:777
 msgid "Key is superseded"
 msgstr "Το κλειδί έχει πα�ακαμθεί"
 
-#: g10/import.c:3236 g10/pkclist.c:79 g10/revoke.c:775
+#: g10/import.c:3244 g10/pkclist.c:79 g10/revoke.c:776
 msgid "Key has been compromised"
 msgstr "Το κλειδί έχει εκτεθεί"
 
-#: g10/import.c:3237 g10/pkclist.c:81 g10/revoke.c:777
+#: g10/import.c:3245 g10/pkclist.c:81 g10/revoke.c:778
 msgid "Key is no longer used"
 msgstr "Το κλειδί δε χ�ησιμοποιείται πλέον"
 
-#: g10/import.c:3238 g10/pkclist.c:83 g10/revoke.c:778
+#: g10/import.c:3246 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "Το User ID δεν είναι πλέον έγκυ�ο"
 
-#: g10/import.c:3363 g10/keylist.c:1105 g10/pkclist.c:87
+#: g10/import.c:3371 g10/keylist.c:1105 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "αιτία για ανάκληση:"
 
-#: g10/import.c:3382 g10/keylist.c:1124 g10/pkclist.c:103
+#: g10/import.c:3390 g10/keylist.c:1124 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "σχόλιο ανάκλησης:"
 
-#: g10/import.c:3432
+#: g10/import.c:3440
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "κλειδί %08lX: όχι δημόσιο κλειδί - αδυναμία εφα�μογής πιστοποιητικο� "
 "ανάκλησης\n"
 
-#: g10/import.c:3461
+#: g10/import.c:3469
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "κλειδί %08lX: αδυναμία εντοπισμο� του α�χικο� τμήματος κλειδιο�: %s\n"
 
-#: g10/import.c:3468
+#: g10/import.c:3476
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "κλειδί %08lX: αδυναμία ανάγνωσης του α�χικο� τμήματος κλειδιο�: %s\n"
 
-#: g10/import.c:3488
+#: g10/import.c:3496
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "κλειδί %08lX: μη έγκυ�ο πιστοποιητικό ανάκλησης: %s - από��ιψη\n"
 
-#: g10/import.c:3523
+#: g10/import.c:3531
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "κλειδί %08lX: \"%s\" πιστοποιητικό ανάκλησης εισήχθηκε\n"
 
-#: g10/import.c:3609
+#: g10/import.c:3617
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "κλειδί %08lX: δεν υπά�χει user ID για την υπογ�αφή\n"
 
-#: g10/import.c:3626
+#: g10/import.c:3634
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "κλειδί %08lX: μη υποστη�ιζόμενος αλγό�ιθμος δημοσίου κλειδιο� στο user id "
 "\"%s\"\n"
 
-#: g10/import.c:3628
+#: g10/import.c:3636
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "κλειδί %08lX: μη έγκυ�η ιδιο-υπογ�αφή στο user id \"%s\"\n"
 
-#: g10/import.c:3645 g10/import.c:3673 g10/import.c:3729
+#: g10/import.c:3653 g10/import.c:3681 g10/import.c:3737
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "κλειδί %08lX: μη υποστη�ιζόμενος αλγό�ιθμος δημοσίου κλειδιο�\n"
 
-#: g10/import.c:3646
+#: g10/import.c:3654
 #, fuzzy, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "κλειδί %08lX: άμεση υπογ�αφή κλειδιο� π�οστέθηκε\n"
 
-#: g10/import.c:3660
+#: g10/import.c:3668
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "κλειδί %08lX: δεν υπά�χει υποκλειδί για τη δέσμευση κλειδιο�\n"
 
-#: g10/import.c:3675
+#: g10/import.c:3683
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "κλειδί %08lX: μη έγκυ�η δέσμευση υποκλειδιο�\n"
 
-#: g10/import.c:3694
+#: g10/import.c:3702
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "κλειδί %08lX: αφαι�έθηκε η δέσμευση πολλαπλο� υποκλειδιο�\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3726
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "κλειδί %08lX: δεν υπά�χει υποκλειδί για την ανάκληση κλειδιο�\n"
 
-#: g10/import.c:3731
+#: g10/import.c:3739
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "κλειδί %08lX: μη έγκυ�η ανάκληση υποκλειδιο�\n"
 
-#: g10/import.c:3746
+#: g10/import.c:3754
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "κλειδί %08lX: αφαι�έθηκε η ανάκληση πολλαπλο� υποκλειδιο�\n"
 
-#: g10/import.c:3790
+#: g10/import.c:3798
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "κλειδί %08lX: πα�αλείφθηκε user ID '"
 
-#: g10/import.c:3817
+#: g10/import.c:3825
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "κλειδί %08lX: πα�αλείφθηκε υποκλειδί\n"
 
-#: g10/import.c:3849
+#: g10/import.c:3857
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "κλειδί %08lX: μη εξαγόμενη υπογ�αφή (κλάση %02x) - πα�αλείφθηκε\n"
 
-#: g10/import.c:3860
+#: g10/import.c:3868
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "κλειδί %08lX: το πιστοποιητικό ανάκλησης σε λάθος σημείο - πα�αλείφθηκε\n"
 
-#: g10/import.c:3878
+#: g10/import.c:3886
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "κλειδί %08lX: μη έγκυ�ο πιστοποιητικό ανάκλησης: %s - πα�αλείφθηκε\n"
 
-#: g10/import.c:3892
+#: g10/import.c:3900
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr ""
 "κλειδί %08lX: η υπογ�αφή του υποκλειδιο� σε λάθος σημείο - πα�αλείφθηκε\n"
 
-#: g10/import.c:3900
+#: g10/import.c:3908
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "κλειδί %08lX: μη αναμενώμενη κλάση υπογ�αφής (0x%02x) - πα�αλείφθηκε\n"
 
-#: g10/import.c:4073
+#: g10/import.c:4081
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "κλειδί %08lX: εντοπίστηκε διπλό user ID - ενώθηκαν\n"
 
-#: g10/import.c:4180
+#: g10/import.c:4188
 #, fuzzy, c-format
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr "κλειδί %08lX: εντοπίστηκε διπλό user ID - ενώθηκαν\n"
 
-#: g10/import.c:4245
+#: g10/import.c:4253
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: κλειδί %08lX μπο�εί να ανακληθεί: λήψη κλειδιο� ανάκλησης "
 "%08lX\n"
 
-#: g10/import.c:4261
+#: g10/import.c:4269
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: κλειδί %08lX μπο�εί να ανακληθεί: το κλειδί ανάκλησης %08lX\n"
 "δεν είναι πα�ών.\n"
 
-#: g10/import.c:4327
+#: g10/import.c:4335
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "κλειδί %08lX: \"%s\" πιστοποιητικό ανάκλησης π�οστέθηκε\n"
 
-#: g10/import.c:4365
+#: g10/import.c:4373
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "κλειδί %08lX: άμεση υπογ�αφή κλειδιο� π�οστέθηκε\n"
 
-#: g10/key-check.c:133 dirmngr/dirmngr_ldap.c:650 dirmngr/ldap-wrapper.c:835
-#: dirmngr/ldap-wrapper.c:852
+#: g10/key-check.c:133 dirmngr/ldap-wrapper.c:835 dirmngr/ldap-wrapper.c:852
 #, fuzzy, c-format
 msgid "error allocating memory: %s\n"
 msgstr "αδυναμία δημιου�γίας της κλειδοθήκης `%s': %s\n"
@@ -4154,7 +4167,7 @@ msgid ""
 "all signatures.\n"
 msgstr ""
 
-#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:284 sm/keydb.c:297
+#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:289 sm/keydb.c:302
 #, fuzzy, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "αδυναμία δημιου�γίας της κλειδοθήκης `%s': %s\n"
@@ -4165,7 +4178,7 @@ msgstr "αδυναμία δημιου�γίας της κλειδοθήκης `%
 msgid "error creating keyring '%s': %s\n"
 msgstr "αδυναμία δημιου�γίας της κλειδοθήκης `%s': %s\n"
 
-#: g10/keydb.c:388 sm/keydb.c:303
+#: g10/keydb.c:388 sm/keydb.c:308
 #, fuzzy, c-format
 msgid "keybox '%s' created\n"
 msgstr "κλειδοθήκη `%s' δημιου�γήθηκε\n"
@@ -4447,8 +4460,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Σίγου�α να υπογ�αφεί; "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6192 g10/keyedit.c:6275 g10/keyedit.c:6404
-#: g10/keyedit.c:6466 g10/sign.c:528
+#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
+#: g10/keyedit.c:6474 g10/sign.c:528
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "η υπογ�αφή απέτυχε: %s\n"
@@ -4859,7 +4872,7 @@ msgstr "Δεν υπά�χει αυτό το user ID.\n"
 msgid "Nothing to sign.\n"
 msgstr "Τίποτα για να υπογ�αφεί με το κλειδί  %08lX\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6057
+#: g10/keyedit.c:2973 g10/keyedit.c:6065
 #, fuzzy, c-format
 msgid "Not signed by you.\n"
 msgstr "   υπογ�άφθηκε από %08lX στις %s%s\n"
@@ -4929,7 +4942,7 @@ msgstr "Αυτό το κλειδί μπο�εί να ανακληθεί από %
 msgid "(sensitive)"
 msgstr " (ευαίσθητο)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:525
+#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "αδυναμία δημιου�γίας του %s: %s\n"
@@ -4945,7 +4958,7 @@ msgid "expired: %s"
 msgstr " [λήγει: %s]"
 
 #: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2262
-#: g10/keyserver.c:531
+#: g10/keyserver.c:354
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [λήγει: %s]"
@@ -4981,14 +4994,14 @@ msgstr ""
 "Η εγγυ�ότητα του απεικονιζόμενου κλειδιο� δεν είναι απα�αίτητα σωστή\n"
 "εκτός και εάν επανακκινήσετε το π�όγ�αμμα.\n"
 
-#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:535
-#: g10/mainproc.c:2280 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
+#: g10/mainproc.c:2282 g10/tofu.c:1789 g10/trust.c:426 dirmngr/ocsp.c:792
 #, fuzzy
 msgid "revoked"
 msgstr "[ανακλημένο]"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:539
-#: g10/mainproc.c:2282 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
+#: g10/mainproc.c:2284 g10/tofu.c:1794 g10/trust.c:113
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -5030,7 +5043,7 @@ msgstr "Σίγου�α ακόμα θέλετε να το π�οσθέσετε; (
 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:3107
+#: g10/keyedit.c:4273 g10/keygen.c:3111
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
@@ -5190,7 +5203,7 @@ msgstr ""
 msgid "Please select exactly one user ID.\n"
 msgstr "Π�έπει να επιλέξετε ακ�ιβώς ένα user ID.\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5357 g10/keyedit.c:5495
+#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "πα�αλείφθηκε η v3 ιδιο-υπογ�αφή στο user id \"%s\"\n"
@@ -5199,134 +5212,134 @@ msgstr "πα�αλείφθηκε η v3 ιδιο-υπογ�αφή στο user id
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5380
+#: g10/keyedit.c:5383
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Σίγου�α θέλετε ακόμα να το χ�ησιμοποιήσετε; (y/N) "
 
-#: g10/keyedit.c:5381
+#: g10/keyedit.c:5384
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Σίγου�α θέλετε ακόμα να το χ�ησιμοποιήσετε; (y/N) "
 
-#: g10/keyedit.c:5441
+#: g10/keyedit.c:5449
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Σημείωση υπογ�αφής: "
 
-#: g10/keyedit.c:5588
+#: g10/keyedit.c:5596
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Επικάλυψη (y/N); "
 
-#: g10/keyedit.c:5658
+#: g10/keyedit.c:5666
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Δεν υπά�χει user ID με δείκτη %d\n"
 
-#: g10/keyedit.c:5720
+#: g10/keyedit.c:5728
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Δεν υπά�χει user ID με δείκτη %d\n"
 
-#: g10/keyedit.c:5821
+#: g10/keyedit.c:5829
 #, fuzzy, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Δεν υπά�χει user ID με δείκτη %d\n"
 
-#: g10/keyedit.c:5843
+#: g10/keyedit.c:5851
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Δεν υπά�χει user ID με δείκτη %d\n"
 
-#: g10/keyedit.c:5984
+#: g10/keyedit.c:5992
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "user ID: \""
 
-#: g10/keyedit.c:5987 g10/keyedit.c:6089 g10/keyedit.c:6137
+#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   υπογ�άφθηκε από %08lX στις %s%s%s\n"
 
-#: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
+#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
 msgid " (non-exportable)"
 msgstr " (μη-εξαγώγιμο)"
 
-#: g10/keyedit.c:5993
+#: g10/keyedit.c:6001
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Αυτή η υπογ�αφή έληξε στις %s.\n"
 
-#: g10/keyedit.c:5998
+#: g10/keyedit.c:6006
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Σίγου�α θέλετε να ανακληθεί αυτό το κλειδί; "
 
-#: g10/keyedit.c:6003
+#: g10/keyedit.c:6011
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Δημιου�γία ενός πιστοποιητικο� ανάκλησης για αυτή την υπογ�αφή; (y/N)"
 
-#: g10/keyedit.c:6063
+#: g10/keyedit.c:6071
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Έχετε υπογ�άψει αυτά τα user ID:\n"
 
-#: g10/keyedit.c:6092
+#: g10/keyedit.c:6100
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (μη-εξαγώγιμο)"
 
-#: g10/keyedit.c:6099
+#: g10/keyedit.c:6107
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   ανακλήθηκε από %08lX στις %s\n"
 
-#: g10/keyedit.c:6124
+#: g10/keyedit.c:6132
 msgid "You are about to revoke these signatures:\n"
 msgstr "Σκοπε�ετε να ανακαλέσετε αυτές τις υπογ�αφές:\n"
 
-#: g10/keyedit.c:6147
+#: g10/keyedit.c:6155
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Σίγου�α να δημιου�γηθο�ν τα πιστοποιητικά ανάκλησης; (y/N)"
 
-#: g10/keyedit.c:6180
+#: g10/keyedit.c:6188
 #, c-format
 msgid "no secret key\n"
 msgstr "κανένα μυστικό κλειδί\n"
 
-#: g10/keyedit.c:6228
+#: g10/keyedit.c:6236
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6238
+#: g10/keyedit.c:6246
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "το user ID \"%s\" έχει ήδη ανακληθεί\n"
 
-#: g10/keyedit.c:6255
+#: g10/keyedit.c:6263
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μια υπογ�αφή user ID έχει ημε�ομηνία %d δε�τε�α στο μέλλον\n"
 
-#: g10/keyedit.c:6351
+#: g10/keyedit.c:6359
 #, 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:6389
+#: g10/keyedit.c:6397
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "το user ID \"%s\" έχει ήδη ανακληθεί\n"
 
-#: g10/keyedit.c:6451
+#: g10/keyedit.c:6459
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "το user ID \"%s\" έχει ήδη ανακληθεί\n"
 
-#: g10/keyedit.c:6548
+#: g10/keyedit.c:6556
 #, 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"
@@ -5336,83 +5349,83 @@ msgstr "Απεικόνιση %s photo ID μεγέθους %ld για το κλε
 msgid "invalid value for option '%s'\n"
 msgstr "μη έγκυ�ες επιλογές ειγαγωγής\n"
 
-#: g10/keygen.c:338
+#: g10/keygen.c:339
 #, fuzzy, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "η π�οεπιλογή %c%lu αντιγ�άφτηκε\n"
 
-#: g10/keygen.c:345
+#: g10/keygen.c:346
 #, fuzzy, c-format
 msgid "too many cipher preferences\n"
 msgstr "πά�α πολλές `%c' π�οεπιλογές\n"
 
-#: g10/keygen.c:347
+#: g10/keygen.c:348
 #, fuzzy, c-format
 msgid "too many digest preferences\n"
 msgstr "πά�α πολλές `%c' π�οεπιλογές\n"
 
-#: g10/keygen.c:349
+#: g10/keygen.c:350
 #, fuzzy, c-format
 msgid "too many compression preferences\n"
 msgstr "πά�α πολλές `%c' π�οεπιλογές\n"
 
-#: g10/keygen.c:351
+#: g10/keygen.c:352
 #, fuzzy, c-format
 msgid "too many AEAD preferences\n"
 msgstr "πά�α πολλές `%c' π�οεπιλογές\n"
 
-#: g10/keygen.c:521
+#: g10/keygen.c:522
 #, fuzzy, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "μη έγκυ�ος χα�ακτή�ας στο \"κο�δόνι\" της επιλογής\n"
 
-#: g10/keygen.c:1130
+#: g10/keygen.c:1131
 #, c-format
 msgid "writing direct signature\n"
 msgstr "εγγ�αφή άμεσης υπογ�αφής\n"
 
-#: g10/keygen.c:1176
+#: g10/keygen.c:1177
 #, c-format
 msgid "writing self signature\n"
 msgstr "εγγ�αφή ιδιο-υπογ�αφής\n"
 
-#: g10/keygen.c:1233
+#: g10/keygen.c:1234
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "εγγ�αφή υπογ�αφής \"δέσιμου\" κλειδιο�\n"
 
-#: g10/keygen.c:1598 g10/keygen.c:1603 g10/keygen.c:1655 g10/keygen.c:1660
-#: g10/keygen.c:1832 g10/keygen.c:1837
+#: g10/keygen.c:1599 g10/keygen.c:1604 g10/keygen.c:1656 g10/keygen.c:1661
+#: g10/keygen.c:1833 g10/keygen.c:1838
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "μη έγκυ�ο μέγεθος κλειδιο�, χ�ήση %u bits\n"
 
-#: g10/keygen.c:1609 g10/keygen.c:1666 g10/keygen.c:1674 g10/keygen.c:1843
+#: g10/keygen.c:1610 g10/keygen.c:1667 g10/keygen.c:1675 g10/keygen.c:1844
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "στ�ογγυλοποίηση του μέγεθος κλειδιο� έως %u bits\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1701
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1899
+#: g10/keygen.c:1900
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1902
+#: g10/keygen.c:1903
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1906
 #, fuzzy
 msgid "Encrypt"
 msgstr "κ�υπτογ�άφηση δεδομένων"
 
-#: g10/keygen.c:1908
+#: g10/keygen.c:1909
 msgid "Authenticate"
 msgstr ""
 
@@ -5426,179 +5439,179 @@ msgstr ""
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1929
+#: g10/keygen.c:1930
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1967
 #, c-format
 msgid "Possible actions for this %s key: "
 msgstr ""
 
-#: g10/keygen.c:1973
+#: g10/keygen.c:1974
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1979
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1981
+#: g10/keygen.c:1982
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (για κ�υπτογ�άφηση μόνο)\n"
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1985
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1987
+#: g10/keygen.c:1988
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:2116
+#: g10/keygen.c:2117
 #, fuzzy, c-format
 msgid "   (%d) RSA and RSA%s\n"
 msgstr "   (%d) DSA και ElGamal (π�οκαθο�ισμένο)\n"
 
-#: g10/keygen.c:2120
+#: g10/keygen.c:2121
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal%s\n"
 msgstr "   (%d) DSA και ElGamal (π�οκαθο�ισμένο)\n"
 
-#: g10/keygen.c:2123
+#: g10/keygen.c:2124
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "   (%d) DSA (sign only)%s\n"
 msgstr "   (%d) DSA (για υπογ�αφή μόνο)\n"
 
-#: g10/keygen.c:2125
+#: g10/keygen.c:2126
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (sign only)\n"
 msgid "   (%d) RSA (sign only)%s\n"
 msgstr "   (%d) RSA (για υπογ�αφή μόνο)\n"
 
-#: g10/keygen.c:2131
+#: g10/keygen.c:2132
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)%s\n"
 msgstr "   (%d) ElGamal (για κ�υπτογ�άφηση μόνο)\n"
 
-#: g10/keygen.c:2133
+#: g10/keygen.c:2134
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (encrypt only)\n"
 msgid "   (%d) RSA (encrypt only)%s\n"
 msgstr "   (%d) RSA (για κ�υπτογ�άφηση μόνο)\n"
 
-#: g10/keygen.c:2139
+#: g10/keygen.c:2140
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (για κ�υπτογ�άφηση μόνο)\n"
 
-#: g10/keygen.c:2141
+#: g10/keygen.c:2142
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (για κ�υπτογ�άφηση μόνο)\n"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2148
 #, fuzzy, c-format
 msgid "   (%d) ECC (sign and encrypt)%s\n"
 msgstr "   (%d) RSA (υπογ�αφή και κ�υπτογ�άφηση)\n"
 
-#: g10/keygen.c:2147 g10/keygen.c:2678
+#: g10/keygen.c:2148 g10/keygen.c:2679
 #, fuzzy
 #| msgid " (default)"
 msgid " *default*"
 msgstr " (π�οκαθο�ισμένο)"
 
-#: g10/keygen.c:2148
+#: g10/keygen.c:2149
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "  (%d) ECC (sign only)\n"
 msgstr "   (%d) DSA (για υπογ�αφή μόνο)\n"
 
-#: g10/keygen.c:2150
+#: g10/keygen.c:2151
 #, fuzzy, c-format
 msgid "  (%d) ECC (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (για κ�υπτογ�άφηση μόνο)\n"
 
-#: g10/keygen.c:2152
+#: g10/keygen.c:2153
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (encrypt only)\n"
 msgid "  (%d) ECC (encrypt only)%s\n"
 msgstr "   (%d) RSA (για κ�υπτογ�άφηση μόνο)\n"
 
-#: g10/keygen.c:2156
+#: g10/keygen.c:2157
 #, fuzzy, c-format
 msgid "  (%d) Existing key%s\n"
 msgstr "   (%d) RSA (για κ�υπτογ�άφηση μόνο)\n"
 
-#: g10/keygen.c:2158
+#: g10/keygen.c:2159
 #, fuzzy, c-format
 msgid "  (%d) Existing key from card%s\n"
 msgstr "   (%d) RSA (για κ�υπτογ�άφηση μόνο)\n"
 
-#: g10/keygen.c:2254 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2255 sm/certreqgen-ui.c:203
 #, fuzzy
 msgid "Enter the keygrip: "
 msgstr "Σημείωση υπογ�αφής: "
 
-#: g10/keygen.c:2267 sm/certreqgen-ui.c:211 tools/gpg-card.c:2280
+#: g10/keygen.c:2268 sm/certreqgen-ui.c:211 tools/gpg-card.c:2297
 #, c-format
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr ""
 
-#: g10/keygen.c:2269 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2270 sm/certreqgen-ui.c:213
 #, fuzzy
 msgid "No key with this keygrip\n"
 msgstr "Δεν υπά�χει user ID με δείκτη %d\n"
 
-#: g10/keygen.c:2288 g10/keygen.c:2298 g10/keygen.c:3440 g10/keygen.c:3451
+#: g10/keygen.c:2289 g10/keygen.c:2299 g10/keygen.c:3444 g10/keygen.c:3455
 #: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
 #, fuzzy, c-format
 msgid "error reading the card: %s\n"
 msgstr "%s: σφάλμα στην ανάγνωση της εγγ�αφής free : %s\n"
 
-#: g10/keygen.c:2292 g10/keygen.c:3444 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2293 g10/keygen.c:3448 sm/certreqgen-ui.c:234
 #, fuzzy, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: g10/keygen.c:2311 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2312 sm/certreqgen-ui.c:246
 #, fuzzy
 msgid "Available keys:\n"
 msgstr "απενε�γοποιεί ένα κλειδί"
 
-#: g10/keygen.c:2504 g10/keygen.c:2518
+#: g10/keygen.c:2505 g10/keygen.c:2519
 #, fuzzy, c-format
 #| msgid "rounded up to %u bits\n"
 msgid "rounded to %u bits\n"
 msgstr "στ�ογγυλοποιήθηκε έως τα %u bits\n"
 
-#: g10/keygen.c:2559
+#: g10/keygen.c:2560
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:2567
+#: g10/keygen.c:2568
 #, fuzzy, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Τι μέγεθος κλειδιο� θα θέλατε; (1024) "
 
-#: g10/keygen.c:2584 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2585 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Το μέγεθος κλειδιο� που ζητήθηκε είναι %u bits\n"
 
-#: g10/keygen.c:2630
+#: g10/keygen.c:2631
 #, fuzzy
 #| msgid "Please select what kind of key you want:\n"
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Πα�ακαλώ επιλέξτε τον τ�πο του κλειδιο� που θέλετε:\n"
 
-#: g10/keygen.c:2819
+#: g10/keygen.c:2820
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5614,7 +5627,7 @@ msgstr ""
 "      <n>m = το κλειδί λήγει σε n μήνες\n"
 "      <n>y = το κλειδί λήγει σε n έτη\n"
 
-#: g10/keygen.c:2830
+#: g10/keygen.c:2831
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5630,40 +5643,40 @@ msgstr ""
 "      <n>m = το κλειδί λήγει σε n μήνες\n"
 "      <n>y = το κλειδί λήγει σε n έτη\n"
 
-#: g10/keygen.c:2853
+#: g10/keygen.c:2854
 msgid "Key is valid for? (0) "
 msgstr "Το κλειδί είναι έγκυ�ο για; (0) "
 
-#: g10/keygen.c:2858
+#: g10/keygen.c:2859
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Η υπογ�αφή έιναι έγκυ�η για; (0) "
 
-#: g10/keygen.c:2871 g10/keygen.c:2896
+#: g10/keygen.c:2875 g10/keygen.c:2900
 msgid "invalid value\n"
 msgstr "μη έγκυ�η τιμή\n"
 
-#: g10/keygen.c:2878
+#: g10/keygen.c:2882
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "το %s δεν λήγει ποτέ\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2883
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "το %s δεν λήγει ποτέ\n"
 
-#: g10/keygen.c:2884
+#: g10/keygen.c:2888
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "το %s λήγει στις %s\n"
 
-#: g10/keygen.c:2885
+#: g10/keygen.c:2889
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Υπογ�αφή λήγει στις %s.\n"
 
-#: g10/keygen.c:2889
+#: g10/keygen.c:2893
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5671,12 +5684,12 @@ msgstr ""
 "Το σ�στημα σας δεν μπο�εί να απεικονίσει ημε�ομηνίες πέ�α του 2038.\n"
 "Όμως, θα χει�ίζονται σωστά έως το 2106.\n"
 
-#: g10/keygen.c:2902
+#: g10/keygen.c:2906
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Είναι αυτό σωστό (y/n); "
 
-#: g10/keygen.c:2970
+#: g10/keygen.c:2974
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5687,7 +5700,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2985
+#: g10/keygen.c:2989
 #, fuzzy
 msgid ""
 "\n"
@@ -5704,50 +5717,50 @@ msgstr ""
 "    \"Nikolaoy Nikos (toy Ioanni) <nikoln@athens.gr>\"\n"
 "\n"
 
-#: g10/keygen.c:3004
+#: g10/keygen.c:3008
 msgid "Real name: "
 msgstr "Αληθινό Όνομα: "
 
-#: g10/keygen.c:3013
+#: g10/keygen.c:3017
 msgid "Invalid character in name\n"
 msgstr "Μη έγκυ�ος χα�ακτή�ας στο όνομα\n"
 
-#: g10/keygen.c:3014
+#: g10/keygen.c:3018
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:3018
+#: g10/keygen.c:3022
 msgid "Name may not start with a digit\n"
 msgstr "Το όνομα δεν επιτ�έπεται να ξεκινά με α�ιθμητικό ψηφίο\n"
 
-#: g10/keygen.c:3021
+#: g10/keygen.c:3025
 msgid "Name must be at least 5 characters long\n"
 msgstr "Το όνομα π�έπει να έχει τουλάχιστον 5 χα�ακτή�ες\n"
 
-#: g10/keygen.c:3031
+#: g10/keygen.c:3035
 msgid "Email address: "
 msgstr "Διε�θυνση Email: "
 
-#: g10/keygen.c:3037
+#: g10/keygen.c:3041
 msgid "Not a valid email address\n"
 msgstr "Μη έγκυ�η διε�θυνση Email\n"
 
-#: g10/keygen.c:3046
+#: g10/keygen.c:3050
 msgid "Comment: "
 msgstr "Σχόλιο: "
 
-#: g10/keygen.c:3052
+#: g10/keygen.c:3056
 msgid "Invalid character in comment\n"
 msgstr "Μη έγκυ�ος χα�ακτή�ας στο σχόλιο\n"
 
-#: g10/keygen.c:3088
+#: g10/keygen.c:3092
 #, fuzzy, c-format
 #| msgid "You are using the `%s' character set.\n"
 msgid "You are using the '%s' character set.\n"
 msgstr "Χ�ησιμοποιείτε το `%s' σετ χα�ακτή�ων.\n"
 
-#: g10/keygen.c:3094
+#: g10/keygen.c:3098
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5758,7 +5771,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3099
+#: g10/keygen.c:3103
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Πα�ακαλώ μην τοποθετείτε την διε�θυνση email στο όνομα ή στο σχόλιο\n"
 
@@ -5773,35 +5786,35 @@ msgstr "Πα�ακαλώ μην τοποθετείτε την διε�θυνση
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3124
+#: g10/keygen.c:3128
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:3134
+#: g10/keygen.c:3138
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Αλλαγή (N)όνομα, (C)σχόλιο, (E)mail ή (Q)τε�ματισμός; "
 
-#: g10/keygen.c:3135
+#: g10/keygen.c:3139
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Αλλαγή (N)όνομα, (C)σχόλιο, (E)mail ή (O)εντάξει/(Q)τε�ματισμός; "
 
-#: g10/keygen.c:3140
+#: g10/keygen.c:3144
 #, fuzzy
 #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Αλλαγή (N)όνομα, (C)σχόλιο, (E)mail ή (Q)τε�ματισμός; "
 
-#: g10/keygen.c:3141
+#: g10/keygen.c:3145
 #, fuzzy
 #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "Αλλαγή (N)όνομα, (C)σχόλιο, (E)mail ή (O)εντάξει/(Q)τε�ματισμός; "
 
-#: g10/keygen.c:3160
+#: g10/keygen.c:3164
 msgid "Please correct the error first\n"
 msgstr "Πα�ακαλώ, διο�θώστε π�ώτα το σφάλμα\n"
 
-#: g10/keygen.c:3206
+#: g10/keygen.c:3210
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -5813,18 +5826,18 @@ msgstr ""
 "τους δίσκους) κατα τη διά�κεια υπολογισμο� π�ώτων α�ιθμών. Αυτό δίνει\n"
 "στη γεννήτ�ια τυχαίων α�ιθμών μια ευκαι�ία να μαζέψει α�κετή εντ�οπία.\n"
 
-#: g10/keygen.c:3591
+#: g10/keygen.c:3595
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4590 g10/keygen.c:4663 g10/keygen.c:4681 g10/keygen.c:4710
-#: g10/keygen.c:5086 g10/keygen.c:5632 g10/keygen.c:5943 g10/keygen.c:6050
+#: g10/keygen.c:4594 g10/keygen.c:4667 g10/keygen.c:4685 g10/keygen.c:4714
+#: g10/keygen.c:5113 g10/keygen.c:5663 g10/keygen.c:5974 g10/keygen.c:6081
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Η δημιου�γία κλειδιο� απέτυχε: %s\n"
 
-#: g10/keygen.c:4599
+#: g10/keygen.c:4603
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5832,67 +5845,67 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:4601
+#: g10/keygen.c:4605
 msgid "Continue? (Y/n) "
 msgstr ""
 
-#: g10/keygen.c:4622
+#: g10/keygen.c:4626
 #, fuzzy, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "`%s' ήδη συμπιέστηκε\n"
 
-#: g10/keygen.c:4627
+#: g10/keygen.c:4631
 #, fuzzy
 msgid "Create anyway? (y/N) "
 msgstr "Χ�ήση οπωσδήποτε αυτο� του κλειδιο�; "
 
-#: g10/keygen.c:4633
+#: g10/keygen.c:4637
 #, fuzzy, c-format
 msgid "creating anyway\n"
 msgstr "δημιου�γία ενός νέου ζε�γους κλειδιών"
 
-#: g10/keygen.c:5069
+#: g10/keygen.c:5096
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 
-#: g10/keygen.c:5118
+#: g10/keygen.c:5145
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Η δημιου�γία κλειδιο� αναβλήθηκε.\n"
 
-#: g10/keygen.c:5178
+#: g10/keygen.c:5205
 #, fuzzy, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "αδυναμία δημιου�γίας του `%s': %s\n"
 
-#: g10/keygen.c:5198
+#: g10/keygen.c:5225
 #, fuzzy, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "ΣΗΜΕΙΩΣΗ: το μυστικό κλειδί %08lX έληξε στις %s\n"
 
-#: g10/keygen.c:5359 g10/keygen.c:5561
+#: g10/keygen.c:5389 g10/keygen.c:5591
 #, fuzzy, c-format
 #| msgid "writing public key to `%s'\n"
 msgid "writing public key to '%s'\n"
 msgstr "εγγ�αφή του δημοσίου κλειδιο� στο `%s'\n"
 
-#: g10/keygen.c:5555
+#: g10/keygen.c:5585
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "δε β�έθηκε εγγ�άψιμη δημόσια κλειδοθήκη: %s\n"
 
-#: g10/keygen.c:5569
+#: g10/keygen.c:5599
 #, fuzzy, c-format
 #| msgid "error writing public keyring `%s': %s\n"
 msgid "error writing public keyring '%s': %s\n"
 msgstr "αδυναμία εγγ�αφής δημόσιας κλειδοθήκης `%s': %s\n"
 
-#: g10/keygen.c:5603
+#: g10/keygen.c:5634
 msgid "public and secret key created and signed.\n"
 msgstr "το δημόσιο και το μυστικό κλειδί δημιου�γήθηκαν και υπογ�άφηκαν.\n"
 
-#: g10/keygen.c:5619
+#: g10/keygen.c:5650
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -5903,7 +5916,7 @@ msgstr ""
 "Μπο�είτε να χ�ησιμοποιήσετε την εντολή \"--edit-key\" για να δημιου�γηθεί\n"
 "ένα δευτε�ε�ον κλειδί για αυτό το λόγο.\n"
 
-#: g10/keygen.c:5801 g10/keygen.c:6000
+#: g10/keygen.c:5832 g10/keygen.c:6031
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5911,7 +5924,7 @@ msgstr ""
 "το κλειδί δημιου�γήθηκε %lu δευτε�όλεπτο στο μέλλον (χ�ονοδίνη ή\n"
 "απλώς π�όβλημα στο �ολόι)\n"
 
-#: g10/keygen.c:5803 g10/keygen.c:6002
+#: g10/keygen.c:5834 g10/keygen.c:6033
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5919,7 +5932,7 @@ msgstr ""
 "το κλειδί δημιου�γήθηκε %lu δευτε�όλεπτα στο μέλλον (χ�ονοδίνη ή\n"
 "απλώς π�όβλημα στο �ολόι)\n"
 
-#: g10/keygen.c:5814 g10/keygen.c:6013
+#: g10/keygen.c:5845 g10/keygen.c:6044
 #, fuzzy, c-format
 #| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
@@ -5927,17 +5940,17 @@ msgstr ""
 "ΣΗΜΕΙΩΣΗ: η δημιου�γία υποκλειδιών για κλειδιά v3 δεν είναι σ�μφωνο\n"
 "με το OpenPGP\n"
 
-#: g10/keygen.c:5826 g10/keygen.c:5828
+#: g10/keygen.c:5857 g10/keygen.c:5859
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Μυστικά τμήματα του κ��ιου κλειδιο� δεν είναι διαθέσιμα.\n"
 
-#: g10/keygen.c:5835 g10/keygen.c:5837
+#: g10/keygen.c:5866 g10/keygen.c:5868
 #, fuzzy, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Μυστικά τμήματα του κ��ιου κλειδιο� δεν είναι διαθέσιμα.\n"
 
-#: g10/keygen.c:5857 g10/keygen.c:6027
+#: g10/keygen.c:5888 g10/keygen.c:6058
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Σίγου�α να δημιου�γηθεί; "
@@ -6020,26 +6033,26 @@ msgstr "     Αποτ�πωμα κλειδιο� ="
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1467
+#: g10/keyring.c:1477
 #, fuzzy, c-format
 msgid "caching keyring '%s'\n"
 msgstr "έλεγχος κλειδοθήκης `%s'\n"
 
-#: g10/keyring.c:1541
+#: g10/keyring.c:1551
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signature)\n"
 msgid_plural "%lu keys cached so far (%lu signatures)\n"
 msgstr[0] "%lu κλειδιά έχουν ελεγχθεί (%lu υπογ�αφές)\n"
 msgstr[1] "%lu κλειδιά έχουν ελεγχθεί (%lu υπογ�αφές)\n"
 
-#: g10/keyring.c:1557
+#: g10/keyring.c:1567
 #, c-format
 msgid "%lu key cached"
 msgid_plural "%lu keys cached"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/keyring.c:1559
+#: g10/keyring.c:1569
 #, fuzzy, c-format
 #| msgid "1 bad signature\n"
 msgid " (%lu signature)\n"
@@ -6047,7 +6060,7 @@ msgid_plural " (%lu signatures)\n"
 msgstr[0] "1 κακή υπογ�αφή\n"
 msgstr[1] "1 κακή υπογ�αφή\n"
 
-#: g10/keyring.c:1636
+#: g10/keyring.c:1646
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: κλειδοθήκη δημιου�γήθηκε\n"
@@ -6077,80 +6090,75 @@ msgstr ""
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "το URL πολιτικής υπογ�αφής που δόθηκε δεν είναι έγκυ�ο\n"
 
-#: g10/keyserver.c:537
+#: g10/keyserver.c:360
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:740
+#: g10/keyserver.c:563
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:846
+#: g10/keyserver.c:669
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "μη έγκυ�ες επιλογές εξαγωγής\n"
 
-#: g10/keyserver.c:986 g10/keyserver.c:1096
+#: g10/keyserver.c:809 g10/keyserver.c:919
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1420 g10/keyserver.c:1453
+#: g10/keyserver.c:1217 g10/keyserver.c:1250
 #, 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:1427
+#: g10/keyserver.c:1224
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: αδυναμία διαγ�αφής tempfile (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1316
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "το κλειδί '%s' δε β�έθηκε: %s\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1319
 #, fuzzy, c-format
 msgid "key not found on keyserver\n"
 msgstr "το κλειδί '%s' δε β�έθηκε: %s\n"
 
-#: g10/keyserver.c:1722
-#, fuzzy, c-format
-msgid "requesting key %s from %s server %s\n"
-msgstr "αίτηση κλειδιο� %08lX από το %s\n"
-
-#: g10/keyserver.c:1726
+#: g10/keyserver.c:1481
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "αίτηση κλειδιο� %08lX από το %s\n"
 
-#: g10/keyserver.c:1841 g10/keyserver.c:2020
+#: g10/keyserver.c:1600 g10/keyserver.c:1793
 #, fuzzy, c-format
 msgid "no keyserver known\n"
 msgstr "μη έγκυ�ες επιλογές εξαγωγής\n"
 
-#: g10/keyserver.c:1856 g10/skclist.c:213 g10/skclist.c:241
+#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "πα�αλείφθηκε `%s': %s\n"
 
-#: g10/keyserver.c:1860
+#: g10/keyserver.c:1619
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "υπογ�άφθηκε με το κλειδί σας %08lX στις %s\n"
 
-#: g10/keyserver.c:1901
+#: g10/keyserver.c:1662
 #, fuzzy, c-format
 msgid "requesting key from '%s'\n"
 msgstr "αίτηση κλειδιο� %08lX από το %s\n"
 
-#: g10/keyserver.c:1917
+#: g10/keyserver.c:1680
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: αδυναμία διαγ�αφής tempfile (%s) `%s': %s\n"
@@ -6177,187 +6185,187 @@ msgstr "κ�υπτογ�αφημένο με άγνωστο αλγό�ιθμο %d
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "κ�υπτογ�αφημένο με άγνωστο αλγό�ιθμο %d\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:473
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "δημόσιο κλειδί είναι %08lX\n"
 
-#: g10/mainproc.c:524
+#: g10/mainproc.c:525
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s, created %s\n"
 msgstr "κ�υπτογ�αφημένο με %u-bit %s κλειδί, ID %08lX, δημιου�γήθηκε %s\n"
 
-#: g10/mainproc.c:528 g10/pkclist.c:231
+#: g10/mainproc.c:529 g10/pkclist.c:231
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                γνωστό σαν \""
 
-#: g10/mainproc.c:532
+#: g10/mainproc.c:533
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "κ�υπτογ�αφημένο με %s key, ID %08lX\n"
 
-#: g10/mainproc.c:552 g10/mainproc.c:935
+#: g10/mainproc.c:553 g10/mainproc.c:937
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:560
+#: g10/mainproc.c:561
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "κ�υπτογ�αφημένο με %lu φ�άσεις κλειδιά\n"
 
-#: g10/mainproc.c:562
+#: g10/mainproc.c:563
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "κ�υπτογ�αφημένο με 1 φ�άση κλειδί\n"
 
-#: g10/mainproc.c:577 g10/mainproc.c:602
+#: g10/mainproc.c:578 g10/mainproc.c:603
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "κ�υπτογ�άφηση με δημόσιο κλειδί απέτυχε: %s\n"
 
-#: g10/mainproc.c:613
+#: g10/mainproc.c:614
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "κ�υπτογ�αφημένα δεδομένα με δημόσιο κλειδί: καλό DEK\n"
 
-#: g10/mainproc.c:642 g10/mainproc.c:663
+#: g10/mainproc.c:643 g10/mainproc.c:664
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "υπόθεση %s κ�υπτογ�αφημένων δεδομένων\n"
 
-#: g10/mainproc.c:649
+#: g10/mainproc.c:650
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "Κ�υπταλγό�ιθμος IDEA μη διαθέσιμος, αισιόδοξη π�οσπάθεια χ�ήσης του\n"
 "%s αντίθετα\n"
 
-#: g10/mainproc.c:742 g10/mainproc.c:780
+#: g10/mainproc.c:744 g10/mainproc.c:782
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: δεν π�οστατε�τηκε η ακε�αιότητα του μη�ματος\n"
 
-#: g10/mainproc.c:753
+#: g10/mainproc.c:755
 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:756
+#: g10/mainproc.c:758
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:761
+#: g10/mainproc.c:763
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "αποκ�υπτογ�άφηση απέτυχε: %s\n"
 
-#: g10/mainproc.c:773
+#: g10/mainproc.c:775
 #, c-format
 msgid "decryption okay\n"
 msgstr "αποκ�υπτογ�άφηση OK\n"
 
-#: g10/mainproc.c:786
+#: g10/mainproc.c:788
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το κ�υπτογ�αφημένο μήνυμα έχει πει�αχθεί!\n"
 
-#: g10/mainproc.c:804
+#: g10/mainproc.c:806
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "αποκ�υπτογ�άφηση απέτυχε: %s\n"
 
-#: g10/mainproc.c:851
+#: g10/mainproc.c:853
 #, 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:858
+#: g10/mainproc.c:860
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "α�χικό όνομα α�χείου='%.*s'\n"
 
-#: g10/mainproc.c:1135
+#: g10/mainproc.c:1137
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "ανεξά�τητη ανάκληση - χ�ησιμοποιείστε \"gpg --import\" για εφα�μογή\n"
 
-#: g10/mainproc.c:1440 g10/mainproc.c:1483
+#: g10/mainproc.c:1442 g10/mainproc.c:1485
 #, fuzzy, c-format
 msgid "no signature found\n"
 msgstr "Καλή υπογ�αφή από \""
 
-#: g10/mainproc.c:1763
+#: g10/mainproc.c:1765
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ΚΑΚΗ υπογ�αφή από \""
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1767
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Ληγμένη υπογ�αφή από \""
 
-#: g10/mainproc.c:1767
+#: g10/mainproc.c:1769
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Καλή υπογ�αφή από \""
 
-#: g10/mainproc.c:1789
+#: g10/mainproc.c:1791
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "καταστολή ανάκλησης υπογ�αφής\n"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1905
 #, fuzzy, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "αδυναμία χει�ισμο� αυτών των πολλαπλών υπογ�αφών\n"
 
-#: g10/mainproc.c:1919 g10/mainproc.c:1926
+#: g10/mainproc.c:1921 g10/mainproc.c:1928
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Υπογ�αφή έληξε στις %s.\n"
 
-#: g10/mainproc.c:1920 g10/mainproc.c:1927 sm/verify.c:480
+#: g10/mainproc.c:1922 g10/mainproc.c:1929 sm/verify.c:480
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                γνωστό σαν \""
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1933
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Υπογ�αφή έγινε στο %.*s με χ�ήση του κλειδιο�%s ID %08lX\n"
 
-#: g10/mainproc.c:1937
+#: g10/mainproc.c:1939
 #, fuzzy, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "                γνωστό σαν \""
 
-#: g10/mainproc.c:1992
+#: g10/mainproc.c:1994
 #, c-format
 msgid "Key available at: "
 msgstr "Κλειδί διαθέσιμο στο: "
 
-#: g10/mainproc.c:2034
+#: g10/mainproc.c:2036
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2234
+#: g10/mainproc.c:2236
 msgid "[uncertain]"
 msgstr "[αβέβαιο]"
 
-#: g10/mainproc.c:2272
+#: g10/mainproc.c:2274
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                γνωστό σαν \""
 
-#: g10/mainproc.c:2347
+#: g10/mainproc.c:2349
 #, 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"
@@ -6365,68 +6373,68 @@ msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Αυτό το κλειδί δεν έχει πιστοποιηθεί με εμπιστε�σιμη "
 "υπογ�αφή!\n"
 
-#: g10/mainproc.c:2363
+#: g10/mainproc.c:2365
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Υπογ�αφή έληξε στις %s.\n"
 
-#: g10/mainproc.c:2368
+#: g10/mainproc.c:2370
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Υπογ�αφή λήγει στις %s.\n"
 
-#: g10/mainproc.c:2379
+#: g10/mainproc.c:2381
 #, 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:2380
+#: g10/mainproc.c:2382
 msgid "binary"
 msgstr "δυαδικό"
 
-#: g10/mainproc.c:2381
+#: g10/mainproc.c:2383
 msgid "textmode"
 msgstr "κατάσταση-κειμένου"
 
-#: g10/mainproc.c:2381 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2383 g10/trust.c:112 dirmngr/ocsp.c:793
 msgid "unknown"
 msgstr "άγνωστο"
 
-#: g10/mainproc.c:2383
+#: g10/mainproc.c:2385
 #, fuzzy
 #| msgid "unknown pubkey algorithm"
 msgid ", key algorithm "
 msgstr "άγνωστος αλγό�ιθμος δημοσίου κλειδιο�"
 
-#: g10/mainproc.c:2418
+#: g10/mainproc.c:2420
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2457
+#: g10/mainproc.c:2459
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Αδυναμία ελέγχου της υπογ�αφής: %s\n"
 
-#: g10/mainproc.c:2553 g10/mainproc.c:2572 g10/mainproc.c:2696
+#: g10/mainproc.c:2555 g10/mainproc.c:2574 g10/mainproc.c:2698
 #, c-format
 msgid "not a detached signature\n"
 msgstr "δεν είναι αποκομμένη υπογ�αφή\n"
 
-#: g10/mainproc.c:2606
+#: g10/mainproc.c:2608
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: εντοπισμός πολλαπλών υπογ�αφών. Μόνο η π�ώτη θα ελεγχθεί.\n"
 
-#: g10/mainproc.c:2615
+#: g10/mainproc.c:2617
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "ανεξά�τητη υπογ�αφή κλάσης 0x%02x\n"
 
-#: g10/mainproc.c:2700
+#: g10/mainproc.c:2702
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "υπογ�αφή παλιο� στυλ (PGP 2.x)\n"
@@ -6615,51 +6623,56 @@ msgstr "Σημείωση κ�ίσιμης υπογ�αφής: "
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "υποπακέτο τ�που %d έχει ο�ισμένο το κ�ιτικό bit\n"
 
-#: g10/passphrase.c:208
+#: g10/passphrase.c:201 sm/decrypt.c:669
+#, fuzzy
+msgid "Please enter the passphrase for decryption."
+msgstr "αλλαγή της φ�άσης κλειδί"
+
+#: g10/passphrase.c:203
 msgid "Enter passphrase\n"
 msgstr "Πληκτ�ολογήστε τη φ�άση κλειδί\n"
 
-#: g10/passphrase.c:219
+#: g10/passphrase.c:227
 #, c-format
 msgid "cancelled by user\n"
 msgstr "ακυ�ώθηκε από το χ�ήστη\n"
 
-#: g10/passphrase.c:460
+#: g10/passphrase.c:472
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (κ��ιο κλειδί, ID %08lX)"
 
-#: g10/passphrase.c:467
+#: g10/passphrase.c:479
 #, fuzzy
 msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 msgstr "Πληκτ�ολογήστε τη φ�άση κλειδί· αυτή είναι μια μυστική π�όταση \n"
 
-#: g10/passphrase.c:471
+#: g10/passphrase.c:483
 #, fuzzy
 msgid "Please enter the passphrase to import the OpenPGP secret key:"
 msgstr "Πληκτ�ολογήστε τη φ�άση κλειδί· αυτή είναι μια μυστική π�όταση \n"
 
-#: g10/passphrase.c:476
+#: g10/passphrase.c:488
 #, fuzzy
 msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 msgstr "Πληκτ�ολογήστε τη φ�άση κλειδί· αυτή είναι μια μυστική π�όταση \n"
 
-#: g10/passphrase.c:479
+#: g10/passphrase.c:491
 #, fuzzy
 msgid "Please enter the passphrase to export the OpenPGP secret key:"
 msgstr "Πληκτ�ολογήστε τη φ�άση κλειδί· αυτή είναι μια μυστική π�όταση \n"
 
-#: g10/passphrase.c:484
+#: g10/passphrase.c:496
 #, fuzzy
 msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 msgstr "Σίγου�α θέλετε να διαγ�αφο�ν τα επιλεγμένα κλειδιά; "
 
-#: g10/passphrase.c:487
+#: g10/passphrase.c:499
 #, fuzzy
 msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgstr "Σίγου�α θέλετε να διαγ�αφο�ν τα επιλεγμένα κλειδιά; "
 
-#: g10/passphrase.c:496
+#: g10/passphrase.c:508
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -6831,7 +6844,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:313 g10/revoke.c:803
+#: g10/pkclist.c:313 g10/revoke.c:804
 msgid "Your decision? "
 msgstr "Η απόφαση σας; "
 
@@ -7139,7 +7152,7 @@ msgstr "αδυναμία Ï€Ï�όσβασης υπογεγÏ�αμμένων δεδÎ
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "αδυναμία π�όσβασης υπογεγ�αμμένων δεδομένων `%s'\n"
 
-#: g10/pubkey-enc.c:99 sm/decrypt.c:879
+#: g10/pubkey-enc.c:99 sm/decrypt.c:1329
 #, fuzzy, c-format
 msgid "key %s is not suitable for decryption in %s mode\n"
 msgstr "κλειδί %08lX: δεν υπά�χει αυτό το user ID\n"
@@ -7186,7 +7199,7 @@ msgid "Note: key has been revoked"
 msgstr "ΣΗΜΕΙΩΣΗ: το κλειδί έχει ανακληθεί"
 
 #: g10/revoke.c:100 g10/revoke.c:126 g10/revoke.c:172 g10/revoke.c:184
-#: g10/revoke.c:502
+#: g10/revoke.c:503
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet απέτυχε: %s\n"
@@ -7215,11 +7228,11 @@ msgstr "Το μυστικό κλειδί είναι διαθέσιμο.\n"
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Δημιου�γία ενός πιστοποιητικο� ανάκλησης για αυτό το κλειδί; "
 
-#: g10/revoke.c:334 g10/revoke.c:744
+#: g10/revoke.c:334 g10/revoke.c:745
 msgid "ASCII armored output forced.\n"
 msgstr "Εξαναγκασμός εξόδου σε θω�ακισμένο ASCII.\n"
 
-#: g10/revoke.c:350 g10/revoke.c:481
+#: g10/revoke.c:350 g10/revoke.c:482
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet απέτυχε: %s\n"
@@ -7233,19 +7246,19 @@ msgstr "Πιστοποιητικό ανάκλησης δημιου�γήθηκε
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "δε β�έθηκαν κλειδιά ανάκλησης για το `%s'\n"
 
-#: g10/revoke.c:567
+#: g10/revoke.c:568
 #, fuzzy
 msgid "This is a revocation certificate for the OpenPGP key:"
 msgstr "Δημιου�γία ενός πιστοποιητικο� ανάκλησης για αυτό το κλειδί; "
 
-#: g10/revoke.c:583
+#: g10/revoke.c:584
 msgid ""
 "A revocation certificate is a kind of \"kill switch\" to publicly\n"
 "declare that a key shall not anymore be used.  It is not possible\n"
 "to retract such a revocation certificate once it has been published."
 msgstr ""
 
-#: g10/revoke.c:586
+#: g10/revoke.c:587
 msgid ""
 "Use it to revoke this key in case of a compromise or loss of\n"
 "the secret key.  However, if the secret key is still accessible,\n"
@@ -7254,20 +7267,20 @@ msgid ""
 "of the gpg command \"--generate-revocation\" in the GnuPG manual."
 msgstr ""
 
-#: g10/revoke.c:592
+#: g10/revoke.c:593
 msgid ""
 "To avoid an accidental use of this file, a colon has been inserted\n"
 "before the 5 dashes below.  Remove this colon with a text editor\n"
 "before importing and publishing this revocation certificate."
 msgstr ""
 
-#: g10/revoke.c:611
+#: g10/revoke.c:612
 #, fuzzy, c-format
 #| msgid "Revocation certificate created.\n"
 msgid "revocation certificate stored as '%s.rev'\n"
 msgstr "Πιστοποιητικό ανάκλησης δημιου�γήθηκε.\n"
 
-#: g10/revoke.c:655
+#: g10/revoke.c:656
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found\n"
 msgstr "το μυστικό κλειδί `%s' δε β�έθηκε: %s\n"
@@ -7275,23 +7288,23 @@ msgstr "το μυστικό κλειδί `%s' δε β�έθηκε: %s\n"
 #. TRANSLATORS: The %s prints a key specification which
 #. for example has been given at the command line.  Several lines
 #. lines with secret key infos are printed after this message.
-#: g10/revoke.c:680
+#: g10/revoke.c:681
 #, c-format
 msgid "'%s' matches multiple secret keys:\n"
 msgstr ""
 
-#: g10/revoke.c:705
+#: g10/revoke.c:706
 #, fuzzy, c-format
 #| msgid "error creating keyring `%s': %s\n"
 msgid "error searching the keyring: %s\n"
 msgstr "αδυναμία δημιου�γίας της κλειδοθήκης `%s': %s\n"
 
-#: g10/revoke.c:728
+#: g10/revoke.c:729
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Δημιου�γία ενός πιστοποιητικο� ανάκλησης για αυτό το κλειδί; "
 
-#: g10/revoke.c:752
+#: g10/revoke.c:753
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -7310,33 +7323,33 @@ msgstr ""
 "π�οσοχή το σ�στημα εκτ�πωσης στο μηχανημά σας μπο�εί να αποθηκε�σει την\n"
 "εκτ�πωση και να την κάνει διαθέσιμη σε άλλους!\n"
 
-#: g10/revoke.c:786
+#: g10/revoke.c:787
 msgid "Please select the reason for the revocation:\n"
 msgstr "Πα�ακαλώ επιλέξτε την αιτία για την ανάκληση:\n"
 
-#: g10/revoke.c:796
+#: g10/revoke.c:797
 msgid "Cancel"
 msgstr "Ακ��ωση"
 
-#: g10/revoke.c:798
+#: g10/revoke.c:799
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Πιθανών να θέλετε να επιλέξετε το %d εδώ)\n"
 
-#: g10/revoke.c:839
+#: g10/revoke.c:843
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Πληκτ�ολογήστε μια π�οαι�ετική πε�ιγ�αφή· τέλος με μια άδεια γ�αμμή:\n"
 
-#: g10/revoke.c:867
+#: g10/revoke.c:871
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Αιτία για ανάκληση: %s\n"
 
-#: g10/revoke.c:869
+#: g10/revoke.c:873
 msgid "(No description given)\n"
 msgstr "(Δεν δώθηκε πε�ιγ�αφή)\n"
 
-#: g10/revoke.c:874
+#: g10/revoke.c:878
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Είναι αυτό εντάξει; "
@@ -7521,24 +7534,24 @@ msgstr "υπογ�αφή:"
 msgid "%s.%s encryption will be used\n"
 msgstr "%s κ�υπτογ�άφηση θα χ�ησιμοποιηθεί\n"
 
-#: g10/skclist.c:172 g10/skclist.c:253
+#: g10/skclist.c:173 g10/skclist.c:254
 #, c-format
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "το κλειδί δεν έχει σημειωθεί σαν ανασφαλές - δεν μπο�εί να χ�ησιμοποιηθεί με "
 "ψε�τικη RNG!\n"
 
-#: g10/skclist.c:204
+#: g10/skclist.c:205
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "πα�αλείφθηκε `%s': αντιγ�άφτηκε\n"
 
-#: g10/skclist.c:223
+#: g10/skclist.c:224
 #, c-format
 msgid "skipped: secret key already present\n"
 msgstr "πα�αλείφθηκε: μυστικό κλειδί ήδη πα�ών\n"
 
-#: g10/skclist.c:242
+#: g10/skclist.c:243
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
@@ -7767,10 +7780,10 @@ msgstr ""
 msgid "TOFU DB error"
 msgstr ""
 
-#: g10/tofu.c:687 g10/tofu.c:2073 g10/tofu.c:2354 g10/tofu.c:2373
-#: g10/tofu.c:2386 g10/tofu.c:2398 g10/tofu.c:2413 g10/tofu.c:2425
-#: g10/tofu.c:3021 g10/tofu.c:3038 g10/tofu.c:3075 g10/tofu.c:3092
-#: g10/tofu.c:3404
+#: g10/tofu.c:687 g10/tofu.c:2077 g10/tofu.c:2358 g10/tofu.c:2377
+#: g10/tofu.c:2390 g10/tofu.c:2402 g10/tofu.c:2417 g10/tofu.c:2429
+#: g10/tofu.c:3025 g10/tofu.c:3042 g10/tofu.c:3079 g10/tofu.c:3096
+#: g10/tofu.c:3408
 #, fuzzy, c-format
 msgid "error reading TOFU database: %s\n"
 msgstr "σφάλμα στη αποστολή π�ος το `%s': %s\n"
@@ -7792,7 +7805,7 @@ msgstr "%s: σφάλμα στην εγγ�αφή της εγγ�αφής dir : %
 msgid "error opening TOFU database '%s': %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: g10/tofu.c:1148 g10/tofu.c:3458 g10/tofu.c:3604
+#: g10/tofu.c:1148 g10/tofu.c:3462 g10/tofu.c:3608
 #, fuzzy, c-format
 msgid "error updating TOFU database: %s\n"
 msgstr "σφάλμα στη αποστολή π�ος το `%s': %s\n"
@@ -7832,43 +7845,43 @@ msgstr "σφάλμα στη δημιουÏ�γία της φÏ�άσης κλειδÎ
 msgid "This key's user IDs:\n"
 msgstr "απεικόνιση των κλειδιών και των user ID"
 
-#: g10/tofu.c:1634 g10/tofu.c:1799
+#: g10/tofu.c:1634 g10/tofu.c:1801
 #, fuzzy, c-format
 #| msgid "Policy: "
 msgid "policy: %s"
 msgstr "Πολιτική: "
 
-#: g10/tofu.c:1725
+#: g10/tofu.c:1727
 #, fuzzy, c-format
 msgid "error gathering signature stats: %s\n"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: g10/tofu.c:1729
+#: g10/tofu.c:1731
 #, c-format
 msgid "The email address \"%s\" is associated with %d key:\n"
 msgid_plural "The email address \"%s\" is associated with %d keys:\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1747
+#: g10/tofu.c:1749
 #, c-format
 msgid "Statistics for keys with the email address \"%s\":\n"
 msgstr ""
 
-#: g10/tofu.c:1797
+#: g10/tofu.c:1799
 #, fuzzy
 #| msgid "list keys"
 msgid "this key"
 msgstr "απεικόνιση της λίστας κλειδιών"
 
-#: g10/tofu.c:1823
+#: g10/tofu.c:1825
 #, fuzzy, c-format
 msgid "Verified %d message."
 msgid_plural "Verified %d messages."
 msgstr[0] "|αλγό� [α�χεία]| απεικόνιση πε�ιλήψεων των μηνυμάτων"
 msgstr[1] "|αλγό� [α�χεία]| απεικόνιση πε�ιλήψεων των μηνυμάτων"
 
-#: g10/tofu.c:1827
+#: g10/tofu.c:1829
 #, fuzzy, c-format
 #| msgid "encrypted with %lu passphrases\n"
 msgid "Encrypted %d message."
@@ -7876,68 +7889,68 @@ msgid_plural "Encrypted %d messages."
 msgstr[0] "κ�υπτογ�αφημένο με %lu φ�άσεις κλειδιά\n"
 msgstr[1] "κ�υπτογ�αφημένο με %lu φ�άσεις κλειδιά\n"
 
-#: g10/tofu.c:1834
+#: g10/tofu.c:1836
 #, fuzzy, c-format
 msgid "Verified %d message in the future."
 msgid_plural "Verified %d messages in the future."
 msgstr[0] "|αλγό� [α�χεία]| απεικόνιση πε�ιλήψεων των μηνυμάτων"
 msgstr[1] "|αλγό� [α�χεία]| απεικόνιση πε�ιλήψεων των μηνυμάτων"
 
-#: g10/tofu.c:1838
+#: g10/tofu.c:1840
 #, fuzzy, c-format
 msgid "Encrypted %d message in the future."
 msgid_plural "Encrypted %d messages in the future."
 msgstr[0] "|αλγό� [α�χεία]| απεικόνιση πε�ιλήψεων των μηνυμάτων"
 msgstr[1] "|αλγό� [α�χεία]| απεικόνιση πε�ιλήψεων των μηνυμάτων"
 
-#: g10/tofu.c:1852
+#: g10/tofu.c:1854
 #, c-format
 msgid "Messages verified over the past %d day: %d."
 msgid_plural "Messages verified over the past %d days: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1858
+#: g10/tofu.c:1860
 #, c-format
 msgid "Messages encrypted over the past %d day: %d."
 msgid_plural "Messages encrypted over the past %d days: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1868
+#: g10/tofu.c:1870
 #, c-format
 msgid "Messages verified over the past %d month: %d."
 msgid_plural "Messages verified over the past %d months: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1874
+#: g10/tofu.c:1876
 #, c-format
 msgid "Messages encrypted over the past %d month: %d."
 msgid_plural "Messages encrypted over the past %d months: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1884
+#: g10/tofu.c:1886
 #, c-format
 msgid "Messages verified over the past %d year: %d."
 msgid_plural "Messages verified over the past %d years: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1890
+#: g10/tofu.c:1892
 #, c-format
 msgid "Messages encrypted over the past %d year: %d."
 msgid_plural "Messages encrypted over the past %d years: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1898
+#: g10/tofu.c:1900
 #, c-format
 msgid "Messages verified in the past: %d."
 msgstr ""
 
-#: g10/tofu.c:1902
+#: g10/tofu.c:1904
 #, fuzzy, c-format
 msgid "Messages encrypted in the past: %d."
 msgstr "|αλγό� [α�χεία]| απεικόνιση πε�ιλήψεων των μηνυμάτων"
@@ -7945,130 +7958,130 @@ msgstr "|αλγό� [α�χεία]| απεικόνιση πε�ιλήψεων τ
 #. TRANSLATORS: Please translate the text found in the source
 #. * file below.  We don't directly internationalize that text so
 #. * that we can tweak it without breaking translations.
-#: g10/tofu.c:1919
+#: g10/tofu.c:1921
 msgid "TOFU detected a binding conflict"
 msgstr ""
 
 #. TRANSLATORS: Two letters (normally the lower and upper case
 #. * version of the hotkey) for each of the five choices.  If
 #. * there is only one choice in your language, repeat it.
-#: g10/tofu.c:1961
+#: g10/tofu.c:1963
 msgid "gGaAuUrRbB"
 msgstr ""
 
-#: g10/tofu.c:1967
+#: g10/tofu.c:1969
 msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 
-#: g10/tofu.c:1975
+#: g10/tofu.c:1978
 msgid "Defaulting to unknown.\n"
 msgstr ""
 
-#: g10/tofu.c:2093 g10/tofu.c:2228
+#: g10/tofu.c:2097 g10/tofu.c:2232
 #, c-format
 msgid "TOFU db corruption detected.\n"
 msgstr ""
 
-#: g10/tofu.c:2829
+#: g10/tofu.c:2833
 #, fuzzy, c-format
 msgid "error changing TOFU policy: %s\n"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: g10/tofu.c:2880
+#: g10/tofu.c:2884
 #, c-format
 msgid "%lld~year"
 msgid_plural "%lld~years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2885
+#: g10/tofu.c:2889
 #, c-format
 msgid "%lld~month"
 msgid_plural "%lld~months"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2890
+#: g10/tofu.c:2894
 #, c-format
 msgid "%lld~week"
 msgid_plural "%lld~weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2895
+#: g10/tofu.c:2899
 #, c-format
 msgid "%lld~day"
 msgid_plural "%lld~days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2900
+#: g10/tofu.c:2904
 #, c-format
 msgid "%lld~hour"
 msgid_plural "%lld~hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2905
+#: g10/tofu.c:2909
 #, c-format
 msgid "%lld~minute"
 msgid_plural "%lld~minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2907
+#: g10/tofu.c:2911
 #, c-format
 msgid "%lld~second"
 msgid_plural "%lld~seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:3145
+#: g10/tofu.c:3149
 #, c-format
 msgid "%s: Verified 0~signatures and encrypted 0~messages."
 msgstr ""
 
-#: g10/tofu.c:3151
+#: g10/tofu.c:3155
 #, fuzzy, c-format
 #| msgid "Deleted %d signatures.\n"
 msgid "%s: Verified 0 signatures."
 msgstr "Διαγ�άφηκαν %d υπογ�αφές.\n"
 
-#: g10/tofu.c:3165
+#: g10/tofu.c:3169
 #, fuzzy
 #| msgid "encrypted with %lu passphrases\n"
 msgid "Encrypted 0 messages."
 msgstr "κ�υπτογ�αφημένο με %lu φ�άσεις κλειδιά\n"
 
-#: g10/tofu.c:3181
+#: g10/tofu.c:3185
 #, fuzzy, c-format
 #| msgid "Policy: "
 msgid "(policy: %s)"
 msgstr "Πολιτική: "
 
-#: g10/tofu.c:3215
+#: g10/tofu.c:3219
 #, c-format
 msgid ""
 "Warning: we have yet to see a message signed using this key and user id!\n"
 msgstr ""
 
-#: g10/tofu.c:3218
+#: g10/tofu.c:3222
 #, c-format
 msgid ""
 "Warning: we've only seen one message signed using this key and user id!\n"
 msgstr ""
 
-#: g10/tofu.c:3222
+#: g10/tofu.c:3226
 #, c-format
 msgid "Warning: you have yet to encrypt a message to this key!\n"
 msgstr ""
 
-#: g10/tofu.c:3225
+#: g10/tofu.c:3229
 #, c-format
 msgid "Warning: you have only encrypted one message to this key!\n"
 msgstr ""
 
-#: g10/tofu.c:3254
+#: g10/tofu.c:3258
 #, c-format
 msgid ""
 "Warning: if you think you've seen more signatures by this key and user id, "
@@ -8085,13 +8098,13 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:3339 g10/tofu.c:3502 g10/tofu.c:3708 g10/tofu.c:3761
-#: g10/tofu.c:3902 g10/tofu.c:3979 g10/tofu.c:4017
+#: g10/tofu.c:3343 g10/tofu.c:3506 g10/tofu.c:3712 g10/tofu.c:3765
+#: g10/tofu.c:3906 g10/tofu.c:3983 g10/tofu.c:4021
 #, fuzzy, c-format
 msgid "error opening TOFU database: %s\n"
 msgstr "σφάλμα στη αποστολή π�ος το `%s': %s\n"
 
-#: g10/tofu.c:3535
+#: g10/tofu.c:3539
 #, c-format
 msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
 msgstr ""
@@ -8159,7 +8172,7 @@ msgstr ""
 msgid "no need for a trustdb check\n"
 msgstr "δεν υπά�χει ανάγκη για έλεγχο της trustdb\n"
 
-#: g10/trustdb.c:601 g10/trustdb.c:2272
+#: g10/trustdb.c:601 g10/trustdb.c:2273
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "επόμενος έλεγχος της trustdb θα γίνει στις %s\n"
@@ -8189,14 +8202,14 @@ msgstr "πα�ακαλώ κάντε ένα --check-trustdb\n"
 msgid "checking the trustdb\n"
 msgstr "έλεγχος της trustdb\n"
 
-#: g10/trustdb.c:1993
+#: g10/trustdb.c:1994
 #, fuzzy, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr[0] "%lu κλειδιά έχουν μέχ�ι τώ�α επεξε�γαστεί\n"
 msgstr[1] "%lu κλειδιά έχουν μέχ�ι τώ�α επεξε�γαστεί\n"
 
-#: g10/trustdb.c:1996
+#: g10/trustdb.c:1997
 #, fuzzy, c-format
 #| msgid "%d keys processed (%d validity counts cleared)\n"
 msgid " (%d validity count cleared)\n"
@@ -8204,46 +8217,46 @@ msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] "%d κλειδιά επεξε�γάστηκαν (%d μετ�ήσεις εγγυ�ότητας πέ�ασαν)\n"
 msgstr[1] "%d κλειδιά επεξε�γάστηκαν (%d μετ�ήσεις εγγυ�ότητας πέ�ασαν)\n"
 
-#: g10/trustdb.c:2066
+#: g10/trustdb.c:2067
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "δε β�έθηκαν απόλυτα εμπιστε�σιμα κλειδιά\n"
 
-#: g10/trustdb.c:2080
+#: g10/trustdb.c:2081
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 "δε β�έθηκε το δημόσιο κλειδί του απόλυτα εμπιστε�σιμου κλειδιο� %08lX\n"
 
-#: g10/trustdb.c:2198
+#: g10/trustdb.c:2199
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2279
+#: g10/trustdb.c:2280
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "εγγ�αφή trust %lu, τ�πος %d: write απέτυχε: %s\n"
 
-#: g10/trust.c:125
+#: g10/trust.c:114
 msgid "undefined"
 msgstr ""
 
-#: g10/trust.c:126
+#: g10/trust.c:115
 #, fuzzy
 msgid "never"
 msgstr "ποτέ     "
 
-#: g10/trust.c:127
+#: g10/trust.c:116
 msgid "marginal"
 msgstr ""
 
-#: g10/trust.c:128
+#: g10/trust.c:117
 msgid "full"
 msgstr ""
 
-#: g10/trust.c:129
+#: g10/trust.c:118
 msgid "ultimate"
 msgstr ""
 
@@ -8255,43 +8268,43 @@ msgstr ""
 #. It gets passed to atoi() so everything after the number is
 #. essentially a comment and need not be translated.  Either key and
 #. uid are both NULL, or neither are NULL.
-#: g10/trust.c:166
+#: g10/trust.c:155
 msgid "10 translator see trust.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trust.c:169
+#: g10/trust.c:158
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[ανακλημένο]"
 
-#: g10/trust.c:171 g10/trust.c:177
+#: g10/trust.c:160 g10/trust.c:166
 #, fuzzy
 msgid "[ expired]"
 msgstr "[ληγμένο]"
 
-#: g10/trust.c:176
+#: g10/trust.c:165
 #, fuzzy
 msgid "[ unknown]"
 msgstr "άγνωστο"
 
-#: g10/trust.c:178
+#: g10/trust.c:167
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trust.c:179
+#: g10/trust.c:168
 #, fuzzy
 msgid "[  never ]"
 msgstr "ποτέ     "
 
-#: g10/trust.c:180
+#: g10/trust.c:169
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trust.c:181
+#: g10/trust.c:170
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trust.c:182
+#: g10/trust.c:171
 msgid "[ultimate]"
 msgstr ""
 
@@ -8350,16 +8363,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:4937 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2386
+#: scd/app-piv.c:1770 scd/app-p15.c:5035 scd/app-nks.c:1530
+#: scd/app-openpgp.c:2387
 #, 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:4956 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2402
+#: scd/app-piv.c:1787 scd/app-p15.c:5054 scd/app-nks.c:1549
+#: scd/app-openpgp.c:2403
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
@@ -8394,10 +8407,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:2669
-#: scd/app-openpgp.c:2693 scd/app-openpgp.c:2871 scd/app-openpgp.c:2893
-#: scd/app-openpgp.c:3074 scd/app-openpgp.c:3361 scd/app-openpgp.c:3408
-#: scd/app-openpgp.c:3545 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2670
+#: scd/app-openpgp.c:2694 scd/app-openpgp.c:2872 scd/app-openpgp.c:2894
+#: scd/app-openpgp.c:3075 scd/app-openpgp.c:3362 scd/app-openpgp.c:3409
+#: scd/app-openpgp.c:3547 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -8417,96 +8430,96 @@ msgstr ""
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr ""
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3616
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3618
 #, fuzzy, c-format
 msgid "key already exists\n"
 msgstr "`%s' ήδη συμπιέστηκε\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3620
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3622
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3622
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3624
 #, fuzzy, c-format
 msgid "generating new key\n"
 msgstr "δημιου�γία ενός νέου ζε�γους κλειδιών"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3624
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3626
 #, fuzzy, c-format
 msgid "writing new key\n"
 msgstr "δημιου�γία ενός νέου ζε�γους κλειδιών"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4484 scd/app-openpgp.c:4767
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4486 scd/app-openpgp.c:4761
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "αποτυχία α�χικοποίησης της TrustDB: %s\n"
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1615
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1616
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1622
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1623
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1732
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1733
 #, 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:4943
+#: scd/app-piv.c:3279 scd/app-openpgp.c:4937
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4951
+#: scd/app-piv.c:3294 scd/app-openpgp.c:4945
 #, fuzzy, c-format
 msgid "generating key failed\n"
 msgstr "διαγ�αφή block κλειδιών απέτυχε: %s\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4957
+#: scd/app-piv.c:3300 scd/app-openpgp.c:4951
 #, 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:1842 scd/app-openpgp.c:4966
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1843 scd/app-openpgp.c:4960
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-p15.c:5035 scd/app-nks.c:2038
+#: scd/app-p15.c:5133 scd/app-nks.c:2038
 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:5038 scd/app-openpgp.c:2818
+#: scd/app-p15.c:5136 scd/app-openpgp.c:2819
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "αλλαγή της φ�άσης κλειδί"
 
-#: scd/app-p15.c:5040 scd/app-nks.c:2028
+#: scd/app-p15.c:5138 scd/app-nks.c:2028
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Πα�ακαλώ επιλέξτε την αιτία για την ανάκληση:\n"
 
-#: scd/app-p15.c:5043 scd/app-nks.c:2019
+#: scd/app-p15.c:5141 scd/app-nks.c:2019
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "αλλαγή της φ�άσης κλειδί"
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4321
+#: scd/app-nks.c:1468 scd/app-openpgp.c:4323
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1476 scd/app-openpgp.c:4333
+#: scd/app-nks.c:1476 scd/app-openpgp.c:4335
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
@@ -8548,27 +8561,27 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3442 scd/app-dinsig.c:534
+#: scd/app-nks.c:2221 scd/app-openpgp.c:3443 scd/app-dinsig.c:534
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: scd/app-openpgp.c:943
+#: scd/app-openpgp.c:944
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "αποτυχία α�χικοποίησης της TrustDB: %s\n"
 
-#: scd/app-openpgp.c:956
+#: scd/app-openpgp.c:957
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "αποτυχία επαναδόμησης της cache κλειδοθήκης: %s\n"
 
-#: scd/app-openpgp.c:1427 scd/app-openpgp.c:3389 scd/app-openpgp.c:5715
+#: scd/app-openpgp.c:1428 scd/app-openpgp.c:3390 scd/app-openpgp.c:5709
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1949
+#: scd/app-openpgp.c:1950
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "διαγ�αφή block κλειδιών απέτυχε: %s\n"
@@ -8576,43 +8589,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:2373
+#: scd/app-openpgp.c:2374
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2621
+#: scd/app-openpgp.c:2622
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2628
+#: scd/app-openpgp.c:2629
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2641
+#: scd/app-openpgp.c:2642
 #, fuzzy
 msgid "||Please unlock the card"
 msgstr "αλλαγή της φ�άσης κλειδί"
 
-#: scd/app-openpgp.c:2700 scd/app-openpgp.c:2900 scd/app-openpgp.c:3368
+#: scd/app-openpgp.c:2701 scd/app-openpgp.c:2901 scd/app-openpgp.c:3369
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2717 scd/app-openpgp.c:2760 scd/app-openpgp.c:2917
-#: scd/app-openpgp.c:5325
+#: scd/app-openpgp.c:2718 scd/app-openpgp.c:2761 scd/app-openpgp.c:2918
+#: scd/app-openpgp.c:5319
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "keyserver αποστολή απέτυχε: %s\n"
 
-#: scd/app-openpgp.c:2804 scd/app-openpgp.c:5724
+#: scd/app-openpgp.c:2805 scd/app-openpgp.c:5718
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2808
+#: scd/app-openpgp.c:2809
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8620,22 +8633,22 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: scd/app-openpgp.c:2841
+#: scd/app-openpgp.c:2842
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3355
+#: scd/app-openpgp.c:3356
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "αλλαγή της φ�άσης κλειδί"
 
-#: scd/app-openpgp.c:3404
+#: scd/app-openpgp.c:3405
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Πα�ακαλώ επιλέξτε την αιτία για την ανάκληση:\n"
 
-#: scd/app-openpgp.c:3414 scd/app-openpgp.c:3481
+#: scd/app-openpgp.c:3415 scd/app-openpgp.c:3484
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
@@ -8643,81 +8656,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:3437
+#: scd/app-openpgp.c:3438
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3439
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3439
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3541
+#: scd/app-openpgp.c:3543
 #, fuzzy
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "αλλαγή της φ�άσης κλειδί"
 
-#: scd/app-openpgp.c:3542
+#: scd/app-openpgp.c:3544
 #, fuzzy
 msgid "||Please enter the PIN and New PIN"
 msgstr "αλλαγή της φ�άσης κλειδί"
 
-#: scd/app-openpgp.c:3600 scd/app-openpgp.c:5026
+#: scd/app-openpgp.c:3602 scd/app-openpgp.c:5020
 #, fuzzy, c-format
 msgid "error reading application data\n"
 msgstr "σφάλμα κατά την ανάγνωση του μπλοκ κλειδιών: %s\n"
 
-#: scd/app-openpgp.c:3606 scd/app-openpgp.c:5033
+#: scd/app-openpgp.c:3608 scd/app-openpgp.c:5027
 #, fuzzy, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "%s: σφάλμα στην ανάγνωση της εγγ�αφής free : %s\n"
 
-#: scd/app-openpgp.c:4302 scd/app-openpgp.c:4657
+#: scd/app-openpgp.c:4304 scd/app-openpgp.c:4653
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4343 scd/app-openpgp.c:4351
+#: scd/app-openpgp.c:4345 scd/app-openpgp.c:4353
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4651
+#: scd/app-openpgp.c:4647
 #, fuzzy, c-format
 #| msgid "unsupported URI"
 msgid "unsupported curve\n"
 msgstr "μη υποστη�ιζόμενο URI"
 
-#: scd/app-openpgp.c:4991
+#: scd/app-openpgp.c:4985
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5041
+#: scd/app-openpgp.c:5035
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5240
+#: scd/app-openpgp.c:5234
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s υπογ�αφή, αλγό�ιθμος πε�ίληψης %s\n"
 
-#: scd/app-openpgp.c:5298
+#: scd/app-openpgp.c:5292
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5729
+#: scd/app-openpgp.c:5723
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:6241 scd/app-openpgp.c:6252
+#: scd/app-openpgp.c:6250 scd/app-openpgp.c:6261
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "δε β�έθηκαν έγκυ�α OpenPGP δεδομένα.\n"
@@ -8738,7 +8751,7 @@ msgstr ""
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:274 dirmngr/dirmngr.c:198
+#: scd/scdaemon.c:136 sm/gpgsm.c:274 dirmngr/dirmngr.c:199
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
@@ -8803,12 +8816,12 @@ msgstr ""
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2104
+#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2143
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2112
+#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2151
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -8818,11 +8831,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:199 sm/certchain.c:2172
+#: sm/certchain.c:199 sm/certchain.c:2174
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:200 sm/certchain.c:2172
+#: sm/certchain.c:200 sm/certchain.c:2174
 #, fuzzy
 msgid "shell"
 msgstr "help"
@@ -8856,231 +8869,231 @@ msgstr "εγγ�αφή του μυστικο� κλειδιο� στο `%s'\n"
 msgid "certificate policy not allowed"
 msgstr "εγγ�αφή του μυστικο� κλειδιο� στο `%s'\n"
 
-#: sm/certchain.c:595 sm/keydb.c:1891 sm/keydb.c:1980
+#: sm/certchain.c:596 sm/keydb.c:1913 sm/keydb.c:2002
 #, fuzzy, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "αποτυχία α�χικοποίησης της TrustDB: %s\n"
 
-#: sm/certchain.c:624
+#: sm/certchain.c:625
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:644
+#: sm/certchain.c:645
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#: sm/certchain.c:724 dirmngr/ocsp.c:683
 #, fuzzy, c-format
 #| msgid "%s: can't access: %s\n"
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "%s: αδυναμία π�όσβασης: %s\n"
 
-#: sm/certchain.c:791
+#: sm/certchain.c:792
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr ""
 
-#: sm/certchain.c:816
+#: sm/certchain.c:817
 #, fuzzy, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: sm/certchain.c:819
+#: sm/certchain.c:820
 #, fuzzy, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "διαγ�αφή block κλειδιών απέτυχε: %s\n"
 
-#: sm/certchain.c:1046 sm/certchain.c:1561 sm/certchain.c:2200 sm/decrypt.c:643
-#: sm/encrypt.c:620 sm/import.c:414 sm/keydb.c:1898 sm/keydb.c:1987
-#: sm/sign.c:428 sm/verify.c:117
+#: sm/certchain.c:1047 sm/certchain.c:1562 sm/certchain.c:2202
+#: sm/decrypt.c:1084 sm/encrypt.c:621 sm/import.c:414 sm/keydb.c:1920
+#: sm/keydb.c:2009 sm/sign.c:428 sm/verify.c:117
 #, fuzzy, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "αποτυχία α�χικοποίησης της TrustDB: %s\n"
 
-#: sm/certchain.c:1232
+#: sm/certchain.c:1233
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "ΣΗΜΕΙΩΣΗ: το κλειδί έχει ανακληθεί"
 
-#: sm/certchain.c:1247
+#: sm/certchain.c:1248
 msgid "the status of the certificate is unknown"
 msgstr ""
 
-#: sm/certchain.c:1254
+#: sm/certchain.c:1255
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:1260
+#: sm/certchain.c:1261
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "απέτυχε ο έλεγχος της υπογ�αφής που δημιου�γήθηκε: %s\n"
 
-#: sm/certchain.c:1289 sm/certchain.c:1357 dirmngr/validate.c:497
+#: sm/certchain.c:1290 sm/certchain.c:1358 dirmngr/validate.c:497
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:1304 sm/certchain.c:1389 dirmngr/validate.c:515
+#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:515
 #, c-format
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1305 sm/certchain.c:1390
+#: sm/certchain.c:1306 sm/certchain.c:1391
 #, fuzzy
 msgid "root certificate not yet valid"
 msgstr "εγγ�αφή του μυστικο� κλειδιο� στο `%s'\n"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1307 sm/certchain.c:1392
 msgid "intermediate certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1319 dirmngr/validate.c:526
+#: sm/certchain.c:1320 dirmngr/validate.c:526
 #, fuzzy, c-format
 msgid "certificate has expired"
 msgstr "Αυτό το κλειδί έχει λήξει!"
 
-#: sm/certchain.c:1320
+#: sm/certchain.c:1321
 #, fuzzy
 msgid "root certificate has expired"
 msgstr "Αυτό το κλειδί έχει λήξει!"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1322
 #, fuzzy
 msgid "intermediate certificate has expired"
 msgstr "Αυτό το κλειδί έχει λήξει!"
 
-#: sm/certchain.c:1363
+#: sm/certchain.c:1364
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:1372
+#: sm/certchain.c:1373
 #, fuzzy
 msgid "certificate with invalid validity"
 msgstr "Αυτό το κλειδί έχει λήξει!"
 
-#: sm/certchain.c:1409
+#: sm/certchain.c:1410
 msgid "signature not created during lifetime of certificate"
 msgstr ""
 
-#: sm/certchain.c:1411
+#: sm/certchain.c:1412
 msgid "certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1413
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1416
+#: sm/certchain.c:1417
 #, fuzzy, c-format
 msgid "  (  signature created at "
 msgstr "        νέες υπογ�αφές: %lu\n"
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1418
 #, fuzzy, c-format
 msgid "  (certificate created at "
 msgstr "Πιστοποιητικό ανάκλησης δημιου�γήθηκε.\n"
 
-#: sm/certchain.c:1420
+#: sm/certchain.c:1421
 #, fuzzy, c-format
 msgid "  (certificate valid from "
 msgstr "κακό πιστοποιητικό"
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1422
 #, c-format
 msgid "  (     issuer valid from "
 msgstr ""
 
-#: sm/certchain.c:1451 dirmngr/validate.c:577
+#: sm/certchain.c:1452 dirmngr/validate.c:577
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "απεικόνιση του fingerprint"
 
-#: sm/certchain.c:1460
+#: sm/certchain.c:1461
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:1473
+#: sm/certchain.c:1474
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1479
+#: sm/certchain.c:1480
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1538
+#: sm/certchain.c:1539
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 
-#: sm/certchain.c:1602
+#: sm/certchain.c:1603
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "δημιου�γία ενός πιστοποιητικο� ανάκλησης"
 
-#: sm/certchain.c:1680
+#: sm/certchain.c:1681
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1749 dirmngr/validate.c:575
+#: sm/certchain.c:1750 dirmngr/validate.c:575
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:1765
+#: sm/certchain.c:1766
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "απέτυχε ο έλεγχος της υπογ�αφής που δημιου�γήθηκε: %s\n"
 
-#: sm/certchain.c:1796 sm/import.c:175 dirmngr/validate.c:630
+#: sm/certchain.c:1797 sm/import.c:175 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1808 dirmngr/validate.c:642
+#: sm/certchain.c:1809 dirmngr/validate.c:642
 #, c-format
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1842 dirmngr/validate.c:668
+#: sm/certchain.c:1844 dirmngr/validate.c:668
 #, fuzzy, c-format
 msgid "certificate has a BAD signature"
 msgstr "επαλήθευση μιας υπογ�αφής"
 
-#: sm/certchain.c:1874 dirmngr/validate.c:692
+#: sm/certchain.c:1876 dirmngr/validate.c:692
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1933 dirmngr/validate.c:717
+#: sm/certchain.c:1935 dirmngr/validate.c:717
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1975 sm/certchain.c:2275 dirmngr/validate.c:747
+#: sm/certchain.c:1977 sm/certchain.c:2278 dirmngr/validate.c:747
 #, fuzzy, c-format
 msgid "certificate is good\n"
 msgstr "η π�οεπιλογή %c%lu αντιγ�άφτηκε\n"
 
-#: sm/certchain.c:1976
+#: sm/certchain.c:1978
 #, fuzzy, c-format
 msgid "intermediate certificate is good\n"
 msgstr "Πιστοποιητικό ανάκλησης δημιου�γήθηκε.\n"
 
-#: sm/certchain.c:1977
+#: sm/certchain.c:1979
 #, fuzzy, c-format
 msgid "root certificate is good\n"
 msgstr "κακό πιστοποιητικό"
 
-#: sm/certchain.c:2159
+#: sm/certchain.c:2161
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:2168
+#: sm/certchain.c:2170
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -9091,18 +9104,18 @@ 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:1372 dirmngr/validate.c:903
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1411 dirmngr/validate.c:903
 #: dirmngr/validate.c:927
 #, fuzzy, c-format
 msgid "out of core\n"
 msgstr "μη επεξε�γασμένο"
 
-#: sm/certcheck.c:389 sm/verify.c:212
+#: sm/certcheck.c:388 sm/verify.c:212
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:793
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:794
 #, fuzzy
 msgid "none"
 msgstr "όχι|οχι"
@@ -9400,17 +9413,17 @@ msgstr ""
 msgid "resource problem: out of core\n"
 msgstr ""
 
-#: sm/decrypt.c:719
+#: sm/decrypt.c:1159
 #, c-format
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
 
-#: sm/decrypt.c:721
+#: sm/decrypt.c:1161
 #, c-format
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr ""
 
-#: sm/decrypt.c:868
+#: sm/decrypt.c:1318
 #, fuzzy, c-format
 msgid "encrypted to %s key %s\n"
 msgstr "κ�υπτογ�αφημένο με %s key, ID %08lX\n"
@@ -9420,7 +9433,7 @@ msgstr "κ�υπτογ�αφημένο με %s key, ID %08lX\n"
 msgid "certificate '%s' not found: %s\n"
 msgstr "το κλειδί '%s' δε β�έθηκε: %s\n"
 
-#: sm/delete.c:120 sm/keydb.c:1999 sm/keydb.c:2098
+#: sm/delete.c:120 sm/keydb.c:2021 sm/keydb.c:2120
 #, fuzzy, c-format
 msgid "error locking keybox: %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του μπλοκ κλειδιών: %s\n"
@@ -9440,7 +9453,7 @@ msgstr "η π�οεπιλογή %c%lu αντιγ�άφτηκε\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "διαγ�αφή block κλειδιών απέτυχε: %s\n"
 
-#: sm/encrypt.c:606
+#: sm/encrypt.c:607
 #, fuzzy, c-format
 msgid "no valid recipients given\n"
 msgstr "(Δεν δώθηκε πε�ιγ�αφή)\n"
@@ -9516,68 +9529,68 @@ msgstr "|ΟÎ�ΟΜΑ|χÏ�ήση ΟÎ�ΟΜΑτος σαν Ï€Ï�οκαθοÏ�ισμέÎ
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "π�οσθήκη αυτο� του κλειδιο� στη λίστα των κλειδοθηκών"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:352 dirmngr/dirmngr.c:265
 #, fuzzy
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|ΔΙΑΚΟΜΙΣΤΗΣ|χ�ήση αυτο� του διακομιστή κλειδιών για αναζήτηση"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:363
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:364
+#: sm/gpgsm.c:365
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|Ο�ΟΜΑ|χ�ήση αλγό�ιθμου κ�υπτογ�άφησης Ο�ΟΜΑ για φ�άσεις κλειδιά"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:386
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:389
+#: sm/gpgsm.c:390
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: sm/gpgsm.c:393
+#: sm/gpgsm.c:394
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:396
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:398
+#: sm/gpgsm.c:399
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|Ο�ΟΜΑ|χ�ήση αλγό�ιθμου κ�υπτογ�άφησης Ο�ΟΜΑ"
 
-#: sm/gpgsm.c:400
+#: sm/gpgsm.c:401
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|Ο�ΟΜΑ|χ�ήση αλγό�ιθμου πε�ίληψης μην�ματος Ο�ΟΜΑ "
 
-#: sm/gpgsm.c:410
+#: sm/gpgsm.c:411
 msgid "batch mode: never ask"
 msgstr "κατάσταση batch: να μη γίνονται ε�ωτήσεις"
 
-#: sm/gpgsm.c:412
+#: sm/gpgsm.c:413
 msgid "assume yes on most questions"
 msgstr "απάντηση ναι στις πε�ισσότε�ες ε�ωτήσεις"
 
-#: sm/gpgsm.c:413
+#: sm/gpgsm.c:414
 msgid "assume no on most questions"
 msgstr "απάντηση όχι στις πε�ισσότε�ες ε�ωτήσεις"
 
-#: sm/gpgsm.c:430
+#: sm/gpgsm.c:431
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|ΑΡΧΕΙΟ|φό�τωμα του α�θ�ώματος επέκτασης ΑΡΧΕΙΟ"
 
-#: sm/gpgsm.c:615
+#: sm/gpgsm.c:616
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Χ�ήση: gpg [επιλογές] [α�χεία] (-h για βοήθεια)"
 
-#: sm/gpgsm.c:618
+#: sm/gpgsm.c:619
 #, fuzzy
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
@@ -9588,52 +9601,27 @@ msgstr ""
 "υπογ�αφή, έλεγχος, κ�υπτογ�άφηση ή αποκ�υπτογ�άφηση\n"
 "η π�οκαθο�ισμένη λειτου�γία εξα�τάται από τα δεδομένα εισόδου\n"
 
-#: sm/gpgsm.c:826
+#: sm/gpgsm.c:827
 #, fuzzy, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "αδυναμία σ�νδεσης στο `%s': %s\n"
 
-#: sm/gpgsm.c:837
+#: sm/gpgsm.c:838
 #, fuzzy, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "άγνωστος π�οκαθο�ισμένος πα�αλήπτης `%s'\n"
 
-#: sm/gpgsm.c:896 dirmngr/ldapserver.c:89
-#, fuzzy, c-format
-msgid "%s:%u: no hostname given\n"
-msgstr "(Δεν δώθηκε πε�ιγ�αφή)\n"
-
-#: sm/gpgsm.c:915 dirmngr/ldapserver.c:108
-#, c-format
-msgid "%s:%u: password given without user\n"
-msgstr ""
-
-#: sm/gpgsm.c:946 dirmngr/ldapserver.c:139
-#, c-format
-msgid "%s:%u: ignoring unknown flag '%s'\n"
-msgstr ""
-
-#: sm/gpgsm.c:962 dirmngr/ldapserver.c:155
-#, fuzzy, c-format
-msgid "%s:%u: skipping this line\n"
-msgstr " s = πα�άλειψη αυτο� του κλειδιο�\n"
-
-#: sm/gpgsm.c:1550
-#, fuzzy, c-format
-msgid "could not parse keyserver\n"
-msgstr "αδυναμία επεξε�γασίας του URI του διακομιση κλειδιών\n"
-
-#: sm/gpgsm.c:1858
+#: sm/gpgsm.c:1711
 #, fuzzy, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "εγγ�αφή στο  `%s'\n"
 
-#: sm/gpgsm.c:1904
+#: sm/gpgsm.c:1757
 #, fuzzy, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "αδυναμία κλεισίματος του `%s': %s\n"
 
-#: sm/gpgsm.c:2273
+#: sm/gpgsm.c:2129
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
@@ -9653,52 +9641,52 @@ msgstr "δημιουÏ�γία ενός πιστοποιητικοÏ� ανάκληÏ
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:471 sm/keydb.c:2018 sm/keydb.c:2111
+#: sm/import.c:472 sm/keydb.c:2040 sm/keydb.c:2133
 #, fuzzy, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: sm/import.c:530 sm/import.c:562
+#: sm/import.c:531 sm/import.c:563
 #, fuzzy, c-format
 msgid "error importing certificate: %s\n"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: sm/import.c:751 tools/gpg-connect-agent.c:1475
+#: sm/import.c:752 tools/gpg-connect-agent.c:1475
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: sm/keydb.c:503
+#: sm/keydb.c:508
 #, fuzzy, c-format
 msgid "no keyboxd running in this session\n"
 msgstr "ο gpg-agent δεν είναι διαθέσιμος σε αυτή τη συνεδ�ία\n"
 
-#: sm/keydb.c:595
+#: sm/keydb.c:600
 #, fuzzy, c-format
 msgid "error opening key DB: %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: sm/keydb.c:1936
+#: sm/keydb.c:1958
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1948
+#: sm/keydb.c:1970
 #, fuzzy, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: sm/keydb.c:1956
+#: sm/keydb.c:1978
 #, fuzzy, c-format
 msgid "error storing certificate: %s\n"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: sm/keydb.c:2009
+#: sm/keydb.c:2031
 #, fuzzy, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "rev? π�όβλημα στον έλεγχο ανάκλησης: %s\n"
 
-#: sm/keydb.c:2030 sm/keydb.c:2122
+#: sm/keydb.c:2052 sm/keydb.c:2144
 #, fuzzy, c-format
 msgid "error storing flags: %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
@@ -9870,57 +9858,57 @@ msgstr ""
 msgid "error loading certificate '%s': %s\n"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: dirmngr/certcache.c:819
+#: dirmngr/certcache.c:820
 #, fuzzy, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "κακό πιστοποιητικό"
 
-#: dirmngr/certcache.c:821
+#: dirmngr/certcache.c:822
 #, fuzzy, c-format
 msgid "    runtime cached certificates: %u\n"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: dirmngr/certcache.c:823
+#: dirmngr/certcache.c:824
 #, fuzzy, c-format
 msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: dirmngr/certcache.c:851 dirmngr/dirmngr-client.c:392
+#: dirmngr/certcache.c:852 dirmngr/dirmngr-client.c:392
 #, fuzzy, c-format
 msgid "certificate already cached\n"
 msgstr "Πιστοποιητικό ανάκλησης δημιου�γήθηκε.\n"
 
-#: dirmngr/certcache.c:853
+#: dirmngr/certcache.c:854
 #, fuzzy, c-format
 msgid "certificate cached\n"
 msgstr "η π�οεπιλογή %c%lu αντιγ�άφτηκε\n"
 
-#: dirmngr/certcache.c:855 dirmngr/certcache.c:875 dirmngr/dirmngr-client.c:396
+#: dirmngr/certcache.c:856 dirmngr/certcache.c:876 dirmngr/dirmngr-client.c:396
 #, fuzzy, c-format
 msgid "error caching certificate: %s\n"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: dirmngr/certcache.c:938
+#: dirmngr/certcache.c:939
 #, fuzzy, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "σφάλμα: μη έγκυ�ο αποτ�πωμα\n"
 
-#: dirmngr/certcache.c:1384 dirmngr/certcache.c:1393
+#: dirmngr/certcache.c:1385 dirmngr/certcache.c:1394
 #, fuzzy, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: dirmngr/certcache.c:1579 dirmngr/certcache.c:1588
+#: dirmngr/certcache.c:1580 dirmngr/certcache.c:1589
 #, fuzzy, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: dirmngr/certcache.c:1694 dirmngr/validate.c:483
+#: dirmngr/certcache.c:1695 dirmngr/validate.c:483
 #, fuzzy, c-format
 msgid "no issuer found in certificate\n"
 msgstr "δημιου�γία ενός πιστοποιητικο� ανάκλησης"
 
-#: dirmngr/certcache.c:1704
+#: dirmngr/certcache.c:1705
 #, fuzzy, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
@@ -9957,7 +9945,7 @@ msgstr "διαγ�αφή block κλειδιών απέτυχε: %s\n"
 msgid "not removing file '%s'\n"
 msgstr "θω�άκιση απέτυχε: %s\n"
 
-#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2380
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2383
 #, fuzzy, c-format
 msgid "error closing cache file: %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
@@ -10192,14 +10180,14 @@ msgid "error getting data from cache file: %s\n"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
 #: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1672 dirmngr/crlcache.c:1697
-#: dirmngr/crlcache.c:1763
+#: dirmngr/crlcache.c:1766
 #, fuzzy, c-format
 #| msgid "invalid response from agent\n"
 msgid "got an invalid S-expression from libksba\n"
 msgstr "μη έγκυ�η απάντηση από τον agent\n"
 
 #: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1679 dirmngr/crlcache.c:1705
-#: dirmngr/crlcache.c:1770 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1773 dirmngr/misc.c:176
 #, fuzzy, c-format
 msgid "converting S-expression failed: %s\n"
 msgstr "αδυναμία π�όσβασης του α�χείου: %s\n"
@@ -10215,166 +10203,166 @@ msgstr "μη έγκυ�ος αλγό�ιθμος  hash `%s'\n"
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1797 dirmngr/ocsp.c:478
+#: dirmngr/crlcache.c:1800 dirmngr/ocsp.c:478
 #, fuzzy, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "διαγ�αφή block κλειδιών απέτυχε: %s\n"
 
-#: dirmngr/crlcache.c:1871
+#: dirmngr/crlcache.c:1874
 #, fuzzy, c-format
 #| msgid "build_packet failed: %s\n"
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "build_packet απέτυχε: %s\n"
 
-#: dirmngr/crlcache.c:1886
+#: dirmngr/crlcache.c:1889
 #, fuzzy, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: dirmngr/crlcache.c:1893
+#: dirmngr/crlcache.c:1896
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1897
+#: dirmngr/crlcache.c:1900
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1917
+#: dirmngr/crlcache.c:1920
 #, fuzzy, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: dirmngr/crlcache.c:1932
+#: dirmngr/crlcache.c:1935
 #, fuzzy, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "εγγ�αφή στο  `%s'\n"
 
-#: dirmngr/crlcache.c:1959
+#: dirmngr/crlcache.c:1962
 #, fuzzy, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "δημιου�γία ενός πιστοποιητικο� ανάκλησης"
 
-#: dirmngr/crlcache.c:1974
+#: dirmngr/crlcache.c:1977
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2020
+#: dirmngr/crlcache.c:2023
 #, fuzzy, c-format
 #| msgid "signature verification suppressed\n"
 msgid "CRL signature verification failed: %s\n"
 msgstr "καταστολή ανάκλησης υπογ�αφής\n"
 
-#: dirmngr/crlcache.c:2032
+#: dirmngr/crlcache.c:2035
 #, fuzzy, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "απέτυχε ο έλεγχος της υπογ�αφής που δημιου�γήθηκε: %s\n"
 
-#: dirmngr/crlcache.c:2174
+#: dirmngr/crlcache.c:2177
 #, fuzzy, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "διαγ�αφή block κλειδιών απέτυχε: %s\n"
 
-#: dirmngr/crlcache.c:2181
+#: dirmngr/crlcache.c:2184
 #, fuzzy, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "η ενημέ�ωση απέτυχε: %s\n"
 
-#: dirmngr/crlcache.c:2215
+#: dirmngr/crlcache.c:2218
 #, fuzzy, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "αδυναμία δημιου�γίας καταλόγου `%s': %s\n"
 
-#: dirmngr/crlcache.c:2219
+#: dirmngr/crlcache.c:2222
 #, fuzzy, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "αδυναμία δημιου�γίας καταλόγου `%s': %s\n"
 
-#: dirmngr/crlcache.c:2229
+#: dirmngr/crlcache.c:2232
 #, fuzzy, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: dirmngr/crlcache.c:2239
+#: dirmngr/crlcache.c:2242
 #, fuzzy, c-format
 #| msgid "update secret failed: %s\n"
 msgid "crl_parse_insert failed: %s\n"
 msgstr "η ενημέ�ωση μυστικο� απέτυχε: %s\n"
 
-#: dirmngr/crlcache.c:2249
+#: dirmngr/crlcache.c:2252
 #, fuzzy, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "εγγ�αφή στο  `%s'\n"
 
-#: dirmngr/crlcache.c:2256
+#: dirmngr/crlcache.c:2259
 #, fuzzy, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: dirmngr/crlcache.c:2281
+#: dirmngr/crlcache.c:2284
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2285
+#: dirmngr/crlcache.c:2288
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2301
+#: dirmngr/crlcache.c:2304
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2311
+#: dirmngr/crlcache.c:2314
 #, fuzzy, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2365
 #, fuzzy, c-format
 msgid "creating cache file '%s'\n"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: dirmngr/crlcache.c:2394
+#: dirmngr/crlcache.c:2397
 #, fuzzy, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "θω�άκιση απέτυχε: %s\n"
 
-#: dirmngr/crlcache.c:2408
+#: dirmngr/crlcache.c:2411
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
 "program start\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2448
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2468
+#: dirmngr/crlcache.c:2471
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2471
+#: dirmngr/crlcache.c:2474
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2474
+#: dirmngr/crlcache.c:2477
 msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2481
+#: dirmngr/crlcache.c:2484
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2499
+#: dirmngr/crlcache.c:2502
 #, fuzzy, c-format
 #| msgid "WARNING: invalid size of random_seed file - not used\n"
 msgid " WARNING: invalid cache record length\n"
@@ -10382,36 +10370,36 @@ msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη έγκυ�ο μέγεθος α�χείου random_seed - δεν\n"
 "χ�ησιμοποιείτε\n"
 
-#: dirmngr/crlcache.c:2506
+#: dirmngr/crlcache.c:2509
 #, fuzzy, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "%s: σφάλμα στην ανάγνωση της εγγ�αφής free : %s\n"
 
-#: dirmngr/crlcache.c:2517
+#: dirmngr/crlcache.c:2520
 #, fuzzy, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "rev? π�όβλημα στον έλεγχο ανάκλησης: %s\n"
 
-#: dirmngr/crlcache.c:2548
+#: dirmngr/crlcache.c:2551
 #, fuzzy, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: dirmngr/crlcache.c:2551
+#: dirmngr/crlcache.c:2554
 msgid "End CRL dump\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2672
+#: dirmngr/crlcache.c:2675
 #, fuzzy, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "η ενημέ�ωση απέτυχε: %s\n"
 
-#: dirmngr/crlcache.c:2683
+#: dirmngr/crlcache.c:2686
 #, fuzzy, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "απέτυχε ο έλεγχος της υπογ�αφής που δημιου�γήθηκε: %s\n"
 
-#: dirmngr/crlcache.c:2743
+#: dirmngr/crlcache.c:2746
 #, fuzzy, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "διαγ�αφή block κλειδιών απέτυχε: %s\n"
@@ -10432,7 +10420,7 @@ msgstr ""
 msgid "error retrieving '%s': %s\n"
 msgstr "σφάλμα κατά τη δημιου�γία του `%s': %s\n"
 
-#: dirmngr/crlfetch.c:218 dirmngr/ldap-wrapper.c:881 dirmngr/misc.c:573
+#: dirmngr/crlfetch.c:218 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
 #, fuzzy, c-format
 #| msgid "%s: error writing dir record: %s\n"
 msgid "error initializing reader object: %s\n"
@@ -10600,135 +10588,135 @@ msgstr ""
 msgid "looking up '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:175
+#: dirmngr/dirmngr.c:176
 msgid "list the contents of the CRL cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:176
+#: dirmngr/dirmngr.c:177
 #, fuzzy
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|ΑΡΧΕΙΟ|φό�τωμα του α�θ�ώματος επέκτασης ΑΡΧΕΙΟ"
 
-#: dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr.c:178
 msgid "|URL|fetch a CRL from URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:178
+#: dirmngr/dirmngr.c:179
 msgid "shutdown the dirmngr"
 msgstr ""
 
-#: dirmngr/dirmngr.c:179
+#: dirmngr/dirmngr.c:180
 msgid "flush the cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:213
 msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:215
+#: dirmngr/dirmngr.c:216
 msgid "|N|do not return more than N items in one query"
 msgstr ""
 
-#: dirmngr/dirmngr.c:221
+#: dirmngr/dirmngr.c:222
 msgid "Network related options"
 msgstr ""
 
-#: dirmngr/dirmngr.c:223
+#: dirmngr/dirmngr.c:224
 msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:235
+#: dirmngr/dirmngr.c:236
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:238
+#: dirmngr/dirmngr.c:239
 #, fuzzy
 msgid "|URL|use keyserver at URL"
 msgstr "αδυναμία επεξε�γασίας του URI του διακομιση κλειδιών\n"
 
-#: dirmngr/dirmngr.c:240
+#: dirmngr/dirmngr.c:241
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-#: dirmngr/dirmngr.c:242
+#: dirmngr/dirmngr.c:243
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:244
+#: dirmngr/dirmngr.c:245
 msgid "inhibit the use of HTTP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:246
+#: dirmngr/dirmngr.c:247
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:248
+#: dirmngr/dirmngr.c:249
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:250
+#: dirmngr/dirmngr.c:251
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: dirmngr/dirmngr.c:254
+#: dirmngr/dirmngr.c:255
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: dirmngr/dirmngr.c:256
+#: dirmngr/dirmngr.c:257
 msgid "inhibit the use of LDAP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:258
+#: dirmngr/dirmngr.c:259
 msgid "ignore LDAP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:260
+#: dirmngr/dirmngr.c:261
 msgid "|HOST|use HOST for LDAP queries"
 msgstr ""
 
-#: dirmngr/dirmngr.c:262
+#: dirmngr/dirmngr.c:263
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr ""
 
-#: dirmngr/dirmngr.c:264
+#: dirmngr/dirmngr.c:267
 #, fuzzy
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|ΑΡΧΕΙΟ|φό�τωμα του α�θ�ώματος επέκτασης ΑΡΧΕΙΟ"
 
-#: dirmngr/dirmngr.c:266
+#: dirmngr/dirmngr.c:269
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 
-#: dirmngr/dirmngr.c:269 dirmngr/dirmngr_ldap.c:104
+#: dirmngr/dirmngr.c:272
 msgid "|N|set LDAP timeout to N seconds"
 msgstr ""
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:275
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:274
+#: dirmngr/dirmngr.c:277
 msgid "allow sending OCSP requests"
 msgstr ""
 
-#: dirmngr/dirmngr.c:276
+#: dirmngr/dirmngr.c:279
 msgid "ignore certificate contained OCSP service URLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:278
+#: dirmngr/dirmngr.c:281
 #, fuzzy
 msgid "|URL|use OCSP responder at URL"
 msgstr "αδυναμία επεξε�γασίας του URI του διακομιση κλειδιών\n"
 
-#: dirmngr/dirmngr.c:280
+#: dirmngr/dirmngr.c:283
 msgid "|FPR|OCSP response signed by FPR"
 msgstr ""
 
-#: dirmngr/dirmngr.c:288
+#: dirmngr/dirmngr.c:291
 msgid "force loading of outdated CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:299
+#: dirmngr/dirmngr.c:302
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -10741,304 +10729,115 @@ msgstr ""
 "@\n"
 "(δείτε τη σελίδα man για μια πλή�η λίστα εντολών και επιλογών)\n"
 
-#: dirmngr/dirmngr.c:441
+#: dirmngr/dirmngr.c:449
 #, fuzzy
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Χ�ήση: gpg [επιλογές] [α�χεία] (-h για βοήθεια)"
 
-#: dirmngr/dirmngr.c:443
+#: dirmngr/dirmngr.c:451
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:523
+#: dirmngr/dirmngr.c:531
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:609 tools/gpgconf.c:667 tools/gpgconf.c:702
-#: tools/gpgconf.c:802
+#: dirmngr/dirmngr.c:617 tools/gpgconf.c:701 tools/gpgconf.c:736
+#: tools/gpgconf.c:836
 #, fuzzy, c-format
 msgid "usage: %s [options] "
 msgstr "χ�ήση: gpg [επιλογές] "
 
-#: dirmngr/dirmngr.c:1260
+#: dirmngr/dirmngr.c:1299
 #, 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:1495 dirmngr/server.c:1824
+#: dirmngr/dirmngr.c:1534 dirmngr/server.c:1878
 #, fuzzy, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "θω�άκιση απέτυχε: %s\n"
 
-#: dirmngr/dirmngr.c:1501 dirmngr/server.c:1830
+#: dirmngr/dirmngr.c:1540 dirmngr/server.c:1884
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "θω�άκιση απέτυχε: %s\n"
 
-#: dirmngr/dirmngr.c:1643
+#: dirmngr/dirmngr.c:1682
 #, fuzzy, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "η γ�αμμή είναι πολ� μεγάλη\n"
 
-#: dirmngr/dirmngr.c:1698 dirmngr/dirmngr.c:1782
+#: dirmngr/dirmngr.c:1737 dirmngr/dirmngr.c:1821
 #, fuzzy, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "σφάλμα: μη έγκυ�ο αποτ�πωμα\n"
 
-#: dirmngr/dirmngr.c:1734 dirmngr/dirmngr.c:1760 tools/gpgconf-comp.c:3539
+#: dirmngr/dirmngr.c:1773 dirmngr/dirmngr.c:1799 tools/gpgconf-comp.c:3549
 #, fuzzy, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "σφάλμα ανάγνωσης: %s\n"
 
-#: dirmngr/dirmngr.c:1789
+#: dirmngr/dirmngr.c:1828
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1876
+#: dirmngr/dirmngr.c:1915
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1917
+#: dirmngr/dirmngr.c:1956
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1922
+#: dirmngr/dirmngr.c:1961
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1924
+#: dirmngr/dirmngr.c:1963
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1929
+#: dirmngr/dirmngr.c:1968
 #, fuzzy, c-format
 msgid "shutdown forced\n"
 msgstr "μη επεξε�γασμένο"
 
-#: dirmngr/dirmngr.c:1937
+#: dirmngr/dirmngr.c:1976
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1944
+#: dirmngr/dirmngr.c:1983
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:105
-msgid "return all values in a record oriented format"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:108
-msgid "|NAME|ignore host part and connect through NAME"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:109
-msgid "force a TLS connection"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:110
-#, fuzzy
-#| msgid "|NAME|set terminal charset to NAME"
-msgid "|NAME|connect to host NAME"
-msgstr "|Ο�ΟΜΑ|καθο�ισμός του σετ χα�ακτή�ων τε�ματικο� σε Ο�ΟΜΑ"
-
-#: dirmngr/dirmngr_ldap.c:111
-msgid "|N|connect to port N"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:112
-#, fuzzy
-#| msgid "|NAME|use NAME as default recipient"
-msgid "|NAME|use user NAME for authentication"
-msgstr "|Ο�ΟΜΑ|χ�ήση του Ο�ΟΜΑτος ως π�οκαθο�ισμένου πα�αλήπτη"
-
-#: dirmngr/dirmngr_ldap.c:113
-msgid "|PASS|use password PASS for authentication"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:115
-msgid "take password from $DIRMNGR_LDAP_PASS"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:116
-msgid "|STRING|query DN STRING"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:117
-msgid "|STRING|use STRING as filter expression"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:118
-msgid "|STRING|return the attribute STRING"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:179
-#, fuzzy
-#| msgid "Usage: gpg [options] [files] (-h for help)"
-msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
-msgstr "Χ�ήση: gpg [επιλογές] [α�χεία] (-h για βοήθεια)"
-
-#: dirmngr/dirmngr_ldap.c:182
-msgid ""
-"Syntax: dirmngr_ldap [options] [URL]\n"
-"Internal LDAP helper for Dirmngr\n"
-"Interface and options may change without notice\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:291
-#, fuzzy, c-format
-#| msgid "invalid import options\n"
-msgid "invalid port number %d\n"
-msgstr "μη έγκυ�ες επιλογές ειγαγωγής\n"
-
-#: dirmngr/dirmngr_ldap.c:400
-#, c-format
-msgid "scanning result for attribute '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:407 dirmngr/dirmngr_ldap.c:490
-#: dirmngr/dirmngr_ldap.c:514 dirmngr/dirmngr_ldap.c:526
-#: dirmngr/dirmngr_ldap.c:722
-#, fuzzy, c-format
-msgid "error writing to stdout: %s\n"
-msgstr "αδυναμία εγγ�αφής της κλειδοθήκης `%s': %s\n"
-
-#: dirmngr/dirmngr_ldap.c:424
-#, c-format
-msgid "          available attribute '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:462
-#, fuzzy, c-format
-msgid "attribute '%s' not found\n"
-msgstr "το κλειδί '%s' δε β�έθηκε: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:469
-#, c-format
-msgid "found attribute '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:581
-#, fuzzy, c-format
-#| msgid "reading from `%s'\n"
-msgid "processing url '%s'\n"
-msgstr "ανάγνωση από `%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:588
-#, fuzzy, c-format
-#| msgid "          w/o user IDs: %lu\n"
-msgid "          user '%s'\n"
-msgstr "          χω�ίς user ID: %lu\n"
-
-#: dirmngr/dirmngr_ldap.c:590
-#, fuzzy, c-format
-msgid "          pass '%s'\n"
-msgstr "                γνωστό σαν \""
-
-#: dirmngr/dirmngr_ldap.c:592
-#, fuzzy, c-format
-msgid "          host '%s'\n"
-msgstr "                γνωστό σαν \""
-
-#: dirmngr/dirmngr_ldap.c:593
-#, fuzzy, c-format
-#| msgid "          not imported: %lu\n"
-msgid "          port %d\n"
-msgstr "          μη  εισαχθέντα: %lu\n"
-
-#: dirmngr/dirmngr_ldap.c:595
-#, fuzzy, c-format
-msgid "            DN '%s'\n"
-msgstr "                γνωστό σαν \""
-
-#: dirmngr/dirmngr_ldap.c:597
-#, c-format
-msgid "        filter '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:602 dirmngr/dirmngr_ldap.c:605
-#, fuzzy, c-format
-msgid "          attr '%s'\n"
-msgstr "                γνωστό σαν \""
-
-#: dirmngr/dirmngr_ldap.c:611
-#, fuzzy, c-format
-msgid "no host name in '%s'\n"
-msgstr "(Δεν δώθηκε πε�ιγ�αφή)\n"
-
-#: dirmngr/dirmngr_ldap.c:616
-#, c-format
-msgid "no attribute given for query '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:622
-#, fuzzy, c-format
-#| msgid "WARNING: using insecure memory!\n"
-msgid "WARNING: using first attribute only\n"
-msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: χ�ήση μη ασφαλο�ς μνήμης!\n"
-
-#: dirmngr/dirmngr_ldap.c:637 dirmngr/dirmngr_ldap.c:678
-#, fuzzy, c-format
-msgid "LDAP init to '%s:%d' failed: %s\n"
-msgstr "θω�άκιση απέτυχε: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:659
-#, fuzzy, c-format
-msgid "LDAP init to '%s' failed: %s\n"
-msgstr "θω�άκιση απέτυχε: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:665
-#, fuzzy, c-format
-msgid "LDAP init to '%s' done\n"
-msgstr "θω�άκιση απέτυχε: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:704
-#, fuzzy, c-format
-msgid "binding to '%s:%d' failed: %s\n"
-msgstr "θω�άκιση απέτυχε: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:728
-#, fuzzy, c-format
-#| msgid "dearmoring failed: %s\n"
-msgid "searching '%s' failed: %s\n"
-msgstr "αποθω�άκιση απέτυχε: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:759
-#, fuzzy, c-format
-msgid "'%s' is not an LDAP URL\n"
-msgstr "\"%s\" δεν είναι JPEG α�χείο\n"
-
-#: dirmngr/dirmngr_ldap.c:765
-#, c-format
-msgid "'%s' is an invalid LDAP URL\n"
-msgstr ""
-
-#: dirmngr/http.c:1989 dirmngr/ocsp.c:255
+#: dirmngr/http.c:1998 dirmngr/ocsp.c:255
 #, fuzzy, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: dirmngr/http.c:3630 dirmngr/ocsp.c:229
+#: dirmngr/http.c:3652 dirmngr/ocsp.c:229
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr ""
 
-#: dirmngr/http.c:3636 dirmngr/ocsp.c:246
+#: dirmngr/http.c:3658 dirmngr/ocsp.c:246
 #, fuzzy, c-format
 msgid "too many redirections\n"
 msgstr "πά�α πολλές `%c' π�οεπιλογές\n"
 
-#: dirmngr/http.c:3748
+#: dirmngr/http.c:3768
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "redirection changed to '%s'\n"
@@ -11079,31 +10878,51 @@ msgstr "η ενημέ�ωση απέτυχε: %s\n"
 msgid "ldap wrapper %d stalled - killing\n"
 msgstr ""
 
-#: dirmngr/ldap.c:91
+#: dirmngr/ldap.c:92
 #, c-format
 msgid "invalid char 0x%02x in host name - not added\n"
 msgstr ""
 
-#: dirmngr/ldap.c:95
+#: dirmngr/ldap.c:96
 #, fuzzy, c-format
 msgid "adding '%s:%d' to the ldap server list\n"
 msgstr "αναζήτηση του \"%s\" από το HKP διακομιστή %s\n"
 
-#: dirmngr/ldap.c:98 dirmngr/misc.c:512
+#: dirmngr/ldap.c:99 dirmngr/misc.c:512
 #, fuzzy, c-format
 msgid "malloc failed: %s\n"
 msgstr "διαγ�αφή block κλειδιών απέτυχε: %s\n"
 
-#: dirmngr/ldap.c:634
+#: dirmngr/ldap.c:221
+#, fuzzy, c-format
+msgid "'%s' is not an LDAP URL\n"
+msgstr "\"%s\" δεν είναι JPEG α�χείο\n"
+
+#: dirmngr/ldap.c:227 dirmngr/ldap.c:233
 #, c-format
-msgid "start_cert_fetch: invalid pattern '%s'\n"
+msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
-#: dirmngr/ldap.c:846
+#: dirmngr/ldap.c:968
 #, c-format
 msgid "ldap_search hit the size limit of the server\n"
 msgstr ""
 
+#: dirmngr/ldapserver.c:119
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr ""
+
+#: dirmngr/ldapserver.c:181
+#, c-format
+msgid "%s:%u: ignoring unknown flag '%s'\n"
+msgstr ""
+
+#: dirmngr/ldapserver.c:203
+#, fuzzy, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr " s = πα�άλειψη αυτο� του κλειδιο�\n"
+
 #: dirmngr/misc.c:172
 #, fuzzy, c-format
 #| msgid "%s: invalid file version %d\n"
@@ -11196,88 +11015,88 @@ msgstr ""
 msgid "allocating list item failed: %s\n"
 msgstr "διαγ�αφή block κλειδιών απέτυχε: %s\n"
 
-#: dirmngr/ocsp.c:537 dirmngr/ocsp.c:724
+#: dirmngr/ocsp.c:538 dirmngr/ocsp.c:725
 #, fuzzy, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: dirmngr/ocsp.c:584
+#: dirmngr/ocsp.c:585
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:623 dirmngr/validate.c:648
+#: dirmngr/ocsp.c:624 dirmngr/validate.c:648
 #, fuzzy, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "το κλειδί '%s' δε β�έθηκε: %s\n"
 
-#: dirmngr/ocsp.c:633
+#: dirmngr/ocsp.c:634
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:640
+#: dirmngr/ocsp.c:641
 #, fuzzy, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "δημιου�γία ενός πιστοποιητικο� ανάκλησης"
 
-#: dirmngr/ocsp.c:650
+#: dirmngr/ocsp.c:651
 #, fuzzy, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "αποτυχία α�χικοποίησης της TrustDB: %s\n"
 
-#: dirmngr/ocsp.c:689
+#: dirmngr/ocsp.c:690
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:696
 #, fuzzy, c-format
 #| msgid "no default secret keyring: %s\n"
 msgid "no default OCSP signer defined\n"
 msgstr "δεν υπά�χει π�οκαθο�ισμένη κλειδοθήκη: %s\n"
 
-#: dirmngr/ocsp.c:702
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:707
+#: dirmngr/ocsp.c:708
 #, fuzzy, c-format
 #| msgid "using cipher %s\n"
 msgid "using OCSP responder '%s'\n"
 msgstr "χ�ήση του κ�υπταλγό�ιθμου: %s\n"
 
-#: dirmngr/ocsp.c:764
+#: dirmngr/ocsp.c:765
 #, fuzzy, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: dirmngr/ocsp.c:789
+#: dirmngr/ocsp.c:790
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:790
+#: dirmngr/ocsp.c:791
 msgid "good"
 msgstr ""
 
-#: dirmngr/ocsp.c:796
+#: dirmngr/ocsp.c:797
 #, fuzzy, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "ΣΗΜΕΙΩΣΗ: το κλειδί έχει ανακληθεί"
 
-#: dirmngr/ocsp.c:831
+#: dirmngr/ocsp.c:832
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:843
+#: dirmngr/ocsp.c:844
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:858
+#: dirmngr/ocsp.c:859
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr ""
@@ -11287,72 +11106,68 @@ msgstr ""
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "η υπογ�αφή απέτυχε: %s\n"
 
-#: dirmngr/server.c:1158
-msgid "ldapserver missing"
-msgstr ""
-
-#: dirmngr/server.c:1224
+#: dirmngr/server.c:1277
 msgid "serialno missing in cert ID"
 msgstr ""
 
-#: dirmngr/server.c:1387 dirmngr/server.c:1473 dirmngr/server.c:1909
-#: dirmngr/server.c:1980 dirmngr/server.c:2556 dirmngr/server.c:2571
+#: dirmngr/server.c:1440 dirmngr/server.c:1526 dirmngr/server.c:1963
+#: dirmngr/server.c:2034 dirmngr/server.c:2662 dirmngr/server.c:2677
 #, fuzzy, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "η υπογ�αφή απέτυχε: %s\n"
 
-#: dirmngr/server.c:1516
+#: dirmngr/server.c:1569
 #, fuzzy, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "διαγ�αφή block κλειδιών απέτυχε: %s\n"
 
-#: dirmngr/server.c:1528 dirmngr/server.c:1559 dirmngr/server.c:1718
+#: dirmngr/server.c:1581 dirmngr/server.c:1612 dirmngr/server.c:1772
 #, fuzzy, c-format
 msgid "error sending data: %s\n"
 msgstr "σφάλμα στη αποστολή π�ος το `%s': %s\n"
 
-#: dirmngr/server.c:1666
+#: dirmngr/server.c:1720
 #, fuzzy, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "διαγ�αφή block κλειδιών απέτυχε: %s\n"
 
-#: dirmngr/server.c:1699
+#: dirmngr/server.c:1753
 #, fuzzy, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "διαγ�αφή block κλειδιών απέτυχε: %s\n"
 
-#: dirmngr/server.c:1726
+#: dirmngr/server.c:1780
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:2860
+#: dirmngr/server.c:2966
 #, fuzzy, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "αδυναμία δημιου�γίας του `%s': %s\n"
 
-#: dirmngr/server.c:2871
+#: dirmngr/server.c:2977
 #, fuzzy, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "%s: αδυναμία δημιου�γίας hashtable: %s\n"
 
-#: dirmngr/server.c:2892
+#: dirmngr/server.c:2998
 #, fuzzy, c-format
 #| msgid "failed to initialize the TrustDB: %s\n"
 msgid "failed to initialize the server: %s\n"
 msgstr "αποτυχία α�χικοποίησης της TrustDB: %s\n"
 
-#: dirmngr/server.c:2900
+#: dirmngr/server.c:3006
 #, fuzzy, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "αποτυχία επαναδόμησης της cache κλειδοθήκης: %s\n"
 
-#: dirmngr/server.c:2933
+#: dirmngr/server.c:3039
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:2952
+#: dirmngr/server.c:3058
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -11501,73 +11316,73 @@ msgstr "ο gpg-agent δεν είναι διαθέσιμος σε αυτή τη Ï
 msgid "error sending standard options: %s\n"
 msgstr "σφάλμα στη αποστολή π�ος το `%s': %s\n"
 
-#: tools/gpgconf-comp.c:649
+#: tools/gpgconf-comp.c:655
 msgid "OpenPGP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:653
+#: tools/gpgconf-comp.c:659
 msgid "S/MIME"
 msgstr ""
 
-#: tools/gpgconf-comp.c:657
+#: tools/gpgconf-comp.c:663
 #, fuzzy
 msgid "Public Keys"
 msgstr "δημόσιο κλειδί είναι %08lX\n"
 
-#: tools/gpgconf-comp.c:661
+#: tools/gpgconf-comp.c:667
 msgid "Private Keys"
 msgstr ""
 
-#: tools/gpgconf-comp.c:665
+#: tools/gpgconf-comp.c:671
 msgid "Smartcards"
 msgstr ""
 
-#: tools/gpgconf-comp.c:669
+#: tools/gpgconf-comp.c:676
 msgid "TPM"
 msgstr ""
 
-#: tools/gpgconf-comp.c:673
+#: tools/gpgconf-comp.c:681
 #, fuzzy
 #| msgid "network error"
 msgid "Network"
 msgstr "σφάλμα δικτ�ου"
 
-#: tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:685
 #, fuzzy
 msgid "Passphrase Entry"
 msgstr "κακή φ�άση κλειδί"
 
-#: tools/gpgconf-comp.c:941
+#: tools/gpgconf-comp.c:951
 #, fuzzy
 msgid "Component not suitable for launching"
 msgstr "δεν β�έθηκε το δημόσιο κλειδί"
 
-#: tools/gpgconf-comp.c:947
+#: tools/gpgconf-comp.c:957
 #, c-format
 msgid "Configuration file of component %s is broken\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:950
+#: tools/gpgconf-comp.c:960
 #, fuzzy, c-format
 #| msgid "Please use the command \"toggle\" first.\n"
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr "Πα�ακαλώ χ�ησιμοποιείστε την εντολή \"toggle\" π�ώτα.\n"
 
-#: tools/gpgconf-comp.c:2816
+#: tools/gpgconf-comp.c:2826
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2946
+#: tools/gpgconf-comp.c:2956
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3543
+#: tools/gpgconf-comp.c:3553
 #, fuzzy, c-format
 msgid "error closing '%s'\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: tools/gpgconf-comp.c:3545
+#: tools/gpgconf-comp.c:3555
 #, fuzzy, c-format
 msgid "error parsing '%s'\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
@@ -11651,16 +11466,16 @@ msgid ""
 "Manage configuration options for tools of the @GNUPG@ system\n"
 msgstr ""
 
-#: tools/gpgconf.c:669 tools/gpgconf.c:704
+#: tools/gpgconf.c:703 tools/gpgconf.c:738
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:678 tools/gpgconf.c:728 tools/gpgconf.c:778
+#: tools/gpgconf.c:712 tools/gpgconf.c:762 tools/gpgconf.c:812
 #, fuzzy
 msgid "Component not found"
 msgstr "δεν β�έθηκε το δημόσιο κλειδί"
 
-#: tools/gpgconf.c:804
+#: tools/gpgconf.c:838
 #, fuzzy
 msgid "No argument allowed"
 msgstr "εγγ�αφή του μυστικο� κλειδιο� στο `%s'\n"
@@ -11676,88 +11491,189 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
-#: tools/gpg-card.c:2390
+#: tools/gpg-card.c:2407
 #, fuzzy, c-format
 msgid "Note: key %s is already stored on the card!\n"
 msgstr "πα�αλείφθηκε: μυστικό κλειδί ήδη πα�ών\n"
 
-#: tools/gpg-card.c:2393
+#: tools/gpg-card.c:2410
 #, fuzzy, c-format
 msgid "Note: Keys are already stored on the card!\n"
 msgstr "πα�αλείφθηκε: μυστικό κλειδί ήδη πα�ών\n"
 
-#: tools/gpg-card.c:2396
+#: tools/gpg-card.c:2413
 #, c-format
 msgid "Replace existing key %s ? (y/N) "
 msgstr ""
 
-#: tools/gpg-card.c:2549 tools/gpg-card.c:2712 tools/gpg-card.c:2935
-#: tools/gpg-card.c:3044
+#: tools/gpg-card.c:2566 tools/gpg-card.c:2729 tools/gpg-card.c:2952
+#: tools/gpg-card.c:3061
 #, c-format
 msgid "%s card no. %s detected\n"
 msgstr ""
 
-#: tools/gpg-card.c:3396
+#: tools/gpg-card.c:3413
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3406 tools/gpg-card.c:3420
+#: tools/gpg-card.c:3423 tools/gpg-card.c:3437
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
 "         can only be reverted using a factory reset!\n"
 msgstr ""
 
-#: tools/gpg-card.c:3423
+#: tools/gpg-card.c:3440
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3669
+#: tools/gpg-card.c:3686
 #, fuzzy
 msgid "authenticate to the card"
 msgstr "Πιστοποιητικό ανάκλησης δημιου�γήθηκε.\n"
 
-#: tools/gpg-card.c:3671
+#: tools/gpg-card.c:3688
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3673
+#: tools/gpg-card.c:3690
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication"
 msgstr "|Ο�ΟΜΑ|χ�ήση του Ο�ΟΜΑτος ως π�οκαθο�ισμένου πα�αλήπτη"
 
-#: tools/gpg-card.c:3675
+#: tools/gpg-card.c:3692
 #, fuzzy
 #| msgid "change the expire date"
 msgid "change a private data object"
 msgstr "αλλαγή της ημε�ομηνίας λήξης"
 
-#: tools/gpg-card.c:3676
+#: tools/gpg-card.c:3693
 #, fuzzy
 msgid "read a certificate from a data object"
 msgstr "Πιστοποιητικό ανάκλησης δημιου�γήθηκε.\n"
 
-#: tools/gpg-card.c:3677
+#: tools/gpg-card.c:3694
 #, fuzzy
 msgid "store a certificate to a data object"
 msgstr "Πιστοποιητικό ανάκλησης δημιου�γήθηκε.\n"
 
-#: tools/gpg-card.c:3678
+#: tools/gpg-card.c:3695
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3679
+#: tools/gpg-card.c:3696
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3681
+#: tools/gpg-card.c:3698
 msgid "manage the command history"
 msgstr ""
 
 #, fuzzy
+#~ msgid "requesting key %s from %s server %s\n"
+#~ msgstr "αίτηση κλειδιο� %08lX από το %s\n"
+
+#, fuzzy
+#~ msgid "%s:%u: no hostname given\n"
+#~ msgstr "(Δεν δώθηκε πε�ιγ�αφή)\n"
+
+#, fuzzy
+#~ msgid "could not parse keyserver\n"
+#~ msgstr "αδυναμία επεξε�γασίας του URI του διακομιση κλειδιών\n"
+
+#, fuzzy
+#~| msgid "|NAME|set terminal charset to NAME"
+#~ msgid "|NAME|connect to host NAME"
+#~ msgstr "|Ο�ΟΜΑ|καθο�ισμός του σετ χα�ακτή�ων τε�ματικο� σε Ο�ΟΜΑ"
+
+#, fuzzy
+#~| msgid "|NAME|use NAME as default recipient"
+#~ msgid "|NAME|use user NAME for authentication"
+#~ msgstr "|Ο�ΟΜΑ|χ�ήση του Ο�ΟΜΑτος ως π�οκαθο�ισμένου πα�αλήπτη"
+
+#, fuzzy
+#~| msgid "Usage: gpg [options] [files] (-h for help)"
+#~ msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
+#~ msgstr "Χ�ήση: gpg [επιλογές] [α�χεία] (-h για βοήθεια)"
+
+#, fuzzy
+#~| msgid "invalid import options\n"
+#~ msgid "invalid port number %d\n"
+#~ msgstr "μη έγκυ�ες επιλογές ειγαγωγής\n"
+
+#, fuzzy
+#~ msgid "error writing to stdout: %s\n"
+#~ msgstr "αδυναμία εγγ�αφής της κλειδοθήκης `%s': %s\n"
+
+#, fuzzy
+#~ msgid "attribute '%s' not found\n"
+#~ msgstr "το κλειδί '%s' δε β�έθηκε: %s\n"
+
+#, fuzzy
+#~| msgid "reading from `%s'\n"
+#~ msgid "processing url '%s'\n"
+#~ msgstr "ανάγνωση από `%s'\n"
+
+#, fuzzy
+#~| msgid "          w/o user IDs: %lu\n"
+#~ msgid "          user '%s'\n"
+#~ msgstr "          χω�ίς user ID: %lu\n"
+
+#, fuzzy
+#~ msgid "          pass '%s'\n"
+#~ msgstr "                γνωστό σαν \""
+
+#, fuzzy
+#~ msgid "          host '%s'\n"
+#~ msgstr "                γνωστό σαν \""
+
+#, fuzzy
+#~| msgid "          not imported: %lu\n"
+#~ msgid "          port %d\n"
+#~ msgstr "          μη  εισαχθέντα: %lu\n"
+
+#, fuzzy
+#~ msgid "            DN '%s'\n"
+#~ msgstr "                γνωστό σαν \""
+
+#, fuzzy
+#~ msgid "          attr '%s'\n"
+#~ msgstr "                γνωστό σαν \""
+
+#, fuzzy
+#~ msgid "no host name in '%s'\n"
+#~ msgstr "(Δεν δώθηκε πε�ιγ�αφή)\n"
+
+#, fuzzy
+#~| msgid "WARNING: using insecure memory!\n"
+#~ msgid "WARNING: using first attribute only\n"
+#~ msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: χ�ήση μη ασφαλο�ς μνήμης!\n"
+
+#, fuzzy
+#~ msgid "LDAP init to '%s:%d' failed: %s\n"
+#~ msgstr "θω�άκιση απέτυχε: %s\n"
+
+#, fuzzy
+#~ msgid "LDAP init to '%s' failed: %s\n"
+#~ msgstr "θω�άκιση απέτυχε: %s\n"
+
+#, fuzzy
+#~ msgid "LDAP init to '%s' done\n"
+#~ msgstr "θω�άκιση απέτυχε: %s\n"
+
+#, fuzzy
+#~ msgid "binding to '%s:%d' failed: %s\n"
+#~ msgstr "θω�άκιση απέτυχε: %s\n"
+
+#, fuzzy
+#~| msgid "dearmoring failed: %s\n"
+#~ msgid "searching '%s' failed: %s\n"
+#~ msgstr "αποθω�άκιση απέτυχε: %s\n"
+
+#, fuzzy
 #~ msgid "Suggest a random passphrase."
 #~ msgstr "αλλαγή της φ�άσης κλειδί"
 
diff --git a/po/en@boldquot.gmo b/po/en@boldquot.gmo
index 8ca958f..7b6a0db 100644
--- a/po/en@boldquot.gmo
+++ b/po/en@boldquot.gmo
diff --git a/po/en@boldquot.po b/po/en@boldquot.po
index e8d24aa..543aad1 100644
--- a/po/en@boldquot.po
+++ b/po/en@boldquot.po
@@ -30,10 +30,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gnupg 2.3.1\n"
+"Project-Id-Version: GNU gnupg 2.3.2\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2021-04-20 12:38+0200\n"
-"PO-Revision-Date: 2021-04-20 12:38+0200\n"
+"POT-Creation-Date: 2021-08-24 18:50+0200\n"
+"PO-Revision-Date: 2021-08-24 18:50+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:328
+#: agent/call-pinentry.c:338
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "failed to acquire the pinentry lock: %s\n"
@@ -53,45 +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:546
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_OK"
 msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:547
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_Cancel"
 msgstr "|pinentry-label|_Cancel"
 
-#: agent/call-pinentry.c:548
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|_Yes"
 msgstr "|pinentry-label|_Yes"
 
-#: agent/call-pinentry.c:549
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_No"
 msgstr "|pinentry-label|_No"
 
-#: agent/call-pinentry.c:550
+#: agent/call-pinentry.c:560
 msgid "|pinentry-label|PIN:"
 msgstr "|pinentry-label|PIN:"
 
-#: agent/call-pinentry.c:551
+#: agent/call-pinentry.c:561
 msgid "|pinentry-label|_Save in password manager"
 msgstr "|pinentry-label|_Save in password manager"
 
-#: agent/call-pinentry.c:552
+#: agent/call-pinentry.c:562
 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:554
+#: agent/call-pinentry.c:564
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr "|pinentry-tt|Make passphrase visible"
 
-#: agent/call-pinentry.c:555
+#: agent/call-pinentry.c:565
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "|pinentry-tt|Hide passphrase"
 
+#: agent/call-pinentry.c:566
+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:944
+#: agent/call-pinentry.c:1022
 msgid "Suggest"
 msgstr "Suggest"
 
@@ -102,13 +106,24 @@ 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:966
+#: agent/call-pinentry.c:1044
 msgid "pinentry.genpin.tooltip"
 msgstr "pinentry.genpin.tooltip"
 
+#: agent/call-pinentry.c:1072
+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
+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:998
+#: agent/call-pinentry.c:1198
 msgid "Quality:"
 msgstr "Quality:"
 
@@ -118,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:1019
+#: agent/call-pinentry.c:1219
 msgid "pinentry.qualitybar.tooltip"
 msgstr "pinentry.qualitybar.tooltip"
 
-#: agent/call-pinentry.c:1263
+#: agent/call-pinentry.c:1477
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
@@ -130,7 +145,7 @@ msgstr ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 
-#: agent/call-pinentry.c:1266
+#: agent/call-pinentry.c:1480
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -138,76 +153,76 @@ msgstr ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 
-#: agent/call-pinentry.c:1303 agent/call-pinentry.c:1506
+#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
 msgid "PIN:"
 msgstr "PIN:"
 
-#: agent/call-pinentry.c:1303 agent/call-pinentry.c:1506
-#: agent/protect-tool.c:728
+#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/protect-tool.c:729
 msgid "Passphrase:"
 msgstr "Passphrase:"
 
-#: agent/call-pinentry.c:1330 agent/call-pinentry.c:1580 agent/command.c:1799
-#: agent/command.c:1852 agent/command-ssh.c:3046 agent/genkey.c:398
+#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
+#: agent/command.c:1988 agent/command-ssh.c:3046 agent/genkey.c:442
 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:1351 agent/call-pinentry.c:1603
+#: agent/call-pinentry.c:1566 agent/call-pinentry.c:1830
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (try %d of %d)"
 
-#: agent/call-pinentry.c:1362 agent/call-pinentry.c:1614
+#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
 msgid "Repeat:"
 msgstr "Repeat:"
 
-#: agent/call-pinentry.c:1372 agent/call-pinentry.c:1384
-#: agent/call-pinentry.c:1624 agent/call-pinentry.c:1636
+#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
+#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
 msgid "PIN too long"
 msgstr "PIN too long"
 
-#: agent/call-pinentry.c:1373 agent/call-pinentry.c:1625
+#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
 msgid "Passphrase too long"
 msgstr "Passphrase too long"
 
-#: agent/call-pinentry.c:1381 agent/call-pinentry.c:1633
+#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
 msgid "Invalid characters in PIN"
 msgstr "Invalid characters in PIN"
 
-#: agent/call-pinentry.c:1386 agent/call-pinentry.c:1638
+#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
 msgid "PIN too short"
 msgstr "PIN too short"
 
-#: agent/call-pinentry.c:1405 agent/call-pinentry.c:1656
+#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
 msgid "Bad PIN"
 msgstr "Bad PIN"
 
-#: agent/call-pinentry.c:1405 agent/call-pinentry.c:1656
+#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
 msgid "Bad Passphrase"
 msgstr "Bad Passphrase"
 
-#: agent/command.c:697
+#: agent/command.c:823
 msgid "Note: Request from the web browser."
 msgstr "Note: Request from the web browser."
 
-#: agent/command.c:698
+#: agent/command.c:824
 msgid "Note: Request from a remote site."
 msgstr "Note: Request from a remote site."
 
-#: agent/command.c:1106 g10/card-util.c:708 g10/card-util.c:729
+#: agent/command.c:1235 g10/card-util.c:713 g10/card-util.c:734
 #, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "error getting serial number of card: %s\n"
 
-#: agent/command.c:1634 agent/command.c:1791 agent/command-ssh.c:2974
-#: agent/genkey.c:333
+#: agent/command.c:1756 agent/command.c:1921 agent/command-ssh.c:2974
+#: agent/genkey.c:377
 msgid "Please re-enter this passphrase"
 msgstr "Please re-enter this passphrase"
 
-#: agent/command.c:2567
+#: agent/command.c:2703
 #, c-format
 msgid ""
 "Please enter the passphrase to protect the imported object within the %s "
@@ -216,7 +231,7 @@ msgstr ""
 "Please enter the passphrase to protect the imported object within the %s "
 "system."
 
-#: agent/command.c:2697
+#: agent/command.c:2833
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -229,25 +244,25 @@ msgstr ""
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ssh keys greater than %d bits are not supported\n"
 
-#: agent/command-ssh.c:872 common/dotlock.c:852 g10/card-util.c:953
-#: g10/export.c:1329 g10/gpg.c:1431 g10/keygen.c:5347 g10/keyring.c:1319
-#: g10/keyring.c:1632 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
+#: agent/command-ssh.c:872 common/dotlock.c:852 g10/card-util.c:963
+#: g10/export.c:1329 g10/gpg.c:1431 g10/keygen.c:5377 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
 #: g10/sign.c:1106 g10/sign.c:1443 g10/tdbio.c:753 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:884 common/helpfile.c:57 g10/card-util.c:910
+#: agent/command-ssh.c:884 common/helpfile.c:57 g10/card-util.c:920
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
 #: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:721 g10/gpg.c:1432
-#: g10/import.c:371 g10/import.c:558 g10/import.c:793 g10/keygen.c:4322
-#: g10/keyring.c:1658 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
+#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4326
+#: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
 #: g10/plaintext.c:610 g10/sign.c:1086 g10/sign.c:1311 g10/sign.c:1424
 #: g10/sign.c:1596 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2380
-#: sm/gpgsm.c:2410 sm/gpgsm.c:2448 sm/keylist.c:1737 sm/qualified.c:65
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2236
+#: sm/gpgsm.c:2266 sm/gpgsm.c:2304 sm/keylist.c:1775 sm/qualified.c:65
 #: dirmngr/certcache.c:396 dirmngr/certcache.c:476 dirmngr/certcache.c:478
-#: dirmngr/crlcache.c:2588 dirmngr/dirmngr.c:1720 tools/gpg-card.c:408
+#: dirmngr/crlcache.c:2591 dirmngr/dirmngr.c:1759 tools/gpg-card.c:408
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "can't open '%s': %s\n"
@@ -353,28 +368,28 @@ msgstr "PIN not correctly repeated; try again"
 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:109 sm/certreqgen-ui.c:433
+#: 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:116
+#: agent/genkey.c:150
 #, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "error writing to temporary file: %s\n"
 
-#: agent/genkey.c:154
+#: agent/genkey.c:191
 msgid "Enter new passphrase"
 msgstr "Enter new passphrase"
 
-#: agent/genkey.c:184
+#: agent/genkey.c:227
 #, 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:186
+#: agent/genkey.c:229
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -383,18 +398,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:198
+#: agent/genkey.c:241
 msgid "Yes, protection is not needed"
 msgstr "Yes, protection is not needed"
 
-#: agent/genkey.c:215
+#: agent/genkey.c:258
 #, 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:234
+#: agent/genkey.c:277
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -404,232 +419,231 @@ msgstr[0] ""
 msgstr[1] ""
 "A passphrase should contain at least %u digits or%%0Aspecial characters."
 
-#: agent/genkey.c:260
+#: agent/genkey.c:304
 #, 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:275
+#: agent/genkey.c:319
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "Warning: You have entered an insecure passphrase."
 
-#: agent/genkey.c:296
+#: agent/genkey.c:340
 msgid "Take this one anyway"
 msgstr "Take this one anyway"
 
-#: agent/genkey.c:464
+#: agent/genkey.c:508
 #, 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:590
+#: agent/genkey.c:637
 msgid "Please enter the new passphrase"
 msgstr "Please enter the new passphrase"
 
-#: agent/gpg-agent.c:162 scd/scdaemon.c:115 dirmngr/dirmngr.c:182
+#: agent/gpg-agent.c:164 scd/scdaemon.c:115 dirmngr/dirmngr.c:183
 msgid "Options used for startup"
 msgstr "Options used for startup"
 
-#: agent/gpg-agent.c:164 scd/scdaemon.c:120 dirmngr/dirmngr.c:171
+#: agent/gpg-agent.c:166 scd/scdaemon.c:120 dirmngr/dirmngr.c:172
 msgid "run in daemon mode (background)"
 msgstr "run in daemon mode (background)"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:117 dirmngr/dirmngr.c:170
+#: agent/gpg-agent.c:167 scd/scdaemon.c:117 dirmngr/dirmngr.c:171
 msgid "run in server mode (foreground)"
 msgstr "run in server mode (foreground)"
 
-#: agent/gpg-agent.c:167 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:169 dirmngr/dirmngr.c:174
 msgid "run in supervised mode"
 msgstr "run in supervised mode"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:121 dirmngr/dirmngr.c:184
+#: agent/gpg-agent.c:171 scd/scdaemon.c:121 dirmngr/dirmngr.c:185
 msgid "do not detach from the console"
 msgstr "do not detach from the console"
 
-#: agent/gpg-agent.c:170 scd/scdaemon.c:122 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:172 scd/scdaemon.c:122 dirmngr/dirmngr.c:186
 msgid "sh-style command output"
 msgstr "sh-style command output"
 
-#: agent/gpg-agent.c:171 scd/scdaemon.c:123 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:173 scd/scdaemon.c:123 dirmngr/dirmngr.c:187
 msgid "csh-style command output"
 msgstr "csh-style command output"
 
-#: agent/gpg-agent.c:179 g10/gpg.c:589 scd/scdaemon.c:125 sm/gpgsm.c:422
-#: dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:181 g10/gpg.c:589 scd/scdaemon.c:125 sm/gpgsm.c:423
+#: dirmngr/dirmngr.c:189
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|read options from FILE"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:574 scd/scdaemon.c:129 sm/gpgsm.c:265
-#: dirmngr/dirmngr.c:192
+#: agent/gpg-agent.c:185 g10/gpg.c:574 scd/scdaemon.c:129 sm/gpgsm.c:265
+#: dirmngr/dirmngr.c:193
 msgid "Options controlling the diagnostic output"
 msgstr "Options controlling the diagnostic output"
 
-#: agent/gpg-agent.c:185 g10/gpg.c:576 g10/gpgv.c:78 kbx/kbxutil.c:89
+#: agent/gpg-agent.c:187 g10/gpg.c:576 g10/gpgv.c:78 kbx/kbxutil.c:89
 #: scd/scdaemon.c:131 sm/gpgsm.c:267 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:194 dirmngr/dirmngr_ldap.c:102
-#: tools/gpg-connect-agent.c:85 tools/gpgconf.c:111
+#: dirmngr/dirmngr.c:195 tools/gpg-connect-agent.c:85 tools/gpgconf.c:111
 msgid "verbose"
 msgstr "verbose"
 
-#: agent/gpg-agent.c:186 g10/gpg.c:578 g10/gpgv.c:79 kbx/kbxutil.c:90
+#: agent/gpg-agent.c:188 g10/gpg.c:578 g10/gpgv.c:79 kbx/kbxutil.c:90
 #: scd/scdaemon.c:132 sm/gpgsm.c:269 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:195 dirmngr/dirmngr_ldap.c:103
+#: dirmngr/dirmngr.c:196
 msgid "be somewhat more quiet"
 msgstr "be somewhat more quiet"
 
-#: agent/gpg-agent.c:194 g10/gpg.c:593 sm/gpgsm.c:283 dirmngr/dirmngr.c:205
+#: agent/gpg-agent.c:196 g10/gpg.c:593 sm/gpgsm.c:283 dirmngr/dirmngr.c:206
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FILE|write server mode logs to FILE"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 scd/scdaemon.c:146 sm/gpgsm.c:290
-#: dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:599 scd/scdaemon.c:146 sm/gpgsm.c:290
+#: dirmngr/dirmngr.c:210
 msgid "Options controlling the configuration"
 msgstr "Options controlling the configuration"
 
-#: agent/gpg-agent.c:201
+#: agent/gpg-agent.c:203
 msgid "do not use the SCdaemon"
 msgstr "do not use the SCdaemon"
 
-#: agent/gpg-agent.c:203
+#: agent/gpg-agent.c:205
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|use PGM as the SCdaemon program"
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr "|PGM|use PGM as the tpm2daemon program"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|accept some commands via NAME"
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 msgid "ignore requests to change the TTY"
 msgstr "ignore requests to change the TTY"
 
-#: agent/gpg-agent.c:215
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the X display"
 msgstr "ignore requests to change the X display"
 
-#: agent/gpg-agent.c:216
+#: agent/gpg-agent.c:218
 msgid "enable ssh support"
 msgstr "enable ssh support"
 
-#: agent/gpg-agent.c:218
+#: agent/gpg-agent.c:220
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "|ALGO|use ALGO to show ssh fingerprints"
 
-#: agent/gpg-agent.c:221
+#: agent/gpg-agent.c:223
 msgid "enable putty support"
 msgstr "enable putty support"
 
-#: agent/gpg-agent.c:233 g10/gpg.c:844 scd/scdaemon.c:176 sm/gpgsm.c:382
+#: agent/gpg-agent.c:235 g10/gpg.c:844 scd/scdaemon.c:176 sm/gpgsm.c:383
 msgid "Options controlling the security"
 msgstr "Options controlling the security"
 
-#: agent/gpg-agent.c:236
+#: agent/gpg-agent.c:238
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|expire cached PINs after N seconds"
 
-#: agent/gpg-agent.c:238
+#: agent/gpg-agent.c:240
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|expire SSH keys after N seconds"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:242
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|set maximum PIN cache lifetime to N seconds"
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:244
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr "|N|set maximum SSH key lifetime to N seconds"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:246
 msgid "do not use the PIN cache when signing"
 msgstr "do not use the PIN cache when signing"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:248
 msgid "disallow the use of an external password cache"
 msgstr "disallow the use of an external password cache"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:250
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "disallow clients to mark keys as “trusted�"
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:253
 msgid "allow presetting passphrase"
 msgstr "allow presetting passphrase"
 
-#: agent/gpg-agent.c:256
+#: agent/gpg-agent.c:258
 msgid "Options enforcing a passphrase policy"
 msgstr "Options enforcing a passphrase policy"
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:261
 msgid "do not allow bypassing the passphrase policy"
 msgstr "do not allow bypassing the passphrase policy"
 
-#: agent/gpg-agent.c:261
+#: agent/gpg-agent.c:263
 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:263
+#: agent/gpg-agent.c:265
 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:266
+#: agent/gpg-agent.c:268
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr "|FILE|check new passphrases against pattern in FILE"
 
-#: agent/gpg-agent.c:268
+#: agent/gpg-agent.c:272
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|expire the passphrase after N days"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:274
 msgid "do not allow the reuse of old passphrases"
 msgstr "do not allow the reuse of old passphrases"
 
-#: agent/gpg-agent.c:273
+#: agent/gpg-agent.c:277
 msgid "Options controlling the PIN-Entry"
 msgstr "Options controlling the PIN-Entry"
 
-#: agent/gpg-agent.c:275
+#: agent/gpg-agent.c:279
 msgid "never use the PIN-entry"
 msgstr "never use the PIN-entry"
 
-#: agent/gpg-agent.c:277
+#: agent/gpg-agent.c:281
 msgid "disallow caller to override the pinentry"
 msgstr "disallow caller to override the pinentry"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:283
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr "let PIN-Entry grab keyboard and mouse"
 
-#: agent/gpg-agent.c:282
+#: agent/gpg-agent.c:286
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|use PGM as the PIN-Entry program"
 
-#: agent/gpg-agent.c:286
+#: agent/gpg-agent.c:290
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|set the Pinentry timeout to N seconds"
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:294
 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:551 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: agent/gpg-agent.c:557 agent/preset-passphrase.c:99 agent/protect-tool.c:154
 #: g10/gpg.c:1132 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:612 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:438
-#: dirmngr/dirmngr_ldap.c:175 tools/gpg-connect-agent.c:220 tools/gpgconf.c:151
+#: sm/gpgsm.c:613 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:446
+#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:151
 #: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Please report bugs to <@EMAIL@>.\n"
 
-#: agent/gpg-agent.c:560
+#: agent/gpg-agent.c:566
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Usage: @GPG_AGENT@ [options] (-h for help)"
 
-#: agent/gpg-agent.c:562
+#: agent/gpg-agent.c:568
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -637,131 +651,131 @@ msgstr ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 
-#: agent/gpg-agent.c:607 g10/gpg.c:1337 scd/scdaemon.c:384 sm/gpgsm.c:760
-#: dirmngr/dirmngr.c:522
+#: agent/gpg-agent.c:613 g10/gpg.c:1337 scd/scdaemon.c:384 sm/gpgsm.c:761
+#: dirmngr/dirmngr.c:530
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "invalid debug-level ‘%s’ given\n"
 
-#: agent/gpg-agent.c:972 g10/gpg.c:3910 g10/gpg.c:3934 sm/gpgsm.c:1769
-#: sm/gpgsm.c:1775
+#: agent/gpg-agent.c:986 g10/gpg.c:3907 g10/gpg.c:3931 sm/gpgsm.c:1622
+#: sm/gpgsm.c:1628
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "selected digest algorithm is invalid\n"
 
-#: agent/gpg-agent.c:1196 agent/gpg-agent.c:2019 common/comopt.c:93
-#: g10/gpg.c:2591 scd/scdaemon.c:549 sm/gpgsm.c:1155 dirmngr/dirmngr.c:989
-#: dirmngr/dirmngr.c:1840
+#: agent/gpg-agent.c:1210 agent/gpg-agent.c:2035 common/comopt.c:93
+#: g10/gpg.c:2594 scd/scdaemon.c:549 sm/gpgsm.c:1028 dirmngr/dirmngr.c:1029
+#: dirmngr/dirmngr.c:1879
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "reading options from ‘%s’\n"
 
-#: agent/gpg-agent.c:1335 g10/gpg.c:3861 scd/scdaemon.c:687 sm/gpgsm.c:1709
-#: dirmngr/dirmngr.c:1108 tools/gpg-connect-agent.c:1270 tools/gpgconf.c:634
+#: agent/gpg-agent.c:1349 g10/gpg.c:3858 scd/scdaemon.c:687 sm/gpgsm.c:1562
+#: dirmngr/dirmngr.c:1145 tools/gpg-connect-agent.c:1270 tools/gpgconf.c:668
 #, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr "Note: ‘%s’ is not considered an option\n"
 
-#: agent/gpg-agent.c:2172 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1267
+#: agent/gpg-agent.c:2188 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1306
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "can't create socket: %s\n"
 
-#: agent/gpg-agent.c:2189 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1280
+#: agent/gpg-agent.c:2205 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1319
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "socket name ‘%s’ is too long\n"
 
-#: agent/gpg-agent.c:2228
+#: agent/gpg-agent.c:2244
 #, 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:2239 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1312
+#: agent/gpg-agent.c:2255 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1351
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "error getting nonce for the socket\n"
 
-#: agent/gpg-agent.c:2244 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1315
+#: agent/gpg-agent.c:2260 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1354
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "error binding socket to '%s': %s\n"
 
-#: agent/gpg-agent.c:2255 agent/gpg-agent.c:2295 agent/gpg-agent.c:2304
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1324
+#: agent/gpg-agent.c:2271 agent/gpg-agent.c:2311 agent/gpg-agent.c:2320
+#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1363
 #, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "can't set permissions of '%s': %s\n"
 
-#: agent/gpg-agent.c:2269 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1336
+#: agent/gpg-agent.c:2285 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1375
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "listening on socket ‘%s’\n"
 
-#: agent/gpg-agent.c:2289 agent/gpg-agent.c:2342 common/homedir.c:517
+#: agent/gpg-agent.c:2305 agent/gpg-agent.c:2358 common/homedir.c:537
 #: 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:2292 agent/gpg-agent.c:2347 common/homedir.c:520
+#: agent/gpg-agent.c:2308 agent/gpg-agent.c:2363 common/homedir.c:540
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "directory ‘%s’ created\n"
 
-#: agent/gpg-agent.c:2353
+#: agent/gpg-agent.c:2369
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "stat() failed for '%s': %s\n"
 
-#: agent/gpg-agent.c:2357
+#: agent/gpg-agent.c:2373
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "can't use ‘%s’ as home directory\n"
 
-#: agent/gpg-agent.c:2512 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2069
+#: agent/gpg-agent.c:2528 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2108
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "error reading nonce on fd %d: %s\n"
 
-#: agent/gpg-agent.c:2719
+#: agent/gpg-agent.c:2735
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "handler 0x%lx for fd %d started\n"
 
-#: agent/gpg-agent.c:2724
+#: agent/gpg-agent.c:2740
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "handler 0x%lx for fd %d terminated\n"
 
-#: agent/gpg-agent.c:2799
+#: agent/gpg-agent.c:2815
 #, 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:2804
+#: agent/gpg-agent.c:2820
 #, 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:3026 scd/scdaemon.c:1374 dirmngr/dirmngr.c:2283
+#: agent/gpg-agent.c:3042 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2322
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "npth_pselect failed: %s - waiting 1s\n"
 
-#: agent/gpg-agent.c:3114 scd/scdaemon.c:1439
+#: agent/gpg-agent.c:3130 scd/scdaemon.c:1441
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s stopped\n"
 
-#: agent/gpg-agent.c:3252 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3271 common/simple-pwquery.c:247 g10/call-agent.c:260
 #: sm/call-agent.c:131 tools/gpg-connect-agent.c:2319 tools/card-call-scd.c:311
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "no gpg-agent running in this session\n"
 
-#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:70
+#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:66
 msgid ""
 "@Options:\n"
 " "
@@ -782,7 +796,7 @@ msgstr ""
 "Password cache maintenance\n"
 
 #: agent/protect-tool.c:107 g10/gpg.c:448 kbx/kbxutil.c:72 sm/gpgsm.c:215
-#: dirmngr/dirmngr.c:168 tools/gpgconf.c:81
+#: dirmngr/dirmngr.c:169 tools/gpgconf.c:81
 msgid ""
 "@Commands:\n"
 " "
@@ -813,15 +827,15 @@ msgstr ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 
-#: agent/protect-tool.c:707
+#: agent/protect-tool.c:708 sm/import.c:775
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Please enter the passphrase to unprotect the PKCS#12 object."
 
-#: agent/protect-tool.c:712
+#: agent/protect-tool.c:713 sm/export.c:727
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Please enter the passphrase to protect the new PKCS#12 object."
 
-#: agent/protect-tool.c:718
+#: agent/protect-tool.c:719
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
@@ -829,7 +843,7 @@ msgstr ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 
-#: agent/protect-tool.c:723
+#: agent/protect-tool.c:724
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -837,17 +851,17 @@ msgstr ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 
-#: agent/protect-tool.c:734
+#: agent/protect-tool.c:735
 #, c-format
 msgid "cancelled\n"
 msgstr "cancelled\n"
 
-#: agent/protect-tool.c:736
+#: agent/protect-tool.c:737
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "error while asking for the passphrase: %s\n"
 
-#: agent/trustlist.c:153 agent/trustlist.c:363 tools/gpgconf.c:424
+#: agent/trustlist.c:153 agent/trustlist.c:363 tools/gpgconf.c:458
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "error opening '%s': %s\n"
@@ -1009,7 +1023,7 @@ msgstr "checking created signature failed: %s\n"
 msgid "secret key parts are not available\n"
 msgstr "secret key parts are not available\n"
 
-#: agent/cvt-openpgp.c:343 g10/card-util.c:1562
+#: agent/cvt-openpgp.c:343 g10/card-util.c:1575
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr "public key algorithm %d (%s) is not supported\n"
@@ -1038,7 +1052,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:505 common/exechelp-posix.c:580
-#: common/exechelp-posix.c:866 dirmngr/dirmngr.c:1354
+#: common/exechelp-posix.c:866 dirmngr/dirmngr.c:1393
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "error forking process: %s\n"
@@ -1110,7 +1124,7 @@ msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "renaming ‘%s’ to ‘%s’ failed: %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3082
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3099
 msgid "yes"
 msgstr "yes"
 
@@ -1164,7 +1178,7 @@ msgstr "out of core in secure memory while allocating %lu bytes"
 msgid "out of core while allocating %lu bytes"
 msgstr "out of core while allocating %lu bytes"
 
-#: common/miscellaneous.c:115 g10/card-util.c:917 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:927 tools/no-libgcrypt.c:30
 #: tools/gpg-card.c:416
 #, c-format
 msgid "error allocating enough memory: %s\n"
@@ -1235,7 +1249,7 @@ msgstr "error getting version from '%s': %s\n"
 msgid "server '%s' is older than us (%s < %s)"
 msgstr "server ‘%s’ is older than us (%s < %s)"
 
-#: common/asshelp.c:737 g10/call-dirmngr.c:408
+#: common/asshelp.c:737 g10/call-dirmngr.c:407
 #, c-format
 msgid "WARNING: %s\n"
 msgstr "WARNING: %s\n"
@@ -1318,7 +1332,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:4212
+#: scd/app-openpgp.c:4214
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "unsupported algorithm: %s"
@@ -1393,11 +1407,11 @@ msgstr "Certificate chain valid"
 msgid "Root certificate trustworthy"
 msgstr "Root certificate trustworthy"
 
-#: common/audit.c:1112 sm/certchain.c:1242
+#: common/audit.c:1112 sm/certchain.c:1243
 msgid "no CRL found for certificate"
 msgstr "no CRL found for certificate"
 
-#: common/audit.c:1115 sm/certchain.c:1252
+#: common/audit.c:1115 sm/certchain.c:1253
 msgid "the available CRL is too old"
 msgstr "the available CRL is too old"
 
@@ -1443,22 +1457,22 @@ msgstr "[none]"
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "invalid radix64 character %02x skipped\n"
 
-#: common/ttyio.c:433
+#: common/ttyio.c:447
 #, c-format
 msgid "Sorry, we are in batchmode - can't get input\n"
 msgstr "Sorry, we are in batchmode - can't get input\n"
 
-#: common/ttyio.c:439
+#: common/ttyio.c:453
 #, c-format
 msgid "Sorry, no terminal at all requested - can't get input\n"
 msgstr "Sorry, no terminal at all requested - can't get input\n"
 
-#: common/ttyio.c:474 common/ttyio.c:484
+#: common/ttyio.c:488 common/ttyio.c:498
 #, c-format
 msgid "too many errors; giving up\n"
 msgstr "too many errors; giving up\n"
 
-#: common/ttyio.c:536
+#: common/ttyio.c:550
 #, c-format
 msgid "Control-D detected\n"
 msgstr "Control-D detected\n"
@@ -1512,8 +1526,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:1036 dirmngr/dirmngr.c:895
-#: dirmngr/dirmngr.c:904
+#: common/init.c:191 sm/gpgsm.c:909 dirmngr/dirmngr.c:935 dirmngr/dirmngr.c:944
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s is too old (need %s, have %s)\n"
@@ -1664,7 +1677,7 @@ msgid "Enter passphrase: "
 msgstr "Enter passphrase: "
 
 #: g10/call-agent.c:318 g10/encrypt.c:282 g10/encrypt.c:818 g10/sign.c:473
-#: sm/call-agent.c:180 sm/encrypt.c:701 sm/sign.c:436
+#: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
 #, c-format
 msgid "%s is not compliant with %s mode\n"
 msgstr "%s is not compliant with %s mode\n"
@@ -1674,213 +1687,213 @@ msgstr "%s is not compliant with %s mode\n"
 msgid "error from TPM: %s\n"
 msgstr "error from TPM: %s\n"
 
-#: g10/call-agent.c:2123 g10/passphrase.c:225 g10/passphrase.c:258
-#: tools/card-call-scd.c:1751
+#: g10/call-agent.c:2135 g10/passphrase.c:233 g10/passphrase.c:266
+#: tools/card-call-scd.c:1755
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problem with the agent: %s\n"
 
-#: g10/call-dirmngr.c:179 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2316
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2316
 #, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "no dirmngr running in this session\n"
 
-#: g10/call-dirmngr.c:213
+#: g10/call-dirmngr.c:212
 #, c-format
 msgid "keyserver option \"honor-keyserver-url\" may not be used in Tor mode\n"
 msgstr ""
 "keyserver option “honor-keyserver-url� may not be used in Tor mode\n"
 
-#: g10/call-dirmngr.c:386
+#: g10/call-dirmngr.c:385
 msgid "WKD uses a cached result"
 msgstr "WKD uses a cached result"
 
-#: g10/call-dirmngr.c:389
+#: g10/call-dirmngr.c:388
 msgid "Tor is not running"
 msgstr "Tor is not running"
 
-#: g10/call-dirmngr.c:391
+#: g10/call-dirmngr.c:390
 msgid "Tor is not properly configured"
 msgstr "Tor is not properly configured"
 
-#: g10/call-dirmngr.c:393
+#: g10/call-dirmngr.c:392
 msgid "DNS is not properly configured"
 msgstr "DNS is not properly configured"
 
-#: g10/call-dirmngr.c:395
+#: g10/call-dirmngr.c:394
 msgid "unacceptable HTTP redirect from server"
 msgstr "unacceptable HTTP redirect from server"
 
-#: g10/call-dirmngr.c:397
+#: g10/call-dirmngr.c:396
 msgid "unacceptable HTTP redirect from server was cleaned up"
 msgstr "unacceptable HTTP redirect from server was cleaned up"
 
-#: g10/call-dirmngr.c:399
+#: g10/call-dirmngr.c:398
 msgid "server uses an invalid certificate"
 msgstr "server uses an invalid certificate"
 
-#: g10/call-dirmngr.c:406 g10/gpg.c:4599
+#: g10/call-dirmngr.c:405 g10/gpg.c:4596
 #, c-format
 msgid "Note: %s\n"
 msgstr "Note: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:369 g10/card-util.c:1924
-#: tools/gpg-card.c:3039
+#: g10/card-util.c:86 g10/card-util.c:374 g10/card-util.c:1937
+#: tools/gpg-card.c:3056
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP card not available: %s\n"
 
-#: g10/card-util.c:91 g10/card-util.c:1930
+#: g10/card-util.c:91 g10/card-util.c:1943
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP card no. %s detected\n"
 
-#: g10/card-util.c:97 g10/card-util.c:2309 g10/delkey.c:164 g10/keyedit.c:1428
-#: g10/keygen.c:4791 g10/revoke.c:214 g10/revoke.c:638
+#: g10/card-util.c:97 g10/card-util.c:2322 g10/delkey.c:164 g10/keyedit.c:1428
+#: g10/keygen.c:4795 g10/revoke.c:214 g10/revoke.c:639
 #, c-format
 msgid "can't do this in batch mode\n"
 msgstr "can't do this in batch mode\n"
 
-#: g10/card-util.c:105 tools/gpg-card.c:2943
+#: g10/card-util.c:105 tools/gpg-card.c:2960
 #, c-format
 msgid "This command is only available for version 2 cards\n"
 msgstr "This command is only available for version 2 cards\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3398 tools/gpg-card.c:2948
+#: g10/card-util.c:107 scd/app-openpgp.c:3399 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"
 
-#: g10/card-util.c:140 g10/card-util.c:1448 g10/card-util.c:1710
-#: g10/card-util.c:1802 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1991 g10/keygen.c:2165 g10/keygen.c:2385 g10/keygen.c:2685
+#: g10/card-util.c:140 g10/card-util.c:1458 g10/card-util.c:1723
+#: g10/card-util.c:1815 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/keygen.c:1992 g10/keygen.c:2166 g10/keygen.c:2386 g10/keygen.c:2686
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
 #: tools/gpg-card.c:510
 msgid "Your selection? "
 msgstr "Your selection? "
 
-#: g10/card-util.c:262 g10/card-util.c:313 tools/gpg-card.c:596
+#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:596
 #: tools/gpg-card.c:636
 msgid "[not set]"
 msgstr "[not set]"
 
-#: g10/card-util.c:558 tools/gpg-card.c:903
+#: g10/card-util.c:563 tools/gpg-card.c:905
 msgid "Mr."
 msgstr "Mr."
 
-#: g10/card-util.c:559 tools/gpg-card.c:904
+#: g10/card-util.c:564 tools/gpg-card.c:906
 msgid "Ms."
 msgstr "Ms."
 
-#: g10/card-util.c:586 tools/gpg-card.c:931
+#: g10/card-util.c:591 tools/gpg-card.c:933
 msgid "not forced"
 msgstr "not forced"
 
-#: g10/card-util.c:586 tools/gpg-card.c:931
+#: g10/card-util.c:591 tools/gpg-card.c:933
 msgid "forced"
 msgstr "forced"
 
-#: g10/card-util.c:768 tools/gpg-card.c:1468
+#: g10/card-util.c:773 tools/gpg-card.c:1484
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Error: Only plain ASCII is currently allowed.\n"
 
-#: g10/card-util.c:770 tools/gpg-card.c:1470
+#: g10/card-util.c:775 tools/gpg-card.c:1486
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Error: The “<� character may not be used.\n"
 
-#: g10/card-util.c:772 tools/gpg-card.c:1472
+#: g10/card-util.c:777 tools/gpg-card.c:1488
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Error: Double spaces are not allowed.\n"
 
-#: g10/card-util.c:789 tools/gpg-card.c:1505
+#: g10/card-util.c:795 tools/gpg-card.c:1521
 msgid "Cardholder's surname: "
 msgstr "Cardholder's surname: "
 
-#: g10/card-util.c:791 tools/gpg-card.c:1506
+#: g10/card-util.c:797 tools/gpg-card.c:1522
 msgid "Cardholder's given name: "
 msgstr "Cardholder's given name: "
 
-#: g10/card-util.c:809 tools/gpg-card.c:1523
+#: g10/card-util.c:816 tools/gpg-card.c:1539
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Error: Combined name too long (limit is %d characters).\n"
 
-#: g10/card-util.c:830 tools/gpg-card.c:1561
+#: g10/card-util.c:840 tools/gpg-card.c:1577
 msgid "URL to retrieve public key: "
 msgstr "URL to retrieve public key: "
 
-#: g10/card-util.c:926 g10/decrypt-data.c:495 g10/import.c:406 g10/import.c:756
-#: g10/import.c:815 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1666
-#: tools/gpgconf.c:437 tools/gpgconf.c:483 tools/gpg-card.c:426
+#: g10/card-util.c:936 g10/decrypt-data.c:495 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:1705
+#: tools/gpgconf.c:471 tools/gpgconf.c:517 tools/gpg-card.c:426
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "error reading '%s': %s\n"
 
-#: g10/card-util.c:959 g10/decrypt-data.c:498 g10/export.c:2496
+#: g10/card-util.c:969 g10/decrypt-data.c:498 g10/export.c:2496
 #: dirmngr/crlcache.c:925 tools/gpg-card.c:486 tools/gpg-card.c:493
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr "error writing '%s': %s\n"
 
-#: g10/card-util.c:986 tools/gpg-card.c:1650
+#: g10/card-util.c:996 tools/gpg-card.c:1666
 msgid "Login data (account name): "
 msgstr "Login data (account name): "
 
-#: g10/card-util.c:1024 tools/gpg-card.c:1945
+#: g10/card-util.c:1034 tools/gpg-card.c:1962
 msgid "Private DO data: "
 msgstr "Private DO data: "
 
-#: g10/card-util.c:1109 tools/gpg-card.c:1699
+#: g10/card-util.c:1119 tools/gpg-card.c:1715
 msgid "Language preferences: "
 msgstr "Language preferences: "
 
-#: g10/card-util.c:1117 tools/gpg-card.c:1710
+#: g10/card-util.c:1127 tools/gpg-card.c:1726
 #, c-format
 msgid "Error: invalid length of preference string.\n"
 msgstr "Error: invalid length of preference string.\n"
 
-#: g10/card-util.c:1126 tools/gpg-card.c:1719
+#: g10/card-util.c:1136 tools/gpg-card.c:1735
 #, c-format
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Error: invalid characters in preference string.\n"
 
-#: g10/card-util.c:1148 tools/gpg-card.c:1753
+#: g10/card-util.c:1158 tools/gpg-card.c:1769
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr "Salutation (M = Mr., F = Ms., or space): "
 
-#: g10/card-util.c:1162 tools/gpg-card.c:1770
+#: g10/card-util.c:1172 tools/gpg-card.c:1786
 msgid "Error: invalid response.\n"
 msgstr "Error: invalid response.\n"
 
-#: g10/card-util.c:1185 tools/gpg-card.c:1835
+#: g10/card-util.c:1195 tools/gpg-card.c:1852
 msgid "CA fingerprint: "
 msgstr "CA fingerprint: "
 
-#: g10/card-util.c:1209 tools/gpg-card.c:1861
+#: g10/card-util.c:1219 tools/gpg-card.c:1878
 #, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Error: invalid formatted fingerprint.\n"
 
-#: g10/card-util.c:1259
+#: g10/card-util.c:1269
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "key operation not possible: %s\n"
 
-#: g10/card-util.c:1260
+#: g10/card-util.c:1270
 msgid "not an OpenPGP card"
 msgstr "not an OpenPGP card"
 
-#: g10/card-util.c:1273 g10/keygen.c:4811 g10/keygen.c:5972
+#: g10/card-util.c:1283 g10/keygen.c:4815 g10/keygen.c:6003
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "error getting current key info: %s\n"
 
-#: g10/card-util.c:1358
+#: g10/card-util.c:1368
 msgid "Replace existing key? (y/N) "
 msgstr "Replace existing key? (y/N) "
 
-#: g10/card-util.c:1375 tools/gpg-card.c:3328
+#: g10/card-util.c:1385 tools/gpg-card.c:3345
 msgid ""
 "Note: There is no guarantee that the card supports the requested\n"
 "      key type or size.  If the key generation does not succeed,\n"
@@ -1892,99 +1905,99 @@ msgstr ""
 "      please check the documentation of your card to see which\n"
 "      key types and sizes are supported.\n"
 
-#: g10/card-util.c:1396 g10/keygen.c:2570 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1406 g10/keygen.c:2571 sm/certreqgen-ui.c:180
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "What keysize do you want? (%u) "
 
-#: g10/card-util.c:1406 g10/keygen.c:2493 g10/keygen.c:2525
+#: g10/card-util.c:1416 g10/keygen.c:2494 g10/keygen.c:2526
 #: sm/certreqgen-ui.c:195
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rounded up to %u bits\n"
 
-#: g10/card-util.c:1414 g10/keygen.c:2578 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1424 g10/keygen.c:2579 sm/certreqgen-ui.c:185
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s keysizes must be in the range %u-%u\n"
 
-#: g10/card-util.c:1433
+#: g10/card-util.c:1443
 msgid "Changing card key attribute for: "
 msgstr "Changing card key attribute for: "
 
-#: g10/card-util.c:1435
+#: g10/card-util.c:1445
 msgid "Signature key\n"
 msgstr "Signature key\n"
 
-#: g10/card-util.c:1437
+#: g10/card-util.c:1447
 msgid "Encryption key\n"
 msgstr "Encryption key\n"
 
-#: g10/card-util.c:1439
+#: g10/card-util.c:1449
 msgid "Authentication key\n"
 msgstr "Authentication key\n"
 
-#: g10/card-util.c:1441 g10/keygen.c:2112 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1451 g10/keygen.c:2113 sm/certreqgen-ui.c:158
 msgid "Please select what kind of key you want:\n"
 msgstr "Please select what kind of key you want:\n"
 
-#: g10/card-util.c:1442 sm/certreqgen-ui.c:159
+#: g10/card-util.c:1452 sm/certreqgen-ui.c:159
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1443
+#: g10/card-util.c:1453
 #, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) ECC\n"
 
-#: g10/card-util.c:1455 g10/card-util.c:1722 g10/card-util.c:1822
-#: g10/keyedit.c:900 g10/keygen.c:2017 g10/keygen.c:2045 g10/keygen.c:2172
-#: g10/keygen.c:2425 g10/keygen.c:2713 g10/revoke.c:836
+#: g10/card-util.c:1468 g10/card-util.c:1735 g10/card-util.c:1835
+#: g10/keyedit.c:900 g10/keygen.c:2018 g10/keygen.c:2046 g10/keygen.c:2173
+#: g10/keygen.c:2426 g10/keygen.c:2714 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Invalid selection.\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1541
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr "The card will now be re-configured to generate a key of %u bits\n"
 
-#: g10/card-util.c:1533
+#: g10/card-util.c:1546
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr "The card will now be re-configured to generate a key of type: %s\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1582
 #, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "error changing key attribute for key %d: %s\n"
 
-#: g10/card-util.c:1585 g10/card-util.c:2106 g10/card-util.c:2162
+#: g10/card-util.c:1598 g10/card-util.c:2119 g10/card-util.c:2175
 #, c-format
 msgid "error getting card info: %s\n"
 msgstr "error getting card info: %s\n"
 
-#: g10/card-util.c:1591 g10/card-util.c:1936 g10/card-util.c:2112
-#: g10/card-util.c:2171 tools/gpg-card.c:3057 tools/gpg-card.c:3296
-#: tools/gpg-card.c:3354
+#: g10/card-util.c:1604 g10/card-util.c:1949 g10/card-util.c:2125
+#: g10/card-util.c:2184 tools/gpg-card.c:3074 tools/gpg-card.c:3313
+#: tools/gpg-card.c:3371
 #, c-format
 msgid "This command is not supported by this card\n"
 msgstr "This command is not supported by this card\n"
 
-#: g10/card-util.c:1637 tools/gpg-card.c:2426
+#: g10/card-util.c:1650 tools/gpg-card.c:2443
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Make off-card backup of encryption key? (Y/n) "
 
-#: g10/card-util.c:1651
+#: g10/card-util.c:1664
 #, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "Note: keys are already stored on the card!\n"
 
-#: g10/card-util.c:1654 tools/gpg-card.c:2398
+#: g10/card-util.c:1667 tools/gpg-card.c:2415
 msgid "Replace existing keys? (y/N) "
 msgstr "Replace existing keys? (y/N) "
 
-#: g10/card-util.c:1666 tools/gpg-card.c:2457
+#: g10/card-util.c:1679 tools/gpg-card.c:2474
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1995,152 +2008,152 @@ msgstr ""
 "   PIN = ‘%s’     Admin PIN = ‘%s’\n"
 "You should change them using the command --change-pin\n"
 
-#: g10/card-util.c:1701
+#: g10/card-util.c:1714
 msgid "Please select the type of key to generate:\n"
 msgstr "Please select the type of key to generate:\n"
 
-#: g10/card-util.c:1703 g10/card-util.c:1793
+#: g10/card-util.c:1716 g10/card-util.c:1806
 msgid "   (1) Signature key\n"
 msgstr "   (1) Signature key\n"
 
-#: g10/card-util.c:1704 g10/card-util.c:1795
+#: g10/card-util.c:1717 g10/card-util.c:1808
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Encryption key\n"
 
-#: g10/card-util.c:1705 g10/card-util.c:1797
+#: g10/card-util.c:1718 g10/card-util.c:1810
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Authentication key\n"
 
-#: g10/card-util.c:1790
+#: g10/card-util.c:1803
 msgid "Please select where to store the key:\n"
 msgstr "Please select where to store the key:\n"
 
-#: g10/card-util.c:1836
+#: g10/card-util.c:1849
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "KEYTOCARD failed: %s\n"
 
-#: g10/card-util.c:1941 tools/gpg-card.c:3065
+#: g10/card-util.c:1954 tools/gpg-card.c:3082
 #, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr "Note: This command destroys all keys stored on the card!\n"
 
-#: g10/card-util.c:1944 tools/gpg-card.c:3068 tools/gpg-card.c:3409
+#: g10/card-util.c:1957 tools/gpg-card.c:3085 tools/gpg-card.c:3426
 msgid "Continue? (y/N) "
 msgstr "Continue? (y/N) "
 
-#: g10/card-util.c:1949 tools/gpg-card.c:3079
+#: g10/card-util.c:1962 tools/gpg-card.c:3096
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr "Really do a factory reset? (enter “yes�) "
 
-#: g10/card-util.c:2142
+#: g10/card-util.c:2155
 #, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "error for setup KDF: %s\n"
 
-#: g10/card-util.c:2188
+#: g10/card-util.c:2201
 #, c-format
 msgid "error for setup UIF: %s\n"
 msgstr "error for setup UIF: %s\n"
 
-#: g10/card-util.c:2212 g10/keyedit.c:1263 tools/gpg-card.c:3649
+#: g10/card-util.c:2225 g10/keyedit.c:1263 tools/gpg-card.c:3666
 msgid "quit this menu"
 msgstr "quit this menu"
 
-#: g10/card-util.c:2214
+#: g10/card-util.c:2227
 msgid "show admin commands"
 msgstr "show admin commands"
 
-#: g10/card-util.c:2215 g10/keyedit.c:1266 tools/gpg-card.c:3652
+#: g10/card-util.c:2228 g10/keyedit.c:1266 tools/gpg-card.c:3669
 msgid "show this help"
 msgstr "show this help"
 
-#: g10/card-util.c:2217 tools/gpg-card.c:3654
+#: g10/card-util.c:2230 tools/gpg-card.c:3671
 msgid "list all available data"
 msgstr "list all available data"
 
-#: g10/card-util.c:2220 tools/gpg-card.c:3656
+#: g10/card-util.c:2233 tools/gpg-card.c:3673
 msgid "change card holder's name"
 msgstr "change card holder's name"
 
-#: g10/card-util.c:2221 tools/gpg-card.c:3657
+#: g10/card-util.c:2234 tools/gpg-card.c:3674
 msgid "change URL to retrieve key"
 msgstr "change URL to retrieve key"
 
-#: g10/card-util.c:2222 tools/gpg-card.c:3658
+#: g10/card-util.c:2235 tools/gpg-card.c:3675
 msgid "fetch the key specified in the card URL"
 msgstr "fetch the key specified in the card URL"
 
-#: g10/card-util.c:2223 tools/gpg-card.c:3659
+#: g10/card-util.c:2236 tools/gpg-card.c:3676
 msgid "change the login name"
 msgstr "change the login name"
 
-#: g10/card-util.c:2224 tools/gpg-card.c:3660
+#: g10/card-util.c:2237 tools/gpg-card.c:3677
 msgid "change the language preferences"
 msgstr "change the language preferences"
 
-#: g10/card-util.c:2225 tools/gpg-card.c:3661
+#: g10/card-util.c:2238 tools/gpg-card.c:3678
 msgid "change card holder's salutation"
 msgstr "change card holder's salutation"
 
-#: g10/card-util.c:2227 tools/gpg-card.c:3663
+#: g10/card-util.c:2240 tools/gpg-card.c:3680
 msgid "change a CA fingerprint"
 msgstr "change a CA fingerprint"
 
-#: g10/card-util.c:2228 tools/gpg-card.c:3664
+#: g10/card-util.c:2241 tools/gpg-card.c:3681
 msgid "toggle the signature force PIN flag"
 msgstr "toggle the signature force PIN flag"
 
-#: g10/card-util.c:2229 tools/gpg-card.c:3665
+#: g10/card-util.c:2242 tools/gpg-card.c:3682
 msgid "generate new keys"
 msgstr "generate new keys"
 
-#: g10/card-util.c:2230 tools/gpg-card.c:3666
+#: g10/card-util.c:2243 tools/gpg-card.c:3683
 msgid "menu to change or unblock the PIN"
 msgstr "menu to change or unblock the PIN"
 
-#: g10/card-util.c:2231 tools/gpg-card.c:3667
+#: g10/card-util.c:2244 tools/gpg-card.c:3684
 msgid "verify the PIN and list all data"
 msgstr "verify the PIN and list all data"
 
-#: g10/card-util.c:2232 tools/gpg-card.c:3668
+#: g10/card-util.c:2245 tools/gpg-card.c:3685
 msgid "unblock the PIN using a Reset Code"
 msgstr "unblock the PIN using a Reset Code"
 
-#: g10/card-util.c:2233 tools/gpg-card.c:3672
+#: g10/card-util.c:2246 tools/gpg-card.c:3689
 msgid "destroy all keys and data"
 msgstr "destroy all keys and data"
 
-#: g10/card-util.c:2235
+#: g10/card-util.c:2248
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr "setup KDF for PIN authentication (on/single/off)"
 
-#: g10/card-util.c:2236
+#: g10/card-util.c:2249
 msgid "change the key attribute"
 msgstr "change the key attribute"
 
-#: g10/card-util.c:2237 tools/gpg-card.c:3674
+#: g10/card-util.c:2250 tools/gpg-card.c:3691
 msgid "change the User Interaction Flag"
 msgstr "change the User Interaction Flag"
 
-#: g10/card-util.c:2361 tools/gpg-card.c:3924
+#: g10/card-util.c:2374 tools/gpg-card.c:3941
 msgid "gpg/card> "
 msgstr "gpg/card> "
 
-#: g10/card-util.c:2402
+#: g10/card-util.c:2415
 msgid "Admin-only command\n"
 msgstr "Admin-only command\n"
 
-#: g10/card-util.c:2433
+#: g10/card-util.c:2446
 msgid "Admin commands are allowed\n"
 msgstr "Admin commands are allowed\n"
 
-#: g10/card-util.c:2435
+#: g10/card-util.c:2448
 msgid "Admin commands are not allowed\n"
 msgstr "Admin commands are not allowed\n"
 
-#: g10/card-util.c:2546 g10/keyedit.c:2275 tools/gpg-card.c:3814
-#: tools/gpg-card.c:4072
+#: g10/card-util.c:2559 g10/keyedit.c:2275 tools/gpg-card.c:3831
+#: tools/gpg-card.c:4089
 #, c-format
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Invalid command  (try “help�)\n"
@@ -2150,22 +2163,22 @@ msgstr "Invalid command  (try “help�)\n"
 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:5293 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5292 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:1934 g10/export.c:2342 g10/export.c:2463
-#: g10/getkey.c:1907 g10/gpg.c:5238 g10/keyedit.c:1450 g10/keyedit.c:2382
-#: g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:703 g10/keyserver.c:1240
-#: g10/revoke.c:230 g10/tofu.c:2168
+#: g10/getkey.c:2032 g10/gpg.c:5237 g10/keyedit.c:1450 g10/keyedit.c:2382
+#: g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:703 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:2002 g10/getkey.c:1915 g10/getkey.c:4330
-#: g10/gpg.c:5247 g10/keyedit.c:2354 g10/keyserver.c:1258 g10/revoke.c:236
-#: g10/revoke.c:665 g10/tofu.c:2176
+#: g10/delkey.c:90 g10/export.c:2002 g10/getkey.c:2040 g10/getkey.c:4455
+#: g10/gpg.c:5246 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"
 msgstr "error reading keyblock: %s\n"
@@ -2284,14 +2297,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:555 g10/encrypt.c:808 g10/decrypt-data.c:261 g10/gpg.c:4083
-#: g10/gpg.c:4130 sm/decrypt.c:742 sm/encrypt.c:691 sm/gpgsm.c:1793
+#: g10/encrypt.c:555 g10/encrypt.c:808 g10/decrypt-data.c:261 g10/gpg.c:4080
+#: g10/gpg.c:4127 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1646
 #, 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:564 g10/gpg.c:4095 g10/gpg.c:4142 g10/sig-check.c:155
-#: g10/sign.c:452 sm/gpgsm.c:1803 sm/gpgsm.c:1813 sm/sign.c:596 sm/verify.c:510
+#: g10/encrypt.c:564 g10/gpg.c:4092 g10/gpg.c:4139 g10/sig-check.c:155
+#: g10/sign.c:452 sm/gpgsm.c:1656 sm/gpgsm.c:1666 sm/sign.c:596 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"
@@ -2308,7 +2321,7 @@ msgid ""
 msgstr ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 
-#: g10/encrypt.c:838 sm/encrypt.c:766
+#: g10/encrypt.c:838 sm/encrypt.c:767
 #, c-format
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "WARNING: key %s is not suitable for encryption in %s mode\n"
@@ -2337,7 +2350,7 @@ msgstr "%s/%s.%s encrypted for: “%s�\n"
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "option ‘%s’ may not be used in %s mode\n"
 
-#: g10/decrypt-data.c:239 g10/mainproc.c:380 sm/decrypt.c:494
+#: g10/decrypt-data.c:239 g10/mainproc.c:380 sm/decrypt.c:892
 #, c-format
 msgid "%s.%s encrypted data\n"
 msgstr "%s.%s encrypted data\n"
@@ -2347,7 +2360,7 @@ msgstr "%s.%s encrypted data\n"
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "encrypted with unknown algorithm %d\n"
 
-#: g10/decrypt-data.c:361 g10/decrypt-data.c:414 sm/decrypt.c:508
+#: g10/decrypt-data.c:361 g10/decrypt-data.c:414 sm/decrypt.c:906
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2387,7 +2400,7 @@ msgstr "use the GnuPG key backup format"
 msgid " - skipped"
 msgstr " - skipped"
 
-#: g10/export.c:1333 g10/import.c:2124 g10/openfile.c:202 g10/openfile.c:296
+#: g10/export.c:1333 g10/import.c:2132 g10/openfile.c:202 g10/openfile.c:296
 #: g10/sign.c:1110 g10/sign.c:1447
 #, c-format
 msgid "writing to '%s'\n"
@@ -2423,61 +2436,61 @@ msgstr "error creating '%s': %s\n"
 msgid "[User ID not found]"
 msgstr "[User ID not found]"
 
-#: g10/getkey.c:1199
+#: g10/getkey.c:1324
 #, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "automatically retrieved ‘%s’ via %s\n"
 
-#: g10/getkey.c:1205
+#: g10/getkey.c:1330
 #, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "error retrieving ‘%s’ via %s: %s\n"
 
-#: g10/getkey.c:1207
+#: g10/getkey.c:1332
 msgid "No fingerprint"
 msgstr "No fingerprint"
 
-#: g10/getkey.c:1449
+#: g10/getkey.c:1574
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr "checking for a fresh copy of an expired key via %s\n"
 
-#: g10/getkey.c:1884 g10/revoke.c:657 g10/revoke.c:718
+#: g10/getkey.c:2009 g10/revoke.c:658 g10/revoke.c:719
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "secret key “%s� not found: %s\n"
 
-#: g10/getkey.c:1887 g10/pkclist.c:1012
+#: g10/getkey.c:2012 g10/pkclist.c:1012
 #, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "(check argument of option '%s')\n"
 
-#: g10/getkey.c:1965
+#: g10/getkey.c:2090
 #, c-format
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "Warning: not using ‘%s’ as default key: %s\n"
 
-#: g10/getkey.c:1973
+#: g10/getkey.c:2098
 #, c-format
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "using “%s� as default secret key for signing\n"
 
-#: g10/getkey.c:1980
+#: g10/getkey.c:2105
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr "all values passed to ‘%s’ ignored\n"
 
-#: g10/getkey.c:2837
+#: g10/getkey.c:2962
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:3703
+#: g10/getkey.c:3828
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "using subkey %s instead of primary key %s\n"
 
-#: g10/getkey.c:4259 g10/gpg.c:2167
+#: g10/getkey.c:4384 g10/gpg.c:2168
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "valid values for option '%s':\n"
@@ -2662,7 +2675,7 @@ msgstr "|SPEC|set up email aliases"
 msgid "use strict OpenPGP behavior"
 msgstr "use strict OpenPGP behavior"
 
-#: g10/gpg.c:651 kbx/kbxutil.c:91 sm/gpgsm.c:424 tools/gpgconf.c:113
+#: g10/gpg.c:651 kbx/kbxutil.c:91 sm/gpgsm.c:425 tools/gpgconf.c:113
 msgid "do not make any changes"
 msgstr "do not make any changes"
 
@@ -2694,7 +2707,7 @@ msgstr "use canonical text mode"
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|set compress level to N (0 disables)"
 
-#: g10/gpg.c:762 sm/gpgsm.c:357
+#: g10/gpg.c:762 sm/gpgsm.c:358
 msgid "Options controlling key import and export"
 msgstr "Options controlling key import and export"
 
@@ -2710,11 +2723,11 @@ msgstr "import missing key from a signature"
 msgid "include the public key in signatures"
 msgstr "include the public key in signatures"
 
-#: g10/gpg.c:776 sm/gpgsm.c:360
+#: g10/gpg.c:776 sm/gpgsm.c:361
 msgid "disable all access to the dirmngr"
 msgstr "disable all access to the dirmngr"
 
-#: g10/gpg.c:788 sm/gpgsm.c:367
+#: g10/gpg.c:788 sm/gpgsm.c:368
 msgid "Options controlling key listings"
 msgstr "Options controlling key listings"
 
@@ -2730,15 +2743,15 @@ msgstr "|USER-ID|encrypt for USER-ID"
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|USER-ID|use USER-ID to sign or decrypt"
 
-#: g10/gpg.c:876 sm/gpgsm.c:408
+#: g10/gpg.c:876 sm/gpgsm.c:409
 msgid "Options for unattended use"
 msgstr "Options for unattended use"
 
-#: g10/gpg.c:895 sm/gpgsm.c:420 dirmngr/dirmngr.c:286
+#: g10/gpg.c:895 sm/gpgsm.c:421 dirmngr/dirmngr.c:289
 msgid "Other options"
 msgstr "Other options"
 
-#: g10/gpg.c:966 sm/gpgsm.c:453
+#: g10/gpg.c:966 sm/gpgsm.c:454
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2780,7 +2793,7 @@ msgstr ""
 "Sign, check, encrypt or decrypt\n"
 "Default operation depends on the input data\n"
 
-#: g10/gpg.c:1168 sm/gpgsm.c:636
+#: g10/gpg.c:1168 sm/gpgsm.c:637
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2804,12 +2817,12 @@ msgstr "Hash: "
 msgid "Compression: "
 msgstr "Compression: "
 
-#: g10/gpg.c:1274 sm/gpgsm.c:710
+#: g10/gpg.c:1274 sm/gpgsm.c:711
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "usage: %s [options] %s\n"
 
-#: g10/gpg.c:1467 sm/gpgsm.c:803
+#: g10/gpg.c:1467 sm/gpgsm.c:804
 #, c-format
 msgid "conflicting commands\n"
 msgstr "conflicting commands\n"
@@ -2819,42 +2832,42 @@ msgstr "conflicting commands\n"
 msgid "no = sign found in group definition '%s'\n"
 msgstr "no = sign found in group definition ‘%s’\n"
 
-#: g10/gpg.c:1683
+#: g10/gpg.c:1684
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "WARNING: unsafe ownership on homedir ‘%s’\n"
 
-#: g10/gpg.c:1686
+#: g10/gpg.c:1687
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "WARNING: unsafe ownership on configuration file ‘%s’\n"
 
-#: g10/gpg.c:1689
+#: g10/gpg.c:1690
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "WARNING: unsafe ownership on extension ‘%s’\n"
 
-#: g10/gpg.c:1695
+#: g10/gpg.c:1696
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "WARNING: unsafe permissions on homedir ‘%s’\n"
 
-#: g10/gpg.c:1698
+#: g10/gpg.c:1699
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "WARNING: unsafe permissions on configuration file ‘%s’\n"
 
-#: g10/gpg.c:1701
+#: g10/gpg.c:1702
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "WARNING: unsafe permissions on extension ‘%s’\n"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1708
 #, 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:1710
+#: g10/gpg.c:1711
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@ -2862,19 +2875,19 @@ msgstr ""
 "WARNING: unsafe enclosing directory ownership on configuration file ‘"
 "%s’\n"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1714
 #, 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:1719
+#: g10/gpg.c:1720
 #, 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:1722
+#: g10/gpg.c:1723
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@ -2882,463 +2895,463 @@ msgstr ""
 "WARNING: unsafe enclosing directory permissions on configuration file ‘"
 "%s’\n"
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1726
 #, 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:1941
+#: g10/gpg.c:1942
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "unknown configuration item ‘%s’\n"
 
-#: g10/gpg.c:2037
+#: g10/gpg.c:2038
 msgid "display photo IDs during key listings"
 msgstr "display photo IDs during key listings"
 
-#: g10/gpg.c:2039
+#: g10/gpg.c:2040
 msgid "show key usage information during key listings"
 msgstr "show key usage information during key listings"
 
-#: g10/gpg.c:2041
+#: g10/gpg.c:2042
 msgid "show policy URLs during signature listings"
 msgstr "show policy URLs during signature listings"
 
-#: g10/gpg.c:2043
+#: g10/gpg.c:2044
 msgid "show all notations during signature listings"
 msgstr "show all notations during signature listings"
 
-#: g10/gpg.c:2045
+#: g10/gpg.c:2046
 msgid "show IETF standard notations during signature listings"
 msgstr "show IETF standard notations during signature listings"
 
-#: g10/gpg.c:2049
+#: g10/gpg.c:2050
 msgid "show user-supplied notations during signature listings"
 msgstr "show user-supplied notations during signature listings"
 
-#: g10/gpg.c:2051
+#: g10/gpg.c:2052
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "show preferred keyserver URLs during signature listings"
 
-#: g10/gpg.c:2053
+#: g10/gpg.c:2054
 msgid "show user ID validity during key listings"
 msgstr "show user ID validity during key listings"
 
-#: g10/gpg.c:2055
+#: g10/gpg.c:2056
 msgid "show revoked and expired user IDs in key listings"
 msgstr "show revoked and expired user IDs in key listings"
 
-#: g10/gpg.c:2057
+#: g10/gpg.c:2058
 msgid "show revoked and expired subkeys in key listings"
 msgstr "show revoked and expired subkeys in key listings"
 
-#: g10/gpg.c:2059
+#: g10/gpg.c:2060
 msgid "show the keyring name in key listings"
 msgstr "show the keyring name in key listings"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2062
 msgid "show expiration dates during signature listings"
 msgstr "show expiration dates during signature listings"
 
-#: g10/gpg.c:2178
+#: g10/gpg.c:2179
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "unknown TOFU policy ‘%s’\n"
 
-#: g10/gpg.c:2180
+#: g10/gpg.c:2181
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(use “help� to list choices)\n"
 
-#: g10/gpg.c:2975 g10/gpg.c:3828 g10/gpg.c:3840
+#: g10/gpg.c:2978 g10/gpg.c:3825 g10/gpg.c:3837
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "Note: %s is not for normal use!\n"
 
-#: g10/gpg.c:3151 g10/gpg.c:3163
+#: g10/gpg.c:3154 g10/gpg.c:3166
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "‘%s’ is not a valid signature expiration\n"
 
-#: g10/gpg.c:3185
+#: g10/gpg.c:3188
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "“%s� is not a proper mail address\n"
 
-#: g10/gpg.c:3217 sm/gpgsm.c:1270
+#: g10/gpg.c:3220 sm/gpgsm.c:1143
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "invalid pinentry mode ‘%s’\n"
 
-#: g10/gpg.c:3223 sm/gpgsm.c:1276
+#: g10/gpg.c:3226 sm/gpgsm.c:1149
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "invalid request origin ‘%s’\n"
 
-#: g10/gpg.c:3280
+#: g10/gpg.c:3283
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "‘%s’ is not a valid character set\n"
 
-#: g10/gpg.c:3302 g10/gpg.c:3511 g10/keyedit.c:5319
+#: g10/gpg.c:3305 g10/gpg.c:3514 g10/keyedit.c:5322
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "could not parse keyserver URL\n"
 
-#: g10/gpg.c:3320
+#: g10/gpg.c:3323
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: invalid keyserver options\n"
 
-#: g10/gpg.c:3323
+#: g10/gpg.c:3326
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "invalid keyserver options\n"
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3333
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: invalid import options\n"
 
-#: g10/gpg.c:3333
+#: g10/gpg.c:3336
 #, c-format
 msgid "invalid import options\n"
 msgstr "invalid import options\n"
 
-#: g10/gpg.c:3339 g10/gpg.c:3354
+#: g10/gpg.c:3342 g10/gpg.c:3357
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "invalid filter option: %s\n"
 
-#: g10/gpg.c:3345
+#: g10/gpg.c:3348
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: invalid export options\n"
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3351
 #, c-format
 msgid "invalid export options\n"
 msgstr "invalid export options\n"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3363
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: invalid list options\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3366
 #, c-format
 msgid "invalid list options\n"
 msgstr "invalid list options\n"
 
-#: g10/gpg.c:3371
+#: g10/gpg.c:3374
 msgid "display photo IDs during signature verification"
 msgstr "display photo IDs during signature verification"
 
-#: g10/gpg.c:3373
+#: g10/gpg.c:3376
 msgid "show policy URLs during signature verification"
 msgstr "show policy URLs during signature verification"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3378
 msgid "show all notations during signature verification"
 msgstr "show all notations during signature verification"
 
-#: g10/gpg.c:3377
+#: g10/gpg.c:3380
 msgid "show IETF standard notations during signature verification"
 msgstr "show IETF standard notations during signature verification"
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3384
 msgid "show user-supplied notations during signature verification"
 msgstr "show user-supplied notations during signature verification"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3386
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "show preferred keyserver URLs during signature verification"
 
-#: g10/gpg.c:3385
+#: g10/gpg.c:3388
 msgid "show user ID validity during signature verification"
 msgstr "show user ID validity during signature verification"
 
-#: g10/gpg.c:3387
+#: g10/gpg.c:3390
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "show revoked and expired user IDs in signature verification"
 
-#: g10/gpg.c:3389
+#: g10/gpg.c:3392
 msgid "show only the primary user ID in signature verification"
 msgstr "show only the primary user ID in signature verification"
 
-#: g10/gpg.c:3396
+#: g10/gpg.c:3399
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: invalid verify options\n"
 
-#: g10/gpg.c:3399
+#: g10/gpg.c:3402
 #, c-format
 msgid "invalid verify options\n"
 msgstr "invalid verify options\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3409
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "unable to set exec-path to %s\n"
 
-#: g10/gpg.c:3613
+#: g10/gpg.c:3616
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: invalid auto-key-locate list\n"
 
-#: g10/gpg.c:3616
+#: g10/gpg.c:3619
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "invalid auto-key-locate list\n"
 
-#: g10/gpg.c:3625
+#: g10/gpg.c:3628
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "invalid argument for option “%.50s�\n"
 
-#: g10/gpg.c:3807 sm/gpgsm.c:1675
+#: g10/gpg.c:3804 sm/gpgsm.c:1528
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNING: program may create a core file!\n"
 
-#: g10/gpg.c:3821
+#: g10/gpg.c:3818
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "WARNING: %s overrides %s\n"
 
-#: g10/gpg.c:3830
+#: g10/gpg.c:3827
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s not allowed with %s!\n"
 
-#: g10/gpg.c:3833
+#: g10/gpg.c:3830
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s makes no sense with %s!\n"
 
-#: g10/gpg.c:3848 sm/gpgsm.c:1696 dirmngr/dirmngr.c:1123
+#: g10/gpg.c:3845 sm/gpgsm.c:1549 dirmngr/dirmngr.c:1160
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "WARNING: running with faked system time: "
 
-#: g10/gpg.c:3869
+#: g10/gpg.c:3866
 #, 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:3897 g10/gpg.c:3928 sm/gpgsm.c:1763
+#: g10/gpg.c:3894 g10/gpg.c:3925 sm/gpgsm.c:1616
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "selected cipher algorithm is invalid\n"
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3901
 #, c-format
 msgid "selected AEAD algorithm is invalid\n"
 msgstr "selected AEAD algorithm is invalid\n"
 
-#: g10/gpg.c:3916
+#: g10/gpg.c:3913
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "selected compression algorithm is invalid\n"
 
-#: g10/gpg.c:3922
+#: g10/gpg.c:3919
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "selected certification digest algorithm is invalid\n"
 
-#: g10/gpg.c:3937
+#: g10/gpg.c:3934
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed must be greater than 0\n"
 
-#: g10/gpg.c:3939
+#: g10/gpg.c:3936
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed must be greater than 1\n"
 
-#: g10/gpg.c:3941
+#: g10/gpg.c:3938
 #, 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:3943
+#: g10/gpg.c:3940
 #, 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:3945
+#: g10/gpg.c:3942
 #, 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:3949
+#: g10/gpg.c:3946
 #, 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:3953
+#: g10/gpg.c:3950
 #, 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:3960
+#: g10/gpg.c:3957
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "invalid default preferences\n"
 
-#: g10/gpg.c:3964
+#: g10/gpg.c:3961
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "invalid personal cipher preferences\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3964
 #, c-format
 msgid "invalid personal AEAD preferences\n"
 msgstr "invalid personal AEAD preferences\n"
 
-#: g10/gpg.c:3971
+#: g10/gpg.c:3968
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "invalid personal digest preferences\n"
 
-#: g10/gpg.c:3975
+#: g10/gpg.c:3972
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "invalid personal compress preferences\n"
 
-#: g10/gpg.c:3984 g10/gpg.c:3989
+#: g10/gpg.c:3981 g10/gpg.c:3986
 #, c-format
 msgid "chunk size invalid - using %d\n"
 msgstr "chunk size invalid - using %d\n"
 
-#: g10/gpg.c:4026
+#: g10/gpg.c:4023
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s does not yet work with %s\n"
 
-#: g10/gpg.c:4089
+#: g10/gpg.c:4086
 #, 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:4101
+#: g10/gpg.c:4098
 #, 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:4256
+#: g10/gpg.c:4253
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "failed to initialize the TrustDB: %s\n"
 
-#: g10/gpg.c:4268
+#: g10/gpg.c:4265
 #, 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:4340
+#: g10/gpg.c:4337
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "symmetric encryption of ‘%s’ failed: %s\n"
 
-#: g10/gpg.c:4369
+#: g10/gpg.c:4366
 #, 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:4372
+#: g10/gpg.c:4369
 #, 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:4430
+#: g10/gpg.c:4427
 #, 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:4433
+#: g10/gpg.c:4430
 #, 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:4821 g10/keyserver.c:1870
+#: g10/gpg.c:4818 g10/keyserver.c:1629
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "keyserver send failed: %s\n"
 
-#: g10/gpg.c:4826
+#: g10/gpg.c:4823
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "keyserver receive failed: %s\n"
 
-#: g10/gpg.c:4832
+#: g10/gpg.c:4829
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "key export failed: %s\n"
 
-#: g10/gpg.c:4845
+#: g10/gpg.c:4842
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "export as ssh key failed: %s\n"
 
-#: g10/gpg.c:4857
+#: g10/gpg.c:4854
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "keyserver search failed: %s\n"
 
-#: g10/gpg.c:4870
+#: g10/gpg.c:4867
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "keyserver refresh failed: %s\n"
 
-#: g10/gpg.c:4937
+#: g10/gpg.c:4936
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dearmoring failed: %s\n"
 
-#: g10/gpg.c:4948
+#: g10/gpg.c:4947
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enarmoring failed: %s\n"
 
-#: g10/gpg.c:5053
+#: g10/gpg.c:5052
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "invalid hash algorithm ‘%s’\n"
 
-#: g10/gpg.c:5205 g10/tofu.c:2156
+#: g10/gpg.c:5204 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:5216
+#: g10/gpg.c:5215
 #, 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:5272
+#: g10/gpg.c:5271
 #, 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:5283
+#: g10/gpg.c:5282
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Go ahead and type your message ...\n"
 
-#: g10/gpg.c:5630
+#: g10/gpg.c:5629
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "the given certification policy URL is invalid\n"
 
-#: g10/gpg.c:5632
+#: g10/gpg.c:5631
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "the given signature policy URL is invalid\n"
 
-#: g10/gpg.c:5665
+#: g10/gpg.c:5664
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "the given preferred keyserver URL is invalid\n"
@@ -3351,7 +3364,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:414 tools/gpgconf.c:116 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:415 tools/gpgconf.c:116 tools/gpg-card.c:95
 msgid "|FD|write status info to this FD"
 msgstr "|FD|write status info to this FD"
 
@@ -3436,97 +3449,97 @@ msgstr "assume the GnuPG key backup format"
 msgid "repair keys on import"
 msgstr "repair keys on import"
 
-#: g10/import.c:399 g10/import.c:721
+#: g10/import.c:407 g10/import.c:729
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "skipping block of type %d\n"
 
-#: g10/import.c:738
+#: g10/import.c:746
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu keys processed so far\n"
 
-#: g10/import.c:831
+#: g10/import.c:839
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Total number processed: %lu\n"
 
-#: g10/import.c:834
+#: g10/import.c:842
 #, c-format
 msgid "    skipped PGP-2 keys: %lu\n"
 msgstr "    skipped PGP-2 keys: %lu\n"
 
-#: g10/import.c:836
+#: g10/import.c:844
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      skipped new keys: %lu\n"
 
-#: g10/import.c:839
+#: g10/import.c:847
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          w/o user IDs: %lu\n"
 
-#: g10/import.c:842 sm/import.c:129
+#: g10/import.c:850 sm/import.c:129
 #, c-format
 msgid "              imported: %lu"
 msgstr "              imported: %lu"
 
-#: g10/import.c:846 sm/import.c:133
+#: g10/import.c:854 sm/import.c:133
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             unchanged: %lu\n"
 
-#: g10/import.c:848
+#: g10/import.c:856
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          new user IDs: %lu\n"
 
-#: g10/import.c:850
+#: g10/import.c:858
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           new subkeys: %lu\n"
 
-#: g10/import.c:852
+#: g10/import.c:860
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        new signatures: %lu\n"
 
-#: g10/import.c:854
+#: g10/import.c:862
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   new key revocations: %lu\n"
 
-#: g10/import.c:856 sm/import.c:135
+#: g10/import.c:864 sm/import.c:135
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      secret keys read: %lu\n"
 
-#: g10/import.c:858 sm/import.c:137
+#: g10/import.c:866 sm/import.c:137
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  secret keys imported: %lu\n"
 
-#: g10/import.c:860 sm/import.c:139
+#: g10/import.c:868 sm/import.c:139
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " secret keys unchanged: %lu\n"
 
-#: g10/import.c:862 sm/import.c:141
+#: g10/import.c:870 sm/import.c:141
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "          not imported: %lu\n"
 
-#: g10/import.c:864
+#: g10/import.c:872
 #, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "    signatures cleaned: %lu\n"
 
-#: g10/import.c:866
+#: g10/import.c:874
 #, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "      user IDs cleaned: %lu\n"
 
-#: g10/import.c:1291
+#: g10/import.c:1299
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
@@ -3535,172 +3548,172 @@ msgstr ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 
-#: g10/import.c:1333
+#: g10/import.c:1341
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         “%s�: preference for cipher algorithm %s\n"
 
-#: g10/import.c:1351
+#: g10/import.c:1359
 #, c-format
 msgid "         \"%s\": preference for AEAD algorithm %s\n"
 msgstr "         “%s�: preference for AEAD algorithm %s\n"
 
-#: g10/import.c:1366
+#: g10/import.c:1374
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         “%s�: preference for digest algorithm %s\n"
 
-#: g10/import.c:1378
+#: g10/import.c:1386
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         “%s�: preference for compression algorithm %s\n"
 
-#: g10/import.c:1391
+#: g10/import.c:1399
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "it is strongly suggested that you update your preferences and\n"
 
-#: g10/import.c:1393
+#: g10/import.c:1401
 #, c-format
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "re-distribute this key to avoid potential algorithm mismatch problems\n"
 
-#: g10/import.c:1418
+#: g10/import.c:1426
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "you can update your preferences with: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:1932 g10/import.c:3053
+#: g10/import.c:1940 g10/import.c:3061
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "key %s: no user ID\n"
 
-#: g10/import.c:1938
+#: g10/import.c:1946
 #, c-format
 msgid "key %s: %s\n"
 msgstr "key %s: %s\n"
 
-#: g10/import.c:1939 g10/import.c:3025
+#: g10/import.c:1947 g10/import.c:3033
 msgid "rejected by import screener"
 msgstr "rejected by import screener"
 
-#: g10/import.c:1988
+#: g10/import.c:1996
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "key %s: PKS subkey corruption repaired\n"
 
-#: g10/import.c:2009
+#: g10/import.c:2017
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "key %s: accepted non self-signed user ID “%s�\n"
 
-#: g10/import.c:2020 g10/import.c:2051
+#: g10/import.c:2028 g10/import.c:2059
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "key %s: no valid user IDs\n"
 
-#: g10/import.c:2022
+#: g10/import.c:2030
 #, c-format
 msgid "this may be caused by a missing self-signature\n"
 msgstr "this may be caused by a missing self-signature\n"
 
-#: g10/import.c:2101 g10/import.c:3439
+#: g10/import.c:2109 g10/import.c:3447
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "key %s: public key not found: %s\n"
 
-#: g10/import.c:2107
+#: g10/import.c:2115
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "key %s: new key - skipped\n"
 
-#: g10/import.c:2119
+#: g10/import.c:2127
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "no writable keyring found: %s\n"
 
-#: g10/import.c:2151 g10/import.c:2253 g10/import.c:3514
+#: g10/import.c:2159 g10/import.c:2261 g10/import.c:3522
 #, c-format
 msgid "error writing keyring '%s': %s\n"
 msgstr "error writing keyring '%s': %s\n"
 
-#: g10/import.c:2174
+#: g10/import.c:2182
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "key %s: public key “%s� imported\n"
 
-#: g10/import.c:2201
+#: g10/import.c:2209
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "key %s: doesn't match our copy\n"
 
-#: g10/import.c:2269
+#: g10/import.c:2277
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "key %s: “%s� 1 new user ID\n"
 
-#: g10/import.c:2272
+#: g10/import.c:2280
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "key %s: “%s� %d new user IDs\n"
 
-#: g10/import.c:2275
+#: g10/import.c:2283
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "key %s: “%s� 1 new signature\n"
 
-#: g10/import.c:2278
+#: g10/import.c:2286
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "key %s: “%s� %d new signatures\n"
 
-#: g10/import.c:2281
+#: g10/import.c:2289
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "key %s: “%s� 1 new subkey\n"
 
-#: g10/import.c:2284
+#: g10/import.c:2292
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "key %s: “%s� %d new subkeys\n"
 
-#: g10/import.c:2287
+#: g10/import.c:2295
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "key %s: “%s� %d signature cleaned\n"
 
-#: g10/import.c:2290
+#: g10/import.c:2298
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "key %s: “%s� %d signatures cleaned\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2301
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "key %s: “%s� %d user ID cleaned\n"
 
-#: g10/import.c:2296
+#: g10/import.c:2304
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "key %s: “%s� %d user IDs cleaned\n"
 
-#: g10/import.c:2332
+#: g10/import.c:2340
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "key %s: “%s� not changed\n"
 
-#: g10/import.c:2692 g10/import.c:2887
+#: g10/import.c:2700 g10/import.c:2895
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "key %s: secret key imported\n"
 
-#: g10/import.c:2700
+#: g10/import.c:2708
 #, c-format
 msgid "key %s: secret key already exists\n"
 msgstr "key %s: secret key already exists\n"
 
-#: g10/import.c:2708
+#: g10/import.c:2716
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "key %s: error sending to agent: %s\n"
@@ -3713,203 +3726,202 @@ msgstr "key %s: error sending to agent: %s\n"
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2877
+#: g10/import.c:2885
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr "To migrate '%s', with each smartcard, run: %s\n"
 
-#: g10/import.c:3024
+#: g10/import.c:3032
 #, c-format
 msgid "secret key %s: %s\n"
 msgstr "secret key %s: %s\n"
 
-#: g10/import.c:3045 g10/import.c:3084
+#: g10/import.c:3053 g10/import.c:3092
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "importing secret keys not allowed\n"
 
-#: g10/import.c:3072
+#: g10/import.c:3080
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "key %s: secret key with invalid cipher %d - skipped\n"
 
-#: g10/import.c:3234 g10/pkclist.c:75 g10/revoke.c:774
+#: g10/import.c:3242 g10/pkclist.c:75 g10/revoke.c:775
 msgid "No reason specified"
 msgstr "No reason specified"
 
-#: g10/import.c:3235 g10/pkclist.c:77 g10/revoke.c:776
+#: g10/import.c:3243 g10/pkclist.c:77 g10/revoke.c:777
 msgid "Key is superseded"
 msgstr "Key is superseded"
 
-#: g10/import.c:3236 g10/pkclist.c:79 g10/revoke.c:775
+#: g10/import.c:3244 g10/pkclist.c:79 g10/revoke.c:776
 msgid "Key has been compromised"
 msgstr "Key has been compromised"
 
-#: g10/import.c:3237 g10/pkclist.c:81 g10/revoke.c:777
+#: g10/import.c:3245 g10/pkclist.c:81 g10/revoke.c:778
 msgid "Key is no longer used"
 msgstr "Key is no longer used"
 
-#: g10/import.c:3238 g10/pkclist.c:83 g10/revoke.c:778
+#: g10/import.c:3246 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "User ID is no longer valid"
 
-#: g10/import.c:3363 g10/keylist.c:1105 g10/pkclist.c:87
+#: g10/import.c:3371 g10/keylist.c:1105 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "reason for revocation: "
 
-#: g10/import.c:3382 g10/keylist.c:1124 g10/pkclist.c:103
+#: g10/import.c:3390 g10/keylist.c:1124 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "revocation comment: "
 
-#: g10/import.c:3432
+#: g10/import.c:3440
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "key %s: no public key - can't apply revocation certificate\n"
 
-#: g10/import.c:3461
+#: g10/import.c:3469
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "key %s: can't locate original keyblock: %s\n"
 
-#: g10/import.c:3468
+#: g10/import.c:3476
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "key %s: can't read original keyblock: %s\n"
 
-#: g10/import.c:3488
+#: g10/import.c:3496
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "key %s: invalid revocation certificate: %s - rejected\n"
 
-#: g10/import.c:3523
+#: g10/import.c:3531
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "key %s: “%s� revocation certificate imported\n"
 
-#: g10/import.c:3609
+#: g10/import.c:3617
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "key %s: no user ID for signature\n"
 
-#: g10/import.c:3626
+#: g10/import.c:3634
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "key %s: unsupported public key algorithm on user ID “%s�\n"
 
-#: g10/import.c:3628
+#: g10/import.c:3636
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "key %s: invalid self-signature on user ID “%s�\n"
 
-#: g10/import.c:3645 g10/import.c:3673 g10/import.c:3729
+#: g10/import.c:3653 g10/import.c:3681 g10/import.c:3737
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "key %s: unsupported public key algorithm\n"
 
-#: g10/import.c:3646
+#: g10/import.c:3654
 #, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "key %s: invalid direct key signature\n"
 
-#: g10/import.c:3660
+#: g10/import.c:3668
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "key %s: no subkey for key binding\n"
 
-#: g10/import.c:3675
+#: g10/import.c:3683
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "key %s: invalid subkey binding\n"
 
-#: g10/import.c:3694
+#: g10/import.c:3702
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "key %s: removed multiple subkey binding\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3726
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "key %s: no subkey for key revocation\n"
 
-#: g10/import.c:3731
+#: g10/import.c:3739
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "key %s: invalid subkey revocation\n"
 
-#: g10/import.c:3746
+#: g10/import.c:3754
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "key %s: removed multiple subkey revocation\n"
 
-#: g10/import.c:3790
+#: g10/import.c:3798
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "key %s: skipped user ID “%s�\n"
 
-#: g10/import.c:3817
+#: g10/import.c:3825
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "key %s: skipped subkey\n"
 
-#: g10/import.c:3849
+#: g10/import.c:3857
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "key %s: non exportable signature (class 0x%02X) - skipped\n"
 
-#: g10/import.c:3860
+#: g10/import.c:3868
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "key %s: revocation certificate at wrong place - skipped\n"
 
-#: g10/import.c:3878
+#: g10/import.c:3886
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "key %s: invalid revocation certificate: %s - skipped\n"
 
-#: g10/import.c:3892
+#: g10/import.c:3900
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "key %s: subkey signature in wrong place - skipped\n"
 
-#: g10/import.c:3900
+#: g10/import.c:3908
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "key %s: unexpected signature class (0x%02X) - skipped\n"
 
-#: g10/import.c:4073
+#: g10/import.c:4081
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "key %s: duplicated user ID detected - merged\n"
 
-#: g10/import.c:4180
+#: g10/import.c:4188
 #, c-format
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr "key %s: duplicated subkeys detected - merged\n"
 
-#: g10/import.c:4245
+#: g10/import.c:4253
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "WARNING: key %s may be revoked: fetching revocation key %s\n"
 
-#: g10/import.c:4261
+#: g10/import.c:4269
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "WARNING: key %s may be revoked: revocation key %s not present.\n"
 
-#: g10/import.c:4327
+#: g10/import.c:4335
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "key %s: “%s� revocation certificate added\n"
 
-#: g10/import.c:4365
+#: g10/import.c:4373
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "key %s: direct key signature added\n"
 
-#: g10/key-check.c:133 dirmngr/dirmngr_ldap.c:650 dirmngr/ldap-wrapper.c:835
-#: dirmngr/ldap-wrapper.c:852
+#: g10/key-check.c:133 dirmngr/ldap-wrapper.c:835 dirmngr/ldap-wrapper.c:852
 #, c-format
 msgid "error allocating memory: %s\n"
 msgstr "error allocating memory: %s\n"
@@ -3973,7 +3985,7 @@ msgstr ""
 "Warning: errors found and only checked self-signatures, run ‘%s’ to "
 "check all signatures.\n"
 
-#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:284 sm/keydb.c:297
+#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:289 sm/keydb.c:302
 #, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "error creating keybox '%s': %s\n"
@@ -3983,7 +3995,7 @@ msgstr "error creating keybox '%s': %s\n"
 msgid "error creating keyring '%s': %s\n"
 msgstr "error creating keyring '%s': %s\n"
 
-#: g10/keydb.c:388 sm/keydb.c:303
+#: g10/keydb.c:388 sm/keydb.c:308
 #, c-format
 msgid "keybox '%s' created\n"
 msgstr "keybox ‘%s’ created\n"
@@ -4238,8 +4250,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:6192 g10/keyedit.c:6275 g10/keyedit.c:6404
-#: g10/keyedit.c:6466 g10/sign.c:528
+#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
+#: g10/keyedit.c:6474 g10/sign.c:528
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signing failed: %s\n"
@@ -4605,7 +4617,7 @@ msgstr "No matching user IDs."
 msgid "Nothing to sign.\n"
 msgstr "Nothing to sign.\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6057
+#: g10/keyedit.c:2973 g10/keyedit.c:6065
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "Not signed by you.\n"
@@ -4672,7 +4684,7 @@ msgstr "This key may be revoked by %s key %s"
 msgid "(sensitive)"
 msgstr "(sensitive)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:525
+#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "created: %s"
@@ -4688,7 +4700,7 @@ msgid "expired: %s"
 msgstr "expired: %s"
 
 #: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2262
-#: g10/keyserver.c:531
+#: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "expires: %s"
@@ -4724,13 +4736,13 @@ 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:535
-#: g10/mainproc.c:2280 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
+#: g10/mainproc.c:2282 g10/tofu.c:1789 g10/trust.c:426 dirmngr/ocsp.c:792
 msgid "revoked"
 msgstr "revoked"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:539
-#: g10/mainproc.c:2282 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
+#: g10/mainproc.c:2284 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "expired"
 
@@ -4771,7 +4783,7 @@ msgstr "Are you sure you still want to add it? (y/N) "
 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:3107
+#: g10/keyedit.c:4273 g10/keygen.c:3111
 msgid "Such a user ID already exists on this key!\n"
 msgstr "Such a user ID already exists on this key!\n"
 
@@ -4914,7 +4926,7 @@ msgstr "subkey %s does not sign and so does not need to be cross-certified\n"
 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:5357 g10/keyedit.c:5495
+#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "skipping v3 self-signature on user ID “%s�\n"
@@ -4923,127 +4935,127 @@ msgstr "skipping v3 self-signature on user ID “%s�\n"
 msgid "Enter your preferred keyserver URL: "
 msgstr "Enter your preferred keyserver URL: "
 
-#: g10/keyedit.c:5380
+#: g10/keyedit.c:5383
 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:5381
+#: g10/keyedit.c:5384
 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:5441
+#: g10/keyedit.c:5449
 msgid "Enter the notation: "
 msgstr "Enter the notation: "
 
-#: g10/keyedit.c:5588
+#: g10/keyedit.c:5596
 msgid "Proceed? (y/N) "
 msgstr "Proceed? (y/N) "
 
-#: g10/keyedit.c:5658
+#: g10/keyedit.c:5666
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "No user ID with index %d\n"
 
-#: g10/keyedit.c:5720
+#: g10/keyedit.c:5728
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "No user ID with hash %s\n"
 
-#: g10/keyedit.c:5821
+#: g10/keyedit.c:5829
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "No subkey with key ID '%s'.\n"
 
-#: g10/keyedit.c:5843
+#: g10/keyedit.c:5851
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "No subkey with index %d\n"
 
-#: g10/keyedit.c:5984
+#: g10/keyedit.c:5992
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "user ID: “%s�\n"
 
-#: g10/keyedit.c:5987 g10/keyedit.c:6089 g10/keyedit.c:6137
+#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
 #, 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:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
+#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
 msgid " (non-exportable)"
 msgstr " (non-exportable)"
 
-#: g10/keyedit.c:5993
+#: g10/keyedit.c:6001
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "This signature expired on %s.\n"
 
-#: g10/keyedit.c:5998
+#: g10/keyedit.c:6006
 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:6003
+#: g10/keyedit.c:6011
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Create a revocation certificate for this signature? (y/N) "
 
-#: g10/keyedit.c:6063
+#: g10/keyedit.c:6071
 #, 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:6092
+#: g10/keyedit.c:6100
 msgid " (non-revocable)"
 msgstr " (non-revocable)"
 
-#: g10/keyedit.c:6099
+#: g10/keyedit.c:6107
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revoked by your key %s on %s\n"
 
-#: g10/keyedit.c:6124
+#: g10/keyedit.c:6132
 msgid "You are about to revoke these signatures:\n"
 msgstr "You are about to revoke these signatures:\n"
 
-#: g10/keyedit.c:6147
+#: g10/keyedit.c:6155
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Really create the revocation certificates? (y/N) "
 
-#: g10/keyedit.c:6180
+#: g10/keyedit.c:6188
 #, c-format
 msgid "no secret key\n"
 msgstr "no secret key\n"
 
-#: g10/keyedit.c:6228
+#: g10/keyedit.c:6236
 #, 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:6238
+#: g10/keyedit.c:6246
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "user ID “%s� is already revoked\n"
 
-#: g10/keyedit.c:6255
+#: g10/keyedit.c:6263
 #, 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:6351
+#: g10/keyedit.c:6359
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Cannot revoke the last valid user ID.\n"
 
-#: g10/keyedit.c:6389
+#: g10/keyedit.c:6397
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Key %s is already revoked.\n"
 
-#: g10/keyedit.c:6451
+#: g10/keyedit.c:6459
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Subkey %s is already revoked.\n"
 
-#: g10/keyedit.c:6548
+#: g10/keyedit.c:6556
 #, 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"
@@ -5053,82 +5065,82 @@ msgstr "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgid "invalid value for option '%s'\n"
 msgstr "invalid value for option ‘%s’\n"
 
-#: g10/keygen.c:338
+#: g10/keygen.c:339
 #, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "preference ‘%s’ duplicated\n"
 
-#: g10/keygen.c:345
+#: g10/keygen.c:346
 #, c-format
 msgid "too many cipher preferences\n"
 msgstr "too many cipher preferences\n"
 
-#: g10/keygen.c:347
+#: g10/keygen.c:348
 #, c-format
 msgid "too many digest preferences\n"
 msgstr "too many digest preferences\n"
 
-#: g10/keygen.c:349
+#: g10/keygen.c:350
 #, c-format
 msgid "too many compression preferences\n"
 msgstr "too many compression preferences\n"
 
-#: g10/keygen.c:351
+#: g10/keygen.c:352
 #, c-format
 msgid "too many AEAD preferences\n"
 msgstr "too many AEAD preferences\n"
 
-#: g10/keygen.c:521
+#: g10/keygen.c:522
 #, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "invalid item ‘%s’ in preference string\n"
 
-#: g10/keygen.c:1130
+#: g10/keygen.c:1131
 #, c-format
 msgid "writing direct signature\n"
 msgstr "writing direct signature\n"
 
-#: g10/keygen.c:1176
+#: g10/keygen.c:1177
 #, c-format
 msgid "writing self signature\n"
 msgstr "writing self signature\n"
 
-#: g10/keygen.c:1233
+#: g10/keygen.c:1234
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "writing key binding signature\n"
 
-#: g10/keygen.c:1598 g10/keygen.c:1603 g10/keygen.c:1655 g10/keygen.c:1660
-#: g10/keygen.c:1832 g10/keygen.c:1837
+#: g10/keygen.c:1599 g10/keygen.c:1604 g10/keygen.c:1656 g10/keygen.c:1661
+#: g10/keygen.c:1833 g10/keygen.c:1838
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "keysize invalid; using %u bits\n"
 
-#: g10/keygen.c:1609 g10/keygen.c:1666 g10/keygen.c:1674 g10/keygen.c:1843
+#: g10/keygen.c:1610 g10/keygen.c:1667 g10/keygen.c:1675 g10/keygen.c:1844
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "keysize rounded up to %u bits\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1701
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 
-#: g10/keygen.c:1899
+#: g10/keygen.c:1900
 msgid "Sign"
 msgstr "Sign"
 
-#: g10/keygen.c:1902
+#: g10/keygen.c:1903
 msgid "Certify"
 msgstr "Certify"
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1906
 msgid "Encrypt"
 msgstr "Encrypt"
 
-#: g10/keygen.c:1908
+#: g10/keygen.c:1909
 msgid "Authenticate"
 msgstr "Authenticate"
 
@@ -5142,166 +5154,166 @@ msgstr "Authenticate"
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1929
+#: g10/keygen.c:1930
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1967
 #, c-format
 msgid "Possible actions for this %s key: "
 msgstr "Possible actions for this %s key: "
 
-#: g10/keygen.c:1973
+#: g10/keygen.c:1974
 msgid "Current allowed actions: "
 msgstr "Current allowed actions: "
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1979
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Toggle the sign capability\n"
 
-#: g10/keygen.c:1981
+#: g10/keygen.c:1982
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Toggle the encrypt capability\n"
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1985
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Toggle the authenticate capability\n"
 
-#: g10/keygen.c:1987
+#: g10/keygen.c:1988
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Finished\n"
 
-#: g10/keygen.c:2116
+#: g10/keygen.c:2117
 #, c-format
 msgid "   (%d) RSA and RSA%s\n"
 msgstr "   (%d) RSA and RSA%s\n"
 
-#: g10/keygen.c:2120
+#: g10/keygen.c:2121
 #, c-format
 msgid "   (%d) DSA and Elgamal%s\n"
 msgstr "   (%d) DSA and Elgamal%s\n"
 
-#: g10/keygen.c:2123
+#: g10/keygen.c:2124
 #, c-format
 msgid "   (%d) DSA (sign only)%s\n"
 msgstr "   (%d) DSA (sign only)%s\n"
 
-#: g10/keygen.c:2125
+#: g10/keygen.c:2126
 #, c-format
 msgid "   (%d) RSA (sign only)%s\n"
 msgstr "   (%d) RSA (sign only)%s\n"
 
-#: g10/keygen.c:2131
+#: g10/keygen.c:2132
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)%s\n"
 msgstr "   (%d) Elgamal (encrypt only)%s\n"
 
-#: g10/keygen.c:2133
+#: g10/keygen.c:2134
 #, c-format
 msgid "   (%d) RSA (encrypt only)%s\n"
 msgstr "   (%d) RSA (encrypt only)%s\n"
 
-#: g10/keygen.c:2139
+#: g10/keygen.c:2140
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)%s\n"
 msgstr "   (%d) DSA (set your own capabilities)%s\n"
 
-#: g10/keygen.c:2141
+#: g10/keygen.c:2142
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (set your own capabilities)%s\n"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2148
 #, c-format
 msgid "   (%d) ECC (sign and encrypt)%s\n"
 msgstr "   (%d) ECC (sign and encrypt)%s\n"
 
-#: g10/keygen.c:2147 g10/keygen.c:2678
+#: g10/keygen.c:2148 g10/keygen.c:2679
 msgid " *default*"
 msgstr " *default*"
 
-#: g10/keygen.c:2148
+#: g10/keygen.c:2149
 #, c-format
 msgid "  (%d) ECC (sign only)\n"
 msgstr "  (%d) ECC (sign only)\n"
 
-#: g10/keygen.c:2150
+#: g10/keygen.c:2151
 #, c-format
 msgid "  (%d) ECC (set your own capabilities)%s\n"
 msgstr "  (%d) ECC (set your own capabilities)%s\n"
 
-#: g10/keygen.c:2152
+#: g10/keygen.c:2153
 #, c-format
 msgid "  (%d) ECC (encrypt only)%s\n"
 msgstr "  (%d) ECC (encrypt only)%s\n"
 
-#: g10/keygen.c:2156
+#: g10/keygen.c:2157
 #, c-format
 msgid "  (%d) Existing key%s\n"
 msgstr "  (%d) Existing key%s\n"
 
-#: g10/keygen.c:2158
+#: g10/keygen.c:2159
 #, c-format
 msgid "  (%d) Existing key from card%s\n"
 msgstr "  (%d) Existing key from card%s\n"
 
-#: g10/keygen.c:2254 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2255 sm/certreqgen-ui.c:203
 msgid "Enter the keygrip: "
 msgstr "Enter the keygrip: "
 
-#: g10/keygen.c:2267 sm/certreqgen-ui.c:211 tools/gpg-card.c:2280
+#: g10/keygen.c:2268 sm/certreqgen-ui.c:211 tools/gpg-card.c:2297
 #, c-format
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr "Not a valid keygrip (expecting 40 hex digits)\n"
 
-#: g10/keygen.c:2269 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2270 sm/certreqgen-ui.c:213
 msgid "No key with this keygrip\n"
 msgstr "No key with this keygrip\n"
 
-#: g10/keygen.c:2288 g10/keygen.c:2298 g10/keygen.c:3440 g10/keygen.c:3451
+#: g10/keygen.c:2289 g10/keygen.c:2299 g10/keygen.c:3444 g10/keygen.c:3455
 #: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
 #, c-format
 msgid "error reading the card: %s\n"
 msgstr "error reading the card: %s\n"
 
-#: g10/keygen.c:2292 g10/keygen.c:3444 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2293 g10/keygen.c:3448 sm/certreqgen-ui.c:234
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "Serial number of the card: %s\n"
 
-#: g10/keygen.c:2311 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2312 sm/certreqgen-ui.c:246
 msgid "Available keys:\n"
 msgstr "Available keys:\n"
 
-#: g10/keygen.c:2504 g10/keygen.c:2518
+#: g10/keygen.c:2505 g10/keygen.c:2519
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr "rounded to %u bits\n"
 
-#: g10/keygen.c:2559
+#: g10/keygen.c:2560
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s keys may be between %u and %u bits long.\n"
 
-#: g10/keygen.c:2567
+#: g10/keygen.c:2568
 #, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "What keysize do you want for the subkey? (%u) "
 
-#: g10/keygen.c:2584 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2585 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Requested keysize is %u bits\n"
 
-#: g10/keygen.c:2630
+#: g10/keygen.c:2631
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Please select which elliptic curve you want:\n"
 
-#: g10/keygen.c:2819
+#: g10/keygen.c:2820
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5317,7 +5329,7 @@ msgstr ""
 "      <n>m = key expires in n months\n"
 "      <n>y = key expires in n years\n"
 
-#: g10/keygen.c:2830
+#: g10/keygen.c:2831
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5333,38 +5345,38 @@ msgstr ""
 "      <n>m = signature expires in n months\n"
 "      <n>y = signature expires in n years\n"
 
-#: g10/keygen.c:2853
+#: g10/keygen.c:2854
 msgid "Key is valid for? (0) "
 msgstr "Key is valid for? (0) "
 
-#: g10/keygen.c:2858
+#: g10/keygen.c:2859
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Signature is valid for? (%s) "
 
-#: g10/keygen.c:2871 g10/keygen.c:2896
+#: g10/keygen.c:2875 g10/keygen.c:2900
 msgid "invalid value\n"
 msgstr "invalid value\n"
 
-#: g10/keygen.c:2878
+#: g10/keygen.c:2882
 msgid "Key does not expire at all\n"
 msgstr "Key does not expire at all\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2883
 msgid "Signature does not expire at all\n"
 msgstr "Signature does not expire at all\n"
 
-#: g10/keygen.c:2884
+#: g10/keygen.c:2888
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Key expires at %s\n"
 
-#: g10/keygen.c:2885
+#: g10/keygen.c:2889
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Signature expires at %s\n"
 
-#: g10/keygen.c:2889
+#: g10/keygen.c:2893
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5372,11 +5384,11 @@ msgstr ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 
-#: g10/keygen.c:2902
+#: g10/keygen.c:2906
 msgid "Is this correct? (y/N) "
 msgstr "Is this correct? (y/N) "
 
-#: g10/keygen.c:2970
+#: g10/keygen.c:2974
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5390,7 +5402,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2985
+#: g10/keygen.c:2989
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5406,49 +5418,49 @@ msgstr ""
 "    “Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>�\n"
 "\n"
 
-#: g10/keygen.c:3004
+#: g10/keygen.c:3008
 msgid "Real name: "
 msgstr "Real name: "
 
-#: g10/keygen.c:3013
+#: g10/keygen.c:3017
 msgid "Invalid character in name\n"
 msgstr "Invalid character in name\n"
 
-#: g10/keygen.c:3014
+#: g10/keygen.c:3018
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr "The characters ‘%s’ and ‘%s’ may not appear in name\n"
 
-#: g10/keygen.c:3018
+#: g10/keygen.c:3022
 msgid "Name may not start with a digit\n"
 msgstr "Name may not start with a digit\n"
 
-#: g10/keygen.c:3021
+#: g10/keygen.c:3025
 msgid "Name must be at least 5 characters long\n"
 msgstr "Name must be at least 5 characters long\n"
 
-#: g10/keygen.c:3031
+#: g10/keygen.c:3035
 msgid "Email address: "
 msgstr "Email address: "
 
-#: g10/keygen.c:3037
+#: g10/keygen.c:3041
 msgid "Not a valid email address\n"
 msgstr "Not a valid email address\n"
 
-#: g10/keygen.c:3046
+#: g10/keygen.c:3050
 msgid "Comment: "
 msgstr "Comment: "
 
-#: g10/keygen.c:3052
+#: g10/keygen.c:3056
 msgid "Invalid character in comment\n"
 msgstr "Invalid character in comment\n"
 
-#: g10/keygen.c:3088
+#: g10/keygen.c:3092
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr "You are using the ‘%s’ character set.\n"
 
-#: g10/keygen.c:3094
+#: g10/keygen.c:3098
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5459,7 +5471,7 @@ msgstr ""
 "    “%s�\n"
 "\n"
 
-#: g10/keygen.c:3099
+#: g10/keygen.c:3103
 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"
 
@@ -5474,31 +5486,31 @@ msgstr "Please don't put the email address into the real name or the comment\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3124
+#: g10/keygen.c:3128
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:3134
+#: g10/keygen.c:3138
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 
-#: g10/keygen.c:3135
+#: g10/keygen.c:3139
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 
-#: g10/keygen.c:3140
+#: g10/keygen.c:3144
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Change (N)ame, (E)mail, or (Q)uit? "
 
-#: g10/keygen.c:3141
+#: g10/keygen.c:3145
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 
-#: g10/keygen.c:3160
+#: g10/keygen.c:3164
 msgid "Please correct the error first\n"
 msgstr "Please correct the error first\n"
 
-#: g10/keygen.c:3206
+#: g10/keygen.c:3210
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -5510,18 +5522,18 @@ msgstr ""
 "disks) during the prime generation; this gives the random number\n"
 "generator a better chance to gain enough entropy.\n"
 
-#: g10/keygen.c:3591
+#: g10/keygen.c:3595
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr "WARNING: v4 is specified, but overridden by v5.\n"
 
-#: g10/keygen.c:4590 g10/keygen.c:4663 g10/keygen.c:4681 g10/keygen.c:4710
-#: g10/keygen.c:5086 g10/keygen.c:5632 g10/keygen.c:5943 g10/keygen.c:6050
+#: g10/keygen.c:4594 g10/keygen.c:4667 g10/keygen.c:4685 g10/keygen.c:4714
+#: g10/keygen.c:5113 g10/keygen.c:5663 g10/keygen.c:5974 g10/keygen.c:6081
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Key generation failed: %s\n"
 
-#: g10/keygen.c:4599
+#: g10/keygen.c:4603
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5532,64 +5544,64 @@ msgstr ""
 "    “%s�\n"
 "\n"
 
-#: g10/keygen.c:4601
+#: g10/keygen.c:4605
 msgid "Continue? (Y/n) "
 msgstr "Continue? (Y/n) "
 
-#: g10/keygen.c:4622
+#: g10/keygen.c:4626
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "A key for “%s� already exists\n"
 
-#: g10/keygen.c:4627
+#: g10/keygen.c:4631
 msgid "Create anyway? (y/N) "
 msgstr "Create anyway? (y/N) "
 
-#: g10/keygen.c:4633
+#: g10/keygen.c:4637
 #, c-format
 msgid "creating anyway\n"
 msgstr "creating anyway\n"
 
-#: g10/keygen.c:5069
+#: g10/keygen.c:5096
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr "Note: Use “%s %s� for a full featured key generation dialog.\n"
 
-#: g10/keygen.c:5118
+#: g10/keygen.c:5145
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Key generation canceled.\n"
 
-#: g10/keygen.c:5178
+#: g10/keygen.c:5205
 #, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "can't create backup file '%s': %s\n"
 
-#: g10/keygen.c:5198
+#: g10/keygen.c:5225
 #, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "Note: backup of card key saved to ‘%s’\n"
 
-#: g10/keygen.c:5359 g10/keygen.c:5561
+#: g10/keygen.c:5389 g10/keygen.c:5591
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr "writing public key to ‘%s’\n"
 
-#: g10/keygen.c:5555
+#: g10/keygen.c:5585
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "no writable public keyring found: %s\n"
 
-#: g10/keygen.c:5569
+#: g10/keygen.c:5599
 #, c-format
 msgid "error writing public keyring '%s': %s\n"
 msgstr "error writing public keyring '%s': %s\n"
 
-#: g10/keygen.c:5603
+#: g10/keygen.c:5634
 msgid "public and secret key created and signed.\n"
 msgstr "public and secret key created and signed.\n"
 
-#: g10/keygen.c:5619
+#: g10/keygen.c:5650
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -5597,36 +5609,36 @@ msgstr ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command “--edit-key� to generate a subkey for this purpose.\n"
 
-#: g10/keygen.c:5801 g10/keygen.c:6000
+#: g10/keygen.c:5832 g10/keygen.c:6031
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 
-#: g10/keygen.c:5803 g10/keygen.c:6002
+#: g10/keygen.c:5834 g10/keygen.c:6033
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 
-#: g10/keygen.c:5814 g10/keygen.c:6013
+#: g10/keygen.c:5845 g10/keygen.c:6044
 #, c-format
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 
-#: g10/keygen.c:5826 g10/keygen.c:5828
+#: g10/keygen.c:5857 g10/keygen.c:5859
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Secret parts of primary key are not available.\n"
 
-#: g10/keygen.c:5835 g10/keygen.c:5837
+#: g10/keygen.c:5866 g10/keygen.c:5868
 #, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Secret parts of primary key are stored on-card.\n"
 
-#: g10/keygen.c:5857 g10/keygen.c:6027
+#: g10/keygen.c:5888 g10/keygen.c:6058
 msgid "Really create? (y/N) "
 msgstr "Really create? (y/N) "
 
@@ -5705,33 +5717,33 @@ msgstr "      Key fingerprint ="
 msgid "      Card serial no. ="
 msgstr "      Card serial no. ="
 
-#: g10/keyring.c:1467
+#: g10/keyring.c:1477
 #, c-format
 msgid "caching keyring '%s'\n"
 msgstr "caching keyring ‘%s’\n"
 
-#: g10/keyring.c:1541
+#: g10/keyring.c:1551
 #, c-format
 msgid "%lu keys cached so far (%lu signature)\n"
 msgid_plural "%lu keys cached so far (%lu signatures)\n"
 msgstr[0] "%lu keys cached so far (%lu signature)\n"
 msgstr[1] "%lu keys cached so far (%lu signatures)\n"
 
-#: g10/keyring.c:1557
+#: g10/keyring.c:1567
 #, c-format
 msgid "%lu key cached"
 msgid_plural "%lu keys cached"
 msgstr[0] "%lu key cached"
 msgstr[1] "%lu keys cached"
 
-#: g10/keyring.c:1559
+#: g10/keyring.c:1569
 #, c-format
 msgid " (%lu signature)\n"
 msgid_plural " (%lu signatures)\n"
 msgstr[0] " (%lu signature)\n"
 msgstr[1] " (%lu signatures)\n"
 
-#: g10/keyring.c:1636
+#: g10/keyring.c:1646
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: keyring created\n"
@@ -5760,77 +5772,72 @@ msgstr "automatically retrieve keys when verifying signatures"
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "honor the preferred keyserver URL set on the key"
 
-#: g10/keyserver.c:537
+#: g10/keyserver.c:360
 msgid "disabled"
 msgstr "disabled"
 
-#: g10/keyserver.c:740
+#: g10/keyserver.c:563
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Enter number(s), N)ext, or Q)uit > "
 
-#: g10/keyserver.c:846
+#: g10/keyserver.c:669
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "invalid keyserver protocol (us %d!=handler %d)\n"
 
-#: g10/keyserver.c:986 g10/keyserver.c:1096
+#: g10/keyserver.c:809 g10/keyserver.c:919
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "“%s� not a key ID: skipping\n"
 
-#: g10/keyserver.c:1420 g10/keyserver.c:1453
+#: g10/keyserver.c:1217 g10/keyserver.c:1250
 #, 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:1427
+#: g10/keyserver.c:1224
 #, 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:1531
+#: g10/keyserver.c:1316
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "key “%s� not found on keyserver\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1319
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "key not found on keyserver\n"
 
-#: g10/keyserver.c:1722
-#, c-format
-msgid "requesting key %s from %s server %s\n"
-msgstr "requesting key %s from %s server %s\n"
-
-#: g10/keyserver.c:1726
+#: g10/keyserver.c:1481
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "requesting key %s from %s\n"
 
-#: g10/keyserver.c:1841 g10/keyserver.c:2020
+#: g10/keyserver.c:1600 g10/keyserver.c:1793
 #, c-format
 msgid "no keyserver known\n"
 msgstr "no keyserver known\n"
 
-#: g10/keyserver.c:1856 g10/skclist.c:213 g10/skclist.c:241
+#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "skipped “%s�: %s\n"
 
-#: g10/keyserver.c:1860
+#: g10/keyserver.c:1619
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "sending key %s to %s\n"
 
-#: g10/keyserver.c:1901
+#: g10/keyserver.c:1662
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr "requesting key from ‘%s’\n"
 
-#: g10/keyserver.c:1917
+#: g10/keyserver.c:1680
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "WARNING: unable to fetch URI %s: %s\n"
@@ -5855,67 +5862,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:472
+#: g10/mainproc.c:473
 #, c-format
 msgid "public key is %s\n"
 msgstr "public key is %s\n"
 
-#: g10/mainproc.c:524
+#: g10/mainproc.c:525
 #, 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:528 g10/pkclist.c:231
+#: g10/mainproc.c:529 g10/pkclist.c:231
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      “%s�\n"
 
-#: g10/mainproc.c:532
+#: g10/mainproc.c:533
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "encrypted with %s key, ID %s\n"
 
-#: g10/mainproc.c:552 g10/mainproc.c:935
+#: g10/mainproc.c:553 g10/mainproc.c:937
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "WARNING: multiple plaintexts seen\n"
 
-#: g10/mainproc.c:560
+#: g10/mainproc.c:561
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "encrypted with %lu passphrases\n"
 
-#: g10/mainproc.c:562
+#: g10/mainproc.c:563
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "encrypted with 1 passphrase\n"
 
-#: g10/mainproc.c:577 g10/mainproc.c:602
+#: g10/mainproc.c:578 g10/mainproc.c:603
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "public key decryption failed: %s\n"
 
-#: g10/mainproc.c:613
+#: g10/mainproc.c:614
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "public key encrypted data: good DEK\n"
 
-#: g10/mainproc.c:642 g10/mainproc.c:663
+#: g10/mainproc.c:643 g10/mainproc.c:664
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "assuming %s encrypted data\n"
 
-#: g10/mainproc.c:649
+#: g10/mainproc.c:650
 #, 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:742 g10/mainproc.c:780
+#: g10/mainproc.c:744 g10/mainproc.c:782
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "WARNING: message was not integrity protected\n"
 
-#: g10/mainproc.c:753
+#: g10/mainproc.c:755
 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"
@@ -5925,179 +5932,179 @@ msgstr ""
 "likely that this message is legitimate.  This is because back\n"
 "then integrity protection was not widely used.\n"
 
-#: g10/mainproc.c:756
+#: g10/mainproc.c:758
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr "Use the option ‘%s’ to decrypt anyway.\n"
 
-#: g10/mainproc.c:761
+#: g10/mainproc.c:763
 #, c-format
 msgid "decryption forced to fail!\n"
 msgstr "decryption forced to fail!\n"
 
-#: g10/mainproc.c:773
+#: g10/mainproc.c:775
 #, c-format
 msgid "decryption okay\n"
 msgstr "decryption okay\n"
 
-#: g10/mainproc.c:786
+#: g10/mainproc.c:788
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "WARNING: encrypted message has been manipulated!\n"
 
-#: g10/mainproc.c:804
+#: g10/mainproc.c:806
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decryption failed: %s\n"
 
-#: g10/mainproc.c:851
+#: g10/mainproc.c:853
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "Note: sender requested “for-your-eyes-only�\n"
 
-#: g10/mainproc.c:858
+#: g10/mainproc.c:860
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "original file name='%.*s'\n"
 
-#: g10/mainproc.c:1135
+#: g10/mainproc.c:1137
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "standalone revocation - use “gpg --import� to apply\n"
 
-#: g10/mainproc.c:1440 g10/mainproc.c:1483
+#: g10/mainproc.c:1442 g10/mainproc.c:1485
 #, c-format
 msgid "no signature found\n"
 msgstr "no signature found\n"
 
-#: g10/mainproc.c:1763
+#: g10/mainproc.c:1765
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "BAD signature from “%s�"
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1767
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Expired signature from “%s�"
 
-#: g10/mainproc.c:1767
+#: g10/mainproc.c:1769
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Good signature from “%s�"
 
-#: g10/mainproc.c:1789
+#: g10/mainproc.c:1791
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "signature verification suppressed\n"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1905
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "can't handle this ambiguous signature data\n"
 
-#: g10/mainproc.c:1919 g10/mainproc.c:1926
+#: g10/mainproc.c:1921 g10/mainproc.c:1928
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Signature made %s\n"
 
-#: g10/mainproc.c:1920 g10/mainproc.c:1927 sm/verify.c:480
+#: g10/mainproc.c:1922 g10/mainproc.c:1929 sm/verify.c:480
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               using %s key %s\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1933
 #, 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:1937
+#: g10/mainproc.c:1939
 #, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "               issuer “%s�\n"
 
-#: g10/mainproc.c:1992
+#: g10/mainproc.c:1994
 #, c-format
 msgid "Key available at: "
 msgstr "Key available at: "
 
-#: g10/mainproc.c:2034
+#: g10/mainproc.c:2036
 #, 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:2234
+#: g10/mainproc.c:2236
 msgid "[uncertain]"
 msgstr "[uncertain]"
 
-#: g10/mainproc.c:2272
+#: g10/mainproc.c:2274
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                aka “%s�"
 
-#: g10/mainproc.c:2347
+#: g10/mainproc.c:2349
 #, 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:2363
+#: g10/mainproc.c:2365
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Signature expired %s\n"
 
-#: g10/mainproc.c:2368
+#: g10/mainproc.c:2370
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Signature expires %s\n"
 
-#: g10/mainproc.c:2379
+#: g10/mainproc.c:2381
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s signature, digest algorithm %s%s%s\n"
 
-#: g10/mainproc.c:2380
+#: g10/mainproc.c:2382
 msgid "binary"
 msgstr "binary"
 
-#: g10/mainproc.c:2381
+#: g10/mainproc.c:2383
 msgid "textmode"
 msgstr "textmode"
 
-#: g10/mainproc.c:2381 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2383 g10/trust.c:112 dirmngr/ocsp.c:793
 msgid "unknown"
 msgstr "unknown"
 
-#: g10/mainproc.c:2383
+#: g10/mainproc.c:2385
 msgid ", key algorithm "
 msgstr ", key algorithm "
 
-#: g10/mainproc.c:2418
+#: g10/mainproc.c:2420
 #, 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:2457
+#: g10/mainproc.c:2459
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Can't check signature: %s\n"
 
-#: g10/mainproc.c:2553 g10/mainproc.c:2572 g10/mainproc.c:2696
+#: g10/mainproc.c:2555 g10/mainproc.c:2574 g10/mainproc.c:2698
 #, c-format
 msgid "not a detached signature\n"
 msgstr "not a detached signature\n"
 
-#: g10/mainproc.c:2606
+#: g10/mainproc.c:2608
 #, 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:2615
+#: g10/mainproc.c:2617
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "standalone signature of class 0x%02x\n"
 
-#: g10/mainproc.c:2700
+#: g10/mainproc.c:2702
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "old style (PGP 2.x) signature\n"
@@ -6278,46 +6285,50 @@ msgstr "Unknown critical signature notation: "
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacket of type %d has critical bit set\n"
 
-#: g10/passphrase.c:208
+#: g10/passphrase.c:201 sm/decrypt.c:669
+msgid "Please enter the passphrase for decryption."
+msgstr "Please enter the passphrase for decryption."
+
+#: g10/passphrase.c:203
 msgid "Enter passphrase\n"
 msgstr "Enter passphrase\n"
 
-#: g10/passphrase.c:219
+#: g10/passphrase.c:227
 #, c-format
 msgid "cancelled by user\n"
 msgstr "cancelled by user\n"
 
-#: g10/passphrase.c:460
+#: g10/passphrase.c:472
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (main key ID %s)"
 
-#: g10/passphrase.c:467
+#: g10/passphrase.c:479
 msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 msgstr "Please enter the passphrase to unlock the OpenPGP secret key:"
 
-#: g10/passphrase.c:471
+#: g10/passphrase.c:483
 msgid "Please enter the passphrase to import the OpenPGP secret key:"
 msgstr "Please enter the passphrase to import the OpenPGP secret key:"
 
-#: g10/passphrase.c:476
+#: g10/passphrase.c:488
 msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 msgstr "Please enter the passphrase to export the OpenPGP secret subkey:"
 
-#: g10/passphrase.c:479
+#: g10/passphrase.c:491
 msgid "Please enter the passphrase to export the OpenPGP secret key:"
 msgstr "Please enter the passphrase to export the OpenPGP secret key:"
 
-#: g10/passphrase.c:484
+#: g10/passphrase.c:496
 msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 msgstr ""
 "Do you really want to permanently delete the OpenPGP secret subkey key:"
 
-#: g10/passphrase.c:487
+#: g10/passphrase.c:499
 msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgstr "Do you really want to permanently delete the OpenPGP secret key:"
 
-#: g10/passphrase.c:496
+#: g10/passphrase.c:508
 #, c-format
 msgid ""
 "%s\n"
@@ -6486,7 +6497,7 @@ msgstr ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 
-#: g10/pkclist.c:313 g10/revoke.c:803
+#: g10/pkclist.c:313 g10/revoke.c:804
 msgid "Your decision? "
 msgstr "Your decision? "
 
@@ -6773,7 +6784,7 @@ msgstr "can't open signed data ‘%s’\n"
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "can't open signed data fd=%d: %s\n"
 
-#: g10/pubkey-enc.c:99 sm/decrypt.c:879
+#: g10/pubkey-enc.c:99 sm/decrypt.c:1329
 #, c-format
 msgid "key %s is not suitable for decryption in %s mode\n"
 msgstr "key %s is not suitable for decryption in %s mode\n"
@@ -6819,7 +6830,7 @@ msgid "Note: key has been revoked"
 msgstr "Note: key has been revoked"
 
 #: g10/revoke.c:100 g10/revoke.c:126 g10/revoke.c:172 g10/revoke.c:184
-#: g10/revoke.c:502
+#: g10/revoke.c:503
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet failed: %s\n"
@@ -6845,11 +6856,11 @@ msgstr "Secret key is not available.\n"
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Create a designated revocation certificate for this key? (y/N) "
 
-#: g10/revoke.c:334 g10/revoke.c:744
+#: g10/revoke.c:334 g10/revoke.c:745
 msgid "ASCII armored output forced.\n"
 msgstr "ASCII armored output forced.\n"
 
-#: g10/revoke.c:350 g10/revoke.c:481
+#: g10/revoke.c:350 g10/revoke.c:482
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet failed: %s\n"
@@ -6863,11 +6874,11 @@ msgstr "Revocation certificate created.\n"
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "no revocation keys found for “%s�\n"
 
-#: g10/revoke.c:567
+#: g10/revoke.c:568
 msgid "This is a revocation certificate for the OpenPGP key:"
 msgstr "This is a revocation certificate for the OpenPGP key:"
 
-#: g10/revoke.c:583
+#: g10/revoke.c:584
 msgid ""
 "A revocation certificate is a kind of \"kill switch\" to publicly\n"
 "declare that a key shall not anymore be used.  It is not possible\n"
@@ -6877,7 +6888,7 @@ msgstr ""
 "declare that a key shall not anymore be used.  It is not possible\n"
 "to retract such a revocation certificate once it has been published."
 
-#: g10/revoke.c:586
+#: g10/revoke.c:587
 msgid ""
 "Use it to revoke this key in case of a compromise or loss of\n"
 "the secret key.  However, if the secret key is still accessible,\n"
@@ -6891,7 +6902,7 @@ msgstr ""
 "a reason for the revocation.  For details see the description of\n"
 "of the gpg command “--generate-revocation� in the GnuPG manual."
 
-#: g10/revoke.c:592
+#: g10/revoke.c:593
 msgid ""
 "To avoid an accidental use of this file, a colon has been inserted\n"
 "before the 5 dashes below.  Remove this colon with a text editor\n"
@@ -6901,12 +6912,12 @@ msgstr ""
 "before the 5 dashes below.  Remove this colon with a text editor\n"
 "before importing and publishing this revocation certificate."
 
-#: g10/revoke.c:611
+#: g10/revoke.c:612
 #, c-format
 msgid "revocation certificate stored as '%s.rev'\n"
 msgstr "revocation certificate stored as ‘%s.rev’\n"
 
-#: g10/revoke.c:655
+#: g10/revoke.c:656
 #, c-format
 msgid "secret key \"%s\" not found\n"
 msgstr "secret key “%s� not found\n"
@@ -6914,21 +6925,21 @@ msgstr "secret key “%s� not found\n"
 #. TRANSLATORS: The %s prints a key specification which
 #. for example has been given at the command line.  Several lines
 #. lines with secret key infos are printed after this message.
-#: g10/revoke.c:680
+#: g10/revoke.c:681
 #, c-format
 msgid "'%s' matches multiple secret keys:\n"
 msgstr "‘%s’ matches multiple secret keys:\n"
 
-#: g10/revoke.c:705
+#: g10/revoke.c:706
 #, c-format
 msgid "error searching the keyring: %s\n"
 msgstr "error searching the keyring: %s\n"
 
-#: g10/revoke.c:728
+#: g10/revoke.c:729
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Create a revocation certificate for this key? (y/N) "
 
-#: g10/revoke.c:752
+#: g10/revoke.c:753
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -6946,33 +6957,33 @@ msgstr ""
 "your media become unreadable.  But have some caution:  The print system of\n"
 "your machine might store the data and make it available to others!\n"
 
-#: g10/revoke.c:786
+#: g10/revoke.c:787
 msgid "Please select the reason for the revocation:\n"
 msgstr "Please select the reason for the revocation:\n"
 
-#: g10/revoke.c:796
+#: g10/revoke.c:797
 msgid "Cancel"
 msgstr "Cancel"
 
-#: g10/revoke.c:798
+#: g10/revoke.c:799
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Probably you want to select %d here)\n"
 
-#: g10/revoke.c:839
+#: g10/revoke.c:843
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Enter an optional description; end it with an empty line:\n"
 
-#: g10/revoke.c:867
+#: g10/revoke.c:871
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Reason for revocation: %s\n"
 
-#: g10/revoke.c:869
+#: g10/revoke.c:873
 msgid "(No description given)\n"
 msgstr "(No description given)\n"
 
-#: g10/revoke.c:874
+#: g10/revoke.c:878
 msgid "Is this okay? (y/N) "
 msgstr "Is this okay? (y/N) "
 
@@ -7135,22 +7146,22 @@ msgstr "signing:"
 msgid "%s.%s encryption will be used\n"
 msgstr "%s.%s encryption will be used\n"
 
-#: g10/skclist.c:172 g10/skclist.c:253
+#: g10/skclist.c:173 g10/skclist.c:254
 #, c-format
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr "key is not flagged as insecure - can't use it with the faked RNG!\n"
 
-#: g10/skclist.c:204
+#: g10/skclist.c:205
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "skipped “%s�: duplicated\n"
 
-#: g10/skclist.c:223
+#: g10/skclist.c:224
 #, c-format
 msgid "skipped: secret key already present\n"
 msgstr "skipped: secret key already present\n"
 
-#: g10/skclist.c:242
+#: g10/skclist.c:243
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "this is a PGP generated Elgamal key which is not secure for signatures!"
@@ -7371,10 +7382,10 @@ msgstr "unsupported TOFU database version: %s\n"
 msgid "TOFU DB error"
 msgstr "TOFU DB error"
 
-#: g10/tofu.c:687 g10/tofu.c:2073 g10/tofu.c:2354 g10/tofu.c:2373
-#: g10/tofu.c:2386 g10/tofu.c:2398 g10/tofu.c:2413 g10/tofu.c:2425
-#: g10/tofu.c:3021 g10/tofu.c:3038 g10/tofu.c:3075 g10/tofu.c:3092
-#: g10/tofu.c:3404
+#: g10/tofu.c:687 g10/tofu.c:2077 g10/tofu.c:2358 g10/tofu.c:2377
+#: g10/tofu.c:2390 g10/tofu.c:2402 g10/tofu.c:2417 g10/tofu.c:2429
+#: g10/tofu.c:3025 g10/tofu.c:3042 g10/tofu.c:3079 g10/tofu.c:3096
+#: g10/tofu.c:3408
 #, c-format
 msgid "error reading TOFU database: %s\n"
 msgstr "error reading TOFU database: %s\n"
@@ -7394,7 +7405,7 @@ msgstr "error initializing TOFU database: %s\n"
 msgid "error opening TOFU database '%s': %s\n"
 msgstr "error opening TOFU database '%s': %s\n"
 
-#: g10/tofu.c:1148 g10/tofu.c:3458 g10/tofu.c:3604
+#: g10/tofu.c:1148 g10/tofu.c:3462 g10/tofu.c:3608
 #, c-format
 msgid "error updating TOFU database: %s\n"
 msgstr "error updating TOFU database: %s\n"
@@ -7437,108 +7448,108 @@ msgstr "error gathering other user IDs: %s\n"
 msgid "This key's user IDs:\n"
 msgstr "This key's user IDs:\n"
 
-#: g10/tofu.c:1634 g10/tofu.c:1799
+#: g10/tofu.c:1634 g10/tofu.c:1801
 #, c-format
 msgid "policy: %s"
 msgstr "policy: %s"
 
-#: g10/tofu.c:1725
+#: g10/tofu.c:1727
 #, c-format
 msgid "error gathering signature stats: %s\n"
 msgstr "error gathering signature stats: %s\n"
 
-#: g10/tofu.c:1729
+#: g10/tofu.c:1731
 #, c-format
 msgid "The email address \"%s\" is associated with %d key:\n"
 msgid_plural "The email address \"%s\" is associated with %d keys:\n"
 msgstr[0] "The email address “%s� is associated with %d key:\n"
 msgstr[1] "The email address “%s� is associated with %d keys:\n"
 
-#: g10/tofu.c:1747
+#: g10/tofu.c:1749
 #, c-format
 msgid "Statistics for keys with the email address \"%s\":\n"
 msgstr "Statistics for keys with the email address “%s�:\n"
 
-#: g10/tofu.c:1797
+#: g10/tofu.c:1799
 msgid "this key"
 msgstr "this key"
 
-#: g10/tofu.c:1823
+#: g10/tofu.c:1825
 #, c-format
 msgid "Verified %d message."
 msgid_plural "Verified %d messages."
 msgstr[0] "Verified %d message."
 msgstr[1] "Verified %d messages."
 
-#: g10/tofu.c:1827
+#: g10/tofu.c:1829
 #, c-format
 msgid "Encrypted %d message."
 msgid_plural "Encrypted %d messages."
 msgstr[0] "Encrypted %d message."
 msgstr[1] "Encrypted %d messages."
 
-#: g10/tofu.c:1834
+#: g10/tofu.c:1836
 #, c-format
 msgid "Verified %d message in the future."
 msgid_plural "Verified %d messages in the future."
 msgstr[0] "Verified %d message in the future."
 msgstr[1] "Verified %d messages in the future."
 
-#: g10/tofu.c:1838
+#: g10/tofu.c:1840
 #, c-format
 msgid "Encrypted %d message in the future."
 msgid_plural "Encrypted %d messages in the future."
 msgstr[0] "Encrypted %d message in the future."
 msgstr[1] "Encrypted %d messages in the future."
 
-#: g10/tofu.c:1852
+#: g10/tofu.c:1854
 #, c-format
 msgid "Messages verified over the past %d day: %d."
 msgid_plural "Messages verified over the past %d days: %d."
 msgstr[0] "Messages verified over the past %d day: %d."
 msgstr[1] "Messages verified over the past %d days: %d."
 
-#: g10/tofu.c:1858
+#: g10/tofu.c:1860
 #, c-format
 msgid "Messages encrypted over the past %d day: %d."
 msgid_plural "Messages encrypted over the past %d days: %d."
 msgstr[0] "Messages encrypted over the past %d day: %d."
 msgstr[1] "Messages encrypted over the past %d days: %d."
 
-#: g10/tofu.c:1868
+#: g10/tofu.c:1870
 #, c-format
 msgid "Messages verified over the past %d month: %d."
 msgid_plural "Messages verified over the past %d months: %d."
 msgstr[0] "Messages verified over the past %d month: %d."
 msgstr[1] "Messages verified over the past %d months: %d."
 
-#: g10/tofu.c:1874
+#: g10/tofu.c:1876
 #, c-format
 msgid "Messages encrypted over the past %d month: %d."
 msgid_plural "Messages encrypted over the past %d months: %d."
 msgstr[0] "Messages encrypted over the past %d month: %d."
 msgstr[1] "Messages encrypted over the past %d months: %d."
 
-#: g10/tofu.c:1884
+#: g10/tofu.c:1886
 #, c-format
 msgid "Messages verified over the past %d year: %d."
 msgid_plural "Messages verified over the past %d years: %d."
 msgstr[0] "Messages verified over the past %d year: %d."
 msgstr[1] "Messages verified over the past %d years: %d."
 
-#: g10/tofu.c:1890
+#: g10/tofu.c:1892
 #, c-format
 msgid "Messages encrypted over the past %d year: %d."
 msgid_plural "Messages encrypted over the past %d years: %d."
 msgstr[0] "Messages encrypted over the past %d year: %d."
 msgstr[1] "Messages encrypted over the past %d years: %d."
 
-#: g10/tofu.c:1898
+#: g10/tofu.c:1900
 #, c-format
 msgid "Messages verified in the past: %d."
 msgstr "Messages verified in the past: %d."
 
-#: g10/tofu.c:1902
+#: g10/tofu.c:1904
 #, c-format
 msgid "Messages encrypted in the past: %d."
 msgstr "Messages encrypted in the past: %d."
@@ -7546,128 +7557,128 @@ msgstr "Messages encrypted in the past: %d."
 #. TRANSLATORS: Please translate the text found in the source
 #. * file below.  We don't directly internationalize that text so
 #. * that we can tweak it without breaking translations.
-#: g10/tofu.c:1919
+#: g10/tofu.c:1921
 msgid "TOFU detected a binding conflict"
 msgstr "TOFU detected a binding conflict"
 
 #. TRANSLATORS: Two letters (normally the lower and upper case
 #. * version of the hotkey) for each of the five choices.  If
 #. * there is only one choice in your language, repeat it.
-#: g10/tofu.c:1961
+#: g10/tofu.c:1963
 msgid "gGaAuUrRbB"
 msgstr "gGaAuUrRbB"
 
-#: g10/tofu.c:1967
+#: g10/tofu.c:1969
 msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 
-#: g10/tofu.c:1975
+#: g10/tofu.c:1978
 msgid "Defaulting to unknown.\n"
 msgstr "Defaulting to unknown.\n"
 
-#: g10/tofu.c:2093 g10/tofu.c:2228
+#: g10/tofu.c:2097 g10/tofu.c:2232
 #, c-format
 msgid "TOFU db corruption detected.\n"
 msgstr "TOFU db corruption detected.\n"
 
-#: g10/tofu.c:2829
+#: g10/tofu.c:2833
 #, c-format
 msgid "error changing TOFU policy: %s\n"
 msgstr "error changing TOFU policy: %s\n"
 
-#: g10/tofu.c:2880
+#: g10/tofu.c:2884
 #, c-format
 msgid "%lld~year"
 msgid_plural "%lld~years"
 msgstr[0] "%lld~year"
 msgstr[1] "%lld~years"
 
-#: g10/tofu.c:2885
+#: g10/tofu.c:2889
 #, c-format
 msgid "%lld~month"
 msgid_plural "%lld~months"
 msgstr[0] "%lld~month"
 msgstr[1] "%lld~months"
 
-#: g10/tofu.c:2890
+#: g10/tofu.c:2894
 #, c-format
 msgid "%lld~week"
 msgid_plural "%lld~weeks"
 msgstr[0] "%lld~week"
 msgstr[1] "%lld~weeks"
 
-#: g10/tofu.c:2895
+#: g10/tofu.c:2899
 #, c-format
 msgid "%lld~day"
 msgid_plural "%lld~days"
 msgstr[0] "%lld~day"
 msgstr[1] "%lld~days"
 
-#: g10/tofu.c:2900
+#: g10/tofu.c:2904
 #, c-format
 msgid "%lld~hour"
 msgid_plural "%lld~hours"
 msgstr[0] "%lld~hour"
 msgstr[1] "%lld~hours"
 
-#: g10/tofu.c:2905
+#: g10/tofu.c:2909
 #, c-format
 msgid "%lld~minute"
 msgid_plural "%lld~minutes"
 msgstr[0] "%lld~minute"
 msgstr[1] "%lld~minutes"
 
-#: g10/tofu.c:2907
+#: g10/tofu.c:2911
 #, c-format
 msgid "%lld~second"
 msgid_plural "%lld~seconds"
 msgstr[0] "%lld~second"
 msgstr[1] "%lld~seconds"
 
-#: g10/tofu.c:3145
+#: g10/tofu.c:3149
 #, c-format
 msgid "%s: Verified 0~signatures and encrypted 0~messages."
 msgstr "%s: Verified 0~signatures and encrypted 0~messages."
 
-#: g10/tofu.c:3151
+#: g10/tofu.c:3155
 #, c-format
 msgid "%s: Verified 0 signatures."
 msgstr "%s: Verified 0 signatures."
 
-#: g10/tofu.c:3165
+#: g10/tofu.c:3169
 msgid "Encrypted 0 messages."
 msgstr "Encrypted 0 messages."
 
-#: g10/tofu.c:3181
+#: g10/tofu.c:3185
 #, c-format
 msgid "(policy: %s)"
 msgstr "(policy: %s)"
 
-#: g10/tofu.c:3215
+#: g10/tofu.c:3219
 #, c-format
 msgid ""
 "Warning: we have yet to see a message signed using this key and user id!\n"
 msgstr ""
 "Warning: we have yet to see a message signed using this key and user id!\n"
 
-#: g10/tofu.c:3218
+#: g10/tofu.c:3222
 #, c-format
 msgid ""
 "Warning: we've only seen one message signed using this key and user id!\n"
 msgstr ""
 "Warning: we've only seen one message signed using this key and user id!\n"
 
-#: g10/tofu.c:3222
+#: g10/tofu.c:3226
 #, c-format
 msgid "Warning: you have yet to encrypt a message to this key!\n"
 msgstr "Warning: you have yet to encrypt a message to this key!\n"
 
-#: g10/tofu.c:3225
+#: g10/tofu.c:3229
 #, c-format
 msgid "Warning: you have only encrypted one message to this key!\n"
 msgstr "Warning: you have only encrypted one message to this key!\n"
 
-#: g10/tofu.c:3254
+#: g10/tofu.c:3258
 #, c-format
 msgid ""
 "Warning: if you think you've seen more signatures by this key and user id, "
@@ -7694,13 +7705,13 @@ msgstr[1] ""
 "  %s\n"
 "to mark it as being bad.\n"
 
-#: g10/tofu.c:3339 g10/tofu.c:3502 g10/tofu.c:3708 g10/tofu.c:3761
-#: g10/tofu.c:3902 g10/tofu.c:3979 g10/tofu.c:4017
+#: g10/tofu.c:3343 g10/tofu.c:3506 g10/tofu.c:3712 g10/tofu.c:3765
+#: g10/tofu.c:3906 g10/tofu.c:3983 g10/tofu.c:4021
 #, c-format
 msgid "error opening TOFU database: %s\n"
 msgstr "error opening TOFU database: %s\n"
 
-#: g10/tofu.c:3535
+#: g10/tofu.c:3539
 #, c-format
 msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
 msgstr "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
@@ -7765,7 +7776,7 @@ msgstr "using %s trust model\n"
 msgid "no need for a trustdb check\n"
 msgstr "no need for a trustdb check\n"
 
-#: g10/trustdb.c:601 g10/trustdb.c:2272
+#: g10/trustdb.c:601 g10/trustdb.c:2273
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "next trustdb check due at %s\n"
@@ -7795,59 +7806,59 @@ msgstr "please do a --check-trustdb\n"
 msgid "checking the trustdb\n"
 msgstr "checking the trustdb\n"
 
-#: g10/trustdb.c:1993
+#: g10/trustdb.c:1994
 #, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr[0] "%d key processed"
 msgstr[1] "%d keys processed"
 
-#: g10/trustdb.c:1996
+#: g10/trustdb.c:1997
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] " (%d validity count cleared)\n"
 msgstr[1] " (%d validity counts cleared)\n"
 
-#: g10/trustdb.c:2066
+#: g10/trustdb.c:2067
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "no ultimately trusted keys found\n"
 
-#: g10/trustdb.c:2080
+#: g10/trustdb.c:2081
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "public key of ultimately trusted key %s not found\n"
 
-#: g10/trustdb.c:2198
+#: g10/trustdb.c:2199
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 
-#: g10/trustdb.c:2279
+#: g10/trustdb.c:2280
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "unable to update trustdb version record: write failed: %s\n"
 
-#: g10/trust.c:125
+#: g10/trust.c:114
 msgid "undefined"
 msgstr "undefined"
 
-#: g10/trust.c:126
+#: g10/trust.c:115
 msgid "never"
 msgstr "never"
 
-#: g10/trust.c:127
+#: g10/trust.c:116
 msgid "marginal"
 msgstr "marginal"
 
-#: g10/trust.c:128
+#: g10/trust.c:117
 msgid "full"
 msgstr "full"
 
-#: g10/trust.c:129
+#: g10/trust.c:118
 msgid "ultimate"
 msgstr "ultimate"
 
@@ -7859,39 +7870,39 @@ msgstr "ultimate"
 #. It gets passed to atoi() so everything after the number is
 #. essentially a comment and need not be translated.  Either key and
 #. uid are both NULL, or neither are NULL.
-#: g10/trust.c:166
+#: g10/trust.c:155
 msgid "10 translator see trust.c:uid_trust_string_fixed"
 msgstr "10 translator see trust.c:uid_trust_string_fixed"
 
-#: g10/trust.c:169
+#: g10/trust.c:158
 msgid "[ revoked]"
 msgstr "[ revoked]"
 
-#: g10/trust.c:171 g10/trust.c:177
+#: g10/trust.c:160 g10/trust.c:166
 msgid "[ expired]"
 msgstr "[ expired]"
 
-#: g10/trust.c:176
+#: g10/trust.c:165
 msgid "[ unknown]"
 msgstr "[ unknown]"
 
-#: g10/trust.c:178
+#: g10/trust.c:167
 msgid "[  undef ]"
 msgstr "[  undef ]"
 
-#: g10/trust.c:179
+#: g10/trust.c:168
 msgid "[  never ]"
 msgstr "[  never ]"
 
-#: g10/trust.c:180
+#: g10/trust.c:169
 msgid "[marginal]"
 msgstr "[marginal]"
 
-#: g10/trust.c:181
+#: g10/trust.c:170
 msgid "[  full  ]"
 msgstr "[  full  ]"
 
-#: g10/trust.c:182
+#: g10/trust.c:171
 msgid "[ultimate]"
 msgstr "[ultimate]"
 
@@ -7949,16 +7960,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:4937 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2386
+#: scd/app-piv.c:1770 scd/app-p15.c:5035 scd/app-nks.c:1530
+#: scd/app-openpgp.c:2387
 #, 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:4956 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2402
+#: scd/app-piv.c:1787 scd/app-p15.c:5054 scd/app-nks.c:1549
+#: scd/app-openpgp.c:2403
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr "Remaining attempts: %d"
@@ -7987,10 +7998,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:2669
-#: scd/app-openpgp.c:2693 scd/app-openpgp.c:2871 scd/app-openpgp.c:2893
-#: scd/app-openpgp.c:3074 scd/app-openpgp.c:3361 scd/app-openpgp.c:3408
-#: scd/app-openpgp.c:3545 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2670
+#: scd/app-openpgp.c:2694 scd/app-openpgp.c:2872 scd/app-openpgp.c:2894
+#: scd/app-openpgp.c:3075 scd/app-openpgp.c:3362 scd/app-openpgp.c:3409
+#: scd/app-openpgp.c:3547 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN callback returned error: %s\n"
@@ -8010,92 +8021,92 @@ 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:3616
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3618
 #, c-format
 msgid "key already exists\n"
 msgstr "key already exists\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3620
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3622
 #, 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:3622
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3624
 #, c-format
 msgid "generating new key\n"
 msgstr "generating new key\n"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3624
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3626
 #, c-format
 msgid "writing new key\n"
 msgstr "writing new key\n"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4484 scd/app-openpgp.c:4767
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4486 scd/app-openpgp.c:4761
 #, 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:1615
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1616
 #, 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:1622
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1623
 #, 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:1732
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1733
 #, 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:4943
+#: scd/app-piv.c:3279 scd/app-openpgp.c:4937
 #, 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:4951
+#: scd/app-piv.c:3294 scd/app-openpgp.c:4945
 #, c-format
 msgid "generating key failed\n"
 msgstr "generating key failed\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4957
+#: scd/app-piv.c:3300 scd/app-openpgp.c:4951
 #, 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:1842 scd/app-openpgp.c:4966
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1843 scd/app-openpgp.c:4960
 #, 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:5035 scd/app-nks.c:2038
+#: scd/app-p15.c:5133 scd/app-nks.c:2038
 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:5038 scd/app-openpgp.c:2818
+#: scd/app-p15.c:5136 scd/app-openpgp.c:2819
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Please enter the Admin PIN"
 
-#: scd/app-p15.c:5040 scd/app-nks.c:2028
+#: scd/app-p15.c:5138 scd/app-nks.c:2028
 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:5043 scd/app-nks.c:2019
+#: scd/app-p15.c:5141 scd/app-nks.c:2019
 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:4321
+#: scd/app-nks.c:1468 scd/app-openpgp.c:4323
 #, 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:4333
+#: scd/app-nks.c:1476 scd/app-openpgp.c:4335
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "RSA public exponent missing or larger than %d bits\n"
@@ -8138,27 +8149,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:3442 scd/app-dinsig.c:534
+#: scd/app-nks.c:2221 scd/app-openpgp.c:3443 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:943
+#: scd/app-openpgp.c:944
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "failed to store the fingerprint: %s\n"
 
-#: scd/app-openpgp.c:956
+#: scd/app-openpgp.c:957
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "failed to store the creation date: %s\n"
 
-#: scd/app-openpgp.c:1427 scd/app-openpgp.c:3389 scd/app-openpgp.c:5715
+#: scd/app-openpgp.c:1428 scd/app-openpgp.c:3390 scd/app-openpgp.c:5709
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "error retrieving CHV status from card\n"
 
-#: scd/app-openpgp.c:1949
+#: scd/app-openpgp.c:1950
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "reading public key failed: %s\n"
@@ -8166,42 +8177,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:2373
+#: scd/app-openpgp.c:2374
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 
-#: scd/app-openpgp.c:2621
+#: scd/app-openpgp.c:2622
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "using default PIN as %s\n"
 
-#: scd/app-openpgp.c:2628
+#: scd/app-openpgp.c:2629
 #, 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:2641
+#: scd/app-openpgp.c:2642
 msgid "||Please unlock the card"
 msgstr "||Please unlock the card"
 
-#: scd/app-openpgp.c:2700 scd/app-openpgp.c:2900 scd/app-openpgp.c:3368
+#: scd/app-openpgp.c:2701 scd/app-openpgp.c:2901 scd/app-openpgp.c:3369
 #, 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:2717 scd/app-openpgp.c:2760 scd/app-openpgp.c:2917
-#: scd/app-openpgp.c:5325
+#: scd/app-openpgp.c:2718 scd/app-openpgp.c:2761 scd/app-openpgp.c:2918
+#: scd/app-openpgp.c:5319
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "verify CHV%d failed: %s\n"
 
-#: scd/app-openpgp.c:2804 scd/app-openpgp.c:5724
+#: scd/app-openpgp.c:2805 scd/app-openpgp.c:5718
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "card is permanently locked!\n"
 
-#: scd/app-openpgp.c:2808
+#: scd/app-openpgp.c:2809
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8209,20 +8220,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:2841
+#: scd/app-openpgp.c:2842
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr "access to admin commands is not configured\n"
 
-#: scd/app-openpgp.c:3355
+#: scd/app-openpgp.c:3356
 msgid "||Please enter the PIN"
 msgstr "||Please enter the PIN"
 
-#: scd/app-openpgp.c:3404
+#: scd/app-openpgp.c:3405
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Please enter the Reset Code for the card"
 
-#: scd/app-openpgp.c:3414 scd/app-openpgp.c:3481
+#: scd/app-openpgp.c:3415 scd/app-openpgp.c:3484
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "Reset Code is too short; minimum length is %d\n"
@@ -8230,79 +8241,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:3437
+#: scd/app-openpgp.c:3438
 msgid "|RN|New Reset Code"
 msgstr "|RN|New Reset Code"
 
-#: scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3439
 msgid "|AN|New Admin PIN"
 msgstr "|AN|New Admin PIN"
 
-#: scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3439
 msgid "|N|New PIN"
 msgstr "|N|New PIN"
 
-#: scd/app-openpgp.c:3541
+#: scd/app-openpgp.c:3543
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "||Please enter the Admin PIN and New Admin PIN"
 
-#: scd/app-openpgp.c:3542
+#: scd/app-openpgp.c:3544
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Please enter the PIN and New PIN"
 
-#: scd/app-openpgp.c:3600 scd/app-openpgp.c:5026
+#: scd/app-openpgp.c:3602 scd/app-openpgp.c:5020
 #, c-format
 msgid "error reading application data\n"
 msgstr "error reading application data\n"
 
-#: scd/app-openpgp.c:3606 scd/app-openpgp.c:5033
+#: scd/app-openpgp.c:3608 scd/app-openpgp.c:5027
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "error reading fingerprint DO\n"
 
-#: scd/app-openpgp.c:4302 scd/app-openpgp.c:4657
+#: scd/app-openpgp.c:4304 scd/app-openpgp.c:4653
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "creation timestamp missing\n"
 
-#: scd/app-openpgp.c:4343 scd/app-openpgp.c:4351
+#: scd/app-openpgp.c:4345 scd/app-openpgp.c:4353
 #, 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:4651
+#: scd/app-openpgp.c:4647
 #, c-format
 msgid "unsupported curve\n"
 msgstr "unsupported curve\n"
 
-#: scd/app-openpgp.c:4991
+#: scd/app-openpgp.c:4985
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "invalid structure of OpenPGP card (DO 0x93)\n"
 
-#: scd/app-openpgp.c:5041
+#: scd/app-openpgp.c:5035
 #, 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:5240
+#: scd/app-openpgp.c:5234
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "card does not support digest algorithm %s\n"
 
-#: scd/app-openpgp.c:5298
+#: scd/app-openpgp.c:5292
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "signatures created so far: %lu\n"
 
-#: scd/app-openpgp.c:5729
+#: scd/app-openpgp.c:5723
 #, 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:6241 scd/app-openpgp.c:6252
+#: scd/app-openpgp.c:6250 scd/app-openpgp.c:6261
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "can't access %s - invalid OpenPGP card?\n"
@@ -8322,7 +8333,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:274 dirmngr/dirmngr.c:198
+#: scd/scdaemon.c:136 sm/gpgsm.c:274 dirmngr/dirmngr.c:199
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LEVEL|set the debugging level to LEVEL"
 
@@ -8384,12 +8395,12 @@ 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:2104
+#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2143
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "handler for fd %d started\n"
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2112
+#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2151
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "handler for fd %d terminated\n"
@@ -8399,11 +8410,11 @@ msgstr "handler for fd %d terminated\n"
 msgid "validation model requested by certificate: %s"
 msgstr "validation model requested by certificate: %s"
 
-#: sm/certchain.c:199 sm/certchain.c:2172
+#: sm/certchain.c:199 sm/certchain.c:2174
 msgid "chain"
 msgstr "chain"
 
-#: sm/certchain.c:200 sm/certchain.c:2172
+#: sm/certchain.c:200 sm/certchain.c:2174
 msgid "shell"
 msgstr "shell"
 
@@ -8436,224 +8447,224 @@ msgstr "Note: non-critical certificate policy not allowed"
 msgid "certificate policy not allowed"
 msgstr "certificate policy not allowed"
 
-#: sm/certchain.c:595 sm/keydb.c:1891 sm/keydb.c:1980
+#: sm/certchain.c:596 sm/keydb.c:1913 sm/keydb.c:2002
 #, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "failed to get the fingerprint\n"
 
-#: sm/certchain.c:624
+#: sm/certchain.c:625
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr "looking up issuer at external location\n"
 
-#: sm/certchain.c:644
+#: sm/certchain.c:645
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "number of issuers matching: %d\n"
 
-#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#: sm/certchain.c:724 dirmngr/ocsp.c:683
 #, c-format
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "can't get authorityInfoAccess: %s\n"
 
-#: sm/certchain.c:791
+#: sm/certchain.c:792
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr "looking up issuer from the Dirmngr cache\n"
 
-#: sm/certchain.c:816
+#: sm/certchain.c:817
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "number of matching certificates: %d\n"
 
-#: sm/certchain.c:819
+#: sm/certchain.c:820
 #, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "dirmngr cache-only key lookup failed: %s\n"
 
-#: sm/certchain.c:1046 sm/certchain.c:1561 sm/certchain.c:2200 sm/decrypt.c:643
-#: sm/encrypt.c:620 sm/import.c:414 sm/keydb.c:1898 sm/keydb.c:1987
-#: sm/sign.c:428 sm/verify.c:117
+#: sm/certchain.c:1047 sm/certchain.c:1562 sm/certchain.c:2202
+#: sm/decrypt.c:1084 sm/encrypt.c:621 sm/import.c:414 sm/keydb.c:1920
+#: sm/keydb.c:2009 sm/sign.c:428 sm/verify.c:117
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "failed to allocate keyDB handle\n"
 
-#: sm/certchain.c:1232
+#: sm/certchain.c:1233
 msgid "certificate has been revoked"
 msgstr "certificate has been revoked"
 
-#: sm/certchain.c:1247
+#: sm/certchain.c:1248
 msgid "the status of the certificate is unknown"
 msgstr "the status of the certificate is unknown"
 
-#: sm/certchain.c:1254
+#: sm/certchain.c:1255
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr "please make sure that the “dirmngr� is properly installed\n"
 
-#: sm/certchain.c:1260
+#: sm/certchain.c:1261
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "checking the CRL failed: %s"
 
-#: sm/certchain.c:1289 sm/certchain.c:1357 dirmngr/validate.c:497
+#: sm/certchain.c:1290 sm/certchain.c:1358 dirmngr/validate.c:497
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "certificate with invalid validity: %s"
 
-#: sm/certchain.c:1304 sm/certchain.c:1389 dirmngr/validate.c:515
+#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:515
 #, c-format
 msgid "certificate not yet valid"
 msgstr "certificate not yet valid"
 
-#: sm/certchain.c:1305 sm/certchain.c:1390
+#: sm/certchain.c:1306 sm/certchain.c:1391
 msgid "root certificate not yet valid"
 msgstr "root certificate not yet valid"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1307 sm/certchain.c:1392
 msgid "intermediate certificate not yet valid"
 msgstr "intermediate certificate not yet valid"
 
-#: sm/certchain.c:1319 dirmngr/validate.c:526
+#: sm/certchain.c:1320 dirmngr/validate.c:526
 #, c-format
 msgid "certificate has expired"
 msgstr "certificate has expired"
 
-#: sm/certchain.c:1320
+#: sm/certchain.c:1321
 msgid "root certificate has expired"
 msgstr "root certificate has expired"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1322
 msgid "intermediate certificate has expired"
 msgstr "intermediate certificate has expired"
 
-#: sm/certchain.c:1363
+#: sm/certchain.c:1364
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr "required certificate attributes missing: %s%s%s"
 
-#: sm/certchain.c:1372
+#: sm/certchain.c:1373
 msgid "certificate with invalid validity"
 msgstr "certificate with invalid validity"
 
-#: sm/certchain.c:1409
+#: sm/certchain.c:1410
 msgid "signature not created during lifetime of certificate"
 msgstr "signature not created during lifetime of certificate"
 
-#: sm/certchain.c:1411
+#: sm/certchain.c:1412
 msgid "certificate not created during lifetime of issuer"
 msgstr "certificate not created during lifetime of issuer"
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1413
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr "intermediate certificate not created during lifetime of issuer"
 
-#: sm/certchain.c:1416
+#: sm/certchain.c:1417
 #, c-format
 msgid "  (  signature created at "
 msgstr "  (  signature created at "
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1418
 #, c-format
 msgid "  (certificate created at "
 msgstr "  (certificate created at "
 
-#: sm/certchain.c:1420
+#: sm/certchain.c:1421
 #, c-format
 msgid "  (certificate valid from "
 msgstr "  (certificate valid from "
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1422
 #, c-format
 msgid "  (     issuer valid from "
 msgstr "  (     issuer valid from "
 
-#: sm/certchain.c:1451 dirmngr/validate.c:577
+#: sm/certchain.c:1452 dirmngr/validate.c:577
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "fingerprint=%s\n"
 
-#: sm/certchain.c:1460
+#: sm/certchain.c:1461
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr "root certificate has now been marked as trusted\n"
 
-#: sm/certchain.c:1473
+#: sm/certchain.c:1474
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr "interactive marking as trusted not enabled in gpg-agent\n"
 
-#: sm/certchain.c:1479
+#: sm/certchain.c:1480
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr "interactive marking as trusted disabled for this session\n"
 
-#: sm/certchain.c:1538
+#: sm/certchain.c:1539
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr "WARNING: creation time of signature not known - assuming current time"
 
-#: sm/certchain.c:1602
+#: sm/certchain.c:1603
 msgid "no issuer found in certificate"
 msgstr "no issuer found in certificate"
 
-#: sm/certchain.c:1680
+#: sm/certchain.c:1681
 msgid "self-signed certificate has a BAD signature"
 msgstr "self-signed certificate has a BAD signature"
 
-#: sm/certchain.c:1749 dirmngr/validate.c:575
+#: sm/certchain.c:1750 dirmngr/validate.c:575
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "root certificate is not marked trusted"
 
-#: sm/certchain.c:1765
+#: sm/certchain.c:1766
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "checking the trust list failed: %s\n"
 
-#: sm/certchain.c:1796 sm/import.c:175 dirmngr/validate.c:630
+#: sm/certchain.c:1797 sm/import.c:175 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "certificate chain too long\n"
 
-#: sm/certchain.c:1808 dirmngr/validate.c:642
+#: sm/certchain.c:1809 dirmngr/validate.c:642
 #, c-format
 msgid "issuer certificate not found"
 msgstr "issuer certificate not found"
 
-#: sm/certchain.c:1842 dirmngr/validate.c:668
+#: sm/certchain.c:1844 dirmngr/validate.c:668
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr "certificate has a BAD signature"
 
-#: sm/certchain.c:1874 dirmngr/validate.c:692
+#: sm/certchain.c:1876 dirmngr/validate.c:692
 msgid "found another possible matching CA certificate - trying again"
 msgstr "found another possible matching CA certificate - trying again"
 
-#: sm/certchain.c:1933 dirmngr/validate.c:717
+#: sm/certchain.c:1935 dirmngr/validate.c:717
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "certificate chain longer than allowed by CA (%d)"
 
-#: sm/certchain.c:1975 sm/certchain.c:2275 dirmngr/validate.c:747
+#: sm/certchain.c:1977 sm/certchain.c:2278 dirmngr/validate.c:747
 #, c-format
 msgid "certificate is good\n"
 msgstr "certificate is good\n"
 
-#: sm/certchain.c:1976
+#: sm/certchain.c:1978
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "intermediate certificate is good\n"
 
-#: sm/certchain.c:1977
+#: sm/certchain.c:1979
 #, c-format
 msgid "root certificate is good\n"
 msgstr "root certificate is good\n"
 
-#: sm/certchain.c:2159
+#: sm/certchain.c:2161
 msgid "switching to chain model"
 msgstr "switching to chain model"
 
-#: sm/certchain.c:2168
+#: sm/certchain.c:2170
 #, c-format
 msgid "validation model used: %s"
 msgstr "validation model used: %s"
@@ -8664,18 +8675,18 @@ 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:1372 dirmngr/validate.c:903
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1411 dirmngr/validate.c:903
 #: dirmngr/validate.c:927
 #, c-format
 msgid "out of core\n"
 msgstr "out of core\n"
 
-#: sm/certcheck.c:389 sm/verify.c:212
+#: sm/certcheck.c:388 sm/verify.c:212
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(this is the MD2 algorithm)\n"
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:793
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:794
 msgid "none"
 msgstr "none"
 
@@ -8963,17 +8974,17 @@ msgstr "Ready.  You should now send this request to your CA.\n"
 msgid "resource problem: out of core\n"
 msgstr "resource problem: out of core\n"
 
-#: sm/decrypt.c:719
+#: sm/decrypt.c:1159
 #, c-format
 msgid "(this is the RC2 algorithm)\n"
 msgstr "(this is the RC2 algorithm)\n"
 
-#: sm/decrypt.c:721
+#: sm/decrypt.c:1161
 #, c-format
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr "(this does not seem to be an encrypted message)\n"
 
-#: sm/decrypt.c:868
+#: sm/decrypt.c:1318
 #, c-format
 msgid "encrypted to %s key %s\n"
 msgstr "encrypted to %s key %s\n"
@@ -8983,7 +8994,7 @@ msgstr "encrypted to %s key %s\n"
 msgid "certificate '%s' not found: %s\n"
 msgstr "certificate ‘%s’ not found: %s\n"
 
-#: sm/delete.c:120 sm/keydb.c:1999 sm/keydb.c:2098
+#: sm/delete.c:120 sm/keydb.c:2021 sm/keydb.c:2120
 #, c-format
 msgid "error locking keybox: %s\n"
 msgstr "error locking keybox: %s\n"
@@ -9003,7 +9014,7 @@ msgstr "certificate ‘%s’ deleted\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "deleting certificate “%s� failed: %s\n"
 
-#: sm/encrypt.c:606
+#: sm/encrypt.c:607
 #, c-format
 msgid "no valid recipients given\n"
 msgstr "no valid recipients given\n"
@@ -9072,63 +9083,63 @@ msgstr "|USER-ID|use USER-ID as default secret key"
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|FILE|add keyring to the list of keyrings"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:352 dirmngr/dirmngr.c:265
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|SPEC|use this keyserver to lookup keys"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:363
 msgid "fetch missing issuer certificates"
 msgstr "fetch missing issuer certificates"
 
-#: sm/gpgsm.c:364
+#: sm/gpgsm.c:365
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NAME|use encoding NAME for PKCS#12 passphrases"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:386
 msgid "never consult a CRL"
 msgstr "never consult a CRL"
 
-#: sm/gpgsm.c:389
+#: sm/gpgsm.c:390
 msgid "do not check CRLs for root certificates"
 msgstr "do not check CRLs for root certificates"
 
-#: sm/gpgsm.c:393
+#: sm/gpgsm.c:394
 msgid "check validity using OCSP"
 msgstr "check validity using OCSP"
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:396
 msgid "do not check certificate policies"
 msgstr "do not check certificate policies"
 
-#: sm/gpgsm.c:398
+#: sm/gpgsm.c:399
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|use cipher algorithm NAME"
 
-#: sm/gpgsm.c:400
+#: sm/gpgsm.c:401
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|use message digest algorithm NAME"
 
-#: sm/gpgsm.c:410
+#: sm/gpgsm.c:411
 msgid "batch mode: never ask"
 msgstr "batch mode: never ask"
 
-#: sm/gpgsm.c:412
+#: sm/gpgsm.c:413
 msgid "assume yes on most questions"
 msgstr "assume yes on most questions"
 
-#: sm/gpgsm.c:413
+#: sm/gpgsm.c:414
 msgid "assume no on most questions"
 msgstr "assume no on most questions"
 
-#: sm/gpgsm.c:430
+#: sm/gpgsm.c:431
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FILE|write an audit log to FILE"
 
-#: sm/gpgsm.c:615
+#: sm/gpgsm.c:616
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Usage: @GPGSM@ [options] [files] (-h for help)"
 
-#: sm/gpgsm.c:618
+#: sm/gpgsm.c:619
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -9138,52 +9149,27 @@ msgstr ""
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
 "Default operation depends on the input data\n"
 
-#: sm/gpgsm.c:826
+#: sm/gpgsm.c:827
 #, 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:837
+#: sm/gpgsm.c:838
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "unknown validation model ‘%s’\n"
 
-#: sm/gpgsm.c:896 dirmngr/ldapserver.c:89
-#, c-format
-msgid "%s:%u: no hostname given\n"
-msgstr "%s:%u: no hostname given\n"
-
-#: sm/gpgsm.c:915 dirmngr/ldapserver.c:108
-#, c-format
-msgid "%s:%u: password given without user\n"
-msgstr "%s:%u: password given without user\n"
-
-#: sm/gpgsm.c:946 dirmngr/ldapserver.c:139
-#, c-format
-msgid "%s:%u: ignoring unknown flag '%s'\n"
-msgstr "%s:%u: ignoring unknown flag ‘%s’\n"
-
-#: sm/gpgsm.c:962 dirmngr/ldapserver.c:155
-#, c-format
-msgid "%s:%u: skipping this line\n"
-msgstr "%s:%u: skipping this line\n"
-
-#: sm/gpgsm.c:1550
-#, c-format
-msgid "could not parse keyserver\n"
-msgstr "could not parse keyserver\n"
-
-#: sm/gpgsm.c:1858
+#: sm/gpgsm.c:1711
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "importing common certificates ‘%s’\n"
 
-#: sm/gpgsm.c:1904
+#: sm/gpgsm.c:1757
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "can't sign using '%s': %s\n"
 
-#: sm/gpgsm.c:2273
+#: sm/gpgsm.c:2129
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "invalid command (there is no implicit command)\n"
@@ -9203,52 +9189,52 @@ msgstr "error storing certificate\n"
 msgid "basic certificate checks failed - not imported\n"
 msgstr "basic certificate checks failed - not imported\n"
 
-#: sm/import.c:471 sm/keydb.c:2018 sm/keydb.c:2111
+#: sm/import.c:472 sm/keydb.c:2040 sm/keydb.c:2133
 #, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "error getting stored flags: %s\n"
 
-#: sm/import.c:530 sm/import.c:562
+#: sm/import.c:531 sm/import.c:563
 #, c-format
 msgid "error importing certificate: %s\n"
 msgstr "error importing certificate: %s\n"
 
-#: sm/import.c:751 tools/gpg-connect-agent.c:1475
+#: sm/import.c:752 tools/gpg-connect-agent.c:1475
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "error reading input: %s\n"
 
-#: sm/keydb.c:503
+#: sm/keydb.c:508
 #, c-format
 msgid "no keyboxd running in this session\n"
 msgstr "no keyboxd running in this session\n"
 
-#: sm/keydb.c:595
+#: sm/keydb.c:600
 #, c-format
 msgid "error opening key DB: %s\n"
 msgstr "error opening key DB: %s\n"
 
-#: sm/keydb.c:1936
+#: sm/keydb.c:1958
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr "problem looking for existing certificate: %s\n"
 
-#: sm/keydb.c:1948
+#: sm/keydb.c:1970
 #, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "error finding writable keyDB: %s\n"
 
-#: sm/keydb.c:1956
+#: sm/keydb.c:1978
 #, c-format
 msgid "error storing certificate: %s\n"
 msgstr "error storing certificate: %s\n"
 
-#: sm/keydb.c:2009
+#: sm/keydb.c:2031
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "problem re-searching certificate: %s\n"
 
-#: sm/keydb.c:2030 sm/keydb.c:2122
+#: sm/keydb.c:2052 sm/keydb.c:2144
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr "error storing flags: %s\n"
@@ -9429,57 +9415,57 @@ msgstr "  subject ="
 msgid "error loading certificate '%s': %s\n"
 msgstr "error loading certificate '%s': %s\n"
 
-#: dirmngr/certcache.c:819
+#: dirmngr/certcache.c:820
 #, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "permanently loaded certificates: %u\n"
 
-#: dirmngr/certcache.c:821
+#: dirmngr/certcache.c:822
 #, c-format
 msgid "    runtime cached certificates: %u\n"
 msgstr "    runtime cached certificates: %u\n"
 
-#: dirmngr/certcache.c:823
+#: dirmngr/certcache.c:824
 #, c-format
 msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "           trusted certificates: %u (%u,%u,%u,%u)\n"
 
-#: dirmngr/certcache.c:851 dirmngr/dirmngr-client.c:392
+#: dirmngr/certcache.c:852 dirmngr/dirmngr-client.c:392
 #, c-format
 msgid "certificate already cached\n"
 msgstr "certificate already cached\n"
 
-#: dirmngr/certcache.c:853
+#: dirmngr/certcache.c:854
 #, c-format
 msgid "certificate cached\n"
 msgstr "certificate cached\n"
 
-#: dirmngr/certcache.c:855 dirmngr/certcache.c:875 dirmngr/dirmngr-client.c:396
+#: dirmngr/certcache.c:856 dirmngr/certcache.c:876 dirmngr/dirmngr-client.c:396
 #, c-format
 msgid "error caching certificate: %s\n"
 msgstr "error caching certificate: %s\n"
 
-#: dirmngr/certcache.c:938
+#: dirmngr/certcache.c:939
 #, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "invalid SHA1 fingerprint string ‘%s’\n"
 
-#: dirmngr/certcache.c:1384 dirmngr/certcache.c:1393
+#: dirmngr/certcache.c:1385 dirmngr/certcache.c:1394
 #, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "error fetching certificate by S/N: %s\n"
 
-#: dirmngr/certcache.c:1579 dirmngr/certcache.c:1588
+#: dirmngr/certcache.c:1580 dirmngr/certcache.c:1589
 #, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "error fetching certificate by subject: %s\n"
 
-#: dirmngr/certcache.c:1694 dirmngr/validate.c:483
+#: dirmngr/certcache.c:1695 dirmngr/validate.c:483
 #, c-format
 msgid "no issuer found in certificate\n"
 msgstr "no issuer found in certificate\n"
 
-#: dirmngr/certcache.c:1704
+#: dirmngr/certcache.c:1705
 #, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "error getting authorityKeyIdentifier: %s\n"
@@ -9514,7 +9500,7 @@ msgstr "removing cache file ‘%s’\n"
 msgid "not removing file '%s'\n"
 msgstr "not removing file ‘%s’\n"
 
-#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2380
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2383
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr "error closing cache file: %s\n"
@@ -9744,13 +9730,13 @@ msgid "error getting data from cache file: %s\n"
 msgstr "error getting data from cache file: %s\n"
 
 #: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1672 dirmngr/crlcache.c:1697
-#: dirmngr/crlcache.c:1763
+#: dirmngr/crlcache.c:1766
 #, c-format
 msgid "got an invalid S-expression from libksba\n"
 msgstr "got an invalid S-expression from libksba\n"
 
 #: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1679 dirmngr/crlcache.c:1705
-#: dirmngr/crlcache.c:1770 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1773 dirmngr/misc.c:176
 #, c-format
 msgid "converting S-expression failed: %s\n"
 msgstr "converting S-expression failed: %s\n"
@@ -9765,132 +9751,132 @@ msgstr "unknown hash algorithm ‘%s’\n"
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr "gcry_md_open for algorithm %d failed: %s\n"
 
-#: dirmngr/crlcache.c:1797 dirmngr/ocsp.c:478
+#: dirmngr/crlcache.c:1800 dirmngr/ocsp.c:478
 #, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "creating S-expression failed: %s\n"
 
-#: dirmngr/crlcache.c:1871
+#: dirmngr/crlcache.c:1874
 #, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "ksba_crl_parse failed: %s\n"
 
-#: dirmngr/crlcache.c:1886
+#: dirmngr/crlcache.c:1889
 #, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "error getting update times of CRL: %s\n"
 
-#: dirmngr/crlcache.c:1893
+#: dirmngr/crlcache.c:1896
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr "update times of this CRL: this=%s next=%s\n"
 
-#: dirmngr/crlcache.c:1897
+#: dirmngr/crlcache.c:1900
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr "nextUpdate not given; assuming a validity period of one day\n"
 
-#: dirmngr/crlcache.c:1917
+#: dirmngr/crlcache.c:1920
 #, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "error getting CRL item: %s\n"
 
-#: dirmngr/crlcache.c:1932
+#: dirmngr/crlcache.c:1935
 #, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "error inserting item into temporary cache file: %s\n"
 
-#: dirmngr/crlcache.c:1959
+#: dirmngr/crlcache.c:1962
 #, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "no CRL issuer found in CRL: %s\n"
 
-#: dirmngr/crlcache.c:1974
+#: dirmngr/crlcache.c:1977
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr "locating CRL issuer certificate by authorityKeyIdentifier\n"
 
-#: dirmngr/crlcache.c:2020
+#: dirmngr/crlcache.c:2023
 #, c-format
 msgid "CRL signature verification failed: %s\n"
 msgstr "CRL signature verification failed: %s\n"
 
-#: dirmngr/crlcache.c:2032
+#: dirmngr/crlcache.c:2035
 #, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "error checking validity of CRL issuer certificate: %s\n"
 
-#: dirmngr/crlcache.c:2174
+#: dirmngr/crlcache.c:2177
 #, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "ksba_crl_new failed: %s\n"
 
-#: dirmngr/crlcache.c:2181
+#: dirmngr/crlcache.c:2184
 #, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "ksba_crl_set_reader failed: %s\n"
 
-#: dirmngr/crlcache.c:2215
+#: dirmngr/crlcache.c:2218
 #, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "removed stale temporary cache file ‘%s’\n"
 
-#: dirmngr/crlcache.c:2219
+#: dirmngr/crlcache.c:2222
 #, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "problem removing stale temporary cache file '%s': %s\n"
 
-#: dirmngr/crlcache.c:2229
+#: dirmngr/crlcache.c:2232
 #, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "error creating temporary cache file '%s': %s\n"
 
-#: dirmngr/crlcache.c:2239
+#: dirmngr/crlcache.c:2242
 #, c-format
 msgid "crl_parse_insert failed: %s\n"
 msgstr "crl_parse_insert failed: %s\n"
 
-#: dirmngr/crlcache.c:2249
+#: dirmngr/crlcache.c:2252
 #, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "error finishing temporary cache file '%s': %s\n"
 
-#: dirmngr/crlcache.c:2256
+#: dirmngr/crlcache.c:2259
 #, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "error closing temporary cache file '%s': %s\n"
 
-#: dirmngr/crlcache.c:2281
+#: dirmngr/crlcache.c:2284
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 
-#: dirmngr/crlcache.c:2285
+#: dirmngr/crlcache.c:2288
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr "new CRL still too old; it expired on %s\n"
 
-#: dirmngr/crlcache.c:2301
+#: dirmngr/crlcache.c:2304
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr "unknown critical CRL extension %s\n"
 
-#: dirmngr/crlcache.c:2311
+#: dirmngr/crlcache.c:2314
 #, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "error reading CRL extensions: %s\n"
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2365
 #, c-format
 msgid "creating cache file '%s'\n"
 msgstr "creating cache file ‘%s’\n"
 
-#: dirmngr/crlcache.c:2394
+#: dirmngr/crlcache.c:2397
 #, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "problem renaming ‘%s’ to '%s': %s\n"
 
-#: dirmngr/crlcache.c:2408
+#: dirmngr/crlcache.c:2411
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
@@ -9899,12 +9885,12 @@ msgstr ""
 "updating the DIR file failed - cache entry will get lost with the next "
 "program start\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2448
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr "Begin CRL dump (retrieved via %s)\n"
 
-#: dirmngr/crlcache.c:2468
+#: dirmngr/crlcache.c:2471
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
@@ -9912,55 +9898,55 @@ msgstr ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 
-#: dirmngr/crlcache.c:2471
+#: dirmngr/crlcache.c:2474
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 
-#: dirmngr/crlcache.c:2474
+#: dirmngr/crlcache.c:2477
 msgid " ERROR: The CRL will not be used\n"
 msgstr " ERROR: The CRL will not be used\n"
 
-#: dirmngr/crlcache.c:2481
+#: dirmngr/crlcache.c:2484
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr " ERROR: This cached CRL may have been tampered with!\n"
 
-#: dirmngr/crlcache.c:2499
+#: dirmngr/crlcache.c:2502
 #, c-format
 msgid " WARNING: invalid cache record length\n"
 msgstr " WARNING: invalid cache record length\n"
 
-#: dirmngr/crlcache.c:2506
+#: dirmngr/crlcache.c:2509
 #, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "problem reading cache record: %s\n"
 
-#: dirmngr/crlcache.c:2517
+#: dirmngr/crlcache.c:2520
 #, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "problem reading cache key: %s\n"
 
-#: dirmngr/crlcache.c:2548
+#: dirmngr/crlcache.c:2551
 #, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "error reading cache entry from db: %s\n"
 
-#: dirmngr/crlcache.c:2551
+#: dirmngr/crlcache.c:2554
 msgid "End CRL dump\n"
 msgstr "End CRL dump\n"
 
-#: dirmngr/crlcache.c:2672
+#: dirmngr/crlcache.c:2675
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "crl_fetch via DP failed: %s\n"
 
-#: dirmngr/crlcache.c:2683
+#: dirmngr/crlcache.c:2686
 #, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "crl_cache_insert via DP failed: %s\n"
 
-#: dirmngr/crlcache.c:2743
+#: dirmngr/crlcache.c:2746
 #, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "crl_cache_insert via issuer failed: %s\n"
@@ -9981,7 +9967,7 @@ msgstr "CRL access not possible due to disabled %s\n"
 msgid "error retrieving '%s': %s\n"
 msgstr "error retrieving '%s': %s\n"
 
-#: dirmngr/crlfetch.c:218 dirmngr/ldap-wrapper.c:881 dirmngr/misc.c:573
+#: dirmngr/crlfetch.c:218 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
 #, c-format
 msgid "error initializing reader object: %s\n"
 msgstr "error initializing reader object: %s\n"
@@ -10137,131 +10123,131 @@ msgstr "absolute file name expected\n"
 msgid "looking up '%s'\n"
 msgstr "looking up ‘%s’\n"
 
-#: dirmngr/dirmngr.c:175
+#: dirmngr/dirmngr.c:176
 msgid "list the contents of the CRL cache"
 msgstr "list the contents of the CRL cache"
 
-#: dirmngr/dirmngr.c:176
+#: dirmngr/dirmngr.c:177
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|FILE|load CRL from FILE into cache"
 
-#: dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr.c:178
 msgid "|URL|fetch a CRL from URL"
 msgstr "|URL|fetch a CRL from URL"
 
-#: dirmngr/dirmngr.c:178
+#: dirmngr/dirmngr.c:179
 msgid "shutdown the dirmngr"
 msgstr "shutdown the dirmngr"
 
-#: dirmngr/dirmngr.c:179
+#: dirmngr/dirmngr.c:180
 msgid "flush the cache"
 msgstr "flush the cache"
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:213
 msgid "allow online software version check"
 msgstr "allow online software version check"
 
-#: dirmngr/dirmngr.c:215
+#: dirmngr/dirmngr.c:216
 msgid "|N|do not return more than N items in one query"
 msgstr "|N|do not return more than N items in one query"
 
-#: dirmngr/dirmngr.c:221
+#: dirmngr/dirmngr.c:222
 msgid "Network related options"
 msgstr "Network related options"
 
-#: dirmngr/dirmngr.c:223
+#: dirmngr/dirmngr.c:224
 msgid "route all network traffic via Tor"
 msgstr "route all network traffic via Tor"
 
-#: dirmngr/dirmngr.c:235
+#: dirmngr/dirmngr.c:236
 msgid "Configuration for Keyservers"
 msgstr "Configuration for Keyservers"
 
-#: dirmngr/dirmngr.c:238
+#: dirmngr/dirmngr.c:239
 msgid "|URL|use keyserver at URL"
 msgstr "|URL|use keyserver at URL"
 
-#: dirmngr/dirmngr.c:240
+#: dirmngr/dirmngr.c:241
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr "|FILE|use the CA certificates in FILE for HKP over TLS"
 
-#: dirmngr/dirmngr.c:242
+#: dirmngr/dirmngr.c:243
 msgid "Configuration for HTTP servers"
 msgstr "Configuration for HTTP servers"
 
-#: dirmngr/dirmngr.c:244
+#: dirmngr/dirmngr.c:245
 msgid "inhibit the use of HTTP"
 msgstr "inhibit the use of HTTP"
 
-#: dirmngr/dirmngr.c:246
+#: dirmngr/dirmngr.c:247
 msgid "ignore HTTP CRL distribution points"
 msgstr "ignore HTTP CRL distribution points"
 
-#: dirmngr/dirmngr.c:248
+#: dirmngr/dirmngr.c:249
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr "|URL|redirect all HTTP requests to URL"
 
-#: dirmngr/dirmngr.c:250
+#: dirmngr/dirmngr.c:251
 msgid "use system's HTTP proxy setting"
 msgstr "use system's HTTP proxy setting"
 
-#: dirmngr/dirmngr.c:254
+#: dirmngr/dirmngr.c:255
 msgid "Configuration of LDAP servers to use"
 msgstr "Configuration of LDAP servers to use"
 
-#: dirmngr/dirmngr.c:256
+#: dirmngr/dirmngr.c:257
 msgid "inhibit the use of LDAP"
 msgstr "inhibit the use of LDAP"
 
-#: dirmngr/dirmngr.c:258
+#: dirmngr/dirmngr.c:259
 msgid "ignore LDAP CRL distribution points"
 msgstr "ignore LDAP CRL distribution points"
 
-#: dirmngr/dirmngr.c:260
+#: dirmngr/dirmngr.c:261
 msgid "|HOST|use HOST for LDAP queries"
 msgstr "|HOST|use HOST for LDAP queries"
 
-#: dirmngr/dirmngr.c:262
+#: dirmngr/dirmngr.c:263
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr "do not use fallback hosts with --ldap-proxy"
 
-#: dirmngr/dirmngr.c:264
+#: dirmngr/dirmngr.c:267
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FILE|read LDAP server list from FILE"
 
-#: dirmngr/dirmngr.c:266
+#: dirmngr/dirmngr.c:269
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr "add new servers discovered in CRL distribution points to serverlist"
 
-#: dirmngr/dirmngr.c:269 dirmngr/dirmngr_ldap.c:104
+#: dirmngr/dirmngr.c:272
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|set LDAP timeout to N seconds"
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:275
 msgid "Configuration for OCSP"
 msgstr "Configuration for OCSP"
 
-#: dirmngr/dirmngr.c:274
+#: dirmngr/dirmngr.c:277
 msgid "allow sending OCSP requests"
 msgstr "allow sending OCSP requests"
 
-#: dirmngr/dirmngr.c:276
+#: dirmngr/dirmngr.c:279
 msgid "ignore certificate contained OCSP service URLs"
 msgstr "ignore certificate contained OCSP service URLs"
 
-#: dirmngr/dirmngr.c:278
+#: dirmngr/dirmngr.c:281
 msgid "|URL|use OCSP responder at URL"
 msgstr "|URL|use OCSP responder at URL"
 
-#: dirmngr/dirmngr.c:280
+#: dirmngr/dirmngr.c:283
 msgid "|FPR|OCSP response signed by FPR"
 msgstr "|FPR|OCSP response signed by FPR"
 
-#: dirmngr/dirmngr.c:288
+#: dirmngr/dirmngr.c:291
 msgid "force loading of outdated CRLs"
 msgstr "force loading of outdated CRLs"
 
-#: dirmngr/dirmngr.c:299
+#: dirmngr/dirmngr.c:302
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
@@ -10271,11 +10257,11 @@ msgstr ""
 "(See the “info� manual for a complete listing of all commands and "
 "options)\n"
 
-#: dirmngr/dirmngr.c:441
+#: dirmngr/dirmngr.c:449
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Usage: @DIRMNGR@ [options] (-h for help)"
 
-#: dirmngr/dirmngr.c:443
+#: dirmngr/dirmngr.c:451
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@ -10283,283 +10269,103 @@ msgstr ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
 
-#: dirmngr/dirmngr.c:523
+#: dirmngr/dirmngr.c:531
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr "valid debug levels are: %s\n"
 
-#: dirmngr/dirmngr.c:609 tools/gpgconf.c:667 tools/gpgconf.c:702
-#: tools/gpgconf.c:802
+#: dirmngr/dirmngr.c:617 tools/gpgconf.c:701 tools/gpgconf.c:736
+#: tools/gpgconf.c:836
 #, c-format
 msgid "usage: %s [options] "
 msgstr "usage: %s [options] "
 
-#: dirmngr/dirmngr.c:1260
+#: dirmngr/dirmngr.c:1299
 #, 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:1495 dirmngr/server.c:1824
+#: dirmngr/dirmngr.c:1534 dirmngr/server.c:1878
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "fetching CRL from ‘%s’ failed: %s\n"
 
-#: dirmngr/dirmngr.c:1501 dirmngr/server.c:1830
+#: dirmngr/dirmngr.c:1540 dirmngr/server.c:1884
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "processing CRL from ‘%s’ failed: %s\n"
 
-#: dirmngr/dirmngr.c:1643
+#: dirmngr/dirmngr.c:1682
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: line too long - skipped\n"
 
-#: dirmngr/dirmngr.c:1698 dirmngr/dirmngr.c:1782
+#: dirmngr/dirmngr.c:1737 dirmngr/dirmngr.c:1821
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: invalid fingerprint detected\n"
 
-#: dirmngr/dirmngr.c:1734 dirmngr/dirmngr.c:1760 tools/gpgconf-comp.c:3539
+#: dirmngr/dirmngr.c:1773 dirmngr/dirmngr.c:1799 tools/gpgconf-comp.c:3549
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: read error: %s\n"
 
-#: dirmngr/dirmngr.c:1789
+#: dirmngr/dirmngr.c:1828
 #, 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:1876
+#: dirmngr/dirmngr.c:1915
 #, 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:1917
+#: dirmngr/dirmngr.c:1956
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "SIGUSR2 received - no action defined\n"
 
-#: dirmngr/dirmngr.c:1922
+#: dirmngr/dirmngr.c:1961
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "SIGTERM received - shutting down ...\n"
 
-#: dirmngr/dirmngr.c:1924
+#: dirmngr/dirmngr.c:1963
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "SIGTERM received - still %d active connections\n"
 
-#: dirmngr/dirmngr.c:1929
+#: dirmngr/dirmngr.c:1968
 #, c-format
 msgid "shutdown forced\n"
 msgstr "shutdown forced\n"
 
-#: dirmngr/dirmngr.c:1937
+#: dirmngr/dirmngr.c:1976
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "SIGINT received - immediate shutdown\n"
 
-#: dirmngr/dirmngr.c:1944
+#: dirmngr/dirmngr.c:1983
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "signal %d received - no action defined\n"
 
-#: dirmngr/dirmngr_ldap.c:105
-msgid "return all values in a record oriented format"
-msgstr "return all values in a record oriented format"
-
-#: dirmngr/dirmngr_ldap.c:108
-msgid "|NAME|ignore host part and connect through NAME"
-msgstr "|NAME|ignore host part and connect through NAME"
-
-#: dirmngr/dirmngr_ldap.c:109
-msgid "force a TLS connection"
-msgstr "force a TLS connection"
-
-#: dirmngr/dirmngr_ldap.c:110
-msgid "|NAME|connect to host NAME"
-msgstr "|NAME|connect to host NAME"
-
-#: dirmngr/dirmngr_ldap.c:111
-msgid "|N|connect to port N"
-msgstr "|N|connect to port N"
-
-#: dirmngr/dirmngr_ldap.c:112
-msgid "|NAME|use user NAME for authentication"
-msgstr "|NAME|use user NAME for authentication"
-
-#: dirmngr/dirmngr_ldap.c:113
-msgid "|PASS|use password PASS for authentication"
-msgstr "|PASS|use password PASS for authentication"
-
-#: dirmngr/dirmngr_ldap.c:115
-msgid "take password from $DIRMNGR_LDAP_PASS"
-msgstr "take password from $DIRMNGR_LDAP_PASS"
-
-#: dirmngr/dirmngr_ldap.c:116
-msgid "|STRING|query DN STRING"
-msgstr "|STRING|query DN STRING"
-
-#: dirmngr/dirmngr_ldap.c:117
-msgid "|STRING|use STRING as filter expression"
-msgstr "|STRING|use STRING as filter expression"
-
-#: dirmngr/dirmngr_ldap.c:118
-msgid "|STRING|return the attribute STRING"
-msgstr "|STRING|return the attribute STRING"
-
-#: dirmngr/dirmngr_ldap.c:179
-msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
-msgstr "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
-
-#: dirmngr/dirmngr_ldap.c:182
-msgid ""
-"Syntax: dirmngr_ldap [options] [URL]\n"
-"Internal LDAP helper for Dirmngr\n"
-"Interface and options may change without notice\n"
-msgstr ""
-"Syntax: dirmngr_ldap [options] [URL]\n"
-"Internal LDAP helper for Dirmngr\n"
-"Interface and options may change without notice\n"
-
-#: dirmngr/dirmngr_ldap.c:291
-#, c-format
-msgid "invalid port number %d\n"
-msgstr "invalid port number %d\n"
-
-#: dirmngr/dirmngr_ldap.c:400
-#, c-format
-msgid "scanning result for attribute '%s'\n"
-msgstr "scanning result for attribute ‘%s’\n"
-
-#: dirmngr/dirmngr_ldap.c:407 dirmngr/dirmngr_ldap.c:490
-#: dirmngr/dirmngr_ldap.c:514 dirmngr/dirmngr_ldap.c:526
-#: dirmngr/dirmngr_ldap.c:722
-#, c-format
-msgid "error writing to stdout: %s\n"
-msgstr "error writing to stdout: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:424
-#, c-format
-msgid "          available attribute '%s'\n"
-msgstr "          available attribute ‘%s’\n"
-
-#: dirmngr/dirmngr_ldap.c:462
-#, c-format
-msgid "attribute '%s' not found\n"
-msgstr "attribute ‘%s’ not found\n"
-
-#: dirmngr/dirmngr_ldap.c:469
-#, c-format
-msgid "found attribute '%s'\n"
-msgstr "found attribute ‘%s’\n"
-
-#: dirmngr/dirmngr_ldap.c:581
-#, c-format
-msgid "processing url '%s'\n"
-msgstr "processing url ‘%s’\n"
-
-#: dirmngr/dirmngr_ldap.c:588
-#, c-format
-msgid "          user '%s'\n"
-msgstr "          user ‘%s’\n"
-
-#: dirmngr/dirmngr_ldap.c:590
-#, c-format
-msgid "          pass '%s'\n"
-msgstr "          pass ‘%s’\n"
-
-#: dirmngr/dirmngr_ldap.c:592
-#, c-format
-msgid "          host '%s'\n"
-msgstr "          host ‘%s’\n"
-
-#: dirmngr/dirmngr_ldap.c:593
-#, c-format
-msgid "          port %d\n"
-msgstr "          port %d\n"
-
-#: dirmngr/dirmngr_ldap.c:595
-#, c-format
-msgid "            DN '%s'\n"
-msgstr "            DN ‘%s’\n"
-
-#: dirmngr/dirmngr_ldap.c:597
-#, c-format
-msgid "        filter '%s'\n"
-msgstr "        filter ‘%s’\n"
-
-#: dirmngr/dirmngr_ldap.c:602 dirmngr/dirmngr_ldap.c:605
-#, c-format
-msgid "          attr '%s'\n"
-msgstr "          attr ‘%s’\n"
-
-#: dirmngr/dirmngr_ldap.c:611
-#, c-format
-msgid "no host name in '%s'\n"
-msgstr "no host name in ‘%s’\n"
-
-#: dirmngr/dirmngr_ldap.c:616
-#, c-format
-msgid "no attribute given for query '%s'\n"
-msgstr "no attribute given for query ‘%s’\n"
-
-#: dirmngr/dirmngr_ldap.c:622
-#, c-format
-msgid "WARNING: using first attribute only\n"
-msgstr "WARNING: using first attribute only\n"
-
-#: dirmngr/dirmngr_ldap.c:637 dirmngr/dirmngr_ldap.c:678
-#, c-format
-msgid "LDAP init to '%s:%d' failed: %s\n"
-msgstr "LDAP init to ‘%s:%d’ failed: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:659
-#, c-format
-msgid "LDAP init to '%s' failed: %s\n"
-msgstr "LDAP init to ‘%s’ failed: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:665
-#, c-format
-msgid "LDAP init to '%s' done\n"
-msgstr "LDAP init to ‘%s’ done\n"
-
-#: dirmngr/dirmngr_ldap.c:704
-#, c-format
-msgid "binding to '%s:%d' failed: %s\n"
-msgstr "binding to ‘%s:%d’ failed: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:728
-#, c-format
-msgid "searching '%s' failed: %s\n"
-msgstr "searching ‘%s’ failed: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:759
-#, c-format
-msgid "'%s' is not an LDAP URL\n"
-msgstr "‘%s’ is not an LDAP URL\n"
-
-#: dirmngr/dirmngr_ldap.c:765
-#, c-format
-msgid "'%s' is an invalid LDAP URL\n"
-msgstr "‘%s’ is an invalid LDAP URL\n"
-
-#: dirmngr/http.c:1989 dirmngr/ocsp.c:255
+#: dirmngr/http.c:1998 dirmngr/ocsp.c:255
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "error accessing '%s': http status %u\n"
 
-#: dirmngr/http.c:3630 dirmngr/ocsp.c:229
+#: dirmngr/http.c:3652 dirmngr/ocsp.c:229
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr "URL ‘%s’ redirected to ‘%s’ (%u)\n"
 
-#: dirmngr/http.c:3636 dirmngr/ocsp.c:246
+#: dirmngr/http.c:3658 dirmngr/ocsp.c:246
 #, c-format
 msgid "too many redirections\n"
 msgstr "too many redirections\n"
 
-#: dirmngr/http.c:3748
+#: dirmngr/http.c:3768
 #, c-format
 msgid "redirection changed to '%s'\n"
 msgstr "redirection changed to ‘%s’\n"
@@ -10599,31 +10405,51 @@ msgstr "waiting for ldap wrapper %d failed: %s\n"
 msgid "ldap wrapper %d stalled - killing\n"
 msgstr "ldap wrapper %d stalled - killing\n"
 
-#: dirmngr/ldap.c:91
+#: dirmngr/ldap.c:92
 #, c-format
 msgid "invalid char 0x%02x in host name - not added\n"
 msgstr "invalid char 0x%02x in host name - not added\n"
 
-#: dirmngr/ldap.c:95
+#: dirmngr/ldap.c:96
 #, c-format
 msgid "adding '%s:%d' to the ldap server list\n"
 msgstr "adding ‘%s:%d’ to the ldap server list\n"
 
-#: dirmngr/ldap.c:98 dirmngr/misc.c:512
+#: dirmngr/ldap.c:99 dirmngr/misc.c:512
 #, c-format
 msgid "malloc failed: %s\n"
 msgstr "malloc failed: %s\n"
 
-#: dirmngr/ldap.c:634
+#: dirmngr/ldap.c:221
+#, c-format
+msgid "'%s' is not an LDAP URL\n"
+msgstr "‘%s’ is not an LDAP URL\n"
+
+#: dirmngr/ldap.c:227 dirmngr/ldap.c:233
 #, c-format
-msgid "start_cert_fetch: invalid pattern '%s'\n"
-msgstr "start_cert_fetch: invalid pattern ‘%s’\n"
+msgid "'%s' is an invalid LDAP URL\n"
+msgstr "‘%s’ is an invalid LDAP URL\n"
 
-#: dirmngr/ldap.c:846
+#: dirmngr/ldap.c:968
 #, c-format
 msgid "ldap_search hit the size limit of the server\n"
 msgstr "ldap_search hit the size limit of the server\n"
 
+#: dirmngr/ldapserver.c:119
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr "%s:%u: password given without user\n"
+
+#: dirmngr/ldapserver.c:181
+#, c-format
+msgid "%s:%u: ignoring unknown flag '%s'\n"
+msgstr "%s:%u: ignoring unknown flag ‘%s’\n"
+
+#: dirmngr/ldapserver.c:203
+#, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr "%s:%u: skipping this line\n"
+
 #: dirmngr/misc.c:172
 #, c-format
 msgid "invalid canonical S-expression found\n"
@@ -10714,86 +10540,86 @@ msgstr "not signed by a default OCSP signer's certificate"
 msgid "allocating list item failed: %s\n"
 msgstr "allocating list item failed: %s\n"
 
-#: dirmngr/ocsp.c:537 dirmngr/ocsp.c:724
+#: dirmngr/ocsp.c:538 dirmngr/ocsp.c:725
 #, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "error getting responder ID: %s\n"
 
-#: dirmngr/ocsp.c:584
+#: dirmngr/ocsp.c:585
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr "no suitable certificate found to verify the OCSP response\n"
 
-#: dirmngr/ocsp.c:623 dirmngr/validate.c:648
+#: dirmngr/ocsp.c:624 dirmngr/validate.c:648
 #, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "issuer certificate not found: %s\n"
 
-#: dirmngr/ocsp.c:633
+#: dirmngr/ocsp.c:634
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr "caller did not return the target certificate\n"
 
-#: dirmngr/ocsp.c:640
+#: dirmngr/ocsp.c:641
 #, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "caller did not return the issuing certificate\n"
 
-#: dirmngr/ocsp.c:650
+#: dirmngr/ocsp.c:651
 #, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "failed to allocate OCSP context: %s\n"
 
-#: dirmngr/ocsp.c:689
+#: dirmngr/ocsp.c:690
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr "no default OCSP responder defined\n"
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:696
 #, c-format
 msgid "no default OCSP signer defined\n"
 msgstr "no default OCSP signer defined\n"
 
-#: dirmngr/ocsp.c:702
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr "using default OCSP responder ‘%s’\n"
 
-#: dirmngr/ocsp.c:707
+#: dirmngr/ocsp.c:708
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "using OCSP responder ‘%s’\n"
 
-#: dirmngr/ocsp.c:764
+#: dirmngr/ocsp.c:765
 #, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "error getting OCSP status for target certificate: %s\n"
 
-#: dirmngr/ocsp.c:789
+#: dirmngr/ocsp.c:790
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr "certificate status is: %s  (this=%s  next=%s)\n"
 
-#: dirmngr/ocsp.c:790
+#: dirmngr/ocsp.c:791
 msgid "good"
 msgstr "good"
 
-#: dirmngr/ocsp.c:796
+#: dirmngr/ocsp.c:797
 #, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "certificate has been revoked at: %s due to: %s\n"
 
-#: dirmngr/ocsp.c:831
+#: dirmngr/ocsp.c:832
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr "OCSP responder returned a status in the future\n"
 
-#: dirmngr/ocsp.c:843
+#: dirmngr/ocsp.c:844
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr "OCSP responder returned a non-current status\n"
 
-#: dirmngr/ocsp.c:858
+#: dirmngr/ocsp.c:859
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr "OCSP responder returned an too old status\n"
@@ -10803,71 +10629,67 @@ msgstr "OCSP responder returned an too old status\n"
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "assuan_inquire(%s) failed: %s\n"
 
-#: dirmngr/server.c:1158
-msgid "ldapserver missing"
-msgstr "ldapserver missing"
-
-#: dirmngr/server.c:1224
+#: dirmngr/server.c:1277
 msgid "serialno missing in cert ID"
 msgstr "serialno missing in cert ID"
 
-#: dirmngr/server.c:1387 dirmngr/server.c:1473 dirmngr/server.c:1909
-#: dirmngr/server.c:1980 dirmngr/server.c:2556 dirmngr/server.c:2571
+#: dirmngr/server.c:1440 dirmngr/server.c:1526 dirmngr/server.c:1963
+#: dirmngr/server.c:2034 dirmngr/server.c:2662 dirmngr/server.c:2677
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "assuan_inquire failed: %s\n"
 
-#: dirmngr/server.c:1516
+#: dirmngr/server.c:1569
 #, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "fetch_cert_by_url failed: %s\n"
 
-#: dirmngr/server.c:1528 dirmngr/server.c:1559 dirmngr/server.c:1718
+#: dirmngr/server.c:1581 dirmngr/server.c:1612 dirmngr/server.c:1772
 #, c-format
 msgid "error sending data: %s\n"
 msgstr "error sending data: %s\n"
 
-#: dirmngr/server.c:1666
+#: dirmngr/server.c:1720
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "start_cert_fetch failed: %s\n"
 
-#: dirmngr/server.c:1699
+#: dirmngr/server.c:1753
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "fetch_next_cert failed: %s\n"
 
-#: dirmngr/server.c:1726
+#: dirmngr/server.c:1780
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr "max_replies %d exceeded\n"
 
-#: dirmngr/server.c:2860
+#: dirmngr/server.c:2966
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "can't allocate control structure: %s\n"
 
-#: dirmngr/server.c:2871
+#: dirmngr/server.c:2977
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "failed to allocate assuan context: %s\n"
 
-#: dirmngr/server.c:2892
+#: dirmngr/server.c:2998
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "failed to initialize the server: %s\n"
 
-#: dirmngr/server.c:2900
+#: dirmngr/server.c:3006
 #, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "failed to the register commands with Assuan: %s\n"
 
-#: dirmngr/server.c:2933
+#: dirmngr/server.c:3039
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "Assuan accept problem: %s\n"
 
-#: dirmngr/server.c:2952
+#: dirmngr/server.c:3058
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "Assuan processing failed: %s\n"
@@ -11012,67 +10834,67 @@ msgstr "no keybox daemon running in this session\n"
 msgid "error sending standard options: %s\n"
 msgstr "error sending standard options: %s\n"
 
-#: tools/gpgconf-comp.c:649
+#: tools/gpgconf-comp.c:655
 msgid "OpenPGP"
 msgstr "OpenPGP"
 
-#: tools/gpgconf-comp.c:653
+#: tools/gpgconf-comp.c:659
 msgid "S/MIME"
 msgstr "S/MIME"
 
-#: tools/gpgconf-comp.c:657
+#: tools/gpgconf-comp.c:663
 msgid "Public Keys"
 msgstr "Public Keys"
 
-#: tools/gpgconf-comp.c:661
+#: tools/gpgconf-comp.c:667
 msgid "Private Keys"
 msgstr "Private Keys"
 
-#: tools/gpgconf-comp.c:665
+#: tools/gpgconf-comp.c:671
 msgid "Smartcards"
 msgstr "Smartcards"
 
-#: tools/gpgconf-comp.c:669
+#: tools/gpgconf-comp.c:676
 msgid "TPM"
 msgstr "TPM"
 
-#: tools/gpgconf-comp.c:673
+#: tools/gpgconf-comp.c:681
 msgid "Network"
 msgstr "Network"
 
-#: tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:685
 msgid "Passphrase Entry"
 msgstr "Passphrase Entry"
 
-#: tools/gpgconf-comp.c:941
+#: tools/gpgconf-comp.c:951
 msgid "Component not suitable for launching"
 msgstr "Component not suitable for launching"
 
-#: tools/gpgconf-comp.c:947
+#: tools/gpgconf-comp.c:957
 #, c-format
 msgid "Configuration file of component %s is broken\n"
 msgstr "Configuration file of component %s is broken\n"
 
-#: tools/gpgconf-comp.c:950
+#: tools/gpgconf-comp.c:960
 #, c-format
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr "Note: Use the command “%s%s� to get details.\n"
 
-#: tools/gpgconf-comp.c:2816
+#: tools/gpgconf-comp.c:2826
 #, c-format
 msgid "External verification of component %s failed"
 msgstr "External verification of component %s failed"
 
-#: tools/gpgconf-comp.c:2946
+#: tools/gpgconf-comp.c:2956
 msgid "Note that group specifications are ignored\n"
 msgstr "Note that group specifications are ignored\n"
 
-#: tools/gpgconf-comp.c:3543
+#: tools/gpgconf-comp.c:3553
 #, c-format
 msgid "error closing '%s'\n"
 msgstr "error closing ‘%s’\n"
 
-#: tools/gpgconf-comp.c:3545
+#: tools/gpgconf-comp.c:3555
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr "error parsing ‘%s’\n"
@@ -11153,15 +10975,15 @@ msgstr ""
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
 
-#: tools/gpgconf.c:669 tools/gpgconf.c:704
+#: tools/gpgconf.c:703 tools/gpgconf.c:738
 msgid "Need one component argument"
 msgstr "Need one component argument"
 
-#: tools/gpgconf.c:678 tools/gpgconf.c:728 tools/gpgconf.c:778
+#: tools/gpgconf.c:712 tools/gpgconf.c:762 tools/gpgconf.c:812
 msgid "Component not found"
 msgstr "Component not found"
 
-#: tools/gpgconf.c:804
+#: tools/gpgconf.c:838
 msgid "No argument allowed"
 msgstr "No argument allowed"
 
@@ -11177,33 +10999,33 @@ msgstr ""
 "Syntax: gpg-check-pattern [options] patternfile\n"
 "Check a passphrase given on stdin against the patternfile\n"
 
-#: tools/gpg-card.c:2390
+#: tools/gpg-card.c:2407
 #, c-format
 msgid "Note: key %s is already stored on the card!\n"
 msgstr "Note: key %s is already stored on the card!\n"
 
-#: tools/gpg-card.c:2393
+#: tools/gpg-card.c:2410
 #, c-format
 msgid "Note: Keys are already stored on the card!\n"
 msgstr "Note: Keys are already stored on the card!\n"
 
-#: tools/gpg-card.c:2396
+#: tools/gpg-card.c:2413
 #, c-format
 msgid "Replace existing key %s ? (y/N) "
 msgstr "Replace existing key %s ? (y/N) "
 
-#: tools/gpg-card.c:2549 tools/gpg-card.c:2712 tools/gpg-card.c:2935
-#: tools/gpg-card.c:3044
+#: tools/gpg-card.c:2566 tools/gpg-card.c:2729 tools/gpg-card.c:2952
+#: tools/gpg-card.c:3061
 #, c-format
 msgid "%s card no. %s detected\n"
 msgstr "%s card no. %s detected\n"
 
-#: tools/gpg-card.c:3396
+#: tools/gpg-card.c:3413
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr "User Interaction Flag is set to “%s� - can't change\n"
 
-#: tools/gpg-card.c:3406 tools/gpg-card.c:3420
+#: tools/gpg-card.c:3423 tools/gpg-card.c:3437
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
@@ -11212,43 +11034,43 @@ msgstr ""
 "Warning: Setting the User Interaction Flag to “%s�\n"
 "         can only be reverted using a factory reset!\n"
 
-#: tools/gpg-card.c:3423
+#: tools/gpg-card.c:3440
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr "Please use “uif --yes %d %s�\n"
 
-#: tools/gpg-card.c:3669
+#: tools/gpg-card.c:3686
 msgid "authenticate to the card"
 msgstr "authenticate to the card"
 
-#: tools/gpg-card.c:3671
+#: tools/gpg-card.c:3688
 msgid "send a reset to the card daemon"
 msgstr "send a reset to the card daemon"
 
-#: tools/gpg-card.c:3673
+#: tools/gpg-card.c:3690
 msgid "setup KDF for PIN authentication"
 msgstr "setup KDF for PIN authentication"
 
-#: tools/gpg-card.c:3675
+#: tools/gpg-card.c:3692
 msgid "change a private data object"
 msgstr "change a private data object"
 
-#: tools/gpg-card.c:3676
+#: tools/gpg-card.c:3693
 msgid "read a certificate from a data object"
 msgstr "read a certificate from a data object"
 
-#: tools/gpg-card.c:3677
+#: tools/gpg-card.c:3694
 msgid "store a certificate to a data object"
 msgstr "store a certificate to a data object"
 
-#: tools/gpg-card.c:3678
+#: tools/gpg-card.c:3695
 msgid "store a private key to a data object"
 msgstr "store a private key to a data object"
 
-#: tools/gpg-card.c:3679
+#: tools/gpg-card.c:3696
 msgid "Yubikey management commands"
 msgstr "Yubikey management commands"
 
-#: tools/gpg-card.c:3681
+#: tools/gpg-card.c:3698
 msgid "manage the command history"
 msgstr "manage the command history"
diff --git a/po/en@quot.gmo b/po/en@quot.gmo
index 0067cb0..df310bb 100644
--- a/po/en@quot.gmo
+++ b/po/en@quot.gmo
diff --git a/po/en@quot.po b/po/en@quot.po
index 1ce8ed7..612c9d3 100644
--- a/po/en@quot.po
+++ b/po/en@quot.po
@@ -27,10 +27,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gnupg 2.3.1\n"
+"Project-Id-Version: GNU gnupg 2.3.2\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2021-04-20 12:38+0200\n"
-"PO-Revision-Date: 2021-04-20 12:38+0200\n"
+"POT-Creation-Date: 2021-08-24 18:50+0200\n"
+"PO-Revision-Date: 2021-08-24 18:50+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:328
+#: agent/call-pinentry.c:338
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "failed to acquire the pinentry lock: %s\n"
@@ -50,45 +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:546
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_OK"
 msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:547
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_Cancel"
 msgstr "|pinentry-label|_Cancel"
 
-#: agent/call-pinentry.c:548
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|_Yes"
 msgstr "|pinentry-label|_Yes"
 
-#: agent/call-pinentry.c:549
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_No"
 msgstr "|pinentry-label|_No"
 
-#: agent/call-pinentry.c:550
+#: agent/call-pinentry.c:560
 msgid "|pinentry-label|PIN:"
 msgstr "|pinentry-label|PIN:"
 
-#: agent/call-pinentry.c:551
+#: agent/call-pinentry.c:561
 msgid "|pinentry-label|_Save in password manager"
 msgstr "|pinentry-label|_Save in password manager"
 
-#: agent/call-pinentry.c:552
+#: agent/call-pinentry.c:562
 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:554
+#: agent/call-pinentry.c:564
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr "|pinentry-tt|Make passphrase visible"
 
-#: agent/call-pinentry.c:555
+#: agent/call-pinentry.c:565
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "|pinentry-tt|Hide passphrase"
 
+#: agent/call-pinentry.c:566
+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:944
+#: agent/call-pinentry.c:1022
 msgid "Suggest"
 msgstr "Suggest"
 
@@ -99,13 +103,24 @@ 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:966
+#: agent/call-pinentry.c:1044
 msgid "pinentry.genpin.tooltip"
 msgstr "pinentry.genpin.tooltip"
 
+#: agent/call-pinentry.c:1072
+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
+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:998
+#: agent/call-pinentry.c:1198
 msgid "Quality:"
 msgstr "Quality:"
 
@@ -115,11 +130,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:1019
+#: agent/call-pinentry.c:1219
 msgid "pinentry.qualitybar.tooltip"
 msgstr "pinentry.qualitybar.tooltip"
 
-#: agent/call-pinentry.c:1263
+#: agent/call-pinentry.c:1477
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
@@ -127,7 +142,7 @@ msgstr ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 
-#: agent/call-pinentry.c:1266
+#: agent/call-pinentry.c:1480
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -135,76 +150,76 @@ msgstr ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 
-#: agent/call-pinentry.c:1303 agent/call-pinentry.c:1506
+#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
 msgid "PIN:"
 msgstr "PIN:"
 
-#: agent/call-pinentry.c:1303 agent/call-pinentry.c:1506
-#: agent/protect-tool.c:728
+#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/protect-tool.c:729
 msgid "Passphrase:"
 msgstr "Passphrase:"
 
-#: agent/call-pinentry.c:1330 agent/call-pinentry.c:1580 agent/command.c:1799
-#: agent/command.c:1852 agent/command-ssh.c:3046 agent/genkey.c:398
+#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
+#: agent/command.c:1988 agent/command-ssh.c:3046 agent/genkey.c:442
 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:1351 agent/call-pinentry.c:1603
+#: agent/call-pinentry.c:1566 agent/call-pinentry.c:1830
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (try %d of %d)"
 
-#: agent/call-pinentry.c:1362 agent/call-pinentry.c:1614
+#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
 msgid "Repeat:"
 msgstr "Repeat:"
 
-#: agent/call-pinentry.c:1372 agent/call-pinentry.c:1384
-#: agent/call-pinentry.c:1624 agent/call-pinentry.c:1636
+#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
+#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
 msgid "PIN too long"
 msgstr "PIN too long"
 
-#: agent/call-pinentry.c:1373 agent/call-pinentry.c:1625
+#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
 msgid "Passphrase too long"
 msgstr "Passphrase too long"
 
-#: agent/call-pinentry.c:1381 agent/call-pinentry.c:1633
+#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
 msgid "Invalid characters in PIN"
 msgstr "Invalid characters in PIN"
 
-#: agent/call-pinentry.c:1386 agent/call-pinentry.c:1638
+#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
 msgid "PIN too short"
 msgstr "PIN too short"
 
-#: agent/call-pinentry.c:1405 agent/call-pinentry.c:1656
+#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
 msgid "Bad PIN"
 msgstr "Bad PIN"
 
-#: agent/call-pinentry.c:1405 agent/call-pinentry.c:1656
+#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
 msgid "Bad Passphrase"
 msgstr "Bad Passphrase"
 
-#: agent/command.c:697
+#: agent/command.c:823
 msgid "Note: Request from the web browser."
 msgstr "Note: Request from the web browser."
 
-#: agent/command.c:698
+#: agent/command.c:824
 msgid "Note: Request from a remote site."
 msgstr "Note: Request from a remote site."
 
-#: agent/command.c:1106 g10/card-util.c:708 g10/card-util.c:729
+#: agent/command.c:1235 g10/card-util.c:713 g10/card-util.c:734
 #, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "error getting serial number of card: %s\n"
 
-#: agent/command.c:1634 agent/command.c:1791 agent/command-ssh.c:2974
-#: agent/genkey.c:333
+#: agent/command.c:1756 agent/command.c:1921 agent/command-ssh.c:2974
+#: agent/genkey.c:377
 msgid "Please re-enter this passphrase"
 msgstr "Please re-enter this passphrase"
 
-#: agent/command.c:2567
+#: agent/command.c:2703
 #, c-format
 msgid ""
 "Please enter the passphrase to protect the imported object within the %s "
@@ -213,7 +228,7 @@ msgstr ""
 "Please enter the passphrase to protect the imported object within the %s "
 "system."
 
-#: agent/command.c:2697
+#: agent/command.c:2833
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -226,25 +241,25 @@ msgstr ""
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ssh keys greater than %d bits are not supported\n"
 
-#: agent/command-ssh.c:872 common/dotlock.c:852 g10/card-util.c:953
-#: g10/export.c:1329 g10/gpg.c:1431 g10/keygen.c:5347 g10/keyring.c:1319
-#: g10/keyring.c:1632 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
+#: agent/command-ssh.c:872 common/dotlock.c:852 g10/card-util.c:963
+#: g10/export.c:1329 g10/gpg.c:1431 g10/keygen.c:5377 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
 #: g10/sign.c:1106 g10/sign.c:1443 g10/tdbio.c:753 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:884 common/helpfile.c:57 g10/card-util.c:910
+#: agent/command-ssh.c:884 common/helpfile.c:57 g10/card-util.c:920
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
 #: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:721 g10/gpg.c:1432
-#: g10/import.c:371 g10/import.c:558 g10/import.c:793 g10/keygen.c:4322
-#: g10/keyring.c:1658 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
+#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4326
+#: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
 #: g10/plaintext.c:610 g10/sign.c:1086 g10/sign.c:1311 g10/sign.c:1424
 #: g10/sign.c:1596 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2380
-#: sm/gpgsm.c:2410 sm/gpgsm.c:2448 sm/keylist.c:1737 sm/qualified.c:65
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2236
+#: sm/gpgsm.c:2266 sm/gpgsm.c:2304 sm/keylist.c:1775 sm/qualified.c:65
 #: dirmngr/certcache.c:396 dirmngr/certcache.c:476 dirmngr/certcache.c:478
-#: dirmngr/crlcache.c:2588 dirmngr/dirmngr.c:1720 tools/gpg-card.c:408
+#: dirmngr/crlcache.c:2591 dirmngr/dirmngr.c:1759 tools/gpg-card.c:408
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "can't open '%s': %s\n"
@@ -350,28 +365,28 @@ msgstr "PIN not correctly repeated; try again"
 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:109 sm/certreqgen-ui.c:433
+#: 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:116
+#: agent/genkey.c:150
 #, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "error writing to temporary file: %s\n"
 
-#: agent/genkey.c:154
+#: agent/genkey.c:191
 msgid "Enter new passphrase"
 msgstr "Enter new passphrase"
 
-#: agent/genkey.c:184
+#: agent/genkey.c:227
 #, 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:186
+#: agent/genkey.c:229
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -380,18 +395,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:198
+#: agent/genkey.c:241
 msgid "Yes, protection is not needed"
 msgstr "Yes, protection is not needed"
 
-#: agent/genkey.c:215
+#: agent/genkey.c:258
 #, 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:234
+#: agent/genkey.c:277
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -401,232 +416,231 @@ msgstr[0] ""
 msgstr[1] ""
 "A passphrase should contain at least %u digits or%%0Aspecial characters."
 
-#: agent/genkey.c:260
+#: agent/genkey.c:304
 #, 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:275
+#: agent/genkey.c:319
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "Warning: You have entered an insecure passphrase."
 
-#: agent/genkey.c:296
+#: agent/genkey.c:340
 msgid "Take this one anyway"
 msgstr "Take this one anyway"
 
-#: agent/genkey.c:464
+#: agent/genkey.c:508
 #, 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:590
+#: agent/genkey.c:637
 msgid "Please enter the new passphrase"
 msgstr "Please enter the new passphrase"
 
-#: agent/gpg-agent.c:162 scd/scdaemon.c:115 dirmngr/dirmngr.c:182
+#: agent/gpg-agent.c:164 scd/scdaemon.c:115 dirmngr/dirmngr.c:183
 msgid "Options used for startup"
 msgstr "Options used for startup"
 
-#: agent/gpg-agent.c:164 scd/scdaemon.c:120 dirmngr/dirmngr.c:171
+#: agent/gpg-agent.c:166 scd/scdaemon.c:120 dirmngr/dirmngr.c:172
 msgid "run in daemon mode (background)"
 msgstr "run in daemon mode (background)"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:117 dirmngr/dirmngr.c:170
+#: agent/gpg-agent.c:167 scd/scdaemon.c:117 dirmngr/dirmngr.c:171
 msgid "run in server mode (foreground)"
 msgstr "run in server mode (foreground)"
 
-#: agent/gpg-agent.c:167 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:169 dirmngr/dirmngr.c:174
 msgid "run in supervised mode"
 msgstr "run in supervised mode"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:121 dirmngr/dirmngr.c:184
+#: agent/gpg-agent.c:171 scd/scdaemon.c:121 dirmngr/dirmngr.c:185
 msgid "do not detach from the console"
 msgstr "do not detach from the console"
 
-#: agent/gpg-agent.c:170 scd/scdaemon.c:122 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:172 scd/scdaemon.c:122 dirmngr/dirmngr.c:186
 msgid "sh-style command output"
 msgstr "sh-style command output"
 
-#: agent/gpg-agent.c:171 scd/scdaemon.c:123 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:173 scd/scdaemon.c:123 dirmngr/dirmngr.c:187
 msgid "csh-style command output"
 msgstr "csh-style command output"
 
-#: agent/gpg-agent.c:179 g10/gpg.c:589 scd/scdaemon.c:125 sm/gpgsm.c:422
-#: dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:181 g10/gpg.c:589 scd/scdaemon.c:125 sm/gpgsm.c:423
+#: dirmngr/dirmngr.c:189
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|read options from FILE"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:574 scd/scdaemon.c:129 sm/gpgsm.c:265
-#: dirmngr/dirmngr.c:192
+#: agent/gpg-agent.c:185 g10/gpg.c:574 scd/scdaemon.c:129 sm/gpgsm.c:265
+#: dirmngr/dirmngr.c:193
 msgid "Options controlling the diagnostic output"
 msgstr "Options controlling the diagnostic output"
 
-#: agent/gpg-agent.c:185 g10/gpg.c:576 g10/gpgv.c:78 kbx/kbxutil.c:89
+#: agent/gpg-agent.c:187 g10/gpg.c:576 g10/gpgv.c:78 kbx/kbxutil.c:89
 #: scd/scdaemon.c:131 sm/gpgsm.c:267 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:194 dirmngr/dirmngr_ldap.c:102
-#: tools/gpg-connect-agent.c:85 tools/gpgconf.c:111
+#: dirmngr/dirmngr.c:195 tools/gpg-connect-agent.c:85 tools/gpgconf.c:111
 msgid "verbose"
 msgstr "verbose"
 
-#: agent/gpg-agent.c:186 g10/gpg.c:578 g10/gpgv.c:79 kbx/kbxutil.c:90
+#: agent/gpg-agent.c:188 g10/gpg.c:578 g10/gpgv.c:79 kbx/kbxutil.c:90
 #: scd/scdaemon.c:132 sm/gpgsm.c:269 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:195 dirmngr/dirmngr_ldap.c:103
+#: dirmngr/dirmngr.c:196
 msgid "be somewhat more quiet"
 msgstr "be somewhat more quiet"
 
-#: agent/gpg-agent.c:194 g10/gpg.c:593 sm/gpgsm.c:283 dirmngr/dirmngr.c:205
+#: agent/gpg-agent.c:196 g10/gpg.c:593 sm/gpgsm.c:283 dirmngr/dirmngr.c:206
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FILE|write server mode logs to FILE"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 scd/scdaemon.c:146 sm/gpgsm.c:290
-#: dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:599 scd/scdaemon.c:146 sm/gpgsm.c:290
+#: dirmngr/dirmngr.c:210
 msgid "Options controlling the configuration"
 msgstr "Options controlling the configuration"
 
-#: agent/gpg-agent.c:201
+#: agent/gpg-agent.c:203
 msgid "do not use the SCdaemon"
 msgstr "do not use the SCdaemon"
 
-#: agent/gpg-agent.c:203
+#: agent/gpg-agent.c:205
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|use PGM as the SCdaemon program"
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr "|PGM|use PGM as the tpm2daemon program"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|accept some commands via NAME"
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 msgid "ignore requests to change the TTY"
 msgstr "ignore requests to change the TTY"
 
-#: agent/gpg-agent.c:215
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the X display"
 msgstr "ignore requests to change the X display"
 
-#: agent/gpg-agent.c:216
+#: agent/gpg-agent.c:218
 msgid "enable ssh support"
 msgstr "enable ssh support"
 
-#: agent/gpg-agent.c:218
+#: agent/gpg-agent.c:220
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "|ALGO|use ALGO to show ssh fingerprints"
 
-#: agent/gpg-agent.c:221
+#: agent/gpg-agent.c:223
 msgid "enable putty support"
 msgstr "enable putty support"
 
-#: agent/gpg-agent.c:233 g10/gpg.c:844 scd/scdaemon.c:176 sm/gpgsm.c:382
+#: agent/gpg-agent.c:235 g10/gpg.c:844 scd/scdaemon.c:176 sm/gpgsm.c:383
 msgid "Options controlling the security"
 msgstr "Options controlling the security"
 
-#: agent/gpg-agent.c:236
+#: agent/gpg-agent.c:238
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|expire cached PINs after N seconds"
 
-#: agent/gpg-agent.c:238
+#: agent/gpg-agent.c:240
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|expire SSH keys after N seconds"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:242
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|set maximum PIN cache lifetime to N seconds"
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:244
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr "|N|set maximum SSH key lifetime to N seconds"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:246
 msgid "do not use the PIN cache when signing"
 msgstr "do not use the PIN cache when signing"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:248
 msgid "disallow the use of an external password cache"
 msgstr "disallow the use of an external password cache"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:250
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "disallow clients to mark keys as “trusted�"
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:253
 msgid "allow presetting passphrase"
 msgstr "allow presetting passphrase"
 
-#: agent/gpg-agent.c:256
+#: agent/gpg-agent.c:258
 msgid "Options enforcing a passphrase policy"
 msgstr "Options enforcing a passphrase policy"
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:261
 msgid "do not allow bypassing the passphrase policy"
 msgstr "do not allow bypassing the passphrase policy"
 
-#: agent/gpg-agent.c:261
+#: agent/gpg-agent.c:263
 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:263
+#: agent/gpg-agent.c:265
 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:266
+#: agent/gpg-agent.c:268
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr "|FILE|check new passphrases against pattern in FILE"
 
-#: agent/gpg-agent.c:268
+#: agent/gpg-agent.c:272
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|expire the passphrase after N days"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:274
 msgid "do not allow the reuse of old passphrases"
 msgstr "do not allow the reuse of old passphrases"
 
-#: agent/gpg-agent.c:273
+#: agent/gpg-agent.c:277
 msgid "Options controlling the PIN-Entry"
 msgstr "Options controlling the PIN-Entry"
 
-#: agent/gpg-agent.c:275
+#: agent/gpg-agent.c:279
 msgid "never use the PIN-entry"
 msgstr "never use the PIN-entry"
 
-#: agent/gpg-agent.c:277
+#: agent/gpg-agent.c:281
 msgid "disallow caller to override the pinentry"
 msgstr "disallow caller to override the pinentry"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:283
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr "let PIN-Entry grab keyboard and mouse"
 
-#: agent/gpg-agent.c:282
+#: agent/gpg-agent.c:286
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|use PGM as the PIN-Entry program"
 
-#: agent/gpg-agent.c:286
+#: agent/gpg-agent.c:290
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|set the Pinentry timeout to N seconds"
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:294
 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:551 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: agent/gpg-agent.c:557 agent/preset-passphrase.c:99 agent/protect-tool.c:154
 #: g10/gpg.c:1132 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:612 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:438
-#: dirmngr/dirmngr_ldap.c:175 tools/gpg-connect-agent.c:220 tools/gpgconf.c:151
+#: sm/gpgsm.c:613 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:446
+#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:151
 #: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Please report bugs to <@EMAIL@>.\n"
 
-#: agent/gpg-agent.c:560
+#: agent/gpg-agent.c:566
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Usage: @GPG_AGENT@ [options] (-h for help)"
 
-#: agent/gpg-agent.c:562
+#: agent/gpg-agent.c:568
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -634,131 +648,131 @@ msgstr ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 
-#: agent/gpg-agent.c:607 g10/gpg.c:1337 scd/scdaemon.c:384 sm/gpgsm.c:760
-#: dirmngr/dirmngr.c:522
+#: agent/gpg-agent.c:613 g10/gpg.c:1337 scd/scdaemon.c:384 sm/gpgsm.c:761
+#: dirmngr/dirmngr.c:530
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "invalid debug-level ‘%s’ given\n"
 
-#: agent/gpg-agent.c:972 g10/gpg.c:3910 g10/gpg.c:3934 sm/gpgsm.c:1769
-#: sm/gpgsm.c:1775
+#: agent/gpg-agent.c:986 g10/gpg.c:3907 g10/gpg.c:3931 sm/gpgsm.c:1622
+#: sm/gpgsm.c:1628
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "selected digest algorithm is invalid\n"
 
-#: agent/gpg-agent.c:1196 agent/gpg-agent.c:2019 common/comopt.c:93
-#: g10/gpg.c:2591 scd/scdaemon.c:549 sm/gpgsm.c:1155 dirmngr/dirmngr.c:989
-#: dirmngr/dirmngr.c:1840
+#: agent/gpg-agent.c:1210 agent/gpg-agent.c:2035 common/comopt.c:93
+#: g10/gpg.c:2594 scd/scdaemon.c:549 sm/gpgsm.c:1028 dirmngr/dirmngr.c:1029
+#: dirmngr/dirmngr.c:1879
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "reading options from ‘%s’\n"
 
-#: agent/gpg-agent.c:1335 g10/gpg.c:3861 scd/scdaemon.c:687 sm/gpgsm.c:1709
-#: dirmngr/dirmngr.c:1108 tools/gpg-connect-agent.c:1270 tools/gpgconf.c:634
+#: agent/gpg-agent.c:1349 g10/gpg.c:3858 scd/scdaemon.c:687 sm/gpgsm.c:1562
+#: dirmngr/dirmngr.c:1145 tools/gpg-connect-agent.c:1270 tools/gpgconf.c:668
 #, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr "Note: ‘%s’ is not considered an option\n"
 
-#: agent/gpg-agent.c:2172 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1267
+#: agent/gpg-agent.c:2188 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1306
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "can't create socket: %s\n"
 
-#: agent/gpg-agent.c:2189 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1280
+#: agent/gpg-agent.c:2205 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1319
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "socket name ‘%s’ is too long\n"
 
-#: agent/gpg-agent.c:2228
+#: agent/gpg-agent.c:2244
 #, 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:2239 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1312
+#: agent/gpg-agent.c:2255 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1351
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "error getting nonce for the socket\n"
 
-#: agent/gpg-agent.c:2244 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1315
+#: agent/gpg-agent.c:2260 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1354
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "error binding socket to '%s': %s\n"
 
-#: agent/gpg-agent.c:2255 agent/gpg-agent.c:2295 agent/gpg-agent.c:2304
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1324
+#: agent/gpg-agent.c:2271 agent/gpg-agent.c:2311 agent/gpg-agent.c:2320
+#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1363
 #, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "can't set permissions of '%s': %s\n"
 
-#: agent/gpg-agent.c:2269 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1336
+#: agent/gpg-agent.c:2285 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1375
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "listening on socket ‘%s’\n"
 
-#: agent/gpg-agent.c:2289 agent/gpg-agent.c:2342 common/homedir.c:517
+#: agent/gpg-agent.c:2305 agent/gpg-agent.c:2358 common/homedir.c:537
 #: 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:2292 agent/gpg-agent.c:2347 common/homedir.c:520
+#: agent/gpg-agent.c:2308 agent/gpg-agent.c:2363 common/homedir.c:540
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "directory ‘%s’ created\n"
 
-#: agent/gpg-agent.c:2353
+#: agent/gpg-agent.c:2369
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "stat() failed for '%s': %s\n"
 
-#: agent/gpg-agent.c:2357
+#: agent/gpg-agent.c:2373
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "can't use ‘%s’ as home directory\n"
 
-#: agent/gpg-agent.c:2512 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2069
+#: agent/gpg-agent.c:2528 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2108
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "error reading nonce on fd %d: %s\n"
 
-#: agent/gpg-agent.c:2719
+#: agent/gpg-agent.c:2735
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "handler 0x%lx for fd %d started\n"
 
-#: agent/gpg-agent.c:2724
+#: agent/gpg-agent.c:2740
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "handler 0x%lx for fd %d terminated\n"
 
-#: agent/gpg-agent.c:2799
+#: agent/gpg-agent.c:2815
 #, 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:2804
+#: agent/gpg-agent.c:2820
 #, 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:3026 scd/scdaemon.c:1374 dirmngr/dirmngr.c:2283
+#: agent/gpg-agent.c:3042 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2322
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "npth_pselect failed: %s - waiting 1s\n"
 
-#: agent/gpg-agent.c:3114 scd/scdaemon.c:1439
+#: agent/gpg-agent.c:3130 scd/scdaemon.c:1441
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s stopped\n"
 
-#: agent/gpg-agent.c:3252 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3271 common/simple-pwquery.c:247 g10/call-agent.c:260
 #: sm/call-agent.c:131 tools/gpg-connect-agent.c:2319 tools/card-call-scd.c:311
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "no gpg-agent running in this session\n"
 
-#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:70
+#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:66
 msgid ""
 "@Options:\n"
 " "
@@ -779,7 +793,7 @@ msgstr ""
 "Password cache maintenance\n"
 
 #: agent/protect-tool.c:107 g10/gpg.c:448 kbx/kbxutil.c:72 sm/gpgsm.c:215
-#: dirmngr/dirmngr.c:168 tools/gpgconf.c:81
+#: dirmngr/dirmngr.c:169 tools/gpgconf.c:81
 msgid ""
 "@Commands:\n"
 " "
@@ -810,15 +824,15 @@ msgstr ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 
-#: agent/protect-tool.c:707
+#: agent/protect-tool.c:708 sm/import.c:775
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Please enter the passphrase to unprotect the PKCS#12 object."
 
-#: agent/protect-tool.c:712
+#: agent/protect-tool.c:713 sm/export.c:727
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Please enter the passphrase to protect the new PKCS#12 object."
 
-#: agent/protect-tool.c:718
+#: agent/protect-tool.c:719
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
@@ -826,7 +840,7 @@ msgstr ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 
-#: agent/protect-tool.c:723
+#: agent/protect-tool.c:724
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -834,17 +848,17 @@ msgstr ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 
-#: agent/protect-tool.c:734
+#: agent/protect-tool.c:735
 #, c-format
 msgid "cancelled\n"
 msgstr "cancelled\n"
 
-#: agent/protect-tool.c:736
+#: agent/protect-tool.c:737
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "error while asking for the passphrase: %s\n"
 
-#: agent/trustlist.c:153 agent/trustlist.c:363 tools/gpgconf.c:424
+#: agent/trustlist.c:153 agent/trustlist.c:363 tools/gpgconf.c:458
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "error opening '%s': %s\n"
@@ -1005,7 +1019,7 @@ msgstr "checking created signature failed: %s\n"
 msgid "secret key parts are not available\n"
 msgstr "secret key parts are not available\n"
 
-#: agent/cvt-openpgp.c:343 g10/card-util.c:1562
+#: agent/cvt-openpgp.c:343 g10/card-util.c:1575
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr "public key algorithm %d (%s) is not supported\n"
@@ -1034,7 +1048,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:505 common/exechelp-posix.c:580
-#: common/exechelp-posix.c:866 dirmngr/dirmngr.c:1354
+#: common/exechelp-posix.c:866 dirmngr/dirmngr.c:1393
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "error forking process: %s\n"
@@ -1106,7 +1120,7 @@ msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "renaming ‘%s’ to ‘%s’ failed: %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3082
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3099
 msgid "yes"
 msgstr "yes"
 
@@ -1160,7 +1174,7 @@ msgstr "out of core in secure memory while allocating %lu bytes"
 msgid "out of core while allocating %lu bytes"
 msgstr "out of core while allocating %lu bytes"
 
-#: common/miscellaneous.c:115 g10/card-util.c:917 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:927 tools/no-libgcrypt.c:30
 #: tools/gpg-card.c:416
 #, c-format
 msgid "error allocating enough memory: %s\n"
@@ -1231,7 +1245,7 @@ msgstr "error getting version from '%s': %s\n"
 msgid "server '%s' is older than us (%s < %s)"
 msgstr "server ‘%s’ is older than us (%s < %s)"
 
-#: common/asshelp.c:737 g10/call-dirmngr.c:408
+#: common/asshelp.c:737 g10/call-dirmngr.c:407
 #, c-format
 msgid "WARNING: %s\n"
 msgstr "WARNING: %s\n"
@@ -1314,7 +1328,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:4212
+#: scd/app-openpgp.c:4214
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "unsupported algorithm: %s"
@@ -1389,11 +1403,11 @@ msgstr "Certificate chain valid"
 msgid "Root certificate trustworthy"
 msgstr "Root certificate trustworthy"
 
-#: common/audit.c:1112 sm/certchain.c:1242
+#: common/audit.c:1112 sm/certchain.c:1243
 msgid "no CRL found for certificate"
 msgstr "no CRL found for certificate"
 
-#: common/audit.c:1115 sm/certchain.c:1252
+#: common/audit.c:1115 sm/certchain.c:1253
 msgid "the available CRL is too old"
 msgstr "the available CRL is too old"
 
@@ -1439,22 +1453,22 @@ msgstr "[none]"
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "invalid radix64 character %02x skipped\n"
 
-#: common/ttyio.c:433
+#: common/ttyio.c:447
 #, c-format
 msgid "Sorry, we are in batchmode - can't get input\n"
 msgstr "Sorry, we are in batchmode - can't get input\n"
 
-#: common/ttyio.c:439
+#: common/ttyio.c:453
 #, c-format
 msgid "Sorry, no terminal at all requested - can't get input\n"
 msgstr "Sorry, no terminal at all requested - can't get input\n"
 
-#: common/ttyio.c:474 common/ttyio.c:484
+#: common/ttyio.c:488 common/ttyio.c:498
 #, c-format
 msgid "too many errors; giving up\n"
 msgstr "too many errors; giving up\n"
 
-#: common/ttyio.c:536
+#: common/ttyio.c:550
 #, c-format
 msgid "Control-D detected\n"
 msgstr "Control-D detected\n"
@@ -1508,8 +1522,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:1036 dirmngr/dirmngr.c:895
-#: dirmngr/dirmngr.c:904
+#: common/init.c:191 sm/gpgsm.c:909 dirmngr/dirmngr.c:935 dirmngr/dirmngr.c:944
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s is too old (need %s, have %s)\n"
@@ -1660,7 +1673,7 @@ msgid "Enter passphrase: "
 msgstr "Enter passphrase: "
 
 #: g10/call-agent.c:318 g10/encrypt.c:282 g10/encrypt.c:818 g10/sign.c:473
-#: sm/call-agent.c:180 sm/encrypt.c:701 sm/sign.c:436
+#: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
 #, c-format
 msgid "%s is not compliant with %s mode\n"
 msgstr "%s is not compliant with %s mode\n"
@@ -1670,212 +1683,212 @@ msgstr "%s is not compliant with %s mode\n"
 msgid "error from TPM: %s\n"
 msgstr "error from TPM: %s\n"
 
-#: g10/call-agent.c:2123 g10/passphrase.c:225 g10/passphrase.c:258
-#: tools/card-call-scd.c:1751
+#: g10/call-agent.c:2135 g10/passphrase.c:233 g10/passphrase.c:266
+#: tools/card-call-scd.c:1755
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problem with the agent: %s\n"
 
-#: g10/call-dirmngr.c:179 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2316
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2316
 #, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "no dirmngr running in this session\n"
 
-#: g10/call-dirmngr.c:213
+#: g10/call-dirmngr.c:212
 #, c-format
 msgid "keyserver option \"honor-keyserver-url\" may not be used in Tor mode\n"
 msgstr "keyserver option “honor-keyserver-url� may not be used in Tor mode\n"
 
-#: g10/call-dirmngr.c:386
+#: g10/call-dirmngr.c:385
 msgid "WKD uses a cached result"
 msgstr "WKD uses a cached result"
 
-#: g10/call-dirmngr.c:389
+#: g10/call-dirmngr.c:388
 msgid "Tor is not running"
 msgstr "Tor is not running"
 
-#: g10/call-dirmngr.c:391
+#: g10/call-dirmngr.c:390
 msgid "Tor is not properly configured"
 msgstr "Tor is not properly configured"
 
-#: g10/call-dirmngr.c:393
+#: g10/call-dirmngr.c:392
 msgid "DNS is not properly configured"
 msgstr "DNS is not properly configured"
 
-#: g10/call-dirmngr.c:395
+#: g10/call-dirmngr.c:394
 msgid "unacceptable HTTP redirect from server"
 msgstr "unacceptable HTTP redirect from server"
 
-#: g10/call-dirmngr.c:397
+#: g10/call-dirmngr.c:396
 msgid "unacceptable HTTP redirect from server was cleaned up"
 msgstr "unacceptable HTTP redirect from server was cleaned up"
 
-#: g10/call-dirmngr.c:399
+#: g10/call-dirmngr.c:398
 msgid "server uses an invalid certificate"
 msgstr "server uses an invalid certificate"
 
-#: g10/call-dirmngr.c:406 g10/gpg.c:4599
+#: g10/call-dirmngr.c:405 g10/gpg.c:4596
 #, c-format
 msgid "Note: %s\n"
 msgstr "Note: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:369 g10/card-util.c:1924
-#: tools/gpg-card.c:3039
+#: g10/card-util.c:86 g10/card-util.c:374 g10/card-util.c:1937
+#: tools/gpg-card.c:3056
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP card not available: %s\n"
 
-#: g10/card-util.c:91 g10/card-util.c:1930
+#: g10/card-util.c:91 g10/card-util.c:1943
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP card no. %s detected\n"
 
-#: g10/card-util.c:97 g10/card-util.c:2309 g10/delkey.c:164 g10/keyedit.c:1428
-#: g10/keygen.c:4791 g10/revoke.c:214 g10/revoke.c:638
+#: g10/card-util.c:97 g10/card-util.c:2322 g10/delkey.c:164 g10/keyedit.c:1428
+#: g10/keygen.c:4795 g10/revoke.c:214 g10/revoke.c:639
 #, c-format
 msgid "can't do this in batch mode\n"
 msgstr "can't do this in batch mode\n"
 
-#: g10/card-util.c:105 tools/gpg-card.c:2943
+#: g10/card-util.c:105 tools/gpg-card.c:2960
 #, c-format
 msgid "This command is only available for version 2 cards\n"
 msgstr "This command is only available for version 2 cards\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3398 tools/gpg-card.c:2948
+#: g10/card-util.c:107 scd/app-openpgp.c:3399 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"
 
-#: g10/card-util.c:140 g10/card-util.c:1448 g10/card-util.c:1710
-#: g10/card-util.c:1802 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1991 g10/keygen.c:2165 g10/keygen.c:2385 g10/keygen.c:2685
+#: g10/card-util.c:140 g10/card-util.c:1458 g10/card-util.c:1723
+#: g10/card-util.c:1815 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/keygen.c:1992 g10/keygen.c:2166 g10/keygen.c:2386 g10/keygen.c:2686
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
 #: tools/gpg-card.c:510
 msgid "Your selection? "
 msgstr "Your selection? "
 
-#: g10/card-util.c:262 g10/card-util.c:313 tools/gpg-card.c:596
+#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:596
 #: tools/gpg-card.c:636
 msgid "[not set]"
 msgstr "[not set]"
 
-#: g10/card-util.c:558 tools/gpg-card.c:903
+#: g10/card-util.c:563 tools/gpg-card.c:905
 msgid "Mr."
 msgstr "Mr."
 
-#: g10/card-util.c:559 tools/gpg-card.c:904
+#: g10/card-util.c:564 tools/gpg-card.c:906
 msgid "Ms."
 msgstr "Ms."
 
-#: g10/card-util.c:586 tools/gpg-card.c:931
+#: g10/card-util.c:591 tools/gpg-card.c:933
 msgid "not forced"
 msgstr "not forced"
 
-#: g10/card-util.c:586 tools/gpg-card.c:931
+#: g10/card-util.c:591 tools/gpg-card.c:933
 msgid "forced"
 msgstr "forced"
 
-#: g10/card-util.c:768 tools/gpg-card.c:1468
+#: g10/card-util.c:773 tools/gpg-card.c:1484
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Error: Only plain ASCII is currently allowed.\n"
 
-#: g10/card-util.c:770 tools/gpg-card.c:1470
+#: g10/card-util.c:775 tools/gpg-card.c:1486
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Error: The “<� character may not be used.\n"
 
-#: g10/card-util.c:772 tools/gpg-card.c:1472
+#: g10/card-util.c:777 tools/gpg-card.c:1488
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Error: Double spaces are not allowed.\n"
 
-#: g10/card-util.c:789 tools/gpg-card.c:1505
+#: g10/card-util.c:795 tools/gpg-card.c:1521
 msgid "Cardholder's surname: "
 msgstr "Cardholder's surname: "
 
-#: g10/card-util.c:791 tools/gpg-card.c:1506
+#: g10/card-util.c:797 tools/gpg-card.c:1522
 msgid "Cardholder's given name: "
 msgstr "Cardholder's given name: "
 
-#: g10/card-util.c:809 tools/gpg-card.c:1523
+#: g10/card-util.c:816 tools/gpg-card.c:1539
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Error: Combined name too long (limit is %d characters).\n"
 
-#: g10/card-util.c:830 tools/gpg-card.c:1561
+#: g10/card-util.c:840 tools/gpg-card.c:1577
 msgid "URL to retrieve public key: "
 msgstr "URL to retrieve public key: "
 
-#: g10/card-util.c:926 g10/decrypt-data.c:495 g10/import.c:406 g10/import.c:756
-#: g10/import.c:815 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1666
-#: tools/gpgconf.c:437 tools/gpgconf.c:483 tools/gpg-card.c:426
+#: g10/card-util.c:936 g10/decrypt-data.c:495 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:1705
+#: tools/gpgconf.c:471 tools/gpgconf.c:517 tools/gpg-card.c:426
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "error reading '%s': %s\n"
 
-#: g10/card-util.c:959 g10/decrypt-data.c:498 g10/export.c:2496
+#: g10/card-util.c:969 g10/decrypt-data.c:498 g10/export.c:2496
 #: dirmngr/crlcache.c:925 tools/gpg-card.c:486 tools/gpg-card.c:493
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr "error writing '%s': %s\n"
 
-#: g10/card-util.c:986 tools/gpg-card.c:1650
+#: g10/card-util.c:996 tools/gpg-card.c:1666
 msgid "Login data (account name): "
 msgstr "Login data (account name): "
 
-#: g10/card-util.c:1024 tools/gpg-card.c:1945
+#: g10/card-util.c:1034 tools/gpg-card.c:1962
 msgid "Private DO data: "
 msgstr "Private DO data: "
 
-#: g10/card-util.c:1109 tools/gpg-card.c:1699
+#: g10/card-util.c:1119 tools/gpg-card.c:1715
 msgid "Language preferences: "
 msgstr "Language preferences: "
 
-#: g10/card-util.c:1117 tools/gpg-card.c:1710
+#: g10/card-util.c:1127 tools/gpg-card.c:1726
 #, c-format
 msgid "Error: invalid length of preference string.\n"
 msgstr "Error: invalid length of preference string.\n"
 
-#: g10/card-util.c:1126 tools/gpg-card.c:1719
+#: g10/card-util.c:1136 tools/gpg-card.c:1735
 #, c-format
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Error: invalid characters in preference string.\n"
 
-#: g10/card-util.c:1148 tools/gpg-card.c:1753
+#: g10/card-util.c:1158 tools/gpg-card.c:1769
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr "Salutation (M = Mr., F = Ms., or space): "
 
-#: g10/card-util.c:1162 tools/gpg-card.c:1770
+#: g10/card-util.c:1172 tools/gpg-card.c:1786
 msgid "Error: invalid response.\n"
 msgstr "Error: invalid response.\n"
 
-#: g10/card-util.c:1185 tools/gpg-card.c:1835
+#: g10/card-util.c:1195 tools/gpg-card.c:1852
 msgid "CA fingerprint: "
 msgstr "CA fingerprint: "
 
-#: g10/card-util.c:1209 tools/gpg-card.c:1861
+#: g10/card-util.c:1219 tools/gpg-card.c:1878
 #, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Error: invalid formatted fingerprint.\n"
 
-#: g10/card-util.c:1259
+#: g10/card-util.c:1269
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "key operation not possible: %s\n"
 
-#: g10/card-util.c:1260
+#: g10/card-util.c:1270
 msgid "not an OpenPGP card"
 msgstr "not an OpenPGP card"
 
-#: g10/card-util.c:1273 g10/keygen.c:4811 g10/keygen.c:5972
+#: g10/card-util.c:1283 g10/keygen.c:4815 g10/keygen.c:6003
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "error getting current key info: %s\n"
 
-#: g10/card-util.c:1358
+#: g10/card-util.c:1368
 msgid "Replace existing key? (y/N) "
 msgstr "Replace existing key? (y/N) "
 
-#: g10/card-util.c:1375 tools/gpg-card.c:3328
+#: g10/card-util.c:1385 tools/gpg-card.c:3345
 msgid ""
 "Note: There is no guarantee that the card supports the requested\n"
 "      key type or size.  If the key generation does not succeed,\n"
@@ -1887,99 +1900,99 @@ msgstr ""
 "      please check the documentation of your card to see which\n"
 "      key types and sizes are supported.\n"
 
-#: g10/card-util.c:1396 g10/keygen.c:2570 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1406 g10/keygen.c:2571 sm/certreqgen-ui.c:180
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "What keysize do you want? (%u) "
 
-#: g10/card-util.c:1406 g10/keygen.c:2493 g10/keygen.c:2525
+#: g10/card-util.c:1416 g10/keygen.c:2494 g10/keygen.c:2526
 #: sm/certreqgen-ui.c:195
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rounded up to %u bits\n"
 
-#: g10/card-util.c:1414 g10/keygen.c:2578 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1424 g10/keygen.c:2579 sm/certreqgen-ui.c:185
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s keysizes must be in the range %u-%u\n"
 
-#: g10/card-util.c:1433
+#: g10/card-util.c:1443
 msgid "Changing card key attribute for: "
 msgstr "Changing card key attribute for: "
 
-#: g10/card-util.c:1435
+#: g10/card-util.c:1445
 msgid "Signature key\n"
 msgstr "Signature key\n"
 
-#: g10/card-util.c:1437
+#: g10/card-util.c:1447
 msgid "Encryption key\n"
 msgstr "Encryption key\n"
 
-#: g10/card-util.c:1439
+#: g10/card-util.c:1449
 msgid "Authentication key\n"
 msgstr "Authentication key\n"
 
-#: g10/card-util.c:1441 g10/keygen.c:2112 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1451 g10/keygen.c:2113 sm/certreqgen-ui.c:158
 msgid "Please select what kind of key you want:\n"
 msgstr "Please select what kind of key you want:\n"
 
-#: g10/card-util.c:1442 sm/certreqgen-ui.c:159
+#: g10/card-util.c:1452 sm/certreqgen-ui.c:159
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1443
+#: g10/card-util.c:1453
 #, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) ECC\n"
 
-#: g10/card-util.c:1455 g10/card-util.c:1722 g10/card-util.c:1822
-#: g10/keyedit.c:900 g10/keygen.c:2017 g10/keygen.c:2045 g10/keygen.c:2172
-#: g10/keygen.c:2425 g10/keygen.c:2713 g10/revoke.c:836
+#: g10/card-util.c:1468 g10/card-util.c:1735 g10/card-util.c:1835
+#: g10/keyedit.c:900 g10/keygen.c:2018 g10/keygen.c:2046 g10/keygen.c:2173
+#: g10/keygen.c:2426 g10/keygen.c:2714 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Invalid selection.\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1541
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr "The card will now be re-configured to generate a key of %u bits\n"
 
-#: g10/card-util.c:1533
+#: g10/card-util.c:1546
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr "The card will now be re-configured to generate a key of type: %s\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1582
 #, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "error changing key attribute for key %d: %s\n"
 
-#: g10/card-util.c:1585 g10/card-util.c:2106 g10/card-util.c:2162
+#: g10/card-util.c:1598 g10/card-util.c:2119 g10/card-util.c:2175
 #, c-format
 msgid "error getting card info: %s\n"
 msgstr "error getting card info: %s\n"
 
-#: g10/card-util.c:1591 g10/card-util.c:1936 g10/card-util.c:2112
-#: g10/card-util.c:2171 tools/gpg-card.c:3057 tools/gpg-card.c:3296
-#: tools/gpg-card.c:3354
+#: g10/card-util.c:1604 g10/card-util.c:1949 g10/card-util.c:2125
+#: g10/card-util.c:2184 tools/gpg-card.c:3074 tools/gpg-card.c:3313
+#: tools/gpg-card.c:3371
 #, c-format
 msgid "This command is not supported by this card\n"
 msgstr "This command is not supported by this card\n"
 
-#: g10/card-util.c:1637 tools/gpg-card.c:2426
+#: g10/card-util.c:1650 tools/gpg-card.c:2443
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Make off-card backup of encryption key? (Y/n) "
 
-#: g10/card-util.c:1651
+#: g10/card-util.c:1664
 #, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "Note: keys are already stored on the card!\n"
 
-#: g10/card-util.c:1654 tools/gpg-card.c:2398
+#: g10/card-util.c:1667 tools/gpg-card.c:2415
 msgid "Replace existing keys? (y/N) "
 msgstr "Replace existing keys? (y/N) "
 
-#: g10/card-util.c:1666 tools/gpg-card.c:2457
+#: g10/card-util.c:1679 tools/gpg-card.c:2474
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1990,152 +2003,152 @@ msgstr ""
 "   PIN = ‘%s’     Admin PIN = ‘%s’\n"
 "You should change them using the command --change-pin\n"
 
-#: g10/card-util.c:1701
+#: g10/card-util.c:1714
 msgid "Please select the type of key to generate:\n"
 msgstr "Please select the type of key to generate:\n"
 
-#: g10/card-util.c:1703 g10/card-util.c:1793
+#: g10/card-util.c:1716 g10/card-util.c:1806
 msgid "   (1) Signature key\n"
 msgstr "   (1) Signature key\n"
 
-#: g10/card-util.c:1704 g10/card-util.c:1795
+#: g10/card-util.c:1717 g10/card-util.c:1808
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Encryption key\n"
 
-#: g10/card-util.c:1705 g10/card-util.c:1797
+#: g10/card-util.c:1718 g10/card-util.c:1810
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Authentication key\n"
 
-#: g10/card-util.c:1790
+#: g10/card-util.c:1803
 msgid "Please select where to store the key:\n"
 msgstr "Please select where to store the key:\n"
 
-#: g10/card-util.c:1836
+#: g10/card-util.c:1849
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "KEYTOCARD failed: %s\n"
 
-#: g10/card-util.c:1941 tools/gpg-card.c:3065
+#: g10/card-util.c:1954 tools/gpg-card.c:3082
 #, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr "Note: This command destroys all keys stored on the card!\n"
 
-#: g10/card-util.c:1944 tools/gpg-card.c:3068 tools/gpg-card.c:3409
+#: g10/card-util.c:1957 tools/gpg-card.c:3085 tools/gpg-card.c:3426
 msgid "Continue? (y/N) "
 msgstr "Continue? (y/N) "
 
-#: g10/card-util.c:1949 tools/gpg-card.c:3079
+#: g10/card-util.c:1962 tools/gpg-card.c:3096
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr "Really do a factory reset? (enter “yes�) "
 
-#: g10/card-util.c:2142
+#: g10/card-util.c:2155
 #, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "error for setup KDF: %s\n"
 
-#: g10/card-util.c:2188
+#: g10/card-util.c:2201
 #, c-format
 msgid "error for setup UIF: %s\n"
 msgstr "error for setup UIF: %s\n"
 
-#: g10/card-util.c:2212 g10/keyedit.c:1263 tools/gpg-card.c:3649
+#: g10/card-util.c:2225 g10/keyedit.c:1263 tools/gpg-card.c:3666
 msgid "quit this menu"
 msgstr "quit this menu"
 
-#: g10/card-util.c:2214
+#: g10/card-util.c:2227
 msgid "show admin commands"
 msgstr "show admin commands"
 
-#: g10/card-util.c:2215 g10/keyedit.c:1266 tools/gpg-card.c:3652
+#: g10/card-util.c:2228 g10/keyedit.c:1266 tools/gpg-card.c:3669
 msgid "show this help"
 msgstr "show this help"
 
-#: g10/card-util.c:2217 tools/gpg-card.c:3654
+#: g10/card-util.c:2230 tools/gpg-card.c:3671
 msgid "list all available data"
 msgstr "list all available data"
 
-#: g10/card-util.c:2220 tools/gpg-card.c:3656
+#: g10/card-util.c:2233 tools/gpg-card.c:3673
 msgid "change card holder's name"
 msgstr "change card holder's name"
 
-#: g10/card-util.c:2221 tools/gpg-card.c:3657
+#: g10/card-util.c:2234 tools/gpg-card.c:3674
 msgid "change URL to retrieve key"
 msgstr "change URL to retrieve key"
 
-#: g10/card-util.c:2222 tools/gpg-card.c:3658
+#: g10/card-util.c:2235 tools/gpg-card.c:3675
 msgid "fetch the key specified in the card URL"
 msgstr "fetch the key specified in the card URL"
 
-#: g10/card-util.c:2223 tools/gpg-card.c:3659
+#: g10/card-util.c:2236 tools/gpg-card.c:3676
 msgid "change the login name"
 msgstr "change the login name"
 
-#: g10/card-util.c:2224 tools/gpg-card.c:3660
+#: g10/card-util.c:2237 tools/gpg-card.c:3677
 msgid "change the language preferences"
 msgstr "change the language preferences"
 
-#: g10/card-util.c:2225 tools/gpg-card.c:3661
+#: g10/card-util.c:2238 tools/gpg-card.c:3678
 msgid "change card holder's salutation"
 msgstr "change card holder's salutation"
 
-#: g10/card-util.c:2227 tools/gpg-card.c:3663
+#: g10/card-util.c:2240 tools/gpg-card.c:3680
 msgid "change a CA fingerprint"
 msgstr "change a CA fingerprint"
 
-#: g10/card-util.c:2228 tools/gpg-card.c:3664
+#: g10/card-util.c:2241 tools/gpg-card.c:3681
 msgid "toggle the signature force PIN flag"
 msgstr "toggle the signature force PIN flag"
 
-#: g10/card-util.c:2229 tools/gpg-card.c:3665
+#: g10/card-util.c:2242 tools/gpg-card.c:3682
 msgid "generate new keys"
 msgstr "generate new keys"
 
-#: g10/card-util.c:2230 tools/gpg-card.c:3666
+#: g10/card-util.c:2243 tools/gpg-card.c:3683
 msgid "menu to change or unblock the PIN"
 msgstr "menu to change or unblock the PIN"
 
-#: g10/card-util.c:2231 tools/gpg-card.c:3667
+#: g10/card-util.c:2244 tools/gpg-card.c:3684
 msgid "verify the PIN and list all data"
 msgstr "verify the PIN and list all data"
 
-#: g10/card-util.c:2232 tools/gpg-card.c:3668
+#: g10/card-util.c:2245 tools/gpg-card.c:3685
 msgid "unblock the PIN using a Reset Code"
 msgstr "unblock the PIN using a Reset Code"
 
-#: g10/card-util.c:2233 tools/gpg-card.c:3672
+#: g10/card-util.c:2246 tools/gpg-card.c:3689
 msgid "destroy all keys and data"
 msgstr "destroy all keys and data"
 
-#: g10/card-util.c:2235
+#: g10/card-util.c:2248
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr "setup KDF for PIN authentication (on/single/off)"
 
-#: g10/card-util.c:2236
+#: g10/card-util.c:2249
 msgid "change the key attribute"
 msgstr "change the key attribute"
 
-#: g10/card-util.c:2237 tools/gpg-card.c:3674
+#: g10/card-util.c:2250 tools/gpg-card.c:3691
 msgid "change the User Interaction Flag"
 msgstr "change the User Interaction Flag"
 
-#: g10/card-util.c:2361 tools/gpg-card.c:3924
+#: g10/card-util.c:2374 tools/gpg-card.c:3941
 msgid "gpg/card> "
 msgstr "gpg/card> "
 
-#: g10/card-util.c:2402
+#: g10/card-util.c:2415
 msgid "Admin-only command\n"
 msgstr "Admin-only command\n"
 
-#: g10/card-util.c:2433
+#: g10/card-util.c:2446
 msgid "Admin commands are allowed\n"
 msgstr "Admin commands are allowed\n"
 
-#: g10/card-util.c:2435
+#: g10/card-util.c:2448
 msgid "Admin commands are not allowed\n"
 msgstr "Admin commands are not allowed\n"
 
-#: g10/card-util.c:2546 g10/keyedit.c:2275 tools/gpg-card.c:3814
-#: tools/gpg-card.c:4072
+#: g10/card-util.c:2559 g10/keyedit.c:2275 tools/gpg-card.c:3831
+#: tools/gpg-card.c:4089
 #, c-format
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Invalid command  (try “help�)\n"
@@ -2145,22 +2158,22 @@ msgstr "Invalid command  (try “help�)\n"
 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:5293 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5292 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:1934 g10/export.c:2342 g10/export.c:2463
-#: g10/getkey.c:1907 g10/gpg.c:5238 g10/keyedit.c:1450 g10/keyedit.c:2382
-#: g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:703 g10/keyserver.c:1240
-#: g10/revoke.c:230 g10/tofu.c:2168
+#: g10/getkey.c:2032 g10/gpg.c:5237 g10/keyedit.c:1450 g10/keyedit.c:2382
+#: g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:703 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:2002 g10/getkey.c:1915 g10/getkey.c:4330
-#: g10/gpg.c:5247 g10/keyedit.c:2354 g10/keyserver.c:1258 g10/revoke.c:236
-#: g10/revoke.c:665 g10/tofu.c:2176
+#: g10/delkey.c:90 g10/export.c:2002 g10/getkey.c:2040 g10/getkey.c:4455
+#: g10/gpg.c:5246 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"
 msgstr "error reading keyblock: %s\n"
@@ -2279,14 +2292,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:555 g10/encrypt.c:808 g10/decrypt-data.c:261 g10/gpg.c:4083
-#: g10/gpg.c:4130 sm/decrypt.c:742 sm/encrypt.c:691 sm/gpgsm.c:1793
+#: g10/encrypt.c:555 g10/encrypt.c:808 g10/decrypt-data.c:261 g10/gpg.c:4080
+#: g10/gpg.c:4127 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1646
 #, 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:564 g10/gpg.c:4095 g10/gpg.c:4142 g10/sig-check.c:155
-#: g10/sign.c:452 sm/gpgsm.c:1803 sm/gpgsm.c:1813 sm/sign.c:596 sm/verify.c:510
+#: g10/encrypt.c:564 g10/gpg.c:4092 g10/gpg.c:4139 g10/sig-check.c:155
+#: g10/sign.c:452 sm/gpgsm.c:1656 sm/gpgsm.c:1666 sm/sign.c:596 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"
@@ -2303,7 +2316,7 @@ msgid ""
 msgstr ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 
-#: g10/encrypt.c:838 sm/encrypt.c:766
+#: g10/encrypt.c:838 sm/encrypt.c:767
 #, c-format
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "WARNING: key %s is not suitable for encryption in %s mode\n"
@@ -2332,7 +2345,7 @@ msgstr "%s/%s.%s encrypted for: “%s�\n"
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "option ‘%s’ may not be used in %s mode\n"
 
-#: g10/decrypt-data.c:239 g10/mainproc.c:380 sm/decrypt.c:494
+#: g10/decrypt-data.c:239 g10/mainproc.c:380 sm/decrypt.c:892
 #, c-format
 msgid "%s.%s encrypted data\n"
 msgstr "%s.%s encrypted data\n"
@@ -2342,7 +2355,7 @@ msgstr "%s.%s encrypted data\n"
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "encrypted with unknown algorithm %d\n"
 
-#: g10/decrypt-data.c:361 g10/decrypt-data.c:414 sm/decrypt.c:508
+#: g10/decrypt-data.c:361 g10/decrypt-data.c:414 sm/decrypt.c:906
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2382,7 +2395,7 @@ msgstr "use the GnuPG key backup format"
 msgid " - skipped"
 msgstr " - skipped"
 
-#: g10/export.c:1333 g10/import.c:2124 g10/openfile.c:202 g10/openfile.c:296
+#: g10/export.c:1333 g10/import.c:2132 g10/openfile.c:202 g10/openfile.c:296
 #: g10/sign.c:1110 g10/sign.c:1447
 #, c-format
 msgid "writing to '%s'\n"
@@ -2418,61 +2431,61 @@ msgstr "error creating '%s': %s\n"
 msgid "[User ID not found]"
 msgstr "[User ID not found]"
 
-#: g10/getkey.c:1199
+#: g10/getkey.c:1324
 #, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "automatically retrieved ‘%s’ via %s\n"
 
-#: g10/getkey.c:1205
+#: g10/getkey.c:1330
 #, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "error retrieving ‘%s’ via %s: %s\n"
 
-#: g10/getkey.c:1207
+#: g10/getkey.c:1332
 msgid "No fingerprint"
 msgstr "No fingerprint"
 
-#: g10/getkey.c:1449
+#: g10/getkey.c:1574
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr "checking for a fresh copy of an expired key via %s\n"
 
-#: g10/getkey.c:1884 g10/revoke.c:657 g10/revoke.c:718
+#: g10/getkey.c:2009 g10/revoke.c:658 g10/revoke.c:719
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "secret key “%s� not found: %s\n"
 
-#: g10/getkey.c:1887 g10/pkclist.c:1012
+#: g10/getkey.c:2012 g10/pkclist.c:1012
 #, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "(check argument of option '%s')\n"
 
-#: g10/getkey.c:1965
+#: g10/getkey.c:2090
 #, c-format
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "Warning: not using ‘%s’ as default key: %s\n"
 
-#: g10/getkey.c:1973
+#: g10/getkey.c:2098
 #, c-format
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "using “%s� as default secret key for signing\n"
 
-#: g10/getkey.c:1980
+#: g10/getkey.c:2105
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr "all values passed to ‘%s’ ignored\n"
 
-#: g10/getkey.c:2837
+#: g10/getkey.c:2962
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:3703
+#: g10/getkey.c:3828
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "using subkey %s instead of primary key %s\n"
 
-#: g10/getkey.c:4259 g10/gpg.c:2167
+#: g10/getkey.c:4384 g10/gpg.c:2168
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "valid values for option '%s':\n"
@@ -2657,7 +2670,7 @@ msgstr "|SPEC|set up email aliases"
 msgid "use strict OpenPGP behavior"
 msgstr "use strict OpenPGP behavior"
 
-#: g10/gpg.c:651 kbx/kbxutil.c:91 sm/gpgsm.c:424 tools/gpgconf.c:113
+#: g10/gpg.c:651 kbx/kbxutil.c:91 sm/gpgsm.c:425 tools/gpgconf.c:113
 msgid "do not make any changes"
 msgstr "do not make any changes"
 
@@ -2689,7 +2702,7 @@ msgstr "use canonical text mode"
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|set compress level to N (0 disables)"
 
-#: g10/gpg.c:762 sm/gpgsm.c:357
+#: g10/gpg.c:762 sm/gpgsm.c:358
 msgid "Options controlling key import and export"
 msgstr "Options controlling key import and export"
 
@@ -2705,11 +2718,11 @@ msgstr "import missing key from a signature"
 msgid "include the public key in signatures"
 msgstr "include the public key in signatures"
 
-#: g10/gpg.c:776 sm/gpgsm.c:360
+#: g10/gpg.c:776 sm/gpgsm.c:361
 msgid "disable all access to the dirmngr"
 msgstr "disable all access to the dirmngr"
 
-#: g10/gpg.c:788 sm/gpgsm.c:367
+#: g10/gpg.c:788 sm/gpgsm.c:368
 msgid "Options controlling key listings"
 msgstr "Options controlling key listings"
 
@@ -2725,15 +2738,15 @@ msgstr "|USER-ID|encrypt for USER-ID"
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|USER-ID|use USER-ID to sign or decrypt"
 
-#: g10/gpg.c:876 sm/gpgsm.c:408
+#: g10/gpg.c:876 sm/gpgsm.c:409
 msgid "Options for unattended use"
 msgstr "Options for unattended use"
 
-#: g10/gpg.c:895 sm/gpgsm.c:420 dirmngr/dirmngr.c:286
+#: g10/gpg.c:895 sm/gpgsm.c:421 dirmngr/dirmngr.c:289
 msgid "Other options"
 msgstr "Other options"
 
-#: g10/gpg.c:966 sm/gpgsm.c:453
+#: g10/gpg.c:966 sm/gpgsm.c:454
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2775,7 +2788,7 @@ msgstr ""
 "Sign, check, encrypt or decrypt\n"
 "Default operation depends on the input data\n"
 
-#: g10/gpg.c:1168 sm/gpgsm.c:636
+#: g10/gpg.c:1168 sm/gpgsm.c:637
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2799,12 +2812,12 @@ msgstr "Hash: "
 msgid "Compression: "
 msgstr "Compression: "
 
-#: g10/gpg.c:1274 sm/gpgsm.c:710
+#: g10/gpg.c:1274 sm/gpgsm.c:711
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "usage: %s [options] %s\n"
 
-#: g10/gpg.c:1467 sm/gpgsm.c:803
+#: g10/gpg.c:1467 sm/gpgsm.c:804
 #, c-format
 msgid "conflicting commands\n"
 msgstr "conflicting commands\n"
@@ -2814,520 +2827,520 @@ msgstr "conflicting commands\n"
 msgid "no = sign found in group definition '%s'\n"
 msgstr "no = sign found in group definition ‘%s’\n"
 
-#: g10/gpg.c:1683
+#: g10/gpg.c:1684
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "WARNING: unsafe ownership on homedir ‘%s’\n"
 
-#: g10/gpg.c:1686
+#: g10/gpg.c:1687
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "WARNING: unsafe ownership on configuration file ‘%s’\n"
 
-#: g10/gpg.c:1689
+#: g10/gpg.c:1690
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "WARNING: unsafe ownership on extension ‘%s’\n"
 
-#: g10/gpg.c:1695
+#: g10/gpg.c:1696
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "WARNING: unsafe permissions on homedir ‘%s’\n"
 
-#: g10/gpg.c:1698
+#: g10/gpg.c:1699
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "WARNING: unsafe permissions on configuration file ‘%s’\n"
 
-#: g10/gpg.c:1701
+#: g10/gpg.c:1702
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "WARNING: unsafe permissions on extension ‘%s’\n"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1708
 #, 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:1710
+#: g10/gpg.c:1711
 #, 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:1713
+#: g10/gpg.c:1714
 #, 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:1719
+#: g10/gpg.c:1720
 #, 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:1722
+#: g10/gpg.c:1723
 #, 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:1725
+#: g10/gpg.c:1726
 #, 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:1941
+#: g10/gpg.c:1942
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "unknown configuration item ‘%s’\n"
 
-#: g10/gpg.c:2037
+#: g10/gpg.c:2038
 msgid "display photo IDs during key listings"
 msgstr "display photo IDs during key listings"
 
-#: g10/gpg.c:2039
+#: g10/gpg.c:2040
 msgid "show key usage information during key listings"
 msgstr "show key usage information during key listings"
 
-#: g10/gpg.c:2041
+#: g10/gpg.c:2042
 msgid "show policy URLs during signature listings"
 msgstr "show policy URLs during signature listings"
 
-#: g10/gpg.c:2043
+#: g10/gpg.c:2044
 msgid "show all notations during signature listings"
 msgstr "show all notations during signature listings"
 
-#: g10/gpg.c:2045
+#: g10/gpg.c:2046
 msgid "show IETF standard notations during signature listings"
 msgstr "show IETF standard notations during signature listings"
 
-#: g10/gpg.c:2049
+#: g10/gpg.c:2050
 msgid "show user-supplied notations during signature listings"
 msgstr "show user-supplied notations during signature listings"
 
-#: g10/gpg.c:2051
+#: g10/gpg.c:2052
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "show preferred keyserver URLs during signature listings"
 
-#: g10/gpg.c:2053
+#: g10/gpg.c:2054
 msgid "show user ID validity during key listings"
 msgstr "show user ID validity during key listings"
 
-#: g10/gpg.c:2055
+#: g10/gpg.c:2056
 msgid "show revoked and expired user IDs in key listings"
 msgstr "show revoked and expired user IDs in key listings"
 
-#: g10/gpg.c:2057
+#: g10/gpg.c:2058
 msgid "show revoked and expired subkeys in key listings"
 msgstr "show revoked and expired subkeys in key listings"
 
-#: g10/gpg.c:2059
+#: g10/gpg.c:2060
 msgid "show the keyring name in key listings"
 msgstr "show the keyring name in key listings"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2062
 msgid "show expiration dates during signature listings"
 msgstr "show expiration dates during signature listings"
 
-#: g10/gpg.c:2178
+#: g10/gpg.c:2179
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "unknown TOFU policy ‘%s’\n"
 
-#: g10/gpg.c:2180
+#: g10/gpg.c:2181
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(use “help� to list choices)\n"
 
-#: g10/gpg.c:2975 g10/gpg.c:3828 g10/gpg.c:3840
+#: g10/gpg.c:2978 g10/gpg.c:3825 g10/gpg.c:3837
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "Note: %s is not for normal use!\n"
 
-#: g10/gpg.c:3151 g10/gpg.c:3163
+#: g10/gpg.c:3154 g10/gpg.c:3166
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "‘%s’ is not a valid signature expiration\n"
 
-#: g10/gpg.c:3185
+#: g10/gpg.c:3188
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "“%s� is not a proper mail address\n"
 
-#: g10/gpg.c:3217 sm/gpgsm.c:1270
+#: g10/gpg.c:3220 sm/gpgsm.c:1143
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "invalid pinentry mode ‘%s’\n"
 
-#: g10/gpg.c:3223 sm/gpgsm.c:1276
+#: g10/gpg.c:3226 sm/gpgsm.c:1149
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "invalid request origin ‘%s’\n"
 
-#: g10/gpg.c:3280
+#: g10/gpg.c:3283
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "‘%s’ is not a valid character set\n"
 
-#: g10/gpg.c:3302 g10/gpg.c:3511 g10/keyedit.c:5319
+#: g10/gpg.c:3305 g10/gpg.c:3514 g10/keyedit.c:5322
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "could not parse keyserver URL\n"
 
-#: g10/gpg.c:3320
+#: g10/gpg.c:3323
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: invalid keyserver options\n"
 
-#: g10/gpg.c:3323
+#: g10/gpg.c:3326
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "invalid keyserver options\n"
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3333
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: invalid import options\n"
 
-#: g10/gpg.c:3333
+#: g10/gpg.c:3336
 #, c-format
 msgid "invalid import options\n"
 msgstr "invalid import options\n"
 
-#: g10/gpg.c:3339 g10/gpg.c:3354
+#: g10/gpg.c:3342 g10/gpg.c:3357
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "invalid filter option: %s\n"
 
-#: g10/gpg.c:3345
+#: g10/gpg.c:3348
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: invalid export options\n"
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3351
 #, c-format
 msgid "invalid export options\n"
 msgstr "invalid export options\n"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3363
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: invalid list options\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3366
 #, c-format
 msgid "invalid list options\n"
 msgstr "invalid list options\n"
 
-#: g10/gpg.c:3371
+#: g10/gpg.c:3374
 msgid "display photo IDs during signature verification"
 msgstr "display photo IDs during signature verification"
 
-#: g10/gpg.c:3373
+#: g10/gpg.c:3376
 msgid "show policy URLs during signature verification"
 msgstr "show policy URLs during signature verification"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3378
 msgid "show all notations during signature verification"
 msgstr "show all notations during signature verification"
 
-#: g10/gpg.c:3377
+#: g10/gpg.c:3380
 msgid "show IETF standard notations during signature verification"
 msgstr "show IETF standard notations during signature verification"
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3384
 msgid "show user-supplied notations during signature verification"
 msgstr "show user-supplied notations during signature verification"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3386
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "show preferred keyserver URLs during signature verification"
 
-#: g10/gpg.c:3385
+#: g10/gpg.c:3388
 msgid "show user ID validity during signature verification"
 msgstr "show user ID validity during signature verification"
 
-#: g10/gpg.c:3387
+#: g10/gpg.c:3390
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "show revoked and expired user IDs in signature verification"
 
-#: g10/gpg.c:3389
+#: g10/gpg.c:3392
 msgid "show only the primary user ID in signature verification"
 msgstr "show only the primary user ID in signature verification"
 
-#: g10/gpg.c:3396
+#: g10/gpg.c:3399
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: invalid verify options\n"
 
-#: g10/gpg.c:3399
+#: g10/gpg.c:3402
 #, c-format
 msgid "invalid verify options\n"
 msgstr "invalid verify options\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3409
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "unable to set exec-path to %s\n"
 
-#: g10/gpg.c:3613
+#: g10/gpg.c:3616
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: invalid auto-key-locate list\n"
 
-#: g10/gpg.c:3616
+#: g10/gpg.c:3619
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "invalid auto-key-locate list\n"
 
-#: g10/gpg.c:3625
+#: g10/gpg.c:3628
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "invalid argument for option “%.50s�\n"
 
-#: g10/gpg.c:3807 sm/gpgsm.c:1675
+#: g10/gpg.c:3804 sm/gpgsm.c:1528
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNING: program may create a core file!\n"
 
-#: g10/gpg.c:3821
+#: g10/gpg.c:3818
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "WARNING: %s overrides %s\n"
 
-#: g10/gpg.c:3830
+#: g10/gpg.c:3827
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s not allowed with %s!\n"
 
-#: g10/gpg.c:3833
+#: g10/gpg.c:3830
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s makes no sense with %s!\n"
 
-#: g10/gpg.c:3848 sm/gpgsm.c:1696 dirmngr/dirmngr.c:1123
+#: g10/gpg.c:3845 sm/gpgsm.c:1549 dirmngr/dirmngr.c:1160
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "WARNING: running with faked system time: "
 
-#: g10/gpg.c:3869
+#: g10/gpg.c:3866
 #, 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:3897 g10/gpg.c:3928 sm/gpgsm.c:1763
+#: g10/gpg.c:3894 g10/gpg.c:3925 sm/gpgsm.c:1616
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "selected cipher algorithm is invalid\n"
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3901
 #, c-format
 msgid "selected AEAD algorithm is invalid\n"
 msgstr "selected AEAD algorithm is invalid\n"
 
-#: g10/gpg.c:3916
+#: g10/gpg.c:3913
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "selected compression algorithm is invalid\n"
 
-#: g10/gpg.c:3922
+#: g10/gpg.c:3919
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "selected certification digest algorithm is invalid\n"
 
-#: g10/gpg.c:3937
+#: g10/gpg.c:3934
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed must be greater than 0\n"
 
-#: g10/gpg.c:3939
+#: g10/gpg.c:3936
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed must be greater than 1\n"
 
-#: g10/gpg.c:3941
+#: g10/gpg.c:3938
 #, 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:3943
+#: g10/gpg.c:3940
 #, 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:3945
+#: g10/gpg.c:3942
 #, 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:3949
+#: g10/gpg.c:3946
 #, 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:3953
+#: g10/gpg.c:3950
 #, 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:3960
+#: g10/gpg.c:3957
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "invalid default preferences\n"
 
-#: g10/gpg.c:3964
+#: g10/gpg.c:3961
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "invalid personal cipher preferences\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3964
 #, c-format
 msgid "invalid personal AEAD preferences\n"
 msgstr "invalid personal AEAD preferences\n"
 
-#: g10/gpg.c:3971
+#: g10/gpg.c:3968
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "invalid personal digest preferences\n"
 
-#: g10/gpg.c:3975
+#: g10/gpg.c:3972
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "invalid personal compress preferences\n"
 
-#: g10/gpg.c:3984 g10/gpg.c:3989
+#: g10/gpg.c:3981 g10/gpg.c:3986
 #, c-format
 msgid "chunk size invalid - using %d\n"
 msgstr "chunk size invalid - using %d\n"
 
-#: g10/gpg.c:4026
+#: g10/gpg.c:4023
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s does not yet work with %s\n"
 
-#: g10/gpg.c:4089
+#: g10/gpg.c:4086
 #, 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:4101
+#: g10/gpg.c:4098
 #, 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:4256
+#: g10/gpg.c:4253
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "failed to initialize the TrustDB: %s\n"
 
-#: g10/gpg.c:4268
+#: g10/gpg.c:4265
 #, 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:4340
+#: g10/gpg.c:4337
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "symmetric encryption of ‘%s’ failed: %s\n"
 
-#: g10/gpg.c:4369
+#: g10/gpg.c:4366
 #, 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:4372
+#: g10/gpg.c:4369
 #, 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:4430
+#: g10/gpg.c:4427
 #, 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:4433
+#: g10/gpg.c:4430
 #, 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:4821 g10/keyserver.c:1870
+#: g10/gpg.c:4818 g10/keyserver.c:1629
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "keyserver send failed: %s\n"
 
-#: g10/gpg.c:4826
+#: g10/gpg.c:4823
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "keyserver receive failed: %s\n"
 
-#: g10/gpg.c:4832
+#: g10/gpg.c:4829
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "key export failed: %s\n"
 
-#: g10/gpg.c:4845
+#: g10/gpg.c:4842
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "export as ssh key failed: %s\n"
 
-#: g10/gpg.c:4857
+#: g10/gpg.c:4854
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "keyserver search failed: %s\n"
 
-#: g10/gpg.c:4870
+#: g10/gpg.c:4867
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "keyserver refresh failed: %s\n"
 
-#: g10/gpg.c:4937
+#: g10/gpg.c:4936
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dearmoring failed: %s\n"
 
-#: g10/gpg.c:4948
+#: g10/gpg.c:4947
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enarmoring failed: %s\n"
 
-#: g10/gpg.c:5053
+#: g10/gpg.c:5052
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "invalid hash algorithm ‘%s’\n"
 
-#: g10/gpg.c:5205 g10/tofu.c:2156
+#: g10/gpg.c:5204 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:5216
+#: g10/gpg.c:5215
 #, 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:5272
+#: g10/gpg.c:5271
 #, 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:5283
+#: g10/gpg.c:5282
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Go ahead and type your message ...\n"
 
-#: g10/gpg.c:5630
+#: g10/gpg.c:5629
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "the given certification policy URL is invalid\n"
 
-#: g10/gpg.c:5632
+#: g10/gpg.c:5631
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "the given signature policy URL is invalid\n"
 
-#: g10/gpg.c:5665
+#: g10/gpg.c:5664
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "the given preferred keyserver URL is invalid\n"
@@ -3340,7 +3353,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:414 tools/gpgconf.c:116 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:415 tools/gpgconf.c:116 tools/gpg-card.c:95
 msgid "|FD|write status info to this FD"
 msgstr "|FD|write status info to this FD"
 
@@ -3425,97 +3438,97 @@ msgstr "assume the GnuPG key backup format"
 msgid "repair keys on import"
 msgstr "repair keys on import"
 
-#: g10/import.c:399 g10/import.c:721
+#: g10/import.c:407 g10/import.c:729
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "skipping block of type %d\n"
 
-#: g10/import.c:738
+#: g10/import.c:746
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu keys processed so far\n"
 
-#: g10/import.c:831
+#: g10/import.c:839
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Total number processed: %lu\n"
 
-#: g10/import.c:834
+#: g10/import.c:842
 #, c-format
 msgid "    skipped PGP-2 keys: %lu\n"
 msgstr "    skipped PGP-2 keys: %lu\n"
 
-#: g10/import.c:836
+#: g10/import.c:844
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      skipped new keys: %lu\n"
 
-#: g10/import.c:839
+#: g10/import.c:847
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          w/o user IDs: %lu\n"
 
-#: g10/import.c:842 sm/import.c:129
+#: g10/import.c:850 sm/import.c:129
 #, c-format
 msgid "              imported: %lu"
 msgstr "              imported: %lu"
 
-#: g10/import.c:846 sm/import.c:133
+#: g10/import.c:854 sm/import.c:133
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             unchanged: %lu\n"
 
-#: g10/import.c:848
+#: g10/import.c:856
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          new user IDs: %lu\n"
 
-#: g10/import.c:850
+#: g10/import.c:858
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           new subkeys: %lu\n"
 
-#: g10/import.c:852
+#: g10/import.c:860
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        new signatures: %lu\n"
 
-#: g10/import.c:854
+#: g10/import.c:862
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   new key revocations: %lu\n"
 
-#: g10/import.c:856 sm/import.c:135
+#: g10/import.c:864 sm/import.c:135
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      secret keys read: %lu\n"
 
-#: g10/import.c:858 sm/import.c:137
+#: g10/import.c:866 sm/import.c:137
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  secret keys imported: %lu\n"
 
-#: g10/import.c:860 sm/import.c:139
+#: g10/import.c:868 sm/import.c:139
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " secret keys unchanged: %lu\n"
 
-#: g10/import.c:862 sm/import.c:141
+#: g10/import.c:870 sm/import.c:141
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "          not imported: %lu\n"
 
-#: g10/import.c:864
+#: g10/import.c:872
 #, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "    signatures cleaned: %lu\n"
 
-#: g10/import.c:866
+#: g10/import.c:874
 #, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "      user IDs cleaned: %lu\n"
 
-#: g10/import.c:1291
+#: g10/import.c:1299
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
@@ -3524,172 +3537,172 @@ msgstr ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 
-#: g10/import.c:1333
+#: g10/import.c:1341
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         “%s�: preference for cipher algorithm %s\n"
 
-#: g10/import.c:1351
+#: g10/import.c:1359
 #, c-format
 msgid "         \"%s\": preference for AEAD algorithm %s\n"
 msgstr "         “%s�: preference for AEAD algorithm %s\n"
 
-#: g10/import.c:1366
+#: g10/import.c:1374
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         “%s�: preference for digest algorithm %s\n"
 
-#: g10/import.c:1378
+#: g10/import.c:1386
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         “%s�: preference for compression algorithm %s\n"
 
-#: g10/import.c:1391
+#: g10/import.c:1399
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "it is strongly suggested that you update your preferences and\n"
 
-#: g10/import.c:1393
+#: g10/import.c:1401
 #, c-format
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "re-distribute this key to avoid potential algorithm mismatch problems\n"
 
-#: g10/import.c:1418
+#: g10/import.c:1426
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "you can update your preferences with: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:1932 g10/import.c:3053
+#: g10/import.c:1940 g10/import.c:3061
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "key %s: no user ID\n"
 
-#: g10/import.c:1938
+#: g10/import.c:1946
 #, c-format
 msgid "key %s: %s\n"
 msgstr "key %s: %s\n"
 
-#: g10/import.c:1939 g10/import.c:3025
+#: g10/import.c:1947 g10/import.c:3033
 msgid "rejected by import screener"
 msgstr "rejected by import screener"
 
-#: g10/import.c:1988
+#: g10/import.c:1996
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "key %s: PKS subkey corruption repaired\n"
 
-#: g10/import.c:2009
+#: g10/import.c:2017
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "key %s: accepted non self-signed user ID “%s�\n"
 
-#: g10/import.c:2020 g10/import.c:2051
+#: g10/import.c:2028 g10/import.c:2059
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "key %s: no valid user IDs\n"
 
-#: g10/import.c:2022
+#: g10/import.c:2030
 #, c-format
 msgid "this may be caused by a missing self-signature\n"
 msgstr "this may be caused by a missing self-signature\n"
 
-#: g10/import.c:2101 g10/import.c:3439
+#: g10/import.c:2109 g10/import.c:3447
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "key %s: public key not found: %s\n"
 
-#: g10/import.c:2107
+#: g10/import.c:2115
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "key %s: new key - skipped\n"
 
-#: g10/import.c:2119
+#: g10/import.c:2127
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "no writable keyring found: %s\n"
 
-#: g10/import.c:2151 g10/import.c:2253 g10/import.c:3514
+#: g10/import.c:2159 g10/import.c:2261 g10/import.c:3522
 #, c-format
 msgid "error writing keyring '%s': %s\n"
 msgstr "error writing keyring '%s': %s\n"
 
-#: g10/import.c:2174
+#: g10/import.c:2182
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "key %s: public key “%s� imported\n"
 
-#: g10/import.c:2201
+#: g10/import.c:2209
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "key %s: doesn't match our copy\n"
 
-#: g10/import.c:2269
+#: g10/import.c:2277
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "key %s: “%s� 1 new user ID\n"
 
-#: g10/import.c:2272
+#: g10/import.c:2280
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "key %s: “%s� %d new user IDs\n"
 
-#: g10/import.c:2275
+#: g10/import.c:2283
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "key %s: “%s� 1 new signature\n"
 
-#: g10/import.c:2278
+#: g10/import.c:2286
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "key %s: “%s� %d new signatures\n"
 
-#: g10/import.c:2281
+#: g10/import.c:2289
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "key %s: “%s� 1 new subkey\n"
 
-#: g10/import.c:2284
+#: g10/import.c:2292
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "key %s: “%s� %d new subkeys\n"
 
-#: g10/import.c:2287
+#: g10/import.c:2295
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "key %s: “%s� %d signature cleaned\n"
 
-#: g10/import.c:2290
+#: g10/import.c:2298
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "key %s: “%s� %d signatures cleaned\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2301
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "key %s: “%s� %d user ID cleaned\n"
 
-#: g10/import.c:2296
+#: g10/import.c:2304
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "key %s: “%s� %d user IDs cleaned\n"
 
-#: g10/import.c:2332
+#: g10/import.c:2340
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "key %s: “%s� not changed\n"
 
-#: g10/import.c:2692 g10/import.c:2887
+#: g10/import.c:2700 g10/import.c:2895
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "key %s: secret key imported\n"
 
-#: g10/import.c:2700
+#: g10/import.c:2708
 #, c-format
 msgid "key %s: secret key already exists\n"
 msgstr "key %s: secret key already exists\n"
 
-#: g10/import.c:2708
+#: g10/import.c:2716
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "key %s: error sending to agent: %s\n"
@@ -3702,203 +3715,202 @@ msgstr "key %s: error sending to agent: %s\n"
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2877
+#: g10/import.c:2885
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr "To migrate '%s', with each smartcard, run: %s\n"
 
-#: g10/import.c:3024
+#: g10/import.c:3032
 #, c-format
 msgid "secret key %s: %s\n"
 msgstr "secret key %s: %s\n"
 
-#: g10/import.c:3045 g10/import.c:3084
+#: g10/import.c:3053 g10/import.c:3092
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "importing secret keys not allowed\n"
 
-#: g10/import.c:3072
+#: g10/import.c:3080
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "key %s: secret key with invalid cipher %d - skipped\n"
 
-#: g10/import.c:3234 g10/pkclist.c:75 g10/revoke.c:774
+#: g10/import.c:3242 g10/pkclist.c:75 g10/revoke.c:775
 msgid "No reason specified"
 msgstr "No reason specified"
 
-#: g10/import.c:3235 g10/pkclist.c:77 g10/revoke.c:776
+#: g10/import.c:3243 g10/pkclist.c:77 g10/revoke.c:777
 msgid "Key is superseded"
 msgstr "Key is superseded"
 
-#: g10/import.c:3236 g10/pkclist.c:79 g10/revoke.c:775
+#: g10/import.c:3244 g10/pkclist.c:79 g10/revoke.c:776
 msgid "Key has been compromised"
 msgstr "Key has been compromised"
 
-#: g10/import.c:3237 g10/pkclist.c:81 g10/revoke.c:777
+#: g10/import.c:3245 g10/pkclist.c:81 g10/revoke.c:778
 msgid "Key is no longer used"
 msgstr "Key is no longer used"
 
-#: g10/import.c:3238 g10/pkclist.c:83 g10/revoke.c:778
+#: g10/import.c:3246 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "User ID is no longer valid"
 
-#: g10/import.c:3363 g10/keylist.c:1105 g10/pkclist.c:87
+#: g10/import.c:3371 g10/keylist.c:1105 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "reason for revocation: "
 
-#: g10/import.c:3382 g10/keylist.c:1124 g10/pkclist.c:103
+#: g10/import.c:3390 g10/keylist.c:1124 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "revocation comment: "
 
-#: g10/import.c:3432
+#: g10/import.c:3440
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "key %s: no public key - can't apply revocation certificate\n"
 
-#: g10/import.c:3461
+#: g10/import.c:3469
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "key %s: can't locate original keyblock: %s\n"
 
-#: g10/import.c:3468
+#: g10/import.c:3476
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "key %s: can't read original keyblock: %s\n"
 
-#: g10/import.c:3488
+#: g10/import.c:3496
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "key %s: invalid revocation certificate: %s - rejected\n"
 
-#: g10/import.c:3523
+#: g10/import.c:3531
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "key %s: “%s� revocation certificate imported\n"
 
-#: g10/import.c:3609
+#: g10/import.c:3617
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "key %s: no user ID for signature\n"
 
-#: g10/import.c:3626
+#: g10/import.c:3634
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "key %s: unsupported public key algorithm on user ID “%s�\n"
 
-#: g10/import.c:3628
+#: g10/import.c:3636
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "key %s: invalid self-signature on user ID “%s�\n"
 
-#: g10/import.c:3645 g10/import.c:3673 g10/import.c:3729
+#: g10/import.c:3653 g10/import.c:3681 g10/import.c:3737
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "key %s: unsupported public key algorithm\n"
 
-#: g10/import.c:3646
+#: g10/import.c:3654
 #, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "key %s: invalid direct key signature\n"
 
-#: g10/import.c:3660
+#: g10/import.c:3668
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "key %s: no subkey for key binding\n"
 
-#: g10/import.c:3675
+#: g10/import.c:3683
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "key %s: invalid subkey binding\n"
 
-#: g10/import.c:3694
+#: g10/import.c:3702
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "key %s: removed multiple subkey binding\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3726
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "key %s: no subkey for key revocation\n"
 
-#: g10/import.c:3731
+#: g10/import.c:3739
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "key %s: invalid subkey revocation\n"
 
-#: g10/import.c:3746
+#: g10/import.c:3754
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "key %s: removed multiple subkey revocation\n"
 
-#: g10/import.c:3790
+#: g10/import.c:3798
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "key %s: skipped user ID “%s�\n"
 
-#: g10/import.c:3817
+#: g10/import.c:3825
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "key %s: skipped subkey\n"
 
-#: g10/import.c:3849
+#: g10/import.c:3857
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "key %s: non exportable signature (class 0x%02X) - skipped\n"
 
-#: g10/import.c:3860
+#: g10/import.c:3868
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "key %s: revocation certificate at wrong place - skipped\n"
 
-#: g10/import.c:3878
+#: g10/import.c:3886
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "key %s: invalid revocation certificate: %s - skipped\n"
 
-#: g10/import.c:3892
+#: g10/import.c:3900
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "key %s: subkey signature in wrong place - skipped\n"
 
-#: g10/import.c:3900
+#: g10/import.c:3908
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "key %s: unexpected signature class (0x%02X) - skipped\n"
 
-#: g10/import.c:4073
+#: g10/import.c:4081
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "key %s: duplicated user ID detected - merged\n"
 
-#: g10/import.c:4180
+#: g10/import.c:4188
 #, c-format
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr "key %s: duplicated subkeys detected - merged\n"
 
-#: g10/import.c:4245
+#: g10/import.c:4253
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "WARNING: key %s may be revoked: fetching revocation key %s\n"
 
-#: g10/import.c:4261
+#: g10/import.c:4269
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "WARNING: key %s may be revoked: revocation key %s not present.\n"
 
-#: g10/import.c:4327
+#: g10/import.c:4335
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "key %s: “%s� revocation certificate added\n"
 
-#: g10/import.c:4365
+#: g10/import.c:4373
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "key %s: direct key signature added\n"
 
-#: g10/key-check.c:133 dirmngr/dirmngr_ldap.c:650 dirmngr/ldap-wrapper.c:835
-#: dirmngr/ldap-wrapper.c:852
+#: g10/key-check.c:133 dirmngr/ldap-wrapper.c:835 dirmngr/ldap-wrapper.c:852
 #, c-format
 msgid "error allocating memory: %s\n"
 msgstr "error allocating memory: %s\n"
@@ -3962,7 +3974,7 @@ msgstr ""
 "Warning: errors found and only checked self-signatures, run ‘%s’ to check "
 "all signatures.\n"
 
-#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:284 sm/keydb.c:297
+#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:289 sm/keydb.c:302
 #, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "error creating keybox '%s': %s\n"
@@ -3972,7 +3984,7 @@ msgstr "error creating keybox '%s': %s\n"
 msgid "error creating keyring '%s': %s\n"
 msgstr "error creating keyring '%s': %s\n"
 
-#: g10/keydb.c:388 sm/keydb.c:303
+#: g10/keydb.c:388 sm/keydb.c:308
 #, c-format
 msgid "keybox '%s' created\n"
 msgstr "keybox ‘%s’ created\n"
@@ -4226,8 +4238,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:6192 g10/keyedit.c:6275 g10/keyedit.c:6404
-#: g10/keyedit.c:6466 g10/sign.c:528
+#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
+#: g10/keyedit.c:6474 g10/sign.c:528
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signing failed: %s\n"
@@ -4592,7 +4604,7 @@ msgstr "No matching user IDs."
 msgid "Nothing to sign.\n"
 msgstr "Nothing to sign.\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6057
+#: g10/keyedit.c:2973 g10/keyedit.c:6065
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "Not signed by you.\n"
@@ -4659,7 +4671,7 @@ msgstr "This key may be revoked by %s key %s"
 msgid "(sensitive)"
 msgstr "(sensitive)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:525
+#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "created: %s"
@@ -4675,7 +4687,7 @@ msgid "expired: %s"
 msgstr "expired: %s"
 
 #: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2262
-#: g10/keyserver.c:531
+#: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "expires: %s"
@@ -4711,13 +4723,13 @@ 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:535
-#: g10/mainproc.c:2280 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
+#: g10/mainproc.c:2282 g10/tofu.c:1789 g10/trust.c:426 dirmngr/ocsp.c:792
 msgid "revoked"
 msgstr "revoked"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:539
-#: g10/mainproc.c:2282 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
+#: g10/mainproc.c:2284 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "expired"
 
@@ -4758,7 +4770,7 @@ msgstr "Are you sure you still want to add it? (y/N) "
 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:3107
+#: g10/keyedit.c:4273 g10/keygen.c:3111
 msgid "Such a user ID already exists on this key!\n"
 msgstr "Such a user ID already exists on this key!\n"
 
@@ -4901,7 +4913,7 @@ msgstr "subkey %s does not sign and so does not need to be cross-certified\n"
 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:5357 g10/keyedit.c:5495
+#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "skipping v3 self-signature on user ID “%s�\n"
@@ -4910,127 +4922,127 @@ msgstr "skipping v3 self-signature on user ID “%s�\n"
 msgid "Enter your preferred keyserver URL: "
 msgstr "Enter your preferred keyserver URL: "
 
-#: g10/keyedit.c:5380
+#: g10/keyedit.c:5383
 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:5381
+#: g10/keyedit.c:5384
 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:5441
+#: g10/keyedit.c:5449
 msgid "Enter the notation: "
 msgstr "Enter the notation: "
 
-#: g10/keyedit.c:5588
+#: g10/keyedit.c:5596
 msgid "Proceed? (y/N) "
 msgstr "Proceed? (y/N) "
 
-#: g10/keyedit.c:5658
+#: g10/keyedit.c:5666
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "No user ID with index %d\n"
 
-#: g10/keyedit.c:5720
+#: g10/keyedit.c:5728
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "No user ID with hash %s\n"
 
-#: g10/keyedit.c:5821
+#: g10/keyedit.c:5829
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "No subkey with key ID '%s'.\n"
 
-#: g10/keyedit.c:5843
+#: g10/keyedit.c:5851
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "No subkey with index %d\n"
 
-#: g10/keyedit.c:5984
+#: g10/keyedit.c:5992
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "user ID: “%s�\n"
 
-#: g10/keyedit.c:5987 g10/keyedit.c:6089 g10/keyedit.c:6137
+#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
 #, 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:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
+#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
 msgid " (non-exportable)"
 msgstr " (non-exportable)"
 
-#: g10/keyedit.c:5993
+#: g10/keyedit.c:6001
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "This signature expired on %s.\n"
 
-#: g10/keyedit.c:5998
+#: g10/keyedit.c:6006
 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:6003
+#: g10/keyedit.c:6011
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Create a revocation certificate for this signature? (y/N) "
 
-#: g10/keyedit.c:6063
+#: g10/keyedit.c:6071
 #, 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:6092
+#: g10/keyedit.c:6100
 msgid " (non-revocable)"
 msgstr " (non-revocable)"
 
-#: g10/keyedit.c:6099
+#: g10/keyedit.c:6107
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revoked by your key %s on %s\n"
 
-#: g10/keyedit.c:6124
+#: g10/keyedit.c:6132
 msgid "You are about to revoke these signatures:\n"
 msgstr "You are about to revoke these signatures:\n"
 
-#: g10/keyedit.c:6147
+#: g10/keyedit.c:6155
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Really create the revocation certificates? (y/N) "
 
-#: g10/keyedit.c:6180
+#: g10/keyedit.c:6188
 #, c-format
 msgid "no secret key\n"
 msgstr "no secret key\n"
 
-#: g10/keyedit.c:6228
+#: g10/keyedit.c:6236
 #, 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:6238
+#: g10/keyedit.c:6246
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "user ID “%s� is already revoked\n"
 
-#: g10/keyedit.c:6255
+#: g10/keyedit.c:6263
 #, 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:6351
+#: g10/keyedit.c:6359
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Cannot revoke the last valid user ID.\n"
 
-#: g10/keyedit.c:6389
+#: g10/keyedit.c:6397
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Key %s is already revoked.\n"
 
-#: g10/keyedit.c:6451
+#: g10/keyedit.c:6459
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Subkey %s is already revoked.\n"
 
-#: g10/keyedit.c:6548
+#: g10/keyedit.c:6556
 #, 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"
@@ -5040,82 +5052,82 @@ msgstr "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgid "invalid value for option '%s'\n"
 msgstr "invalid value for option ‘%s’\n"
 
-#: g10/keygen.c:338
+#: g10/keygen.c:339
 #, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "preference ‘%s’ duplicated\n"
 
-#: g10/keygen.c:345
+#: g10/keygen.c:346
 #, c-format
 msgid "too many cipher preferences\n"
 msgstr "too many cipher preferences\n"
 
-#: g10/keygen.c:347
+#: g10/keygen.c:348
 #, c-format
 msgid "too many digest preferences\n"
 msgstr "too many digest preferences\n"
 
-#: g10/keygen.c:349
+#: g10/keygen.c:350
 #, c-format
 msgid "too many compression preferences\n"
 msgstr "too many compression preferences\n"
 
-#: g10/keygen.c:351
+#: g10/keygen.c:352
 #, c-format
 msgid "too many AEAD preferences\n"
 msgstr "too many AEAD preferences\n"
 
-#: g10/keygen.c:521
+#: g10/keygen.c:522
 #, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "invalid item ‘%s’ in preference string\n"
 
-#: g10/keygen.c:1130
+#: g10/keygen.c:1131
 #, c-format
 msgid "writing direct signature\n"
 msgstr "writing direct signature\n"
 
-#: g10/keygen.c:1176
+#: g10/keygen.c:1177
 #, c-format
 msgid "writing self signature\n"
 msgstr "writing self signature\n"
 
-#: g10/keygen.c:1233
+#: g10/keygen.c:1234
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "writing key binding signature\n"
 
-#: g10/keygen.c:1598 g10/keygen.c:1603 g10/keygen.c:1655 g10/keygen.c:1660
-#: g10/keygen.c:1832 g10/keygen.c:1837
+#: g10/keygen.c:1599 g10/keygen.c:1604 g10/keygen.c:1656 g10/keygen.c:1661
+#: g10/keygen.c:1833 g10/keygen.c:1838
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "keysize invalid; using %u bits\n"
 
-#: g10/keygen.c:1609 g10/keygen.c:1666 g10/keygen.c:1674 g10/keygen.c:1843
+#: g10/keygen.c:1610 g10/keygen.c:1667 g10/keygen.c:1675 g10/keygen.c:1844
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "keysize rounded up to %u bits\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1701
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 
-#: g10/keygen.c:1899
+#: g10/keygen.c:1900
 msgid "Sign"
 msgstr "Sign"
 
-#: g10/keygen.c:1902
+#: g10/keygen.c:1903
 msgid "Certify"
 msgstr "Certify"
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1906
 msgid "Encrypt"
 msgstr "Encrypt"
 
-#: g10/keygen.c:1908
+#: g10/keygen.c:1909
 msgid "Authenticate"
 msgstr "Authenticate"
 
@@ -5129,166 +5141,166 @@ msgstr "Authenticate"
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1929
+#: g10/keygen.c:1930
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1967
 #, c-format
 msgid "Possible actions for this %s key: "
 msgstr "Possible actions for this %s key: "
 
-#: g10/keygen.c:1973
+#: g10/keygen.c:1974
 msgid "Current allowed actions: "
 msgstr "Current allowed actions: "
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1979
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Toggle the sign capability\n"
 
-#: g10/keygen.c:1981
+#: g10/keygen.c:1982
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Toggle the encrypt capability\n"
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1985
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Toggle the authenticate capability\n"
 
-#: g10/keygen.c:1987
+#: g10/keygen.c:1988
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Finished\n"
 
-#: g10/keygen.c:2116
+#: g10/keygen.c:2117
 #, c-format
 msgid "   (%d) RSA and RSA%s\n"
 msgstr "   (%d) RSA and RSA%s\n"
 
-#: g10/keygen.c:2120
+#: g10/keygen.c:2121
 #, c-format
 msgid "   (%d) DSA and Elgamal%s\n"
 msgstr "   (%d) DSA and Elgamal%s\n"
 
-#: g10/keygen.c:2123
+#: g10/keygen.c:2124
 #, c-format
 msgid "   (%d) DSA (sign only)%s\n"
 msgstr "   (%d) DSA (sign only)%s\n"
 
-#: g10/keygen.c:2125
+#: g10/keygen.c:2126
 #, c-format
 msgid "   (%d) RSA (sign only)%s\n"
 msgstr "   (%d) RSA (sign only)%s\n"
 
-#: g10/keygen.c:2131
+#: g10/keygen.c:2132
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)%s\n"
 msgstr "   (%d) Elgamal (encrypt only)%s\n"
 
-#: g10/keygen.c:2133
+#: g10/keygen.c:2134
 #, c-format
 msgid "   (%d) RSA (encrypt only)%s\n"
 msgstr "   (%d) RSA (encrypt only)%s\n"
 
-#: g10/keygen.c:2139
+#: g10/keygen.c:2140
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)%s\n"
 msgstr "   (%d) DSA (set your own capabilities)%s\n"
 
-#: g10/keygen.c:2141
+#: g10/keygen.c:2142
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (set your own capabilities)%s\n"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2148
 #, c-format
 msgid "   (%d) ECC (sign and encrypt)%s\n"
 msgstr "   (%d) ECC (sign and encrypt)%s\n"
 
-#: g10/keygen.c:2147 g10/keygen.c:2678
+#: g10/keygen.c:2148 g10/keygen.c:2679
 msgid " *default*"
 msgstr " *default*"
 
-#: g10/keygen.c:2148
+#: g10/keygen.c:2149
 #, c-format
 msgid "  (%d) ECC (sign only)\n"
 msgstr "  (%d) ECC (sign only)\n"
 
-#: g10/keygen.c:2150
+#: g10/keygen.c:2151
 #, c-format
 msgid "  (%d) ECC (set your own capabilities)%s\n"
 msgstr "  (%d) ECC (set your own capabilities)%s\n"
 
-#: g10/keygen.c:2152
+#: g10/keygen.c:2153
 #, c-format
 msgid "  (%d) ECC (encrypt only)%s\n"
 msgstr "  (%d) ECC (encrypt only)%s\n"
 
-#: g10/keygen.c:2156
+#: g10/keygen.c:2157
 #, c-format
 msgid "  (%d) Existing key%s\n"
 msgstr "  (%d) Existing key%s\n"
 
-#: g10/keygen.c:2158
+#: g10/keygen.c:2159
 #, c-format
 msgid "  (%d) Existing key from card%s\n"
 msgstr "  (%d) Existing key from card%s\n"
 
-#: g10/keygen.c:2254 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2255 sm/certreqgen-ui.c:203
 msgid "Enter the keygrip: "
 msgstr "Enter the keygrip: "
 
-#: g10/keygen.c:2267 sm/certreqgen-ui.c:211 tools/gpg-card.c:2280
+#: g10/keygen.c:2268 sm/certreqgen-ui.c:211 tools/gpg-card.c:2297
 #, c-format
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr "Not a valid keygrip (expecting 40 hex digits)\n"
 
-#: g10/keygen.c:2269 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2270 sm/certreqgen-ui.c:213
 msgid "No key with this keygrip\n"
 msgstr "No key with this keygrip\n"
 
-#: g10/keygen.c:2288 g10/keygen.c:2298 g10/keygen.c:3440 g10/keygen.c:3451
+#: g10/keygen.c:2289 g10/keygen.c:2299 g10/keygen.c:3444 g10/keygen.c:3455
 #: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
 #, c-format
 msgid "error reading the card: %s\n"
 msgstr "error reading the card: %s\n"
 
-#: g10/keygen.c:2292 g10/keygen.c:3444 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2293 g10/keygen.c:3448 sm/certreqgen-ui.c:234
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "Serial number of the card: %s\n"
 
-#: g10/keygen.c:2311 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2312 sm/certreqgen-ui.c:246
 msgid "Available keys:\n"
 msgstr "Available keys:\n"
 
-#: g10/keygen.c:2504 g10/keygen.c:2518
+#: g10/keygen.c:2505 g10/keygen.c:2519
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr "rounded to %u bits\n"
 
-#: g10/keygen.c:2559
+#: g10/keygen.c:2560
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s keys may be between %u and %u bits long.\n"
 
-#: g10/keygen.c:2567
+#: g10/keygen.c:2568
 #, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "What keysize do you want for the subkey? (%u) "
 
-#: g10/keygen.c:2584 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2585 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Requested keysize is %u bits\n"
 
-#: g10/keygen.c:2630
+#: g10/keygen.c:2631
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Please select which elliptic curve you want:\n"
 
-#: g10/keygen.c:2819
+#: g10/keygen.c:2820
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5304,7 +5316,7 @@ msgstr ""
 "      <n>m = key expires in n months\n"
 "      <n>y = key expires in n years\n"
 
-#: g10/keygen.c:2830
+#: g10/keygen.c:2831
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5320,38 +5332,38 @@ msgstr ""
 "      <n>m = signature expires in n months\n"
 "      <n>y = signature expires in n years\n"
 
-#: g10/keygen.c:2853
+#: g10/keygen.c:2854
 msgid "Key is valid for? (0) "
 msgstr "Key is valid for? (0) "
 
-#: g10/keygen.c:2858
+#: g10/keygen.c:2859
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Signature is valid for? (%s) "
 
-#: g10/keygen.c:2871 g10/keygen.c:2896
+#: g10/keygen.c:2875 g10/keygen.c:2900
 msgid "invalid value\n"
 msgstr "invalid value\n"
 
-#: g10/keygen.c:2878
+#: g10/keygen.c:2882
 msgid "Key does not expire at all\n"
 msgstr "Key does not expire at all\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2883
 msgid "Signature does not expire at all\n"
 msgstr "Signature does not expire at all\n"
 
-#: g10/keygen.c:2884
+#: g10/keygen.c:2888
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Key expires at %s\n"
 
-#: g10/keygen.c:2885
+#: g10/keygen.c:2889
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Signature expires at %s\n"
 
-#: g10/keygen.c:2889
+#: g10/keygen.c:2893
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5359,11 +5371,11 @@ msgstr ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 
-#: g10/keygen.c:2902
+#: g10/keygen.c:2906
 msgid "Is this correct? (y/N) "
 msgstr "Is this correct? (y/N) "
 
-#: g10/keygen.c:2970
+#: g10/keygen.c:2974
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5377,7 +5389,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2985
+#: g10/keygen.c:2989
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5393,49 +5405,49 @@ msgstr ""
 "    “Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>�\n"
 "\n"
 
-#: g10/keygen.c:3004
+#: g10/keygen.c:3008
 msgid "Real name: "
 msgstr "Real name: "
 
-#: g10/keygen.c:3013
+#: g10/keygen.c:3017
 msgid "Invalid character in name\n"
 msgstr "Invalid character in name\n"
 
-#: g10/keygen.c:3014
+#: g10/keygen.c:3018
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr "The characters ‘%s’ and ‘%s’ may not appear in name\n"
 
-#: g10/keygen.c:3018
+#: g10/keygen.c:3022
 msgid "Name may not start with a digit\n"
 msgstr "Name may not start with a digit\n"
 
-#: g10/keygen.c:3021
+#: g10/keygen.c:3025
 msgid "Name must be at least 5 characters long\n"
 msgstr "Name must be at least 5 characters long\n"
 
-#: g10/keygen.c:3031
+#: g10/keygen.c:3035
 msgid "Email address: "
 msgstr "Email address: "
 
-#: g10/keygen.c:3037
+#: g10/keygen.c:3041
 msgid "Not a valid email address\n"
 msgstr "Not a valid email address\n"
 
-#: g10/keygen.c:3046
+#: g10/keygen.c:3050
 msgid "Comment: "
 msgstr "Comment: "
 
-#: g10/keygen.c:3052
+#: g10/keygen.c:3056
 msgid "Invalid character in comment\n"
 msgstr "Invalid character in comment\n"
 
-#: g10/keygen.c:3088
+#: g10/keygen.c:3092
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr "You are using the ‘%s’ character set.\n"
 
-#: g10/keygen.c:3094
+#: g10/keygen.c:3098
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5446,7 +5458,7 @@ msgstr ""
 "    “%s�\n"
 "\n"
 
-#: g10/keygen.c:3099
+#: g10/keygen.c:3103
 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"
 
@@ -5461,31 +5473,31 @@ msgstr "Please don't put the email address into the real name or the comment\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3124
+#: g10/keygen.c:3128
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:3134
+#: g10/keygen.c:3138
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 
-#: g10/keygen.c:3135
+#: g10/keygen.c:3139
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 
-#: g10/keygen.c:3140
+#: g10/keygen.c:3144
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Change (N)ame, (E)mail, or (Q)uit? "
 
-#: g10/keygen.c:3141
+#: g10/keygen.c:3145
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 
-#: g10/keygen.c:3160
+#: g10/keygen.c:3164
 msgid "Please correct the error first\n"
 msgstr "Please correct the error first\n"
 
-#: g10/keygen.c:3206
+#: g10/keygen.c:3210
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -5497,18 +5509,18 @@ msgstr ""
 "disks) during the prime generation; this gives the random number\n"
 "generator a better chance to gain enough entropy.\n"
 
-#: g10/keygen.c:3591
+#: g10/keygen.c:3595
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr "WARNING: v4 is specified, but overridden by v5.\n"
 
-#: g10/keygen.c:4590 g10/keygen.c:4663 g10/keygen.c:4681 g10/keygen.c:4710
-#: g10/keygen.c:5086 g10/keygen.c:5632 g10/keygen.c:5943 g10/keygen.c:6050
+#: g10/keygen.c:4594 g10/keygen.c:4667 g10/keygen.c:4685 g10/keygen.c:4714
+#: g10/keygen.c:5113 g10/keygen.c:5663 g10/keygen.c:5974 g10/keygen.c:6081
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Key generation failed: %s\n"
 
-#: g10/keygen.c:4599
+#: g10/keygen.c:4603
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5519,64 +5531,64 @@ msgstr ""
 "    “%s�\n"
 "\n"
 
-#: g10/keygen.c:4601
+#: g10/keygen.c:4605
 msgid "Continue? (Y/n) "
 msgstr "Continue? (Y/n) "
 
-#: g10/keygen.c:4622
+#: g10/keygen.c:4626
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "A key for “%s� already exists\n"
 
-#: g10/keygen.c:4627
+#: g10/keygen.c:4631
 msgid "Create anyway? (y/N) "
 msgstr "Create anyway? (y/N) "
 
-#: g10/keygen.c:4633
+#: g10/keygen.c:4637
 #, c-format
 msgid "creating anyway\n"
 msgstr "creating anyway\n"
 
-#: g10/keygen.c:5069
+#: g10/keygen.c:5096
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr "Note: Use “%s %s� for a full featured key generation dialog.\n"
 
-#: g10/keygen.c:5118
+#: g10/keygen.c:5145
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Key generation canceled.\n"
 
-#: g10/keygen.c:5178
+#: g10/keygen.c:5205
 #, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "can't create backup file '%s': %s\n"
 
-#: g10/keygen.c:5198
+#: g10/keygen.c:5225
 #, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "Note: backup of card key saved to ‘%s’\n"
 
-#: g10/keygen.c:5359 g10/keygen.c:5561
+#: g10/keygen.c:5389 g10/keygen.c:5591
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr "writing public key to ‘%s’\n"
 
-#: g10/keygen.c:5555
+#: g10/keygen.c:5585
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "no writable public keyring found: %s\n"
 
-#: g10/keygen.c:5569
+#: g10/keygen.c:5599
 #, c-format
 msgid "error writing public keyring '%s': %s\n"
 msgstr "error writing public keyring '%s': %s\n"
 
-#: g10/keygen.c:5603
+#: g10/keygen.c:5634
 msgid "public and secret key created and signed.\n"
 msgstr "public and secret key created and signed.\n"
 
-#: g10/keygen.c:5619
+#: g10/keygen.c:5650
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -5584,36 +5596,36 @@ msgstr ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command “--edit-key� to generate a subkey for this purpose.\n"
 
-#: g10/keygen.c:5801 g10/keygen.c:6000
+#: g10/keygen.c:5832 g10/keygen.c:6031
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 
-#: g10/keygen.c:5803 g10/keygen.c:6002
+#: g10/keygen.c:5834 g10/keygen.c:6033
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 
-#: g10/keygen.c:5814 g10/keygen.c:6013
+#: g10/keygen.c:5845 g10/keygen.c:6044
 #, c-format
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 
-#: g10/keygen.c:5826 g10/keygen.c:5828
+#: g10/keygen.c:5857 g10/keygen.c:5859
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Secret parts of primary key are not available.\n"
 
-#: g10/keygen.c:5835 g10/keygen.c:5837
+#: g10/keygen.c:5866 g10/keygen.c:5868
 #, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Secret parts of primary key are stored on-card.\n"
 
-#: g10/keygen.c:5857 g10/keygen.c:6027
+#: g10/keygen.c:5888 g10/keygen.c:6058
 msgid "Really create? (y/N) "
 msgstr "Really create? (y/N) "
 
@@ -5692,33 +5704,33 @@ msgstr "      Key fingerprint ="
 msgid "      Card serial no. ="
 msgstr "      Card serial no. ="
 
-#: g10/keyring.c:1467
+#: g10/keyring.c:1477
 #, c-format
 msgid "caching keyring '%s'\n"
 msgstr "caching keyring ‘%s’\n"
 
-#: g10/keyring.c:1541
+#: g10/keyring.c:1551
 #, c-format
 msgid "%lu keys cached so far (%lu signature)\n"
 msgid_plural "%lu keys cached so far (%lu signatures)\n"
 msgstr[0] "%lu keys cached so far (%lu signature)\n"
 msgstr[1] "%lu keys cached so far (%lu signatures)\n"
 
-#: g10/keyring.c:1557
+#: g10/keyring.c:1567
 #, c-format
 msgid "%lu key cached"
 msgid_plural "%lu keys cached"
 msgstr[0] "%lu key cached"
 msgstr[1] "%lu keys cached"
 
-#: g10/keyring.c:1559
+#: g10/keyring.c:1569
 #, c-format
 msgid " (%lu signature)\n"
 msgid_plural " (%lu signatures)\n"
 msgstr[0] " (%lu signature)\n"
 msgstr[1] " (%lu signatures)\n"
 
-#: g10/keyring.c:1636
+#: g10/keyring.c:1646
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: keyring created\n"
@@ -5747,77 +5759,72 @@ msgstr "automatically retrieve keys when verifying signatures"
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "honor the preferred keyserver URL set on the key"
 
-#: g10/keyserver.c:537
+#: g10/keyserver.c:360
 msgid "disabled"
 msgstr "disabled"
 
-#: g10/keyserver.c:740
+#: g10/keyserver.c:563
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Enter number(s), N)ext, or Q)uit > "
 
-#: g10/keyserver.c:846
+#: g10/keyserver.c:669
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "invalid keyserver protocol (us %d!=handler %d)\n"
 
-#: g10/keyserver.c:986 g10/keyserver.c:1096
+#: g10/keyserver.c:809 g10/keyserver.c:919
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "“%s� not a key ID: skipping\n"
 
-#: g10/keyserver.c:1420 g10/keyserver.c:1453
+#: g10/keyserver.c:1217 g10/keyserver.c:1250
 #, 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:1427
+#: g10/keyserver.c:1224
 #, 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:1531
+#: g10/keyserver.c:1316
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "key “%s� not found on keyserver\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1319
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "key not found on keyserver\n"
 
-#: g10/keyserver.c:1722
-#, c-format
-msgid "requesting key %s from %s server %s\n"
-msgstr "requesting key %s from %s server %s\n"
-
-#: g10/keyserver.c:1726
+#: g10/keyserver.c:1481
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "requesting key %s from %s\n"
 
-#: g10/keyserver.c:1841 g10/keyserver.c:2020
+#: g10/keyserver.c:1600 g10/keyserver.c:1793
 #, c-format
 msgid "no keyserver known\n"
 msgstr "no keyserver known\n"
 
-#: g10/keyserver.c:1856 g10/skclist.c:213 g10/skclist.c:241
+#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "skipped “%s�: %s\n"
 
-#: g10/keyserver.c:1860
+#: g10/keyserver.c:1619
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "sending key %s to %s\n"
 
-#: g10/keyserver.c:1901
+#: g10/keyserver.c:1662
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr "requesting key from ‘%s’\n"
 
-#: g10/keyserver.c:1917
+#: g10/keyserver.c:1680
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "WARNING: unable to fetch URI %s: %s\n"
@@ -5842,67 +5849,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:472
+#: g10/mainproc.c:473
 #, c-format
 msgid "public key is %s\n"
 msgstr "public key is %s\n"
 
-#: g10/mainproc.c:524
+#: g10/mainproc.c:525
 #, 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:528 g10/pkclist.c:231
+#: g10/mainproc.c:529 g10/pkclist.c:231
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      “%s�\n"
 
-#: g10/mainproc.c:532
+#: g10/mainproc.c:533
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "encrypted with %s key, ID %s\n"
 
-#: g10/mainproc.c:552 g10/mainproc.c:935
+#: g10/mainproc.c:553 g10/mainproc.c:937
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "WARNING: multiple plaintexts seen\n"
 
-#: g10/mainproc.c:560
+#: g10/mainproc.c:561
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "encrypted with %lu passphrases\n"
 
-#: g10/mainproc.c:562
+#: g10/mainproc.c:563
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "encrypted with 1 passphrase\n"
 
-#: g10/mainproc.c:577 g10/mainproc.c:602
+#: g10/mainproc.c:578 g10/mainproc.c:603
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "public key decryption failed: %s\n"
 
-#: g10/mainproc.c:613
+#: g10/mainproc.c:614
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "public key encrypted data: good DEK\n"
 
-#: g10/mainproc.c:642 g10/mainproc.c:663
+#: g10/mainproc.c:643 g10/mainproc.c:664
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "assuming %s encrypted data\n"
 
-#: g10/mainproc.c:649
+#: g10/mainproc.c:650
 #, 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:742 g10/mainproc.c:780
+#: g10/mainproc.c:744 g10/mainproc.c:782
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "WARNING: message was not integrity protected\n"
 
-#: g10/mainproc.c:753
+#: g10/mainproc.c:755
 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"
@@ -5912,179 +5919,179 @@ msgstr ""
 "likely that this message is legitimate.  This is because back\n"
 "then integrity protection was not widely used.\n"
 
-#: g10/mainproc.c:756
+#: g10/mainproc.c:758
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr "Use the option ‘%s’ to decrypt anyway.\n"
 
-#: g10/mainproc.c:761
+#: g10/mainproc.c:763
 #, c-format
 msgid "decryption forced to fail!\n"
 msgstr "decryption forced to fail!\n"
 
-#: g10/mainproc.c:773
+#: g10/mainproc.c:775
 #, c-format
 msgid "decryption okay\n"
 msgstr "decryption okay\n"
 
-#: g10/mainproc.c:786
+#: g10/mainproc.c:788
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "WARNING: encrypted message has been manipulated!\n"
 
-#: g10/mainproc.c:804
+#: g10/mainproc.c:806
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decryption failed: %s\n"
 
-#: g10/mainproc.c:851
+#: g10/mainproc.c:853
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "Note: sender requested “for-your-eyes-only�\n"
 
-#: g10/mainproc.c:858
+#: g10/mainproc.c:860
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "original file name='%.*s'\n"
 
-#: g10/mainproc.c:1135
+#: g10/mainproc.c:1137
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "standalone revocation - use “gpg --import� to apply\n"
 
-#: g10/mainproc.c:1440 g10/mainproc.c:1483
+#: g10/mainproc.c:1442 g10/mainproc.c:1485
 #, c-format
 msgid "no signature found\n"
 msgstr "no signature found\n"
 
-#: g10/mainproc.c:1763
+#: g10/mainproc.c:1765
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "BAD signature from “%s�"
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1767
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Expired signature from “%s�"
 
-#: g10/mainproc.c:1767
+#: g10/mainproc.c:1769
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Good signature from “%s�"
 
-#: g10/mainproc.c:1789
+#: g10/mainproc.c:1791
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "signature verification suppressed\n"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1905
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "can't handle this ambiguous signature data\n"
 
-#: g10/mainproc.c:1919 g10/mainproc.c:1926
+#: g10/mainproc.c:1921 g10/mainproc.c:1928
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Signature made %s\n"
 
-#: g10/mainproc.c:1920 g10/mainproc.c:1927 sm/verify.c:480
+#: g10/mainproc.c:1922 g10/mainproc.c:1929 sm/verify.c:480
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               using %s key %s\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1933
 #, 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:1937
+#: g10/mainproc.c:1939
 #, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "               issuer “%s�\n"
 
-#: g10/mainproc.c:1992
+#: g10/mainproc.c:1994
 #, c-format
 msgid "Key available at: "
 msgstr "Key available at: "
 
-#: g10/mainproc.c:2034
+#: g10/mainproc.c:2036
 #, 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:2234
+#: g10/mainproc.c:2236
 msgid "[uncertain]"
 msgstr "[uncertain]"
 
-#: g10/mainproc.c:2272
+#: g10/mainproc.c:2274
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                aka “%s�"
 
-#: g10/mainproc.c:2347
+#: g10/mainproc.c:2349
 #, 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:2363
+#: g10/mainproc.c:2365
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Signature expired %s\n"
 
-#: g10/mainproc.c:2368
+#: g10/mainproc.c:2370
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Signature expires %s\n"
 
-#: g10/mainproc.c:2379
+#: g10/mainproc.c:2381
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s signature, digest algorithm %s%s%s\n"
 
-#: g10/mainproc.c:2380
+#: g10/mainproc.c:2382
 msgid "binary"
 msgstr "binary"
 
-#: g10/mainproc.c:2381
+#: g10/mainproc.c:2383
 msgid "textmode"
 msgstr "textmode"
 
-#: g10/mainproc.c:2381 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2383 g10/trust.c:112 dirmngr/ocsp.c:793
 msgid "unknown"
 msgstr "unknown"
 
-#: g10/mainproc.c:2383
+#: g10/mainproc.c:2385
 msgid ", key algorithm "
 msgstr ", key algorithm "
 
-#: g10/mainproc.c:2418
+#: g10/mainproc.c:2420
 #, 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:2457
+#: g10/mainproc.c:2459
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Can't check signature: %s\n"
 
-#: g10/mainproc.c:2553 g10/mainproc.c:2572 g10/mainproc.c:2696
+#: g10/mainproc.c:2555 g10/mainproc.c:2574 g10/mainproc.c:2698
 #, c-format
 msgid "not a detached signature\n"
 msgstr "not a detached signature\n"
 
-#: g10/mainproc.c:2606
+#: g10/mainproc.c:2608
 #, 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:2615
+#: g10/mainproc.c:2617
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "standalone signature of class 0x%02x\n"
 
-#: g10/mainproc.c:2700
+#: g10/mainproc.c:2702
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "old style (PGP 2.x) signature\n"
@@ -6264,46 +6271,50 @@ msgstr "Unknown critical signature notation: "
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacket of type %d has critical bit set\n"
 
-#: g10/passphrase.c:208
+#: g10/passphrase.c:201 sm/decrypt.c:669
+msgid "Please enter the passphrase for decryption."
+msgstr "Please enter the passphrase for decryption."
+
+#: g10/passphrase.c:203
 msgid "Enter passphrase\n"
 msgstr "Enter passphrase\n"
 
-#: g10/passphrase.c:219
+#: g10/passphrase.c:227
 #, c-format
 msgid "cancelled by user\n"
 msgstr "cancelled by user\n"
 
-#: g10/passphrase.c:460
+#: g10/passphrase.c:472
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (main key ID %s)"
 
-#: g10/passphrase.c:467
+#: g10/passphrase.c:479
 msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 msgstr "Please enter the passphrase to unlock the OpenPGP secret key:"
 
-#: g10/passphrase.c:471
+#: g10/passphrase.c:483
 msgid "Please enter the passphrase to import the OpenPGP secret key:"
 msgstr "Please enter the passphrase to import the OpenPGP secret key:"
 
-#: g10/passphrase.c:476
+#: g10/passphrase.c:488
 msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 msgstr "Please enter the passphrase to export the OpenPGP secret subkey:"
 
-#: g10/passphrase.c:479
+#: g10/passphrase.c:491
 msgid "Please enter the passphrase to export the OpenPGP secret key:"
 msgstr "Please enter the passphrase to export the OpenPGP secret key:"
 
-#: g10/passphrase.c:484
+#: g10/passphrase.c:496
 msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 msgstr ""
 "Do you really want to permanently delete the OpenPGP secret subkey key:"
 
-#: g10/passphrase.c:487
+#: g10/passphrase.c:499
 msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgstr "Do you really want to permanently delete the OpenPGP secret key:"
 
-#: g10/passphrase.c:496
+#: g10/passphrase.c:508
 #, c-format
 msgid ""
 "%s\n"
@@ -6472,7 +6483,7 @@ msgstr ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 
-#: g10/pkclist.c:313 g10/revoke.c:803
+#: g10/pkclist.c:313 g10/revoke.c:804
 msgid "Your decision? "
 msgstr "Your decision? "
 
@@ -6759,7 +6770,7 @@ msgstr "can't open signed data ‘%s’\n"
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "can't open signed data fd=%d: %s\n"
 
-#: g10/pubkey-enc.c:99 sm/decrypt.c:879
+#: g10/pubkey-enc.c:99 sm/decrypt.c:1329
 #, c-format
 msgid "key %s is not suitable for decryption in %s mode\n"
 msgstr "key %s is not suitable for decryption in %s mode\n"
@@ -6805,7 +6816,7 @@ msgid "Note: key has been revoked"
 msgstr "Note: key has been revoked"
 
 #: g10/revoke.c:100 g10/revoke.c:126 g10/revoke.c:172 g10/revoke.c:184
-#: g10/revoke.c:502
+#: g10/revoke.c:503
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet failed: %s\n"
@@ -6831,11 +6842,11 @@ msgstr "Secret key is not available.\n"
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Create a designated revocation certificate for this key? (y/N) "
 
-#: g10/revoke.c:334 g10/revoke.c:744
+#: g10/revoke.c:334 g10/revoke.c:745
 msgid "ASCII armored output forced.\n"
 msgstr "ASCII armored output forced.\n"
 
-#: g10/revoke.c:350 g10/revoke.c:481
+#: g10/revoke.c:350 g10/revoke.c:482
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet failed: %s\n"
@@ -6849,11 +6860,11 @@ msgstr "Revocation certificate created.\n"
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "no revocation keys found for “%s�\n"
 
-#: g10/revoke.c:567
+#: g10/revoke.c:568
 msgid "This is a revocation certificate for the OpenPGP key:"
 msgstr "This is a revocation certificate for the OpenPGP key:"
 
-#: g10/revoke.c:583
+#: g10/revoke.c:584
 msgid ""
 "A revocation certificate is a kind of \"kill switch\" to publicly\n"
 "declare that a key shall not anymore be used.  It is not possible\n"
@@ -6863,7 +6874,7 @@ msgstr ""
 "declare that a key shall not anymore be used.  It is not possible\n"
 "to retract such a revocation certificate once it has been published."
 
-#: g10/revoke.c:586
+#: g10/revoke.c:587
 msgid ""
 "Use it to revoke this key in case of a compromise or loss of\n"
 "the secret key.  However, if the secret key is still accessible,\n"
@@ -6877,7 +6888,7 @@ msgstr ""
 "a reason for the revocation.  For details see the description of\n"
 "of the gpg command “--generate-revocation� in the GnuPG manual."
 
-#: g10/revoke.c:592
+#: g10/revoke.c:593
 msgid ""
 "To avoid an accidental use of this file, a colon has been inserted\n"
 "before the 5 dashes below.  Remove this colon with a text editor\n"
@@ -6887,12 +6898,12 @@ msgstr ""
 "before the 5 dashes below.  Remove this colon with a text editor\n"
 "before importing and publishing this revocation certificate."
 
-#: g10/revoke.c:611
+#: g10/revoke.c:612
 #, c-format
 msgid "revocation certificate stored as '%s.rev'\n"
 msgstr "revocation certificate stored as ‘%s.rev’\n"
 
-#: g10/revoke.c:655
+#: g10/revoke.c:656
 #, c-format
 msgid "secret key \"%s\" not found\n"
 msgstr "secret key “%s� not found\n"
@@ -6900,21 +6911,21 @@ msgstr "secret key “%s� not found\n"
 #. TRANSLATORS: The %s prints a key specification which
 #. for example has been given at the command line.  Several lines
 #. lines with secret key infos are printed after this message.
-#: g10/revoke.c:680
+#: g10/revoke.c:681
 #, c-format
 msgid "'%s' matches multiple secret keys:\n"
 msgstr "‘%s’ matches multiple secret keys:\n"
 
-#: g10/revoke.c:705
+#: g10/revoke.c:706
 #, c-format
 msgid "error searching the keyring: %s\n"
 msgstr "error searching the keyring: %s\n"
 
-#: g10/revoke.c:728
+#: g10/revoke.c:729
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Create a revocation certificate for this key? (y/N) "
 
-#: g10/revoke.c:752
+#: g10/revoke.c:753
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -6932,33 +6943,33 @@ msgstr ""
 "your media become unreadable.  But have some caution:  The print system of\n"
 "your machine might store the data and make it available to others!\n"
 
-#: g10/revoke.c:786
+#: g10/revoke.c:787
 msgid "Please select the reason for the revocation:\n"
 msgstr "Please select the reason for the revocation:\n"
 
-#: g10/revoke.c:796
+#: g10/revoke.c:797
 msgid "Cancel"
 msgstr "Cancel"
 
-#: g10/revoke.c:798
+#: g10/revoke.c:799
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Probably you want to select %d here)\n"
 
-#: g10/revoke.c:839
+#: g10/revoke.c:843
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Enter an optional description; end it with an empty line:\n"
 
-#: g10/revoke.c:867
+#: g10/revoke.c:871
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Reason for revocation: %s\n"
 
-#: g10/revoke.c:869
+#: g10/revoke.c:873
 msgid "(No description given)\n"
 msgstr "(No description given)\n"
 
-#: g10/revoke.c:874
+#: g10/revoke.c:878
 msgid "Is this okay? (y/N) "
 msgstr "Is this okay? (y/N) "
 
@@ -7121,22 +7132,22 @@ msgstr "signing:"
 msgid "%s.%s encryption will be used\n"
 msgstr "%s.%s encryption will be used\n"
 
-#: g10/skclist.c:172 g10/skclist.c:253
+#: g10/skclist.c:173 g10/skclist.c:254
 #, c-format
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr "key is not flagged as insecure - can't use it with the faked RNG!\n"
 
-#: g10/skclist.c:204
+#: g10/skclist.c:205
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "skipped “%s�: duplicated\n"
 
-#: g10/skclist.c:223
+#: g10/skclist.c:224
 #, c-format
 msgid "skipped: secret key already present\n"
 msgstr "skipped: secret key already present\n"
 
-#: g10/skclist.c:242
+#: g10/skclist.c:243
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "this is a PGP generated Elgamal key which is not secure for signatures!"
@@ -7357,10 +7368,10 @@ msgstr "unsupported TOFU database version: %s\n"
 msgid "TOFU DB error"
 msgstr "TOFU DB error"
 
-#: g10/tofu.c:687 g10/tofu.c:2073 g10/tofu.c:2354 g10/tofu.c:2373
-#: g10/tofu.c:2386 g10/tofu.c:2398 g10/tofu.c:2413 g10/tofu.c:2425
-#: g10/tofu.c:3021 g10/tofu.c:3038 g10/tofu.c:3075 g10/tofu.c:3092
-#: g10/tofu.c:3404
+#: g10/tofu.c:687 g10/tofu.c:2077 g10/tofu.c:2358 g10/tofu.c:2377
+#: g10/tofu.c:2390 g10/tofu.c:2402 g10/tofu.c:2417 g10/tofu.c:2429
+#: g10/tofu.c:3025 g10/tofu.c:3042 g10/tofu.c:3079 g10/tofu.c:3096
+#: g10/tofu.c:3408
 #, c-format
 msgid "error reading TOFU database: %s\n"
 msgstr "error reading TOFU database: %s\n"
@@ -7380,7 +7391,7 @@ msgstr "error initializing TOFU database: %s\n"
 msgid "error opening TOFU database '%s': %s\n"
 msgstr "error opening TOFU database '%s': %s\n"
 
-#: g10/tofu.c:1148 g10/tofu.c:3458 g10/tofu.c:3604
+#: g10/tofu.c:1148 g10/tofu.c:3462 g10/tofu.c:3608
 #, c-format
 msgid "error updating TOFU database: %s\n"
 msgstr "error updating TOFU database: %s\n"
@@ -7422,108 +7433,108 @@ msgstr "error gathering other user IDs: %s\n"
 msgid "This key's user IDs:\n"
 msgstr "This key's user IDs:\n"
 
-#: g10/tofu.c:1634 g10/tofu.c:1799
+#: g10/tofu.c:1634 g10/tofu.c:1801
 #, c-format
 msgid "policy: %s"
 msgstr "policy: %s"
 
-#: g10/tofu.c:1725
+#: g10/tofu.c:1727
 #, c-format
 msgid "error gathering signature stats: %s\n"
 msgstr "error gathering signature stats: %s\n"
 
-#: g10/tofu.c:1729
+#: g10/tofu.c:1731
 #, c-format
 msgid "The email address \"%s\" is associated with %d key:\n"
 msgid_plural "The email address \"%s\" is associated with %d keys:\n"
 msgstr[0] "The email address “%s� is associated with %d key:\n"
 msgstr[1] "The email address “%s� is associated with %d keys:\n"
 
-#: g10/tofu.c:1747
+#: g10/tofu.c:1749
 #, c-format
 msgid "Statistics for keys with the email address \"%s\":\n"
 msgstr "Statistics for keys with the email address “%s�:\n"
 
-#: g10/tofu.c:1797
+#: g10/tofu.c:1799
 msgid "this key"
 msgstr "this key"
 
-#: g10/tofu.c:1823
+#: g10/tofu.c:1825
 #, c-format
 msgid "Verified %d message."
 msgid_plural "Verified %d messages."
 msgstr[0] "Verified %d message."
 msgstr[1] "Verified %d messages."
 
-#: g10/tofu.c:1827
+#: g10/tofu.c:1829
 #, c-format
 msgid "Encrypted %d message."
 msgid_plural "Encrypted %d messages."
 msgstr[0] "Encrypted %d message."
 msgstr[1] "Encrypted %d messages."
 
-#: g10/tofu.c:1834
+#: g10/tofu.c:1836
 #, c-format
 msgid "Verified %d message in the future."
 msgid_plural "Verified %d messages in the future."
 msgstr[0] "Verified %d message in the future."
 msgstr[1] "Verified %d messages in the future."
 
-#: g10/tofu.c:1838
+#: g10/tofu.c:1840
 #, c-format
 msgid "Encrypted %d message in the future."
 msgid_plural "Encrypted %d messages in the future."
 msgstr[0] "Encrypted %d message in the future."
 msgstr[1] "Encrypted %d messages in the future."
 
-#: g10/tofu.c:1852
+#: g10/tofu.c:1854
 #, c-format
 msgid "Messages verified over the past %d day: %d."
 msgid_plural "Messages verified over the past %d days: %d."
 msgstr[0] "Messages verified over the past %d day: %d."
 msgstr[1] "Messages verified over the past %d days: %d."
 
-#: g10/tofu.c:1858
+#: g10/tofu.c:1860
 #, c-format
 msgid "Messages encrypted over the past %d day: %d."
 msgid_plural "Messages encrypted over the past %d days: %d."
 msgstr[0] "Messages encrypted over the past %d day: %d."
 msgstr[1] "Messages encrypted over the past %d days: %d."
 
-#: g10/tofu.c:1868
+#: g10/tofu.c:1870
 #, c-format
 msgid "Messages verified over the past %d month: %d."
 msgid_plural "Messages verified over the past %d months: %d."
 msgstr[0] "Messages verified over the past %d month: %d."
 msgstr[1] "Messages verified over the past %d months: %d."
 
-#: g10/tofu.c:1874
+#: g10/tofu.c:1876
 #, c-format
 msgid "Messages encrypted over the past %d month: %d."
 msgid_plural "Messages encrypted over the past %d months: %d."
 msgstr[0] "Messages encrypted over the past %d month: %d."
 msgstr[1] "Messages encrypted over the past %d months: %d."
 
-#: g10/tofu.c:1884
+#: g10/tofu.c:1886
 #, c-format
 msgid "Messages verified over the past %d year: %d."
 msgid_plural "Messages verified over the past %d years: %d."
 msgstr[0] "Messages verified over the past %d year: %d."
 msgstr[1] "Messages verified over the past %d years: %d."
 
-#: g10/tofu.c:1890
+#: g10/tofu.c:1892
 #, c-format
 msgid "Messages encrypted over the past %d year: %d."
 msgid_plural "Messages encrypted over the past %d years: %d."
 msgstr[0] "Messages encrypted over the past %d year: %d."
 msgstr[1] "Messages encrypted over the past %d years: %d."
 
-#: g10/tofu.c:1898
+#: g10/tofu.c:1900
 #, c-format
 msgid "Messages verified in the past: %d."
 msgstr "Messages verified in the past: %d."
 
-#: g10/tofu.c:1902
+#: g10/tofu.c:1904
 #, c-format
 msgid "Messages encrypted in the past: %d."
 msgstr "Messages encrypted in the past: %d."
@@ -7531,128 +7542,128 @@ msgstr "Messages encrypted in the past: %d."
 #. TRANSLATORS: Please translate the text found in the source
 #. * file below.  We don't directly internationalize that text so
 #. * that we can tweak it without breaking translations.
-#: g10/tofu.c:1919
+#: g10/tofu.c:1921
 msgid "TOFU detected a binding conflict"
 msgstr "TOFU detected a binding conflict"
 
 #. TRANSLATORS: Two letters (normally the lower and upper case
 #. * version of the hotkey) for each of the five choices.  If
 #. * there is only one choice in your language, repeat it.
-#: g10/tofu.c:1961
+#: g10/tofu.c:1963
 msgid "gGaAuUrRbB"
 msgstr "gGaAuUrRbB"
 
-#: g10/tofu.c:1967
+#: g10/tofu.c:1969
 msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 
-#: g10/tofu.c:1975
+#: g10/tofu.c:1978
 msgid "Defaulting to unknown.\n"
 msgstr "Defaulting to unknown.\n"
 
-#: g10/tofu.c:2093 g10/tofu.c:2228
+#: g10/tofu.c:2097 g10/tofu.c:2232
 #, c-format
 msgid "TOFU db corruption detected.\n"
 msgstr "TOFU db corruption detected.\n"
 
-#: g10/tofu.c:2829
+#: g10/tofu.c:2833
 #, c-format
 msgid "error changing TOFU policy: %s\n"
 msgstr "error changing TOFU policy: %s\n"
 
-#: g10/tofu.c:2880
+#: g10/tofu.c:2884
 #, c-format
 msgid "%lld~year"
 msgid_plural "%lld~years"
 msgstr[0] "%lld~year"
 msgstr[1] "%lld~years"
 
-#: g10/tofu.c:2885
+#: g10/tofu.c:2889
 #, c-format
 msgid "%lld~month"
 msgid_plural "%lld~months"
 msgstr[0] "%lld~month"
 msgstr[1] "%lld~months"
 
-#: g10/tofu.c:2890
+#: g10/tofu.c:2894
 #, c-format
 msgid "%lld~week"
 msgid_plural "%lld~weeks"
 msgstr[0] "%lld~week"
 msgstr[1] "%lld~weeks"
 
-#: g10/tofu.c:2895
+#: g10/tofu.c:2899
 #, c-format
 msgid "%lld~day"
 msgid_plural "%lld~days"
 msgstr[0] "%lld~day"
 msgstr[1] "%lld~days"
 
-#: g10/tofu.c:2900
+#: g10/tofu.c:2904
 #, c-format
 msgid "%lld~hour"
 msgid_plural "%lld~hours"
 msgstr[0] "%lld~hour"
 msgstr[1] "%lld~hours"
 
-#: g10/tofu.c:2905
+#: g10/tofu.c:2909
 #, c-format
 msgid "%lld~minute"
 msgid_plural "%lld~minutes"
 msgstr[0] "%lld~minute"
 msgstr[1] "%lld~minutes"
 
-#: g10/tofu.c:2907
+#: g10/tofu.c:2911
 #, c-format
 msgid "%lld~second"
 msgid_plural "%lld~seconds"
 msgstr[0] "%lld~second"
 msgstr[1] "%lld~seconds"
 
-#: g10/tofu.c:3145
+#: g10/tofu.c:3149
 #, c-format
 msgid "%s: Verified 0~signatures and encrypted 0~messages."
 msgstr "%s: Verified 0~signatures and encrypted 0~messages."
 
-#: g10/tofu.c:3151
+#: g10/tofu.c:3155
 #, c-format
 msgid "%s: Verified 0 signatures."
 msgstr "%s: Verified 0 signatures."
 
-#: g10/tofu.c:3165
+#: g10/tofu.c:3169
 msgid "Encrypted 0 messages."
 msgstr "Encrypted 0 messages."
 
-#: g10/tofu.c:3181
+#: g10/tofu.c:3185
 #, c-format
 msgid "(policy: %s)"
 msgstr "(policy: %s)"
 
-#: g10/tofu.c:3215
+#: g10/tofu.c:3219
 #, c-format
 msgid ""
 "Warning: we have yet to see a message signed using this key and user id!\n"
 msgstr ""
 "Warning: we have yet to see a message signed using this key and user id!\n"
 
-#: g10/tofu.c:3218
+#: g10/tofu.c:3222
 #, c-format
 msgid ""
 "Warning: we've only seen one message signed using this key and user id!\n"
 msgstr ""
 "Warning: we've only seen one message signed using this key and user id!\n"
 
-#: g10/tofu.c:3222
+#: g10/tofu.c:3226
 #, c-format
 msgid "Warning: you have yet to encrypt a message to this key!\n"
 msgstr "Warning: you have yet to encrypt a message to this key!\n"
 
-#: g10/tofu.c:3225
+#: g10/tofu.c:3229
 #, c-format
 msgid "Warning: you have only encrypted one message to this key!\n"
 msgstr "Warning: you have only encrypted one message to this key!\n"
 
-#: g10/tofu.c:3254
+#: g10/tofu.c:3258
 #, c-format
 msgid ""
 "Warning: if you think you've seen more signatures by this key and user id, "
@@ -7679,13 +7690,13 @@ msgstr[1] ""
 "  %s\n"
 "to mark it as being bad.\n"
 
-#: g10/tofu.c:3339 g10/tofu.c:3502 g10/tofu.c:3708 g10/tofu.c:3761
-#: g10/tofu.c:3902 g10/tofu.c:3979 g10/tofu.c:4017
+#: g10/tofu.c:3343 g10/tofu.c:3506 g10/tofu.c:3712 g10/tofu.c:3765
+#: g10/tofu.c:3906 g10/tofu.c:3983 g10/tofu.c:4021
 #, c-format
 msgid "error opening TOFU database: %s\n"
 msgstr "error opening TOFU database: %s\n"
 
-#: g10/tofu.c:3535
+#: g10/tofu.c:3539
 #, c-format
 msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
 msgstr "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
@@ -7750,7 +7761,7 @@ msgstr "using %s trust model\n"
 msgid "no need for a trustdb check\n"
 msgstr "no need for a trustdb check\n"
 
-#: g10/trustdb.c:601 g10/trustdb.c:2272
+#: g10/trustdb.c:601 g10/trustdb.c:2273
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "next trustdb check due at %s\n"
@@ -7780,59 +7791,59 @@ msgstr "please do a --check-trustdb\n"
 msgid "checking the trustdb\n"
 msgstr "checking the trustdb\n"
 
-#: g10/trustdb.c:1993
+#: g10/trustdb.c:1994
 #, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr[0] "%d key processed"
 msgstr[1] "%d keys processed"
 
-#: g10/trustdb.c:1996
+#: g10/trustdb.c:1997
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] " (%d validity count cleared)\n"
 msgstr[1] " (%d validity counts cleared)\n"
 
-#: g10/trustdb.c:2066
+#: g10/trustdb.c:2067
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "no ultimately trusted keys found\n"
 
-#: g10/trustdb.c:2080
+#: g10/trustdb.c:2081
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "public key of ultimately trusted key %s not found\n"
 
-#: g10/trustdb.c:2198
+#: g10/trustdb.c:2199
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 
-#: g10/trustdb.c:2279
+#: g10/trustdb.c:2280
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "unable to update trustdb version record: write failed: %s\n"
 
-#: g10/trust.c:125
+#: g10/trust.c:114
 msgid "undefined"
 msgstr "undefined"
 
-#: g10/trust.c:126
+#: g10/trust.c:115
 msgid "never"
 msgstr "never"
 
-#: g10/trust.c:127
+#: g10/trust.c:116
 msgid "marginal"
 msgstr "marginal"
 
-#: g10/trust.c:128
+#: g10/trust.c:117
 msgid "full"
 msgstr "full"
 
-#: g10/trust.c:129
+#: g10/trust.c:118
 msgid "ultimate"
 msgstr "ultimate"
 
@@ -7844,39 +7855,39 @@ msgstr "ultimate"
 #. It gets passed to atoi() so everything after the number is
 #. essentially a comment and need not be translated.  Either key and
 #. uid are both NULL, or neither are NULL.
-#: g10/trust.c:166
+#: g10/trust.c:155
 msgid "10 translator see trust.c:uid_trust_string_fixed"
 msgstr "10 translator see trust.c:uid_trust_string_fixed"
 
-#: g10/trust.c:169
+#: g10/trust.c:158
 msgid "[ revoked]"
 msgstr "[ revoked]"
 
-#: g10/trust.c:171 g10/trust.c:177
+#: g10/trust.c:160 g10/trust.c:166
 msgid "[ expired]"
 msgstr "[ expired]"
 
-#: g10/trust.c:176
+#: g10/trust.c:165
 msgid "[ unknown]"
 msgstr "[ unknown]"
 
-#: g10/trust.c:178
+#: g10/trust.c:167
 msgid "[  undef ]"
 msgstr "[  undef ]"
 
-#: g10/trust.c:179
+#: g10/trust.c:168
 msgid "[  never ]"
 msgstr "[  never ]"
 
-#: g10/trust.c:180
+#: g10/trust.c:169
 msgid "[marginal]"
 msgstr "[marginal]"
 
-#: g10/trust.c:181
+#: g10/trust.c:170
 msgid "[  full  ]"
 msgstr "[  full  ]"
 
-#: g10/trust.c:182
+#: g10/trust.c:171
 msgid "[ultimate]"
 msgstr "[ultimate]"
 
@@ -7934,16 +7945,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:4937 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2386
+#: scd/app-piv.c:1770 scd/app-p15.c:5035 scd/app-nks.c:1530
+#: scd/app-openpgp.c:2387
 #, 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:4956 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2402
+#: scd/app-piv.c:1787 scd/app-p15.c:5054 scd/app-nks.c:1549
+#: scd/app-openpgp.c:2403
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr "Remaining attempts: %d"
@@ -7972,10 +7983,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:2669
-#: scd/app-openpgp.c:2693 scd/app-openpgp.c:2871 scd/app-openpgp.c:2893
-#: scd/app-openpgp.c:3074 scd/app-openpgp.c:3361 scd/app-openpgp.c:3408
-#: scd/app-openpgp.c:3545 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2670
+#: scd/app-openpgp.c:2694 scd/app-openpgp.c:2872 scd/app-openpgp.c:2894
+#: scd/app-openpgp.c:3075 scd/app-openpgp.c:3362 scd/app-openpgp.c:3409
+#: scd/app-openpgp.c:3547 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN callback returned error: %s\n"
@@ -7995,92 +8006,92 @@ 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:3616
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3618
 #, c-format
 msgid "key already exists\n"
 msgstr "key already exists\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3620
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3622
 #, 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:3622
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3624
 #, c-format
 msgid "generating new key\n"
 msgstr "generating new key\n"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3624
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3626
 #, c-format
 msgid "writing new key\n"
 msgstr "writing new key\n"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4484 scd/app-openpgp.c:4767
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4486 scd/app-openpgp.c:4761
 #, 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:1615
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1616
 #, 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:1622
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1623
 #, 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:1732
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1733
 #, 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:4943
+#: scd/app-piv.c:3279 scd/app-openpgp.c:4937
 #, 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:4951
+#: scd/app-piv.c:3294 scd/app-openpgp.c:4945
 #, c-format
 msgid "generating key failed\n"
 msgstr "generating key failed\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4957
+#: scd/app-piv.c:3300 scd/app-openpgp.c:4951
 #, 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:1842 scd/app-openpgp.c:4966
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1843 scd/app-openpgp.c:4960
 #, 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:5035 scd/app-nks.c:2038
+#: scd/app-p15.c:5133 scd/app-nks.c:2038
 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:5038 scd/app-openpgp.c:2818
+#: scd/app-p15.c:5136 scd/app-openpgp.c:2819
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Please enter the Admin PIN"
 
-#: scd/app-p15.c:5040 scd/app-nks.c:2028
+#: scd/app-p15.c:5138 scd/app-nks.c:2028
 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:5043 scd/app-nks.c:2019
+#: scd/app-p15.c:5141 scd/app-nks.c:2019
 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:4321
+#: scd/app-nks.c:1468 scd/app-openpgp.c:4323
 #, 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:4333
+#: scd/app-nks.c:1476 scd/app-openpgp.c:4335
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "RSA public exponent missing or larger than %d bits\n"
@@ -8123,27 +8134,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:3442 scd/app-dinsig.c:534
+#: scd/app-nks.c:2221 scd/app-openpgp.c:3443 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:943
+#: scd/app-openpgp.c:944
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "failed to store the fingerprint: %s\n"
 
-#: scd/app-openpgp.c:956
+#: scd/app-openpgp.c:957
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "failed to store the creation date: %s\n"
 
-#: scd/app-openpgp.c:1427 scd/app-openpgp.c:3389 scd/app-openpgp.c:5715
+#: scd/app-openpgp.c:1428 scd/app-openpgp.c:3390 scd/app-openpgp.c:5709
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "error retrieving CHV status from card\n"
 
-#: scd/app-openpgp.c:1949
+#: scd/app-openpgp.c:1950
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "reading public key failed: %s\n"
@@ -8151,42 +8162,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:2373
+#: scd/app-openpgp.c:2374
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 
-#: scd/app-openpgp.c:2621
+#: scd/app-openpgp.c:2622
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "using default PIN as %s\n"
 
-#: scd/app-openpgp.c:2628
+#: scd/app-openpgp.c:2629
 #, 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:2641
+#: scd/app-openpgp.c:2642
 msgid "||Please unlock the card"
 msgstr "||Please unlock the card"
 
-#: scd/app-openpgp.c:2700 scd/app-openpgp.c:2900 scd/app-openpgp.c:3368
+#: scd/app-openpgp.c:2701 scd/app-openpgp.c:2901 scd/app-openpgp.c:3369
 #, 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:2717 scd/app-openpgp.c:2760 scd/app-openpgp.c:2917
-#: scd/app-openpgp.c:5325
+#: scd/app-openpgp.c:2718 scd/app-openpgp.c:2761 scd/app-openpgp.c:2918
+#: scd/app-openpgp.c:5319
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "verify CHV%d failed: %s\n"
 
-#: scd/app-openpgp.c:2804 scd/app-openpgp.c:5724
+#: scd/app-openpgp.c:2805 scd/app-openpgp.c:5718
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "card is permanently locked!\n"
 
-#: scd/app-openpgp.c:2808
+#: scd/app-openpgp.c:2809
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8194,20 +8205,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:2841
+#: scd/app-openpgp.c:2842
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr "access to admin commands is not configured\n"
 
-#: scd/app-openpgp.c:3355
+#: scd/app-openpgp.c:3356
 msgid "||Please enter the PIN"
 msgstr "||Please enter the PIN"
 
-#: scd/app-openpgp.c:3404
+#: scd/app-openpgp.c:3405
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Please enter the Reset Code for the card"
 
-#: scd/app-openpgp.c:3414 scd/app-openpgp.c:3481
+#: scd/app-openpgp.c:3415 scd/app-openpgp.c:3484
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "Reset Code is too short; minimum length is %d\n"
@@ -8215,79 +8226,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:3437
+#: scd/app-openpgp.c:3438
 msgid "|RN|New Reset Code"
 msgstr "|RN|New Reset Code"
 
-#: scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3439
 msgid "|AN|New Admin PIN"
 msgstr "|AN|New Admin PIN"
 
-#: scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3439
 msgid "|N|New PIN"
 msgstr "|N|New PIN"
 
-#: scd/app-openpgp.c:3541
+#: scd/app-openpgp.c:3543
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "||Please enter the Admin PIN and New Admin PIN"
 
-#: scd/app-openpgp.c:3542
+#: scd/app-openpgp.c:3544
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Please enter the PIN and New PIN"
 
-#: scd/app-openpgp.c:3600 scd/app-openpgp.c:5026
+#: scd/app-openpgp.c:3602 scd/app-openpgp.c:5020
 #, c-format
 msgid "error reading application data\n"
 msgstr "error reading application data\n"
 
-#: scd/app-openpgp.c:3606 scd/app-openpgp.c:5033
+#: scd/app-openpgp.c:3608 scd/app-openpgp.c:5027
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "error reading fingerprint DO\n"
 
-#: scd/app-openpgp.c:4302 scd/app-openpgp.c:4657
+#: scd/app-openpgp.c:4304 scd/app-openpgp.c:4653
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "creation timestamp missing\n"
 
-#: scd/app-openpgp.c:4343 scd/app-openpgp.c:4351
+#: scd/app-openpgp.c:4345 scd/app-openpgp.c:4353
 #, 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:4651
+#: scd/app-openpgp.c:4647
 #, c-format
 msgid "unsupported curve\n"
 msgstr "unsupported curve\n"
 
-#: scd/app-openpgp.c:4991
+#: scd/app-openpgp.c:4985
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "invalid structure of OpenPGP card (DO 0x93)\n"
 
-#: scd/app-openpgp.c:5041
+#: scd/app-openpgp.c:5035
 #, 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:5240
+#: scd/app-openpgp.c:5234
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "card does not support digest algorithm %s\n"
 
-#: scd/app-openpgp.c:5298
+#: scd/app-openpgp.c:5292
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "signatures created so far: %lu\n"
 
-#: scd/app-openpgp.c:5729
+#: scd/app-openpgp.c:5723
 #, 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:6241 scd/app-openpgp.c:6252
+#: scd/app-openpgp.c:6250 scd/app-openpgp.c:6261
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "can't access %s - invalid OpenPGP card?\n"
@@ -8307,7 +8318,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:274 dirmngr/dirmngr.c:198
+#: scd/scdaemon.c:136 sm/gpgsm.c:274 dirmngr/dirmngr.c:199
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LEVEL|set the debugging level to LEVEL"
 
@@ -8369,12 +8380,12 @@ 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:2104
+#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2143
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "handler for fd %d started\n"
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2112
+#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2151
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "handler for fd %d terminated\n"
@@ -8384,11 +8395,11 @@ msgstr "handler for fd %d terminated\n"
 msgid "validation model requested by certificate: %s"
 msgstr "validation model requested by certificate: %s"
 
-#: sm/certchain.c:199 sm/certchain.c:2172
+#: sm/certchain.c:199 sm/certchain.c:2174
 msgid "chain"
 msgstr "chain"
 
-#: sm/certchain.c:200 sm/certchain.c:2172
+#: sm/certchain.c:200 sm/certchain.c:2174
 msgid "shell"
 msgstr "shell"
 
@@ -8421,224 +8432,224 @@ msgstr "Note: non-critical certificate policy not allowed"
 msgid "certificate policy not allowed"
 msgstr "certificate policy not allowed"
 
-#: sm/certchain.c:595 sm/keydb.c:1891 sm/keydb.c:1980
+#: sm/certchain.c:596 sm/keydb.c:1913 sm/keydb.c:2002
 #, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "failed to get the fingerprint\n"
 
-#: sm/certchain.c:624
+#: sm/certchain.c:625
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr "looking up issuer at external location\n"
 
-#: sm/certchain.c:644
+#: sm/certchain.c:645
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "number of issuers matching: %d\n"
 
-#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#: sm/certchain.c:724 dirmngr/ocsp.c:683
 #, c-format
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "can't get authorityInfoAccess: %s\n"
 
-#: sm/certchain.c:791
+#: sm/certchain.c:792
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr "looking up issuer from the Dirmngr cache\n"
 
-#: sm/certchain.c:816
+#: sm/certchain.c:817
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "number of matching certificates: %d\n"
 
-#: sm/certchain.c:819
+#: sm/certchain.c:820
 #, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "dirmngr cache-only key lookup failed: %s\n"
 
-#: sm/certchain.c:1046 sm/certchain.c:1561 sm/certchain.c:2200 sm/decrypt.c:643
-#: sm/encrypt.c:620 sm/import.c:414 sm/keydb.c:1898 sm/keydb.c:1987
-#: sm/sign.c:428 sm/verify.c:117
+#: sm/certchain.c:1047 sm/certchain.c:1562 sm/certchain.c:2202
+#: sm/decrypt.c:1084 sm/encrypt.c:621 sm/import.c:414 sm/keydb.c:1920
+#: sm/keydb.c:2009 sm/sign.c:428 sm/verify.c:117
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "failed to allocate keyDB handle\n"
 
-#: sm/certchain.c:1232
+#: sm/certchain.c:1233
 msgid "certificate has been revoked"
 msgstr "certificate has been revoked"
 
-#: sm/certchain.c:1247
+#: sm/certchain.c:1248
 msgid "the status of the certificate is unknown"
 msgstr "the status of the certificate is unknown"
 
-#: sm/certchain.c:1254
+#: sm/certchain.c:1255
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr "please make sure that the “dirmngr� is properly installed\n"
 
-#: sm/certchain.c:1260
+#: sm/certchain.c:1261
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "checking the CRL failed: %s"
 
-#: sm/certchain.c:1289 sm/certchain.c:1357 dirmngr/validate.c:497
+#: sm/certchain.c:1290 sm/certchain.c:1358 dirmngr/validate.c:497
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "certificate with invalid validity: %s"
 
-#: sm/certchain.c:1304 sm/certchain.c:1389 dirmngr/validate.c:515
+#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:515
 #, c-format
 msgid "certificate not yet valid"
 msgstr "certificate not yet valid"
 
-#: sm/certchain.c:1305 sm/certchain.c:1390
+#: sm/certchain.c:1306 sm/certchain.c:1391
 msgid "root certificate not yet valid"
 msgstr "root certificate not yet valid"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1307 sm/certchain.c:1392
 msgid "intermediate certificate not yet valid"
 msgstr "intermediate certificate not yet valid"
 
-#: sm/certchain.c:1319 dirmngr/validate.c:526
+#: sm/certchain.c:1320 dirmngr/validate.c:526
 #, c-format
 msgid "certificate has expired"
 msgstr "certificate has expired"
 
-#: sm/certchain.c:1320
+#: sm/certchain.c:1321
 msgid "root certificate has expired"
 msgstr "root certificate has expired"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1322
 msgid "intermediate certificate has expired"
 msgstr "intermediate certificate has expired"
 
-#: sm/certchain.c:1363
+#: sm/certchain.c:1364
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr "required certificate attributes missing: %s%s%s"
 
-#: sm/certchain.c:1372
+#: sm/certchain.c:1373
 msgid "certificate with invalid validity"
 msgstr "certificate with invalid validity"
 
-#: sm/certchain.c:1409
+#: sm/certchain.c:1410
 msgid "signature not created during lifetime of certificate"
 msgstr "signature not created during lifetime of certificate"
 
-#: sm/certchain.c:1411
+#: sm/certchain.c:1412
 msgid "certificate not created during lifetime of issuer"
 msgstr "certificate not created during lifetime of issuer"
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1413
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr "intermediate certificate not created during lifetime of issuer"
 
-#: sm/certchain.c:1416
+#: sm/certchain.c:1417
 #, c-format
 msgid "  (  signature created at "
 msgstr "  (  signature created at "
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1418
 #, c-format
 msgid "  (certificate created at "
 msgstr "  (certificate created at "
 
-#: sm/certchain.c:1420
+#: sm/certchain.c:1421
 #, c-format
 msgid "  (certificate valid from "
 msgstr "  (certificate valid from "
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1422
 #, c-format
 msgid "  (     issuer valid from "
 msgstr "  (     issuer valid from "
 
-#: sm/certchain.c:1451 dirmngr/validate.c:577
+#: sm/certchain.c:1452 dirmngr/validate.c:577
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "fingerprint=%s\n"
 
-#: sm/certchain.c:1460
+#: sm/certchain.c:1461
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr "root certificate has now been marked as trusted\n"
 
-#: sm/certchain.c:1473
+#: sm/certchain.c:1474
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr "interactive marking as trusted not enabled in gpg-agent\n"
 
-#: sm/certchain.c:1479
+#: sm/certchain.c:1480
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr "interactive marking as trusted disabled for this session\n"
 
-#: sm/certchain.c:1538
+#: sm/certchain.c:1539
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr "WARNING: creation time of signature not known - assuming current time"
 
-#: sm/certchain.c:1602
+#: sm/certchain.c:1603
 msgid "no issuer found in certificate"
 msgstr "no issuer found in certificate"
 
-#: sm/certchain.c:1680
+#: sm/certchain.c:1681
 msgid "self-signed certificate has a BAD signature"
 msgstr "self-signed certificate has a BAD signature"
 
-#: sm/certchain.c:1749 dirmngr/validate.c:575
+#: sm/certchain.c:1750 dirmngr/validate.c:575
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "root certificate is not marked trusted"
 
-#: sm/certchain.c:1765
+#: sm/certchain.c:1766
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "checking the trust list failed: %s\n"
 
-#: sm/certchain.c:1796 sm/import.c:175 dirmngr/validate.c:630
+#: sm/certchain.c:1797 sm/import.c:175 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "certificate chain too long\n"
 
-#: sm/certchain.c:1808 dirmngr/validate.c:642
+#: sm/certchain.c:1809 dirmngr/validate.c:642
 #, c-format
 msgid "issuer certificate not found"
 msgstr "issuer certificate not found"
 
-#: sm/certchain.c:1842 dirmngr/validate.c:668
+#: sm/certchain.c:1844 dirmngr/validate.c:668
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr "certificate has a BAD signature"
 
-#: sm/certchain.c:1874 dirmngr/validate.c:692
+#: sm/certchain.c:1876 dirmngr/validate.c:692
 msgid "found another possible matching CA certificate - trying again"
 msgstr "found another possible matching CA certificate - trying again"
 
-#: sm/certchain.c:1933 dirmngr/validate.c:717
+#: sm/certchain.c:1935 dirmngr/validate.c:717
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "certificate chain longer than allowed by CA (%d)"
 
-#: sm/certchain.c:1975 sm/certchain.c:2275 dirmngr/validate.c:747
+#: sm/certchain.c:1977 sm/certchain.c:2278 dirmngr/validate.c:747
 #, c-format
 msgid "certificate is good\n"
 msgstr "certificate is good\n"
 
-#: sm/certchain.c:1976
+#: sm/certchain.c:1978
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "intermediate certificate is good\n"
 
-#: sm/certchain.c:1977
+#: sm/certchain.c:1979
 #, c-format
 msgid "root certificate is good\n"
 msgstr "root certificate is good\n"
 
-#: sm/certchain.c:2159
+#: sm/certchain.c:2161
 msgid "switching to chain model"
 msgstr "switching to chain model"
 
-#: sm/certchain.c:2168
+#: sm/certchain.c:2170
 #, c-format
 msgid "validation model used: %s"
 msgstr "validation model used: %s"
@@ -8649,18 +8660,18 @@ 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:1372 dirmngr/validate.c:903
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1411 dirmngr/validate.c:903
 #: dirmngr/validate.c:927
 #, c-format
 msgid "out of core\n"
 msgstr "out of core\n"
 
-#: sm/certcheck.c:389 sm/verify.c:212
+#: sm/certcheck.c:388 sm/verify.c:212
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(this is the MD2 algorithm)\n"
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:793
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:794
 msgid "none"
 msgstr "none"
 
@@ -8948,17 +8959,17 @@ msgstr "Ready.  You should now send this request to your CA.\n"
 msgid "resource problem: out of core\n"
 msgstr "resource problem: out of core\n"
 
-#: sm/decrypt.c:719
+#: sm/decrypt.c:1159
 #, c-format
 msgid "(this is the RC2 algorithm)\n"
 msgstr "(this is the RC2 algorithm)\n"
 
-#: sm/decrypt.c:721
+#: sm/decrypt.c:1161
 #, c-format
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr "(this does not seem to be an encrypted message)\n"
 
-#: sm/decrypt.c:868
+#: sm/decrypt.c:1318
 #, c-format
 msgid "encrypted to %s key %s\n"
 msgstr "encrypted to %s key %s\n"
@@ -8968,7 +8979,7 @@ msgstr "encrypted to %s key %s\n"
 msgid "certificate '%s' not found: %s\n"
 msgstr "certificate ‘%s’ not found: %s\n"
 
-#: sm/delete.c:120 sm/keydb.c:1999 sm/keydb.c:2098
+#: sm/delete.c:120 sm/keydb.c:2021 sm/keydb.c:2120
 #, c-format
 msgid "error locking keybox: %s\n"
 msgstr "error locking keybox: %s\n"
@@ -8988,7 +8999,7 @@ msgstr "certificate ‘%s’ deleted\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "deleting certificate “%s� failed: %s\n"
 
-#: sm/encrypt.c:606
+#: sm/encrypt.c:607
 #, c-format
 msgid "no valid recipients given\n"
 msgstr "no valid recipients given\n"
@@ -9057,63 +9068,63 @@ msgstr "|USER-ID|use USER-ID as default secret key"
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|FILE|add keyring to the list of keyrings"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:352 dirmngr/dirmngr.c:265
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|SPEC|use this keyserver to lookup keys"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:363
 msgid "fetch missing issuer certificates"
 msgstr "fetch missing issuer certificates"
 
-#: sm/gpgsm.c:364
+#: sm/gpgsm.c:365
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NAME|use encoding NAME for PKCS#12 passphrases"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:386
 msgid "never consult a CRL"
 msgstr "never consult a CRL"
 
-#: sm/gpgsm.c:389
+#: sm/gpgsm.c:390
 msgid "do not check CRLs for root certificates"
 msgstr "do not check CRLs for root certificates"
 
-#: sm/gpgsm.c:393
+#: sm/gpgsm.c:394
 msgid "check validity using OCSP"
 msgstr "check validity using OCSP"
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:396
 msgid "do not check certificate policies"
 msgstr "do not check certificate policies"
 
-#: sm/gpgsm.c:398
+#: sm/gpgsm.c:399
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|use cipher algorithm NAME"
 
-#: sm/gpgsm.c:400
+#: sm/gpgsm.c:401
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|use message digest algorithm NAME"
 
-#: sm/gpgsm.c:410
+#: sm/gpgsm.c:411
 msgid "batch mode: never ask"
 msgstr "batch mode: never ask"
 
-#: sm/gpgsm.c:412
+#: sm/gpgsm.c:413
 msgid "assume yes on most questions"
 msgstr "assume yes on most questions"
 
-#: sm/gpgsm.c:413
+#: sm/gpgsm.c:414
 msgid "assume no on most questions"
 msgstr "assume no on most questions"
 
-#: sm/gpgsm.c:430
+#: sm/gpgsm.c:431
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FILE|write an audit log to FILE"
 
-#: sm/gpgsm.c:615
+#: sm/gpgsm.c:616
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Usage: @GPGSM@ [options] [files] (-h for help)"
 
-#: sm/gpgsm.c:618
+#: sm/gpgsm.c:619
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -9123,52 +9134,27 @@ msgstr ""
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
 "Default operation depends on the input data\n"
 
-#: sm/gpgsm.c:826
+#: sm/gpgsm.c:827
 #, 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:837
+#: sm/gpgsm.c:838
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "unknown validation model ‘%s’\n"
 
-#: sm/gpgsm.c:896 dirmngr/ldapserver.c:89
-#, c-format
-msgid "%s:%u: no hostname given\n"
-msgstr "%s:%u: no hostname given\n"
-
-#: sm/gpgsm.c:915 dirmngr/ldapserver.c:108
-#, c-format
-msgid "%s:%u: password given without user\n"
-msgstr "%s:%u: password given without user\n"
-
-#: sm/gpgsm.c:946 dirmngr/ldapserver.c:139
-#, c-format
-msgid "%s:%u: ignoring unknown flag '%s'\n"
-msgstr "%s:%u: ignoring unknown flag ‘%s’\n"
-
-#: sm/gpgsm.c:962 dirmngr/ldapserver.c:155
-#, c-format
-msgid "%s:%u: skipping this line\n"
-msgstr "%s:%u: skipping this line\n"
-
-#: sm/gpgsm.c:1550
-#, c-format
-msgid "could not parse keyserver\n"
-msgstr "could not parse keyserver\n"
-
-#: sm/gpgsm.c:1858
+#: sm/gpgsm.c:1711
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "importing common certificates ‘%s’\n"
 
-#: sm/gpgsm.c:1904
+#: sm/gpgsm.c:1757
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "can't sign using '%s': %s\n"
 
-#: sm/gpgsm.c:2273
+#: sm/gpgsm.c:2129
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "invalid command (there is no implicit command)\n"
@@ -9188,52 +9174,52 @@ msgstr "error storing certificate\n"
 msgid "basic certificate checks failed - not imported\n"
 msgstr "basic certificate checks failed - not imported\n"
 
-#: sm/import.c:471 sm/keydb.c:2018 sm/keydb.c:2111
+#: sm/import.c:472 sm/keydb.c:2040 sm/keydb.c:2133
 #, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "error getting stored flags: %s\n"
 
-#: sm/import.c:530 sm/import.c:562
+#: sm/import.c:531 sm/import.c:563
 #, c-format
 msgid "error importing certificate: %s\n"
 msgstr "error importing certificate: %s\n"
 
-#: sm/import.c:751 tools/gpg-connect-agent.c:1475
+#: sm/import.c:752 tools/gpg-connect-agent.c:1475
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "error reading input: %s\n"
 
-#: sm/keydb.c:503
+#: sm/keydb.c:508
 #, c-format
 msgid "no keyboxd running in this session\n"
 msgstr "no keyboxd running in this session\n"
 
-#: sm/keydb.c:595
+#: sm/keydb.c:600
 #, c-format
 msgid "error opening key DB: %s\n"
 msgstr "error opening key DB: %s\n"
 
-#: sm/keydb.c:1936
+#: sm/keydb.c:1958
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr "problem looking for existing certificate: %s\n"
 
-#: sm/keydb.c:1948
+#: sm/keydb.c:1970
 #, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "error finding writable keyDB: %s\n"
 
-#: sm/keydb.c:1956
+#: sm/keydb.c:1978
 #, c-format
 msgid "error storing certificate: %s\n"
 msgstr "error storing certificate: %s\n"
 
-#: sm/keydb.c:2009
+#: sm/keydb.c:2031
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "problem re-searching certificate: %s\n"
 
-#: sm/keydb.c:2030 sm/keydb.c:2122
+#: sm/keydb.c:2052 sm/keydb.c:2144
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr "error storing flags: %s\n"
@@ -9414,57 +9400,57 @@ msgstr "  subject ="
 msgid "error loading certificate '%s': %s\n"
 msgstr "error loading certificate '%s': %s\n"
 
-#: dirmngr/certcache.c:819
+#: dirmngr/certcache.c:820
 #, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "permanently loaded certificates: %u\n"
 
-#: dirmngr/certcache.c:821
+#: dirmngr/certcache.c:822
 #, c-format
 msgid "    runtime cached certificates: %u\n"
 msgstr "    runtime cached certificates: %u\n"
 
-#: dirmngr/certcache.c:823
+#: dirmngr/certcache.c:824
 #, c-format
 msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "           trusted certificates: %u (%u,%u,%u,%u)\n"
 
-#: dirmngr/certcache.c:851 dirmngr/dirmngr-client.c:392
+#: dirmngr/certcache.c:852 dirmngr/dirmngr-client.c:392
 #, c-format
 msgid "certificate already cached\n"
 msgstr "certificate already cached\n"
 
-#: dirmngr/certcache.c:853
+#: dirmngr/certcache.c:854
 #, c-format
 msgid "certificate cached\n"
 msgstr "certificate cached\n"
 
-#: dirmngr/certcache.c:855 dirmngr/certcache.c:875 dirmngr/dirmngr-client.c:396
+#: dirmngr/certcache.c:856 dirmngr/certcache.c:876 dirmngr/dirmngr-client.c:396
 #, c-format
 msgid "error caching certificate: %s\n"
 msgstr "error caching certificate: %s\n"
 
-#: dirmngr/certcache.c:938
+#: dirmngr/certcache.c:939
 #, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "invalid SHA1 fingerprint string ‘%s’\n"
 
-#: dirmngr/certcache.c:1384 dirmngr/certcache.c:1393
+#: dirmngr/certcache.c:1385 dirmngr/certcache.c:1394
 #, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "error fetching certificate by S/N: %s\n"
 
-#: dirmngr/certcache.c:1579 dirmngr/certcache.c:1588
+#: dirmngr/certcache.c:1580 dirmngr/certcache.c:1589
 #, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "error fetching certificate by subject: %s\n"
 
-#: dirmngr/certcache.c:1694 dirmngr/validate.c:483
+#: dirmngr/certcache.c:1695 dirmngr/validate.c:483
 #, c-format
 msgid "no issuer found in certificate\n"
 msgstr "no issuer found in certificate\n"
 
-#: dirmngr/certcache.c:1704
+#: dirmngr/certcache.c:1705
 #, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "error getting authorityKeyIdentifier: %s\n"
@@ -9499,7 +9485,7 @@ msgstr "removing cache file ‘%s’\n"
 msgid "not removing file '%s'\n"
 msgstr "not removing file ‘%s’\n"
 
-#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2380
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2383
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr "error closing cache file: %s\n"
@@ -9729,13 +9715,13 @@ msgid "error getting data from cache file: %s\n"
 msgstr "error getting data from cache file: %s\n"
 
 #: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1672 dirmngr/crlcache.c:1697
-#: dirmngr/crlcache.c:1763
+#: dirmngr/crlcache.c:1766
 #, c-format
 msgid "got an invalid S-expression from libksba\n"
 msgstr "got an invalid S-expression from libksba\n"
 
 #: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1679 dirmngr/crlcache.c:1705
-#: dirmngr/crlcache.c:1770 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1773 dirmngr/misc.c:176
 #, c-format
 msgid "converting S-expression failed: %s\n"
 msgstr "converting S-expression failed: %s\n"
@@ -9750,132 +9736,132 @@ msgstr "unknown hash algorithm ‘%s’\n"
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr "gcry_md_open for algorithm %d failed: %s\n"
 
-#: dirmngr/crlcache.c:1797 dirmngr/ocsp.c:478
+#: dirmngr/crlcache.c:1800 dirmngr/ocsp.c:478
 #, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "creating S-expression failed: %s\n"
 
-#: dirmngr/crlcache.c:1871
+#: dirmngr/crlcache.c:1874
 #, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "ksba_crl_parse failed: %s\n"
 
-#: dirmngr/crlcache.c:1886
+#: dirmngr/crlcache.c:1889
 #, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "error getting update times of CRL: %s\n"
 
-#: dirmngr/crlcache.c:1893
+#: dirmngr/crlcache.c:1896
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr "update times of this CRL: this=%s next=%s\n"
 
-#: dirmngr/crlcache.c:1897
+#: dirmngr/crlcache.c:1900
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr "nextUpdate not given; assuming a validity period of one day\n"
 
-#: dirmngr/crlcache.c:1917
+#: dirmngr/crlcache.c:1920
 #, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "error getting CRL item: %s\n"
 
-#: dirmngr/crlcache.c:1932
+#: dirmngr/crlcache.c:1935
 #, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "error inserting item into temporary cache file: %s\n"
 
-#: dirmngr/crlcache.c:1959
+#: dirmngr/crlcache.c:1962
 #, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "no CRL issuer found in CRL: %s\n"
 
-#: dirmngr/crlcache.c:1974
+#: dirmngr/crlcache.c:1977
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr "locating CRL issuer certificate by authorityKeyIdentifier\n"
 
-#: dirmngr/crlcache.c:2020
+#: dirmngr/crlcache.c:2023
 #, c-format
 msgid "CRL signature verification failed: %s\n"
 msgstr "CRL signature verification failed: %s\n"
 
-#: dirmngr/crlcache.c:2032
+#: dirmngr/crlcache.c:2035
 #, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "error checking validity of CRL issuer certificate: %s\n"
 
-#: dirmngr/crlcache.c:2174
+#: dirmngr/crlcache.c:2177
 #, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "ksba_crl_new failed: %s\n"
 
-#: dirmngr/crlcache.c:2181
+#: dirmngr/crlcache.c:2184
 #, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "ksba_crl_set_reader failed: %s\n"
 
-#: dirmngr/crlcache.c:2215
+#: dirmngr/crlcache.c:2218
 #, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "removed stale temporary cache file ‘%s’\n"
 
-#: dirmngr/crlcache.c:2219
+#: dirmngr/crlcache.c:2222
 #, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "problem removing stale temporary cache file '%s': %s\n"
 
-#: dirmngr/crlcache.c:2229
+#: dirmngr/crlcache.c:2232
 #, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "error creating temporary cache file '%s': %s\n"
 
-#: dirmngr/crlcache.c:2239
+#: dirmngr/crlcache.c:2242
 #, c-format
 msgid "crl_parse_insert failed: %s\n"
 msgstr "crl_parse_insert failed: %s\n"
 
-#: dirmngr/crlcache.c:2249
+#: dirmngr/crlcache.c:2252
 #, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "error finishing temporary cache file '%s': %s\n"
 
-#: dirmngr/crlcache.c:2256
+#: dirmngr/crlcache.c:2259
 #, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "error closing temporary cache file '%s': %s\n"
 
-#: dirmngr/crlcache.c:2281
+#: dirmngr/crlcache.c:2284
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 
-#: dirmngr/crlcache.c:2285
+#: dirmngr/crlcache.c:2288
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr "new CRL still too old; it expired on %s\n"
 
-#: dirmngr/crlcache.c:2301
+#: dirmngr/crlcache.c:2304
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr "unknown critical CRL extension %s\n"
 
-#: dirmngr/crlcache.c:2311
+#: dirmngr/crlcache.c:2314
 #, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "error reading CRL extensions: %s\n"
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2365
 #, c-format
 msgid "creating cache file '%s'\n"
 msgstr "creating cache file ‘%s’\n"
 
-#: dirmngr/crlcache.c:2394
+#: dirmngr/crlcache.c:2397
 #, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "problem renaming ‘%s’ to '%s': %s\n"
 
-#: dirmngr/crlcache.c:2408
+#: dirmngr/crlcache.c:2411
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
@@ -9884,12 +9870,12 @@ msgstr ""
 "updating the DIR file failed - cache entry will get lost with the next "
 "program start\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2448
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr "Begin CRL dump (retrieved via %s)\n"
 
-#: dirmngr/crlcache.c:2468
+#: dirmngr/crlcache.c:2471
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
@@ -9897,55 +9883,55 @@ msgstr ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 
-#: dirmngr/crlcache.c:2471
+#: dirmngr/crlcache.c:2474
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 
-#: dirmngr/crlcache.c:2474
+#: dirmngr/crlcache.c:2477
 msgid " ERROR: The CRL will not be used\n"
 msgstr " ERROR: The CRL will not be used\n"
 
-#: dirmngr/crlcache.c:2481
+#: dirmngr/crlcache.c:2484
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr " ERROR: This cached CRL may have been tampered with!\n"
 
-#: dirmngr/crlcache.c:2499
+#: dirmngr/crlcache.c:2502
 #, c-format
 msgid " WARNING: invalid cache record length\n"
 msgstr " WARNING: invalid cache record length\n"
 
-#: dirmngr/crlcache.c:2506
+#: dirmngr/crlcache.c:2509
 #, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "problem reading cache record: %s\n"
 
-#: dirmngr/crlcache.c:2517
+#: dirmngr/crlcache.c:2520
 #, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "problem reading cache key: %s\n"
 
-#: dirmngr/crlcache.c:2548
+#: dirmngr/crlcache.c:2551
 #, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "error reading cache entry from db: %s\n"
 
-#: dirmngr/crlcache.c:2551
+#: dirmngr/crlcache.c:2554
 msgid "End CRL dump\n"
 msgstr "End CRL dump\n"
 
-#: dirmngr/crlcache.c:2672
+#: dirmngr/crlcache.c:2675
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "crl_fetch via DP failed: %s\n"
 
-#: dirmngr/crlcache.c:2683
+#: dirmngr/crlcache.c:2686
 #, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "crl_cache_insert via DP failed: %s\n"
 
-#: dirmngr/crlcache.c:2743
+#: dirmngr/crlcache.c:2746
 #, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "crl_cache_insert via issuer failed: %s\n"
@@ -9966,7 +9952,7 @@ msgstr "CRL access not possible due to disabled %s\n"
 msgid "error retrieving '%s': %s\n"
 msgstr "error retrieving '%s': %s\n"
 
-#: dirmngr/crlfetch.c:218 dirmngr/ldap-wrapper.c:881 dirmngr/misc.c:573
+#: dirmngr/crlfetch.c:218 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
 #, c-format
 msgid "error initializing reader object: %s\n"
 msgstr "error initializing reader object: %s\n"
@@ -10122,131 +10108,131 @@ msgstr "absolute file name expected\n"
 msgid "looking up '%s'\n"
 msgstr "looking up ‘%s’\n"
 
-#: dirmngr/dirmngr.c:175
+#: dirmngr/dirmngr.c:176
 msgid "list the contents of the CRL cache"
 msgstr "list the contents of the CRL cache"
 
-#: dirmngr/dirmngr.c:176
+#: dirmngr/dirmngr.c:177
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|FILE|load CRL from FILE into cache"
 
-#: dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr.c:178
 msgid "|URL|fetch a CRL from URL"
 msgstr "|URL|fetch a CRL from URL"
 
-#: dirmngr/dirmngr.c:178
+#: dirmngr/dirmngr.c:179
 msgid "shutdown the dirmngr"
 msgstr "shutdown the dirmngr"
 
-#: dirmngr/dirmngr.c:179
+#: dirmngr/dirmngr.c:180
 msgid "flush the cache"
 msgstr "flush the cache"
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:213
 msgid "allow online software version check"
 msgstr "allow online software version check"
 
-#: dirmngr/dirmngr.c:215
+#: dirmngr/dirmngr.c:216
 msgid "|N|do not return more than N items in one query"
 msgstr "|N|do not return more than N items in one query"
 
-#: dirmngr/dirmngr.c:221
+#: dirmngr/dirmngr.c:222
 msgid "Network related options"
 msgstr "Network related options"
 
-#: dirmngr/dirmngr.c:223
+#: dirmngr/dirmngr.c:224
 msgid "route all network traffic via Tor"
 msgstr "route all network traffic via Tor"
 
-#: dirmngr/dirmngr.c:235
+#: dirmngr/dirmngr.c:236
 msgid "Configuration for Keyservers"
 msgstr "Configuration for Keyservers"
 
-#: dirmngr/dirmngr.c:238
+#: dirmngr/dirmngr.c:239
 msgid "|URL|use keyserver at URL"
 msgstr "|URL|use keyserver at URL"
 
-#: dirmngr/dirmngr.c:240
+#: dirmngr/dirmngr.c:241
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr "|FILE|use the CA certificates in FILE for HKP over TLS"
 
-#: dirmngr/dirmngr.c:242
+#: dirmngr/dirmngr.c:243
 msgid "Configuration for HTTP servers"
 msgstr "Configuration for HTTP servers"
 
-#: dirmngr/dirmngr.c:244
+#: dirmngr/dirmngr.c:245
 msgid "inhibit the use of HTTP"
 msgstr "inhibit the use of HTTP"
 
-#: dirmngr/dirmngr.c:246
+#: dirmngr/dirmngr.c:247
 msgid "ignore HTTP CRL distribution points"
 msgstr "ignore HTTP CRL distribution points"
 
-#: dirmngr/dirmngr.c:248
+#: dirmngr/dirmngr.c:249
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr "|URL|redirect all HTTP requests to URL"
 
-#: dirmngr/dirmngr.c:250
+#: dirmngr/dirmngr.c:251
 msgid "use system's HTTP proxy setting"
 msgstr "use system's HTTP proxy setting"
 
-#: dirmngr/dirmngr.c:254
+#: dirmngr/dirmngr.c:255
 msgid "Configuration of LDAP servers to use"
 msgstr "Configuration of LDAP servers to use"
 
-#: dirmngr/dirmngr.c:256
+#: dirmngr/dirmngr.c:257
 msgid "inhibit the use of LDAP"
 msgstr "inhibit the use of LDAP"
 
-#: dirmngr/dirmngr.c:258
+#: dirmngr/dirmngr.c:259
 msgid "ignore LDAP CRL distribution points"
 msgstr "ignore LDAP CRL distribution points"
 
-#: dirmngr/dirmngr.c:260
+#: dirmngr/dirmngr.c:261
 msgid "|HOST|use HOST for LDAP queries"
 msgstr "|HOST|use HOST for LDAP queries"
 
-#: dirmngr/dirmngr.c:262
+#: dirmngr/dirmngr.c:263
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr "do not use fallback hosts with --ldap-proxy"
 
-#: dirmngr/dirmngr.c:264
+#: dirmngr/dirmngr.c:267
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FILE|read LDAP server list from FILE"
 
-#: dirmngr/dirmngr.c:266
+#: dirmngr/dirmngr.c:269
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr "add new servers discovered in CRL distribution points to serverlist"
 
-#: dirmngr/dirmngr.c:269 dirmngr/dirmngr_ldap.c:104
+#: dirmngr/dirmngr.c:272
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|set LDAP timeout to N seconds"
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:275
 msgid "Configuration for OCSP"
 msgstr "Configuration for OCSP"
 
-#: dirmngr/dirmngr.c:274
+#: dirmngr/dirmngr.c:277
 msgid "allow sending OCSP requests"
 msgstr "allow sending OCSP requests"
 
-#: dirmngr/dirmngr.c:276
+#: dirmngr/dirmngr.c:279
 msgid "ignore certificate contained OCSP service URLs"
 msgstr "ignore certificate contained OCSP service URLs"
 
-#: dirmngr/dirmngr.c:278
+#: dirmngr/dirmngr.c:281
 msgid "|URL|use OCSP responder at URL"
 msgstr "|URL|use OCSP responder at URL"
 
-#: dirmngr/dirmngr.c:280
+#: dirmngr/dirmngr.c:283
 msgid "|FPR|OCSP response signed by FPR"
 msgstr "|FPR|OCSP response signed by FPR"
 
-#: dirmngr/dirmngr.c:288
+#: dirmngr/dirmngr.c:291
 msgid "force loading of outdated CRLs"
 msgstr "force loading of outdated CRLs"
 
-#: dirmngr/dirmngr.c:299
+#: dirmngr/dirmngr.c:302
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
@@ -10255,11 +10241,11 @@ msgstr ""
 "@\n"
 "(See the “info� manual for a complete listing of all commands and options)\n"
 
-#: dirmngr/dirmngr.c:441
+#: dirmngr/dirmngr.c:449
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Usage: @DIRMNGR@ [options] (-h for help)"
 
-#: dirmngr/dirmngr.c:443
+#: dirmngr/dirmngr.c:451
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@ -10267,283 +10253,103 @@ msgstr ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
 
-#: dirmngr/dirmngr.c:523
+#: dirmngr/dirmngr.c:531
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr "valid debug levels are: %s\n"
 
-#: dirmngr/dirmngr.c:609 tools/gpgconf.c:667 tools/gpgconf.c:702
-#: tools/gpgconf.c:802
+#: dirmngr/dirmngr.c:617 tools/gpgconf.c:701 tools/gpgconf.c:736
+#: tools/gpgconf.c:836
 #, c-format
 msgid "usage: %s [options] "
 msgstr "usage: %s [options] "
 
-#: dirmngr/dirmngr.c:1260
+#: dirmngr/dirmngr.c:1299
 #, 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:1495 dirmngr/server.c:1824
+#: dirmngr/dirmngr.c:1534 dirmngr/server.c:1878
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "fetching CRL from ‘%s’ failed: %s\n"
 
-#: dirmngr/dirmngr.c:1501 dirmngr/server.c:1830
+#: dirmngr/dirmngr.c:1540 dirmngr/server.c:1884
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "processing CRL from ‘%s’ failed: %s\n"
 
-#: dirmngr/dirmngr.c:1643
+#: dirmngr/dirmngr.c:1682
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: line too long - skipped\n"
 
-#: dirmngr/dirmngr.c:1698 dirmngr/dirmngr.c:1782
+#: dirmngr/dirmngr.c:1737 dirmngr/dirmngr.c:1821
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: invalid fingerprint detected\n"
 
-#: dirmngr/dirmngr.c:1734 dirmngr/dirmngr.c:1760 tools/gpgconf-comp.c:3539
+#: dirmngr/dirmngr.c:1773 dirmngr/dirmngr.c:1799 tools/gpgconf-comp.c:3549
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: read error: %s\n"
 
-#: dirmngr/dirmngr.c:1789
+#: dirmngr/dirmngr.c:1828
 #, 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:1876
+#: dirmngr/dirmngr.c:1915
 #, 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:1917
+#: dirmngr/dirmngr.c:1956
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "SIGUSR2 received - no action defined\n"
 
-#: dirmngr/dirmngr.c:1922
+#: dirmngr/dirmngr.c:1961
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "SIGTERM received - shutting down ...\n"
 
-#: dirmngr/dirmngr.c:1924
+#: dirmngr/dirmngr.c:1963
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "SIGTERM received - still %d active connections\n"
 
-#: dirmngr/dirmngr.c:1929
+#: dirmngr/dirmngr.c:1968
 #, c-format
 msgid "shutdown forced\n"
 msgstr "shutdown forced\n"
 
-#: dirmngr/dirmngr.c:1937
+#: dirmngr/dirmngr.c:1976
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "SIGINT received - immediate shutdown\n"
 
-#: dirmngr/dirmngr.c:1944
+#: dirmngr/dirmngr.c:1983
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "signal %d received - no action defined\n"
 
-#: dirmngr/dirmngr_ldap.c:105
-msgid "return all values in a record oriented format"
-msgstr "return all values in a record oriented format"
-
-#: dirmngr/dirmngr_ldap.c:108
-msgid "|NAME|ignore host part and connect through NAME"
-msgstr "|NAME|ignore host part and connect through NAME"
-
-#: dirmngr/dirmngr_ldap.c:109
-msgid "force a TLS connection"
-msgstr "force a TLS connection"
-
-#: dirmngr/dirmngr_ldap.c:110
-msgid "|NAME|connect to host NAME"
-msgstr "|NAME|connect to host NAME"
-
-#: dirmngr/dirmngr_ldap.c:111
-msgid "|N|connect to port N"
-msgstr "|N|connect to port N"
-
-#: dirmngr/dirmngr_ldap.c:112
-msgid "|NAME|use user NAME for authentication"
-msgstr "|NAME|use user NAME for authentication"
-
-#: dirmngr/dirmngr_ldap.c:113
-msgid "|PASS|use password PASS for authentication"
-msgstr "|PASS|use password PASS for authentication"
-
-#: dirmngr/dirmngr_ldap.c:115
-msgid "take password from $DIRMNGR_LDAP_PASS"
-msgstr "take password from $DIRMNGR_LDAP_PASS"
-
-#: dirmngr/dirmngr_ldap.c:116
-msgid "|STRING|query DN STRING"
-msgstr "|STRING|query DN STRING"
-
-#: dirmngr/dirmngr_ldap.c:117
-msgid "|STRING|use STRING as filter expression"
-msgstr "|STRING|use STRING as filter expression"
-
-#: dirmngr/dirmngr_ldap.c:118
-msgid "|STRING|return the attribute STRING"
-msgstr "|STRING|return the attribute STRING"
-
-#: dirmngr/dirmngr_ldap.c:179
-msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
-msgstr "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
-
-#: dirmngr/dirmngr_ldap.c:182
-msgid ""
-"Syntax: dirmngr_ldap [options] [URL]\n"
-"Internal LDAP helper for Dirmngr\n"
-"Interface and options may change without notice\n"
-msgstr ""
-"Syntax: dirmngr_ldap [options] [URL]\n"
-"Internal LDAP helper for Dirmngr\n"
-"Interface and options may change without notice\n"
-
-#: dirmngr/dirmngr_ldap.c:291
-#, c-format
-msgid "invalid port number %d\n"
-msgstr "invalid port number %d\n"
-
-#: dirmngr/dirmngr_ldap.c:400
-#, c-format
-msgid "scanning result for attribute '%s'\n"
-msgstr "scanning result for attribute ‘%s’\n"
-
-#: dirmngr/dirmngr_ldap.c:407 dirmngr/dirmngr_ldap.c:490
-#: dirmngr/dirmngr_ldap.c:514 dirmngr/dirmngr_ldap.c:526
-#: dirmngr/dirmngr_ldap.c:722
-#, c-format
-msgid "error writing to stdout: %s\n"
-msgstr "error writing to stdout: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:424
-#, c-format
-msgid "          available attribute '%s'\n"
-msgstr "          available attribute ‘%s’\n"
-
-#: dirmngr/dirmngr_ldap.c:462
-#, c-format
-msgid "attribute '%s' not found\n"
-msgstr "attribute ‘%s’ not found\n"
-
-#: dirmngr/dirmngr_ldap.c:469
-#, c-format
-msgid "found attribute '%s'\n"
-msgstr "found attribute ‘%s’\n"
-
-#: dirmngr/dirmngr_ldap.c:581
-#, c-format
-msgid "processing url '%s'\n"
-msgstr "processing url ‘%s’\n"
-
-#: dirmngr/dirmngr_ldap.c:588
-#, c-format
-msgid "          user '%s'\n"
-msgstr "          user ‘%s’\n"
-
-#: dirmngr/dirmngr_ldap.c:590
-#, c-format
-msgid "          pass '%s'\n"
-msgstr "          pass ‘%s’\n"
-
-#: dirmngr/dirmngr_ldap.c:592
-#, c-format
-msgid "          host '%s'\n"
-msgstr "          host ‘%s’\n"
-
-#: dirmngr/dirmngr_ldap.c:593
-#, c-format
-msgid "          port %d\n"
-msgstr "          port %d\n"
-
-#: dirmngr/dirmngr_ldap.c:595
-#, c-format
-msgid "            DN '%s'\n"
-msgstr "            DN ‘%s’\n"
-
-#: dirmngr/dirmngr_ldap.c:597
-#, c-format
-msgid "        filter '%s'\n"
-msgstr "        filter ‘%s’\n"
-
-#: dirmngr/dirmngr_ldap.c:602 dirmngr/dirmngr_ldap.c:605
-#, c-format
-msgid "          attr '%s'\n"
-msgstr "          attr ‘%s’\n"
-
-#: dirmngr/dirmngr_ldap.c:611
-#, c-format
-msgid "no host name in '%s'\n"
-msgstr "no host name in ‘%s’\n"
-
-#: dirmngr/dirmngr_ldap.c:616
-#, c-format
-msgid "no attribute given for query '%s'\n"
-msgstr "no attribute given for query ‘%s’\n"
-
-#: dirmngr/dirmngr_ldap.c:622
-#, c-format
-msgid "WARNING: using first attribute only\n"
-msgstr "WARNING: using first attribute only\n"
-
-#: dirmngr/dirmngr_ldap.c:637 dirmngr/dirmngr_ldap.c:678
-#, c-format
-msgid "LDAP init to '%s:%d' failed: %s\n"
-msgstr "LDAP init to ‘%s:%d’ failed: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:659
-#, c-format
-msgid "LDAP init to '%s' failed: %s\n"
-msgstr "LDAP init to ‘%s’ failed: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:665
-#, c-format
-msgid "LDAP init to '%s' done\n"
-msgstr "LDAP init to ‘%s’ done\n"
-
-#: dirmngr/dirmngr_ldap.c:704
-#, c-format
-msgid "binding to '%s:%d' failed: %s\n"
-msgstr "binding to ‘%s:%d’ failed: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:728
-#, c-format
-msgid "searching '%s' failed: %s\n"
-msgstr "searching ‘%s’ failed: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:759
-#, c-format
-msgid "'%s' is not an LDAP URL\n"
-msgstr "‘%s’ is not an LDAP URL\n"
-
-#: dirmngr/dirmngr_ldap.c:765
-#, c-format
-msgid "'%s' is an invalid LDAP URL\n"
-msgstr "‘%s’ is an invalid LDAP URL\n"
-
-#: dirmngr/http.c:1989 dirmngr/ocsp.c:255
+#: dirmngr/http.c:1998 dirmngr/ocsp.c:255
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "error accessing '%s': http status %u\n"
 
-#: dirmngr/http.c:3630 dirmngr/ocsp.c:229
+#: dirmngr/http.c:3652 dirmngr/ocsp.c:229
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr "URL ‘%s’ redirected to ‘%s’ (%u)\n"
 
-#: dirmngr/http.c:3636 dirmngr/ocsp.c:246
+#: dirmngr/http.c:3658 dirmngr/ocsp.c:246
 #, c-format
 msgid "too many redirections\n"
 msgstr "too many redirections\n"
 
-#: dirmngr/http.c:3748
+#: dirmngr/http.c:3768
 #, c-format
 msgid "redirection changed to '%s'\n"
 msgstr "redirection changed to ‘%s’\n"
@@ -10583,31 +10389,51 @@ msgstr "waiting for ldap wrapper %d failed: %s\n"
 msgid "ldap wrapper %d stalled - killing\n"
 msgstr "ldap wrapper %d stalled - killing\n"
 
-#: dirmngr/ldap.c:91
+#: dirmngr/ldap.c:92
 #, c-format
 msgid "invalid char 0x%02x in host name - not added\n"
 msgstr "invalid char 0x%02x in host name - not added\n"
 
-#: dirmngr/ldap.c:95
+#: dirmngr/ldap.c:96
 #, c-format
 msgid "adding '%s:%d' to the ldap server list\n"
 msgstr "adding ‘%s:%d’ to the ldap server list\n"
 
-#: dirmngr/ldap.c:98 dirmngr/misc.c:512
+#: dirmngr/ldap.c:99 dirmngr/misc.c:512
 #, c-format
 msgid "malloc failed: %s\n"
 msgstr "malloc failed: %s\n"
 
-#: dirmngr/ldap.c:634
+#: dirmngr/ldap.c:221
+#, c-format
+msgid "'%s' is not an LDAP URL\n"
+msgstr "‘%s’ is not an LDAP URL\n"
+
+#: dirmngr/ldap.c:227 dirmngr/ldap.c:233
 #, c-format
-msgid "start_cert_fetch: invalid pattern '%s'\n"
-msgstr "start_cert_fetch: invalid pattern ‘%s’\n"
+msgid "'%s' is an invalid LDAP URL\n"
+msgstr "‘%s’ is an invalid LDAP URL\n"
 
-#: dirmngr/ldap.c:846
+#: dirmngr/ldap.c:968
 #, c-format
 msgid "ldap_search hit the size limit of the server\n"
 msgstr "ldap_search hit the size limit of the server\n"
 
+#: dirmngr/ldapserver.c:119
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr "%s:%u: password given without user\n"
+
+#: dirmngr/ldapserver.c:181
+#, c-format
+msgid "%s:%u: ignoring unknown flag '%s'\n"
+msgstr "%s:%u: ignoring unknown flag ‘%s’\n"
+
+#: dirmngr/ldapserver.c:203
+#, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr "%s:%u: skipping this line\n"
+
 #: dirmngr/misc.c:172
 #, c-format
 msgid "invalid canonical S-expression found\n"
@@ -10698,86 +10524,86 @@ msgstr "not signed by a default OCSP signer's certificate"
 msgid "allocating list item failed: %s\n"
 msgstr "allocating list item failed: %s\n"
 
-#: dirmngr/ocsp.c:537 dirmngr/ocsp.c:724
+#: dirmngr/ocsp.c:538 dirmngr/ocsp.c:725
 #, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "error getting responder ID: %s\n"
 
-#: dirmngr/ocsp.c:584
+#: dirmngr/ocsp.c:585
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr "no suitable certificate found to verify the OCSP response\n"
 
-#: dirmngr/ocsp.c:623 dirmngr/validate.c:648
+#: dirmngr/ocsp.c:624 dirmngr/validate.c:648
 #, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "issuer certificate not found: %s\n"
 
-#: dirmngr/ocsp.c:633
+#: dirmngr/ocsp.c:634
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr "caller did not return the target certificate\n"
 
-#: dirmngr/ocsp.c:640
+#: dirmngr/ocsp.c:641
 #, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "caller did not return the issuing certificate\n"
 
-#: dirmngr/ocsp.c:650
+#: dirmngr/ocsp.c:651
 #, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "failed to allocate OCSP context: %s\n"
 
-#: dirmngr/ocsp.c:689
+#: dirmngr/ocsp.c:690
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr "no default OCSP responder defined\n"
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:696
 #, c-format
 msgid "no default OCSP signer defined\n"
 msgstr "no default OCSP signer defined\n"
 
-#: dirmngr/ocsp.c:702
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr "using default OCSP responder ‘%s’\n"
 
-#: dirmngr/ocsp.c:707
+#: dirmngr/ocsp.c:708
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "using OCSP responder ‘%s’\n"
 
-#: dirmngr/ocsp.c:764
+#: dirmngr/ocsp.c:765
 #, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "error getting OCSP status for target certificate: %s\n"
 
-#: dirmngr/ocsp.c:789
+#: dirmngr/ocsp.c:790
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr "certificate status is: %s  (this=%s  next=%s)\n"
 
-#: dirmngr/ocsp.c:790
+#: dirmngr/ocsp.c:791
 msgid "good"
 msgstr "good"
 
-#: dirmngr/ocsp.c:796
+#: dirmngr/ocsp.c:797
 #, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "certificate has been revoked at: %s due to: %s\n"
 
-#: dirmngr/ocsp.c:831
+#: dirmngr/ocsp.c:832
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr "OCSP responder returned a status in the future\n"
 
-#: dirmngr/ocsp.c:843
+#: dirmngr/ocsp.c:844
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr "OCSP responder returned a non-current status\n"
 
-#: dirmngr/ocsp.c:858
+#: dirmngr/ocsp.c:859
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr "OCSP responder returned an too old status\n"
@@ -10787,71 +10613,67 @@ msgstr "OCSP responder returned an too old status\n"
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "assuan_inquire(%s) failed: %s\n"
 
-#: dirmngr/server.c:1158
-msgid "ldapserver missing"
-msgstr "ldapserver missing"
-
-#: dirmngr/server.c:1224
+#: dirmngr/server.c:1277
 msgid "serialno missing in cert ID"
 msgstr "serialno missing in cert ID"
 
-#: dirmngr/server.c:1387 dirmngr/server.c:1473 dirmngr/server.c:1909
-#: dirmngr/server.c:1980 dirmngr/server.c:2556 dirmngr/server.c:2571
+#: dirmngr/server.c:1440 dirmngr/server.c:1526 dirmngr/server.c:1963
+#: dirmngr/server.c:2034 dirmngr/server.c:2662 dirmngr/server.c:2677
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "assuan_inquire failed: %s\n"
 
-#: dirmngr/server.c:1516
+#: dirmngr/server.c:1569
 #, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "fetch_cert_by_url failed: %s\n"
 
-#: dirmngr/server.c:1528 dirmngr/server.c:1559 dirmngr/server.c:1718
+#: dirmngr/server.c:1581 dirmngr/server.c:1612 dirmngr/server.c:1772
 #, c-format
 msgid "error sending data: %s\n"
 msgstr "error sending data: %s\n"
 
-#: dirmngr/server.c:1666
+#: dirmngr/server.c:1720
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "start_cert_fetch failed: %s\n"
 
-#: dirmngr/server.c:1699
+#: dirmngr/server.c:1753
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "fetch_next_cert failed: %s\n"
 
-#: dirmngr/server.c:1726
+#: dirmngr/server.c:1780
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr "max_replies %d exceeded\n"
 
-#: dirmngr/server.c:2860
+#: dirmngr/server.c:2966
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "can't allocate control structure: %s\n"
 
-#: dirmngr/server.c:2871
+#: dirmngr/server.c:2977
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "failed to allocate assuan context: %s\n"
 
-#: dirmngr/server.c:2892
+#: dirmngr/server.c:2998
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "failed to initialize the server: %s\n"
 
-#: dirmngr/server.c:2900
+#: dirmngr/server.c:3006
 #, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "failed to the register commands with Assuan: %s\n"
 
-#: dirmngr/server.c:2933
+#: dirmngr/server.c:3039
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "Assuan accept problem: %s\n"
 
-#: dirmngr/server.c:2952
+#: dirmngr/server.c:3058
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "Assuan processing failed: %s\n"
@@ -10996,67 +10818,67 @@ msgstr "no keybox daemon running in this session\n"
 msgid "error sending standard options: %s\n"
 msgstr "error sending standard options: %s\n"
 
-#: tools/gpgconf-comp.c:649
+#: tools/gpgconf-comp.c:655
 msgid "OpenPGP"
 msgstr "OpenPGP"
 
-#: tools/gpgconf-comp.c:653
+#: tools/gpgconf-comp.c:659
 msgid "S/MIME"
 msgstr "S/MIME"
 
-#: tools/gpgconf-comp.c:657
+#: tools/gpgconf-comp.c:663
 msgid "Public Keys"
 msgstr "Public Keys"
 
-#: tools/gpgconf-comp.c:661
+#: tools/gpgconf-comp.c:667
 msgid "Private Keys"
 msgstr "Private Keys"
 
-#: tools/gpgconf-comp.c:665
+#: tools/gpgconf-comp.c:671
 msgid "Smartcards"
 msgstr "Smartcards"
 
-#: tools/gpgconf-comp.c:669
+#: tools/gpgconf-comp.c:676
 msgid "TPM"
 msgstr "TPM"
 
-#: tools/gpgconf-comp.c:673
+#: tools/gpgconf-comp.c:681
 msgid "Network"
 msgstr "Network"
 
-#: tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:685
 msgid "Passphrase Entry"
 msgstr "Passphrase Entry"
 
-#: tools/gpgconf-comp.c:941
+#: tools/gpgconf-comp.c:951
 msgid "Component not suitable for launching"
 msgstr "Component not suitable for launching"
 
-#: tools/gpgconf-comp.c:947
+#: tools/gpgconf-comp.c:957
 #, c-format
 msgid "Configuration file of component %s is broken\n"
 msgstr "Configuration file of component %s is broken\n"
 
-#: tools/gpgconf-comp.c:950
+#: tools/gpgconf-comp.c:960
 #, c-format
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr "Note: Use the command “%s%s� to get details.\n"
 
-#: tools/gpgconf-comp.c:2816
+#: tools/gpgconf-comp.c:2826
 #, c-format
 msgid "External verification of component %s failed"
 msgstr "External verification of component %s failed"
 
-#: tools/gpgconf-comp.c:2946
+#: tools/gpgconf-comp.c:2956
 msgid "Note that group specifications are ignored\n"
 msgstr "Note that group specifications are ignored\n"
 
-#: tools/gpgconf-comp.c:3543
+#: tools/gpgconf-comp.c:3553
 #, c-format
 msgid "error closing '%s'\n"
 msgstr "error closing ‘%s’\n"
 
-#: tools/gpgconf-comp.c:3545
+#: tools/gpgconf-comp.c:3555
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr "error parsing ‘%s’\n"
@@ -11137,15 +10959,15 @@ msgstr ""
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
 
-#: tools/gpgconf.c:669 tools/gpgconf.c:704
+#: tools/gpgconf.c:703 tools/gpgconf.c:738
 msgid "Need one component argument"
 msgstr "Need one component argument"
 
-#: tools/gpgconf.c:678 tools/gpgconf.c:728 tools/gpgconf.c:778
+#: tools/gpgconf.c:712 tools/gpgconf.c:762 tools/gpgconf.c:812
 msgid "Component not found"
 msgstr "Component not found"
 
-#: tools/gpgconf.c:804
+#: tools/gpgconf.c:838
 msgid "No argument allowed"
 msgstr "No argument allowed"
 
@@ -11161,33 +10983,33 @@ msgstr ""
 "Syntax: gpg-check-pattern [options] patternfile\n"
 "Check a passphrase given on stdin against the patternfile\n"
 
-#: tools/gpg-card.c:2390
+#: tools/gpg-card.c:2407
 #, c-format
 msgid "Note: key %s is already stored on the card!\n"
 msgstr "Note: key %s is already stored on the card!\n"
 
-#: tools/gpg-card.c:2393
+#: tools/gpg-card.c:2410
 #, c-format
 msgid "Note: Keys are already stored on the card!\n"
 msgstr "Note: Keys are already stored on the card!\n"
 
-#: tools/gpg-card.c:2396
+#: tools/gpg-card.c:2413
 #, c-format
 msgid "Replace existing key %s ? (y/N) "
 msgstr "Replace existing key %s ? (y/N) "
 
-#: tools/gpg-card.c:2549 tools/gpg-card.c:2712 tools/gpg-card.c:2935
-#: tools/gpg-card.c:3044
+#: tools/gpg-card.c:2566 tools/gpg-card.c:2729 tools/gpg-card.c:2952
+#: tools/gpg-card.c:3061
 #, c-format
 msgid "%s card no. %s detected\n"
 msgstr "%s card no. %s detected\n"
 
-#: tools/gpg-card.c:3396
+#: tools/gpg-card.c:3413
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr "User Interaction Flag is set to “%s� - can't change\n"
 
-#: tools/gpg-card.c:3406 tools/gpg-card.c:3420
+#: tools/gpg-card.c:3423 tools/gpg-card.c:3437
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
@@ -11196,43 +11018,43 @@ msgstr ""
 "Warning: Setting the User Interaction Flag to “%s�\n"
 "         can only be reverted using a factory reset!\n"
 
-#: tools/gpg-card.c:3423
+#: tools/gpg-card.c:3440
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr "Please use “uif --yes %d %s�\n"
 
-#: tools/gpg-card.c:3669
+#: tools/gpg-card.c:3686
 msgid "authenticate to the card"
 msgstr "authenticate to the card"
 
-#: tools/gpg-card.c:3671
+#: tools/gpg-card.c:3688
 msgid "send a reset to the card daemon"
 msgstr "send a reset to the card daemon"
 
-#: tools/gpg-card.c:3673
+#: tools/gpg-card.c:3690
 msgid "setup KDF for PIN authentication"
 msgstr "setup KDF for PIN authentication"
 
-#: tools/gpg-card.c:3675
+#: tools/gpg-card.c:3692
 msgid "change a private data object"
 msgstr "change a private data object"
 
-#: tools/gpg-card.c:3676
+#: tools/gpg-card.c:3693
 msgid "read a certificate from a data object"
 msgstr "read a certificate from a data object"
 
-#: tools/gpg-card.c:3677
+#: tools/gpg-card.c:3694
 msgid "store a certificate to a data object"
 msgstr "store a certificate to a data object"
 
-#: tools/gpg-card.c:3678
+#: tools/gpg-card.c:3695
 msgid "store a private key to a data object"
 msgstr "store a private key to a data object"
 
-#: tools/gpg-card.c:3679
+#: tools/gpg-card.c:3696
 msgid "Yubikey management commands"
 msgstr "Yubikey management commands"
 
-#: tools/gpg-card.c:3681
+#: tools/gpg-card.c:3698
 msgid "manage the command history"
 msgstr "manage the command history"
diff --git a/po/eo.po b/po/eo.po
index 6eea738..1f4f924 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: 2021-04-20 12:38+0200\n"
+"POT-Creation-Date: 2021-08-24 18:50+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:328
+#: agent/call-pinentry.c:338
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
@@ -28,49 +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:546
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_OK"
 msgstr ""
 
-#: agent/call-pinentry.c:547
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
-#: agent/call-pinentry.c:548
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|_Yes"
 msgstr ""
 
-#: agent/call-pinentry.c:549
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_No"
 msgstr ""
 
-#: agent/call-pinentry.c:550
+#: agent/call-pinentry.c:560
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:551
+#: agent/call-pinentry.c:561
 msgid "|pinentry-label|_Save in password manager"
 msgstr ""
 
-#: agent/call-pinentry.c:552
+#: agent/call-pinentry.c:562
 #, 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:554
+#: agent/call-pinentry.c:564
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:555
+#: agent/call-pinentry.c:565
 #, fuzzy
 #| msgid "invalid passphrase"
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "nevalida pasfrazo"
 
+#: agent/call-pinentry.c:566
+msgid "Caps Lock is on"
+msgstr ""
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:944
+#: agent/call-pinentry.c:1022
 msgid "Suggest"
 msgstr ""
 
@@ -81,13 +85,25 @@ 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:966
+#: agent/call-pinentry.c:1044
 msgid "pinentry.genpin.tooltip"
 msgstr ""
 
+#: agent/call-pinentry.c:1072
+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
+#, 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:998
+#: agent/call-pinentry.c:1198
 msgid "Quality:"
 msgstr ""
 
@@ -97,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:1019
+#: agent/call-pinentry.c:1219
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:1263
+#: agent/call-pinentry.c:1477
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:1266
+#: agent/call-pinentry.c:1480
 #, 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:1303 agent/call-pinentry.c:1506
+#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1303 agent/call-pinentry.c:1506
-#: agent/protect-tool.c:728
+#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/protect-tool.c:729
 #, fuzzy
 msgid "Passphrase:"
 msgstr "malbona pasfrazo"
 
-#: agent/call-pinentry.c:1330 agent/call-pinentry.c:1580 agent/command.c:1799
-#: agent/command.c:1852 agent/command-ssh.c:3046 agent/genkey.c:398
+#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
+#: agent/command.c:1988 agent/command-ssh.c:3046 agent/genkey.c:442
 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:1351 agent/call-pinentry.c:1603
+#: agent/call-pinentry.c:1566 agent/call-pinentry.c:1830
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:1362 agent/call-pinentry.c:1614
+#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
 msgid "Repeat:"
 msgstr ""
 
-#: agent/call-pinentry.c:1372 agent/call-pinentry.c:1384
-#: agent/call-pinentry.c:1624 agent/call-pinentry.c:1636
+#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
+#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
 #, fuzzy
 msgid "PIN too long"
 msgstr "pasfrazo estas tro longa\n"
 
-#: agent/call-pinentry.c:1373 agent/call-pinentry.c:1625
+#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "pasfrazo estas tro longa\n"
 
-#: agent/call-pinentry.c:1381 agent/call-pinentry.c:1633
+#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Nevalida signo en nomo\n"
 
-#: agent/call-pinentry.c:1386 agent/call-pinentry.c:1638
+#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:1405 agent/call-pinentry.c:1656
+#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
 #, fuzzy
 msgid "Bad PIN"
 msgstr "malbona MPI"
 
-#: agent/call-pinentry.c:1405 agent/call-pinentry.c:1656
+#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "malbona pasfrazo"
 
-#: agent/command.c:697
+#: agent/command.c:823
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:698
+#: agent/command.c:824
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1106 g10/card-util.c:708 g10/card-util.c:729
+#: agent/command.c:1235 g10/card-util.c:713 g10/card-util.c:734
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: agent/command.c:1634 agent/command.c:1791 agent/command-ssh.c:2974
-#: agent/genkey.c:333
+#: agent/command.c:1756 agent/command.c:1921 agent/command-ssh.c:2974
+#: agent/genkey.c:377
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "�an�i la pasfrazon"
 
-#: agent/command.c:2567
+#: agent/command.c:2703
 #, 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:2697
+#: agent/command.c:2833
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -208,26 +224,26 @@ msgstr ""
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "protekto-metodo %d%s ne estas realigita\n"
 
-#: agent/command-ssh.c:872 common/dotlock.c:852 g10/card-util.c:953
-#: g10/export.c:1329 g10/gpg.c:1431 g10/keygen.c:5347 g10/keyring.c:1319
-#: g10/keyring.c:1632 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
+#: agent/command-ssh.c:872 common/dotlock.c:852 g10/card-util.c:963
+#: g10/export.c:1329 g10/gpg.c:1431 g10/keygen.c:5377 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
 #: g10/sign.c:1106 g10/sign.c:1443 g10/tdbio.c:753 tools/gpg-card.c:479
 #, fuzzy, c-format
 #| msgid "can't create `%s': %s\n"
 msgid "can't create '%s': %s\n"
 msgstr "ne povas krei '%s': %s\n"
 
-#: agent/command-ssh.c:884 common/helpfile.c:57 g10/card-util.c:910
+#: agent/command-ssh.c:884 common/helpfile.c:57 g10/card-util.c:920
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
 #: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:721 g10/gpg.c:1432
-#: g10/import.c:371 g10/import.c:558 g10/import.c:793 g10/keygen.c:4322
-#: g10/keyring.c:1658 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
+#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4326
+#: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
 #: g10/plaintext.c:610 g10/sign.c:1086 g10/sign.c:1311 g10/sign.c:1424
 #: g10/sign.c:1596 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2380
-#: sm/gpgsm.c:2410 sm/gpgsm.c:2448 sm/keylist.c:1737 sm/qualified.c:65
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2236
+#: sm/gpgsm.c:2266 sm/gpgsm.c:2304 sm/keylist.c:1775 sm/qualified.c:65
 #: dirmngr/certcache.c:396 dirmngr/certcache.c:476 dirmngr/certcache.c:478
-#: dirmngr/crlcache.c:2588 dirmngr/dirmngr.c:1720 tools/gpg-card.c:408
+#: dirmngr/crlcache.c:2591 dirmngr/dirmngr.c:1759 tools/gpg-card.c:408
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
@@ -337,39 +353,39 @@ msgstr "la pasfrazo ne estis �uste ripetita; provu denove"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:109 sm/certreqgen-ui.c:433
+#: 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:116
+#: agent/genkey.c:150
 #, fuzzy, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "skribas al '%s'\n"
 
-#: agent/genkey.c:154
+#: agent/genkey.c:191
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Donu pasfrazon\n"
 
-#: agent/genkey.c:184
+#: agent/genkey.c:227
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:186
+#: agent/genkey.c:229
 #, 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:198
+#: agent/genkey.c:241
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:215
+#: agent/genkey.c:258
 #, fuzzy, c-format
 #| msgid "Name must be at least 5 characters long\n"
 msgid "A passphrase should be at least %u character long."
@@ -377,7 +393,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:234
+#: agent/genkey.c:277
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -385,385 +401,384 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:260
+#: agent/genkey.c:304
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:275
+#: agent/genkey.c:319
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
-#: agent/genkey.c:296
+#: agent/genkey.c:340
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "Ĉu tamen uzi ĉi tiun �losilon? "
 
-#: agent/genkey.c:464
+#: agent/genkey.c:508
 #, 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:590
+#: agent/genkey.c:637
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "�an�i la pasfrazon"
 
-#: agent/gpg-agent.c:162 scd/scdaemon.c:115 dirmngr/dirmngr.c:182
+#: agent/gpg-agent.c:164 scd/scdaemon.c:115 dirmngr/dirmngr.c:183
 msgid "Options used for startup"
 msgstr ""
 
-#: agent/gpg-agent.c:164 scd/scdaemon.c:120 dirmngr/dirmngr.c:171
+#: agent/gpg-agent.c:166 scd/scdaemon.c:120 dirmngr/dirmngr.c:172
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:117 dirmngr/dirmngr.c:170
+#: agent/gpg-agent.c:167 scd/scdaemon.c:117 dirmngr/dirmngr.c:171
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:167 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:169 dirmngr/dirmngr.c:174
 #, fuzzy
 #| msgid "Key is superseded"
 msgid "run in supervised mode"
 msgstr "Åœlosilo estas anstataÅ­igita."
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:121 dirmngr/dirmngr.c:184
+#: agent/gpg-agent.c:171 scd/scdaemon.c:121 dirmngr/dirmngr.c:185
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:170 scd/scdaemon.c:122 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:172 scd/scdaemon.c:122 dirmngr/dirmngr.c:186
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:171 scd/scdaemon.c:123 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:173 scd/scdaemon.c:123 dirmngr/dirmngr.c:187
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:179 g10/gpg.c:589 scd/scdaemon.c:125 sm/gpgsm.c:422
-#: dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:181 g10/gpg.c:589 scd/scdaemon.c:125 sm/gpgsm.c:423
+#: dirmngr/dirmngr.c:189
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:574 scd/scdaemon.c:129 sm/gpgsm.c:265
-#: dirmngr/dirmngr.c:192
+#: agent/gpg-agent.c:185 g10/gpg.c:574 scd/scdaemon.c:129 sm/gpgsm.c:265
+#: dirmngr/dirmngr.c:193
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: agent/gpg-agent.c:185 g10/gpg.c:576 g10/gpgv.c:78 kbx/kbxutil.c:89
+#: agent/gpg-agent.c:187 g10/gpg.c:576 g10/gpgv.c:78 kbx/kbxutil.c:89
 #: scd/scdaemon.c:131 sm/gpgsm.c:267 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:194 dirmngr/dirmngr_ldap.c:102
-#: tools/gpg-connect-agent.c:85 tools/gpgconf.c:111
+#: dirmngr/dirmngr.c:195 tools/gpg-connect-agent.c:85 tools/gpgconf.c:111
 msgid "verbose"
 msgstr "detala eligo"
 
-#: agent/gpg-agent.c:186 g10/gpg.c:578 g10/gpgv.c:79 kbx/kbxutil.c:90
+#: agent/gpg-agent.c:188 g10/gpg.c:578 g10/gpgv.c:79 kbx/kbxutil.c:90
 #: scd/scdaemon.c:132 sm/gpgsm.c:269 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:195 dirmngr/dirmngr_ldap.c:103
+#: dirmngr/dirmngr.c:196
 msgid "be somewhat more quiet"
 msgstr "iom malpli da informoj"
 
-#: agent/gpg-agent.c:194 g10/gpg.c:593 sm/gpgsm.c:283 dirmngr/dirmngr.c:205
+#: agent/gpg-agent.c:196 g10/gpg.c:593 sm/gpgsm.c:283 dirmngr/dirmngr.c:206
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 scd/scdaemon.c:146 sm/gpgsm.c:290
-#: dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:599 scd/scdaemon.c:146 sm/gpgsm.c:290
+#: dirmngr/dirmngr.c:210
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: agent/gpg-agent.c:201
+#: agent/gpg-agent.c:203
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "aktualigi la fido-datenaron"
 
-#: agent/gpg-agent.c:203
+#: agent/gpg-agent.c:205
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 #, 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:213
+#: agent/gpg-agent.c:215
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:215
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:216
+#: agent/gpg-agent.c:218
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
 msgstr "ne realigita"
 
-#: agent/gpg-agent.c:218
+#: agent/gpg-agent.c:220
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:221
+#: agent/gpg-agent.c:223
 #, fuzzy
 #| msgid "not supported"
 msgid "enable putty support"
 msgstr "ne realigita"
 
-#: agent/gpg-agent.c:233 g10/gpg.c:844 scd/scdaemon.c:176 sm/gpgsm.c:382
+#: agent/gpg-agent.c:235 g10/gpg.c:844 scd/scdaemon.c:176 sm/gpgsm.c:383
 msgid "Options controlling the security"
 msgstr ""
 
-#: agent/gpg-agent.c:236
+#: agent/gpg-agent.c:238
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:238
+#: agent/gpg-agent.c:240
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:242
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:244
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:246
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:248
 #, fuzzy
 msgid "disallow the use of an external password cache"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:250
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:253
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: agent/gpg-agent.c:256
+#: agent/gpg-agent.c:258
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:261
 msgid "do not allow bypassing the passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:261
+#: agent/gpg-agent.c:263
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:265
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:266
+#: agent/gpg-agent.c:268
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:268
+#: agent/gpg-agent.c:272
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|uzi pasfraz-re�imon N"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:274
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: agent/gpg-agent.c:273
+#: agent/gpg-agent.c:277
 msgid "Options controlling the PIN-Entry"
 msgstr ""
 
-#: agent/gpg-agent.c:275
+#: agent/gpg-agent.c:279
 #, fuzzy
 #| msgid "use the gpg-agent"
 msgid "never use the PIN-entry"
 msgstr "uzi gpg-agent"
 
-#: agent/gpg-agent.c:277
+#: agent/gpg-agent.c:281
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:283
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:282
+#: agent/gpg-agent.c:286
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:286
+#: agent/gpg-agent.c:290
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:294
 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:551 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: agent/gpg-agent.c:557 agent/preset-passphrase.c:99 agent/protect-tool.c:154
 #: g10/gpg.c:1132 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:612 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:438
-#: dirmngr/dirmngr_ldap.c:175 tools/gpg-connect-agent.c:220 tools/gpgconf.c:151
+#: sm/gpgsm.c:613 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:446
+#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:151
 #: 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:560
+#: agent/gpg-agent.c:566
 #, fuzzy
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: agent/gpg-agent.c:562
+#: agent/gpg-agent.c:568
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:607 g10/gpg.c:1337 scd/scdaemon.c:384 sm/gpgsm.c:760
-#: dirmngr/dirmngr.c:522
+#: agent/gpg-agent.c:613 g10/gpg.c:1337 scd/scdaemon.c:384 sm/gpgsm.c:761
+#: dirmngr/dirmngr.c:530
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:972 g10/gpg.c:3910 g10/gpg.c:3934 sm/gpgsm.c:1769
-#: sm/gpgsm.c:1775
+#: agent/gpg-agent.c:986 g10/gpg.c:3907 g10/gpg.c:3931 sm/gpgsm.c:1622
+#: sm/gpgsm.c:1628
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: agent/gpg-agent.c:1196 agent/gpg-agent.c:2019 common/comopt.c:93
-#: g10/gpg.c:2591 scd/scdaemon.c:549 sm/gpgsm.c:1155 dirmngr/dirmngr.c:989
-#: dirmngr/dirmngr.c:1840
+#: agent/gpg-agent.c:1210 agent/gpg-agent.c:2035 common/comopt.c:93
+#: g10/gpg.c:2594 scd/scdaemon.c:549 sm/gpgsm.c:1028 dirmngr/dirmngr.c:1029
+#: dirmngr/dirmngr.c:1879
 #, 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:1335 g10/gpg.c:3861 scd/scdaemon.c:687 sm/gpgsm.c:1709
-#: dirmngr/dirmngr.c:1108 tools/gpg-connect-agent.c:1270 tools/gpgconf.c:634
+#: agent/gpg-agent.c:1349 g10/gpg.c:3858 scd/scdaemon.c:687 sm/gpgsm.c:1562
+#: dirmngr/dirmngr.c:1145 tools/gpg-connect-agent.c:1270 tools/gpgconf.c:668
 #, fuzzy, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: agent/gpg-agent.c:2172 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1267
+#: agent/gpg-agent.c:2188 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1306
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "ne povas krei %s: %s\n"
 
-#: agent/gpg-agent.c:2189 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1280
+#: agent/gpg-agent.c:2205 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1319
 #, fuzzy, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "Valida atestilrevoko"
 
-#: agent/gpg-agent.c:2228
+#: agent/gpg-agent.c:2244
 #, 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:2239 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1312
+#: agent/gpg-agent.c:2255 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1351
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: agent/gpg-agent.c:2244 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1315
+#: agent/gpg-agent.c:2260 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1354
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "eraro dum sendo al '%s': %s\n"
 
-#: agent/gpg-agent.c:2255 agent/gpg-agent.c:2295 agent/gpg-agent.c:2304
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1324
+#: agent/gpg-agent.c:2271 agent/gpg-agent.c:2311 agent/gpg-agent.c:2320
+#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1363
 #, fuzzy, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: agent/gpg-agent.c:2269 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1336
+#: agent/gpg-agent.c:2285 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1375
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: agent/gpg-agent.c:2289 agent/gpg-agent.c:2342 common/homedir.c:517
+#: agent/gpg-agent.c:2305 agent/gpg-agent.c:2358 common/homedir.c:537
 #: 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:2292 agent/gpg-agent.c:2347 common/homedir.c:520
+#: agent/gpg-agent.c:2308 agent/gpg-agent.c:2363 common/homedir.c:540
 #: g10/openfile.c:402
 #, fuzzy, c-format
 msgid "directory '%s' created\n"
 msgstr "%s: dosierujo kreita\n"
 
-#: agent/gpg-agent.c:2353
+#: agent/gpg-agent.c:2369
 #, fuzzy, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "fido-datenaro: lego malsukcesis (n=%d): %s\n"
 
-#: agent/gpg-agent.c:2357
+#: agent/gpg-agent.c:2373
 #, fuzzy, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "%s: ne povas krei dosierujon: %s\n"
 
-#: agent/gpg-agent.c:2512 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2069
+#: agent/gpg-agent.c:2528 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2108
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: agent/gpg-agent.c:2719
+#: agent/gpg-agent.c:2735
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2724
+#: agent/gpg-agent.c:2740
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2799
+#: agent/gpg-agent.c:2815
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2804
+#: agent/gpg-agent.c:2820
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3026 scd/scdaemon.c:1374 dirmngr/dirmngr.c:2283
+#: agent/gpg-agent.c:3042 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2322
 #, fuzzy, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "aktualigo de sekreto malsukcesis: %s\n"
 
-#: agent/gpg-agent.c:3114 scd/scdaemon.c:1439
+#: agent/gpg-agent.c:3130 scd/scdaemon.c:1441
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu �losiloj ignoritaj\n"
 
-#: agent/gpg-agent.c:3252 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3271 common/simple-pwquery.c:247 g10/call-agent.c:260
 #: sm/call-agent.c:131 tools/gpg-connect-agent.c:2319 tools/card-call-scd.c:311
 #, fuzzy, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent ne estas disponata en ĉi tiu sesio\n"
 
-#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:70
+#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:66
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -785,7 +800,7 @@ msgid ""
 msgstr ""
 
 #: agent/protect-tool.c:107 g10/gpg.c:448 kbx/kbxutil.c:72 sm/gpgsm.c:215
-#: dirmngr/dirmngr.c:168 tools/gpgconf.c:81
+#: dirmngr/dirmngr.c:169 tools/gpgconf.c:81
 msgid ""
 "@Commands:\n"
 " "
@@ -815,40 +830,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:707
+#: agent/protect-tool.c:708 sm/import.c:775
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
-#: agent/protect-tool.c:712
+#: agent/protect-tool.c:713 sm/export.c:727
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
-#: agent/protect-tool.c:718
+#: agent/protect-tool.c:719
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:723
+#: agent/protect-tool.c:724
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
-#: agent/protect-tool.c:734
+#: agent/protect-tool.c:735
 #, fuzzy, c-format
 msgid "cancelled\n"
 msgstr "nuligita de uzanto\n"
 
-#: agent/protect-tool.c:736
+#: agent/protect-tool.c:737
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: agent/trustlist.c:153 agent/trustlist.c:363 tools/gpgconf.c:424
+#: agent/trustlist.c:153 agent/trustlist.c:363 tools/gpgconf.c:458
 #, fuzzy, c-format
 msgid "error opening '%s': %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
@@ -1003,7 +1018,7 @@ msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
 msgid "secret key parts are not available\n"
 msgstr "sekretaj �losilpartoj ne estas disponataj\n"
 
-#: agent/cvt-openpgp.c:343 g10/card-util.c:1562
+#: agent/cvt-openpgp.c:343 g10/card-util.c:1575
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -1035,7 +1050,7 @@ msgid "error creating a stream for a pipe: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
 #: common/exechelp-posix.c:505 common/exechelp-posix.c:580
-#: common/exechelp-posix.c:866 dirmngr/dirmngr.c:1354
+#: common/exechelp-posix.c:866 dirmngr/dirmngr.c:1393
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
@@ -1108,7 +1123,7 @@ msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3082
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3099
 #, fuzzy
 msgid "yes"
 msgstr "jes"
@@ -1164,7 +1179,7 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:115 g10/card-util.c:917 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:927 tools/no-libgcrypt.c:30
 #: tools/gpg-card.c:416
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
@@ -1236,7 +1251,7 @@ msgstr "eraro dum kreado de �losilaro '%s': %s\n"
 msgid "server '%s' is older than us (%s < %s)"
 msgstr ""
 
-#: common/asshelp.c:737 g10/call-dirmngr.c:408
+#: common/asshelp.c:737 g10/call-dirmngr.c:407
 #, fuzzy, c-format
 #| msgid "WARNING: %s overrides %s\n"
 msgid "WARNING: %s\n"
@@ -1333,7 +1348,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:4212
+#: scd/app-openpgp.c:4214
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
@@ -1419,12 +1434,12 @@ msgstr ""
 "Neniom da atestiloj trovitaj kun nedifinita fidovaloro.\n"
 "\n"
 
-#: common/audit.c:1112 sm/certchain.c:1242
+#: common/audit.c:1112 sm/certchain.c:1243
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "Bona atestilo"
 
-#: common/audit.c:1115 sm/certchain.c:1252
+#: common/audit.c:1115 sm/certchain.c:1253
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Nenia helpo disponata"
@@ -1476,22 +1491,22 @@ msgstr "nekonata versio"
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "nevalida signo %02x en bazo 64 ignorita\n"
 
-#: common/ttyio.c:433
+#: common/ttyio.c:447
 #, c-format
 msgid "Sorry, we are in batchmode - can't get input\n"
 msgstr ""
 
-#: common/ttyio.c:439
+#: common/ttyio.c:453
 #, c-format
 msgid "Sorry, no terminal at all requested - can't get input\n"
 msgstr ""
 
-#: common/ttyio.c:474 common/ttyio.c:484
+#: common/ttyio.c:488 common/ttyio.c:498
 #, c-format
 msgid "too many errors; giving up\n"
 msgstr ""
 
-#: common/ttyio.c:536
+#: common/ttyio.c:550
 #, c-format
 msgid "Control-D detected\n"
 msgstr ""
@@ -1545,8 +1560,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:1036 dirmngr/dirmngr.c:895
-#: dirmngr/dirmngr.c:904
+#: common/init.c:191 sm/gpgsm.c:909 dirmngr/dirmngr.c:935 dirmngr/dirmngr.c:944
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
@@ -1701,7 +1715,7 @@ msgid "Enter passphrase: "
 msgstr "Donu pasfrazon: "
 
 #: g10/call-agent.c:318 g10/encrypt.c:282 g10/encrypt.c:818 g10/sign.c:473
-#: sm/call-agent.c:180 sm/encrypt.c:701 sm/sign.c:436
+#: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
 #, fuzzy, c-format
 msgid "%s is not compliant with %s mode\n"
 msgstr "%s ne havas sencon kun %s!\n"
@@ -1711,224 +1725,224 @@ msgstr "%s ne havas sencon kun %s!\n"
 msgid "error from TPM: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: g10/call-agent.c:2123 g10/passphrase.c:225 g10/passphrase.c:258
-#: tools/card-call-scd.c:1751
+#: g10/call-agent.c:2135 g10/passphrase.c:233 g10/passphrase.c:266
+#: tools/card-call-scd.c:1755
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problemo kun agento: agento redonas 0x%lx\n"
 
-#: g10/call-dirmngr.c:179 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2316
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2316
 #, fuzzy, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "gpg-agent ne estas disponata en ĉi tiu sesio\n"
 
-#: g10/call-dirmngr.c:213
+#: g10/call-dirmngr.c:212
 #, fuzzy, c-format
 msgid "keyserver option \"honor-keyserver-url\" may not be used in Tor mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/call-dirmngr.c:386
+#: g10/call-dirmngr.c:385
 msgid "WKD uses a cached result"
 msgstr ""
 
-#: g10/call-dirmngr.c:389
+#: g10/call-dirmngr.c:388
 msgid "Tor is not running"
 msgstr ""
 
-#: g10/call-dirmngr.c:391
+#: g10/call-dirmngr.c:390
 #, fuzzy
 msgid "Tor is not properly configured"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: g10/call-dirmngr.c:393
+#: g10/call-dirmngr.c:392
 #, fuzzy
 msgid "DNS is not properly configured"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: g10/call-dirmngr.c:395
+#: g10/call-dirmngr.c:394
 msgid "unacceptable HTTP redirect from server"
 msgstr ""
 
-#: g10/call-dirmngr.c:397
+#: g10/call-dirmngr.c:396
 msgid "unacceptable HTTP redirect from server was cleaned up"
 msgstr ""
 
-#: g10/call-dirmngr.c:399
+#: g10/call-dirmngr.c:398
 #, fuzzy
 #| msgid "generate a revocation certificate"
 msgid "server uses an invalid certificate"
 msgstr "krei revokatestilon"
 
-#: g10/call-dirmngr.c:406 g10/gpg.c:4599
+#: g10/call-dirmngr.c:405 g10/gpg.c:4596
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "kiraso: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:369 g10/card-util.c:1924
-#: tools/gpg-card.c:3039
+#: g10/card-util.c:86 g10/card-util.c:374 g10/card-util.c:1937
+#: tools/gpg-card.c:3056
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "sekreta �losilo ne havebla"
 
-#: g10/card-util.c:91 g10/card-util.c:1930
+#: g10/card-util.c:91 g10/card-util.c:1943
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:97 g10/card-util.c:2309 g10/delkey.c:164 g10/keyedit.c:1428
-#: g10/keygen.c:4791 g10/revoke.c:214 g10/revoke.c:638
+#: g10/card-util.c:97 g10/card-util.c:2322 g10/delkey.c:164 g10/keyedit.c:1428
+#: g10/keygen.c:4795 g10/revoke.c:214 g10/revoke.c:639
 #, fuzzy, c-format
 msgid "can't do this in batch mode\n"
 msgstr "ne povas fari tion en neinteraga re�imo\n"
 
-#: g10/card-util.c:105 tools/gpg-card.c:2943
+#: g10/card-util.c:105 tools/gpg-card.c:2960
 #, fuzzy, c-format
 msgid "This command is only available for version 2 cards\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3398 tools/gpg-card.c:2948
+#: g10/card-util.c:107 scd/app-openpgp.c:3399 tools/gpg-card.c:2965
 #, fuzzy, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "sekretaj �losilpartoj ne estas disponataj\n"
 
-#: g10/card-util.c:140 g10/card-util.c:1448 g10/card-util.c:1710
-#: g10/card-util.c:1802 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1991 g10/keygen.c:2165 g10/keygen.c:2385 g10/keygen.c:2685
+#: g10/card-util.c:140 g10/card-util.c:1458 g10/card-util.c:1723
+#: g10/card-util.c:1815 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/keygen.c:1992 g10/keygen.c:2166 g10/keygen.c:2386 g10/keygen.c:2686
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
 #: tools/gpg-card.c:510
 msgid "Your selection? "
 msgstr "Via elekto? "
 
-#: g10/card-util.c:262 g10/card-util.c:313 tools/gpg-card.c:596
+#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:596
 #: tools/gpg-card.c:636
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:558 tools/gpg-card.c:903
+#: g10/card-util.c:563 tools/gpg-card.c:905
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:559 tools/gpg-card.c:904
+#: g10/card-util.c:564 tools/gpg-card.c:906
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:586 tools/gpg-card.c:931
+#: g10/card-util.c:591 tools/gpg-card.c:933
 #, fuzzy
 msgid "not forced"
 msgstr "ne traktita"
 
-#: g10/card-util.c:586 tools/gpg-card.c:931
+#: g10/card-util.c:591 tools/gpg-card.c:933
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:768 tools/gpg-card.c:1468
+#: g10/card-util.c:773 tools/gpg-card.c:1484
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:770 tools/gpg-card.c:1470
+#: g10/card-util.c:775 tools/gpg-card.c:1486
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:772 tools/gpg-card.c:1472
+#: g10/card-util.c:777 tools/gpg-card.c:1488
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:789 tools/gpg-card.c:1505
+#: g10/card-util.c:795 tools/gpg-card.c:1521
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:791 tools/gpg-card.c:1506
+#: g10/card-util.c:797 tools/gpg-card.c:1522
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:809 tools/gpg-card.c:1523
+#: g10/card-util.c:816 tools/gpg-card.c:1539
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:830 tools/gpg-card.c:1561
+#: g10/card-util.c:840 tools/gpg-card.c:1577
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "skribas publikan �losilon al '%s'\n"
 
-#: g10/card-util.c:926 g10/decrypt-data.c:495 g10/import.c:406 g10/import.c:756
-#: g10/import.c:815 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1666
-#: tools/gpgconf.c:437 tools/gpgconf.c:483 tools/gpg-card.c:426
+#: g10/card-util.c:936 g10/decrypt-data.c:495 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:1705
+#: tools/gpgconf.c:471 tools/gpgconf.c:517 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:959 g10/decrypt-data.c:498 g10/export.c:2496
+#: g10/card-util.c:969 g10/decrypt-data.c:498 g10/export.c:2496
 #: dirmngr/crlcache.c:925 tools/gpg-card.c:486 tools/gpg-card.c:493
 #, fuzzy, c-format
 msgid "error writing '%s': %s\n"
 msgstr "eraro dum skribado de �losilaro '%s': %s\n"
 
-#: g10/card-util.c:986 tools/gpg-card.c:1650
+#: g10/card-util.c:996 tools/gpg-card.c:1666
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:1024 tools/gpg-card.c:1945
+#: g10/card-util.c:1034 tools/gpg-card.c:1962
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:1109 tools/gpg-card.c:1699
+#: g10/card-util.c:1119 tools/gpg-card.c:1715
 #, fuzzy
 msgid "Language preferences: "
 msgstr "aktualigitaj preferoj"
 
-#: g10/card-util.c:1117 tools/gpg-card.c:1710
+#: g10/card-util.c:1127 tools/gpg-card.c:1726
 #, fuzzy, c-format
 msgid "Error: invalid length of preference string.\n"
 msgstr "nevalida signo en signoĉeno\n"
 
-#: g10/card-util.c:1126 tools/gpg-card.c:1719
+#: g10/card-util.c:1136 tools/gpg-card.c:1735
 #, fuzzy, c-format
 msgid "Error: invalid characters in preference string.\n"
 msgstr "nevalida signo en signoĉeno\n"
 
-#: g10/card-util.c:1148 tools/gpg-card.c:1753
+#: g10/card-util.c:1158 tools/gpg-card.c:1769
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1162 tools/gpg-card.c:1770
+#: g10/card-util.c:1172 tools/gpg-card.c:1786
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: g10/card-util.c:1185 tools/gpg-card.c:1835
+#: g10/card-util.c:1195 tools/gpg-card.c:1852
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Fingrospuro:"
 
-#: g10/card-util.c:1209 tools/gpg-card.c:1861
+#: g10/card-util.c:1219 tools/gpg-card.c:1878
 #, fuzzy, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: g10/card-util.c:1259
+#: g10/card-util.c:1269
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/card-util.c:1260
+#: g10/card-util.c:1270
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
 
-#: g10/card-util.c:1273 g10/keygen.c:4811 g10/keygen.c:5972
+#: g10/card-util.c:1283 g10/keygen.c:4815 g10/keygen.c:6003
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
 
-#: g10/card-util.c:1358
+#: g10/card-util.c:1368
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1375 tools/gpg-card.c:3328
+#: g10/card-util.c:1385 tools/gpg-card.c:3345
 msgid ""
 "Note: There is no guarantee that the card supports the requested\n"
 "      key type or size.  If the key generation does not succeed,\n"
@@ -1936,102 +1950,102 @@ msgid ""
 "      key types and sizes are supported.\n"
 msgstr ""
 
-#: g10/card-util.c:1396 g10/keygen.c:2570 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1406 g10/keygen.c:2571 sm/certreqgen-ui.c:180
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Kiun �losilgrandon vi deziras? (1024) "
 
-#: g10/card-util.c:1406 g10/keygen.c:2493 g10/keygen.c:2525
+#: g10/card-util.c:1416 g10/keygen.c:2494 g10/keygen.c:2526
 #: sm/certreqgen-ui.c:195
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rondigita �is %u bitoj\n"
 
-#: g10/card-util.c:1414 g10/keygen.c:2578 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1424 g10/keygen.c:2579 sm/certreqgen-ui.c:185
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/card-util.c:1433
+#: g10/card-util.c:1443
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1435
+#: g10/card-util.c:1445
 #, fuzzy
 msgid "Signature key\n"
 msgstr "Ĉi tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/card-util.c:1437
+#: g10/card-util.c:1447
 #, fuzzy
 msgid "Encryption key\n"
 msgstr "   (%d) RSA (nur ĉifri)\n"
 
-#: g10/card-util.c:1439
+#: g10/card-util.c:1449
 msgid "Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1441 g10/keygen.c:2112 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1451 g10/keygen.c:2113 sm/certreqgen-ui.c:158
 msgid "Please select what kind of key you want:\n"
 msgstr "Bonvolu elekti, kian �losilon vi deziras:\n"
 
-#: g10/card-util.c:1442 sm/certreqgen-ui.c:159
+#: g10/card-util.c:1452 sm/certreqgen-ui.c:159
 #, fuzzy, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA (nur subskribi)\n"
 
-#: g10/card-util.c:1443
+#: g10/card-util.c:1453
 #, fuzzy, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) DSA kaj ElGamal (implicita elekto)\n"
 
-#: g10/card-util.c:1455 g10/card-util.c:1722 g10/card-util.c:1822
-#: g10/keyedit.c:900 g10/keygen.c:2017 g10/keygen.c:2045 g10/keygen.c:2172
-#: g10/keygen.c:2425 g10/keygen.c:2713 g10/revoke.c:836
+#: g10/card-util.c:1468 g10/card-util.c:1735 g10/card-util.c:1835
+#: g10/keyedit.c:900 g10/keygen.c:2018 g10/keygen.c:2046 g10/keygen.c:2173
+#: g10/keygen.c:2426 g10/keygen.c:2714 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Nevalida elekto.\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1541
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 
-#: g10/card-util.c:1533
+#: g10/card-util.c:1546
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1582
 #, fuzzy, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "eraro dum sendo al '%s': %s\n"
 
-#: g10/card-util.c:1585 g10/card-util.c:2106 g10/card-util.c:2162
+#: g10/card-util.c:1598 g10/card-util.c:2119 g10/card-util.c:2175
 #, fuzzy, c-format
 msgid "error getting card info: %s\n"
 msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
 
-#: g10/card-util.c:1591 g10/card-util.c:1936 g10/card-util.c:2112
-#: g10/card-util.c:2171 tools/gpg-card.c:3057 tools/gpg-card.c:3296
-#: tools/gpg-card.c:3354
+#: g10/card-util.c:1604 g10/card-util.c:1949 g10/card-util.c:2125
+#: g10/card-util.c:2184 tools/gpg-card.c:3074 tools/gpg-card.c:3313
+#: tools/gpg-card.c:3371
 #, fuzzy, c-format
 #| msgid "This command is not allowed while in %s mode.\n"
 msgid "This command is not supported by this card\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/card-util.c:1637 tools/gpg-card.c:2426
+#: g10/card-util.c:1650 tools/gpg-card.c:2443
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1651
+#: g10/card-util.c:1664
 #, fuzzy, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "ignorita: sekreta �losilo jam ĉeestas\n"
 
-#: g10/card-util.c:1654 tools/gpg-card.c:2398
+#: g10/card-util.c:1667 tools/gpg-card.c:2415
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1666 tools/gpg-card.c:2457
+#: g10/card-util.c:1679 tools/gpg-card.c:2474
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2039,172 +2053,172 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1701
+#: g10/card-util.c:1714
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Bonvolu elekti, kian �losilon vi deziras:\n"
 
-#: g10/card-util.c:1703 g10/card-util.c:1793
+#: g10/card-util.c:1716 g10/card-util.c:1806
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Ĉi tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/card-util.c:1704 g10/card-util.c:1795
+#: g10/card-util.c:1717 g10/card-util.c:1808
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (nur ĉifri)\n"
 
-#: g10/card-util.c:1705 g10/card-util.c:1797
+#: g10/card-util.c:1718 g10/card-util.c:1810
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1790
+#: g10/card-util.c:1803
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Kialo por revoko: "
 
-#: g10/card-util.c:1836
+#: g10/card-util.c:1849
 #, fuzzy, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: g10/card-util.c:1941 tools/gpg-card.c:3065
+#: g10/card-util.c:1954 tools/gpg-card.c:3082
 #, fuzzy, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr "ignorita: sekreta �losilo jam ĉeestas\n"
 
-#: g10/card-util.c:1944 tools/gpg-card.c:3068 tools/gpg-card.c:3409
+#: g10/card-util.c:1957 tools/gpg-card.c:3085 tools/gpg-card.c:3426
 #, fuzzy
 msgid "Continue? (y/N) "
 msgstr "Ĉu vere subskribi? "
 
-#: g10/card-util.c:1949 tools/gpg-card.c:3079
+#: g10/card-util.c:1962 tools/gpg-card.c:3096
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2142
+#: g10/card-util.c:2155
 #, fuzzy, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: g10/card-util.c:2188
+#: g10/card-util.c:2201
 #, fuzzy, c-format
 msgid "error for setup UIF: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: g10/card-util.c:2212 g10/keyedit.c:1263 tools/gpg-card.c:3649
+#: g10/card-util.c:2225 g10/keyedit.c:1263 tools/gpg-card.c:3666
 msgid "quit this menu"
 msgstr "forlasi ĉi tiun menuon"
 
-#: g10/card-util.c:2214
+#: g10/card-util.c:2227
 #, fuzzy
 msgid "show admin commands"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/card-util.c:2215 g10/keyedit.c:1266 tools/gpg-card.c:3652
+#: g10/card-util.c:2228 g10/keyedit.c:1266 tools/gpg-card.c:3669
 msgid "show this help"
 msgstr "montri ĉi tiun helpon"
 
-#: g10/card-util.c:2217 tools/gpg-card.c:3654
+#: g10/card-util.c:2230 tools/gpg-card.c:3671
 #, fuzzy
 msgid "list all available data"
 msgstr "Nenia helpo disponata"
 
-#: g10/card-util.c:2220 tools/gpg-card.c:3656
+#: g10/card-util.c:2233 tools/gpg-card.c:3673
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:2221 tools/gpg-card.c:3657
+#: g10/card-util.c:2234 tools/gpg-card.c:3674
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:2222 tools/gpg-card.c:3658
+#: g10/card-util.c:2235 tools/gpg-card.c:3675
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:2223 tools/gpg-card.c:3659
+#: g10/card-util.c:2236 tools/gpg-card.c:3676
 #, fuzzy
 msgid "change the login name"
 msgstr "�an�i la daton de eksvalidi�o"
 
-#: g10/card-util.c:2224 tools/gpg-card.c:3660
+#: g10/card-util.c:2237 tools/gpg-card.c:3677
 #, fuzzy
 msgid "change the language preferences"
 msgstr "�an�i la posedantofidon"
 
-#: g10/card-util.c:2225 tools/gpg-card.c:3661
+#: g10/card-util.c:2238 tools/gpg-card.c:3678
 msgid "change card holder's salutation"
 msgstr ""
 
-#: g10/card-util.c:2227 tools/gpg-card.c:3663
+#: g10/card-util.c:2240 tools/gpg-card.c:3680
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "montri fingrospuron"
 
-#: g10/card-util.c:2228 tools/gpg-card.c:3664
+#: g10/card-util.c:2241 tools/gpg-card.c:3681
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:2229 tools/gpg-card.c:3665
+#: g10/card-util.c:2242 tools/gpg-card.c:3682
 #, fuzzy
 msgid "generate new keys"
 msgstr "krei novan �losilparon"
 
-#: g10/card-util.c:2230 tools/gpg-card.c:3666
+#: g10/card-util.c:2243 tools/gpg-card.c:3683
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:2231 tools/gpg-card.c:3667
+#: g10/card-util.c:2244 tools/gpg-card.c:3684
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:2232 tools/gpg-card.c:3668
+#: g10/card-util.c:2245 tools/gpg-card.c:3685
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:2233 tools/gpg-card.c:3672
+#: g10/card-util.c:2246 tools/gpg-card.c:3689
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2235
+#: g10/card-util.c:2248
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr "|NOMO|uzi NOMOn kiel implicitan ricevonton"
 
-#: g10/card-util.c:2236
+#: g10/card-util.c:2249
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "�an�i la posedantofidon"
 
-#: g10/card-util.c:2237 tools/gpg-card.c:3674
+#: g10/card-util.c:2250 tools/gpg-card.c:3691
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the User Interaction Flag"
 msgstr "�an�i la posedantofidon"
 
-#: g10/card-util.c:2361 tools/gpg-card.c:3924
+#: g10/card-util.c:2374 tools/gpg-card.c:3941
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2402
+#: g10/card-util.c:2415
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/card-util.c:2433
+#: g10/card-util.c:2446
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/card-util.c:2435
+#: g10/card-util.c:2448
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/card-util.c:2546 g10/keyedit.c:2275 tools/gpg-card.c:3814
-#: tools/gpg-card.c:4072
+#: g10/card-util.c:2559 g10/keyedit.c:2275 tools/gpg-card.c:3831
+#: tools/gpg-card.c:4089
 #, c-format
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Nevalida komando (provu per \"helpo\")\n"
@@ -2214,23 +2228,23 @@ msgstr "Nevalida komando (provu per \"helpo\")\n"
 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:5293 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5292 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:1934 g10/export.c:2342 g10/export.c:2463
-#: g10/getkey.c:1907 g10/gpg.c:5238 g10/keyedit.c:1450 g10/keyedit.c:2382
-#: g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:703 g10/keyserver.c:1240
-#: g10/revoke.c:230 g10/tofu.c:2168
+#: g10/getkey.c:2032 g10/gpg.c:5237 g10/keyedit.c:1450 g10/keyedit.c:2382
+#: g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:703 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:2002 g10/getkey.c:1915 g10/getkey.c:4330
-#: g10/gpg.c:5247 g10/keyedit.c:2354 g10/keyserver.c:1258 g10/revoke.c:236
-#: g10/revoke.c:665 g10/tofu.c:2176
+#: g10/delkey.c:90 g10/export.c:2002 g10/getkey.c:2040 g10/getkey.c:4455
+#: g10/gpg.c:5246 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"
 msgstr "eraro dum legado de �losilbloko: %s\n"
@@ -2354,14 +2368,14 @@ msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:555 g10/encrypt.c:808 g10/decrypt-data.c:261 g10/gpg.c:4083
-#: g10/gpg.c:4130 sm/decrypt.c:742 sm/encrypt.c:691 sm/gpgsm.c:1793
+#: g10/encrypt.c:555 g10/encrypt.c:808 g10/decrypt-data.c:261 g10/gpg.c:4080
+#: g10/gpg.c:4127 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1646
 #, 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:564 g10/gpg.c:4095 g10/gpg.c:4142 g10/sig-check.c:155
-#: g10/sign.c:452 sm/gpgsm.c:1803 sm/gpgsm.c:1813 sm/sign.c:596 sm/verify.c:510
+#: g10/encrypt.c:564 g10/gpg.c:4092 g10/gpg.c:4139 g10/sig-check.c:155
+#: g10/sign.c:452 sm/gpgsm.c:1656 sm/gpgsm.c:1666 sm/sign.c:596 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"
@@ -2378,7 +2392,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "NOTO: ĉifrad-metodo %d ne trovita en preferoj\n"
 
-#: g10/encrypt.c:838 sm/encrypt.c:766
+#: g10/encrypt.c:838 sm/encrypt.c:767
 #, fuzzy, c-format
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
@@ -2405,7 +2419,7 @@ msgstr "%s/%s-ĉifrita por: %s\n"
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/decrypt-data.c:239 g10/mainproc.c:380 sm/decrypt.c:494
+#: g10/decrypt-data.c:239 g10/mainproc.c:380 sm/decrypt.c:892
 #, fuzzy, c-format
 #| msgid "%s encrypted data\n"
 msgid "%s.%s encrypted data\n"
@@ -2416,7 +2430,7 @@ msgstr "%s-ĉifritaj datenoj\n"
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "ĉifrita per nekonata metodo %d\n"
 
-#: g10/decrypt-data.c:361 g10/decrypt-data.c:414 sm/decrypt.c:508
+#: g10/decrypt-data.c:361 g10/decrypt-data.c:414 sm/decrypt.c:906
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2462,7 +2476,7 @@ msgstr ""
 msgid " - skipped"
 msgstr "%s: ignorita: %s\n"
 
-#: g10/export.c:1333 g10/import.c:2124 g10/openfile.c:202 g10/openfile.c:296
+#: g10/export.c:1333 g10/import.c:2132 g10/openfile.c:202 g10/openfile.c:296
 #: g10/sign.c:1110 g10/sign.c:1447
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
@@ -2501,64 +2515,64 @@ msgstr "eraro dum kreado de '%s': %s\n"
 msgid "[User ID not found]"
 msgstr "[Uzantidentigilo ne trovita]"
 
-#: g10/getkey.c:1199
+#: g10/getkey.c:1324
 #, fuzzy, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "eraro dum kreado de '%s': %s\n"
 
-#: g10/getkey.c:1205
+#: g10/getkey.c:1330
 #, fuzzy, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "eraro dum kreado de '%s': %s\n"
 
-#: g10/getkey.c:1207
+#: g10/getkey.c:1332
 #, fuzzy
 msgid "No fingerprint"
 msgstr "Fingrospuro:"
 
-#: g10/getkey.c:1449
+#: g10/getkey.c:1574
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1884 g10/revoke.c:657 g10/revoke.c:718
+#: g10/getkey.c:2009 g10/revoke.c:658 g10/revoke.c:719
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: g10/getkey.c:1887 g10/pkclist.c:1012
+#: g10/getkey.c:2012 g10/pkclist.c:1012
 #, fuzzy, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "nevalida kiraso"
 
-#: g10/getkey.c:1965
+#: g10/getkey.c:2090
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan �losilon"
 
-#: g10/getkey.c:1973
+#: g10/getkey.c:2098
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan �losilon"
 
-#: g10/getkey.c:1980
+#: g10/getkey.c:2105
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr ""
 
-#: g10/getkey.c:2837
+#: g10/getkey.c:2962
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Nevalida �losilo %08lX validigita per --always-trust\n"
 
-#: g10/getkey.c:3703
+#: g10/getkey.c:3828
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "uzas flankan �losilon %08lX anstataŭ la ĉefa �losilo %08lX\n"
 
-#: g10/getkey.c:4259 g10/gpg.c:2167
+#: g10/getkey.c:4384 g10/gpg.c:2168
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "nevalida kiraso"
@@ -2763,7 +2777,7 @@ msgstr ""
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:651 kbx/kbxutil.c:91 sm/gpgsm.c:424 tools/gpgconf.c:113
+#: g10/gpg.c:651 kbx/kbxutil.c:91 sm/gpgsm.c:425 tools/gpgconf.c:113
 msgid "do not make any changes"
 msgstr "fari neniajn �an�ojn"
 
@@ -2797,7 +2811,7 @@ msgstr "uzi tekstan re�imon"
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|difini densig-nivelon N (0=nenia)"
 
-#: g10/gpg.c:762 sm/gpgsm.c:357
+#: g10/gpg.c:762 sm/gpgsm.c:358
 msgid "Options controlling key import and export"
 msgstr ""
 
@@ -2816,11 +2830,11 @@ msgstr "importi �losilojn de �losilservilo"
 msgid "include the public key in signatures"
 msgstr "kontroli �losilsubskribojn"
 
-#: g10/gpg.c:776 sm/gpgsm.c:360
+#: g10/gpg.c:776 sm/gpgsm.c:361
 msgid "disable all access to the dirmngr"
 msgstr ""
 
-#: g10/gpg.c:788 sm/gpgsm.c:367
+#: g10/gpg.c:788 sm/gpgsm.c:368
 msgid "Options controlling key listings"
 msgstr ""
 
@@ -2840,15 +2854,15 @@ msgstr "|NOMO|ĉifri por NOMO"
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "uzi ĉi tiun uzantidentigilon por subskribi aŭ malĉifri"
 
-#: g10/gpg.c:876 sm/gpgsm.c:408
+#: g10/gpg.c:876 sm/gpgsm.c:409
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:895 sm/gpgsm.c:420 dirmngr/dirmngr.c:286
+#: g10/gpg.c:895 sm/gpgsm.c:421 dirmngr/dirmngr.c:289
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:966 sm/gpgsm.c:453
+#: g10/gpg.c:966 sm/gpgsm.c:454
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2907,7 +2921,7 @@ msgstr ""
 "subskribi, kontroli, ĉifri aŭ malĉifri\n"
 "implicita operacio dependas de la enigataj datenoj\n"
 
-#: g10/gpg.c:1168 sm/gpgsm.c:636
+#: g10/gpg.c:1168 sm/gpgsm.c:637
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2932,12 +2946,12 @@ msgstr ""
 msgid "Compression: "
 msgstr "Komento: "
 
-#: g10/gpg.c:1274 sm/gpgsm.c:710
+#: g10/gpg.c:1274 sm/gpgsm.c:711
 #, fuzzy, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "uzado: gpg [opcioj] "
 
-#: g10/gpg.c:1467 sm/gpgsm.c:803
+#: g10/gpg.c:1467 sm/gpgsm.c:804
 #, c-format
 msgid "conflicting commands\n"
 msgstr "malkongruaj komandoj\n"
@@ -2947,532 +2961,532 @@ msgstr "malkongruaj komandoj\n"
 msgid "no = sign found in group definition '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1683
+#: g10/gpg.c:1684
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1686
+#: g10/gpg.c:1687
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1689
+#: g10/gpg.c:1690
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1695
+#: g10/gpg.c:1696
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1698
+#: g10/gpg.c:1699
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1701
+#: g10/gpg.c:1702
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1708
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory 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 enclosing directory 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 enclosing directory 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 enclosing directory 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 enclosing directory 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 enclosing directory permissions on extension '%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1941
+#: g10/gpg.c:1942
 #, fuzzy, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "%s: nova opcio-dosiero kreita\n"
 
-#: g10/gpg.c:2037
+#: g10/gpg.c:2038
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:2039
+#: g10/gpg.c:2040
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/gpg.c:2041
+#: g10/gpg.c:2042
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2043
+#: g10/gpg.c:2044
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/gpg.c:2045
+#: g10/gpg.c:2046
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2049
+#: g10/gpg.c:2050
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2051
+#: g10/gpg.c:2052
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:2053
+#: g10/gpg.c:2054
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:2055
+#: g10/gpg.c:2056
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:2057
+#: g10/gpg.c:2058
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:2059
+#: g10/gpg.c:2060
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "montri, en kiu �losilaro estas listigita �losilo"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2062
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/gpg.c:2178
+#: g10/gpg.c:2179
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "nekonata implicita ricevonto '%s'\n"
 
-#: g10/gpg.c:2180
+#: g10/gpg.c:2181
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2975 g10/gpg.c:3828 g10/gpg.c:3840
+#: g10/gpg.c:2978 g10/gpg.c:3825 g10/gpg.c:3837
 #, 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:3151 g10/gpg.c:3163
+#: g10/gpg.c:3154 g10/gpg.c:3166
 #, fuzzy, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:3185
+#: g10/gpg.c:3188
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "Nevalida retadreso\n"
 
-#: g10/gpg.c:3217 sm/gpgsm.c:1270
+#: g10/gpg.c:3220 sm/gpgsm.c:1143
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: g10/gpg.c:3223 sm/gpgsm.c:1276
+#: g10/gpg.c:3226 sm/gpgsm.c:1149
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:3280
+#: g10/gpg.c:3283
 #, fuzzy, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:3302 g10/gpg.c:3511 g10/keyedit.c:5319
+#: g10/gpg.c:3305 g10/gpg.c:3514 g10/keyedit.c:5322
 #, fuzzy, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "ne povis analizi URI de �losilservilo\n"
 
-#: g10/gpg.c:3320
+#: g10/gpg.c:3323
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:3323
+#: g10/gpg.c:3326
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3333
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:3333
+#: g10/gpg.c:3336
 #, fuzzy, c-format
 msgid "invalid import options\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:3339 g10/gpg.c:3354
+#: g10/gpg.c:3342 g10/gpg.c:3357
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:3345
+#: g10/gpg.c:3348
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3351
 #, fuzzy, c-format
 msgid "invalid export options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3363
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3366
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:3371
+#: g10/gpg.c:3374
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3373
+#: g10/gpg.c:3376
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3378
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:3377
+#: g10/gpg.c:3380
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3384
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3386
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:3385
+#: g10/gpg.c:3388
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:3387
+#: g10/gpg.c:3390
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3389
+#: g10/gpg.c:3392
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:3396
+#: g10/gpg.c:3399
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:3399
+#: g10/gpg.c:3402
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3409
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:3613
+#: g10/gpg.c:3616
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:3616
+#: g10/gpg.c:3619
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3625
+#: g10/gpg.c:3628
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:3807 sm/gpgsm.c:1675
+#: g10/gpg.c:3804 sm/gpgsm.c:1528
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTO: programo povas krei core-dosieron!\n"
 
-#: g10/gpg.c:3821
+#: g10/gpg.c:3818
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTO: %s nuligas %s\n"
 
-#: g10/gpg.c:3830
+#: g10/gpg.c:3827
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ne eblas kun %s!\n"
 
-#: g10/gpg.c:3833
+#: g10/gpg.c:3830
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/gpg.c:3848 sm/gpgsm.c:1696 dirmngr/dirmngr.c:1123
+#: g10/gpg.c:3845 sm/gpgsm.c:1549 dirmngr/dirmngr.c:1160
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3869
+#: g10/gpg.c:3866
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/gpg.c:3897 g10/gpg.c:3928 sm/gpgsm.c:1763
+#: g10/gpg.c:3894 g10/gpg.c:3925 sm/gpgsm.c:1616
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "elektita ĉifrad-metodo ne validas\n"
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3901
 #, 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:3916
+#: g10/gpg.c:3913
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "elektita ĉifrad-metodo ne validas\n"
 
-#: g10/gpg.c:3922
+#: g10/gpg.c:3919
 #, fuzzy, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/gpg.c:3937
+#: g10/gpg.c:3934
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed devas esti pli granda ol 0\n"
 
-#: g10/gpg.c:3939
+#: g10/gpg.c:3936
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed devas esti pli granda ol 1\n"
 
-#: g10/gpg.c:3941
+#: g10/gpg.c:3938
 #, 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:3943
+#: g10/gpg.c:3940
 #, 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:3945
+#: g10/gpg.c:3942
 #, 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:3949
+#: g10/gpg.c:3946
 #, 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:3953
+#: g10/gpg.c:3950
 #, 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:3960
+#: g10/gpg.c:3957
 #, fuzzy, c-format
 msgid "invalid default preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3964
+#: g10/gpg.c:3961
 #, fuzzy, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3964
 #, fuzzy, c-format
 msgid "invalid personal AEAD preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3971
+#: g10/gpg.c:3968
 #, fuzzy, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3975
+#: g10/gpg.c:3972
 #, fuzzy, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3984 g10/gpg.c:3989
+#: g10/gpg.c:3981 g10/gpg.c:3986
 #, 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:4026
+#: g10/gpg.c:4023
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/gpg.c:4089
+#: g10/gpg.c:4086
 #, 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:4101
+#: g10/gpg.c:4098
 #, 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:4256
+#: g10/gpg.c:4253
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/gpg.c:4268
+#: g10/gpg.c:4265
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:4340
+#: g10/gpg.c:4337
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "malĉifrado malsukcesis: %s\n"
 
-#: g10/gpg.c:4369
+#: g10/gpg.c:4366
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4372
+#: g10/gpg.c:4369
 #, 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:4430
+#: g10/gpg.c:4427
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4433
+#: g10/gpg.c:4430
 #, 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:4821 g10/keyserver.c:1870
+#: g10/gpg.c:4818 g10/keyserver.c:1629
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:4826
+#: g10/gpg.c:4823
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:4832
+#: g10/gpg.c:4829
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:4845
+#: g10/gpg.c:4842
 #, fuzzy, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:4857
+#: g10/gpg.c:4854
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "get_dir_record: search_record malsukcesis: %s\n"
 
-#: g10/gpg.c:4870
+#: g10/gpg.c:4867
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:4937
+#: g10/gpg.c:4936
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "elkirasigo malsukcesis: %s\n"
 
-#: g10/gpg.c:4948
+#: g10/gpg.c:4947
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: g10/gpg.c:5053
+#: g10/gpg.c:5052
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: g10/gpg.c:5205 g10/tofu.c:2156
+#: g10/gpg.c:5204 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:5216
+#: g10/gpg.c:5215
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5272
+#: g10/gpg.c:5271
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5283
+#: g10/gpg.c:5282
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Ektajpu vian mesa�on ...\n"
 
-#: g10/gpg.c:5630
+#: g10/gpg.c:5629
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por atestado ne validas\n"
 
-#: g10/gpg.c:5632
+#: g10/gpg.c:5631
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:5665
+#: g10/gpg.c:5664
 #, fuzzy, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
@@ -3487,7 +3501,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:414 tools/gpgconf.c:116 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:415 tools/gpgconf.c:116 tools/gpg-card.c:95
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skribi statusinformojn al FD (dosierpriskribilo)"
 
@@ -3580,271 +3594,271 @@ msgstr ""
 msgid "repair keys on import"
 msgstr "montri fingrospuron"
 
-#: g10/import.c:399 g10/import.c:721
+#: g10/import.c:407 g10/import.c:729
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ignoras blokon de speco %d\n"
 
-#: g10/import.c:738
+#: g10/import.c:746
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu �losiloj jam traktitaj\n"
 
-#: g10/import.c:831
+#: g10/import.c:839
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "      Nombro traktita entute: %lu\n"
 
-#: g10/import.c:834
+#: g10/import.c:842
 #, fuzzy, c-format
 #| msgid "      skipped new keys: %lu\n"
 msgid "    skipped PGP-2 keys: %lu\n"
 msgstr "    ignoritaj novaj �losiloj: %lu\n"
 
-#: g10/import.c:836
+#: g10/import.c:844
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "    ignoritaj novaj �losiloj: %lu\n"
 
-#: g10/import.c:839
+#: g10/import.c:847
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         sen uzantidentigilo: %lu\n"
 
-#: g10/import.c:842 sm/import.c:129
+#: g10/import.c:850 sm/import.c:129
 #, c-format
 msgid "              imported: %lu"
 msgstr "                  importitaj: %lu"
 
-#: g10/import.c:846 sm/import.c:133
+#: g10/import.c:854 sm/import.c:133
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                  ne�an�itaj: %lu\n"
 
-#: g10/import.c:848
+#: g10/import.c:856
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      novaj uzantidentigiloj: %lu\n"
 
-#: g10/import.c:850
+#: g10/import.c:858
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           novaj sub�losiloj: %lu\n"
 
-#: g10/import.c:852
+#: g10/import.c:860
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "            novaj subskriboj: %lu\n"
 
-#: g10/import.c:854
+#: g10/import.c:862
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "         novaj �losilrevokoj: %lu\n"
 
-#: g10/import.c:856 sm/import.c:135
+#: g10/import.c:864 sm/import.c:135
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "   sekretaj �losiloj legitaj: %lu\n"
 
-#: g10/import.c:858 sm/import.c:137
+#: g10/import.c:866 sm/import.c:137
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "sekretaj �losiloj importitaj: %lu\n"
 
-#: g10/import.c:860 sm/import.c:139
+#: g10/import.c:868 sm/import.c:139
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "sekretaj �losiloj ne�an�itaj: %lu\n"
 
-#: g10/import.c:862 sm/import.c:141
+#: g10/import.c:870 sm/import.c:141
 #, fuzzy, c-format
 msgid "          not imported: %lu\n"
 msgstr "                  importitaj: %lu"
 
-#: g10/import.c:864
+#: g10/import.c:872
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "            novaj subskriboj: %lu\n"
 
-#: g10/import.c:866
+#: g10/import.c:874
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "   sekretaj �losiloj legitaj: %lu\n"
 
-#: g10/import.c:1291
+#: g10/import.c:1299
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:1333
+#: g10/import.c:1341
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:1351
+#: g10/import.c:1359
 #, fuzzy, c-format
 msgid "         \"%s\": preference for AEAD algorithm %s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/import.c:1366
+#: g10/import.c:1374
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/import.c:1378
+#: g10/import.c:1386
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:1391
+#: g10/import.c:1399
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:1393
+#: g10/import.c:1401
 #, c-format
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:1418
+#: g10/import.c:1426
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:1932 g10/import.c:3053
+#: g10/import.c:1940 g10/import.c:3061
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "�losilo %08lX: mankas uzantidentigilo\n"
 
-#: g10/import.c:1938
+#: g10/import.c:1946
 #, fuzzy, c-format
 msgid "key %s: %s\n"
 msgstr "ignoris '%s': %s\n"
 
-#: g10/import.c:1939 g10/import.c:3025
+#: g10/import.c:1947 g10/import.c:3033
 msgid "rejected by import screener"
 msgstr ""
 
-#: g10/import.c:1988
+#: g10/import.c:1996
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
 
-#: g10/import.c:2009
+#: g10/import.c:2017
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "�losilo %08lX: akceptis ne-mem-subskribitan uzantidentigilon '"
 
-#: g10/import.c:2020 g10/import.c:2051
+#: g10/import.c:2028 g10/import.c:2059
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "�losilo %08lX: mankas valida uzantidentigilo\n"
 
-#: g10/import.c:2022
+#: g10/import.c:2030
 #, c-format
 msgid "this may be caused by a missing self-signature\n"
 msgstr "tio povas esti kaÅ­zata de mankanta mem-subskribo\n"
 
-#: g10/import.c:2101 g10/import.c:3439
+#: g10/import.c:2109 g10/import.c:3447
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "�losilo %08lX: publika �losilo ne trovita: %s\n"
 
-#: g10/import.c:2107
+#: g10/import.c:2115
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "�losilo %08lX: nova �losilo - ignorita\n"
 
-#: g10/import.c:2119
+#: g10/import.c:2127
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "neniu skribebla �losilaro trovita: %s\n"
 
-#: g10/import.c:2151 g10/import.c:2253 g10/import.c:3514
+#: g10/import.c:2159 g10/import.c:2261 g10/import.c:3522
 #, fuzzy, c-format
 #| msgid "error writing keyring `%s': %s\n"
 msgid "error writing keyring '%s': %s\n"
 msgstr "eraro dum skribado de �losilaro '%s': %s\n"
 
-#: g10/import.c:2174
+#: g10/import.c:2182
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "�losilo %08lX: publika �losilo importita\n"
 
-#: g10/import.c:2201
+#: g10/import.c:2209
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "�losilo %08lX: diferencas de nia kopio\n"
 
-#: g10/import.c:2269
+#: g10/import.c:2277
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "�losilo %08lX: 1 nova uzantidentigilo\n"
 
-#: g10/import.c:2272
+#: g10/import.c:2280
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "�losilo %08lX: %d novaj uzantidentigiloj\n"
 
-#: g10/import.c:2275
+#: g10/import.c:2283
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "�losilo %08lX: 1 nova subskribo\n"
 
-#: g10/import.c:2278
+#: g10/import.c:2286
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "�losilo %08lX: %d novaj subskriboj\n"
 
-#: g10/import.c:2281
+#: g10/import.c:2289
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "�losilo %08lX: 1 nova sub�losilo\n"
 
-#: g10/import.c:2284
+#: g10/import.c:2292
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "�losilo %08lX: %d novaj sub�losiloj\n"
 
-#: g10/import.c:2287
+#: g10/import.c:2295
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "�losilo %08lX: %d novaj subskriboj\n"
 
-#: g10/import.c:2290
+#: g10/import.c:2298
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "�losilo %08lX: %d novaj subskriboj\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2301
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "�losilo %08lX: %d novaj uzantidentigiloj\n"
 
-#: g10/import.c:2296
+#: g10/import.c:2304
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "�losilo %08lX: %d novaj uzantidentigiloj\n"
 
-#: g10/import.c:2332
+#: g10/import.c:2340
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "�losilo %08lX: ne �an�ita\n"
 
-#: g10/import.c:2692 g10/import.c:2887
+#: g10/import.c:2700 g10/import.c:2895
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "�losilo %08lX: sekreta �losilo importita\n"
 
-#: g10/import.c:2700
+#: g10/import.c:2708
 #, fuzzy, c-format
 #| msgid "skipped: secret key already present\n"
 msgid "key %s: secret key already exists\n"
 msgstr "ignorita: sekreta �losilo jam ĉeestas\n"
 
-#: g10/import.c:2708
+#: g10/import.c:2716
 #, fuzzy, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "eraro dum sendo al '%s': %s\n"
@@ -3857,204 +3871,203 @@ msgstr "eraro dum sendo al '%s': %s\n"
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2877
+#: g10/import.c:2885
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:3024
+#: g10/import.c:3032
 #, fuzzy, c-format
 msgid "secret key %s: %s\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: g10/import.c:3045 g10/import.c:3084
+#: g10/import.c:3053 g10/import.c:3092
 #, fuzzy, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/import.c:3072
+#: g10/import.c:3080
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "�losilo %08lX: sekreta �losilo sen publika �losilo - ignorita\n"
 
-#: g10/import.c:3234 g10/pkclist.c:75 g10/revoke.c:774
+#: g10/import.c:3242 g10/pkclist.c:75 g10/revoke.c:775
 msgid "No reason specified"
 msgstr "Nenia kialo specifita"
 
-#: g10/import.c:3235 g10/pkclist.c:77 g10/revoke.c:776
+#: g10/import.c:3243 g10/pkclist.c:77 g10/revoke.c:777
 msgid "Key is superseded"
 msgstr "Åœlosilo estas anstataÅ­igita."
 
-#: g10/import.c:3236 g10/pkclist.c:79 g10/revoke.c:775
+#: g10/import.c:3244 g10/pkclist.c:79 g10/revoke.c:776
 msgid "Key has been compromised"
 msgstr "Åœlosilo estas kompromitita"
 
-#: g10/import.c:3237 g10/pkclist.c:81 g10/revoke.c:777
+#: g10/import.c:3245 g10/pkclist.c:81 g10/revoke.c:778
 msgid "Key is no longer used"
 msgstr "Åœlosilo estas ne plu uzata"
 
-#: g10/import.c:3238 g10/pkclist.c:83 g10/revoke.c:778
+#: g10/import.c:3246 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "Uzantidentigilo ne plu validas"
 
-#: g10/import.c:3363 g10/keylist.c:1105 g10/pkclist.c:87
+#: g10/import.c:3371 g10/keylist.c:1105 g10/pkclist.c:87
 #, fuzzy, c-format
 msgid "reason for revocation: "
 msgstr "Kialo por revoko: "
 
-#: g10/import.c:3382 g10/keylist.c:1124 g10/pkclist.c:103
+#: g10/import.c:3390 g10/keylist.c:1124 g10/pkclist.c:103
 #, fuzzy, c-format
 msgid "revocation comment: "
 msgstr "Komento pri revoko: "
 
-#: g10/import.c:3432
+#: g10/import.c:3440
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "�losilo %08lX: publika �losilo mankas - ne povas apliki revokatestilon\n"
 
-#: g10/import.c:3461
+#: g10/import.c:3469
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "�losilo %08lX: ne povas trovi originalan �losilblokon: %s\n"
 
-#: g10/import.c:3468
+#: g10/import.c:3476
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "�losilo %08lX: ne povas legi originalan �losilblokon: %s\n"
 
-#: g10/import.c:3488
+#: g10/import.c:3496
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "�losilo %08lX: nevalida revokatestilo: %s - malakceptita\n"
 
-#: g10/import.c:3523
+#: g10/import.c:3531
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "�losilo %08lX: revokatestilo importita\n"
 
-#: g10/import.c:3609
+#: g10/import.c:3617
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "�losilo %08lX: mankas uzantidentigilo por subskribo\n"
 
-#: g10/import.c:3626
+#: g10/import.c:3634
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "�losilo %08lX: nerealigita publik�losila metodo\n"
 
-#: g10/import.c:3628
+#: g10/import.c:3636
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "�losilo %08lX: nevalida mem-subskribo\n"
 
-#: g10/import.c:3645 g10/import.c:3673 g10/import.c:3729
+#: g10/import.c:3653 g10/import.c:3681 g10/import.c:3737
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "�losilo %08lX: nerealigita publik�losila metodo\n"
 
-#: g10/import.c:3646
+#: g10/import.c:3654
 #, fuzzy, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "�losilo %08lX: rekta �losilsubskribo aldonita\n"
 
-#: g10/import.c:3660
+#: g10/import.c:3668
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
 
-#: g10/import.c:3675
+#: g10/import.c:3683
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
 
-#: g10/import.c:3694
+#: g10/import.c:3702
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3726
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
 
-#: g10/import.c:3731
+#: g10/import.c:3739
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "�losilo %08lX.%lu: Valida sub�losilrevoko\n"
 
-#: g10/import.c:3746
+#: g10/import.c:3754
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
 
-#: g10/import.c:3790
+#: g10/import.c:3798
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "�losilo %08lX: ignoris uzantidentigilon '"
 
-#: g10/import.c:3817
+#: g10/import.c:3825
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "�losilo %08lX: ignoris sub�losilon\n"
 
-#: g10/import.c:3849
+#: g10/import.c:3857
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "�losilo %08lX: neeksportebla subskribo (klaso %02x) - ignorita\n"
 
-#: g10/import.c:3860
+#: g10/import.c:3868
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "�losilo %08lX: revokatestilo en mal�usta loko - ignorita\n"
 
-#: g10/import.c:3878
+#: g10/import.c:3886
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "�losilo %08lX: nevalida revokatestilo: %s - ignorita\n"
 
-#: g10/import.c:3892
+#: g10/import.c:3900
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "�losilo %08lX: revokatestilo en mal�usta loko - ignorita\n"
 
-#: g10/import.c:3900
+#: g10/import.c:3908
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "�losilo %08lX: neeksportebla subskribo (klaso %02x) - ignorita\n"
 
-#: g10/import.c:4073
+#: g10/import.c:4081
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "�losilo %08lX: trovis ripetitan uzantidentigilon - kunfandita\n"
 
-#: g10/import.c:4180
+#: g10/import.c:4188
 #, fuzzy, c-format
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr "�losilo %08lX: trovis ripetitan uzantidentigilon - kunfandita\n"
 
-#: g10/import.c:4245
+#: g10/import.c:4253
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "AVERTO: Ĉi tiu �losilo estas revokita de sia posedanto!\n"
 
-#: g10/import.c:4261
+#: g10/import.c:4269
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "AVERTO: Ĉi tiu �losilo estas revokita de sia posedanto!\n"
 
-#: g10/import.c:4327
+#: g10/import.c:4335
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "�losilo %08lX: revokatestilo aldonita\n"
 
-#: g10/import.c:4365
+#: g10/import.c:4373
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "�losilo %08lX: rekta �losilsubskribo aldonita\n"
 
-#: g10/key-check.c:133 dirmngr/dirmngr_ldap.c:650 dirmngr/ldap-wrapper.c:835
-#: dirmngr/ldap-wrapper.c:852
+#: g10/key-check.c:133 dirmngr/ldap-wrapper.c:835 dirmngr/ldap-wrapper.c:852
 #, fuzzy, c-format
 msgid "error allocating memory: %s\n"
 msgstr "eraro dum kreado de �losilaro '%s': %s\n"
@@ -4117,7 +4130,7 @@ msgid ""
 "all signatures.\n"
 msgstr ""
 
-#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:284 sm/keydb.c:297
+#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:289 sm/keydb.c:302
 #, fuzzy, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "eraro dum kreado de �losilaro '%s': %s\n"
@@ -4128,7 +4141,7 @@ msgstr "eraro dum kreado de �losilaro '%s': %s\n"
 msgid "error creating keyring '%s': %s\n"
 msgstr "eraro dum kreado de �losilaro '%s': %s\n"
 
-#: g10/keydb.c:388 sm/keydb.c:303
+#: g10/keydb.c:388 sm/keydb.c:308
 #, fuzzy, c-format
 msgid "keybox '%s' created\n"
 msgstr "�losilaro '%s' kreita\n"
@@ -4424,8 +4437,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Ĉu vere subskribi? "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6192 g10/keyedit.c:6275 g10/keyedit.c:6404
-#: g10/keyedit.c:6466 g10/sign.c:528
+#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
+#: g10/keyedit.c:6474 g10/sign.c:528
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "subskribado malsukcesis: %s\n"
@@ -4834,7 +4847,7 @@ msgstr "Uzantidentigilo ne ekzistas.\n"
 msgid "Nothing to sign.\n"
 msgstr "Nenio por subskribi per �losilo %08lX\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6057
+#: g10/keyedit.c:2973 g10/keyedit.c:6065
 #, fuzzy, c-format
 msgid "Not signed by you.\n"
 msgstr "   subskribita per %08lX je %s%s\n"
@@ -4904,7 +4917,7 @@ msgstr "Ĉi tiu �losilo estas revokebla per %s �losilo %s%s\n"
 msgid "(sensitive)"
 msgstr " (sentema)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:525
+#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "ne povas krei %s: %s\n"
@@ -4920,7 +4933,7 @@ msgid "expired: %s"
 msgstr " [eksvalidi�os: %s]"
 
 #: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2262
-#: g10/keyserver.c:531
+#: g10/keyserver.c:354
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [eksvalidi�os: %s]"
@@ -4954,14 +4967,14 @@ msgid ""
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:535
-#: g10/mainproc.c:2280 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
+#: g10/mainproc.c:2282 g10/tofu.c:1789 g10/trust.c:426 dirmngr/ocsp.c:792
 #, fuzzy
 msgid "revoked"
 msgstr "rev"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:539
-#: g10/mainproc.c:2282 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
+#: g10/mainproc.c:2284 g10/tofu.c:1794 g10/trust.c:113
 #, fuzzy
 msgid "expired"
 msgstr "eksval"
@@ -5002,7 +5015,7 @@ msgstr "Ĉu vi estas certa, ke vi ankoraŭ volas aldoni �in? (j/n) "
 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:3107
+#: g10/keyedit.c:4273 g10/keygen.c:3111
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
@@ -5151,7 +5164,7 @@ msgstr ""
 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:5357 g10/keyedit.c:5495
+#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "�losilo %08lX: nevalida mem-subskribo\n"
@@ -5160,136 +5173,136 @@ msgstr "�losilo %08lX: nevalida mem-subskribo\n"
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5380
+#: g10/keyedit.c:5383
 #, 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:5381
+#: g10/keyedit.c:5384
 #, 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:5441
+#: g10/keyedit.c:5449
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Subskribo-notacio: "
 
-#: g10/keyedit.c:5588
+#: g10/keyedit.c:5596
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Ĉu surskribi (j/N)? "
 
-#: g10/keyedit.c:5658
+#: g10/keyedit.c:5666
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:5720
+#: g10/keyedit.c:5728
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:5821
+#: g10/keyedit.c:5829
 #, fuzzy, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:5843
+#: g10/keyedit.c:5851
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:5984
+#: g10/keyedit.c:5992
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "uzantidentigilo: \""
 
-#: g10/keyedit.c:5987 g10/keyedit.c:6089 g10/keyedit.c:6137
+#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
 #, 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:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
+#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:5993
+#: g10/keyedit.c:6001
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Ĉi tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/keyedit.c:5998
+#: g10/keyedit.c:6006
 #, 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:6003
+#: g10/keyedit.c:6011
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Ĉu krei revokatestilon por ĉi tiu subskribo? (j/N)"
 
-#: g10/keyedit.c:6063
+#: g10/keyedit.c:6071
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n"
 
-#: g10/keyedit.c:6092
+#: g10/keyedit.c:6100
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "subskribi �losilon nerevokeble"
 
-#: g10/keyedit.c:6099
+#: g10/keyedit.c:6107
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revokita de %08lX je %s\n"
 
-#: g10/keyedit.c:6124
+#: g10/keyedit.c:6132
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vi revokos la sekvajn subskribojn:\n"
 
-#: g10/keyedit.c:6147
+#: g10/keyedit.c:6155
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Ĉu vere krei la revokatestilojn? (j/N)"
 
-#: g10/keyedit.c:6180
+#: g10/keyedit.c:6188
 #, c-format
 msgid "no secret key\n"
 msgstr "mankas sekreta �losilo\n"
 
-#: g10/keyedit.c:6228
+#: g10/keyedit.c:6236
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6238
+#: g10/keyedit.c:6246
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:6255
+#: g10/keyedit.c:6263
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:6351
+#: g10/keyedit.c:6359
 #, 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:6389
+#: g10/keyedit.c:6397
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:6451
+#: g10/keyedit.c:6459
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:6548
+#: g10/keyedit.c:6556
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -5299,83 +5312,83 @@ msgstr ""
 msgid "invalid value for option '%s'\n"
 msgstr "nevalida kiraso"
 
-#: g10/keygen.c:338
+#: g10/keygen.c:339
 #, fuzzy, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "prefero %c%lu ripetita\n"
 
-#: g10/keygen.c:345
+#: g10/keygen.c:346
 #, fuzzy, c-format
 msgid "too many cipher preferences\n"
 msgstr "tro da '%c'-preferoj\n"
 
-#: g10/keygen.c:347
+#: g10/keygen.c:348
 #, fuzzy, c-format
 msgid "too many digest preferences\n"
 msgstr "tro da '%c'-preferoj\n"
 
-#: g10/keygen.c:349
+#: g10/keygen.c:350
 #, fuzzy, c-format
 msgid "too many compression preferences\n"
 msgstr "tro da '%c'-preferoj\n"
 
-#: g10/keygen.c:351
+#: g10/keygen.c:352
 #, fuzzy, c-format
 msgid "too many AEAD preferences\n"
 msgstr "tro da '%c'-preferoj\n"
 
-#: g10/keygen.c:521
+#: g10/keygen.c:522
 #, fuzzy, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "nevalida signo en signoĉeno\n"
 
-#: g10/keygen.c:1130
+#: g10/keygen.c:1131
 #, fuzzy, c-format
 msgid "writing direct signature\n"
 msgstr "skribas mem-subskribon\n"
 
-#: g10/keygen.c:1176
+#: g10/keygen.c:1177
 #, c-format
 msgid "writing self signature\n"
 msgstr "skribas mem-subskribon\n"
 
-#: g10/keygen.c:1233
+#: g10/keygen.c:1234
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "skribas �losilbindan subskribon\n"
 
-#: g10/keygen.c:1598 g10/keygen.c:1603 g10/keygen.c:1655 g10/keygen.c:1660
-#: g10/keygen.c:1832 g10/keygen.c:1837
+#: g10/keygen.c:1599 g10/keygen.c:1604 g10/keygen.c:1656 g10/keygen.c:1661
+#: g10/keygen.c:1833 g10/keygen.c:1838
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "�losilgrando nevalida; uzas %u bitojn\n"
 
-#: g10/keygen.c:1609 g10/keygen.c:1666 g10/keygen.c:1674 g10/keygen.c:1843
+#: g10/keygen.c:1610 g10/keygen.c:1667 g10/keygen.c:1675 g10/keygen.c:1844
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "�losilgrando rondigita �is %u bitoj\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1701
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1899
+#: g10/keygen.c:1900
 #, fuzzy
 msgid "Sign"
 msgstr "subskribi"
 
-#: g10/keygen.c:1902
+#: g10/keygen.c:1903
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1906
 #, fuzzy
 msgid "Encrypt"
 msgstr "ĉifri datenojn"
 
-#: g10/keygen.c:1908
+#: g10/keygen.c:1909
 msgid "Authenticate"
 msgstr ""
 
@@ -5389,179 +5402,179 @@ msgstr ""
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1929
+#: g10/keygen.c:1930
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1967
 #, c-format
 msgid "Possible actions for this %s key: "
 msgstr ""
 
-#: g10/keygen.c:1973
+#: g10/keygen.c:1974
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1979
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1981
+#: g10/keygen.c:1982
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (nur ĉifri)\n"
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1985
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1987
+#: g10/keygen.c:1988
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:2116
+#: g10/keygen.c:2117
 #, fuzzy, c-format
 msgid "   (%d) RSA and RSA%s\n"
 msgstr "   (%d) DSA kaj ElGamal (implicita elekto)\n"
 
-#: g10/keygen.c:2120
+#: g10/keygen.c:2121
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal%s\n"
 msgstr "   (%d) DSA kaj ElGamal (implicita elekto)\n"
 
-#: g10/keygen.c:2123
+#: g10/keygen.c:2124
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "   (%d) DSA (sign only)%s\n"
 msgstr "   (%d) DSA (nur subskribi)\n"
 
-#: g10/keygen.c:2125
+#: g10/keygen.c:2126
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (sign only)\n"
 msgid "   (%d) RSA (sign only)%s\n"
 msgstr "   (%d) RSA (nur subskribi)\n"
 
-#: g10/keygen.c:2131
+#: g10/keygen.c:2132
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)%s\n"
 msgstr "   (%d) ElGamal (nur ĉifri)\n"
 
-#: g10/keygen.c:2133
+#: g10/keygen.c:2134
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (encrypt only)\n"
 msgid "   (%d) RSA (encrypt only)%s\n"
 msgstr "   (%d) RSA (nur ĉifri)\n"
 
-#: g10/keygen.c:2139
+#: g10/keygen.c:2140
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (nur ĉifri)\n"
 
-#: g10/keygen.c:2141
+#: g10/keygen.c:2142
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (nur ĉifri)\n"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2148
 #, fuzzy, c-format
 #| msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgid "   (%d) ECC (sign and encrypt)%s\n"
 msgstr "   (%d) ElGamal (subskribi kaj ĉifri)\n"
 
-#: g10/keygen.c:2147 g10/keygen.c:2678
+#: g10/keygen.c:2148 g10/keygen.c:2679
 #, fuzzy
 msgid " *default*"
 msgstr "malĉifri datenojn (implicita elekto)"
 
-#: g10/keygen.c:2148
+#: g10/keygen.c:2149
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "  (%d) ECC (sign only)\n"
 msgstr "   (%d) DSA (nur subskribi)\n"
 
-#: g10/keygen.c:2150
+#: g10/keygen.c:2151
 #, fuzzy, c-format
 msgid "  (%d) ECC (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (nur ĉifri)\n"
 
-#: g10/keygen.c:2152
+#: g10/keygen.c:2153
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (encrypt only)\n"
 msgid "  (%d) ECC (encrypt only)%s\n"
 msgstr "   (%d) RSA (nur ĉifri)\n"
 
-#: g10/keygen.c:2156
+#: g10/keygen.c:2157
 #, fuzzy, c-format
 msgid "  (%d) Existing key%s\n"
 msgstr "   (%d) RSA (nur ĉifri)\n"
 
-#: g10/keygen.c:2158
+#: g10/keygen.c:2159
 #, fuzzy, c-format
 msgid "  (%d) Existing key from card%s\n"
 msgstr "   (%d) RSA (nur ĉifri)\n"
 
-#: g10/keygen.c:2254 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2255 sm/certreqgen-ui.c:203
 #, fuzzy
 msgid "Enter the keygrip: "
 msgstr "Subskribo-notacio: "
 
-#: g10/keygen.c:2267 sm/certreqgen-ui.c:211 tools/gpg-card.c:2280
+#: g10/keygen.c:2268 sm/certreqgen-ui.c:211 tools/gpg-card.c:2297
 #, c-format
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr ""
 
-#: g10/keygen.c:2269 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2270 sm/certreqgen-ui.c:213
 #, fuzzy
 msgid "No key with this keygrip\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keygen.c:2288 g10/keygen.c:2298 g10/keygen.c:3440 g10/keygen.c:3451
+#: g10/keygen.c:2289 g10/keygen.c:2299 g10/keygen.c:3444 g10/keygen.c:3455
 #: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
 #, fuzzy, c-format
 msgid "error reading the card: %s\n"
 msgstr "%s: eraro dum legado de libera registro: %s\n"
 
-#: g10/keygen.c:2292 g10/keygen.c:3444 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2293 g10/keygen.c:3448 sm/certreqgen-ui.c:234
 #, fuzzy, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: g10/keygen.c:2311 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2312 sm/certreqgen-ui.c:246
 #, fuzzy
 msgid "Available keys:\n"
 msgstr "mal�alti �losilon"
 
-#: g10/keygen.c:2504 g10/keygen.c:2518
+#: g10/keygen.c:2505 g10/keygen.c:2519
 #, fuzzy, c-format
 #| msgid "rounded up to %u bits\n"
 msgid "rounded to %u bits\n"
 msgstr "rondigita �is %u bitoj\n"
 
-#: g10/keygen.c:2559
+#: g10/keygen.c:2560
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:2567
+#: g10/keygen.c:2568
 #, fuzzy, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Kiun �losilgrandon vi deziras? (1024) "
 
-#: g10/keygen.c:2584 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2585 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Petita �losilgrando estas %u bitoj\n"
 
-#: g10/keygen.c:2630
+#: g10/keygen.c:2631
 #, fuzzy
 #| msgid "Please select what kind of key you want:\n"
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Bonvolu elekti, kian �losilon vi deziras:\n"
 
-#: g10/keygen.c:2819
+#: g10/keygen.c:2820
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5577,7 +5590,7 @@ msgstr ""
 "      <n>m = �losilo eksvalidi�os post n monatoj\n"
 "      <n>y = �losilo eksvalidi�os post n jaroj\n"
 
-#: g10/keygen.c:2830
+#: g10/keygen.c:2831
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5593,40 +5606,40 @@ msgstr ""
 "      <n>m = �losilo eksvalidi�os post n monatoj\n"
 "      <n>y = �losilo eksvalidi�os post n jaroj\n"
 
-#: g10/keygen.c:2853
+#: g10/keygen.c:2854
 msgid "Key is valid for? (0) "
 msgstr "Åœlosilo validu ...? (0) "
 
-#: g10/keygen.c:2858
+#: g10/keygen.c:2859
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Åœlosilo validu por ...? (0) "
 
-#: g10/keygen.c:2871 g10/keygen.c:2896
+#: g10/keygen.c:2875 g10/keygen.c:2900
 msgid "invalid value\n"
 msgstr "nevalida valoro\n"
 
-#: g10/keygen.c:2878
+#: g10/keygen.c:2882
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s neniam eksvalidi�os\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2883
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s neniam eksvalidi�os\n"
 
-#: g10/keygen.c:2884
+#: g10/keygen.c:2888
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s eksvalidi�os je %s\n"
 
-#: g10/keygen.c:2885
+#: g10/keygen.c:2889
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Ĉi tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/keygen.c:2889
+#: g10/keygen.c:2893
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5634,12 +5647,12 @@ msgstr ""
 "Via sistemo ne povas montri datojn post 2038.\n"
 "Tamen, �i estos �uste traktata �is 2106.\n"
 
-#: g10/keygen.c:2902
+#: g10/keygen.c:2906
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Ĉu tio estas �usta (j/n)? "
 
-#: g10/keygen.c:2970
+#: g10/keygen.c:2974
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5650,7 +5663,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2985
+#: g10/keygen.c:2989
 #, fuzzy
 msgid ""
 "\n"
@@ -5666,50 +5679,50 @@ msgstr ""
 "    \"Heinrich Heine (la poeto) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:3004
+#: g10/keygen.c:3008
 msgid "Real name: "
 msgstr "Vera nomo: "
 
-#: g10/keygen.c:3013
+#: g10/keygen.c:3017
 msgid "Invalid character in name\n"
 msgstr "Nevalida signo en nomo\n"
 
-#: g10/keygen.c:3014
+#: g10/keygen.c:3018
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:3018
+#: g10/keygen.c:3022
 msgid "Name may not start with a digit\n"
 msgstr "Nomo ne povas komenci�i per cifero\n"
 
-#: g10/keygen.c:3021
+#: g10/keygen.c:3025
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nomo devas havi almenaÅ­ 5 signojn\n"
 
-#: g10/keygen.c:3031
+#: g10/keygen.c:3035
 msgid "Email address: "
 msgstr "Retadreso: "
 
-#: g10/keygen.c:3037
+#: g10/keygen.c:3041
 msgid "Not a valid email address\n"
 msgstr "Nevalida retadreso\n"
 
-#: g10/keygen.c:3046
+#: g10/keygen.c:3050
 msgid "Comment: "
 msgstr "Komento: "
 
-#: g10/keygen.c:3052
+#: g10/keygen.c:3056
 msgid "Invalid character in comment\n"
 msgstr "Nevalida signo en komento\n"
 
-#: g10/keygen.c:3088
+#: g10/keygen.c:3092
 #, fuzzy, c-format
 #| msgid "You are using the `%s' character set.\n"
 msgid "You are using the '%s' character set.\n"
 msgstr "Vi uzas la signaron '%s'.\n"
 
-#: g10/keygen.c:3094
+#: g10/keygen.c:3098
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5720,7 +5733,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3099
+#: g10/keygen.c:3103
 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"
 
@@ -5735,35 +5748,35 @@ msgstr "Bonvolu ne meti la retadreson en la veran nomon aÅ­ la komenton\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3124
+#: g10/keygen.c:3128
 msgid "NnCcEeOoQq"
 msgstr "NnKkAaBbFf"
 
-#: g10/keygen.c:3134
+#: g10/keygen.c:3138
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Ŝan�u (N)omon, (K)omenton, (A)adreson, aŭ (F)ini? "
 
-#: g10/keygen.c:3135
+#: g10/keygen.c:3139
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Ŝan�u (N)omon, (K)omenton, (A)adreson, aŭ (B)one/(F)ini? "
 
-#: g10/keygen.c:3140
+#: g10/keygen.c:3144
 #, fuzzy
 #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Ŝan�u (N)omon, (K)omenton, (A)adreson, aŭ (F)ini? "
 
-#: g10/keygen.c:3141
+#: g10/keygen.c:3145
 #, fuzzy
 #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "Ŝan�u (N)omon, (K)omenton, (A)adreson, aŭ (B)one/(F)ini? "
 
-#: g10/keygen.c:3160
+#: g10/keygen.c:3164
 msgid "Please correct the error first\n"
 msgstr "Bonvolu korekti la eraron unue\n"
 
-#: g10/keygen.c:3206
+#: g10/keygen.c:3210
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -5775,18 +5788,18 @@ msgstr ""
 "kreado de la primoj; tio donas al la stokastilo pli bonan �ancon\n"
 "akiri sufiĉe da entropio.\n"
 
-#: g10/keygen.c:3591
+#: g10/keygen.c:3595
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4590 g10/keygen.c:4663 g10/keygen.c:4681 g10/keygen.c:4710
-#: g10/keygen.c:5086 g10/keygen.c:5632 g10/keygen.c:5943 g10/keygen.c:6050
+#: g10/keygen.c:4594 g10/keygen.c:4667 g10/keygen.c:4685 g10/keygen.c:4714
+#: g10/keygen.c:5113 g10/keygen.c:5663 g10/keygen.c:5974 g10/keygen.c:6081
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/keygen.c:4599
+#: g10/keygen.c:4603
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5794,67 +5807,67 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:4601
+#: g10/keygen.c:4605
 msgid "Continue? (Y/n) "
 msgstr ""
 
-#: g10/keygen.c:4622
+#: g10/keygen.c:4626
 #, fuzzy, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "'%s' jam densigita\n"
 
-#: g10/keygen.c:4627
+#: g10/keygen.c:4631
 #, fuzzy
 msgid "Create anyway? (y/N) "
 msgstr "Ĉu tamen uzi ĉi tiun �losilon? "
 
-#: g10/keygen.c:4633
+#: g10/keygen.c:4637
 #, fuzzy, c-format
 msgid "creating anyway\n"
 msgstr "Ĉu tamen uzi ĉi tiun �losilon? "
 
-#: g10/keygen.c:5069
+#: g10/keygen.c:5096
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 
-#: g10/keygen.c:5118
+#: g10/keygen.c:5145
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Kreado de �losiloj nuligita.\n"
 
-#: g10/keygen.c:5178
+#: g10/keygen.c:5205
 #, fuzzy, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "ne povas krei '%s': %s\n"
 
-#: g10/keygen.c:5198
+#: g10/keygen.c:5225
 #, fuzzy, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "NOTO: sekreta �losilo %08lX eksvalidi�is je %s\n"
 
-#: g10/keygen.c:5359 g10/keygen.c:5561
+#: g10/keygen.c:5389 g10/keygen.c:5591
 #, fuzzy, c-format
 #| msgid "writing public key to `%s'\n"
 msgid "writing public key to '%s'\n"
 msgstr "skribas publikan �losilon al '%s'\n"
 
-#: g10/keygen.c:5555
+#: g10/keygen.c:5585
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "neniu skribebla publika �losilaro trovita: %s\n"
 
-#: g10/keygen.c:5569
+#: g10/keygen.c:5599
 #, fuzzy, c-format
 #| msgid "error writing public keyring `%s': %s\n"
 msgid "error writing public keyring '%s': %s\n"
 msgstr "eraro dum skribado de publika �losilaro '%s': %s\n"
 
-#: g10/keygen.c:5603
+#: g10/keygen.c:5634
 msgid "public and secret key created and signed.\n"
 msgstr "publika kaj sekreta �losiloj kreitaj kaj subskribitaj.\n"
 
-#: g10/keygen.c:5619
+#: g10/keygen.c:5650
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -5863,7 +5876,7 @@ msgstr ""
 "Notu, ke ĉi tiu �losilo ne estas uzebla por ĉifrado. Vi eble volos\n"
 "uzi la komandon \"--edit-key\" por krei flankan �losilon por tiu celo.\n"
 
-#: g10/keygen.c:5801 g10/keygen.c:6000
+#: g10/keygen.c:5832 g10/keygen.c:6031
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5871,7 +5884,7 @@ msgstr ""
 "�losilo estis kreita %lu sekundon en la estonteco (tempotordo aŭ "
 "horlo�eraro)\n"
 
-#: g10/keygen.c:5803 g10/keygen.c:6002
+#: g10/keygen.c:5834 g10/keygen.c:6033
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5879,23 +5892,23 @@ msgstr ""
 "�losilo estis kreita %lu sekundojn en la estonteco (tempotordo aŭ "
 "horlo�eraro)\n"
 
-#: g10/keygen.c:5814 g10/keygen.c:6013
+#: g10/keygen.c:5845 g10/keygen.c:6044
 #, fuzzy, c-format
 #| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOTO: krei sub�losilojn por v3-�losiloj ne estas OpenPGP-kongrue\n"
 
-#: g10/keygen.c:5826 g10/keygen.c:5828
+#: g10/keygen.c:5857 g10/keygen.c:5859
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Sekretaj partoj de ĉefa �losilo ne estas disponataj.\n"
 
-#: g10/keygen.c:5835 g10/keygen.c:5837
+#: g10/keygen.c:5866 g10/keygen.c:5868
 #, fuzzy, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Sekretaj partoj de ĉefa �losilo ne estas disponataj.\n"
 
-#: g10/keygen.c:5857 g10/keygen.c:6027
+#: g10/keygen.c:5888 g10/keygen.c:6058
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Ĉu vere krei? "
@@ -5984,19 +5997,19 @@ msgstr "     Åœlosilo-fingrospuro ="
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1467
+#: g10/keyring.c:1477
 #, fuzzy, c-format
 msgid "caching keyring '%s'\n"
 msgstr "kontrolas �losilaron '%s'\n"
 
-#: g10/keyring.c:1541
+#: g10/keyring.c:1551
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signature)\n"
 msgid_plural "%lu keys cached so far (%lu signatures)\n"
 msgstr[0] "%lu �losiloj kontrolitaj (%lu subskriboj)\n"
 msgstr[1] "%lu �losiloj kontrolitaj (%lu subskriboj)\n"
 
-#: g10/keyring.c:1557
+#: g10/keyring.c:1567
 #, fuzzy, c-format
 #| msgid "\t%lu keys updated\n"
 msgid "%lu key cached"
@@ -6004,7 +6017,7 @@ msgid_plural "%lu keys cached"
 msgstr[0] "\t%lu �losiloj aktualigitaj\n"
 msgstr[1] "\t%lu �losiloj aktualigitaj\n"
 
-#: g10/keyring.c:1559
+#: g10/keyring.c:1569
 #, fuzzy, c-format
 #| msgid "1 bad signature\n"
 msgid " (%lu signature)\n"
@@ -6012,7 +6025,7 @@ msgid_plural " (%lu signatures)\n"
 msgstr[0] "1 malbona subskribo\n"
 msgstr[1] "1 malbona subskribo\n"
 
-#: g10/keyring.c:1636
+#: g10/keyring.c:1646
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: �losilaro kreita\n"
@@ -6042,80 +6055,75 @@ msgstr ""
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/keyserver.c:537
+#: g10/keyserver.c:360
 #, fuzzy
 msgid "disabled"
 msgstr "el"
 
-#: g10/keyserver.c:740
+#: g10/keyserver.c:563
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:846
+#: g10/keyserver.c:669
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "nevalida �losilaro"
 
-#: g10/keyserver.c:986 g10/keyserver.c:1096
+#: g10/keyserver.c:809 g10/keyserver.c:919
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: ne valida �losilidentigilo\n"
 
-#: g10/keyserver.c:1420 g10/keyserver.c:1453
+#: g10/keyserver.c:1217 g10/keyserver.c:1250
 #, 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:1427
+#: g10/keyserver.c:1224
 #, 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:1531
+#: g10/keyserver.c:1316
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1319
 #, fuzzy, c-format
 msgid "key not found on keyserver\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: g10/keyserver.c:1722
-#, fuzzy, c-format
-msgid "requesting key %s from %s server %s\n"
-msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
-
-#: g10/keyserver.c:1726
+#: g10/keyserver.c:1481
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
 
-#: g10/keyserver.c:1841 g10/keyserver.c:2020
+#: g10/keyserver.c:1600 g10/keyserver.c:1793
 #, fuzzy, c-format
 msgid "no keyserver known\n"
 msgstr "nevalida �losilaro"
 
-#: g10/keyserver.c:1856 g10/skclist.c:213 g10/skclist.c:241
+#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "ignoris '%s': %s\n"
 
-#: g10/keyserver.c:1860
+#: g10/keyserver.c:1619
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "subskribita per via �losilo %08lX je %s\n"
 
-#: g10/keyserver.c:1901
+#: g10/keyserver.c:1662
 #, fuzzy, c-format
 msgid "requesting key from '%s'\n"
 msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
 
-#: g10/keyserver.c:1917
+#: g10/keyserver.c:1680
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
@@ -6141,252 +6149,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:472
+#: g10/mainproc.c:473
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "publika �losilo estas %08lX\n"
 
-#: g10/mainproc.c:524
+#: g10/mainproc.c:525
 #, 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:528 g10/pkclist.c:231
+#: g10/mainproc.c:529 g10/pkclist.c:231
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "            alinome \""
 
-#: g10/mainproc.c:532
+#: g10/mainproc.c:533
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "ĉifrita per %s-�losilo, %08lX\n"
 
-#: g10/mainproc.c:552 g10/mainproc.c:935
+#: g10/mainproc.c:553 g10/mainproc.c:937
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:560
+#: g10/mainproc.c:561
 #, fuzzy, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Ripetu pasfrazon\n"
 
-#: g10/mainproc.c:562
+#: g10/mainproc.c:563
 #, fuzzy, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "Ripetu pasfrazon\n"
 
-#: g10/mainproc.c:577 g10/mainproc.c:602
+#: g10/mainproc.c:578 g10/mainproc.c:603
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "publik�losila malĉifrado malsukcesis: %s\n"
 
-#: g10/mainproc.c:613
+#: g10/mainproc.c:614
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "publik�losile ĉifritaj datenoj: bona DEK\n"
 
-#: g10/mainproc.c:642 g10/mainproc.c:663
+#: g10/mainproc.c:643 g10/mainproc.c:664
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "supozas %s ĉifritajn datenojn\n"
 
-#: g10/mainproc.c:649
+#: g10/mainproc.c:650
 #, 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:742 g10/mainproc.c:780
+#: g10/mainproc.c:744 g10/mainproc.c:782
 #, fuzzy, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVERTO: nenio estis eksportita\n"
 
-#: g10/mainproc.c:753
+#: g10/mainproc.c:755
 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:756
+#: g10/mainproc.c:758
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:761
+#: g10/mainproc.c:763
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "malĉifrado malsukcesis: %s\n"
 
-#: g10/mainproc.c:773
+#: g10/mainproc.c:775
 #, c-format
 msgid "decryption okay\n"
 msgstr "malĉifrado sukcesis\n"
 
-#: g10/mainproc.c:786
+#: g10/mainproc.c:788
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVERTO: ĉifrita mesa�o estis manipulita!\n"
 
-#: g10/mainproc.c:804
+#: g10/mainproc.c:806
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "malĉifrado malsukcesis: %s\n"
 
-#: g10/mainproc.c:851
+#: g10/mainproc.c:853
 #, 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:858
+#: g10/mainproc.c:860
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "originala dosiernomo='%.*s'\n"
 
-#: g10/mainproc.c:1135
+#: g10/mainproc.c:1137
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "memstara revoko - uzu \"gpg --import\" por apliki �in\n"
 
-#: g10/mainproc.c:1440 g10/mainproc.c:1483
+#: g10/mainproc.c:1442 g10/mainproc.c:1485
 #, fuzzy, c-format
 msgid "no signature found\n"
 msgstr "Bona subskribo de \""
 
-#: g10/mainproc.c:1763
+#: g10/mainproc.c:1765
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "MALBONA subskribo de \""
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1767
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Eksvalidi�inta subskribo de \""
 
-#: g10/mainproc.c:1767
+#: g10/mainproc.c:1769
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Bona subskribo de \""
 
-#: g10/mainproc.c:1789
+#: g10/mainproc.c:1791
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "kontrolo de subskribo estas mal�altita\n"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1905
 #, fuzzy, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "ne povas trakti ĉi tiujn pluroblajn subskribojn\n"
 
-#: g10/mainproc.c:1919 g10/mainproc.c:1926
+#: g10/mainproc.c:1921 g10/mainproc.c:1928
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Ĉi tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/mainproc.c:1920 g10/mainproc.c:1927 sm/verify.c:480
+#: g10/mainproc.c:1922 g10/mainproc.c:1929 sm/verify.c:480
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "            alinome \""
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1933
 #, 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:1937
+#: g10/mainproc.c:1939
 #, fuzzy, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "            alinome \""
 
-#: g10/mainproc.c:1992
+#: g10/mainproc.c:1994
 #, fuzzy, c-format
 msgid "Key available at: "
 msgstr "Nenia helpo disponata"
 
-#: g10/mainproc.c:2034
+#: g10/mainproc.c:2036
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2234
+#: g10/mainproc.c:2236
 msgid "[uncertain]"
 msgstr "[malcerta]"
 
-#: g10/mainproc.c:2272
+#: g10/mainproc.c:2274
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "            alinome \""
 
-#: g10/mainproc.c:2347
+#: g10/mainproc.c:2349
 #, 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:2363
+#: g10/mainproc.c:2365
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "Ĉi tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/mainproc.c:2368
+#: g10/mainproc.c:2370
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "Ĉi tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/mainproc.c:2379
+#: g10/mainproc.c:2381
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/mainproc.c:2380
+#: g10/mainproc.c:2382
 #, fuzzy
 msgid "binary"
 msgstr "ĉefa"
 
-#: g10/mainproc.c:2381
+#: g10/mainproc.c:2383
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:2381 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2383 g10/trust.c:112 dirmngr/ocsp.c:793
 #, fuzzy
 msgid "unknown"
 msgstr "nekonata versio"
 
-#: g10/mainproc.c:2383
+#: g10/mainproc.c:2385
 #, fuzzy
 #| msgid "unknown pubkey algorithm"
 msgid ", key algorithm "
 msgstr "nekonata publik�losila metodo"
 
-#: g10/mainproc.c:2418
+#: g10/mainproc.c:2420
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2457
+#: g10/mainproc.c:2459
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Ne povas kontroli subskribon: %s\n"
 
-#: g10/mainproc.c:2553 g10/mainproc.c:2572 g10/mainproc.c:2696
+#: g10/mainproc.c:2555 g10/mainproc.c:2574 g10/mainproc.c:2698
 #, c-format
 msgid "not a detached signature\n"
 msgstr "ne aparta subskribo\n"
 
-#: g10/mainproc.c:2606
+#: g10/mainproc.c:2608
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:2615
+#: g10/mainproc.c:2617
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "memstara subskribo de klaso 0x%02x\n"
 
-#: g10/mainproc.c:2700
+#: g10/mainproc.c:2702
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "malnovstila subskribo (PGP 2.x)\n"
@@ -6569,51 +6577,56 @@ msgstr "Subskribo-notacio: "
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaketo de speco %d havas �altitan \"critical bit\"\n"
 
-#: g10/passphrase.c:208
+#: g10/passphrase.c:201 sm/decrypt.c:669
+#, fuzzy
+msgid "Please enter the passphrase for decryption."
+msgstr "�an�i la pasfrazon"
+
+#: g10/passphrase.c:203
 msgid "Enter passphrase\n"
 msgstr "Donu pasfrazon\n"
 
-#: g10/passphrase.c:219
+#: g10/passphrase.c:227
 #, c-format
 msgid "cancelled by user\n"
 msgstr "nuligita de uzanto\n"
 
-#: g10/passphrase.c:460
+#: g10/passphrase.c:472
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ĉef�losilo %08lX)"
 
-#: g10/passphrase.c:467
+#: g10/passphrase.c:479
 #, fuzzy
 msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
-#: g10/passphrase.c:471
+#: g10/passphrase.c:483
 #, fuzzy
 msgid "Please enter the passphrase to import the OpenPGP secret key:"
 msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
-#: g10/passphrase.c:476
+#: g10/passphrase.c:488
 #, fuzzy
 msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
-#: g10/passphrase.c:479
+#: g10/passphrase.c:491
 #, fuzzy
 msgid "Please enter the passphrase to export the OpenPGP secret key:"
 msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
-#: g10/passphrase.c:484
+#: g10/passphrase.c:496
 #, fuzzy
 msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 msgstr "Ĉu vi vere volas forvi�i la elektitajn �losilojn? "
 
-#: g10/passphrase.c:487
+#: g10/passphrase.c:499
 #, fuzzy
 msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgstr "Ĉu vi vere volas forvi�i la elektitajn �losilojn? "
 
-#: g10/passphrase.c:496
+#: g10/passphrase.c:508
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -6776,7 +6789,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:313 g10/revoke.c:803
+#: g10/pkclist.c:313 g10/revoke.c:804
 msgid "Your decision? "
 msgstr "Via decido? "
 
@@ -7076,7 +7089,7 @@ msgstr "ne povas malfermi subskribitan dosieron '%s'\n"
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "ne povas malfermi subskribitan dosieron '%s'\n"
 
-#: g10/pubkey-enc.c:99 sm/decrypt.c:879
+#: g10/pubkey-enc.c:99 sm/decrypt.c:1329
 #, fuzzy, c-format
 msgid "key %s is not suitable for decryption in %s mode\n"
 msgstr "�losilo %08lX: mankas uzantidentigilo\n"
@@ -7122,7 +7135,7 @@ msgid "Note: key has been revoked"
 msgstr "�losilo %08lX: �losilo estas revokita!\n"
 
 #: g10/revoke.c:100 g10/revoke.c:126 g10/revoke.c:172 g10/revoke.c:184
-#: g10/revoke.c:502
+#: g10/revoke.c:503
 #, fuzzy, c-format
 msgid "build_packet failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
@@ -7151,11 +7164,11 @@ msgstr "Sekreta �losilo estas havebla.\n"
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Ĉu krei revokatestilon por ĉi tiu subskribo? (j/N)"
 
-#: g10/revoke.c:334 g10/revoke.c:744
+#: g10/revoke.c:334 g10/revoke.c:745
 msgid "ASCII armored output forced.\n"
 msgstr ""
 
-#: g10/revoke.c:350 g10/revoke.c:481
+#: g10/revoke.c:350 g10/revoke.c:482
 #, fuzzy, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "listigo de �losilblokoj malsukcesis: %s\n"
@@ -7170,19 +7183,19 @@ msgstr "�losilo %08lX: revokatestilo aldonita\n"
 msgid "no revocation keys found for \"%s\"\n"
 msgstr ""
 
-#: g10/revoke.c:567
+#: g10/revoke.c:568
 #, fuzzy
 msgid "This is a revocation certificate for the OpenPGP key:"
 msgstr "Ĉu krei revokatestilon por ĉi tiu subskribo? (j/N)"
 
-#: g10/revoke.c:583
+#: g10/revoke.c:584
 msgid ""
 "A revocation certificate is a kind of \"kill switch\" to publicly\n"
 "declare that a key shall not anymore be used.  It is not possible\n"
 "to retract such a revocation certificate once it has been published."
 msgstr ""
 
-#: g10/revoke.c:586
+#: g10/revoke.c:587
 msgid ""
 "Use it to revoke this key in case of a compromise or loss of\n"
 "the secret key.  However, if the secret key is still accessible,\n"
@@ -7191,19 +7204,19 @@ msgid ""
 "of the gpg command \"--generate-revocation\" in the GnuPG manual."
 msgstr ""
 
-#: g10/revoke.c:592
+#: g10/revoke.c:593
 msgid ""
 "To avoid an accidental use of this file, a colon has been inserted\n"
 "before the 5 dashes below.  Remove this colon with a text editor\n"
 "before importing and publishing this revocation certificate."
 msgstr ""
 
-#: g10/revoke.c:611
+#: g10/revoke.c:612
 #, fuzzy, c-format
 msgid "revocation certificate stored as '%s.rev'\n"
 msgstr "�losilo %08lX: revokatestilo aldonita\n"
 
-#: g10/revoke.c:655
+#: g10/revoke.c:656
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
@@ -7211,23 +7224,23 @@ msgstr "�losilo '%s' ne trovita: %s\n"
 #. TRANSLATORS: The %s prints a key specification which
 #. for example has been given at the command line.  Several lines
 #. lines with secret key infos are printed after this message.
-#: g10/revoke.c:680
+#: g10/revoke.c:681
 #, c-format
 msgid "'%s' matches multiple secret keys:\n"
 msgstr ""
 
-#: g10/revoke.c:705
+#: g10/revoke.c:706
 #, fuzzy, c-format
 #| msgid "error creating keyring `%s': %s\n"
 msgid "error searching the keyring: %s\n"
 msgstr "eraro dum kreado de �losilaro '%s': %s\n"
 
-#: g10/revoke.c:728
+#: g10/revoke.c:729
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Ĉu krei revokatestilon por ĉi tiu subskribo? (j/N)"
 
-#: g10/revoke.c:752
+#: g10/revoke.c:753
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -7238,37 +7251,37 @@ msgid ""
 "your machine might store the data and make it available to others!\n"
 msgstr ""
 
-#: g10/revoke.c:786
+#: g10/revoke.c:787
 #, fuzzy
 msgid "Please select the reason for the revocation:\n"
 msgstr "Kialo por revoko: "
 
-#: g10/revoke.c:796
+#: g10/revoke.c:797
 msgid "Cancel"
 msgstr ""
 
-#: g10/revoke.c:798
+#: g10/revoke.c:799
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr ""
 
-#: g10/revoke.c:839
+#: g10/revoke.c:843
 #, fuzzy
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 "\n"
 "Donu la uzantidentigilon. Finu per malplena linio: "
 
-#: g10/revoke.c:867
+#: g10/revoke.c:871
 #, fuzzy, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Kialo por revoko: "
 
-#: g10/revoke.c:869
+#: g10/revoke.c:873
 msgid "(No description given)\n"
 msgstr ""
 
-#: g10/revoke.c:874
+#: g10/revoke.c:878
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Ĉu tamen uzi ĉi tiun �losilon? "
@@ -7441,24 +7454,24 @@ msgstr "subskribas:"
 msgid "%s.%s encryption will be used\n"
 msgstr "%s ĉifrado estos aplikata\n"
 
-#: g10/skclist.c:172 g10/skclist.c:253
+#: g10/skclist.c:173 g10/skclist.c:254
 #, c-format
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "�losilo ne estas markita kiel malsekura - ne povas uzi �in kun falsa "
 "stokastilo!\n"
 
-#: g10/skclist.c:204
+#: g10/skclist.c:205
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "ignoris '%s': ripetita\n"
 
-#: g10/skclist.c:223
+#: g10/skclist.c:224
 #, c-format
 msgid "skipped: secret key already present\n"
 msgstr "ignorita: sekreta �losilo jam ĉeestas\n"
 
-#: g10/skclist.c:242
+#: g10/skclist.c:243
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
@@ -7684,10 +7697,10 @@ msgstr ""
 msgid "TOFU DB error"
 msgstr ""
 
-#: g10/tofu.c:687 g10/tofu.c:2073 g10/tofu.c:2354 g10/tofu.c:2373
-#: g10/tofu.c:2386 g10/tofu.c:2398 g10/tofu.c:2413 g10/tofu.c:2425
-#: g10/tofu.c:3021 g10/tofu.c:3038 g10/tofu.c:3075 g10/tofu.c:3092
-#: g10/tofu.c:3404
+#: g10/tofu.c:687 g10/tofu.c:2077 g10/tofu.c:2358 g10/tofu.c:2377
+#: g10/tofu.c:2390 g10/tofu.c:2402 g10/tofu.c:2417 g10/tofu.c:2429
+#: g10/tofu.c:3025 g10/tofu.c:3042 g10/tofu.c:3079 g10/tofu.c:3096
+#: g10/tofu.c:3408
 #, fuzzy, c-format
 msgid "error reading TOFU database: %s\n"
 msgstr "eraro dum sendo al '%s': %s\n"
@@ -7709,7 +7722,7 @@ msgstr "%s: eraro dum skribo de dosieruja registro: %s\n"
 msgid "error opening TOFU database '%s': %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: g10/tofu.c:1148 g10/tofu.c:3458 g10/tofu.c:3604
+#: g10/tofu.c:1148 g10/tofu.c:3462 g10/tofu.c:3608
 #, fuzzy, c-format
 msgid "error updating TOFU database: %s\n"
 msgstr "eraro dum sendo al '%s': %s\n"
@@ -7749,111 +7762,111 @@ msgstr "eraro dum kreado de pasfrazo: %s\n"
 msgid "This key's user IDs:\n"
 msgstr "listigi �losilojn kaj uzantidentigilojn"
 
-#: g10/tofu.c:1634 g10/tofu.c:1799
+#: g10/tofu.c:1634 g10/tofu.c:1801
 #, fuzzy, c-format
 #| msgid "Policy: "
 msgid "policy: %s"
 msgstr "Gvidlinio: "
 
-#: g10/tofu.c:1725
+#: g10/tofu.c:1727
 #, fuzzy, c-format
 msgid "error gathering signature stats: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: g10/tofu.c:1729
+#: g10/tofu.c:1731
 #, c-format
 msgid "The email address \"%s\" is associated with %d key:\n"
 msgid_plural "The email address \"%s\" is associated with %d keys:\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1747
+#: g10/tofu.c:1749
 #, c-format
 msgid "Statistics for keys with the email address \"%s\":\n"
 msgstr ""
 
-#: g10/tofu.c:1797
+#: g10/tofu.c:1799
 #, fuzzy
 #| msgid "list keys"
 msgid "this key"
 msgstr "listigi �losilojn"
 
-#: g10/tofu.c:1823
+#: g10/tofu.c:1825
 #, fuzzy, c-format
 msgid "Verified %d message."
 msgid_plural "Verified %d messages."
 msgstr[0] "|metodo [dosieroj]|presi mesa�o-kompendiojn"
 msgstr[1] "|metodo [dosieroj]|presi mesa�o-kompendiojn"
 
-#: g10/tofu.c:1827
+#: g10/tofu.c:1829
 #, fuzzy, c-format
 msgid "Encrypted %d message."
 msgid_plural "Encrypted %d messages."
 msgstr[0] "Ripetu pasfrazon\n"
 msgstr[1] "Ripetu pasfrazon\n"
 
-#: g10/tofu.c:1834
+#: g10/tofu.c:1836
 #, fuzzy, c-format
 msgid "Verified %d message in the future."
 msgid_plural "Verified %d messages in the future."
 msgstr[0] "|metodo [dosieroj]|presi mesa�o-kompendiojn"
 msgstr[1] "|metodo [dosieroj]|presi mesa�o-kompendiojn"
 
-#: g10/tofu.c:1838
+#: g10/tofu.c:1840
 #, fuzzy, c-format
 msgid "Encrypted %d message in the future."
 msgid_plural "Encrypted %d messages in the future."
 msgstr[0] "|metodo [dosieroj]|presi mesa�o-kompendiojn"
 msgstr[1] "|metodo [dosieroj]|presi mesa�o-kompendiojn"
 
-#: g10/tofu.c:1852
+#: g10/tofu.c:1854
 #, c-format
 msgid "Messages verified over the past %d day: %d."
 msgid_plural "Messages verified over the past %d days: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1858
+#: g10/tofu.c:1860
 #, c-format
 msgid "Messages encrypted over the past %d day: %d."
 msgid_plural "Messages encrypted over the past %d days: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1868
+#: g10/tofu.c:1870
 #, c-format
 msgid "Messages verified over the past %d month: %d."
 msgid_plural "Messages verified over the past %d months: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1874
+#: g10/tofu.c:1876
 #, c-format
 msgid "Messages encrypted over the past %d month: %d."
 msgid_plural "Messages encrypted over the past %d months: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1884
+#: g10/tofu.c:1886
 #, c-format
 msgid "Messages verified over the past %d year: %d."
 msgid_plural "Messages verified over the past %d years: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1890
+#: g10/tofu.c:1892
 #, c-format
 msgid "Messages encrypted over the past %d year: %d."
 msgid_plural "Messages encrypted over the past %d years: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1898
+#: g10/tofu.c:1900
 #, c-format
 msgid "Messages verified in the past: %d."
 msgstr ""
 
-#: g10/tofu.c:1902
+#: g10/tofu.c:1904
 #, fuzzy, c-format
 msgid "Messages encrypted in the past: %d."
 msgstr "|metodo [dosieroj]|presi mesa�o-kompendiojn"
@@ -7861,129 +7874,129 @@ msgstr "|metodo [dosieroj]|presi mesa�o-kompendiojn"
 #. TRANSLATORS: Please translate the text found in the source
 #. * file below.  We don't directly internationalize that text so
 #. * that we can tweak it without breaking translations.
-#: g10/tofu.c:1919
+#: g10/tofu.c:1921
 msgid "TOFU detected a binding conflict"
 msgstr ""
 
 #. TRANSLATORS: Two letters (normally the lower and upper case
 #. * version of the hotkey) for each of the five choices.  If
 #. * there is only one choice in your language, repeat it.
-#: g10/tofu.c:1961
+#: g10/tofu.c:1963
 msgid "gGaAuUrRbB"
 msgstr ""
 
-#: g10/tofu.c:1967
+#: g10/tofu.c:1969
 msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 
-#: g10/tofu.c:1975
+#: g10/tofu.c:1978
 msgid "Defaulting to unknown.\n"
 msgstr ""
 
-#: g10/tofu.c:2093 g10/tofu.c:2228
+#: g10/tofu.c:2097 g10/tofu.c:2232
 #, c-format
 msgid "TOFU db corruption detected.\n"
 msgstr ""
 
-#: g10/tofu.c:2829
+#: g10/tofu.c:2833
 #, fuzzy, c-format
 msgid "error changing TOFU policy: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: g10/tofu.c:2880
+#: g10/tofu.c:2884
 #, c-format
 msgid "%lld~year"
 msgid_plural "%lld~years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2885
+#: g10/tofu.c:2889
 #, c-format
 msgid "%lld~month"
 msgid_plural "%lld~months"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2890
+#: g10/tofu.c:2894
 #, c-format
 msgid "%lld~week"
 msgid_plural "%lld~weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2895
+#: g10/tofu.c:2899
 #, c-format
 msgid "%lld~day"
 msgid_plural "%lld~days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2900
+#: g10/tofu.c:2904
 #, c-format
 msgid "%lld~hour"
 msgid_plural "%lld~hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2905
+#: g10/tofu.c:2909
 #, c-format
 msgid "%lld~minute"
 msgid_plural "%lld~minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2907
+#: g10/tofu.c:2911
 #, c-format
 msgid "%lld~second"
 msgid_plural "%lld~seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:3145
+#: g10/tofu.c:3149
 #, c-format
 msgid "%s: Verified 0~signatures and encrypted 0~messages."
 msgstr ""
 
-#: g10/tofu.c:3151
+#: g10/tofu.c:3155
 #, fuzzy, c-format
 #| msgid "Deleted %d signatures.\n"
 msgid "%s: Verified 0 signatures."
 msgstr "Forvi�is %d subskribojn.\n"
 
-#: g10/tofu.c:3165
+#: g10/tofu.c:3169
 #, fuzzy
 msgid "Encrypted 0 messages."
 msgstr "Ripetu pasfrazon\n"
 
-#: g10/tofu.c:3181
+#: g10/tofu.c:3185
 #, fuzzy, c-format
 #| msgid "Policy: "
 msgid "(policy: %s)"
 msgstr "Gvidlinio: "
 
-#: g10/tofu.c:3215
+#: g10/tofu.c:3219
 #, c-format
 msgid ""
 "Warning: we have yet to see a message signed using this key and user id!\n"
 msgstr ""
 
-#: g10/tofu.c:3218
+#: g10/tofu.c:3222
 #, c-format
 msgid ""
 "Warning: we've only seen one message signed using this key and user id!\n"
 msgstr ""
 
-#: g10/tofu.c:3222
+#: g10/tofu.c:3226
 #, c-format
 msgid "Warning: you have yet to encrypt a message to this key!\n"
 msgstr ""
 
-#: g10/tofu.c:3225
+#: g10/tofu.c:3229
 #, c-format
 msgid "Warning: you have only encrypted one message to this key!\n"
 msgstr ""
 
-#: g10/tofu.c:3254
+#: g10/tofu.c:3258
 #, c-format
 msgid ""
 "Warning: if you think you've seen more signatures by this key and user id, "
@@ -8000,13 +8013,13 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:3339 g10/tofu.c:3502 g10/tofu.c:3708 g10/tofu.c:3761
-#: g10/tofu.c:3902 g10/tofu.c:3979 g10/tofu.c:4017
+#: g10/tofu.c:3343 g10/tofu.c:3506 g10/tofu.c:3712 g10/tofu.c:3765
+#: g10/tofu.c:3906 g10/tofu.c:3983 g10/tofu.c:4021
 #, fuzzy, c-format
 msgid "error opening TOFU database: %s\n"
 msgstr "eraro dum sendo al '%s': %s\n"
 
-#: g10/tofu.c:3535
+#: g10/tofu.c:3539
 #, c-format
 msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
 msgstr ""
@@ -8072,7 +8085,7 @@ msgstr ""
 msgid "no need for a trustdb check\n"
 msgstr "kontrolo de fido-datenaro ne estas bezonata\n"
 
-#: g10/trustdb.c:601 g10/trustdb.c:2272
+#: g10/trustdb.c:601 g10/trustdb.c:2273
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "sekva kontrolo de fido-datenaro je %s\n"
@@ -8102,58 +8115,58 @@ msgstr ""
 msgid "checking the trustdb\n"
 msgstr "kontrolas la fido-datenaron\n"
 
-#: g10/trustdb.c:1993
+#: g10/trustdb.c:1994
 #, fuzzy, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr[0] "%lu �losiloj jam traktitaj\n"
 msgstr[1] "%lu �losiloj jam traktitaj\n"
 
-#: g10/trustdb.c:1996
+#: g10/trustdb.c:1997
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/trustdb.c:2066
+#: g10/trustdb.c:2067
 #, fuzzy, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "publika �losilo de absolute fidata �losilo %08lX ne trovita\n"
 
-#: g10/trustdb.c:2080
+#: g10/trustdb.c:2081
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "publika �losilo de absolute fidata �losilo %08lX ne trovita\n"
 
-#: g10/trustdb.c:2198
+#: g10/trustdb.c:2199
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2279
+#: g10/trustdb.c:2280
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "fido-datenaro %lu, speco %d: skribo malsukcesis: %s\n"
 
-#: g10/trust.c:125
+#: g10/trust.c:114
 msgid "undefined"
 msgstr ""
 
-#: g10/trust.c:126
+#: g10/trust.c:115
 msgid "never"
 msgstr ""
 
-#: g10/trust.c:127
+#: g10/trust.c:116
 msgid "marginal"
 msgstr ""
 
-#: g10/trust.c:128
+#: g10/trust.c:117
 msgid "full"
 msgstr ""
 
-#: g10/trust.c:129
+#: g10/trust.c:118
 msgid "ultimate"
 msgstr ""
 
@@ -8165,42 +8178,42 @@ msgstr ""
 #. It gets passed to atoi() so everything after the number is
 #. essentially a comment and need not be translated.  Either key and
 #. uid are both NULL, or neither are NULL.
-#: g10/trust.c:166
+#: g10/trust.c:155
 msgid "10 translator see trust.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trust.c:169
+#: g10/trust.c:158
 #, fuzzy
 msgid "[ revoked]"
 msgstr "rev"
 
-#: g10/trust.c:171 g10/trust.c:177
+#: g10/trust.c:160 g10/trust.c:166
 #, fuzzy
 msgid "[ expired]"
 msgstr "eksval"
 
-#: g10/trust.c:176
+#: g10/trust.c:165
 #, fuzzy
 msgid "[ unknown]"
 msgstr "nekonata versio"
 
-#: g10/trust.c:178
+#: g10/trust.c:167
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trust.c:179
+#: g10/trust.c:168
 msgid "[  never ]"
 msgstr ""
 
-#: g10/trust.c:180
+#: g10/trust.c:169
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trust.c:181
+#: g10/trust.c:170
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trust.c:182
+#: g10/trust.c:171
 msgid "[ultimate]"
 msgstr ""
 
@@ -8258,16 +8271,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:4937 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2386
+#: scd/app-piv.c:1770 scd/app-p15.c:5035 scd/app-nks.c:1530
+#: scd/app-openpgp.c:2387
 #, 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:4956 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2402
+#: scd/app-piv.c:1787 scd/app-p15.c:5054 scd/app-nks.c:1549
+#: scd/app-openpgp.c:2403
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
@@ -8302,10 +8315,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:2669
-#: scd/app-openpgp.c:2693 scd/app-openpgp.c:2871 scd/app-openpgp.c:2893
-#: scd/app-openpgp.c:3074 scd/app-openpgp.c:3361 scd/app-openpgp.c:3408
-#: scd/app-openpgp.c:3545 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2670
+#: scd/app-openpgp.c:2694 scd/app-openpgp.c:2872 scd/app-openpgp.c:2894
+#: scd/app-openpgp.c:3075 scd/app-openpgp.c:3362 scd/app-openpgp.c:3409
+#: scd/app-openpgp.c:3547 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -8325,96 +8338,96 @@ msgstr ""
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr ""
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3616
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3618
 #, fuzzy, c-format
 msgid "key already exists\n"
 msgstr "'%s' jam densigita\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3620
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3622
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3622
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3624
 #, fuzzy, c-format
 msgid "generating new key\n"
 msgstr "krei novan �losilparon"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3624
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3626
 #, fuzzy, c-format
 msgid "writing new key\n"
 msgstr "krei novan �losilparon"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4484 scd/app-openpgp.c:4767
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4486 scd/app-openpgp.c:4761
 #, 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:1615
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1616
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1622
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1623
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1732
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1733
 #, 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:4943
+#: scd/app-piv.c:3279 scd/app-openpgp.c:4937
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4951
+#: scd/app-piv.c:3294 scd/app-openpgp.c:4945
 #, 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:4957
+#: scd/app-piv.c:3300 scd/app-openpgp.c:4951
 #, 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:1842 scd/app-openpgp.c:4966
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1843 scd/app-openpgp.c:4960
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-p15.c:5035 scd/app-nks.c:2038
+#: scd/app-p15.c:5133 scd/app-nks.c:2038
 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:5038 scd/app-openpgp.c:2818
+#: scd/app-p15.c:5136 scd/app-openpgp.c:2819
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "�an�i la pasfrazon"
 
-#: scd/app-p15.c:5040 scd/app-nks.c:2028
+#: scd/app-p15.c:5138 scd/app-nks.c:2028
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Kialo por revoko: "
 
-#: scd/app-p15.c:5043 scd/app-nks.c:2019
+#: scd/app-p15.c:5141 scd/app-nks.c:2019
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "�an�i la pasfrazon"
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4321
+#: scd/app-nks.c:1468 scd/app-openpgp.c:4323
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1476 scd/app-openpgp.c:4333
+#: scd/app-nks.c:1476 scd/app-openpgp.c:4335
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
@@ -8456,27 +8469,27 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3442 scd/app-dinsig.c:534
+#: scd/app-nks.c:2221 scd/app-openpgp.c:3443 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:943
+#: scd/app-openpgp.c:944
 #, 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:956
+#: scd/app-openpgp.c:957
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "malsukcesis rekonstrui �losilaran staplon: %s\n"
 
-#: scd/app-openpgp.c:1427 scd/app-openpgp.c:3389 scd/app-openpgp.c:5715
+#: scd/app-openpgp.c:1428 scd/app-openpgp.c:3390 scd/app-openpgp.c:5709
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1949
+#: scd/app-openpgp.c:1950
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
@@ -8484,43 +8497,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:2373
+#: scd/app-openpgp.c:2374
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2621
+#: scd/app-openpgp.c:2622
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2628
+#: scd/app-openpgp.c:2629
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2641
+#: scd/app-openpgp.c:2642
 #, fuzzy
 msgid "||Please unlock the card"
 msgstr "�an�i la pasfrazon"
 
-#: scd/app-openpgp.c:2700 scd/app-openpgp.c:2900 scd/app-openpgp.c:3368
+#: scd/app-openpgp.c:2701 scd/app-openpgp.c:2901 scd/app-openpgp.c:3369
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2717 scd/app-openpgp.c:2760 scd/app-openpgp.c:2917
-#: scd/app-openpgp.c:5325
+#: scd/app-openpgp.c:2718 scd/app-openpgp.c:2761 scd/app-openpgp.c:2918
+#: scd/app-openpgp.c:5319
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: scd/app-openpgp.c:2804 scd/app-openpgp.c:5724
+#: scd/app-openpgp.c:2805 scd/app-openpgp.c:5718
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2808
+#: scd/app-openpgp.c:2809
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8528,22 +8541,22 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: scd/app-openpgp.c:2841
+#: scd/app-openpgp.c:2842
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3355
+#: scd/app-openpgp.c:3356
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "�an�i la pasfrazon"
 
-#: scd/app-openpgp.c:3404
+#: scd/app-openpgp.c:3405
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Kialo por revoko: "
 
-#: scd/app-openpgp.c:3414 scd/app-openpgp.c:3481
+#: scd/app-openpgp.c:3415 scd/app-openpgp.c:3484
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
@@ -8551,81 +8564,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:3437
+#: scd/app-openpgp.c:3438
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3439
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3439
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3541
+#: scd/app-openpgp.c:3543
 #, fuzzy
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "�an�i la pasfrazon"
 
-#: scd/app-openpgp.c:3542
+#: scd/app-openpgp.c:3544
 #, fuzzy
 msgid "||Please enter the PIN and New PIN"
 msgstr "�an�i la pasfrazon"
 
-#: scd/app-openpgp.c:3600 scd/app-openpgp.c:5026
+#: scd/app-openpgp.c:3602 scd/app-openpgp.c:5020
 #, fuzzy, c-format
 msgid "error reading application data\n"
 msgstr "eraro dum legado de �losilbloko: %s\n"
 
-#: scd/app-openpgp.c:3606 scd/app-openpgp.c:5033
+#: scd/app-openpgp.c:3608 scd/app-openpgp.c:5027
 #, fuzzy, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "%s: eraro dum legado de libera registro: %s\n"
 
-#: scd/app-openpgp.c:4302 scd/app-openpgp.c:4657
+#: scd/app-openpgp.c:4304 scd/app-openpgp.c:4653
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4343 scd/app-openpgp.c:4351
+#: scd/app-openpgp.c:4345 scd/app-openpgp.c:4353
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4651
+#: scd/app-openpgp.c:4647
 #, fuzzy, c-format
 #| msgid "unsupported URI"
 msgid "unsupported curve\n"
 msgstr "nerealigita URI"
 
-#: scd/app-openpgp.c:4991
+#: scd/app-openpgp.c:4985
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5041
+#: scd/app-openpgp.c:5035
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5240
+#: scd/app-openpgp.c:5234
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: scd/app-openpgp.c:5298
+#: scd/app-openpgp.c:5292
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5729
+#: scd/app-openpgp.c:5723
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:6241 scd/app-openpgp.c:6252
+#: scd/app-openpgp.c:6250 scd/app-openpgp.c:6261
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
@@ -8647,7 +8660,7 @@ msgstr "Donu la uzantidentigilon: "
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:274 dirmngr/dirmngr.c:198
+#: scd/scdaemon.c:136 sm/gpgsm.c:274 dirmngr/dirmngr.c:199
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
@@ -8712,12 +8725,12 @@ msgstr ""
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2104
+#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2143
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2112
+#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2151
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -8727,11 +8740,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:199 sm/certchain.c:2172
+#: sm/certchain.c:199 sm/certchain.c:2174
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:200 sm/certchain.c:2172
+#: sm/certchain.c:200 sm/certchain.c:2174
 #, fuzzy
 msgid "shell"
 msgstr "helpo"
@@ -8765,238 +8778,238 @@ msgstr "skribas sekretan �losilon al '%s'\n"
 msgid "certificate policy not allowed"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: sm/certchain.c:595 sm/keydb.c:1891 sm/keydb.c:1980
+#: sm/certchain.c:596 sm/keydb.c:1913 sm/keydb.c:2002
 #, fuzzy, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: sm/certchain.c:624
+#: sm/certchain.c:625
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:644
+#: sm/certchain.c:645
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#: sm/certchain.c:724 dirmngr/ocsp.c:683
 #, fuzzy, c-format
 #| msgid "%s: can't access: %s\n"
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "%s: ne povas aliri: %s\n"
 
-#: sm/certchain.c:791
+#: sm/certchain.c:792
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr ""
 
-#: sm/certchain.c:816
+#: sm/certchain.c:817
 #, fuzzy, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: sm/certchain.c:819
+#: sm/certchain.c:820
 #, fuzzy, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: sm/certchain.c:1046 sm/certchain.c:1561 sm/certchain.c:2200 sm/decrypt.c:643
-#: sm/encrypt.c:620 sm/import.c:414 sm/keydb.c:1898 sm/keydb.c:1987
-#: sm/sign.c:428 sm/verify.c:117
+#: sm/certchain.c:1047 sm/certchain.c:1562 sm/certchain.c:2202
+#: sm/decrypt.c:1084 sm/encrypt.c:621 sm/import.c:414 sm/keydb.c:1920
+#: sm/keydb.c:2009 sm/sign.c:428 sm/verify.c:117
 #, fuzzy, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: sm/certchain.c:1232
+#: sm/certchain.c:1233
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "�losilo %08lX: �losilo estas revokita!\n"
 
-#: sm/certchain.c:1247
+#: sm/certchain.c:1248
 msgid "the status of the certificate is unknown"
 msgstr ""
 
-#: sm/certchain.c:1254
+#: sm/certchain.c:1255
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:1260
+#: sm/certchain.c:1261
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
 
-#: sm/certchain.c:1289 sm/certchain.c:1357 dirmngr/validate.c:497
+#: sm/certchain.c:1290 sm/certchain.c:1358 dirmngr/validate.c:497
 #, fuzzy, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "problemo ĉe legado de atestilo: %s\n"
 
-#: sm/certchain.c:1304 sm/certchain.c:1389 dirmngr/validate.c:515
+#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:515
 #, fuzzy, c-format
 msgid "certificate not yet valid"
 msgstr "Valida atestilrevoko"
 
-#: sm/certchain.c:1305 sm/certchain.c:1390
+#: sm/certchain.c:1306 sm/certchain.c:1391
 #, fuzzy
 msgid "root certificate not yet valid"
 msgstr "Valida atestilrevoko"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1307 sm/certchain.c:1392
 #, fuzzy
 msgid "intermediate certificate not yet valid"
 msgstr "Valida atestilrevoko"
 
-#: sm/certchain.c:1319 dirmngr/validate.c:526
+#: sm/certchain.c:1320 dirmngr/validate.c:526
 #, fuzzy, c-format
 msgid "certificate has expired"
 msgstr "problemo ĉe legado de atestilo: %s\n"
 
-#: sm/certchain.c:1320
+#: sm/certchain.c:1321
 #, fuzzy
 msgid "root certificate has expired"
 msgstr "problemo ĉe legado de atestilo: %s\n"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1322
 #, fuzzy
 msgid "intermediate certificate has expired"
 msgstr "problemo ĉe legado de atestilo: %s\n"
 
-#: sm/certchain.c:1363
+#: sm/certchain.c:1364
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:1372
+#: sm/certchain.c:1373
 #, fuzzy
 msgid "certificate with invalid validity"
 msgstr "problemo ĉe legado de atestilo: %s\n"
 
-#: sm/certchain.c:1409
+#: sm/certchain.c:1410
 msgid "signature not created during lifetime of certificate"
 msgstr ""
 
-#: sm/certchain.c:1411
+#: sm/certchain.c:1412
 msgid "certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1413
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1416
+#: sm/certchain.c:1417
 #, fuzzy, c-format
 msgid "  (  signature created at "
 msgstr "            novaj subskriboj: %lu\n"
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1418
 #, fuzzy, c-format
 msgid "  (certificate created at "
 msgstr "�losilo %08lX: revokatestilo aldonita\n"
 
-#: sm/certchain.c:1420
+#: sm/certchain.c:1421
 #, fuzzy, c-format
 msgid "  (certificate valid from "
 msgstr "Valida atestilrevoko"
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1422
 #, c-format
 msgid "  (     issuer valid from "
 msgstr ""
 
-#: sm/certchain.c:1451 dirmngr/validate.c:577
+#: sm/certchain.c:1452 dirmngr/validate.c:577
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "Fingrospuro:"
 
-#: sm/certchain.c:1460
+#: sm/certchain.c:1461
 #, fuzzy, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 "Neniom da atestiloj trovitaj kun nedifinita fidovaloro.\n"
 "\n"
 
-#: sm/certchain.c:1473
+#: sm/certchain.c:1474
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1479
+#: sm/certchain.c:1480
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1538
+#: sm/certchain.c:1539
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 
-#: sm/certchain.c:1602
+#: sm/certchain.c:1603
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "Bona atestilo"
 
-#: sm/certchain.c:1680
+#: sm/certchain.c:1681
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1749 dirmngr/validate.c:575
+#: sm/certchain.c:1750 dirmngr/validate.c:575
 #, fuzzy, c-format
 msgid "root certificate is not marked trusted"
 msgstr ""
 "Neniom da atestiloj trovitaj kun nedifinita fidovaloro.\n"
 "\n"
 
-#: sm/certchain.c:1765
+#: sm/certchain.c:1766
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
 
-#: sm/certchain.c:1796 sm/import.c:175 dirmngr/validate.c:630
+#: sm/certchain.c:1797 sm/import.c:175 dirmngr/validate.c:630
 #, fuzzy, c-format
 msgid "certificate chain too long\n"
 msgstr "Valida atestilrevoko"
 
-#: sm/certchain.c:1808 dirmngr/validate.c:642
+#: sm/certchain.c:1809 dirmngr/validate.c:642
 #, fuzzy, c-format
 msgid "issuer certificate not found"
 msgstr "Valida atestilrevoko"
 
-#: sm/certchain.c:1842 dirmngr/validate.c:668
+#: sm/certchain.c:1844 dirmngr/validate.c:668
 #, fuzzy, c-format
 msgid "certificate has a BAD signature"
 msgstr "kontroli subskribon"
 
-#: sm/certchain.c:1874 dirmngr/validate.c:692
+#: sm/certchain.c:1876 dirmngr/validate.c:692
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1933 dirmngr/validate.c:717
+#: sm/certchain.c:1935 dirmngr/validate.c:717
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1975 sm/certchain.c:2275 dirmngr/validate.c:747
+#: sm/certchain.c:1977 sm/certchain.c:2278 dirmngr/validate.c:747
 #, fuzzy, c-format
 msgid "certificate is good\n"
 msgstr "Valida atestilrevoko"
 
-#: sm/certchain.c:1976
+#: sm/certchain.c:1978
 #, fuzzy, c-format
 msgid "intermediate certificate is good\n"
 msgstr "ripetita atestilo - forvi�ita"
 
-#: sm/certchain.c:1977
+#: sm/certchain.c:1979
 #, fuzzy, c-format
 msgid "root certificate is good\n"
 msgstr ""
 "Neniom da atestiloj trovitaj kun nedifinita fidovaloro.\n"
 "\n"
 
-#: sm/certchain.c:2159
+#: sm/certchain.c:2161
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:2168
+#: sm/certchain.c:2170
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -9007,18 +9020,18 @@ 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:1372 dirmngr/validate.c:903
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1411 dirmngr/validate.c:903
 #: dirmngr/validate.c:927
 #, fuzzy, c-format
 msgid "out of core\n"
 msgstr "ne traktita"
 
-#: sm/certcheck.c:389 sm/verify.c:212
+#: sm/certcheck.c:388 sm/verify.c:212
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:793
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:794
 #, fuzzy
 msgid "none"
 msgstr "ne"
@@ -9317,17 +9330,17 @@ msgstr ""
 msgid "resource problem: out of core\n"
 msgstr ""
 
-#: sm/decrypt.c:719
+#: sm/decrypt.c:1159
 #, c-format
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
 
-#: sm/decrypt.c:721
+#: sm/decrypt.c:1161
 #, c-format
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr ""
 
-#: sm/decrypt.c:868
+#: sm/decrypt.c:1318
 #, fuzzy, c-format
 msgid "encrypted to %s key %s\n"
 msgstr "ĉifrita per %s-�losilo, %08lX\n"
@@ -9337,7 +9350,7 @@ msgstr "ĉifrita per %s-�losilo, %08lX\n"
 msgid "certificate '%s' not found: %s\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: sm/delete.c:120 sm/keydb.c:1999 sm/keydb.c:2098
+#: sm/delete.c:120 sm/keydb.c:2021 sm/keydb.c:2120
 #, fuzzy, c-format
 msgid "error locking keybox: %s\n"
 msgstr "eraro dum legado de �losilbloko: %s\n"
@@ -9357,7 +9370,7 @@ msgstr "ripetita atestilo - forvi�ita"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: sm/encrypt.c:606
+#: sm/encrypt.c:607
 #, fuzzy, c-format
 msgid "no valid recipients given\n"
 msgstr "nevalida respondo de agento\n"
@@ -9433,68 +9446,68 @@ msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan �losilon"
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "aldoni ĉi tiun �losilaron al la listo de �losilaroj"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:352 dirmngr/dirmngr.c:265
 #, fuzzy
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|SERVILO|uzi ĉi tiun �losilservilon por serĉi �losilojn"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:363
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:364
+#: sm/gpgsm.c:365
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NOMO|uzi ĉifrad-metodon NOMO por pasfrazoj"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:386
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:389
+#: sm/gpgsm.c:390
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: sm/gpgsm.c:393
+#: sm/gpgsm.c:394
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:396
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:398
+#: sm/gpgsm.c:399
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOMO|uzi ĉifrad-metodon NOMO"
 
-#: sm/gpgsm.c:400
+#: sm/gpgsm.c:401
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOMO|uzi kompendi-metodon NOMO"
 
-#: sm/gpgsm.c:410
+#: sm/gpgsm.c:411
 msgid "batch mode: never ask"
 msgstr "neinteraga re�imo: neniam demandi"
 
-#: sm/gpgsm.c:412
+#: sm/gpgsm.c:413
 msgid "assume yes on most questions"
 msgstr "supozi \"jes\" ĉe la plej multaj demandoj"
 
-#: sm/gpgsm.c:413
+#: sm/gpgsm.c:414
 msgid "assume no on most questions"
 msgstr "supozi \"ne\" ĉe la plej multaj demandoj"
 
-#: sm/gpgsm.c:430
+#: sm/gpgsm.c:431
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: sm/gpgsm.c:615
+#: sm/gpgsm.c:616
 #, 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:618
+#: sm/gpgsm.c:619
 #, fuzzy
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
@@ -9505,52 +9518,27 @@ msgstr ""
 "subskribi, kontroli, ĉifri aŭ malĉifri\n"
 "implicita operacio dependas de la enigataj datenoj\n"
 
-#: sm/gpgsm.c:826
+#: sm/gpgsm.c:827
 #, 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:837
+#: sm/gpgsm.c:838
 #, fuzzy, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "nekonata implicita ricevonto '%s'\n"
 
-#: sm/gpgsm.c:896 dirmngr/ldapserver.c:89
-#, c-format
-msgid "%s:%u: no hostname given\n"
-msgstr ""
-
-#: sm/gpgsm.c:915 dirmngr/ldapserver.c:108
-#, c-format
-msgid "%s:%u: password given without user\n"
-msgstr ""
-
-#: sm/gpgsm.c:946 dirmngr/ldapserver.c:139
-#, c-format
-msgid "%s:%u: ignoring unknown flag '%s'\n"
-msgstr ""
-
-#: sm/gpgsm.c:962 dirmngr/ldapserver.c:155
-#, fuzzy, c-format
-msgid "%s:%u: skipping this line\n"
-msgstr " s = supersalti ĉi tiun �losilon\n"
-
-#: sm/gpgsm.c:1550
-#, fuzzy, c-format
-msgid "could not parse keyserver\n"
-msgstr "ne povis analizi URI de �losilservilo\n"
-
-#: sm/gpgsm.c:1858
+#: sm/gpgsm.c:1711
 #, fuzzy, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "skribas al '%s'\n"
 
-#: sm/gpgsm.c:1904
+#: sm/gpgsm.c:1757
 #, fuzzy, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "ne povas fermi '%s': %s\n"
 
-#: sm/gpgsm.c:2273
+#: sm/gpgsm.c:2129
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
@@ -9570,52 +9558,52 @@ msgstr "Bona atestilo"
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:471 sm/keydb.c:2018 sm/keydb.c:2111
+#: sm/import.c:472 sm/keydb.c:2040 sm/keydb.c:2133
 #, fuzzy, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: sm/import.c:530 sm/import.c:562
+#: sm/import.c:531 sm/import.c:563
 #, fuzzy, c-format
 msgid "error importing certificate: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: sm/import.c:751 tools/gpg-connect-agent.c:1475
+#: sm/import.c:752 tools/gpg-connect-agent.c:1475
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: sm/keydb.c:503
+#: sm/keydb.c:508
 #, fuzzy, c-format
 msgid "no keyboxd running in this session\n"
 msgstr "gpg-agent ne estas disponata en ĉi tiu sesio\n"
 
-#: sm/keydb.c:595
+#: sm/keydb.c:600
 #, fuzzy, c-format
 msgid "error opening key DB: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: sm/keydb.c:1936
+#: sm/keydb.c:1958
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1948
+#: sm/keydb.c:1970
 #, fuzzy, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: sm/keydb.c:1956
+#: sm/keydb.c:1978
 #, fuzzy, c-format
 msgid "error storing certificate: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: sm/keydb.c:2009
+#: sm/keydb.c:2031
 #, fuzzy, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "rev? problemo en kontrolo de revoko: %s\n"
 
-#: sm/keydb.c:2030 sm/keydb.c:2122
+#: sm/keydb.c:2052 sm/keydb.c:2144
 #, fuzzy, c-format
 msgid "error storing flags: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
@@ -9785,57 +9773,57 @@ msgstr ""
 msgid "error loading certificate '%s': %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: dirmngr/certcache.c:819
+#: dirmngr/certcache.c:820
 #, fuzzy, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "Nevalida atestilo"
 
-#: dirmngr/certcache.c:821
+#: dirmngr/certcache.c:822
 #, fuzzy, c-format
 msgid "    runtime cached certificates: %u\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: dirmngr/certcache.c:823
+#: dirmngr/certcache.c:824
 #, fuzzy, c-format
 msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: dirmngr/certcache.c:851 dirmngr/dirmngr-client.c:392
+#: dirmngr/certcache.c:852 dirmngr/dirmngr-client.c:392
 #, fuzzy, c-format
 msgid "certificate already cached\n"
 msgstr "�losilo %08lX: revokatestilo aldonita\n"
 
-#: dirmngr/certcache.c:853
+#: dirmngr/certcache.c:854
 #, fuzzy, c-format
 msgid "certificate cached\n"
 msgstr "Valida atestilrevoko"
 
-#: dirmngr/certcache.c:855 dirmngr/certcache.c:875 dirmngr/dirmngr-client.c:396
+#: dirmngr/certcache.c:856 dirmngr/certcache.c:876 dirmngr/dirmngr-client.c:396
 #, fuzzy, c-format
 msgid "error caching certificate: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: dirmngr/certcache.c:938
+#: dirmngr/certcache.c:939
 #, fuzzy, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: dirmngr/certcache.c:1384 dirmngr/certcache.c:1393
+#: dirmngr/certcache.c:1385 dirmngr/certcache.c:1394
 #, fuzzy, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: dirmngr/certcache.c:1579 dirmngr/certcache.c:1588
+#: dirmngr/certcache.c:1580 dirmngr/certcache.c:1589
 #, fuzzy, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: dirmngr/certcache.c:1694 dirmngr/validate.c:483
+#: dirmngr/certcache.c:1695 dirmngr/validate.c:483
 #, fuzzy, c-format
 msgid "no issuer found in certificate\n"
 msgstr "Bona atestilo"
 
-#: dirmngr/certcache.c:1704
+#: dirmngr/certcache.c:1705
 #, fuzzy, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
@@ -9871,7 +9859,7 @@ msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 msgid "not removing file '%s'\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2380
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2383
 #, fuzzy, c-format
 msgid "error closing cache file: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
@@ -10103,13 +10091,13 @@ msgid "error getting data from cache file: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
 #: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1672 dirmngr/crlcache.c:1697
-#: dirmngr/crlcache.c:1763
+#: dirmngr/crlcache.c:1766
 #, c-format
 msgid "got an invalid S-expression from libksba\n"
 msgstr ""
 
 #: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1679 dirmngr/crlcache.c:1705
-#: dirmngr/crlcache.c:1770 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1773 dirmngr/misc.c:176
 #, fuzzy, c-format
 #| msgid "changing permission of  `%s' failed: %s\n"
 msgid "converting S-expression failed: %s\n"
@@ -10126,201 +10114,201 @@ msgstr "nevalida kompendi-metodo '%s'\n"
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1797 dirmngr/ocsp.c:478
+#: dirmngr/crlcache.c:1800 dirmngr/ocsp.c:478
 #, fuzzy, c-format
 #| msgid "changing permission of  `%s' failed: %s\n"
 msgid "creating S-expression failed: %s\n"
 msgstr "�an�o de permesoj de '%s' malsukcesis: %s\n"
 
-#: dirmngr/crlcache.c:1871
+#: dirmngr/crlcache.c:1874
 #, fuzzy, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: dirmngr/crlcache.c:1886
+#: dirmngr/crlcache.c:1889
 #, fuzzy, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: dirmngr/crlcache.c:1893
+#: dirmngr/crlcache.c:1896
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1897
+#: dirmngr/crlcache.c:1900
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1917
+#: dirmngr/crlcache.c:1920
 #, fuzzy, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: dirmngr/crlcache.c:1932
+#: dirmngr/crlcache.c:1935
 #, fuzzy, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "skribas al '%s'\n"
 
-#: dirmngr/crlcache.c:1959
+#: dirmngr/crlcache.c:1962
 #, fuzzy, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "Bona atestilo"
 
-#: dirmngr/crlcache.c:1974
+#: dirmngr/crlcache.c:1977
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2020
+#: dirmngr/crlcache.c:2023
 #, fuzzy, c-format
 #| msgid "signature verification suppressed\n"
 msgid "CRL signature verification failed: %s\n"
 msgstr "kontrolo de subskribo estas mal�altita\n"
 
-#: dirmngr/crlcache.c:2032
+#: dirmngr/crlcache.c:2035
 #, fuzzy, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
 
-#: dirmngr/crlcache.c:2174
+#: dirmngr/crlcache.c:2177
 #, fuzzy, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: dirmngr/crlcache.c:2181
+#: dirmngr/crlcache.c:2184
 #, fuzzy, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: dirmngr/crlcache.c:2215
+#: dirmngr/crlcache.c:2218
 #, fuzzy, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "%s: ne povas krei dosierujon: %s\n"
 
-#: dirmngr/crlcache.c:2219
+#: dirmngr/crlcache.c:2222
 #, fuzzy, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "%s: ne povas krei dosierujon: %s\n"
 
-#: dirmngr/crlcache.c:2229
+#: dirmngr/crlcache.c:2232
 #, fuzzy, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: dirmngr/crlcache.c:2239
+#: dirmngr/crlcache.c:2242
 #, fuzzy, c-format
 #| msgid "lid ?: insert failed: %s\n"
 msgid "crl_parse_insert failed: %s\n"
 msgstr "lid ?: en�ovo malsukcesis: %s\n"
 
-#: dirmngr/crlcache.c:2249
+#: dirmngr/crlcache.c:2252
 #, fuzzy, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "skribas al '%s'\n"
 
-#: dirmngr/crlcache.c:2256
+#: dirmngr/crlcache.c:2259
 #, fuzzy, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: dirmngr/crlcache.c:2281
+#: dirmngr/crlcache.c:2284
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2285
+#: dirmngr/crlcache.c:2288
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2301
+#: dirmngr/crlcache.c:2304
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2311
+#: dirmngr/crlcache.c:2314
 #, fuzzy, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2365
 #, fuzzy, c-format
 msgid "creating cache file '%s'\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: dirmngr/crlcache.c:2394
+#: dirmngr/crlcache.c:2397
 #, fuzzy, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: dirmngr/crlcache.c:2408
+#: dirmngr/crlcache.c:2411
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
 "program start\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2448
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2468
+#: dirmngr/crlcache.c:2471
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2471
+#: dirmngr/crlcache.c:2474
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2474
+#: dirmngr/crlcache.c:2477
 msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2481
+#: dirmngr/crlcache.c:2484
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2499
+#: dirmngr/crlcache.c:2502
 #, fuzzy, c-format
 msgid " WARNING: invalid cache record length\n"
 msgstr "averto: nevalida grando de la dosiero random_seen - ne uzita\n"
 
-#: dirmngr/crlcache.c:2506
+#: dirmngr/crlcache.c:2509
 #, fuzzy, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "%s: eraro dum legado de libera registro: %s\n"
 
-#: dirmngr/crlcache.c:2517
+#: dirmngr/crlcache.c:2520
 #, fuzzy, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "rev? problemo en kontrolo de revoko: %s\n"
 
-#: dirmngr/crlcache.c:2548
+#: dirmngr/crlcache.c:2551
 #, fuzzy, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: dirmngr/crlcache.c:2551
+#: dirmngr/crlcache.c:2554
 msgid "End CRL dump\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2672
+#: dirmngr/crlcache.c:2675
 #, fuzzy, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: dirmngr/crlcache.c:2683
+#: dirmngr/crlcache.c:2686
 #, fuzzy, c-format
 #| msgid "lid ?: insert failed: %s\n"
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "lid ?: en�ovo malsukcesis: %s\n"
 
-#: dirmngr/crlcache.c:2743
+#: dirmngr/crlcache.c:2746
 #, fuzzy, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
@@ -10341,7 +10329,7 @@ msgstr ""
 msgid "error retrieving '%s': %s\n"
 msgstr "eraro dum kreado de '%s': %s\n"
 
-#: dirmngr/crlfetch.c:218 dirmngr/ldap-wrapper.c:881 dirmngr/misc.c:573
+#: dirmngr/crlfetch.c:218 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
 #, fuzzy, c-format
 #| msgid "%s: error writing dir record: %s\n"
 msgid "error initializing reader object: %s\n"
@@ -10510,135 +10498,135 @@ msgstr ""
 msgid "looking up '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:175
+#: dirmngr/dirmngr.c:176
 msgid "list the contents of the CRL cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:176
+#: dirmngr/dirmngr.c:177
 #, fuzzy
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr.c:178
 msgid "|URL|fetch a CRL from URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:178
+#: dirmngr/dirmngr.c:179
 msgid "shutdown the dirmngr"
 msgstr ""
 
-#: dirmngr/dirmngr.c:179
+#: dirmngr/dirmngr.c:180
 msgid "flush the cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:213
 msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:215
+#: dirmngr/dirmngr.c:216
 msgid "|N|do not return more than N items in one query"
 msgstr ""
 
-#: dirmngr/dirmngr.c:221
+#: dirmngr/dirmngr.c:222
 msgid "Network related options"
 msgstr ""
 
-#: dirmngr/dirmngr.c:223
+#: dirmngr/dirmngr.c:224
 msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:235
+#: dirmngr/dirmngr.c:236
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:238
+#: dirmngr/dirmngr.c:239
 #, fuzzy
 msgid "|URL|use keyserver at URL"
 msgstr "ne povis analizi URI de �losilservilo\n"
 
-#: dirmngr/dirmngr.c:240
+#: dirmngr/dirmngr.c:241
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-#: dirmngr/dirmngr.c:242
+#: dirmngr/dirmngr.c:243
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:244
+#: dirmngr/dirmngr.c:245
 msgid "inhibit the use of HTTP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:246
+#: dirmngr/dirmngr.c:247
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:248
+#: dirmngr/dirmngr.c:249
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:250
+#: dirmngr/dirmngr.c:251
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: dirmngr/dirmngr.c:254
+#: dirmngr/dirmngr.c:255
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: dirmngr/dirmngr.c:256
+#: dirmngr/dirmngr.c:257
 msgid "inhibit the use of LDAP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:258
+#: dirmngr/dirmngr.c:259
 msgid "ignore LDAP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:260
+#: dirmngr/dirmngr.c:261
 msgid "|HOST|use HOST for LDAP queries"
 msgstr ""
 
-#: dirmngr/dirmngr.c:262
+#: dirmngr/dirmngr.c:263
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr ""
 
-#: dirmngr/dirmngr.c:264
+#: dirmngr/dirmngr.c:267
 #, fuzzy
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: dirmngr/dirmngr.c:266
+#: dirmngr/dirmngr.c:269
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 
-#: dirmngr/dirmngr.c:269 dirmngr/dirmngr_ldap.c:104
+#: dirmngr/dirmngr.c:272
 msgid "|N|set LDAP timeout to N seconds"
 msgstr ""
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:275
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:274
+#: dirmngr/dirmngr.c:277
 msgid "allow sending OCSP requests"
 msgstr ""
 
-#: dirmngr/dirmngr.c:276
+#: dirmngr/dirmngr.c:279
 msgid "ignore certificate contained OCSP service URLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:278
+#: dirmngr/dirmngr.c:281
 #, fuzzy
 msgid "|URL|use OCSP responder at URL"
 msgstr "ne povis analizi URI de �losilservilo\n"
 
-#: dirmngr/dirmngr.c:280
+#: dirmngr/dirmngr.c:283
 msgid "|FPR|OCSP response signed by FPR"
 msgstr ""
 
-#: dirmngr/dirmngr.c:288
+#: dirmngr/dirmngr.c:291
 msgid "force loading of outdated CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:299
+#: dirmngr/dirmngr.c:302
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -10651,302 +10639,115 @@ msgstr ""
 "@\n"
 "(Vidu la manpa�on por kompleta listo de ĉiuj komandoj kaj opcioj)\n"
 
-#: dirmngr/dirmngr.c:441
+#: dirmngr/dirmngr.c:449
 #, fuzzy
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: dirmngr/dirmngr.c:443
+#: dirmngr/dirmngr.c:451
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:523
+#: dirmngr/dirmngr.c:531
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:609 tools/gpgconf.c:667 tools/gpgconf.c:702
-#: tools/gpgconf.c:802
+#: dirmngr/dirmngr.c:617 tools/gpgconf.c:701 tools/gpgconf.c:736
+#: tools/gpgconf.c:836
 #, fuzzy, c-format
 msgid "usage: %s [options] "
 msgstr "uzado: gpg [opcioj] "
 
-#: dirmngr/dirmngr.c:1260
+#: dirmngr/dirmngr.c:1299
 #, 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:1495 dirmngr/server.c:1824
+#: dirmngr/dirmngr.c:1534 dirmngr/server.c:1878
 #, fuzzy, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: dirmngr/dirmngr.c:1501 dirmngr/server.c:1830
+#: dirmngr/dirmngr.c:1540 dirmngr/server.c:1884
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: dirmngr/dirmngr.c:1643
+#: dirmngr/dirmngr.c:1682
 #, fuzzy, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "pasfrazo estas tro longa\n"
 
-#: dirmngr/dirmngr.c:1698 dirmngr/dirmngr.c:1782
+#: dirmngr/dirmngr.c:1737 dirmngr/dirmngr.c:1821
 #, fuzzy, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: dirmngr/dirmngr.c:1734 dirmngr/dirmngr.c:1760 tools/gpgconf-comp.c:3539
+#: dirmngr/dirmngr.c:1773 dirmngr/dirmngr.c:1799 tools/gpgconf-comp.c:3549
 #, fuzzy, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "kiraso: %s\n"
 
-#: dirmngr/dirmngr.c:1789
+#: dirmngr/dirmngr.c:1828
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1876
+#: dirmngr/dirmngr.c:1915
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1917
+#: dirmngr/dirmngr.c:1956
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1922
+#: dirmngr/dirmngr.c:1961
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1924
+#: dirmngr/dirmngr.c:1963
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1929
+#: dirmngr/dirmngr.c:1968
 #, fuzzy, c-format
 msgid "shutdown forced\n"
 msgstr "ne traktita"
 
-#: dirmngr/dirmngr.c:1937
+#: dirmngr/dirmngr.c:1976
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1944
+#: dirmngr/dirmngr.c:1983
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:105
-msgid "return all values in a record oriented format"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:108
-msgid "|NAME|ignore host part and connect through NAME"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:109
-msgid "force a TLS connection"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:110
-#, fuzzy
-#| msgid "|NAME|set terminal charset to NAME"
-msgid "|NAME|connect to host NAME"
-msgstr "|NOMO|difini NOMOn kiel la signaron de la terminalo"
-
-#: dirmngr/dirmngr_ldap.c:111
-msgid "|N|connect to port N"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:112
-#, fuzzy
-#| msgid "|NAME|use NAME as default recipient"
-msgid "|NAME|use user NAME for authentication"
-msgstr "|NOMO|uzi NOMOn kiel implicitan ricevonton"
-
-#: dirmngr/dirmngr_ldap.c:113
-msgid "|PASS|use password PASS for authentication"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:115
-msgid "take password from $DIRMNGR_LDAP_PASS"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:116
-msgid "|STRING|query DN STRING"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:117
-msgid "|STRING|use STRING as filter expression"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:118
-msgid "|STRING|return the attribute STRING"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:179
-#, fuzzy
-#| msgid "Usage: gpg [options] [files] (-h for help)"
-msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
-msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
-
-#: dirmngr/dirmngr_ldap.c:182
-msgid ""
-"Syntax: dirmngr_ldap [options] [URL]\n"
-"Internal LDAP helper for Dirmngr\n"
-"Interface and options may change without notice\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:291
-#, fuzzy, c-format
-msgid "invalid port number %d\n"
-msgstr "nevalida kiraso"
-
-#: dirmngr/dirmngr_ldap.c:400
-#, c-format
-msgid "scanning result for attribute '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:407 dirmngr/dirmngr_ldap.c:490
-#: dirmngr/dirmngr_ldap.c:514 dirmngr/dirmngr_ldap.c:526
-#: dirmngr/dirmngr_ldap.c:722
-#, fuzzy, c-format
-msgid "error writing to stdout: %s\n"
-msgstr "eraro dum skribado de �losilaro '%s': %s\n"
-
-#: dirmngr/dirmngr_ldap.c:424
-#, c-format
-msgid "          available attribute '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:462
-#, fuzzy, c-format
-#| msgid "user '%s' not found: %s\n"
-msgid "attribute '%s' not found\n"
-msgstr "uzanto '%s' ne trovita: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:469
-#, c-format
-msgid "found attribute '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:581
-#, fuzzy, c-format
-#| msgid "reading from `%s'\n"
-msgid "processing url '%s'\n"
-msgstr "legas el '%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:588
-#, fuzzy, c-format
-#| msgid "          w/o user IDs: %lu\n"
-msgid "          user '%s'\n"
-msgstr "         sen uzantidentigilo: %lu\n"
-
-#: dirmngr/dirmngr_ldap.c:590
-#, fuzzy, c-format
-msgid "          pass '%s'\n"
-msgstr "            alinome \""
-
-#: dirmngr/dirmngr_ldap.c:592
-#, fuzzy, c-format
-msgid "          host '%s'\n"
-msgstr "            alinome \""
-
-#: dirmngr/dirmngr_ldap.c:593
-#, fuzzy, c-format
-msgid "          port %d\n"
-msgstr "                  importitaj: %lu"
-
-#: dirmngr/dirmngr_ldap.c:595
-#, fuzzy, c-format
-msgid "            DN '%s'\n"
-msgstr "            alinome \""
-
-#: dirmngr/dirmngr_ldap.c:597
-#, c-format
-msgid "        filter '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:602 dirmngr/dirmngr_ldap.c:605
-#, fuzzy, c-format
-msgid "          attr '%s'\n"
-msgstr "            alinome \""
-
-#: dirmngr/dirmngr_ldap.c:611
-#, c-format
-msgid "no host name in '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:616
-#, c-format
-msgid "no attribute given for query '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:622
-#, fuzzy, c-format
-msgid "WARNING: using first attribute only\n"
-msgstr "Averto: uzas malsekuran memoron!\n"
-
-#: dirmngr/dirmngr_ldap.c:637 dirmngr/dirmngr_ldap.c:678
-#, fuzzy, c-format
-msgid "LDAP init to '%s:%d' failed: %s\n"
-msgstr "enkirasigo malsukcesis: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:659
-#, fuzzy, c-format
-msgid "LDAP init to '%s' failed: %s\n"
-msgstr "enkirasigo malsukcesis: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:665
-#, fuzzy, c-format
-msgid "LDAP init to '%s' done\n"
-msgstr "enkirasigo malsukcesis: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:704
-#, fuzzy, c-format
-msgid "binding to '%s:%d' failed: %s\n"
-msgstr "enkirasigo malsukcesis: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:728
-#, fuzzy, c-format
-#| msgid "dearmoring failed: %s\n"
-msgid "searching '%s' failed: %s\n"
-msgstr "elkirasigo malsukcesis: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:759
-#, fuzzy, c-format
-msgid "'%s' is not an LDAP URL\n"
-msgstr "%s: ne estas fido-datenaro\n"
-
-#: dirmngr/dirmngr_ldap.c:765
-#, c-format
-msgid "'%s' is an invalid LDAP URL\n"
-msgstr ""
-
-#: dirmngr/http.c:1989 dirmngr/ocsp.c:255
+#: dirmngr/http.c:1998 dirmngr/ocsp.c:255
 #, fuzzy, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: dirmngr/http.c:3630 dirmngr/ocsp.c:229
+#: dirmngr/http.c:3652 dirmngr/ocsp.c:229
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr ""
 
-#: dirmngr/http.c:3636 dirmngr/ocsp.c:246
+#: dirmngr/http.c:3658 dirmngr/ocsp.c:246
 #, fuzzy, c-format
 msgid "too many redirections\n"
 msgstr "tro da '%c'-preferoj\n"
 
-#: dirmngr/http.c:3748
+#: dirmngr/http.c:3768
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "redirection changed to '%s'\n"
@@ -10987,31 +10788,51 @@ msgstr "aktualigo malsukcesis: %s\n"
 msgid "ldap wrapper %d stalled - killing\n"
 msgstr ""
 
-#: dirmngr/ldap.c:91
+#: dirmngr/ldap.c:92
 #, c-format
 msgid "invalid char 0x%02x in host name - not added\n"
 msgstr ""
 
-#: dirmngr/ldap.c:95
+#: dirmngr/ldap.c:96
 #, fuzzy, c-format
 msgid "adding '%s:%d' to the ldap server list\n"
 msgstr "serĉas pri \"%s\" ĉe HKP-servilo %s\n"
 
-#: dirmngr/ldap.c:98 dirmngr/misc.c:512
+#: dirmngr/ldap.c:99 dirmngr/misc.c:512
 #, fuzzy, c-format
 msgid "malloc failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: dirmngr/ldap.c:634
+#: dirmngr/ldap.c:221
+#, fuzzy, c-format
+msgid "'%s' is not an LDAP URL\n"
+msgstr "%s: ne estas fido-datenaro\n"
+
+#: dirmngr/ldap.c:227 dirmngr/ldap.c:233
 #, c-format
-msgid "start_cert_fetch: invalid pattern '%s'\n"
+msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
-#: dirmngr/ldap.c:846
+#: dirmngr/ldap.c:968
 #, c-format
 msgid "ldap_search hit the size limit of the server\n"
 msgstr ""
 
+#: dirmngr/ldapserver.c:119
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr ""
+
+#: dirmngr/ldapserver.c:181
+#, c-format
+msgid "%s:%u: ignoring unknown flag '%s'\n"
+msgstr ""
+
+#: dirmngr/ldapserver.c:203
+#, fuzzy, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr " s = supersalti ĉi tiun �losilon\n"
+
 #: dirmngr/misc.c:172
 #, fuzzy, c-format
 #| msgid "%s: invalid file version %d\n"
@@ -11105,87 +10926,87 @@ msgstr ""
 msgid "allocating list item failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: dirmngr/ocsp.c:537 dirmngr/ocsp.c:724
+#: dirmngr/ocsp.c:538 dirmngr/ocsp.c:725
 #, fuzzy, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: dirmngr/ocsp.c:584
+#: dirmngr/ocsp.c:585
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:623 dirmngr/validate.c:648
+#: dirmngr/ocsp.c:624 dirmngr/validate.c:648
 #, fuzzy, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "Valida atestilrevoko"
 
-#: dirmngr/ocsp.c:633
+#: dirmngr/ocsp.c:634
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:640
+#: dirmngr/ocsp.c:641
 #, fuzzy, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "Bona atestilo"
 
-#: dirmngr/ocsp.c:650
+#: dirmngr/ocsp.c:651
 #, fuzzy, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: dirmngr/ocsp.c:689
+#: dirmngr/ocsp.c:690
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:696
 #, fuzzy, c-format
 #| msgid "no default secret keyring: %s\n"
 msgid "no default OCSP signer defined\n"
 msgstr "mankas implicita sekreta �losilaro: %s\n"
 
-#: dirmngr/ocsp.c:702
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:707
+#: dirmngr/ocsp.c:708
 #, fuzzy, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "subskribado malsukcesis: %s\n"
 
-#: dirmngr/ocsp.c:764
+#: dirmngr/ocsp.c:765
 #, fuzzy, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: dirmngr/ocsp.c:789
+#: dirmngr/ocsp.c:790
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:790
+#: dirmngr/ocsp.c:791
 msgid "good"
 msgstr ""
 
-#: dirmngr/ocsp.c:796
+#: dirmngr/ocsp.c:797
 #, fuzzy, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "�losilo %08lX: �losilo estas revokita!\n"
 
-#: dirmngr/ocsp.c:831
+#: dirmngr/ocsp.c:832
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:843
+#: dirmngr/ocsp.c:844
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:858
+#: dirmngr/ocsp.c:859
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr ""
@@ -11195,72 +11016,68 @@ msgstr ""
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "subskribado malsukcesis: %s\n"
 
-#: dirmngr/server.c:1158
-msgid "ldapserver missing"
-msgstr ""
-
-#: dirmngr/server.c:1224
+#: dirmngr/server.c:1277
 msgid "serialno missing in cert ID"
 msgstr ""
 
-#: dirmngr/server.c:1387 dirmngr/server.c:1473 dirmngr/server.c:1909
-#: dirmngr/server.c:1980 dirmngr/server.c:2556 dirmngr/server.c:2571
+#: dirmngr/server.c:1440 dirmngr/server.c:1526 dirmngr/server.c:1963
+#: dirmngr/server.c:2034 dirmngr/server.c:2662 dirmngr/server.c:2677
 #, fuzzy, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "subskribado malsukcesis: %s\n"
 
-#: dirmngr/server.c:1516
+#: dirmngr/server.c:1569
 #, fuzzy, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: dirmngr/server.c:1528 dirmngr/server.c:1559 dirmngr/server.c:1718
+#: dirmngr/server.c:1581 dirmngr/server.c:1612 dirmngr/server.c:1772
 #, fuzzy, c-format
 msgid "error sending data: %s\n"
 msgstr "eraro dum sendo al '%s': %s\n"
 
-#: dirmngr/server.c:1666
+#: dirmngr/server.c:1720
 #, fuzzy, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: dirmngr/server.c:1699
+#: dirmngr/server.c:1753
 #, fuzzy, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: dirmngr/server.c:1726
+#: dirmngr/server.c:1780
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:2860
+#: dirmngr/server.c:2966
 #, fuzzy, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "ne povas krei '%s': %s\n"
 
-#: dirmngr/server.c:2871
+#: dirmngr/server.c:2977
 #, fuzzy, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "%s: malsukcesis krei haktabelon: %s\n"
 
-#: dirmngr/server.c:2892
+#: dirmngr/server.c:2998
 #, fuzzy, c-format
 #| msgid "failed to initialize the TrustDB: %s\n"
 msgid "failed to initialize the server: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: dirmngr/server.c:2900
+#: dirmngr/server.c:3006
 #, fuzzy, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "malsukcesis rekonstrui �losilaran staplon: %s\n"
 
-#: dirmngr/server.c:2933
+#: dirmngr/server.c:3039
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:2952
+#: dirmngr/server.c:3058
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -11409,73 +11226,73 @@ msgstr "gpg-agent ne estas disponata en ĉi tiu sesio\n"
 msgid "error sending standard options: %s\n"
 msgstr "eraro dum sendo al '%s': %s\n"
 
-#: tools/gpgconf-comp.c:649
+#: tools/gpgconf-comp.c:655
 msgid "OpenPGP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:653
+#: tools/gpgconf-comp.c:659
 msgid "S/MIME"
 msgstr ""
 
-#: tools/gpgconf-comp.c:657
+#: tools/gpgconf-comp.c:663
 #, fuzzy
 msgid "Public Keys"
 msgstr "publika �losilo estas %08lX\n"
 
-#: tools/gpgconf-comp.c:661
+#: tools/gpgconf-comp.c:667
 msgid "Private Keys"
 msgstr ""
 
-#: tools/gpgconf-comp.c:665
+#: tools/gpgconf-comp.c:671
 msgid "Smartcards"
 msgstr ""
 
-#: tools/gpgconf-comp.c:669
+#: tools/gpgconf-comp.c:676
 msgid "TPM"
 msgstr ""
 
-#: tools/gpgconf-comp.c:673
+#: tools/gpgconf-comp.c:681
 #, fuzzy
 #| msgid "network error"
 msgid "Network"
 msgstr "reteraro"
 
-#: tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:685
 #, fuzzy
 msgid "Passphrase Entry"
 msgstr "malbona pasfrazo"
 
-#: tools/gpgconf-comp.c:941
+#: tools/gpgconf-comp.c:951
 #, fuzzy
 msgid "Component not suitable for launching"
 msgstr "publika �losilo ne trovita"
 
-#: tools/gpgconf-comp.c:947
+#: tools/gpgconf-comp.c:957
 #, c-format
 msgid "Configuration file of component %s is broken\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:950
+#: tools/gpgconf-comp.c:960
 #, fuzzy, c-format
 #| msgid "Please use the command \"toggle\" first.\n"
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr "Bonvolu uzi la komandon \"toggle\" unue.\n"
 
-#: tools/gpgconf-comp.c:2816
+#: tools/gpgconf-comp.c:2826
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2946
+#: tools/gpgconf-comp.c:2956
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3543
+#: tools/gpgconf-comp.c:3553
 #, fuzzy, c-format
 msgid "error closing '%s'\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: tools/gpgconf-comp.c:3545
+#: tools/gpgconf-comp.c:3555
 #, fuzzy, c-format
 msgid "error parsing '%s'\n"
 msgstr "eraro dum legado de '%s': %s\n"
@@ -11559,16 +11376,16 @@ msgid ""
 "Manage configuration options for tools of the @GNUPG@ system\n"
 msgstr ""
 
-#: tools/gpgconf.c:669 tools/gpgconf.c:704
+#: tools/gpgconf.c:703 tools/gpgconf.c:738
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:678 tools/gpgconf.c:728 tools/gpgconf.c:778
+#: tools/gpgconf.c:712 tools/gpgconf.c:762 tools/gpgconf.c:812
 #, fuzzy
 msgid "Component not found"
 msgstr "publika �losilo ne trovita"
 
-#: tools/gpgconf.c:804
+#: tools/gpgconf.c:838
 #, fuzzy
 msgid "No argument allowed"
 msgstr "skribas sekretan �losilon al '%s'\n"
@@ -11584,88 +11401,179 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
-#: tools/gpg-card.c:2390
+#: tools/gpg-card.c:2407
 #, fuzzy, c-format
 msgid "Note: key %s is already stored on the card!\n"
 msgstr "ignorita: sekreta �losilo jam ĉeestas\n"
 
-#: tools/gpg-card.c:2393
+#: tools/gpg-card.c:2410
 #, fuzzy, c-format
 msgid "Note: Keys are already stored on the card!\n"
 msgstr "ignorita: sekreta �losilo jam ĉeestas\n"
 
-#: tools/gpg-card.c:2396
+#: tools/gpg-card.c:2413
 #, c-format
 msgid "Replace existing key %s ? (y/N) "
 msgstr ""
 
-#: tools/gpg-card.c:2549 tools/gpg-card.c:2712 tools/gpg-card.c:2935
-#: tools/gpg-card.c:3044
+#: tools/gpg-card.c:2566 tools/gpg-card.c:2729 tools/gpg-card.c:2952
+#: tools/gpg-card.c:3061
 #, c-format
 msgid "%s card no. %s detected\n"
 msgstr ""
 
-#: tools/gpg-card.c:3396
+#: tools/gpg-card.c:3413
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3406 tools/gpg-card.c:3420
+#: tools/gpg-card.c:3423 tools/gpg-card.c:3437
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
 "         can only be reverted using a factory reset!\n"
 msgstr ""
 
-#: tools/gpg-card.c:3423
+#: tools/gpg-card.c:3440
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3669
+#: tools/gpg-card.c:3686
 #, fuzzy
 msgid "authenticate to the card"
 msgstr "�losilo %08lX: revokatestilo aldonita\n"
 
-#: tools/gpg-card.c:3671
+#: tools/gpg-card.c:3688
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3673
+#: tools/gpg-card.c:3690
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication"
 msgstr "|NOMO|uzi NOMOn kiel implicitan ricevonton"
 
-#: tools/gpg-card.c:3675
+#: tools/gpg-card.c:3692
 #, fuzzy
 #| msgid "change the expire date"
 msgid "change a private data object"
 msgstr "�an�i la daton de eksvalidi�o"
 
-#: tools/gpg-card.c:3676
+#: tools/gpg-card.c:3693
 #, fuzzy
 msgid "read a certificate from a data object"
 msgstr "�losilo %08lX: revokatestilo aldonita\n"
 
-#: tools/gpg-card.c:3677
+#: tools/gpg-card.c:3694
 #, fuzzy
 msgid "store a certificate to a data object"
 msgstr "�losilo %08lX: revokatestilo aldonita\n"
 
-#: tools/gpg-card.c:3678
+#: tools/gpg-card.c:3695
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3679
+#: tools/gpg-card.c:3696
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3681
+#: tools/gpg-card.c:3698
 msgid "manage the command history"
 msgstr ""
 
 #, fuzzy
+#~ msgid "requesting key %s from %s server %s\n"
+#~ msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
+
+#, fuzzy
+#~ msgid "could not parse keyserver\n"
+#~ msgstr "ne povis analizi URI de �losilservilo\n"
+
+#, fuzzy
+#~| msgid "|NAME|set terminal charset to NAME"
+#~ msgid "|NAME|connect to host NAME"
+#~ msgstr "|NOMO|difini NOMOn kiel la signaron de la terminalo"
+
+#, fuzzy
+#~| msgid "|NAME|use NAME as default recipient"
+#~ msgid "|NAME|use user NAME for authentication"
+#~ msgstr "|NOMO|uzi NOMOn kiel implicitan ricevonton"
+
+#, fuzzy
+#~| msgid "Usage: gpg [options] [files] (-h for help)"
+#~ msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
+#~ msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
+
+#, fuzzy
+#~ msgid "invalid port number %d\n"
+#~ msgstr "nevalida kiraso"
+
+#, fuzzy
+#~ msgid "error writing to stdout: %s\n"
+#~ msgstr "eraro dum skribado de �losilaro '%s': %s\n"
+
+#, fuzzy
+#~| msgid "user '%s' not found: %s\n"
+#~ msgid "attribute '%s' not found\n"
+#~ msgstr "uzanto '%s' ne trovita: %s\n"
+
+#, fuzzy
+#~| msgid "reading from `%s'\n"
+#~ msgid "processing url '%s'\n"
+#~ msgstr "legas el '%s'\n"
+
+#, fuzzy
+#~| msgid "          w/o user IDs: %lu\n"
+#~ msgid "          user '%s'\n"
+#~ msgstr "         sen uzantidentigilo: %lu\n"
+
+#, fuzzy
+#~ msgid "          pass '%s'\n"
+#~ msgstr "            alinome \""
+
+#, fuzzy
+#~ msgid "          host '%s'\n"
+#~ msgstr "            alinome \""
+
+#, fuzzy
+#~ msgid "          port %d\n"
+#~ msgstr "                  importitaj: %lu"
+
+#, fuzzy
+#~ msgid "            DN '%s'\n"
+#~ msgstr "            alinome \""
+
+#, fuzzy
+#~ msgid "          attr '%s'\n"
+#~ msgstr "            alinome \""
+
+#, fuzzy
+#~ msgid "WARNING: using first attribute only\n"
+#~ msgstr "Averto: uzas malsekuran memoron!\n"
+
+#, fuzzy
+#~ msgid "LDAP init to '%s:%d' failed: %s\n"
+#~ msgstr "enkirasigo malsukcesis: %s\n"
+
+#, fuzzy
+#~ msgid "LDAP init to '%s' failed: %s\n"
+#~ msgstr "enkirasigo malsukcesis: %s\n"
+
+#, fuzzy
+#~ msgid "LDAP init to '%s' done\n"
+#~ msgstr "enkirasigo malsukcesis: %s\n"
+
+#, fuzzy
+#~ msgid "binding to '%s:%d' failed: %s\n"
+#~ msgstr "enkirasigo malsukcesis: %s\n"
+
+#, fuzzy
+#~| msgid "dearmoring failed: %s\n"
+#~ msgid "searching '%s' failed: %s\n"
+#~ msgstr "elkirasigo malsukcesis: %s\n"
+
+#, fuzzy
 #~ msgid "Suggest a random passphrase."
 #~ msgstr "�an�i la pasfrazon"
 
diff --git a/po/es.gmo b/po/es.gmo
index fd10809..6367e6b 100644
--- a/po/es.gmo
+++ b/po/es.gmo
diff --git a/po/es.po b/po/es.po
index ea9318f..e653ae0 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: 2021-04-20 12:38+0200\n"
+"POT-Creation-Date: 2021-08-24 18:50+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:328
+#: agent/call-pinentry.c:338
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "no pude conseguir el bloqueo de entrada de pin: %s\n"
@@ -32,45 +32,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:546
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_OK"
 msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:547
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_Cancel"
 msgstr "|pinentry-label|_Cancelar"
 
-#: agent/call-pinentry.c:548
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|_Yes"
 msgstr "|pinentry-label|_Sí"
 
-#: agent/call-pinentry.c:549
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_No"
 msgstr "|pinentry-label|_No"
 
-#: agent/call-pinentry.c:550
+#: agent/call-pinentry.c:560
 msgid "|pinentry-label|PIN:"
 msgstr "|pinentry-label|PIN:"
 
-#: agent/call-pinentry.c:551
+#: agent/call-pinentry.c:561
 msgid "|pinentry-label|_Save in password manager"
 msgstr "|pinentry-label|_Guardar en gestor de contraseñas"
 
-#: agent/call-pinentry.c:552
+#: agent/call-pinentry.c:562
 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:554
+#: agent/call-pinentry.c:564
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr "|pinentry-tt|Mostrar frase contraseña"
 
-#: agent/call-pinentry.c:555
+#: agent/call-pinentry.c:565
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "|pinentry-tt|Esconder frase contraseña"
 
+#: agent/call-pinentry.c:566
+msgid "Caps Lock is on"
+msgstr ""
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:944
+#: agent/call-pinentry.c:1022
 msgid "Suggest"
 msgstr ""
 
@@ -81,15 +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:966
+#: agent/call-pinentry.c:1044
 #, fuzzy
 #| msgid "pinentry.qualitybar.tooltip"
 msgid "pinentry.genpin.tooltip"
 msgstr "barra de calidad, entrada de pin"
 
+#: agent/call-pinentry.c:1072
+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
+#, fuzzy
+#| msgid "Passphrase too long"
+msgid "Passphrase Not Allowed"
+msgstr "Frase contraseña demasiado larga"
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:998
+#: agent/call-pinentry.c:1198
 msgid "Quality:"
 msgstr "Calidad:"
 
@@ -99,18 +116,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:1019
+#: agent/call-pinentry.c:1219
 msgid "pinentry.qualitybar.tooltip"
 msgstr "barra de calidad, entrada de pin"
 
-#: agent/call-pinentry.c:1263
+#: agent/call-pinentry.c:1477
 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:1266
+#: agent/call-pinentry.c:1480
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -118,7 +135,7 @@ msgstr ""
 "Por favor introduzca la frase contraseña para desbloquear la clave secreta "
 "de esta sesión"
 
-#: agent/call-pinentry.c:1303 agent/call-pinentry.c:1506
+#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
 msgid "PIN:"
 msgstr "PIN:"
 
@@ -131,46 +148,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:1303 agent/call-pinentry.c:1506
-#: agent/protect-tool.c:728
+#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/protect-tool.c:729
 msgid "Passphrase:"
 msgstr "Frase contraseña:"
 
-#: agent/call-pinentry.c:1330 agent/call-pinentry.c:1580 agent/command.c:1799
-#: agent/command.c:1852 agent/command-ssh.c:3046 agent/genkey.c:398
+#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
+#: agent/command.c:1988 agent/command-ssh.c:3046 agent/genkey.c:442
 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:1351 agent/call-pinentry.c:1603
+#: agent/call-pinentry.c:1566 agent/call-pinentry.c:1830
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (intento %d de %d)"
 
-#: agent/call-pinentry.c:1362 agent/call-pinentry.c:1614
+#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
 msgid "Repeat:"
 msgstr "Repetir:"
 
-#: agent/call-pinentry.c:1372 agent/call-pinentry.c:1384
-#: agent/call-pinentry.c:1624 agent/call-pinentry.c:1636
+#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
+#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
 msgid "PIN too long"
 msgstr "PIN demasiado largo"
 
-#: agent/call-pinentry.c:1373 agent/call-pinentry.c:1625
+#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
 msgid "Passphrase too long"
 msgstr "Frase contraseña demasiado larga"
 
-#: agent/call-pinentry.c:1381 agent/call-pinentry.c:1633
+#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
 msgid "Invalid characters in PIN"
 msgstr "Caracteres inválidos en el PIN"
 
-#: agent/call-pinentry.c:1386 agent/call-pinentry.c:1638
+#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
 msgid "PIN too short"
 msgstr "PIN demasiado corto"
 
-#: agent/call-pinentry.c:1405 agent/call-pinentry.c:1656
+#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
 msgid "Bad PIN"
 msgstr "PIN incorrecto"
 
@@ -183,29 +200,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:1405 agent/call-pinentry.c:1656
+#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
 msgid "Bad Passphrase"
 msgstr "Frase contraseña errónea"
 
-#: agent/command.c:697
+#: agent/command.c:823
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:698
+#: agent/command.c:824
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1106 g10/card-util.c:708 g10/card-util.c:729
+#: agent/command.c:1235 g10/card-util.c:713 g10/card-util.c:734
 #, 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:1634 agent/command.c:1791 agent/command-ssh.c:2974
-#: agent/genkey.c:333
+#: agent/command.c:1756 agent/command.c:1921 agent/command-ssh.c:2974
+#: agent/genkey.c:377
 msgid "Please re-enter this passphrase"
 msgstr "Por favor vuelva a introducir frase contraseña"
 
-#: agent/command.c:2567
+#: agent/command.c:2703
 #, fuzzy, c-format
 #| msgid ""
 #| "Please enter the passphrase to protect the imported object within the "
@@ -216,7 +233,7 @@ msgid ""
 msgstr ""
 "Introduzca la frase contraseña para proteger el objeto importado en GnuPG."
 
-#: agent/command.c:2697
+#: agent/command.c:2833
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -227,25 +244,25 @@ msgstr ""
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "no pueden usarse claves ssh de más de %d bits\n"
 
-#: agent/command-ssh.c:872 common/dotlock.c:852 g10/card-util.c:953
-#: g10/export.c:1329 g10/gpg.c:1431 g10/keygen.c:5347 g10/keyring.c:1319
-#: g10/keyring.c:1632 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
+#: agent/command-ssh.c:872 common/dotlock.c:852 g10/card-util.c:963
+#: g10/export.c:1329 g10/gpg.c:1431 g10/keygen.c:5377 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
 #: g10/sign.c:1106 g10/sign.c:1443 g10/tdbio.c:753 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:884 common/helpfile.c:57 g10/card-util.c:910
+#: agent/command-ssh.c:884 common/helpfile.c:57 g10/card-util.c:920
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
 #: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:721 g10/gpg.c:1432
-#: g10/import.c:371 g10/import.c:558 g10/import.c:793 g10/keygen.c:4322
-#: g10/keyring.c:1658 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
+#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4326
+#: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
 #: g10/plaintext.c:610 g10/sign.c:1086 g10/sign.c:1311 g10/sign.c:1424
 #: g10/sign.c:1596 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2380
-#: sm/gpgsm.c:2410 sm/gpgsm.c:2448 sm/keylist.c:1737 sm/qualified.c:65
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2236
+#: sm/gpgsm.c:2266 sm/gpgsm.c:2304 sm/keylist.c:1775 sm/qualified.c:65
 #: dirmngr/certcache.c:396 dirmngr/certcache.c:476 dirmngr/certcache.c:478
-#: dirmngr/crlcache.c:2588 dirmngr/dirmngr.c:1720 tools/gpg-card.c:408
+#: dirmngr/crlcache.c:2591 dirmngr/dirmngr.c:1759 tools/gpg-card.c:408
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "no se puede abrir '%s': %s\n"
@@ -354,21 +371,21 @@ msgstr "PIN repetido incorrectamente; inténtelo de nuevo"
 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:109 sm/certreqgen-ui.c:433
+#: 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:116
+#: 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
+#: agent/genkey.c:191
 msgid "Enter new passphrase"
 msgstr "Introduzca nueva frase contraseña"
 
-#: agent/genkey.c:184
+#: agent/genkey.c:227
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
@@ -376,7 +393,7 @@ msgstr ""
 "¡No ha introducido una frase contraseña!%0AnNo se permiten frases contraseña "
 "en blanco."
 
-#: agent/genkey.c:186
+#: agent/genkey.c:229
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -385,18 +402,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:198
+#: agent/genkey.c:241
 msgid "Yes, protection is not needed"
 msgstr "Sí, no se necesita protección"
 
-#: agent/genkey.c:215
+#: agent/genkey.c:258
 #, 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:234
+#: agent/genkey.c:277
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -408,195 +425,194 @@ msgstr[1] ""
 "Una frase contraseña debe tener al menos %u dígitos o %%0A caracteres "
 "especiales."
 
-#: agent/genkey.c:260
+#: agent/genkey.c:304
 #, 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:275
+#: agent/genkey.c:319
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "Aviso: ha introducido una frase contraseña insegura."
 
-#: agent/genkey.c:296
+#: agent/genkey.c:340
 msgid "Take this one anyway"
 msgstr "Tomar esta de todas formas"
 
-#: agent/genkey.c:464
+#: agent/genkey.c:508
 #, 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:590
+#: agent/genkey.c:637
 msgid "Please enter the new passphrase"
 msgstr "Por favor escriba la nueva frase contraseña"
 
-#: agent/gpg-agent.c:162 scd/scdaemon.c:115 dirmngr/dirmngr.c:182
+#: agent/gpg-agent.c:164 scd/scdaemon.c:115 dirmngr/dirmngr.c:183
 #, fuzzy
 #| msgid "Options useful for debugging"
 msgid "Options used for startup"
 msgstr "Opciones útiles para el depurado"
 
-#: agent/gpg-agent.c:164 scd/scdaemon.c:120 dirmngr/dirmngr.c:171
+#: agent/gpg-agent.c:166 scd/scdaemon.c:120 dirmngr/dirmngr.c:172
 msgid "run in daemon mode (background)"
 msgstr "ejecutar en modo demonio (segundo plano)"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:117 dirmngr/dirmngr.c:170
+#: agent/gpg-agent.c:167 scd/scdaemon.c:117 dirmngr/dirmngr.c:171
 msgid "run in server mode (foreground)"
 msgstr "ejecutar en modo servidor (primer plano)"
 
-#: agent/gpg-agent.c:167 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:169 dirmngr/dirmngr.c:174
 msgid "run in supervised mode"
 msgstr "ejecutar en modo supervisado"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:121 dirmngr/dirmngr.c:184
+#: agent/gpg-agent.c:171 scd/scdaemon.c:121 dirmngr/dirmngr.c:185
 msgid "do not detach from the console"
 msgstr "no independizarse de la consola"
 
-#: agent/gpg-agent.c:170 scd/scdaemon.c:122 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:172 scd/scdaemon.c:122 dirmngr/dirmngr.c:186
 msgid "sh-style command output"
 msgstr "salida de datos estilo sh"
 
-#: agent/gpg-agent.c:171 scd/scdaemon.c:123 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:173 scd/scdaemon.c:123 dirmngr/dirmngr.c:187
 msgid "csh-style command output"
 msgstr "salida de datos estilo csh"
 
-#: agent/gpg-agent.c:179 g10/gpg.c:589 scd/scdaemon.c:125 sm/gpgsm.c:422
-#: dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:181 g10/gpg.c:589 scd/scdaemon.c:125 sm/gpgsm.c:423
+#: dirmngr/dirmngr.c:189
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|lee opciones desde FICHERO"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:574 scd/scdaemon.c:129 sm/gpgsm.c:265
-#: dirmngr/dirmngr.c:192
+#: agent/gpg-agent.c:185 g10/gpg.c:574 scd/scdaemon.c:129 sm/gpgsm.c:265
+#: dirmngr/dirmngr.c:193
 msgid "Options controlling the diagnostic output"
 msgstr "Opciones que controlan la salida de diagnósticos"
 
-#: agent/gpg-agent.c:185 g10/gpg.c:576 g10/gpgv.c:78 kbx/kbxutil.c:89
+#: agent/gpg-agent.c:187 g10/gpg.c:576 g10/gpgv.c:78 kbx/kbxutil.c:89
 #: scd/scdaemon.c:131 sm/gpgsm.c:267 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:194 dirmngr/dirmngr_ldap.c:102
-#: tools/gpg-connect-agent.c:85 tools/gpgconf.c:111
+#: dirmngr/dirmngr.c:195 tools/gpg-connect-agent.c:85 tools/gpgconf.c:111
 msgid "verbose"
 msgstr "prolijo"
 
-#: agent/gpg-agent.c:186 g10/gpg.c:578 g10/gpgv.c:79 kbx/kbxutil.c:90
+#: agent/gpg-agent.c:188 g10/gpg.c:578 g10/gpgv.c:79 kbx/kbxutil.c:90
 #: scd/scdaemon.c:132 sm/gpgsm.c:269 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:195 dirmngr/dirmngr_ldap.c:103
+#: dirmngr/dirmngr.c:196
 msgid "be somewhat more quiet"
 msgstr "algo más discreto"
 
-#: agent/gpg-agent.c:194 g10/gpg.c:593 sm/gpgsm.c:283 dirmngr/dirmngr.c:205
+#: agent/gpg-agent.c:196 g10/gpg.c:593 sm/gpgsm.c:283 dirmngr/dirmngr.c:206
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FILE|escribir logs en modo servidor en FICHERO"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 scd/scdaemon.c:146 sm/gpgsm.c:290
-#: dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:599 scd/scdaemon.c:146 sm/gpgsm.c:290
+#: dirmngr/dirmngr.c:210
 msgid "Options controlling the configuration"
 msgstr "Opciones que controlan la configuración"
 
-#: agent/gpg-agent.c:201
+#: agent/gpg-agent.c:203
 msgid "do not use the SCdaemon"
 msgstr "no usar SCdaemon"
 
-#: agent/gpg-agent.c:203
+#: agent/gpg-agent.c:205
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|usar PCM como programa SCdaemon"
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 #, 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:209
+#: agent/gpg-agent.c:211
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|aceptar algunos comandos via NAME"
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 msgid "ignore requests to change the TTY"
 msgstr "ignorar peticiones de cambiar el TTY"
 
-#: agent/gpg-agent.c:215
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the X display"
 msgstr "ignorar peticiones de cambiar el display X"
 
-#: agent/gpg-agent.c:216
+#: agent/gpg-agent.c:218
 msgid "enable ssh support"
 msgstr "permitir soporte de ssh-agent"
 
-#: agent/gpg-agent.c:218
+#: agent/gpg-agent.c:220
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "|ALGO|usar ALGO para mostrar las huellas digitales de ssh"
 
-#: agent/gpg-agent.c:221
+#: agent/gpg-agent.c:223
 msgid "enable putty support"
 msgstr "habilitar soporte de putty"
 
-#: agent/gpg-agent.c:233 g10/gpg.c:844 scd/scdaemon.c:176 sm/gpgsm.c:382
+#: agent/gpg-agent.c:235 g10/gpg.c:844 scd/scdaemon.c:176 sm/gpgsm.c:383
 msgid "Options controlling the security"
 msgstr "Opciones que controlan la seguridad"
 
-#: agent/gpg-agent.c:236
+#: agent/gpg-agent.c:238
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|los PINs en la caché expiran en N segundos"
 
-#: agent/gpg-agent.c:238
+#: agent/gpg-agent.c:240
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|las claves SSH caducan en N segundos"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:242
 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:242
+#: agent/gpg-agent.c:244
 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:244
+#: agent/gpg-agent.c:246
 msgid "do not use the PIN cache when signing"
 msgstr "no usar el caché de PINs al firmar"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:248
 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:248
+#: agent/gpg-agent.c:250
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "no permitir que los clientes marquen claves como \"confiables\""
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:253
 msgid "allow presetting passphrase"
 msgstr "permitir preestablecer frase contraseña"
 
-#: agent/gpg-agent.c:256
+#: agent/gpg-agent.c:258
 msgid "Options enforcing a passphrase policy"
 msgstr "Opciones que fuerzan una política de frases contraseña"
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:261
 msgid "do not allow bypassing the passphrase policy"
 msgstr "no permitir evitar la política de frases contraseña"
 
-#: agent/gpg-agent.c:261
+#: agent/gpg-agent.c:263
 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:263
+#: agent/gpg-agent.c:265
 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:266
+#: agent/gpg-agent.c:268
 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:268
+#: agent/gpg-agent.c:272
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|frase contraseña caduca tras N días"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:274
 msgid "do not allow the reuse of old passphrases"
 msgstr "no permite reusar antiguas frases contraseña"
 
-#: agent/gpg-agent.c:273
+#: agent/gpg-agent.c:277
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the PIN-Entry"
@@ -604,50 +620,50 @@ msgstr "Opciones que controlan la seguridad"
 
 # usa
 # Vale.
-#: agent/gpg-agent.c:275
+#: agent/gpg-agent.c:279
 #, fuzzy
 #| msgid "use the gpg-agent"
 msgid "never use the PIN-entry"
 msgstr "usa el agente gpg"
 
-#: agent/gpg-agent.c:277
+#: agent/gpg-agent.c:281
 msgid "disallow caller to override the pinentry"
 msgstr "no permitir que el caller cambie la entrada de pin"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:283
 #, 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:282
+#: agent/gpg-agent.c:286
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|usar PGM como el programa para entrada de PIN"
 
-#: agent/gpg-agent.c:286
+#: agent/gpg-agent.c:290
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|establecer vida máxima de Pinentry en N segundos"
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:294
 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:551 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: agent/gpg-agent.c:557 agent/preset-passphrase.c:99 agent/protect-tool.c:154
 #: g10/gpg.c:1132 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:612 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:438
-#: dirmngr/dirmngr_ldap.c:175 tools/gpg-connect-agent.c:220 tools/gpgconf.c:151
+#: sm/gpgsm.c:613 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:446
+#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:151
 #: 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:560
+#: agent/gpg-agent.c:566
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Uso: @GPG_AGENT@ [opciones] (-h para ayuda)"
 
-#: agent/gpg-agent.c:562
+#: agent/gpg-agent.c:568
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -655,132 +671,132 @@ msgstr ""
 "Sintaxis: @GPG_AGENT@ [opciones] [orden [argumentos]]\n"
 "Manejo de claves privadas por @GNUPG@\n"
 
-#: agent/gpg-agent.c:607 g10/gpg.c:1337 scd/scdaemon.c:384 sm/gpgsm.c:760
-#: dirmngr/dirmngr.c:522
+#: agent/gpg-agent.c:613 g10/gpg.c:1337 scd/scdaemon.c:384 sm/gpgsm.c:761
+#: dirmngr/dirmngr.c:530
 #, 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:972 g10/gpg.c:3910 g10/gpg.c:3934 sm/gpgsm.c:1769
-#: sm/gpgsm.c:1775
+#: agent/gpg-agent.c:986 g10/gpg.c:3907 g10/gpg.c:3931 sm/gpgsm.c:1622
+#: sm/gpgsm.c:1628
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no inválido\n"
 
-#: agent/gpg-agent.c:1196 agent/gpg-agent.c:2019 common/comopt.c:93
-#: g10/gpg.c:2591 scd/scdaemon.c:549 sm/gpgsm.c:1155 dirmngr/dirmngr.c:989
-#: dirmngr/dirmngr.c:1840
+#: agent/gpg-agent.c:1210 agent/gpg-agent.c:2035 common/comopt.c:93
+#: g10/gpg.c:2594 scd/scdaemon.c:549 sm/gpgsm.c:1028 dirmngr/dirmngr.c:1029
+#: dirmngr/dirmngr.c:1879
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "leyendo opciones de '%s'\n"
 
-#: agent/gpg-agent.c:1335 g10/gpg.c:3861 scd/scdaemon.c:687 sm/gpgsm.c:1709
-#: dirmngr/dirmngr.c:1108 tools/gpg-connect-agent.c:1270 tools/gpgconf.c:634
+#: agent/gpg-agent.c:1349 g10/gpg.c:3858 scd/scdaemon.c:687 sm/gpgsm.c:1562
+#: dirmngr/dirmngr.c:1145 tools/gpg-connect-agent.c:1270 tools/gpgconf.c:668
 #, 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:2172 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1267
+#: agent/gpg-agent.c:2188 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1306
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "no se puede crear el socket: %s\n"
 
-#: agent/gpg-agent.c:2189 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1280
+#: agent/gpg-agent.c:2205 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1319
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "el nombre de socket '%s' es demasiado largo\n"
 
-#: agent/gpg-agent.c:2228
+#: agent/gpg-agent.c:2244
 #, 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:2239 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1312
+#: agent/gpg-agent.c:2255 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1351
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "error obteniendo valor único para el socket\n"
 
-#: agent/gpg-agent.c:2244 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1315
+#: agent/gpg-agent.c:2260 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1354
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "error enlazando el socket con '%s': %s\n"
 
-#: agent/gpg-agent.c:2255 agent/gpg-agent.c:2295 agent/gpg-agent.c:2304
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1324
+#: agent/gpg-agent.c:2271 agent/gpg-agent.c:2311 agent/gpg-agent.c:2320
+#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1363
 #, 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:2269 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1336
+#: agent/gpg-agent.c:2285 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1375
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "escuchando en el socket '%s'\n"
 
-#: agent/gpg-agent.c:2289 agent/gpg-agent.c:2342 common/homedir.c:517
+#: agent/gpg-agent.c:2305 agent/gpg-agent.c:2358 common/homedir.c:537
 #: 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:2292 agent/gpg-agent.c:2347 common/homedir.c:520
+#: agent/gpg-agent.c:2308 agent/gpg-agent.c:2363 common/homedir.c:540
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "creado el directorio '%s'\n"
 
-#: agent/gpg-agent.c:2353
+#: agent/gpg-agent.c:2369
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "stat() falló para '%s': %s\n"
 
-#: agent/gpg-agent.c:2357
+#: agent/gpg-agent.c:2373
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "no puede usar '%s' como directorio personal\n"
 
-#: agent/gpg-agent.c:2512 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2069
+#: agent/gpg-agent.c:2528 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2108
 #, 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:2719
+#: agent/gpg-agent.c:2735
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "manejador 0x%lx para descriptor %d iniciado\n"
 
-#: agent/gpg-agent.c:2724
+#: agent/gpg-agent.c:2740
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "manejador 0x%lx pada descriptor %d finalizado\n"
 
-#: agent/gpg-agent.c:2799
+#: agent/gpg-agent.c:2815
 #, 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:2804
+#: agent/gpg-agent.c:2820
 #, 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:3026 scd/scdaemon.c:1374 dirmngr/dirmngr.c:2283
+#: agent/gpg-agent.c:3042 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2322
 #, 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:3114 scd/scdaemon.c:1439
+#: agent/gpg-agent.c:3130 scd/scdaemon.c:1441
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s detenido\n"
 
-#: agent/gpg-agent.c:3252 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3271 common/simple-pwquery.c:247 g10/call-agent.c:260
 #: sm/call-agent.c:131 tools/gpg-connect-agent.c:2319 tools/card-call-scd.c:311
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "no hay un agente gpg ejecutándose en esta sesión\n"
 
-#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:70
+#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:66
 msgid ""
 "@Options:\n"
 " "
@@ -805,7 +821,7 @@ msgstr ""
 # puede acentuar? ¿demasiado alta?
 # ¿Quién dice que no se puede? :-)
 #: agent/protect-tool.c:107 g10/gpg.c:448 kbx/kbxutil.c:72 sm/gpgsm.c:215
-#: dirmngr/dirmngr.c:168 tools/gpgconf.c:81
+#: dirmngr/dirmngr.c:169 tools/gpgconf.c:81
 msgid ""
 "@Commands:\n"
 " "
@@ -836,22 +852,22 @@ msgstr ""
 "Sintaxis: gpg-protect-tool [opciones] [args]\n"
 "Herramienta para el mantenimiento de claves secretas\n"
 
-#: agent/protect-tool.c:707
+#: agent/protect-tool.c:708 sm/import.c:775
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Introduzca frase contraseña para desproteger el objeto PKCS#12."
 
-#: agent/protect-tool.c:712
+#: agent/protect-tool.c:713 sm/export.c:727
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Introduzca frase contraseña para proteger el nuevo objeto PKCS#12."
 
-#: agent/protect-tool.c:718
+#: agent/protect-tool.c:719
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 "Introduzca la frase contraseña para proteger el objeto importado en GnuPG."
 
-#: agent/protect-tool.c:723
+#: agent/protect-tool.c:724
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -859,17 +875,17 @@ msgstr ""
 "Por favor introduzca la frase contraseña o PIN\n"
 "necesarios para completar esta operación."
 
-#: agent/protect-tool.c:734
+#: agent/protect-tool.c:735
 #, c-format
 msgid "cancelled\n"
 msgstr "cancelado\n"
 
-#: agent/protect-tool.c:736
+#: agent/protect-tool.c:737
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "error pidiendo la frase contraseña: %s\n"
 
-#: agent/trustlist.c:153 agent/trustlist.c:363 tools/gpgconf.c:424
+#: agent/trustlist.c:153 agent/trustlist.c:363 tools/gpgconf.c:458
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "error abriendo '%s': %s\n"
@@ -1032,7 +1048,7 @@ msgstr "la comprobación de la firma creada falló: %s\n"
 msgid "secret key parts are not available\n"
 msgstr "las partes de la clave privada no están disponibles\n"
 
-#: agent/cvt-openpgp.c:343 g10/card-util.c:1562
+#: agent/cvt-openpgp.c:343 g10/card-util.c:1575
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr "el algoritmo de llave pública %d (%s) no se puede usar\n"
@@ -1061,7 +1077,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:505 common/exechelp-posix.c:580
-#: common/exechelp-posix.c:866 dirmngr/dirmngr.c:1354
+#: common/exechelp-posix.c:866 dirmngr/dirmngr.c:1393
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "error bifurcando procesos: %s\n"
@@ -1133,7 +1149,7 @@ msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "renombrar '%s' a '%s' falló: %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3082
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3099
 msgid "yes"
 msgstr "sí|si"
 
@@ -1187,7 +1203,7 @@ msgstr "agotado núcleo de memoria segura reservando %lu bytes"
 msgid "out of core while allocating %lu bytes"
 msgstr "error de memoria al reservar %lu bytes"
 
-#: common/miscellaneous.c:115 g10/card-util.c:917 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:927 tools/no-libgcrypt.c:30
 #: tools/gpg-card.c:416
 #, c-format
 msgid "error allocating enough memory: %s\n"
@@ -1264,7 +1280,7 @@ msgstr "error intentando averiguar la versión de '%s': %s\n"
 msgid "server '%s' is older than us (%s < %s)"
 msgstr "el servidor '%s' es más viejo que nosotros (%s < %s)"
 
-#: common/asshelp.c:737 g10/call-dirmngr.c:408
+#: common/asshelp.c:737 g10/call-dirmngr.c:407
 #, c-format
 msgid "WARNING: %s\n"
 msgstr "ATENCIÓN: %s\n"
@@ -1349,7 +1365,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:4212
+#: scd/app-openpgp.c:4214
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "algoritmo no disponible: %s"
@@ -1424,11 +1440,11 @@ msgstr "Cadena de certificados válida"
 msgid "Root certificate trustworthy"
 msgstr "Certificado raíz fiable"
 
-#: common/audit.c:1112 sm/certchain.c:1242
+#: common/audit.c:1112 sm/certchain.c:1243
 msgid "no CRL found for certificate"
 msgstr "no se encuentra CRL para el certificado"
 
-#: common/audit.c:1115 sm/certchain.c:1252
+#: common/audit.c:1115 sm/certchain.c:1253
 msgid "the available CRL is too old"
 msgstr "el CRL disponible es demasiado antiguo"
 
@@ -1474,22 +1490,22 @@ msgstr "[ninguno]"
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "caracter inválido radix64 %02x omitido\n"
 
-#: common/ttyio.c:433
+#: common/ttyio.c:447
 #, c-format
 msgid "Sorry, we are in batchmode - can't get input\n"
 msgstr ""
 
-#: common/ttyio.c:439
+#: common/ttyio.c:453
 #, c-format
 msgid "Sorry, no terminal at all requested - can't get input\n"
 msgstr ""
 
-#: common/ttyio.c:474 common/ttyio.c:484
+#: common/ttyio.c:488 common/ttyio.c:498
 #, c-format
 msgid "too many errors; giving up\n"
 msgstr ""
 
-#: common/ttyio.c:536
+#: common/ttyio.c:550
 #, c-format
 msgid "Control-D detected\n"
 msgstr ""
@@ -1543,8 +1559,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:1036 dirmngr/dirmngr.c:895
-#: dirmngr/dirmngr.c:904
+#: common/init.c:191 sm/gpgsm.c:909 dirmngr/dirmngr.c:935 dirmngr/dirmngr.c:944
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s es demasiado antiguo (necesita %s, tiene %s)\n"
@@ -1697,7 +1712,7 @@ msgid "Enter passphrase: "
 msgstr "Introduzca la frase contraseña: "
 
 #: g10/call-agent.c:318 g10/encrypt.c:282 g10/encrypt.c:818 g10/sign.c:473
-#: sm/call-agent.c:180 sm/encrypt.c:701 sm/sign.c:436
+#: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
 #, c-format
 msgid "%s is not compliant with %s mode\n"
 msgstr "%s no funciona con el modo %s\n"
@@ -1708,220 +1723,220 @@ msgstr "%s no funciona con el modo %s\n"
 msgid "error from TPM: %s\n"
 msgstr "error al leer de %s: %s\n"
 
-#: g10/call-agent.c:2123 g10/passphrase.c:225 g10/passphrase.c:258
-#: tools/card-call-scd.c:1751
+#: g10/call-agent.c:2135 g10/passphrase.c:233 g10/passphrase.c:266
+#: tools/card-call-scd.c:1755
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problema con el agente: %s\n"
 
-#: g10/call-dirmngr.c:179 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2316
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2316
 #, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "no hay agente dirmngr activo en esta sesión\n"
 
-#: g10/call-dirmngr.c:213
+#: g10/call-dirmngr.c:212
 #, fuzzy, c-format
 #| msgid "option '%s' may not be used in %s mode\n"
 msgid "keyserver option \"honor-keyserver-url\" may not be used in Tor mode\n"
 msgstr "no se puede usar la opción '%s' en modo %s\n"
 
-#: g10/call-dirmngr.c:386
+#: g10/call-dirmngr.c:385
 msgid "WKD uses a cached result"
 msgstr ""
 
-#: g10/call-dirmngr.c:389
+#: g10/call-dirmngr.c:388
 msgid "Tor is not running"
 msgstr ""
 
-#: g10/call-dirmngr.c:391
+#: g10/call-dirmngr.c:390
 #, fuzzy
 #| msgid "\"%s\" is not a proper fingerprint\n"
 msgid "Tor is not properly configured"
 msgstr "\"%s\" no es una huella digital válida\n"
 
-#: g10/call-dirmngr.c:393
+#: g10/call-dirmngr.c:392
 #, fuzzy
 #| msgid "\"%s\" is not a proper fingerprint\n"
 msgid "DNS is not properly configured"
 msgstr "\"%s\" no es una huella digital válida\n"
 
-#: g10/call-dirmngr.c:395
+#: g10/call-dirmngr.c:394
 msgid "unacceptable HTTP redirect from server"
 msgstr ""
 
-#: g10/call-dirmngr.c:397
+#: g10/call-dirmngr.c:396
 msgid "unacceptable HTTP redirect from server was cleaned up"
 msgstr ""
 
-#: g10/call-dirmngr.c:399
+#: g10/call-dirmngr.c:398
 #, fuzzy
 #| msgid "generate a revocation certificate"
 msgid "server uses an invalid certificate"
 msgstr "genera un certificado de revocación"
 
-#: g10/call-dirmngr.c:406 g10/gpg.c:4599
+#: g10/call-dirmngr.c:405 g10/gpg.c:4596
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:369 g10/card-util.c:1924
-#: tools/gpg-card.c:3039
+#: g10/card-util.c:86 g10/card-util.c:374 g10/card-util.c:1937
+#: tools/gpg-card.c:3056
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "tarjeta OpenPGP no disponible: %s\n"
 
-#: g10/card-util.c:91 g10/card-util.c:1930
+#: g10/card-util.c:91 g10/card-util.c:1943
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "tarjeta OpenPGP num. %s detectada\n"
 
-#: g10/card-util.c:97 g10/card-util.c:2309 g10/delkey.c:164 g10/keyedit.c:1428
-#: g10/keygen.c:4791 g10/revoke.c:214 g10/revoke.c:638
+#: g10/card-util.c:97 g10/card-util.c:2322 g10/delkey.c:164 g10/keyedit.c:1428
+#: g10/keygen.c:4795 g10/revoke.c:214 g10/revoke.c:639
 #, c-format
 msgid "can't do this in batch mode\n"
 msgstr "imposible hacer esto en modo de proceso por lotes\n"
 
-#: g10/card-util.c:105 tools/gpg-card.c:2943
+#: g10/card-util.c:105 tools/gpg-card.c:2960
 #, c-format
 msgid "This command is only available for version 2 cards\n"
 msgstr "Esta orden solo está disponible en tarjetas versión 2\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3398 tools/gpg-card.c:2948
+#: g10/card-util.c:107 scd/app-openpgp.c:3399 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"
 
-#: g10/card-util.c:140 g10/card-util.c:1448 g10/card-util.c:1710
-#: g10/card-util.c:1802 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1991 g10/keygen.c:2165 g10/keygen.c:2385 g10/keygen.c:2685
+#: g10/card-util.c:140 g10/card-util.c:1458 g10/card-util.c:1723
+#: g10/card-util.c:1815 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/keygen.c:1992 g10/keygen.c:2166 g10/keygen.c:2386 g10/keygen.c:2686
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
 #: tools/gpg-card.c:510
 msgid "Your selection? "
 msgstr "Su elección: "
 
-#: g10/card-util.c:262 g10/card-util.c:313 tools/gpg-card.c:596
+#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:596
 #: tools/gpg-card.c:636
 msgid "[not set]"
 msgstr "[no establecido]"
 
-#: g10/card-util.c:558 tools/gpg-card.c:903
+#: g10/card-util.c:563 tools/gpg-card.c:905
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:559 tools/gpg-card.c:904
+#: g10/card-util.c:564 tools/gpg-card.c:906
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:586 tools/gpg-card.c:931
+#: g10/card-util.c:591 tools/gpg-card.c:933
 msgid "not forced"
 msgstr "no forzado"
 
-#: g10/card-util.c:586 tools/gpg-card.c:931
+#: g10/card-util.c:591 tools/gpg-card.c:933
 msgid "forced"
 msgstr "forzado"
 
-#: g10/card-util.c:768 tools/gpg-card.c:1468
+#: g10/card-util.c:773 tools/gpg-card.c:1484
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Error: sólo se permite ASCII sin formato actualmente.\n"
 
-#: g10/card-util.c:770 tools/gpg-card.c:1470
+#: g10/card-util.c:775 tools/gpg-card.c:1486
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Error: El caracter \"<\" no puede usarse.\n"
 
-#: g10/card-util.c:772 tools/gpg-card.c:1472
+#: g10/card-util.c:777 tools/gpg-card.c:1488
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Error: no se permiten dobles espacios.\n"
 
-#: g10/card-util.c:789 tools/gpg-card.c:1505
+#: g10/card-util.c:795 tools/gpg-card.c:1521
 msgid "Cardholder's surname: "
 msgstr "Apellido del titular de la tarjeta: "
 
-#: g10/card-util.c:791 tools/gpg-card.c:1506
+#: g10/card-util.c:797 tools/gpg-card.c:1522
 msgid "Cardholder's given name: "
 msgstr "Nombre del titular de la tarjeta: "
 
-#: g10/card-util.c:809 tools/gpg-card.c:1523
+#: g10/card-util.c:816 tools/gpg-card.c:1539
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Error: nombre combinado demasiado largo (máximo %d caracteres).\n"
 
-#: g10/card-util.c:830 tools/gpg-card.c:1561
+#: g10/card-util.c:840 tools/gpg-card.c:1577
 msgid "URL to retrieve public key: "
 msgstr "URL de donde recuperar la clave pública: "
 
-#: g10/card-util.c:926 g10/decrypt-data.c:495 g10/import.c:406 g10/import.c:756
-#: g10/import.c:815 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1666
-#: tools/gpgconf.c:437 tools/gpgconf.c:483 tools/gpg-card.c:426
+#: g10/card-util.c:936 g10/decrypt-data.c:495 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:1705
+#: tools/gpgconf.c:471 tools/gpgconf.c:517 tools/gpg-card.c:426
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "error al leer '%s': %s\n"
 
-#: g10/card-util.c:959 g10/decrypt-data.c:498 g10/export.c:2496
+#: g10/card-util.c:969 g10/decrypt-data.c:498 g10/export.c:2496
 #: dirmngr/crlcache.c:925 tools/gpg-card.c:486 tools/gpg-card.c:493
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr "error al escribir '%s': %s\n"
 
-#: g10/card-util.c:986 tools/gpg-card.c:1650
+#: g10/card-util.c:996 tools/gpg-card.c:1666
 msgid "Login data (account name): "
 msgstr "Datos de login (nombre de la cuenta): "
 
-#: g10/card-util.c:1024 tools/gpg-card.c:1945
+#: g10/card-util.c:1034 tools/gpg-card.c:1962
 msgid "Private DO data: "
 msgstr "Datos privados: "
 
-#: g10/card-util.c:1109 tools/gpg-card.c:1699
+#: g10/card-util.c:1119 tools/gpg-card.c:1715
 msgid "Language preferences: "
 msgstr "Preferencias de idioma: "
 
-#: g10/card-util.c:1117 tools/gpg-card.c:1710
+#: g10/card-util.c:1127 tools/gpg-card.c:1726
 #, c-format
 msgid "Error: invalid length of preference string.\n"
 msgstr "Error: longitud de la cadena de preferencias inválida.\n"
 
-#: g10/card-util.c:1126 tools/gpg-card.c:1719
+#: g10/card-util.c:1136 tools/gpg-card.c:1735
 #, c-format
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Error: caracteres inválidos en cadena de preferencias.\n"
 
-#: g10/card-util.c:1148 tools/gpg-card.c:1753
+#: g10/card-util.c:1158 tools/gpg-card.c:1769
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1162 tools/gpg-card.c:1770
+#: g10/card-util.c:1172 tools/gpg-card.c:1786
 msgid "Error: invalid response.\n"
 msgstr "Error: respuesta no válida.\n"
 
-#: g10/card-util.c:1185 tools/gpg-card.c:1835
+#: g10/card-util.c:1195 tools/gpg-card.c:1852
 msgid "CA fingerprint: "
 msgstr "Huella digital CA: "
 
-#: g10/card-util.c:1209 tools/gpg-card.c:1861
+#: g10/card-util.c:1219 tools/gpg-card.c:1878
 #, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Error: formato inválido de huella digital.\n"
 
-#: g10/card-util.c:1259
+#: g10/card-util.c:1269
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "la operación con la clave no es posible: %s\n"
 
-#: g10/card-util.c:1260
+#: g10/card-util.c:1270
 msgid "not an OpenPGP card"
 msgstr "no es una tarjeta OpenPGP"
 
-#: g10/card-util.c:1273 g10/keygen.c:4811 g10/keygen.c:5972
+#: g10/card-util.c:1283 g10/keygen.c:4815 g10/keygen.c:6003
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "error obteniendo la información actual de la clave: %s\n"
 
-#: g10/card-util.c:1358
+#: g10/card-util.c:1368
 msgid "Replace existing key? (y/N) "
 msgstr "¿Reemplazar la clave existente? (s/N) "
 
-#: g10/card-util.c:1375 tools/gpg-card.c:3328
+#: g10/card-util.c:1385 tools/gpg-card.c:3345
 #, fuzzy
 #| msgid ""
 #| "Note: There is no guarantee that the card supports the requested size.\n"
@@ -1937,100 +1952,100 @@ msgstr ""
 "      requerido. Si la generación de clave fracasa, por favor compruebe\n"
 "      la documentación de su tarjeta para ver los tamaños posibles.\n"
 
-#: g10/card-util.c:1396 g10/keygen.c:2570 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1406 g10/keygen.c:2571 sm/certreqgen-ui.c:180
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "¿De qué tamaño quiere la clave? (%u) "
 
-#: g10/card-util.c:1406 g10/keygen.c:2493 g10/keygen.c:2525
+#: g10/card-util.c:1416 g10/keygen.c:2494 g10/keygen.c:2526
 #: sm/certreqgen-ui.c:195
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "redondeados a %u bits\n"
 
-#: g10/card-util.c:1414 g10/keygen.c:2578 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1424 g10/keygen.c:2579 sm/certreqgen-ui.c:185
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "los tamaños de claves %s deben estar en el rango %u-%u\n"
 
-#: g10/card-util.c:1433
+#: g10/card-util.c:1443
 msgid "Changing card key attribute for: "
 msgstr "Cambiando el atributo de la clave de tarjeta por: "
 
-#: g10/card-util.c:1435
+#: g10/card-util.c:1445
 msgid "Signature key\n"
 msgstr "Clave de firmado\n"
 
-#: g10/card-util.c:1437
+#: g10/card-util.c:1447
 msgid "Encryption key\n"
 msgstr "Clave de cifrado\n"
 
-#: g10/card-util.c:1439
+#: g10/card-util.c:1449
 msgid "Authentication key\n"
 msgstr "Clave de autentificación\n"
 
-#: g10/card-util.c:1441 g10/keygen.c:2112 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1451 g10/keygen.c:2113 sm/certreqgen-ui.c:158
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor seleccione tipo de clave deseado:\n"
 
-#: g10/card-util.c:1442 sm/certreqgen-ui.c:159
+#: g10/card-util.c:1452 sm/certreqgen-ui.c:159
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1443
+#: g10/card-util.c:1453
 #, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) ECC\n"
 
-#: g10/card-util.c:1455 g10/card-util.c:1722 g10/card-util.c:1822
-#: g10/keyedit.c:900 g10/keygen.c:2017 g10/keygen.c:2045 g10/keygen.c:2172
-#: g10/keygen.c:2425 g10/keygen.c:2713 g10/revoke.c:836
+#: g10/card-util.c:1468 g10/card-util.c:1735 g10/card-util.c:1835
+#: g10/keyedit.c:900 g10/keygen.c:2018 g10/keygen.c:2046 g10/keygen.c:2173
+#: g10/keygen.c:2426 g10/keygen.c:2714 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Elección inválida.\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1541
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr "Ahora la tarjeta se reconfigurará para generar una clave de %u bits\n"
 
-#: g10/card-util.c:1533
+#: g10/card-util.c:1546
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr "Ahora la tarjeta se reconfigurará para generar una clave de tipo: %s\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1582
 #, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "error cambiando el atributo de clave de la clave %d: %s\n"
 
-#: g10/card-util.c:1585 g10/card-util.c:2106 g10/card-util.c:2162
+#: g10/card-util.c:1598 g10/card-util.c:2119 g10/card-util.c:2175
 #, c-format
 msgid "error getting card info: %s\n"
 msgstr "error al obtener información de la clave: %s\n"
 
-#: g10/card-util.c:1591 g10/card-util.c:1936 g10/card-util.c:2112
-#: g10/card-util.c:2171 tools/gpg-card.c:3057 tools/gpg-card.c:3296
-#: tools/gpg-card.c:3354
+#: g10/card-util.c:1604 g10/card-util.c:1949 g10/card-util.c:2125
+#: g10/card-util.c:2184 tools/gpg-card.c:3074 tools/gpg-card.c:3313
+#: tools/gpg-card.c:3371
 #, c-format
 msgid "This command is not supported by this card\n"
 msgstr "Esta orden no se puede usar con esta tarjeta\n"
 
-#: g10/card-util.c:1637 tools/gpg-card.c:2426
+#: g10/card-util.c:1650 tools/gpg-card.c:2443
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 "¿Hacer copia de seguridad externa a la tarjeta de clave de cifrado? (S/n) "
 
-#: g10/card-util.c:1651
+#: g10/card-util.c:1664
 #, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "NOTA: ¡ya hay claves almacenadas en la tarjeta!\n"
 
-#: g10/card-util.c:1654 tools/gpg-card.c:2398
+#: g10/card-util.c:1667 tools/gpg-card.c:2415
 msgid "Replace existing keys? (y/N) "
 msgstr "¿Reemplazar las claves existentes? (s/N) "
 
-#: g10/card-util.c:1666 tools/gpg-card.c:2457
+#: g10/card-util.c:1679 tools/gpg-card.c:2474
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2041,160 +2056,160 @@ msgstr ""
 "   PIN = '%s'     PIN Administrador = '%s'\n"
 "Debería cambiarlos usando la orden --change-pin\n"
 
-#: g10/card-util.c:1701
+#: g10/card-util.c:1714
 msgid "Please select the type of key to generate:\n"
 msgstr "Por favor seleccione tipo de clave que generar:\n"
 
-#: g10/card-util.c:1703 g10/card-util.c:1793
+#: g10/card-util.c:1716 g10/card-util.c:1806
 msgid "   (1) Signature key\n"
 msgstr "   (1) Clave de firmado\n"
 
-#: g10/card-util.c:1704 g10/card-util.c:1795
+#: g10/card-util.c:1717 g10/card-util.c:1808
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Clave de cifrado\n"
 
-#: g10/card-util.c:1705 g10/card-util.c:1797
+#: g10/card-util.c:1718 g10/card-util.c:1810
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Clave de autentificación\n"
 
-#: g10/card-util.c:1790
+#: g10/card-util.c:1803
 msgid "Please select where to store the key:\n"
 msgstr "Por favor elija donde guardar la clave:\n"
 
-#: g10/card-util.c:1836
+#: g10/card-util.c:1849
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "KEYTOCARD fallido: %s\n"
 
-#: g10/card-util.c:1941 tools/gpg-card.c:3065
+#: g10/card-util.c:1954 tools/gpg-card.c:3082
 #, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr ""
 "NOTA: ¡Esta orden destruye todas las claves almacenadas en la tarjeta!\n"
 
-#: g10/card-util.c:1944 tools/gpg-card.c:3068 tools/gpg-card.c:3409
+#: g10/card-util.c:1957 tools/gpg-card.c:3085 tools/gpg-card.c:3426
 msgid "Continue? (y/N) "
 msgstr "¿Continuar? (s/N) "
 
-#: g10/card-util.c:1949 tools/gpg-card.c:3079
+#: g10/card-util.c:1962 tools/gpg-card.c:3096
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr "¿Realmente quiere volver a los valores de fábrica? (escriba \"sí\") "
 
-#: g10/card-util.c:2142
+#: g10/card-util.c:2155
 #, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "error de la configuración KDF: %s\n"
 
-#: g10/card-util.c:2188
+#: g10/card-util.c:2201
 #, fuzzy, c-format
 #| msgid "error for setup KDF: %s\n"
 msgid "error for setup UIF: %s\n"
 msgstr "error de la configuración KDF: %s\n"
 
-#: g10/card-util.c:2212 g10/keyedit.c:1263 tools/gpg-card.c:3649
+#: g10/card-util.c:2225 g10/keyedit.c:1263 tools/gpg-card.c:3666
 msgid "quit this menu"
 msgstr "salir de este menú"
 
-#: g10/card-util.c:2214
+#: g10/card-util.c:2227
 msgid "show admin commands"
 msgstr "ver órdenes de administrador"
 
-#: g10/card-util.c:2215 g10/keyedit.c:1266 tools/gpg-card.c:3652
+#: g10/card-util.c:2228 g10/keyedit.c:1266 tools/gpg-card.c:3669
 msgid "show this help"
 msgstr "muestra esta ayuda"
 
-#: g10/card-util.c:2217 tools/gpg-card.c:3654
+#: g10/card-util.c:2230 tools/gpg-card.c:3671
 msgid "list all available data"
 msgstr "listar todos los datos disponibles"
 
-#: g10/card-util.c:2220 tools/gpg-card.c:3656
+#: g10/card-util.c:2233 tools/gpg-card.c:3673
 msgid "change card holder's name"
 msgstr "cambiar el nombre del titular de la tarjeta"
 
-#: g10/card-util.c:2221 tools/gpg-card.c:3657
+#: g10/card-util.c:2234 tools/gpg-card.c:3674
 msgid "change URL to retrieve key"
 msgstr "cambiar URL de donde obtener la clave"
 
-#: g10/card-util.c:2222 tools/gpg-card.c:3658
+#: g10/card-util.c:2235 tools/gpg-card.c:3675
 msgid "fetch the key specified in the card URL"
 msgstr "recuperar la clave especificada en la URL de la tarjeta"
 
-#: g10/card-util.c:2223 tools/gpg-card.c:3659
+#: g10/card-util.c:2236 tools/gpg-card.c:3676
 msgid "change the login name"
 msgstr "cambiar nombre de usuario"
 
-#: g10/card-util.c:2224 tools/gpg-card.c:3660
+#: g10/card-util.c:2237 tools/gpg-card.c:3677
 msgid "change the language preferences"
 msgstr "cambiar preferencias de idioma"
 
-#: g10/card-util.c:2225 tools/gpg-card.c:3661
+#: g10/card-util.c:2238 tools/gpg-card.c:3678
 #, fuzzy
 #| msgid "change card holder's sex"
 msgid "change card holder's salutation"
 msgstr "cambiar sexo del titular de la tarjeta"
 
-#: g10/card-util.c:2227 tools/gpg-card.c:3663
+#: g10/card-util.c:2240 tools/gpg-card.c:3680
 msgid "change a CA fingerprint"
 msgstr "cambiar huella digital de una CA"
 
-#: g10/card-util.c:2228 tools/gpg-card.c:3664
+#: g10/card-util.c:2241 tools/gpg-card.c:3681
 msgid "toggle the signature force PIN flag"
 msgstr "cambiar estado de la opción forzar firma del PIN"
 
-#: g10/card-util.c:2229 tools/gpg-card.c:3665
+#: g10/card-util.c:2242 tools/gpg-card.c:3682
 msgid "generate new keys"
 msgstr "generar nuevas claves"
 
-#: g10/card-util.c:2230 tools/gpg-card.c:3666
+#: g10/card-util.c:2243 tools/gpg-card.c:3683
 msgid "menu to change or unblock the PIN"
 msgstr "menú para cambiar o desbloquear el PIN"
 
-#: g10/card-util.c:2231 tools/gpg-card.c:3667
+#: g10/card-util.c:2244 tools/gpg-card.c:3684
 msgid "verify the PIN and list all data"
 msgstr "verificar PIN y listar todos los datos"
 
-#: g10/card-util.c:2232 tools/gpg-card.c:3668
+#: g10/card-util.c:2245 tools/gpg-card.c:3685
 msgid "unblock the PIN using a Reset Code"
 msgstr "desbloquear PIN usando Código de Reinicio"
 
-#: g10/card-util.c:2233 tools/gpg-card.c:3672
+#: g10/card-util.c:2246 tools/gpg-card.c:3689
 msgid "destroy all keys and data"
 msgstr "destruir todas las claves y datos"
 
-#: g10/card-util.c:2235
+#: g10/card-util.c:2248
 #, fuzzy
 #| msgid "setup KDF for PIN authentication"
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr "configurar KDF para autentificación de PIN"
 
-#: g10/card-util.c:2236
+#: g10/card-util.c:2249
 msgid "change the key attribute"
 msgstr "cambia valores de la clave"
 
-#: g10/card-util.c:2237 tools/gpg-card.c:3674
+#: g10/card-util.c:2250 tools/gpg-card.c:3691
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the User Interaction Flag"
 msgstr "cambia valores de confianza"
 
-#: g10/card-util.c:2361 tools/gpg-card.c:3924
+#: g10/card-util.c:2374 tools/gpg-card.c:3941
 msgid "gpg/card> "
 msgstr "gpg/tarjeta> "
 
-#: g10/card-util.c:2402
+#: g10/card-util.c:2415
 msgid "Admin-only command\n"
 msgstr "Órdenes sólo de administrador\n"
 
-#: g10/card-util.c:2433
+#: g10/card-util.c:2446
 msgid "Admin commands are allowed\n"
 msgstr "Se permiten órdenes de administrador\n"
 
-#: g10/card-util.c:2435
+#: g10/card-util.c:2448
 msgid "Admin commands are not allowed\n"
 msgstr "No se permiten órdenes de administrador\n"
 
-#: g10/card-util.c:2546 g10/keyedit.c:2275 tools/gpg-card.c:3814
-#: tools/gpg-card.c:4072
+#: g10/card-util.c:2559 g10/keyedit.c:2275 tools/gpg-card.c:3831
+#: tools/gpg-card.c:4089
 #, c-format
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Orden inválida (pruebe \"help\")\n"
@@ -2204,22 +2219,22 @@ msgstr "Orden inválida (pruebe \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output no funciona con esta orden\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5293 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5292 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:1934 g10/export.c:2342 g10/export.c:2463
-#: g10/getkey.c:1907 g10/gpg.c:5238 g10/keyedit.c:1450 g10/keyedit.c:2382
-#: g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:703 g10/keyserver.c:1240
-#: g10/revoke.c:230 g10/tofu.c:2168
+#: g10/getkey.c:2032 g10/gpg.c:5237 g10/keyedit.c:1450 g10/keyedit.c:2382
+#: g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:703 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:2002 g10/getkey.c:1915 g10/getkey.c:4330
-#: g10/gpg.c:5247 g10/keyedit.c:2354 g10/keyserver.c:1258 g10/revoke.c:236
-#: g10/revoke.c:665 g10/tofu.c:2176
+#: g10/delkey.c:90 g10/export.c:2002 g10/getkey.c:2040 g10/getkey.c:4455
+#: g10/gpg.c:5246 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"
 msgstr "error al leer bloque de claves: %s\n"
@@ -2340,14 +2355,14 @@ msgstr "no se puede usar el cifrado '%s' en modo %s\n"
 msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:555 g10/encrypt.c:808 g10/decrypt-data.c:261 g10/gpg.c:4083
-#: g10/gpg.c:4130 sm/decrypt.c:742 sm/encrypt.c:691 sm/gpgsm.c:1793
+#: g10/encrypt.c:555 g10/encrypt.c:808 g10/decrypt-data.c:261 g10/gpg.c:4080
+#: g10/gpg.c:4127 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1646
 #, 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:564 g10/gpg.c:4095 g10/gpg.c:4142 g10/sig-check.c:155
-#: g10/sign.c:452 sm/gpgsm.c:1803 sm/gpgsm.c:1813 sm/sign.c:596 sm/verify.c:510
+#: g10/encrypt.c:564 g10/gpg.c:4092 g10/gpg.c:4139 g10/sig-check.c:155
+#: g10/sign.c:452 sm/gpgsm.c:1656 sm/gpgsm.c:1666 sm/sign.c:596 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"
@@ -2365,7 +2380,7 @@ msgstr ""
 "AVISO: forzar el cifrado simétrico %s (%d) viola las preferencias\n"
 "del destinatario\n"
 
-#: g10/encrypt.c:838 sm/encrypt.c:766
+#: g10/encrypt.c:838 sm/encrypt.c:767
 #, c-format
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr ""
@@ -2399,7 +2414,7 @@ msgstr "%s/%s cifrado para: \"%s\"\n"
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "no se puede usar la opción '%s' en modo %s\n"
 
-#: g10/decrypt-data.c:239 g10/mainproc.c:380 sm/decrypt.c:494
+#: g10/decrypt-data.c:239 g10/mainproc.c:380 sm/decrypt.c:892
 #, fuzzy, c-format
 #| msgid "%s encrypted data\n"
 msgid "%s.%s encrypted data\n"
@@ -2410,7 +2425,7 @@ msgstr "datos cifrados %s\n"
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrado con algoritmo desconocido %d\n"
 
-#: g10/decrypt-data.c:361 g10/decrypt-data.c:414 sm/decrypt.c:508
+#: g10/decrypt-data.c:361 g10/decrypt-data.c:414 sm/decrypt.c:906
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2450,7 +2465,7 @@ msgstr "usar el formato de backup de claves GnuPG"
 msgid " - skipped"
 msgstr " - omitido"
 
-#: g10/export.c:1333 g10/import.c:2124 g10/openfile.c:202 g10/openfile.c:296
+#: g10/export.c:1333 g10/import.c:2132 g10/openfile.c:202 g10/openfile.c:296
 #: g10/sign.c:1110 g10/sign.c:1447
 #, c-format
 msgid "writing to '%s'\n"
@@ -2486,61 +2501,61 @@ msgstr "error al crear '%s': %s\n"
 msgid "[User ID not found]"
 msgstr "[ID de usuario no encontrado]"
 
-#: g10/getkey.c:1199
+#: g10/getkey.c:1324
 #, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "'%s' recuperado automáticamente vía %s\n"
 
-#: g10/getkey.c:1205
+#: g10/getkey.c:1330
 #, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "error recuperando '%s' vía %s: %s\n"
 
-#: g10/getkey.c:1207
+#: g10/getkey.c:1332
 msgid "No fingerprint"
 msgstr "No hay huella digital"
 
-#: g10/getkey.c:1449
+#: g10/getkey.c:1574
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1884 g10/revoke.c:657 g10/revoke.c:718
+#: g10/getkey.c:2009 g10/revoke.c:658 g10/revoke.c:719
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "clave secreta \"%s\" no encontrada: %s\n"
 
-#: g10/getkey.c:1887 g10/pkclist.c:1012
+#: g10/getkey.c:2012 g10/pkclist.c:1012
 #, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "(revisar el parámetro de la opción '%s')\n"
 
-#: g10/getkey.c:1965
+#: g10/getkey.c:2090
 #, c-format
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "Advertencia: no estamos usando '%s' como clave predeterminada: %s\n"
 
-#: g10/getkey.c:1973
+#: g10/getkey.c:2098
 #, c-format
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "usando \"%s\" como clave secreta predeterminada para firmar\n"
 
-#: g10/getkey.c:1980
+#: g10/getkey.c:2105
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr "todos los valores pasados a '%s' ignorados\n"
 
-#: g10/getkey.c:2837
+#: g10/getkey.c:2962
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Clave %s inválida hecha válida mediante --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:3703
+#: g10/getkey.c:3828
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "usando subclave %s en vez de clave primaria %s\n"
 
-#: g10/getkey.c:4259 g10/gpg.c:2167
+#: g10/getkey.c:4384 g10/gpg.c:2168
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "parámetros válidos para la opción '%s':\n"
@@ -2727,7 +2742,7 @@ msgstr "|SPEC|establecer alias de email"
 msgid "use strict OpenPGP behavior"
 msgstr "usar estilo OpenPGP estricto"
 
-#: g10/gpg.c:651 kbx/kbxutil.c:91 sm/gpgsm.c:424 tools/gpgconf.c:113
+#: g10/gpg.c:651 kbx/kbxutil.c:91 sm/gpgsm.c:425 tools/gpgconf.c:113
 msgid "do not make any changes"
 msgstr "no hace ningún cambio"
 
@@ -2763,7 +2778,7 @@ msgstr "usa modo de texto canónico"
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|nivel de compresión N (0 desactiva)"
 
-#: g10/gpg.c:762 sm/gpgsm.c:357
+#: g10/gpg.c:762 sm/gpgsm.c:358
 #, fuzzy
 #| msgid "Options controlling the interactivity and enforcement"
 msgid "Options controlling key import and export"
@@ -2785,11 +2800,11 @@ msgstr "importa claves desde un servidor de claves"
 msgid "include the public key in signatures"
 msgstr "lista y comprueba firmas de las claves"
 
-#: g10/gpg.c:776 sm/gpgsm.c:360
+#: g10/gpg.c:776 sm/gpgsm.c:361
 msgid "disable all access to the dirmngr"
 msgstr "prohibir todo acceso al dirmngr"
 
-#: g10/gpg.c:788 sm/gpgsm.c:367
+#: g10/gpg.c:788 sm/gpgsm.c:368
 #, fuzzy
 #| msgid "Options controlling the configuration"
 msgid "Options controlling key listings"
@@ -2809,11 +2824,11 @@ msgstr "|USER-ID|cifra para ID-USUARIO"
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|USER-ID|usa este identificador para firmar o descifrar"
 
-#: g10/gpg.c:876 sm/gpgsm.c:408
+#: g10/gpg.c:876 sm/gpgsm.c:409
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:895 sm/gpgsm.c:420 dirmngr/dirmngr.c:286
+#: g10/gpg.c:895 sm/gpgsm.c:421 dirmngr/dirmngr.c:289
 msgid "Other options"
 msgstr ""
 
@@ -2821,7 +2836,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:966 sm/gpgsm.c:453
+#: g10/gpg.c:966 sm/gpgsm.c:454
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2863,7 +2878,7 @@ msgstr ""
 "firma, comprueba, cifra o descifra\n"
 "la operación por defecto depende de los datos de entrada\n"
 
-#: g10/gpg.c:1168 sm/gpgsm.c:636
+#: g10/gpg.c:1168 sm/gpgsm.c:637
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2887,12 +2902,12 @@ msgstr "Resumen: "
 msgid "Compression: "
 msgstr "Compresión: "
 
-#: g10/gpg.c:1274 sm/gpgsm.c:710
+#: g10/gpg.c:1274 sm/gpgsm.c:711
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "uso: %s [opciones] %s\n"
 
-#: g10/gpg.c:1467 sm/gpgsm.c:803
+#: g10/gpg.c:1467 sm/gpgsm.c:804
 #, c-format
 msgid "conflicting commands\n"
 msgstr "órdenes incompatibles\n"
@@ -2902,42 +2917,42 @@ msgstr "órdenes incompatibles\n"
 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:1683
+#: g10/gpg.c:1684
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "AVISO: propiedad insegura del directorio personal '%s'\n"
 
-#: g10/gpg.c:1686
+#: g10/gpg.c:1687
 #, 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:1689
+#: g10/gpg.c:1690
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "AVISO: propiedad insegura de la extensión '%s'\n"
 
-#: g10/gpg.c:1695
+#: g10/gpg.c:1696
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "AVISO: permisos inseguros del directorio personal '%s'\n"
 
-#: g10/gpg.c:1698
+#: g10/gpg.c:1699
 #, 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:1701
+#: g10/gpg.c:1702
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "AVISO: permisos inseguros de la extensión '%s'\n"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1708
 #, 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:1710
+#: g10/gpg.c:1711
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@ -2945,18 +2960,18 @@ msgstr ""
 "AVISO: propiedad insegura del directorio contenedor del fichero de\n"
 "configuración '%s'\n"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1714
 #, 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:1719
+#: g10/gpg.c:1720
 #, 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:1722
+#: g10/gpg.c:1723
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@ -2964,446 +2979,446 @@ msgstr ""
 "AVISO: permisos inseguros del directorio contenedor del fichero de\n"
 "configuración '%s'\n"
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1726
 #, 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:1941
+#: g10/gpg.c:1942
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "artículo de configuración desconocido '%s'\n"
 
-#: g10/gpg.c:2037
+#: g10/gpg.c:2038
 msgid "display photo IDs during key listings"
 msgstr "mostrar foto IDs al listar claves"
 
-#: g10/gpg.c:2039
+#: g10/gpg.c:2040
 msgid "show key usage information during key listings"
 msgstr "mostrar información de uso de las claves al listarlas"
 
-#: g10/gpg.c:2041
+#: g10/gpg.c:2042
 msgid "show policy URLs during signature listings"
 msgstr "mostrar URLS de política al listar firmas"
 
-#: g10/gpg.c:2043
+#: g10/gpg.c:2044
 msgid "show all notations during signature listings"
 msgstr "mostrar todas las notaciones al listar firmas"
 
-#: g10/gpg.c:2045
+#: g10/gpg.c:2046
 msgid "show IETF standard notations during signature listings"
 msgstr "mostrar notaciones estándar IETF al listar firmas"
 
-#: g10/gpg.c:2049
+#: g10/gpg.c:2050
 msgid "show user-supplied notations during signature listings"
 msgstr "mostrar notaciones personalizadas al listar firmas"
 
-#: g10/gpg.c:2051
+#: g10/gpg.c:2052
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "mostrar URL del servidor de claves preferido al listar firmas"
 
-#: g10/gpg.c:2053
+#: g10/gpg.c:2054
 msgid "show user ID validity during key listings"
 msgstr "mostrar validez de la ID de usuario al listar claves"
 
-#: g10/gpg.c:2055
+#: g10/gpg.c:2056
 msgid "show revoked and expired user IDs in key listings"
 msgstr "mostar IDs de usuario revocados y caducados al listar firmas"
 
-#: g10/gpg.c:2057
+#: g10/gpg.c:2058
 msgid "show revoked and expired subkeys in key listings"
 msgstr "mostrar subclaves revocadas y expiradas al listar claves"
 
-#: g10/gpg.c:2059
+#: g10/gpg.c:2060
 msgid "show the keyring name in key listings"
 msgstr "mostrar nombre de los anillos de claves al listar claves"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2062
 msgid "show expiration dates during signature listings"
 msgstr "mostrar fechas de caducidad al listar firmas"
 
-#: g10/gpg.c:2178
+#: g10/gpg.c:2179
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "política TOFU desconocida '%s'\n"
 
-#: g10/gpg.c:2180
+#: g10/gpg.c:2181
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(usa \"ayuda\" para listar las opciones)\n"
 
-#: g10/gpg.c:2975 g10/gpg.c:3828 g10/gpg.c:3840
+#: g10/gpg.c:2978 g10/gpg.c:3825 g10/gpg.c:3837
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "NOTA: ¡%s no es para uso normal!\n"
 
-#: g10/gpg.c:3151 g10/gpg.c:3163
+#: g10/gpg.c:3154 g10/gpg.c:3166
 #, 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:3185
+#: g10/gpg.c:3188
 #, 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:3217 sm/gpgsm.c:1270
+#: g10/gpg.c:3220 sm/gpgsm.c:1143
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "modo de entrada de pin inválido '%s'\n"
 
-#: g10/gpg.c:3223 sm/gpgsm.c:1276
+#: g10/gpg.c:3226 sm/gpgsm.c:1149
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "origen incorrecto de la consulta '%s'\n"
 
-#: g10/gpg.c:3280
+#: g10/gpg.c:3283
 #, 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:3302 g10/gpg.c:3511 g10/keyedit.c:5319
+#: g10/gpg.c:3305 g10/gpg.c:3514 g10/keyedit.c:5322
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "no se puede interpretar la URL del servidor de claves\n"
 
-#: g10/gpg.c:3320
+#: g10/gpg.c:3323
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opciones del servidor de claves inválidas\n"
 
-#: g10/gpg.c:3323
+#: g10/gpg.c:3326
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "opciones del servidor de claves inválidas\n"
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3333
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opciones de importación inválidas\n"
 
-#: g10/gpg.c:3333
+#: g10/gpg.c:3336
 #, c-format
 msgid "invalid import options\n"
 msgstr "opciones de importación inválidas\n"
 
-#: g10/gpg.c:3339 g10/gpg.c:3354
+#: g10/gpg.c:3342 g10/gpg.c:3357
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "opción de filtro inválida: %s\n"
 
-#: g10/gpg.c:3345
+#: g10/gpg.c:3348
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opciones de exportación inválidas\n"
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3351
 #, c-format
 msgid "invalid export options\n"
 msgstr "opciones de exportación inválidas\n"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3363
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: lista de opciones inválida\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3366
 #, c-format
 msgid "invalid list options\n"
 msgstr "lista de opciones inválida\n"
 
-#: g10/gpg.c:3371
+#: g10/gpg.c:3374
 msgid "display photo IDs during signature verification"
 msgstr "mostrar foto IDs al verificar firmas"
 
-#: g10/gpg.c:3373
+#: g10/gpg.c:3376
 msgid "show policy URLs during signature verification"
 msgstr "mostrar URLs de política al verificar firmas"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3378
 msgid "show all notations during signature verification"
 msgstr "mostrar todas las notaciones al verificar firmas"
 
-#: g10/gpg.c:3377
+#: g10/gpg.c:3380
 msgid "show IETF standard notations during signature verification"
 msgstr "mostrar notaciones estándar IETF al verificar firmas"
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3384
 msgid "show user-supplied notations during signature verification"
 msgstr "mostrar notaciones personalizadas al verificar firmas"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3386
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "mostrar URLs del servidor de claves preferido al verificar firmas"
 
-#: g10/gpg.c:3385
+#: g10/gpg.c:3388
 msgid "show user ID validity during signature verification"
 msgstr "mostrar validez del ID de usuario al verificar firmas"
 
-#: g10/gpg.c:3387
+#: g10/gpg.c:3390
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "mostrar IDs de usuario revocados y caducados al verificar firmas"
 
-#: g10/gpg.c:3389
+#: g10/gpg.c:3392
 msgid "show only the primary user ID in signature verification"
 msgstr "mostrar solo ID primario de usuario al verificar firmas"
 
-#: g10/gpg.c:3396
+#: g10/gpg.c:3399
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opciones de verificación inválidas\n"
 
-#: g10/gpg.c:3399
+#: g10/gpg.c:3402
 #, c-format
 msgid "invalid verify options\n"
 msgstr "opciones de verificación inválidas\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3409
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "imposible establecer camino de ejecutables %s\n"
 
-#: g10/gpg.c:3613
+#: g10/gpg.c:3616
 #, 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:3616
+#: g10/gpg.c:3619
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "lista de auto-localización de claves inválida\n"
 
-#: g10/gpg.c:3625
+#: g10/gpg.c:3628
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "parámetro incorrecto para la opción \"%.50s\"\n"
 
-#: g10/gpg.c:3807 sm/gpgsm.c:1675
+#: g10/gpg.c:3804 sm/gpgsm.c:1528
 #, 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:3821
+#: g10/gpg.c:3818
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sustituye a %s\n"
 
-#: g10/gpg.c:3830
+#: g10/gpg.c:3827
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "¡%s no permitido con %s!\n"
 
-#: g10/gpg.c:3833
+#: g10/gpg.c:3830
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "¡%s no tiene sentido con %s!\n"
 
-#: g10/gpg.c:3848 sm/gpgsm.c:1696 dirmngr/dirmngr.c:1123
+#: g10/gpg.c:3845 sm/gpgsm.c:1549 dirmngr/dirmngr.c:1160
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "AVISO: ejecutándose con hora del sistema falsificada "
 
-#: g10/gpg.c:3869
+#: g10/gpg.c:3866
 #, 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:3897 g10/gpg.c:3928 sm/gpgsm.c:1763
+#: g10/gpg.c:3894 g10/gpg.c:3925 sm/gpgsm.c:1616
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado es inválido\n"
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3901
 #, 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:3916
+#: g10/gpg.c:3913
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "el algoritmo de compresión seleccionado es inválido\n"
 
-#: g10/gpg.c:3922
+#: g10/gpg.c:3919
 #, 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:3937
+#: g10/gpg.c:3934
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser mayor que 0\n"
 
-#: g10/gpg.c:3939
+#: g10/gpg.c:3936
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser mayor que 1\n"
 
-#: g10/gpg.c:3941
+#: g10/gpg.c:3938
 #, 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:3943
+#: g10/gpg.c:3940
 #, 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:3945
+#: g10/gpg.c:3942
 #, 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:3949
+#: g10/gpg.c:3946
 #, 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:3953
+#: g10/gpg.c:3950
 #, 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:3960
+#: g10/gpg.c:3957
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto inválidas\n"
 
-#: g10/gpg.c:3964
+#: g10/gpg.c:3961
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias personales de cifrado inválidas\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3964
 #, 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:3971
+#: g10/gpg.c:3968
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias personales de algoritmo de resumen inválidas\n"
 
-#: g10/gpg.c:3975
+#: g10/gpg.c:3972
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias personales de compresión inválidas\n"
 
-#: g10/gpg.c:3984 g10/gpg.c:3989
+#: g10/gpg.c:3981 g10/gpg.c:3986
 #, 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:4026
+#: g10/gpg.c:4023
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s aún no funciona con %s\n"
 
-#: g10/gpg.c:4089
+#: g10/gpg.c:4086
 #, 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:4101
+#: g10/gpg.c:4098
 #, 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:4256
+#: g10/gpg.c:4253
 #, 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:4268
+#: g10/gpg.c:4265
 #, 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:4340
+#: g10/gpg.c:4337
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "el cifrado simétrico de '%s' falló: %s\n"
 
-#: g10/gpg.c:4369
+#: g10/gpg.c:4366
 #, 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:4372
+#: g10/gpg.c:4369
 #, 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:4430
+#: g10/gpg.c:4427
 #, 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:4433
+#: g10/gpg.c:4430
 #, 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:4821 g10/keyserver.c:1870
+#: g10/gpg.c:4818 g10/keyserver.c:1629
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "envío al servidor de claves fallido: %s\n"
 
-#: g10/gpg.c:4826
+#: g10/gpg.c:4823
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recepción del servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:4832
+#: g10/gpg.c:4829
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "exportación de clave fallida: %s\n"
 
-#: g10/gpg.c:4845
+#: g10/gpg.c:4842
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "exportación como clave ssh fallida: %s\n"
 
-#: g10/gpg.c:4857
+#: g10/gpg.c:4854
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "búsqueda del servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:4870
+#: g10/gpg.c:4867
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "renovación al servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:4937
+#: g10/gpg.c:4936
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminación de armadura fallida: %s\n"
 
-#: g10/gpg.c:4948
+#: g10/gpg.c:4947
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creación de armadura fallida: %s\n"
 
-#: g10/gpg.c:5053
+#: g10/gpg.c:5052
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "algoritmo de distribución inválido '%s'\n"
 
-#: g10/gpg.c:5205 g10/tofu.c:2156
+#: g10/gpg.c:5204 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:5216
+#: g10/gpg.c:5215
 #, 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:5272
+#: g10/gpg.c:5271
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
@@ -3414,22 +3429,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:5283
+#: g10/gpg.c:5282
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Adelante, teclee su mensaje...\n"
 
-#: g10/gpg.c:5630
+#: g10/gpg.c:5629
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL de política de certificado inválida\n"
 
-#: g10/gpg.c:5632
+#: g10/gpg.c:5631
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL de política inválida\n"
 
-#: g10/gpg.c:5665
+#: g10/gpg.c:5664
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la URL del servidor de claves preferido no es válida\n"
@@ -3442,7 +3457,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:414 tools/gpgconf.c:116 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:415 tools/gpgconf.c:116 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"
 
@@ -3531,97 +3546,97 @@ msgstr "asumir entrada en formato de backup de clave GnuPG"
 msgid "repair keys on import"
 msgstr "reparar claves al importar"
 
-#: g10/import.c:399 g10/import.c:721
+#: g10/import.c:407 g10/import.c:729
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "omitiendo bloque de tipo %d\n"
 
-#: g10/import.c:738
+#: g10/import.c:746
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu claves procesadas hasta ahora\n"
 
-#: g10/import.c:831
+#: g10/import.c:839
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Cantidad total procesada: %lu\n"
 
-#: g10/import.c:834
+#: g10/import.c:842
 #, c-format
 msgid "    skipped PGP-2 keys: %lu\n"
 msgstr "      omitidas las claves PGP-2: %lu\n"
 
-#: g10/import.c:836
+#: g10/import.c:844
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      omitidas nuevas claves: %lu\n"
 
-#: g10/import.c:839
+#: g10/import.c:847
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          sin identificador: %lu\n"
 
-#: g10/import.c:842 sm/import.c:129
+#: g10/import.c:850 sm/import.c:129
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importadas: %lu"
 
-#: g10/import.c:846 sm/import.c:133
+#: g10/import.c:854 sm/import.c:133
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             sin cambios: %lu\n"
 
-#: g10/import.c:848
+#: g10/import.c:856
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          nuevos identificativos: %lu\n"
 
-#: g10/import.c:850
+#: g10/import.c:858
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           nuevas subclaves: %lu\n"
 
-#: g10/import.c:852
+#: g10/import.c:860
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        nuevas firmas: %lu\n"
 
-#: g10/import.c:854
+#: g10/import.c:862
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   nuevas revocaciones de claves: %lu\n"
 
-#: g10/import.c:856 sm/import.c:135
+#: g10/import.c:864 sm/import.c:135
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      claves secretas leídas: %lu\n"
 
-#: g10/import.c:858 sm/import.c:137
+#: g10/import.c:866 sm/import.c:137
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  claves secretas importadas: %lu\n"
 
-#: g10/import.c:860 sm/import.c:139
+#: g10/import.c:868 sm/import.c:139
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " claves secretas sin cambios: %lu\n"
 
-#: g10/import.c:862 sm/import.c:141
+#: g10/import.c:870 sm/import.c:141
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "          no importadas: %lu\n"
 
-#: g10/import.c:864
+#: g10/import.c:872
 #, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "    firmas limpiadas: %lu\n"
 
-#: g10/import.c:866
+#: g10/import.c:874
 #, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "      IDs de usuario limpiados: %lu\n"
 
-#: g10/import.c:1291
+#: g10/import.c:1299
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
@@ -3630,175 +3645,175 @@ msgstr ""
 "AVISO: la clave %s contiene preferencias para algoritmos\n"
 "no disponibles en estos IDs de usuario:\n"
 
-#: g10/import.c:1333
+#: g10/import.c:1341
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": algoritmo de cifrado preferido %s\n"
 
-#: g10/import.c:1351
+#: g10/import.c:1359
 #, fuzzy, c-format
 #| msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgid "         \"%s\": preference for AEAD algorithm %s\n"
 msgstr "         \"%s\": algoritmo de cifrado preferido %s\n"
 
-#: g10/import.c:1366
+#: g10/import.c:1374
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": algoritmo de resumen preferido %s\n"
 
-#: g10/import.c:1378
+#: g10/import.c:1386
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": algoritmo de compresión preferido %s\n"
 
-#: g10/import.c:1391
+#: g10/import.c:1399
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "se recomienda encarecidamente que actualice sus preferencias y\n"
 
-#: g10/import.c:1393
+#: g10/import.c:1401
 #, c-format
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "redistribuya esta clave para evitar potenciales problemas de\n"
 "diferencias en los algoritmos.\n"
 
-#: g10/import.c:1418
+#: g10/import.c:1426
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 "puede actualizar sus preferencias con: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:1932 g10/import.c:3053
+#: g10/import.c:1940 g10/import.c:3061
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "clave %s: sin identificador de usuario\n"
 
-#: g10/import.c:1938
+#: g10/import.c:1946
 #, c-format
 msgid "key %s: %s\n"
 msgstr "clave %s: %s\n"
 
-#: g10/import.c:1939 g10/import.c:3025
+#: g10/import.c:1947 g10/import.c:3033
 msgid "rejected by import screener"
 msgstr "rechazado por el filtro de importación"
 
-#: g10/import.c:1988
+#: g10/import.c:1996
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "clave %s: reparada la subclave PKS corrompida\n"
 
-#: g10/import.c:2009
+#: g10/import.c:2017
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "clave %s: aceptado ID de usuario sin autofirma \"%s\"\n"
 
-#: g10/import.c:2020 g10/import.c:2051
+#: g10/import.c:2028 g10/import.c:2059
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "clave %s: sin identificadores de usuario válidos\n"
 
-#: g10/import.c:2022
+#: g10/import.c:2030
 #, c-format
 msgid "this may be caused by a missing self-signature\n"
 msgstr "esto puede ser debido a la ausencia de autofirma\n"
 
-#: g10/import.c:2101 g10/import.c:3439
+#: g10/import.c:2109 g10/import.c:3447
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "clave %s: clave pública no encontrada: %s\n"
 
-#: g10/import.c:2107
+#: g10/import.c:2115
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "clave %s: clave nueva - omitida\n"
 
-#: g10/import.c:2119
+#: g10/import.c:2127
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "anillo de claves no escribible encontrado: %s\n"
 
-#: g10/import.c:2151 g10/import.c:2253 g10/import.c:3514
+#: g10/import.c:2159 g10/import.c:2261 g10/import.c:3522
 #, c-format
 msgid "error writing keyring '%s': %s\n"
 msgstr "error escribiendo anillo '%s': %s\n"
 
-#: g10/import.c:2174
+#: g10/import.c:2182
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "clave %s: clave pública \"%s\" importada\n"
 
-#: g10/import.c:2201
+#: g10/import.c:2209
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "clave %s: no coincide con nuestra copia\n"
 
-#: g10/import.c:2269
+#: g10/import.c:2277
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "clave %s: \"%s\" 1 ID de usuario nuevo\n"
 
-#: g10/import.c:2272
+#: g10/import.c:2280
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "clave %s: \"%s\" %d nuevos identificadores de usuario\n"
 
-#: g10/import.c:2275
+#: g10/import.c:2283
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "clave %s: \"%s\" 1 firma nueva\n"
 
-#: g10/import.c:2278
+#: g10/import.c:2286
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "clave %s: \"%s\" %d firmas nuevas\n"
 
-#: g10/import.c:2281
+#: g10/import.c:2289
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "clave %s: \"%s\" 1 subclave nueva\n"
 
-#: g10/import.c:2284
+#: g10/import.c:2292
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "clave %s: \"%s\" %d subclaves nuevas\n"
 
-#: g10/import.c:2287
+#: g10/import.c:2295
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "clave %s: \"%s\" %d firmas limpiadas\n"
 
-#: g10/import.c:2290
+#: g10/import.c:2298
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "clave %s: \"%s\" %d firmas limpiadas\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2301
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "clave %s: \"%s\" %d identificador de usuario limpiado\n"
 
-#: g10/import.c:2296
+#: g10/import.c:2304
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "clave %s: \"%s\" %d identificadores de usuario limpiados\n"
 
-#: g10/import.c:2332
+#: g10/import.c:2340
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "clave %s: \"%s\" sin cambios\n"
 
-#: g10/import.c:2692 g10/import.c:2887
+#: g10/import.c:2700 g10/import.c:2895
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "clave %s: clave secreta importada\n"
 
-#: g10/import.c:2700
+#: g10/import.c:2708
 #, c-format
 msgid "key %s: secret key already exists\n"
 msgstr "clave %s: clave secreta ya existe\n"
 
-#: g10/import.c:2708
+#: g10/import.c:2716
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "clave %s: error enviando al agente: %s\n"
@@ -3811,208 +3826,207 @@ msgstr "clave %s: error enviando al agente: %s\n"
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2877
+#: g10/import.c:2885
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr "Para migrar '%s', para cada smartcard ejecuta: %s\n"
 
-#: g10/import.c:3024
+#: g10/import.c:3032
 #, c-format
 msgid "secret key %s: %s\n"
 msgstr "clave secreta %s: %s\n"
 
-#: g10/import.c:3045 g10/import.c:3084
+#: g10/import.c:3053 g10/import.c:3092
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "no se permite importar claves secretas\n"
 
-#: g10/import.c:3072
+#: g10/import.c:3080
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "clave %s: clave secreta con cifrado incorrecto %d - omitida\n"
 
-#: g10/import.c:3234 g10/pkclist.c:75 g10/revoke.c:774
+#: g10/import.c:3242 g10/pkclist.c:75 g10/revoke.c:775
 msgid "No reason specified"
 msgstr "No se dio ninguna razón"
 
-#: g10/import.c:3235 g10/pkclist.c:77 g10/revoke.c:776
+#: g10/import.c:3243 g10/pkclist.c:77 g10/revoke.c:777
 msgid "Key is superseded"
 msgstr "La clave ha sido reemplazada"
 
-#: g10/import.c:3236 g10/pkclist.c:79 g10/revoke.c:775
+#: g10/import.c:3244 g10/pkclist.c:79 g10/revoke.c:776
 msgid "Key has been compromised"
 msgstr "La clave ha sido comprometida"
 
-#: g10/import.c:3237 g10/pkclist.c:81 g10/revoke.c:777
+#: g10/import.c:3245 g10/pkclist.c:81 g10/revoke.c:778
 msgid "Key is no longer used"
 msgstr "La clave ya no está en uso"
 
-#: g10/import.c:3238 g10/pkclist.c:83 g10/revoke.c:778
+#: g10/import.c:3246 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "El identificador de usuario ya no es válido"
 
-#: g10/import.c:3363 g10/keylist.c:1105 g10/pkclist.c:87
+#: g10/import.c:3371 g10/keylist.c:1105 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "razón para la revocación: "
 
-#: g10/import.c:3382 g10/keylist.c:1124 g10/pkclist.c:103
+#: g10/import.c:3390 g10/keylist.c:1124 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "comentario a la revocación: "
 
-#: g10/import.c:3432
+#: g10/import.c:3440
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "clave %s: falta la clave pública - imposible emplear el\n"
 "certificado de revocación\n"
 
-#: g10/import.c:3461
+#: g10/import.c:3469
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "clave %s: no puede localizarse el bloque de claves original: %s\n"
 
-#: g10/import.c:3468
+#: g10/import.c:3476
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "clave %s: no puede leerse el bloque de claves original: %s\n"
 
-#: g10/import.c:3488
+#: g10/import.c:3496
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "clave %s: certificado de revocación inválido: %s - rechazado\n"
 
-#: g10/import.c:3523
+#: g10/import.c:3531
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "clave %s: \"%s\" certificado de revocación importado\n"
 
-#: g10/import.c:3609
+#: g10/import.c:3617
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "clave %s: no hay identificador de usuario para la firma\n"
 
-#: g10/import.c:3626
+#: g10/import.c:3634
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "clave %s: algoritmo de clave pública no disponible para ID \"%s\"\n"
 
-#: g10/import.c:3628
+#: g10/import.c:3636
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "clave %s: autofirma inválida para el id \"%s\"\n"
 
-#: g10/import.c:3645 g10/import.c:3673 g10/import.c:3729
+#: g10/import.c:3653 g10/import.c:3681 g10/import.c:3737
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "clave %s: algoritmo de clave pública no disponible\n"
 
-#: g10/import.c:3646
+#: g10/import.c:3654
 #, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "clave %s: firma directa de clave inválida\n"
 
-#: g10/import.c:3660
+#: g10/import.c:3668
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "clave %s: no hay subclave que unir a la clave\n"
 
-#: g10/import.c:3675
+#: g10/import.c:3683
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "clave %s: unión de subclave inválida\n"
 
-#: g10/import.c:3694
+#: g10/import.c:3702
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "clave %s: borrado enlace de subclaves múltiples\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3726
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "clave %s: no hay subclave para la revocación de clave\n"
 
-#: g10/import.c:3731
+#: g10/import.c:3739
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "clave %s: revocación de subclave inválida\n"
 
-#: g10/import.c:3746
+#: g10/import.c:3754
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "clave %s: borrada revocación de subclave múltiple\n"
 
-#: g10/import.c:3790
+#: g10/import.c:3798
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "clave %s: omitido ID de usuario \"%s\"\n"
 
-#: g10/import.c:3817
+#: g10/import.c:3825
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "clave %s: subclave omitida\n"
 
-#: g10/import.c:3849
+#: g10/import.c:3857
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "clave %s: firma no exportable (clase 0x%02X) - omitida\n"
 
-#: g10/import.c:3860
+#: g10/import.c:3868
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "clave %s: certificado de revocación en lugar equivocado - omitido\n"
 
-#: g10/import.c:3878
+#: g10/import.c:3886
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "clave %s: certificado de revocación no valido: %s - omitido\n"
 
-#: g10/import.c:3892
+#: g10/import.c:3900
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "clave %s: firma de subclave en lugar equivocado - omitida\n"
 
-#: g10/import.c:3900
+#: g10/import.c:3908
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "clave %s: firma de clase (0x%02X) inesperada - omitida\n"
 
-#: g10/import.c:4073
+#: g10/import.c:4081
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "clave %s: detectado usuario duplicado - fusionada\n"
 
-#: g10/import.c:4180
+#: g10/import.c:4188
 #, fuzzy, c-format
 #| msgid "key %s: duplicated user ID detected - merged\n"
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr "clave %s: detectado usuario duplicado - fusionada\n"
 
-#: g10/import.c:4245
+#: g10/import.c:4253
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "AVISO: la clave %s puede estar revocada: recuperando clave de revocación %s\n"
 
-#: g10/import.c:4261
+#: g10/import.c:4269
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVISO: la clave %s puede estar revocada: falta clave de revocación %s.\n"
 
-#: g10/import.c:4327
+#: g10/import.c:4335
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "clave %s: \"%s\" certificado de revocación añadido\n"
 
-#: g10/import.c:4365
+#: g10/import.c:4373
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "clave %s: firma directa de clave añadida\n"
 
-#: g10/key-check.c:133 dirmngr/dirmngr_ldap.c:650 dirmngr/ldap-wrapper.c:835
-#: dirmngr/ldap-wrapper.c:852
+#: g10/key-check.c:133 dirmngr/ldap-wrapper.c:835 dirmngr/ldap-wrapper.c:852
 #, c-format
 msgid "error allocating memory: %s\n"
 msgstr "error al reservar memoria: %s\n"
@@ -4079,7 +4093,7 @@ msgid ""
 "all signatures.\n"
 msgstr ""
 
-#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:284 sm/keydb.c:297
+#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:289 sm/keydb.c:302
 #, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "error al crear caja de claves '%s': %s\n"
@@ -4089,7 +4103,7 @@ msgstr "error al crear caja de claves '%s': %s\n"
 msgid "error creating keyring '%s': %s\n"
 msgstr "error al crear anillo '%s': %s\n"
 
-#: g10/keydb.c:388 sm/keydb.c:303
+#: g10/keydb.c:388 sm/keydb.c:308
 #, c-format
 msgid "keybox '%s' created\n"
 msgstr "caja de claves '%s' creada\n"
@@ -4342,8 +4356,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:6192 g10/keyedit.c:6275 g10/keyedit.c:6404
-#: g10/keyedit.c:6466 g10/sign.c:528
+#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
+#: g10/keyedit.c:6474 g10/sign.c:528
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallida: %s\n"
@@ -4715,7 +4729,7 @@ msgstr "No coincide con ningún identificador de usuario."
 msgid "Nothing to sign.\n"
 msgstr "Nada que firmar.\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6057
+#: g10/keyedit.c:2973 g10/keyedit.c:6065
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "No está firmado por usted.\n"
@@ -4783,7 +4797,7 @@ msgstr "Esta clave puede ser revocada por %s clave %s"
 msgid "(sensitive)"
 msgstr "(confidencial)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:525
+#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "creado: %s"
@@ -4799,7 +4813,7 @@ msgid "expired: %s"
 msgstr "caducó: %s"
 
 #: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2262
-#: g10/keyserver.c:531
+#: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "caduca: %s"
@@ -4835,13 +4849,13 @@ 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:535
-#: g10/mainproc.c:2280 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
+#: g10/mainproc.c:2282 g10/tofu.c:1789 g10/trust.c:426 dirmngr/ocsp.c:792
 msgid "revoked"
 msgstr "revocada"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:539
-#: g10/mainproc.c:2282 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
+#: g10/mainproc.c:2284 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "caducada"
 
@@ -4881,7 +4895,7 @@ msgstr "¿Está seguro de querer añadirla? (s/N) "
 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:3107
+#: g10/keyedit.c:4273 g10/keygen.c:3111
 msgid "Such a user ID already exists on this key!\n"
 msgstr "¡Ese ID de usuario ya existe en esta clave!\n"
 
@@ -5024,7 +5038,7 @@ msgstr "la subclave %s no firma y así no necesita ser certificada en cruz\n"
 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:5357 g10/keyedit.c:5495
+#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "omitiendo autofirma V3 para el id \"%s\"\n"
@@ -5033,127 +5047,127 @@ msgstr "omitiendo autofirma V3 para el id \"%s\"\n"
 msgid "Enter your preferred keyserver URL: "
 msgstr "Introduzca la URL de su servidor de claves preferido: "
 
-#: g10/keyedit.c:5380
+#: g10/keyedit.c:5383
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "¿Seguro que quiere reemplazarlo? (s/N) "
 
-#: g10/keyedit.c:5381
+#: g10/keyedit.c:5384
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "¿Seguro que quiere borrarlo? (s/N) "
 
-#: g10/keyedit.c:5441
+#: g10/keyedit.c:5449
 msgid "Enter the notation: "
 msgstr "Introduzca la notación: "
 
-#: g10/keyedit.c:5588
+#: g10/keyedit.c:5596
 msgid "Proceed? (y/N) "
 msgstr "¿Continuar? (s/N) "
 
-#: g10/keyedit.c:5658
+#: g10/keyedit.c:5666
 #, 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:5720
+#: g10/keyedit.c:5728
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "No hay ID de usuario con hash %s\n"
 
-#: g10/keyedit.c:5821
+#: g10/keyedit.c:5829
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "No existe una subclave con ID de usuario '%s'.\n"
 
-#: g10/keyedit.c:5843
+#: g10/keyedit.c:5851
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "No existe una subclave con índice %d\n"
 
-#: g10/keyedit.c:5984
+#: g10/keyedit.c:5992
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usuario: \"%s\"\n"
 
-#: g10/keyedit.c:5987 g10/keyedit.c:6089 g10/keyedit.c:6137
+#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
 #, 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:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
+#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
 msgid " (non-exportable)"
 msgstr " (no exportable)"
 
-#: g10/keyedit.c:5993
+#: g10/keyedit.c:6001
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta firma caducó el %s.\n"
 
-#: g10/keyedit.c:5998
+#: g10/keyedit.c:6006
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "¿De verdad quiere revocarla? (s/N) "
 
-#: g10/keyedit.c:6003
+#: g10/keyedit.c:6011
 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:6063
+#: g10/keyedit.c:6071
 #, 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:6092
+#: g10/keyedit.c:6100
 msgid " (non-revocable)"
 msgstr " (no revocable)"
 
-#: g10/keyedit.c:6099
+#: g10/keyedit.c:6107
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revocada por la clave %s el %s\n"
 
-#: g10/keyedit.c:6124
+#: g10/keyedit.c:6132
 msgid "You are about to revoke these signatures:\n"
 msgstr "Va a revocar las siguientes firmas:\n"
 
-#: g10/keyedit.c:6147
+#: g10/keyedit.c:6155
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "¿Crear los certificados de revocación realmente? (s/N) "
 
-#: g10/keyedit.c:6180
+#: g10/keyedit.c:6188
 #, c-format
 msgid "no secret key\n"
 msgstr "no hay clave secreta\n"
 
-#: g10/keyedit.c:6228
+#: g10/keyedit.c:6236
 #, 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:6238
+#: g10/keyedit.c:6246
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ID de usuario \"%s\" ya ha sido revocado\n"
 
-#: g10/keyedit.c:6255
+#: g10/keyedit.c:6263
 #, 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:6351
+#: g10/keyedit.c:6359
 #, 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:6389
+#: g10/keyedit.c:6397
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "La clave %s ya ha sido revocada.\n"
 
-#: g10/keyedit.c:6451
+#: g10/keyedit.c:6459
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "La subclave %s ya ha sido revocada.\n"
 
-#: g10/keyedit.c:6548
+#: g10/keyedit.c:6556
 #, 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"
@@ -5163,64 +5177,64 @@ msgstr "Mostrando ID fotográfico %s de tamaño %ld para la clave %s (uid %d)\n"
 msgid "invalid value for option '%s'\n"
 msgstr "parámetro incorrecto para la opción '%s'\n"
 
-#: g10/keygen.c:338
+#: g10/keygen.c:339
 #, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "preferencia '%s' duplicada\n"
 
-#: g10/keygen.c:345
+#: g10/keygen.c:346
 #, c-format
 msgid "too many cipher preferences\n"
 msgstr "demasiadas preferencias de cifrado\n"
 
-#: g10/keygen.c:347
+#: g10/keygen.c:348
 #, c-format
 msgid "too many digest preferences\n"
 msgstr "demasiadas preferencias de resumen\n"
 
-#: g10/keygen.c:349
+#: g10/keygen.c:350
 #, c-format
 msgid "too many compression preferences\n"
 msgstr "demasiadas preferencias de compresión\n"
 
-#: g10/keygen.c:351
+#: g10/keygen.c:352
 #, fuzzy, c-format
 #| msgid "too many cipher preferences\n"
 msgid "too many AEAD preferences\n"
 msgstr "demasiadas preferencias de cifrado\n"
 
-#: g10/keygen.c:521
+#: g10/keygen.c:522
 #, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "item incorrecto '%s' en cadena de preferencias\n"
 
-#: g10/keygen.c:1130
+#: g10/keygen.c:1131
 #, c-format
 msgid "writing direct signature\n"
 msgstr "escribiendo firma directa\n"
 
-#: g10/keygen.c:1176
+#: g10/keygen.c:1177
 #, c-format
 msgid "writing self signature\n"
 msgstr "escribiendo autofirma\n"
 
-#: g10/keygen.c:1233
+#: g10/keygen.c:1234
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "escribiendo la firma de comprobación de clave\n"
 
-#: g10/keygen.c:1598 g10/keygen.c:1603 g10/keygen.c:1655 g10/keygen.c:1660
-#: g10/keygen.c:1832 g10/keygen.c:1837
+#: g10/keygen.c:1599 g10/keygen.c:1604 g10/keygen.c:1656 g10/keygen.c:1661
+#: g10/keygen.c:1833 g10/keygen.c:1838
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tamaño de clave incorrecto; se usarán %u bits\n"
 
-#: g10/keygen.c:1609 g10/keygen.c:1666 g10/keygen.c:1674 g10/keygen.c:1843
+#: g10/keygen.c:1610 g10/keygen.c:1667 g10/keygen.c:1675 g10/keygen.c:1844
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tamaño de clave redondeado a %u bits\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1701
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
@@ -5228,19 +5242,19 @@ msgstr ""
 "AVISO: ciertos programas OpenPGP no usan claves DSAcon resúmenes de este "
 "tamaño\n"
 
-#: g10/keygen.c:1899
+#: g10/keygen.c:1900
 msgid "Sign"
 msgstr "Firma"
 
-#: g10/keygen.c:1902
+#: g10/keygen.c:1903
 msgid "Certify"
 msgstr "Certificar"
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1906
 msgid "Encrypt"
 msgstr "Cifrado"
 
-#: g10/keygen.c:1908
+#: g10/keygen.c:1909
 msgid "Authenticate"
 msgstr "Autentificación"
 
@@ -5254,182 +5268,182 @@ msgstr "Autentificación"
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1929
+#: g10/keygen.c:1930
 msgid "SsEeAaQq"
 msgstr "FfCcAaSs"
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1967
 #, fuzzy, c-format
 #| msgid "Possible actions for a %s key: "
 msgid "Possible actions for this %s key: "
 msgstr "Posibles accriones para una %s clave: "
 
-#: g10/keygen.c:1973
+#: g10/keygen.c:1974
 msgid "Current allowed actions: "
 msgstr "Acciones permitidas actualmente: "
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1979
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Conmutar la capacidad de firmar\n"
 
-#: g10/keygen.c:1981
+#: g10/keygen.c:1982
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Conmutar la capacidad de cifrado\n"
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1985
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Conmutar la capacidad de autenticación\n"
 
-#: g10/keygen.c:1987
+#: g10/keygen.c:1988
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Acabado\n"
 
-#: g10/keygen.c:2116
+#: g10/keygen.c:2117
 #, fuzzy, c-format
 #| msgid "   (%d) RSA and RSA (default)\n"
 msgid "   (%d) RSA and RSA%s\n"
 msgstr "   (%d) RSA y RSA (por defecto)\n"
 
-#: g10/keygen.c:2120
+#: g10/keygen.c:2121
 #, fuzzy, c-format
 #| msgid "   (%d) DSA and Elgamal\n"
 msgid "   (%d) DSA and Elgamal%s\n"
 msgstr "   (%d) DSA y ElGamal\n"
 
-#: g10/keygen.c:2123
+#: g10/keygen.c:2124
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "   (%d) DSA (sign only)%s\n"
 msgstr "   (%d) DSA (sólo firmar)\n"
 
-#: g10/keygen.c:2125
+#: g10/keygen.c:2126
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (sign only)\n"
 msgid "   (%d) RSA (sign only)%s\n"
 msgstr "   (%d) RSA (sólo firmar)\n"
 
-#: g10/keygen.c:2131
+#: g10/keygen.c:2132
 #, fuzzy, c-format
 #| msgid "   (%d) Elgamal (encrypt only)\n"
 msgid "   (%d) Elgamal (encrypt only)%s\n"
 msgstr "   (%d) ElGamal (sólo cifrar)\n"
 
-#: g10/keygen.c:2133
+#: g10/keygen.c:2134
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (encrypt only)\n"
 msgid "   (%d) RSA (encrypt only)%s\n"
 msgstr "   (%d) RSA (sólo cifrar)\n"
 
-#: g10/keygen.c:2139
+#: g10/keygen.c:2140
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (set your own capabilities)\n"
 msgid "   (%d) DSA (set your own capabilities)%s\n"
 msgstr "   (%d) DSA (permite elegir capacidades)\n"
 
-#: g10/keygen.c:2141
+#: g10/keygen.c:2142
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (set your own capabilities)\n"
 msgid "   (%d) RSA (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (permite elegir capacidades)\n"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2148
 #, fuzzy, c-format
 #| msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgid "   (%d) ECC (sign and encrypt)%s\n"
 msgstr "   (%d) ElGamal (firmar y cifrar)\n"
 
-#: g10/keygen.c:2147 g10/keygen.c:2678
+#: g10/keygen.c:2148 g10/keygen.c:2679
 #, fuzzy
 #| msgid " (default)"
 msgid " *default*"
 msgstr "(por defecto)"
 
-#: g10/keygen.c:2148
+#: g10/keygen.c:2149
 #, c-format
 msgid "  (%d) ECC (sign only)\n"
 msgstr "  (%d) ECC (sólo firmar)\n"
 
-#: g10/keygen.c:2150
+#: g10/keygen.c:2151
 #, fuzzy, c-format
 #| msgid "  (%d) ECC (set your own capabilities)\n"
 msgid "  (%d) ECC (set your own capabilities)%s\n"
 msgstr "   (%d) ECC (permite elegir capacidades)\n"
 
-#: g10/keygen.c:2152
+#: g10/keygen.c:2153
 #, fuzzy, c-format
 #| msgid "  (%d) ECC (encrypt only)\n"
 msgid "  (%d) ECC (encrypt only)%s\n"
 msgstr "   (%d) ECC (sólo cifrar)\n"
 
-#: g10/keygen.c:2156
+#: g10/keygen.c:2157
 #, fuzzy, c-format
 #| msgid "  (%d) Existing key\n"
 msgid "  (%d) Existing key%s\n"
 msgstr "   (%d) Clave existente\n"
 
-#: g10/keygen.c:2158
+#: g10/keygen.c:2159
 #, fuzzy, c-format
 #| msgid "   (%d) Existing key from card\n"
 msgid "  (%d) Existing key from card%s\n"
 msgstr "   (%d) Clave existente de la tarjeta\n"
 
-#: g10/keygen.c:2254 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2255 sm/certreqgen-ui.c:203
 msgid "Enter the keygrip: "
 msgstr "Introduzca keygrip: "
 
-#: g10/keygen.c:2267 sm/certreqgen-ui.c:211 tools/gpg-card.c:2280
+#: g10/keygen.c:2268 sm/certreqgen-ui.c:211 tools/gpg-card.c:2297
 #, c-format
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr "No es un keygrip válido (se esperaban 40 dígitos hex)\n"
 
-#: g10/keygen.c:2269 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2270 sm/certreqgen-ui.c:213
 msgid "No key with this keygrip\n"
 msgstr "No hay claves con ese keygrip\n"
 
-#: g10/keygen.c:2288 g10/keygen.c:2298 g10/keygen.c:3440 g10/keygen.c:3451
+#: g10/keygen.c:2289 g10/keygen.c:2299 g10/keygen.c:3444 g10/keygen.c:3455
 #: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
 #, c-format
 msgid "error reading the card: %s\n"
 msgstr "error al leer la tarjeta: %s\n"
 
-#: g10/keygen.c:2292 g10/keygen.c:3444 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2293 g10/keygen.c:3448 sm/certreqgen-ui.c:234
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "Número de serie de la tarjeta: %s\n"
 
-#: g10/keygen.c:2311 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2312 sm/certreqgen-ui.c:246
 msgid "Available keys:\n"
 msgstr "Claves disponibles:\n"
 
-#: g10/keygen.c:2504 g10/keygen.c:2518
+#: g10/keygen.c:2505 g10/keygen.c:2519
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr "redondeados a %u bits\n"
 
-#: g10/keygen.c:2559
+#: g10/keygen.c:2560
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "las claves %s pueden tener entre %u y %u bits de longitud.\n"
 
-#: g10/keygen.c:2567
+#: g10/keygen.c:2568
 #, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "¿De qué tamaño quiere la subclave? (%u) "
 
-#: g10/keygen.c:2584 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2585 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "El tamaño requerido es de %u bits\n"
 
-#: g10/keygen.c:2630
+#: g10/keygen.c:2631
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Seleccione el tipo de curva elíptica deseado:\n"
 
-#: g10/keygen.c:2819
+#: g10/keygen.c:2820
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5445,7 +5459,7 @@ msgstr ""
 "      <n>m = la clave caduca en n meses\n"
 "      <n>y = la clave caduca en n años\n"
 
-#: g10/keygen.c:2830
+#: g10/keygen.c:2831
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5461,38 +5475,38 @@ msgstr ""
 "      <n>m = la clave caduca en n meses\n"
 "      <n>y = la clave caduca en n años\n"
 
-#: g10/keygen.c:2853
+#: g10/keygen.c:2854
 msgid "Key is valid for? (0) "
 msgstr "¿Validez de la clave (0)? "
 
-#: g10/keygen.c:2858
+#: g10/keygen.c:2859
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Clave válida ¿durante? (%s) "
 
-#: g10/keygen.c:2871 g10/keygen.c:2896
+#: g10/keygen.c:2875 g10/keygen.c:2900
 msgid "invalid value\n"
 msgstr "valor inválido\n"
 
-#: g10/keygen.c:2878
+#: g10/keygen.c:2882
 msgid "Key does not expire at all\n"
 msgstr "La clave nunca caduca\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2883
 msgid "Signature does not expire at all\n"
 msgstr "La firma nunca caduca\n"
 
-#: g10/keygen.c:2884
+#: g10/keygen.c:2888
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "La clave caduca %s\n"
 
-#: g10/keygen.c:2885
+#: g10/keygen.c:2889
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "La firma caduca el %s\n"
 
-#: g10/keygen.c:2889
+#: g10/keygen.c:2893
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5500,11 +5514,11 @@ msgstr ""
 "Su sistema no puede mostrar fechas más allá del 2038.\n"
 "Sin embargo funcionará correctamente hasta el 2106.\n"
 
-#: g10/keygen.c:2902
+#: g10/keygen.c:2906
 msgid "Is this correct? (y/N) "
 msgstr "¿Es correcto? (s/n) "
 
-#: g10/keygen.c:2970
+#: g10/keygen.c:2974
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5518,7 +5532,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2985
+#: g10/keygen.c:2989
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5534,49 +5548,49 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:3004
+#: g10/keygen.c:3008
 msgid "Real name: "
 msgstr "Nombre y apellidos: "
 
-#: g10/keygen.c:3013
+#: g10/keygen.c:3017
 msgid "Invalid character in name\n"
 msgstr "Caracter inválido en el nombre\n"
 
-#: g10/keygen.c:3014
+#: g10/keygen.c:3018
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr "Los caracteres '%s' y '%s' no pueden aparecer en el nombre\n"
 
-#: g10/keygen.c:3018
+#: g10/keygen.c:3022
 msgid "Name may not start with a digit\n"
 msgstr "El nombre no puede empezar con un número\n"
 
-#: g10/keygen.c:3021
+#: g10/keygen.c:3025
 msgid "Name must be at least 5 characters long\n"
 msgstr "El nombre debe tener al menos 5 caracteres\n"
 
-#: g10/keygen.c:3031
+#: g10/keygen.c:3035
 msgid "Email address: "
 msgstr "Dirección de correo electrónico: "
 
-#: g10/keygen.c:3037
+#: g10/keygen.c:3041
 msgid "Not a valid email address\n"
 msgstr "Dirección inválida\n"
 
-#: g10/keygen.c:3046
+#: g10/keygen.c:3050
 msgid "Comment: "
 msgstr "Comentario: "
 
-#: g10/keygen.c:3052
+#: g10/keygen.c:3056
 msgid "Invalid character in comment\n"
 msgstr "Caracter inválido en el comentario\n"
 
-#: g10/keygen.c:3088
+#: g10/keygen.c:3092
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr "Está usando el juego de caracteres '%s'.\n"
 
-#: g10/keygen.c:3094
+#: g10/keygen.c:3098
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5587,7 +5601,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3099
+#: g10/keygen.c:3103
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Por favor no ponga la dirección de correo-e en el nombre real o en el "
@@ -5604,31 +5618,31 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3124
+#: g10/keygen.c:3128
 msgid "NnCcEeOoQq"
 msgstr "NnCcDdVvSs"
 
-#: g10/keygen.c:3134
+#: g10/keygen.c:3138
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "¿Cambia (N)ombre, (C)omentario, (D)irección o (S)alir? "
 
-#: g10/keygen.c:3135
+#: g10/keygen.c:3139
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "¿Cambia (N)ombre, (C)omentario, (D)irección o (V)ale/(S)alir? "
 
-#: g10/keygen.c:3140
+#: g10/keygen.c:3144
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "¿Cambia (N)ombre, (D)irección o (S)alir? "
 
-#: g10/keygen.c:3141
+#: g10/keygen.c:3145
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "¿Cambia (N)ombre, (D)irección o (V)ale/(S)alir? "
 
-#: g10/keygen.c:3160
+#: g10/keygen.c:3164
 msgid "Please correct the error first\n"
 msgstr "Por favor corrija primero el error.\n"
 
-#: g10/keygen.c:3206
+#: g10/keygen.c:3210
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -5641,18 +5655,18 @@ msgstr ""
 "generador de números aleatorios mayor oportunidad de recoger suficiente\n"
 "entropía.\n"
 
-#: g10/keygen.c:3591
+#: g10/keygen.c:3595
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4590 g10/keygen.c:4663 g10/keygen.c:4681 g10/keygen.c:4710
-#: g10/keygen.c:5086 g10/keygen.c:5632 g10/keygen.c:5943 g10/keygen.c:6050
+#: g10/keygen.c:4594 g10/keygen.c:4667 g10/keygen.c:4685 g10/keygen.c:4714
+#: g10/keygen.c:5113 g10/keygen.c:5663 g10/keygen.c:5974 g10/keygen.c:6081
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Creación de la clave fallida: %s\n"
 
-#: g10/keygen.c:4599
+#: g10/keygen.c:4603
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5663,64 +5677,64 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:4601
+#: g10/keygen.c:4605
 msgid "Continue? (Y/n) "
 msgstr "¿Continuar? (S/n) "
 
-#: g10/keygen.c:4622
+#: g10/keygen.c:4626
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "Ya existe una clave para \"%s\"\n"
 
-#: g10/keygen.c:4627
+#: g10/keygen.c:4631
 msgid "Create anyway? (y/N) "
 msgstr "¿Crear de todas formas?(s/N) "
 
-#: g10/keygen.c:4633
+#: g10/keygen.c:4637
 #, c-format
 msgid "creating anyway\n"
 msgstr "creando de todas formas\n"
 
-#: g10/keygen.c:5069
+#: g10/keygen.c:5096
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr "Nota: Usa \"%s %s\" para el diálogo completo de generación de clave.\n"
 
-#: g10/keygen.c:5118
+#: g10/keygen.c:5145
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Creación de claves cancelada.\n"
 
-#: g10/keygen.c:5178
+#: g10/keygen.c:5205
 #, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "no se puede crear fichero de respaldo '%s': %s\n"
 
-#: g10/keygen.c:5198
+#: g10/keygen.c:5225
 #, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "NOTA: copia de seguridad de la clave guardada en '%s'\n"
 
-#: g10/keygen.c:5359 g10/keygen.c:5561
+#: g10/keygen.c:5389 g10/keygen.c:5591
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr "escribiendo clave pública en '%s'\n"
 
-#: g10/keygen.c:5555
+#: g10/keygen.c:5585
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "anillo público de claves no escribible encontrado: %s\n"
 
-#: g10/keygen.c:5569
+#: g10/keygen.c:5599
 #, c-format
 msgid "error writing public keyring '%s': %s\n"
 msgstr "error al escribir en el anillo público '%s': %s\n"
 
-#: g10/keygen.c:5603
+#: g10/keygen.c:5634
 msgid "public and secret key created and signed.\n"
 msgstr "claves pública y secreta creadas y firmadas.\n"
 
-#: g10/keygen.c:5619
+#: g10/keygen.c:5650
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -5728,7 +5742,7 @@ msgstr ""
 "Tenga en cuenta que esta clave no puede ser usada para cifrar. Puede usar\n"
 "la orden \"--edit-key\" para crear una subclave con este propósito.\n"
 
-#: g10/keygen.c:5801 g10/keygen.c:6000
+#: g10/keygen.c:5832 g10/keygen.c:6031
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5736,7 +5750,7 @@ msgstr ""
 "clave pública creada %lu segundos en el futuro (salto en el tiempo o\n"
 "problemas con el reloj)\n"
 
-#: g10/keygen.c:5803 g10/keygen.c:6002
+#: g10/keygen.c:5834 g10/keygen.c:6033
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5744,23 +5758,23 @@ msgstr ""
 "clave pública creada %lu segundos en el futuro (salto en el tiempo o\n"
 "problemas con el reloj)\n"
 
-#: g10/keygen.c:5814 g10/keygen.c:6013
+#: g10/keygen.c:5845 g10/keygen.c:6044
 #, c-format
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "Atención: crear subclaves para claves V3 no sigue el estándar OpenPGP\n"
 
-#: g10/keygen.c:5826 g10/keygen.c:5828
+#: g10/keygen.c:5857 g10/keygen.c:5859
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Las partes secretas de la clave primaria no están disponibles.\n"
 
-#: g10/keygen.c:5835 g10/keygen.c:5837
+#: g10/keygen.c:5866 g10/keygen.c:5868
 #, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Las partes secretas de la clave primaria se guardan en la tarjeta.\n"
 
-#: g10/keygen.c:5857 g10/keygen.c:6027
+#: g10/keygen.c:5888 g10/keygen.c:6058
 msgid "Really create? (y/N) "
 msgstr "¿Crear de verdad? (s/N) "
 
@@ -5839,33 +5853,33 @@ msgstr "      Huella de clave ="
 msgid "      Card serial no. ="
 msgstr "      Número de serie de la tarjeta ="
 
-#: g10/keyring.c:1467
+#: g10/keyring.c:1477
 #, c-format
 msgid "caching keyring '%s'\n"
 msgstr "memorizando anillo '%s'\n"
 
-#: g10/keyring.c:1541
+#: g10/keyring.c:1551
 #, c-format
 msgid "%lu keys cached so far (%lu signature)\n"
 msgid_plural "%lu keys cached so far (%lu signatures)\n"
 msgstr[0] "%lu clave memorizada hasta ahora (%lu firmas)\n"
 msgstr[1] "%lu claves memorizadas hasta ahora (%lu firmas)\n"
 
-#: g10/keyring.c:1557
+#: g10/keyring.c:1567
 #, c-format
 msgid "%lu key cached"
 msgid_plural "%lu keys cached"
 msgstr[0] "%lu clave memorizada"
 msgstr[1] "\t%lu claves memrizadas"
 
-#: g10/keyring.c:1559
+#: g10/keyring.c:1569
 #, c-format
 msgid " (%lu signature)\n"
 msgid_plural " (%lu signatures)\n"
 msgstr[0] " (%lu firma)\n"
 msgstr[1] " (%lu firmas)\n"
 
-#: g10/keyring.c:1636
+#: g10/keyring.c:1646
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: anillo creado\n"
@@ -5894,77 +5908,72 @@ msgstr "recuperar automáticamente claves al verificar firmas"
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "usar la URL de servidor de claves preferido presente en la clave"
 
-#: g10/keyserver.c:537
+#: g10/keyserver.c:360
 msgid "disabled"
 msgstr "deshabilitado"
 
-#: g10/keyserver.c:740
+#: g10/keyserver.c:563
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Introduzca número(s), O)tro, o F)in > "
 
-#: g10/keyserver.c:846
+#: g10/keyserver.c:669
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "protocolo del servidor de claves inválido (us %d!=handler %d)\n"
 
-#: g10/keyserver.c:986 g10/keyserver.c:1096
+#: g10/keyserver.c:809 g10/keyserver.c:919
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" no es un identificador de clave válido: omitido\n"
 
-#: g10/keyserver.c:1420 g10/keyserver.c:1453
+#: g10/keyserver.c:1217 g10/keyserver.c:1250
 #, 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:1427
+#: g10/keyserver.c:1224
 #, 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:1531
+#: g10/keyserver.c:1316
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "clave \"%s\" no encontrada en el servidor\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1319
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "clave no encontrada en el servidor\n"
 
-#: g10/keyserver.c:1722
-#, c-format
-msgid "requesting key %s from %s server %s\n"
-msgstr "solicitando clave %s de %s servidor %s\n"
-
-#: g10/keyserver.c:1726
+#: g10/keyserver.c:1481
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "solicitando clave %s de %s\n"
 
-#: g10/keyserver.c:1841 g10/keyserver.c:2020
+#: g10/keyserver.c:1600 g10/keyserver.c:1793
 #, c-format
 msgid "no keyserver known\n"
 msgstr "ningún servidor de claves conocido\n"
 
-#: g10/keyserver.c:1856 g10/skclist.c:213 g10/skclist.c:241
+#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "omitido \"%s\": %s\n"
 
-#: g10/keyserver.c:1860
+#: g10/keyserver.c:1619
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "enviando clave %s a %s\n"
 
-#: g10/keyserver.c:1901
+#: g10/keyserver.c:1662
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr "solicitando clave de %s\n"
 
-#: g10/keyserver.c:1917
+#: g10/keyserver.c:1680
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVISO: imposible recuperar URI %s: %s\n"
@@ -5991,251 +6000,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:472
+#: g10/mainproc.c:473
 #, c-format
 msgid "public key is %s\n"
 msgstr "la clave pública es %s\n"
 
-#: g10/mainproc.c:524
+#: g10/mainproc.c:525
 #, 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:528 g10/pkclist.c:231
+#: g10/mainproc.c:529 g10/pkclist.c:231
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:532
+#: g10/mainproc.c:533
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrado con clave %s, ID %s\n"
 
-#: g10/mainproc.c:552 g10/mainproc.c:935
+#: g10/mainproc.c:553 g10/mainproc.c:937
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "AVISO: se observan varios textos en claro\n"
 
-#: g10/mainproc.c:560
+#: g10/mainproc.c:561
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "cifrado con %lu frases contraseña\n"
 
-#: g10/mainproc.c:562
+#: g10/mainproc.c:563
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "cifrado con 1 frase contraseña\n"
 
-#: g10/mainproc.c:577 g10/mainproc.c:602
+#: g10/mainproc.c:578 g10/mainproc.c:603
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "descifrado de la clave pública fallido: %s\n"
 
-#: g10/mainproc.c:613
+#: g10/mainproc.c:614
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "datos cifrados con la clave pública: DEK correcta\n"
 
-#: g10/mainproc.c:642 g10/mainproc.c:663
+#: g10/mainproc.c:643 g10/mainproc.c:664
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "suponiendo %s datos cifrados\n"
 
-#: g10/mainproc.c:649
+#: g10/mainproc.c:650
 #, 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:742 g10/mainproc.c:780
+#: g10/mainproc.c:744 g10/mainproc.c:782
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ATENCIÓN: la intgridad del mensaje no está protegida\n"
 
-#: g10/mainproc.c:753
+#: g10/mainproc.c:755
 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:756
+#: g10/mainproc.c:758
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:761
+#: g10/mainproc.c:763
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "descifrado fallido: %s\n"
 
-#: g10/mainproc.c:773
+#: g10/mainproc.c:775
 #, c-format
 msgid "decryption okay\n"
 msgstr "descifrado correcto\n"
 
-#: g10/mainproc.c:786
+#: g10/mainproc.c:788
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATENCIÓN: ¡el mensaje cifrado ha sido manipulado!\n"
 
-#: g10/mainproc.c:804
+#: g10/mainproc.c:806
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "descifrado fallido: %s\n"
 
-#: g10/mainproc.c:851
+#: g10/mainproc.c:853
 #, 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:858
+#: g10/mainproc.c:860
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nombre fichero original='%.*s'\n"
 
-#: g10/mainproc.c:1135
+#: g10/mainproc.c:1137
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocación independiente - use \"gpg --import\" para aplicarla\n"
 
-#: g10/mainproc.c:1440 g10/mainproc.c:1483
+#: g10/mainproc.c:1442 g10/mainproc.c:1485
 #, c-format
 msgid "no signature found\n"
 msgstr "no se encontró firma\n"
 
-#: g10/mainproc.c:1763
+#: g10/mainproc.c:1765
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Firma INCORRECTA de \"%s\""
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1767
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Firma caducada de \"%s\""
 
-#: g10/mainproc.c:1767
+#: g10/mainproc.c:1769
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Firma correcta de \"%s\""
 
-#: g10/mainproc.c:1789
+#: g10/mainproc.c:1791
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "suprimida la verificación de la firma\n"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1905
 #, 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:1919 g10/mainproc.c:1926
+#: g10/mainproc.c:1921 g10/mainproc.c:1928
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Firmado el %s\n"
 
-#: g10/mainproc.c:1920 g10/mainproc.c:1927 sm/verify.c:480
+#: g10/mainproc.c:1922 g10/mainproc.c:1929 sm/verify.c:480
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               usando %s clave %s\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1933
 #, 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:1937
+#: g10/mainproc.c:1939
 #, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "               emisor \"%s\"\n"
 
-#: g10/mainproc.c:1992
+#: g10/mainproc.c:1994
 #, c-format
 msgid "Key available at: "
 msgstr "Clave disponible en: "
 
-#: g10/mainproc.c:2034
+#: g10/mainproc.c:2036
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2234
+#: g10/mainproc.c:2236
 msgid "[uncertain]"
 msgstr "[incierto]"
 
-#: g10/mainproc.c:2272
+#: g10/mainproc.c:2274
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                alias \"%s\""
 
-#: g10/mainproc.c:2347
+#: g10/mainproc.c:2349
 #, 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:2363
+#: g10/mainproc.c:2365
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Firma caducada en %s\n"
 
-#: g10/mainproc.c:2368
+#: g10/mainproc.c:2370
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "La firma caduca el %s\n"
 
-#: g10/mainproc.c:2379
+#: g10/mainproc.c:2381
 #, 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:2380
+#: g10/mainproc.c:2382
 msgid "binary"
 msgstr "binaria"
 
-#: g10/mainproc.c:2381
+#: g10/mainproc.c:2383
 msgid "textmode"
 msgstr "modotexto"
 
-#: g10/mainproc.c:2381 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2383 g10/trust.c:112 dirmngr/ocsp.c:793
 msgid "unknown"
 msgstr "desconocido"
 
-#: g10/mainproc.c:2383
+#: g10/mainproc.c:2385
 msgid ", key algorithm "
 msgstr ", algoritmo de clave pública "
 
-#: g10/mainproc.c:2418
+#: g10/mainproc.c:2420
 #, 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:2457
+#: g10/mainproc.c:2459
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposible comprobar la firma: %s\n"
 
-#: g10/mainproc.c:2553 g10/mainproc.c:2572 g10/mainproc.c:2696
+#: g10/mainproc.c:2555 g10/mainproc.c:2574 g10/mainproc.c:2698
 #, c-format
 msgid "not a detached signature\n"
 msgstr "no es una firma separada\n"
 
-#: g10/mainproc.c:2606
+#: g10/mainproc.c:2608
 #, 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:2615
+#: g10/mainproc.c:2617
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "firma independiente de clase 0x%02x\n"
 
-#: g10/mainproc.c:2700
+#: g10/mainproc.c:2702
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma al viejo estilo (PGP 2.x)\n"
@@ -6419,46 +6428,52 @@ msgstr "Notación de firmas críticas: "
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "el subpaquete de tipo %d tiene el bit crítico activado\n"
 
-#: g10/passphrase.c:208
+#: g10/passphrase.c:201 sm/decrypt.c:669
+#, fuzzy
+#| msgid "Please enter the new passphrase"
+msgid "Please enter the passphrase for decryption."
+msgstr "Por favor escriba la nueva frase contraseña"
+
+#: g10/passphrase.c:203
 msgid "Enter passphrase\n"
 msgstr "Introduzca frase contraseña\n"
 
-#: g10/passphrase.c:219
+#: g10/passphrase.c:227
 #, c-format
 msgid "cancelled by user\n"
 msgstr "cancelado por el usuario\n"
 
-#: g10/passphrase.c:460
+#: g10/passphrase.c:472
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (ID de clave primaria %s)"
 
-#: g10/passphrase.c:467
+#: g10/passphrase.c:479
 msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 msgstr "Introduzca frase contraseña para desbloquear la clave secreta OpenPGP:"
 
-#: g10/passphrase.c:471
+#: g10/passphrase.c:483
 msgid "Please enter the passphrase to import the OpenPGP secret key:"
 msgstr "Introduzca frase contraseña para importar la clave secreta OpenPGP:"
 
-#: g10/passphrase.c:476
+#: g10/passphrase.c:488
 msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 msgstr "Introduzca frase contraseña para exportar la subclave secreta OpenPGP:"
 
-#: g10/passphrase.c:479
+#: g10/passphrase.c:491
 msgid "Please enter the passphrase to export the OpenPGP secret key:"
 msgstr "Introduzca frase contraseña para exportar la clave secreta OpenPGP:"
 
-#: g10/passphrase.c:484
+#: g10/passphrase.c:496
 msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 msgstr ""
 "De verdad quiere borrar para siempre la subclave secreta de la clave OpenPGP:"
 
-#: g10/passphrase.c:487
+#: g10/passphrase.c:499
 msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgstr "De verdad quiere borrar para siempre la clave secreta OpenPGP:"
 
-#: g10/passphrase.c:496
+#: g10/passphrase.c:508
 #, c-format
 msgid ""
 "%s\n"
@@ -6630,7 +6645,7 @@ msgstr ""
 "El mínimo nivel de confianza para esta clave es: %s\n"
 "\n"
 
-#: g10/pkclist.c:313 g10/revoke.c:803
+#: g10/pkclist.c:313 g10/revoke.c:804
 msgid "Your decision? "
 msgstr "¿Su decisión? "
 
@@ -6941,7 +6956,7 @@ msgstr "imposible abrir datos firmados '%s'\n"
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "imposible abrir datos firmados fd=%d: %s\n"
 
-#: g10/pubkey-enc.c:99 sm/decrypt.c:879
+#: g10/pubkey-enc.c:99 sm/decrypt.c:1329
 #, c-format
 msgid "key %s is not suitable for decryption in %s mode\n"
 msgstr "la clave %s no se puede usar para cifrar en modo %s\n"
@@ -6988,7 +7003,7 @@ msgid "Note: key has been revoked"
 msgstr "NOTA: la clave ha sido revocada"
 
 #: g10/revoke.c:100 g10/revoke.c:126 g10/revoke.c:172 g10/revoke.c:184
-#: g10/revoke.c:502
+#: g10/revoke.c:503
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "construcción del paquete fallida: %s\n"
@@ -7014,11 +7029,11 @@ msgstr "Clave secreta no disponible.\n"
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "¿Crear un certificado de revocación para esta clave? (s/N) "
 
-#: g10/revoke.c:334 g10/revoke.c:744
+#: g10/revoke.c:334 g10/revoke.c:745
 msgid "ASCII armored output forced.\n"
 msgstr "se fuerza salida con armadura ASCII.\n"
 
-#: g10/revoke.c:350 g10/revoke.c:481
+#: g10/revoke.c:350 g10/revoke.c:482
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet falló: %s\n"
@@ -7032,11 +7047,11 @@ msgstr "Certificado de revocación creado.\n"
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "no se encuentran claves de revocación para \"%s\"\n"
 
-#: g10/revoke.c:567
+#: g10/revoke.c:568
 msgid "This is a revocation certificate for the OpenPGP key:"
 msgstr "Este es un certificado de revocación para la clave OpenPGP:"
 
-#: g10/revoke.c:583
+#: g10/revoke.c:584
 msgid ""
 "A revocation certificate is a kind of \"kill switch\" to publicly\n"
 "declare that a key shall not anymore be used.  It is not possible\n"
@@ -7047,7 +7062,7 @@ msgstr ""
 "públicamente que una clave no debería usarse más. No es posible deshacer\n"
 "un certificado de este tipo una vez que se publica."
 
-#: g10/revoke.c:586
+#: g10/revoke.c:587
 msgid ""
 "Use it to revoke this key in case of a compromise or loss of\n"
 "the secret key.  However, if the secret key is still accessible,\n"
@@ -7063,7 +7078,7 @@ msgstr ""
 "\"\n"
 "en el manual GnuPG."
 
-#: g10/revoke.c:592
+#: g10/revoke.c:593
 msgid ""
 "To avoid an accidental use of this file, a colon has been inserted\n"
 "before the 5 dashes below.  Remove this colon with a text editor\n"
@@ -7074,12 +7089,12 @@ msgstr ""
 "con un editor de texto antes de importar y publicar este certificado\n"
 "de revocación."
 
-#: g10/revoke.c:611
+#: g10/revoke.c:612
 #, c-format
 msgid "revocation certificate stored as '%s.rev'\n"
 msgstr "certificado de revocación guardado como '%s.rev'\n"
 
-#: g10/revoke.c:655
+#: g10/revoke.c:656
 #, c-format
 msgid "secret key \"%s\" not found\n"
 msgstr "clave secreta \"%s\" no encontrada\n"
@@ -7087,21 +7102,21 @@ msgstr "clave secreta \"%s\" no encontrada\n"
 #. TRANSLATORS: The %s prints a key specification which
 #. for example has been given at the command line.  Several lines
 #. lines with secret key infos are printed after this message.
-#: g10/revoke.c:680
+#: g10/revoke.c:681
 #, c-format
 msgid "'%s' matches multiple secret keys:\n"
 msgstr "'%s' coincide con varias claves secretas:\n"
 
-#: g10/revoke.c:705
+#: g10/revoke.c:706
 #, c-format
 msgid "error searching the keyring: %s\n"
 msgstr "error buscando el anillo de claves: %s\n"
 
-#: g10/revoke.c:728
+#: g10/revoke.c:729
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "¿Crear un certificado de revocación para esta clave? (s/N) "
 
-#: g10/revoke.c:752
+#: g10/revoke.c:753
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -7120,33 +7135,33 @@ msgstr ""
 "de impresión de su máquina podría almacenar los datos y hacerlos accesibles\n"
 "a otras personas!\n"
 
-#: g10/revoke.c:786
+#: g10/revoke.c:787
 msgid "Please select the reason for the revocation:\n"
 msgstr "Por favor elija una razón para la revocación:\n"
 
-#: g10/revoke.c:796
+#: g10/revoke.c:797
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: g10/revoke.c:798
+#: g10/revoke.c:799
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Probablemente quería seleccionar %d aquí)\n"
 
-#: g10/revoke.c:839
+#: g10/revoke.c:843
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Introduzca una descripción opcional; acábela con una línea vacía:\n"
 
-#: g10/revoke.c:867
+#: g10/revoke.c:871
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Razón para la revocación: %s\n"
 
-#: g10/revoke.c:869
+#: g10/revoke.c:873
 msgid "(No description given)\n"
 msgstr "(No se dió descripción)\n"
 
-#: g10/revoke.c:874
+#: g10/revoke.c:878
 msgid "Is this okay? (y/N) "
 msgstr "¿Es correcto? (s/N) "
 
@@ -7324,22 +7339,22 @@ msgstr "firmando:"
 msgid "%s.%s encryption will be used\n"
 msgstr "se usará un cifrado %s\n"
 
-#: g10/skclist.c:172 g10/skclist.c:253
+#: g10/skclist.c:173 g10/skclist.c:254
 #, c-format
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr "clave no marcada como insegura - no puede usarse con el pseudo RNG\n"
 
-#: g10/skclist.c:204
+#: g10/skclist.c:205
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "\"%s\" omitido: duplicado\n"
 
-#: g10/skclist.c:223
+#: g10/skclist.c:224
 #, c-format
 msgid "skipped: secret key already present\n"
 msgstr "omitido: clave secreta ya presente\n"
 
-#: g10/skclist.c:242
+#: g10/skclist.c:243
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "¡esta es una clave ElGamal generada por PGP que NO es segura para firmar!"
@@ -7561,10 +7576,10 @@ msgstr "version de base de datos TOFU no soportada: %s\n"
 msgid "TOFU DB error"
 msgstr "Error de la base de datos de TOFU"
 
-#: g10/tofu.c:687 g10/tofu.c:2073 g10/tofu.c:2354 g10/tofu.c:2373
-#: g10/tofu.c:2386 g10/tofu.c:2398 g10/tofu.c:2413 g10/tofu.c:2425
-#: g10/tofu.c:3021 g10/tofu.c:3038 g10/tofu.c:3075 g10/tofu.c:3092
-#: g10/tofu.c:3404
+#: g10/tofu.c:687 g10/tofu.c:2077 g10/tofu.c:2358 g10/tofu.c:2377
+#: g10/tofu.c:2390 g10/tofu.c:2402 g10/tofu.c:2417 g10/tofu.c:2429
+#: g10/tofu.c:3025 g10/tofu.c:3042 g10/tofu.c:3079 g10/tofu.c:3096
+#: g10/tofu.c:3408
 #, c-format
 msgid "error reading TOFU database: %s\n"
 msgstr "error al leer la base de datos TOFU: %s\n"
@@ -7584,7 +7599,7 @@ msgstr "error iniciando base de datos TOFU: %s\n"
 msgid "error opening TOFU database '%s': %s\n"
 msgstr "error al abrir base de datos TOFU '%s': %s\n"
 
-#: g10/tofu.c:1148 g10/tofu.c:3458 g10/tofu.c:3604
+#: g10/tofu.c:1148 g10/tofu.c:3462 g10/tofu.c:3608
 #, c-format
 msgid "error updating TOFU database: %s\n"
 msgstr "error al actualizar la base de datos TOFU: %s\n"
@@ -7630,17 +7645,17 @@ msgstr "error al obtener otras ID de usuario: %s\n"
 msgid "This key's user IDs:\n"
 msgstr "Las ID de usuario de esta clave:\n"
 
-#: g10/tofu.c:1634 g10/tofu.c:1799
+#: g10/tofu.c:1634 g10/tofu.c:1801
 #, c-format
 msgid "policy: %s"
 msgstr "política: %s"
 
-#: g10/tofu.c:1725
+#: g10/tofu.c:1727
 #, c-format
 msgid "error gathering signature stats: %s\n"
 msgstr "error al obtener estadísticas de las firmas: %s\n"
 
-#: g10/tofu.c:1729
+#: g10/tofu.c:1731
 #, c-format
 msgid "The email address \"%s\" is associated with %d key:\n"
 msgid_plural "The email address \"%s\" is associated with %d keys:\n"
@@ -7649,38 +7664,38 @@ msgstr[0] ""
 msgstr[1] ""
 "La dirección de correo electrónico \"%s\" está asociada a %d claves:\n"
 
-#: g10/tofu.c:1747
+#: g10/tofu.c:1749
 #, c-format
 msgid "Statistics for keys with the email address \"%s\":\n"
 msgstr ""
 "Estadísticas para las claves con la dirección de correo electrónico \"%s\":\n"
 
-#: g10/tofu.c:1797
+#: g10/tofu.c:1799
 msgid "this key"
 msgstr "esta clave"
 
-#: g10/tofu.c:1823
+#: g10/tofu.c:1825
 #, c-format
 msgid "Verified %d message."
 msgid_plural "Verified %d messages."
 msgstr[0] "Verificado %d mensaje."
 msgstr[1] "Verificados %d mensajes."
 
-#: g10/tofu.c:1827
+#: g10/tofu.c:1829
 #, c-format
 msgid "Encrypted %d message."
 msgid_plural "Encrypted %d messages."
 msgstr[0] "Cifrado %d mensaje."
 msgstr[1] "Cifrados %d mensajes."
 
-#: g10/tofu.c:1834
+#: g10/tofu.c:1836
 #, c-format
 msgid "Verified %d message in the future."
 msgid_plural "Verified %d messages in the future."
 msgstr[0] "Verificado %d mensaje en el futuro."
 msgstr[1] "Verificados %d mensajes en el futuro."
 
-#: g10/tofu.c:1838
+#: g10/tofu.c:1840
 #, c-format
 msgid "Encrypted %d message in the future."
 msgid_plural "Encrypted %d messages in the future."
@@ -7688,54 +7703,54 @@ msgstr[0] "Cifrado %d mensaje en el futuro."
 msgstr[1] "Cifrados %d mensajes en el futuro."
 
 # this string and the following ones are not easy to translate to spanish. is the string of the answer always meaning plural thins, or it can say 1week apart of 7weeks? if so, we in Spanish need to change the translation of 'last'...
-#: g10/tofu.c:1852
+#: g10/tofu.c:1854
 #, c-format
 msgid "Messages verified over the past %d day: %d."
 msgid_plural "Messages verified over the past %d days: %d."
 msgstr[0] ""
 msgstr[1] "Mensajes verificados los últimos %d días: %d."
 
-#: g10/tofu.c:1858
+#: g10/tofu.c:1860
 #, c-format
 msgid "Messages encrypted over the past %d day: %d."
 msgid_plural "Messages encrypted over the past %d days: %d."
 msgstr[0] ""
 msgstr[1] "Mensajes cifrados los últimos %d días: %d."
 
-#: g10/tofu.c:1868
+#: g10/tofu.c:1870
 #, c-format
 msgid "Messages verified over the past %d month: %d."
 msgid_plural "Messages verified over the past %d months: %d."
 msgstr[0] ""
 msgstr[1] "Mensajes verificados los últimos %d meses: %d."
 
-#: g10/tofu.c:1874
+#: g10/tofu.c:1876
 #, c-format
 msgid "Messages encrypted over the past %d month: %d."
 msgid_plural "Messages encrypted over the past %d months: %d."
 msgstr[0] ""
 msgstr[1] "Mensajes cifrados los últimos %d meses: %d."
 
-#: g10/tofu.c:1884
+#: g10/tofu.c:1886
 #, c-format
 msgid "Messages verified over the past %d year: %d."
 msgid_plural "Messages verified over the past %d years: %d."
 msgstr[0] ""
 msgstr[1] "Mensajes verificados los últimos %d años: %d."
 
-#: g10/tofu.c:1890
+#: g10/tofu.c:1892
 #, c-format
 msgid "Messages encrypted over the past %d year: %d."
 msgid_plural "Messages encrypted over the past %d years: %d."
 msgstr[0] ""
 msgstr[1] "Mensajes cifrados los últimos %d años: %d."
 
-#: g10/tofu.c:1898
+#: g10/tofu.c:1900
 #, c-format
 msgid "Messages verified in the past: %d."
 msgstr "Mensajes verificados en el pasado: %d."
 
-#: g10/tofu.c:1902
+#: g10/tofu.c:1904
 #, c-format
 msgid "Messages encrypted in the past: %d."
 msgstr "Mensajes cifrados en el pasado: %d."
@@ -7743,105 +7758,105 @@ msgstr "Mensajes cifrados en el pasado: %d."
 #. TRANSLATORS: Please translate the text found in the source
 #. * file below.  We don't directly internationalize that text so
 #. * that we can tweak it without breaking translations.
-#: g10/tofu.c:1919
+#: g10/tofu.c:1921
 msgid "TOFU detected a binding conflict"
 msgstr "TOFU ha detectado un conflicto de binding"
 
 #. TRANSLATORS: Two letters (normally the lower and upper case
 #. * version of the hotkey) for each of the five choices.  If
 #. * there is only one choice in your language, repeat it.
-#: g10/tofu.c:1961
+#: g10/tofu.c:1963
 msgid "gGaAuUrRbB"
 msgstr "bBaAdDrRmM"
 
-#: g10/tofu.c:1967
+#: g10/tofu.c:1969
 msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 "(B)ien, (A)ceptar esta vez, (D)esconocido, (R)echazar esta vez, (M)ala? "
 
-#: g10/tofu.c:1975
+#: g10/tofu.c:1978
 msgid "Defaulting to unknown.\n"
 msgstr "Por defecto elegiremos desconocido.\n"
 
-#: g10/tofu.c:2093 g10/tofu.c:2228
+#: g10/tofu.c:2097 g10/tofu.c:2232
 #, c-format
 msgid "TOFU db corruption detected.\n"
 msgstr "Detectada corrupción en la base de datos TOFU.\n"
 
-#: g10/tofu.c:2829
+#: g10/tofu.c:2833
 #, c-format
 msgid "error changing TOFU policy: %s\n"
 msgstr "error al cambiar la política TOFU: %s\n"
 
-#: g10/tofu.c:2880
+#: g10/tofu.c:2884
 #, c-format
 msgid "%lld~year"
 msgid_plural "%lld~years"
 msgstr[0] "%lld~año"
 msgstr[1] "%lld~años"
 
-#: g10/tofu.c:2885
+#: g10/tofu.c:2889
 #, c-format
 msgid "%lld~month"
 msgid_plural "%lld~months"
 msgstr[0] "%lld~mes"
 msgstr[1] "%lld~meses"
 
-#: g10/tofu.c:2890
+#: g10/tofu.c:2894
 #, c-format
 msgid "%lld~week"
 msgid_plural "%lld~weeks"
 msgstr[0] "%lld~semana"
 msgstr[1] "%lld~semanas"
 
-#: g10/tofu.c:2895
+#: g10/tofu.c:2899
 #, c-format
 msgid "%lld~day"
 msgid_plural "%lld~days"
 msgstr[0] "%lld~día"
 msgstr[1] "%lld~días"
 
-#: g10/tofu.c:2900
+#: g10/tofu.c:2904
 #, c-format
 msgid "%lld~hour"
 msgid_plural "%lld~hours"
 msgstr[0] "%lld~hora"
 msgstr[1] "%lld~horas"
 
-#: g10/tofu.c:2905
+#: g10/tofu.c:2909
 #, c-format
 msgid "%lld~minute"
 msgid_plural "%lld~minutes"
 msgstr[0] "%lld~minuto"
 msgstr[1] "%lld~minutos"
 
-#: g10/tofu.c:2907
+#: g10/tofu.c:2911
 #, c-format
 msgid "%lld~second"
 msgid_plural "%lld~seconds"
 msgstr[0] "%lld~segundo"
 msgstr[1] "%lld~segundos"
 
-#: g10/tofu.c:3145
+#: g10/tofu.c:3149
 #, c-format
 msgid "%s: Verified 0~signatures and encrypted 0~messages."
 msgstr "%s: Verificadas 0~firmas y cifrados 0~mensajes."
 
-#: g10/tofu.c:3151
+#: g10/tofu.c:3155
 #, c-format
 msgid "%s: Verified 0 signatures."
 msgstr "%s: Verificadas 0 firmas."
 
-#: g10/tofu.c:3165
+#: g10/tofu.c:3169
 msgid "Encrypted 0 messages."
 msgstr "Cifrados 0 mensajes."
 
-#: g10/tofu.c:3181
+#: g10/tofu.c:3185
 #, c-format
 msgid "(policy: %s)"
 msgstr "(política: %s)"
 
-#: g10/tofu.c:3215
+#: g10/tofu.c:3219
 #, c-format
 msgid ""
 "Warning: we have yet to see a message signed using this key and user id!\n"
@@ -7849,7 +7864,7 @@ msgstr ""
 "Advertencia: ¡Todavía no hemos visto ningún mensaje firmado con esta clave e "
 "identificador de usuario/a!\n"
 
-#: g10/tofu.c:3218
+#: g10/tofu.c:3222
 #, c-format
 msgid ""
 "Warning: we've only seen one message signed using this key and user id!\n"
@@ -7857,17 +7872,17 @@ msgstr ""
 "Advertencia: ¡sólo hemos visto un mensaje firmado con esta clave e "
 "identificador de usuario!\n"
 
-#: g10/tofu.c:3222
+#: g10/tofu.c:3226
 #, c-format
 msgid "Warning: you have yet to encrypt a message to this key!\n"
 msgstr "Advertencia: ¡todavía no has cifrado ningún mensaje para esta clave!\n"
 
-#: g10/tofu.c:3225
+#: g10/tofu.c:3229
 #, c-format
 msgid "Warning: you have only encrypted one message to this key!\n"
 msgstr "Advertencia: ¡sólo has cifrado un mensaje para esta clave!\n"
 
-#: g10/tofu.c:3254
+#: g10/tofu.c:3258
 #, c-format
 msgid ""
 "Warning: if you think you've seen more signatures by this key and user id, "
@@ -7896,13 +7911,13 @@ msgstr[1] ""
 "  %s\n"
 "para marcarla como mala.\n"
 
-#: g10/tofu.c:3339 g10/tofu.c:3502 g10/tofu.c:3708 g10/tofu.c:3761
-#: g10/tofu.c:3902 g10/tofu.c:3979 g10/tofu.c:4017
+#: g10/tofu.c:3343 g10/tofu.c:3506 g10/tofu.c:3712 g10/tofu.c:3765
+#: g10/tofu.c:3906 g10/tofu.c:3983 g10/tofu.c:4021
 #, c-format
 msgid "error opening TOFU database: %s\n"
 msgstr "error al abrir base de datos TOFU: %s\n"
 
-#: g10/tofu.c:3535
+#: g10/tofu.c:3539
 #, c-format
 msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
 msgstr ""
@@ -7970,7 +7985,7 @@ msgstr "usando %s como modelo de confianza\n"
 msgid "no need for a trustdb check\n"
 msgstr "no es necesaria una comprobación de la base de datos de confianza\n"
 
-#: g10/trustdb.c:601 g10/trustdb.c:2272
+#: g10/trustdb.c:601 g10/trustdb.c:2273
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "siguiente comprobación de base de datos de confianza el: %s\n"
@@ -8004,31 +8019,31 @@ msgstr "por favor haga un --check-trustdb\n"
 msgid "checking the trustdb\n"
 msgstr "comprobando base de datos de confianza\n"
 
-#: g10/trustdb.c:1993
+#: g10/trustdb.c:1994
 #, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr[0] "%d clave procesada"
 msgstr[1] "%d claves procesadas"
 
-#: g10/trustdb.c:1996
+#: g10/trustdb.c:1997
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] " (%d validación de cuenta borrada)\n"
 msgstr[1] " (%d validaciones de cuenta borradas)\n"
 
-#: g10/trustdb.c:2066
+#: g10/trustdb.c:2067
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "no se encuentran claves absolutamente fiables\n"
 
-#: g10/trustdb.c:2080
+#: g10/trustdb.c:2081
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "clave pública de la clave absolutamente fiable %s no encontrada\n"
 
-#: g10/trustdb.c:2198
+#: g10/trustdb.c:2199
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -8036,30 +8051,30 @@ msgstr ""
 "nivel: %d  validez: %3d  firmada: %3d  confianza: %d-, %dq, %dn, %dm, %df, "
 "%du\n"
 
-#: g10/trustdb.c:2279
+#: g10/trustdb.c:2280
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
 "no se puede actualizar el registro de la versión de la base de datos\n"
 "de confianza: fallo de escritura: %s\n"
 
-#: g10/trust.c:125
+#: g10/trust.c:114
 msgid "undefined"
 msgstr "no definido"
 
-#: g10/trust.c:126
+#: g10/trust.c:115
 msgid "never"
 msgstr "nunca"
 
-#: g10/trust.c:127
+#: g10/trust.c:116
 msgid "marginal"
 msgstr "dudosa"
 
-#: g10/trust.c:128
+#: g10/trust.c:117
 msgid "full"
 msgstr "total"
 
-#: g10/trust.c:129
+#: g10/trust.c:118
 msgid "ultimate"
 msgstr "absoluta"
 
@@ -8071,39 +8086,39 @@ msgstr "absoluta"
 #. It gets passed to atoi() so everything after the number is
 #. essentially a comment and need not be translated.  Either key and
 #. uid are both NULL, or neither are NULL.
-#: g10/trust.c:166
+#: g10/trust.c:155
 msgid "10 translator see trust.c:uid_trust_string_fixed"
 msgstr "13 no apto para supersticiosos"
 
-#: g10/trust.c:169
+#: g10/trust.c:158
 msgid "[ revoked]"
 msgstr "[  revocada ]"
 
-#: g10/trust.c:171 g10/trust.c:177
+#: g10/trust.c:160 g10/trust.c:166
 msgid "[ expired]"
 msgstr "[  caducada ]"
 
-#: g10/trust.c:176
+#: g10/trust.c:165
 msgid "[ unknown]"
 msgstr "[desconocida]"
 
-#: g10/trust.c:178
+#: g10/trust.c:167
 msgid "[  undef ]"
 msgstr "[no definida]"
 
-#: g10/trust.c:179
+#: g10/trust.c:168
 msgid "[  never ]"
 msgstr "[ nunca ]"
 
-#: g10/trust.c:180
+#: g10/trust.c:169
 msgid "[marginal]"
 msgstr "[   dudosa  ]"
 
-#: g10/trust.c:181
+#: g10/trust.c:170
 msgid "[  full  ]"
 msgstr "[   total   ]"
 
-#: g10/trust.c:182
+#: g10/trust.c:171
 msgid "[ultimate]"
 msgstr "[  absoluta ]"
 
@@ -8163,16 +8178,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:4937 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2386
+#: scd/app-piv.c:1770 scd/app-p15.c:5035 scd/app-nks.c:1530
+#: scd/app-openpgp.c:2387
 #, 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:4956 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2402
+#: scd/app-piv.c:1787 scd/app-p15.c:5054 scd/app-nks.c:1549
+#: scd/app-openpgp.c:2403
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr "Intentos disponibles: %d"
@@ -8214,10 +8229,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:2669
-#: scd/app-openpgp.c:2693 scd/app-openpgp.c:2871 scd/app-openpgp.c:2893
-#: scd/app-openpgp.c:3074 scd/app-openpgp.c:3361 scd/app-openpgp.c:3408
-#: scd/app-openpgp.c:3545 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2670
+#: scd/app-openpgp.c:2694 scd/app-openpgp.c:2872 scd/app-openpgp.c:2894
+#: scd/app-openpgp.c:3075 scd/app-openpgp.c:3362 scd/app-openpgp.c:3409
+#: scd/app-openpgp.c:3547 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"
@@ -8239,93 +8254,93 @@ 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:3616
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3618
 #, c-format
 msgid "key already exists\n"
 msgstr "la clave ya existe\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3620
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3622
 #, 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:3622
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3624
 #, c-format
 msgid "generating new key\n"
 msgstr "generando nueva clave\n"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3624
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3626
 #, c-format
 msgid "writing new key\n"
 msgstr "escribiendo clave nueva\n"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4484 scd/app-openpgp.c:4767
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4486 scd/app-openpgp.c:4761
 #, 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:1615
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1616
 #, 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:1622
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1623
 #, 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:1732
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1733
 #, 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:4943
+#: scd/app-piv.c:3279 scd/app-openpgp.c:4937
 #, 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:4951
+#: scd/app-piv.c:3294 scd/app-openpgp.c:4945
 #, 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:4957
+#: scd/app-piv.c:3300 scd/app-openpgp.c:4951
 #, 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:1842 scd/app-openpgp.c:4966
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1843 scd/app-openpgp.c:4960
 #, 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:5035 scd/app-nks.c:2038
+#: scd/app-p15.c:5133 scd/app-nks.c:2038
 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:5038 scd/app-openpgp.c:2818
+#: scd/app-p15.c:5136 scd/app-openpgp.c:2819
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Por favor introduzca PIN de Administrador"
 
-#: scd/app-p15.c:5040 scd/app-nks.c:2028
+#: scd/app-p15.c:5138 scd/app-nks.c:2028
 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:5043 scd/app-nks.c:2019
+#: scd/app-p15.c:5141 scd/app-nks.c:2019
 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:4321
+#: scd/app-nks.c:1468 scd/app-openpgp.c:4323
 #, 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:4333
+#: scd/app-nks.c:1476 scd/app-openpgp.c:4335
 #, 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"
@@ -8369,27 +8384,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:3442 scd/app-dinsig.c:534
+#: scd/app-nks.c:2221 scd/app-openpgp.c:3443 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:943
+#: scd/app-openpgp.c:944
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "fallo al almacenar la huella digital: %s\n"
 
-#: scd/app-openpgp.c:956
+#: scd/app-openpgp.c:957
 #, 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:1427 scd/app-openpgp.c:3389 scd/app-openpgp.c:5715
+#: scd/app-openpgp.c:1428 scd/app-openpgp.c:3390 scd/app-openpgp.c:5709
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "error recuperando el estatus CHV de la tarjeta\n"
 
-#: scd/app-openpgp.c:1949
+#: scd/app-openpgp.c:1950
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "fallo al leer clave pública: %s\n"
@@ -8397,42 +8412,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:2373
+#: scd/app-openpgp.c:2374
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 
-#: scd/app-openpgp.c:2621
+#: scd/app-openpgp.c:2622
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "usando PIN por defecto %s\n"
 
-#: scd/app-openpgp.c:2628
+#: scd/app-openpgp.c:2629
 #, 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:2641
+#: scd/app-openpgp.c:2642
 msgid "||Please unlock the card"
 msgstr "||Por favor desbloquee la tarjeta"
 
-#: scd/app-openpgp.c:2700 scd/app-openpgp.c:2900 scd/app-openpgp.c:3368
+#: scd/app-openpgp.c:2701 scd/app-openpgp.c:2901 scd/app-openpgp.c:3369
 #, 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:2717 scd/app-openpgp.c:2760 scd/app-openpgp.c:2917
-#: scd/app-openpgp.c:5325
+#: scd/app-openpgp.c:2718 scd/app-openpgp.c:2761 scd/app-openpgp.c:2918
+#: scd/app-openpgp.c:5319
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "la verificación CHV%d falló: %s\n"
 
-#: scd/app-openpgp.c:2804 scd/app-openpgp.c:5724
+#: scd/app-openpgp.c:2805 scd/app-openpgp.c:5718
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "¡la tarjeta está bloqueada permanentemente!\n"
 
-#: scd/app-openpgp.c:2808
+#: scd/app-openpgp.c:2809
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8444,20 +8459,20 @@ msgstr[1] ""
 "%d intentos quedan para PIN de administrador antes de "
 "bloquearpermanentemente la clave\n"
 
-#: scd/app-openpgp.c:2841
+#: scd/app-openpgp.c:2842
 #, 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:3355
+#: scd/app-openpgp.c:3356
 msgid "||Please enter the PIN"
 msgstr "||Por favor introduzca PIN"
 
-#: scd/app-openpgp.c:3404
+#: scd/app-openpgp.c:3405
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Por favor introduzca Código de Reinicio de la tarjeta"
 
-#: scd/app-openpgp.c:3414 scd/app-openpgp.c:3481
+#: scd/app-openpgp.c:3415 scd/app-openpgp.c:3484
 #, 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"
@@ -8465,79 +8480,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:3437
+#: scd/app-openpgp.c:3438
 msgid "|RN|New Reset Code"
 msgstr "|RN|Nuevo Código de Reinicio"
 
-#: scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3439
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Nuevo PIN Administrador"
 
-#: scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3439
 msgid "|N|New PIN"
 msgstr "|N|Nuevo PIN"
 
-#: scd/app-openpgp.c:3541
+#: scd/app-openpgp.c:3543
 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:3542
+#: scd/app-openpgp.c:3544
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Por favor introduzca el PIN y el Nuevo PIN"
 
-#: scd/app-openpgp.c:3600 scd/app-openpgp.c:5026
+#: scd/app-openpgp.c:3602 scd/app-openpgp.c:5020
 #, c-format
 msgid "error reading application data\n"
 msgstr "error al leer datos de la aplicación\n"
 
-#: scd/app-openpgp.c:3606 scd/app-openpgp.c:5033
+#: scd/app-openpgp.c:3608 scd/app-openpgp.c:5027
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "error al leer huella digital DO\n"
 
-#: scd/app-openpgp.c:4302 scd/app-openpgp.c:4657
+#: scd/app-openpgp.c:4304 scd/app-openpgp.c:4653
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "falta fecha de creación\n"
 
-#: scd/app-openpgp.c:4343 scd/app-openpgp.c:4351
+#: scd/app-openpgp.c:4345 scd/app-openpgp.c:4353
 #, 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:4651
+#: scd/app-openpgp.c:4647
 #, c-format
 msgid "unsupported curve\n"
 msgstr "curva no soportada\n"
 
-#: scd/app-openpgp.c:4991
+#: scd/app-openpgp.c:4985
 #, 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:5041
+#: scd/app-openpgp.c:5035
 #, 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:5240
+#: scd/app-openpgp.c:5234
 #, 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:5298
+#: scd/app-openpgp.c:5292
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "firmas creadas hasta ahora: %lu\n"
 
-#: scd/app-openpgp.c:5729
+#: scd/app-openpgp.c:5723
 #, 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:6241 scd/app-openpgp.c:6252
+#: scd/app-openpgp.c:6250 scd/app-openpgp.c:6261
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "no se puede acceder a %s - ¿tarjeta OpenPGP inválida?\n"
@@ -8557,7 +8572,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:274 dirmngr/dirmngr.c:198
+#: scd/scdaemon.c:136 sm/gpgsm.c:274 dirmngr/dirmngr.c:199
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LEVEL|poner el nivel de depurado a NIVEL"
 
@@ -8618,12 +8633,12 @@ msgstr ""
 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:2104
+#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2143
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "manejador del descriptor %d iniciado\n"
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2112
+#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2151
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "manejador del descriptor %d terminado\n"
@@ -8633,11 +8648,11 @@ msgstr "manejador del descriptor %d terminado\n"
 msgid "validation model requested by certificate: %s"
 msgstr "el certificado: %s requiere un modelo de validación"
 
-#: sm/certchain.c:199 sm/certchain.c:2172
+#: sm/certchain.c:199 sm/certchain.c:2174
 msgid "chain"
 msgstr "cadena"
 
-#: sm/certchain.c:200 sm/certchain.c:2172
+#: sm/certchain.c:200 sm/certchain.c:2174
 msgid "shell"
 msgstr "shell"
 
@@ -8670,225 +8685,225 @@ msgstr "Nota: no se permiten políticas no críticas de certificados"
 msgid "certificate policy not allowed"
 msgstr "no se permite política de certificado"
 
-#: sm/certchain.c:595 sm/keydb.c:1891 sm/keydb.c:1980
+#: sm/certchain.c:596 sm/keydb.c:1913 sm/keydb.c:2002
 #, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "fallo obteniendo huella digital\n"
 
-#: sm/certchain.c:624
+#: sm/certchain.c:625
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr "buscando al emisor en una localización externa\n"
 
-#: sm/certchain.c:644
+#: sm/certchain.c:645
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "numero de emisores coincidentes: %d\n"
 
-#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#: sm/certchain.c:724 dirmngr/ocsp.c:683
 #, c-format
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "no se ha podido obtener authorityInfoAccess: %s\n"
 
-#: sm/certchain.c:791
+#: sm/certchain.c:792
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr "buscando emisor en el caché de Dirmngr\n"
 
-#: sm/certchain.c:816
+#: sm/certchain.c:817
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "número de certificados coincidentes: %d\n"
 
-#: sm/certchain.c:819
+#: sm/certchain.c:820
 #, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "fallo buscando la clave sólo caché de dirmngr: %s\n"
 
-#: sm/certchain.c:1046 sm/certchain.c:1561 sm/certchain.c:2200 sm/decrypt.c:643
-#: sm/encrypt.c:620 sm/import.c:414 sm/keydb.c:1898 sm/keydb.c:1987
-#: sm/sign.c:428 sm/verify.c:117
+#: sm/certchain.c:1047 sm/certchain.c:1562 sm/certchain.c:2202
+#: sm/decrypt.c:1084 sm/encrypt.c:621 sm/import.c:414 sm/keydb.c:1920
+#: sm/keydb.c:2009 sm/sign.c:428 sm/verify.c:117
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "fallo al reservar handle de keyDB\n"
 
-#: sm/certchain.c:1232
+#: sm/certchain.c:1233
 msgid "certificate has been revoked"
 msgstr "el certificado ha sido revocado"
 
-#: sm/certchain.c:1247
+#: sm/certchain.c:1248
 msgid "the status of the certificate is unknown"
 msgstr "el estado del certificado es desconocido"
 
-#: sm/certchain.c:1254
+#: sm/certchain.c:1255
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr "por favor asegúrese de que \"dirmngr\" está bien instalado\n"
 
-#: sm/certchain.c:1260
+#: sm/certchain.c:1261
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "la comprobación de CRL falló: %s"
 
-#: sm/certchain.c:1289 sm/certchain.c:1357 dirmngr/validate.c:497
+#: sm/certchain.c:1290 sm/certchain.c:1358 dirmngr/validate.c:497
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "validez del certificado incorrecta: %s"
 
-#: sm/certchain.c:1304 sm/certchain.c:1389 dirmngr/validate.c:515
+#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:515
 #, c-format
 msgid "certificate not yet valid"
 msgstr "el certificado aún no es válido"
 
-#: sm/certchain.c:1305 sm/certchain.c:1390
+#: sm/certchain.c:1306 sm/certchain.c:1391
 msgid "root certificate not yet valid"
 msgstr "el certificado raíz no es válido aún"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1307 sm/certchain.c:1392
 msgid "intermediate certificate not yet valid"
 msgstr "el certificado intermedio aún no es válido"
 
-#: sm/certchain.c:1319 dirmngr/validate.c:526
+#: sm/certchain.c:1320 dirmngr/validate.c:526
 #, c-format
 msgid "certificate has expired"
 msgstr "certificado caducado"
 
-#: sm/certchain.c:1320
+#: sm/certchain.c:1321
 msgid "root certificate has expired"
 msgstr "el certificado raíz ha caducado"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1322
 msgid "intermediate certificate has expired"
 msgstr "el certificado intermedio ha caducado"
 
-#: sm/certchain.c:1363
+#: sm/certchain.c:1364
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr "faltan los atributos requeridos del certificado: %s%s%s"
 
-#: sm/certchain.c:1372
+#: sm/certchain.c:1373
 msgid "certificate with invalid validity"
 msgstr "el certificado tiene una validez incorrecta"
 
-#: sm/certchain.c:1409
+#: sm/certchain.c:1410
 msgid "signature not created during lifetime of certificate"
 msgstr "la firma no se creo durante el tiempo de validez del certificado"
 
-#: sm/certchain.c:1411
+#: sm/certchain.c:1412
 msgid "certificate not created during lifetime of issuer"
 msgstr "el certificado no se creo durante el tiempo de validez el emisor"
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1413
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
 "certificado intermedio no creado durante el tiempo de validez del emisor"
 
-#: sm/certchain.c:1416
+#: sm/certchain.c:1417
 #, c-format
 msgid "  (  signature created at "
 msgstr "  ( firmas creadas en "
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1418
 #, c-format
 msgid "  (certificate created at "
 msgstr "  (certificado creado en "
 
-#: sm/certchain.c:1420
+#: sm/certchain.c:1421
 #, c-format
 msgid "  (certificate valid from "
 msgstr "  (certificado válido desde "
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1422
 #, c-format
 msgid "  (     issuer valid from "
 msgstr "  (     emisor válido desde "
 
-#: sm/certchain.c:1451 dirmngr/validate.c:577
+#: sm/certchain.c:1452 dirmngr/validate.c:577
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "huella digital=%s\n"
 
-#: sm/certchain.c:1460
+#: sm/certchain.c:1461
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr "certificado raíz marcado ahora como fiable\n"
 
-#: sm/certchain.c:1473
+#: sm/certchain.c:1474
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr "marcar interactivamente como fiable no está activado en gpg-agent\n"
 
-#: sm/certchain.c:1479
+#: sm/certchain.c:1480
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr "marcar interactivamente como fíable desactivado en esta sesión\n"
 
-#: sm/certchain.c:1538
+#: sm/certchain.c:1539
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr "AVISO: fecha de creación de firma desconocida - asumo momento actual"
 
-#: sm/certchain.c:1602
+#: sm/certchain.c:1603
 msgid "no issuer found in certificate"
 msgstr "no se encuentra el emisor de este certificado"
 
-#: sm/certchain.c:1680
+#: sm/certchain.c:1681
 msgid "self-signed certificate has a BAD signature"
 msgstr "certificado auto firmado con firma INCORRECTA"
 
-#: sm/certchain.c:1749 dirmngr/validate.c:575
+#: sm/certchain.c:1750 dirmngr/validate.c:575
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "el certificado raíz no está marcado como fiable"
 
-#: sm/certchain.c:1765
+#: sm/certchain.c:1766
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "la comprobación de la lista de confianza falló: %s\n"
 
-#: sm/certchain.c:1796 sm/import.c:175 dirmngr/validate.c:630
+#: sm/certchain.c:1797 sm/import.c:175 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "cadena de certificados demasiado larga\n"
 
-#: sm/certchain.c:1808 dirmngr/validate.c:642
+#: sm/certchain.c:1809 dirmngr/validate.c:642
 #, c-format
 msgid "issuer certificate not found"
 msgstr "no se encuentra emisor del certificado"
 
-#: sm/certchain.c:1842 dirmngr/validate.c:668
+#: sm/certchain.c:1844 dirmngr/validate.c:668
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr "el certificado tiene una firma INCORRECTA"
 
-#: sm/certchain.c:1874 dirmngr/validate.c:692
+#: sm/certchain.c:1876 dirmngr/validate.c:692
 msgid "found another possible matching CA certificate - trying again"
 msgstr "encontrado otro posible certificado de CA coincidente - reintentando"
 
-#: sm/certchain.c:1933 dirmngr/validate.c:717
+#: sm/certchain.c:1935 dirmngr/validate.c:717
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "cadena de certificados más larga de lo que permite la CA (%d)"
 
-#: sm/certchain.c:1975 sm/certchain.c:2275 dirmngr/validate.c:747
+#: sm/certchain.c:1977 sm/certchain.c:2278 dirmngr/validate.c:747
 #, c-format
 msgid "certificate is good\n"
 msgstr "certificado correcto\n"
 
-#: sm/certchain.c:1976
+#: sm/certchain.c:1978
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "certificado intermedio correcto\n"
 
-#: sm/certchain.c:1977
+#: sm/certchain.c:1979
 #, c-format
 msgid "root certificate is good\n"
 msgstr "certificado raíz correcto\n"
 
-#: sm/certchain.c:2159
+#: sm/certchain.c:2161
 msgid "switching to chain model"
 msgstr "cambiando al modelo en cadena"
 
-#: sm/certchain.c:2168
+#: sm/certchain.c:2170
 #, c-format
 msgid "validation model used: %s"
 msgstr "modelo de validación usado: %s"
@@ -8899,18 +8914,18 @@ 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:1372 dirmngr/validate.c:903
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1411 dirmngr/validate.c:903
 #: dirmngr/validate.c:927
 #, c-format
 msgid "out of core\n"
 msgstr "memoria desbordada\n"
 
-#: sm/certcheck.c:389 sm/verify.c:212
+#: sm/certcheck.c:388 sm/verify.c:212
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(es el algoritmo MD2)\n"
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:793
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:794
 msgid "none"
 msgstr "ninguno"
 
@@ -9201,17 +9216,17 @@ msgstr "Acabado. Debería mandar esta petición a su CA.\n"
 msgid "resource problem: out of core\n"
 msgstr "problema de recursos: memoria desbordada\n"
 
-#: sm/decrypt.c:719
+#: sm/decrypt.c:1159
 #, c-format
 msgid "(this is the RC2 algorithm)\n"
 msgstr "(el algoritmo RC2)\n"
 
-#: sm/decrypt.c:721
+#: sm/decrypt.c:1161
 #, c-format
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr "(no parece un mensaje cifrado)\n"
 
-#: sm/decrypt.c:868
+#: sm/decrypt.c:1318
 #, fuzzy, c-format
 #| msgid "encrypted with %s key, ID %s\n"
 msgid "encrypted to %s key %s\n"
@@ -9222,7 +9237,7 @@ msgstr "cifrado con clave %s, ID %s\n"
 msgid "certificate '%s' not found: %s\n"
 msgstr "certificado '%s' no encontrado: %s\n"
 
-#: sm/delete.c:120 sm/keydb.c:1999 sm/keydb.c:2098
+#: sm/delete.c:120 sm/keydb.c:2021 sm/keydb.c:2120
 #, c-format
 msgid "error locking keybox: %s\n"
 msgstr "error bloqueando keybox: %s\n"
@@ -9242,7 +9257,7 @@ msgstr "certificado '%s' borrado\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "borrado del certificado \"%s\" fallido: %s\n"
 
-#: sm/encrypt.c:606
+#: sm/encrypt.c:607
 #, c-format
 msgid "no valid recipients given\n"
 msgstr "no se dieron receptores válidos\n"
@@ -9311,43 +9326,43 @@ msgstr "|USER-ID|usa ID-USUARIO como clave secreta por defecto"
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|FILE|añade este anillo a la lista de anillos"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:352 dirmngr/dirmngr.c:265
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|SPEC|usa este servidor para buscar claves"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:363
 msgid "fetch missing issuer certificates"
 msgstr "recuperar certificados de emisor perdidos"
 
-#: sm/gpgsm.c:364
+#: sm/gpgsm.c:365
 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:385
+#: sm/gpgsm.c:386
 msgid "never consult a CRL"
 msgstr "nunca consultar una CRL"
 
-#: sm/gpgsm.c:389
+#: sm/gpgsm.c:390
 msgid "do not check CRLs for root certificates"
 msgstr "no comprobar CRLs para certificados raíz"
 
-#: sm/gpgsm.c:393
+#: sm/gpgsm.c:394
 msgid "check validity using OCSP"
 msgstr "comprabar validez usando OCSP"
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:396
 msgid "do not check certificate policies"
 msgstr "no comprobar políticas de certificados"
 
-#: sm/gpgsm.c:398
+#: sm/gpgsm.c:399
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|usa el algoritmo de cifrado NOMBRE"
 
-#: sm/gpgsm.c:400
+#: sm/gpgsm.c:401
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|usa algoritmo de resumen de mensaje NOMBRE"
 
-#: sm/gpgsm.c:410
+#: sm/gpgsm.c:411
 msgid "batch mode: never ask"
 msgstr "proceso por lotes: nunca preguntar"
 
@@ -9357,23 +9372,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:412
+#: sm/gpgsm.c:413
 msgid "assume yes on most questions"
 msgstr "asume \"sí\" en casi todas las preguntas"
 
-#: sm/gpgsm.c:413
+#: sm/gpgsm.c:414
 msgid "assume no on most questions"
 msgstr "asume \"no\" en casi todas las preguntas"
 
-#: sm/gpgsm.c:430
+#: sm/gpgsm.c:431
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FILE|escribir inform de auditoría a FICHERO"
 
-#: sm/gpgsm.c:615
+#: sm/gpgsm.c:616
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Uso: @GPGSM@ [opciones] [ficheros] (-h para ayuda)"
 
-#: sm/gpgsm.c:618
+#: sm/gpgsm.c:619
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -9383,52 +9398,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:826
+#: sm/gpgsm.c:827
 #, 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:837
+#: sm/gpgsm.c:838
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "modelo de validación desconocido '%s'\n"
 
-#: sm/gpgsm.c:896 dirmngr/ldapserver.c:89
-#, c-format
-msgid "%s:%u: no hostname given\n"
-msgstr "%s:%u: falta el nombre del host\n"
-
-#: sm/gpgsm.c:915 dirmngr/ldapserver.c:108
-#, c-format
-msgid "%s:%u: password given without user\n"
-msgstr "%s:%u: se dio contraseña sin usuario\n"
-
-#: sm/gpgsm.c:946 dirmngr/ldapserver.c:139
-#, c-format
-msgid "%s:%u: ignoring unknown flag '%s'\n"
-msgstr ""
-
-#: sm/gpgsm.c:962 dirmngr/ldapserver.c:155
-#, c-format
-msgid "%s:%u: skipping this line\n"
-msgstr "%s:%u: omitir esta línea\n"
-
-#: sm/gpgsm.c:1550
-#, c-format
-msgid "could not parse keyserver\n"
-msgstr "no se puede interpretar el servidor de claves\n"
-
-#: sm/gpgsm.c:1858
+#: sm/gpgsm.c:1711
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "importando certificados comunes '%s'\n"
 
-#: sm/gpgsm.c:1904
+#: sm/gpgsm.c:1757
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "no puedo firmar usando '%s': %s\n"
 
-#: sm/gpgsm.c:2273
+#: sm/gpgsm.c:2129
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "orden inválida (no hay orden implícita)\n"
@@ -9448,53 +9438,53 @@ msgstr "error almacenando certificado\n"
 msgid "basic certificate checks failed - not imported\n"
 msgstr "fallaron comprobaciones básicas sobre el certificado - no importado\n"
 
-#: sm/import.c:471 sm/keydb.c:2018 sm/keydb.c:2111
+#: sm/import.c:472 sm/keydb.c:2040 sm/keydb.c:2133
 #, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "error obteniendo parámetros almacenados: %s\n"
 
-#: sm/import.c:530 sm/import.c:562
+#: sm/import.c:531 sm/import.c:563
 #, c-format
 msgid "error importing certificate: %s\n"
 msgstr "error importando el certificado: %s\n"
 
-#: sm/import.c:751 tools/gpg-connect-agent.c:1475
+#: sm/import.c:752 tools/gpg-connect-agent.c:1475
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "error al leer la entrada: %s\n"
 
-#: sm/keydb.c:503
+#: sm/keydb.c:508
 #, fuzzy, c-format
 #| msgid "no dirmngr running in this session\n"
 msgid "no keyboxd running in this session\n"
 msgstr "no hay agente dirmngr activo en esta sesión\n"
 
-#: sm/keydb.c:595
+#: sm/keydb.c:600
 #, c-format
 msgid "error opening key DB: %s\n"
 msgstr "error al abrir base de datos de claves: %s\n"
 
-#: sm/keydb.c:1936
+#: sm/keydb.c:1958
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr "problema buscando el certificado existente: %s\n"
 
-#: sm/keydb.c:1948
+#: sm/keydb.c:1970
 #, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "error obteniendo keyDB para escribir: %s\n"
 
-#: sm/keydb.c:1956
+#: sm/keydb.c:1978
 #, c-format
 msgid "error storing certificate: %s\n"
 msgstr "error almacenando certificado: %s\n"
 
-#: sm/keydb.c:2009
+#: sm/keydb.c:2031
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "problema re-buscando el certificado: %s\n"
 
-#: sm/keydb.c:2030 sm/keydb.c:2122
+#: sm/keydb.c:2052 sm/keydb.c:2144
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr "error almacenando parámetros: %s\n"
@@ -9676,57 +9666,57 @@ msgstr "   asunto ="
 msgid "error loading certificate '%s': %s\n"
 msgstr "error al cargar certificado '%s': %s\n"
 
-#: dirmngr/certcache.c:819
+#: dirmngr/certcache.c:820
 #, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "    certificados cargados permanentemente: %u\n"
 
-#: dirmngr/certcache.c:821
+#: dirmngr/certcache.c:822
 #, c-format
 msgid "    runtime cached certificates: %u\n"
 msgstr "certificados almacenados para esta sesión: %u\n"
 
-#: dirmngr/certcache.c:823
+#: dirmngr/certcache.c:824
 #, c-format
 msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "                   certificados confiados: %u (%u,%u,%u,%u)\n"
 
-#: dirmngr/certcache.c:851 dirmngr/dirmngr-client.c:392
+#: dirmngr/certcache.c:852 dirmngr/dirmngr-client.c:392
 #, c-format
 msgid "certificate already cached\n"
 msgstr "certificado ya almacenado\n"
 
-#: dirmngr/certcache.c:853
+#: dirmngr/certcache.c:854
 #, c-format
 msgid "certificate cached\n"
 msgstr "certificado almacenado\n"
 
-#: dirmngr/certcache.c:855 dirmngr/certcache.c:875 dirmngr/dirmngr-client.c:396
+#: dirmngr/certcache.c:856 dirmngr/certcache.c:876 dirmngr/dirmngr-client.c:396
 #, c-format
 msgid "error caching certificate: %s\n"
 msgstr "error al almacenar certificado: %s\n"
 
-#: dirmngr/certcache.c:938
+#: dirmngr/certcache.c:939
 #, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "huella digital SHA1 no válida '%s'\n"
 
-#: dirmngr/certcache.c:1384 dirmngr/certcache.c:1393
+#: dirmngr/certcache.c:1385 dirmngr/certcache.c:1394
 #, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "error al descargar certificado con S/N: %s\n"
 
-#: dirmngr/certcache.c:1579 dirmngr/certcache.c:1588
+#: dirmngr/certcache.c:1580 dirmngr/certcache.c:1589
 #, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "error al descargar certificado por asunto: %s\n"
 
-#: dirmngr/certcache.c:1694 dirmngr/validate.c:483
+#: dirmngr/certcache.c:1695 dirmngr/validate.c:483
 #, c-format
 msgid "no issuer found in certificate\n"
 msgstr "no se encuentra el emisor de este certificado\n"
 
-#: dirmngr/certcache.c:1704
+#: dirmngr/certcache.c:1705
 #, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "error al obtener authorityKeyIdentifier: %s\n"
@@ -9761,7 +9751,7 @@ msgstr "removiendo archivo de cache '%s'\n"
 msgid "not removing file '%s'\n"
 msgstr "no se remueve el archivo '%s'\n"
 
-#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2380
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2383
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr "error cerrando archivo de cache: %s\n"
@@ -9999,13 +9989,13 @@ msgid "error getting data from cache file: %s\n"
 msgstr "error al obtener datos del archivo de cache: %s\n"
 
 #: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1672 dirmngr/crlcache.c:1697
-#: dirmngr/crlcache.c:1763
+#: dirmngr/crlcache.c:1766
 #, c-format
 msgid "got an invalid S-expression from libksba\n"
 msgstr "respuesta S-expression de libksba no válida\n"
 
 #: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1679 dirmngr/crlcache.c:1705
-#: dirmngr/crlcache.c:1770 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1773 dirmngr/misc.c:176
 #, c-format
 msgid "converting S-expression failed: %s\n"
 msgstr "he fallado al convertir la expresión S-expression: %s\n"
@@ -10020,134 +10010,134 @@ msgstr "algoritmo hash inválido '%s'\n"
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr "gcry_md_open para algoritmo %d ha fallado: %s\n"
 
-#: dirmngr/crlcache.c:1797 dirmngr/ocsp.c:478
+#: dirmngr/crlcache.c:1800 dirmngr/ocsp.c:478
 #, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "fallo al crear S-expression: %s\n"
 
-#: dirmngr/crlcache.c:1871
+#: dirmngr/crlcache.c:1874
 #, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "ha fallado ksba_crl_parse: %s\n"
 
-#: dirmngr/crlcache.c:1886
+#: dirmngr/crlcache.c:1889
 #, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "error obteniendo el número de serie de la tarjeta: %s\n"
 
-#: dirmngr/crlcache.c:1893
+#: dirmngr/crlcache.c:1896
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr "fechas de actualización de este CRL: esta=%s próxima=%s\n"
 
-#: dirmngr/crlcache.c:1897
+#: dirmngr/crlcache.c:1900
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr "no se ha dado nextUpdate, asumiento un período de validez de un día\n"
 
-#: dirmngr/crlcache.c:1917
+#: dirmngr/crlcache.c:1920
 #, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "error al obtener un objeto CRL: %s\n"
 
-#: dirmngr/crlcache.c:1932
+#: dirmngr/crlcache.c:1935
 #, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "error al insertar objeto en el alacenamiento temporal: %s\n"
 
-#: dirmngr/crlcache.c:1959
+#: dirmngr/crlcache.c:1962
 #, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "no se encuentra el emisor en el CRL: %s\n"
 
-#: dirmngr/crlcache.c:1974
+#: dirmngr/crlcache.c:1977
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr "buscando el certificado de emisor CRL por authorityKeyIdentifier\n"
 
-#: dirmngr/crlcache.c:2020
+#: dirmngr/crlcache.c:2023
 #, c-format
 msgid "CRL signature verification failed: %s\n"
 msgstr "ha fallado la verificación CRL de la firma: %s\n"
 
-#: dirmngr/crlcache.c:2032
+#: dirmngr/crlcache.c:2035
 #, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "error al verificar la validez del emisor del certificado CRL: %s\n"
 
-#: dirmngr/crlcache.c:2174
+#: dirmngr/crlcache.c:2177
 #, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "ha fallado ksba_crl_new: %s\n"
 
-#: dirmngr/crlcache.c:2181
+#: dirmngr/crlcache.c:2184
 #, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "ha fallado ksba_crl_set_reader: %s\n"
 
-#: dirmngr/crlcache.c:2215
+#: dirmngr/crlcache.c:2218
 #, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "se ha removido el fichero temporal de cache en desuso '%s'\n"
 
-#: dirmngr/crlcache.c:2219
+#: dirmngr/crlcache.c:2222
 #, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "problema al remover el fichero temporal de cache en desuso '%s': %s\n"
 
-#: dirmngr/crlcache.c:2229
+#: dirmngr/crlcache.c:2232
 #, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "error al crear fichero temporal de cache '%s': %s\n"
 
-#: dirmngr/crlcache.c:2239
+#: dirmngr/crlcache.c:2242
 #, c-format
 msgid "crl_parse_insert failed: %s\n"
 msgstr "ha fallado crl_parse_insert: %s\n"
 
-#: dirmngr/crlcache.c:2249
+#: dirmngr/crlcache.c:2252
 #, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "error al finalizar fichero temporal de cache '%s': %s\n"
 
-#: dirmngr/crlcache.c:2256
+#: dirmngr/crlcache.c:2259
 #, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "error al cerrar fichero temporal de cache '%s': %s\n"
 
-#: dirmngr/crlcache.c:2281
+#: dirmngr/crlcache.c:2284
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 "ADVERTENCIA: el nuevo CRL es también anticuado; caducó el %s - cargándolo de "
 "todos modos\n"
 
-#: dirmngr/crlcache.c:2285
+#: dirmngr/crlcache.c:2288
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr "el nuevo CRL está anticuado; caducó el %s\n"
 
-#: dirmngr/crlcache.c:2301
+#: dirmngr/crlcache.c:2304
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr "extensión crítica CRL desconocida %s\n"
 
-#: dirmngr/crlcache.c:2311
+#: dirmngr/crlcache.c:2314
 #, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "error al leer las extensiones CRL: %s\n"
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2365
 #, c-format
 msgid "creating cache file '%s'\n"
 msgstr "creando fichero de cache '%s'\n"
 
-#: dirmngr/crlcache.c:2394
+#: dirmngr/crlcache.c:2397
 #, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "problema al renombrar '%s' a '%s': %s\n"
 
-#: dirmngr/crlcache.c:2408
+#: dirmngr/crlcache.c:2411
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
@@ -10156,12 +10146,12 @@ msgstr ""
 "ha fallado la actualización del archivo DIR - la entrada de cache se perderá "
 "al reiniciar el programa\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2448
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr "Comienzo del dump CRL (obtenido mediante %s)\n"
 
-#: dirmngr/crlcache.c:2468
+#: dirmngr/crlcache.c:2471
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
@@ -10170,57 +10160,57 @@ msgstr ""
 "luego de una actualización!\n"
 
 # qué es una 'extensión crítica desconocida'? dice que falta?
-#: dirmngr/crlcache.c:2471
+#: dirmngr/crlcache.c:2474
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 " ERROR: El CRL no se usará a causa de una extensión crítica desconocida!\n"
 "\n"
 
-#: dirmngr/crlcache.c:2474
+#: dirmngr/crlcache.c:2477
 msgid " ERROR: The CRL will not be used\n"
 msgstr " ERROR: No se usará el CRL\n"
 
-#: dirmngr/crlcache.c:2481
+#: dirmngr/crlcache.c:2484
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 " ERROR: ¡Puede que alguien haya manipulado este CRL almacenado en local!\n"
 
-#: dirmngr/crlcache.c:2499
+#: dirmngr/crlcache.c:2502
 #, c-format
 msgid " WARNING: invalid cache record length\n"
 msgstr " ATENCIÓN: el tamaño de la entrada de cache no es correcto\n"
 
-#: dirmngr/crlcache.c:2506
+#: dirmngr/crlcache.c:2509
 #, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "error al leer entrada de cache: %s\n"
 
-#: dirmngr/crlcache.c:2517
+#: dirmngr/crlcache.c:2520
 #, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "problema al leer clave de cache: %s\n"
 
-#: dirmngr/crlcache.c:2548
+#: dirmngr/crlcache.c:2551
 #, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "error al leer entrada de cache de la base de datos: %s\n"
 
-#: dirmngr/crlcache.c:2551
+#: dirmngr/crlcache.c:2554
 msgid "End CRL dump\n"
 msgstr "Terminar el dump de CRL\n"
 
-#: dirmngr/crlcache.c:2672
+#: dirmngr/crlcache.c:2675
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "ha fallado crl_fetch via DP: %s\n"
 
-#: dirmngr/crlcache.c:2683
+#: dirmngr/crlcache.c:2686
 #, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "ha fallado crl_cache_insert via DP: %s\n"
 
-#: dirmngr/crlcache.c:2743
+#: dirmngr/crlcache.c:2746
 #, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "ha fallado crl_cache_insert via emisor: %s\n"
@@ -10241,7 +10231,7 @@ msgstr "el acceso CRL no es posible debido a que %s está desactivado\n"
 msgid "error retrieving '%s': %s\n"
 msgstr "error recuperando '%s': %s\n"
 
-#: dirmngr/crlfetch.c:218 dirmngr/ldap-wrapper.c:881 dirmngr/misc.c:573
+#: dirmngr/crlfetch.c:218 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
 #, c-format
 msgid "error initializing reader object: %s\n"
 msgstr "error al inicializar objeto lector: %s\n"
@@ -10399,129 +10389,129 @@ msgstr "espero la ruta absoluta del archivo\n"
 msgid "looking up '%s'\n"
 msgstr "buscando '%s'\n"
 
-#: dirmngr/dirmngr.c:175
+#: dirmngr/dirmngr.c:176
 msgid "list the contents of the CRL cache"
 msgstr "listar los contenidos del cache CRL"
 
-#: dirmngr/dirmngr.c:176
+#: dirmngr/dirmngr.c:177
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|FILE|carga CRL de FILE en la cache"
 
-#: dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr.c:178
 msgid "|URL|fetch a CRL from URL"
 msgstr "|URL|carga un CRL de una URL"
 
-#: dirmngr/dirmngr.c:178
+#: dirmngr/dirmngr.c:179
 msgid "shutdown the dirmngr"
 msgstr "apaga el dirmngr"
 
-#: dirmngr/dirmngr.c:179
+#: dirmngr/dirmngr.c:180
 msgid "flush the cache"
 msgstr "descargar la memoria cache"
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:213
 msgid "allow online software version check"
 msgstr "permitir el chequeo online de versiones de software"
 
-#: dirmngr/dirmngr.c:215
+#: dirmngr/dirmngr.c:216
 msgid "|N|do not return more than N items in one query"
 msgstr "|N|no devolver más de N items en una consulta"
 
-#: dirmngr/dirmngr.c:221
+#: dirmngr/dirmngr.c:222
 msgid "Network related options"
 msgstr ""
 
-#: dirmngr/dirmngr.c:223
+#: dirmngr/dirmngr.c:224
 msgid "route all network traffic via Tor"
 msgstr "enrutar todo el tráfico a través de Tor"
 
-#: dirmngr/dirmngr.c:235
+#: dirmngr/dirmngr.c:236
 msgid "Configuration for Keyservers"
 msgstr "Configuración para servidores de claves"
 
-#: dirmngr/dirmngr.c:238
+#: dirmngr/dirmngr.c:239
 msgid "|URL|use keyserver at URL"
 msgstr "|URL|usar servidor de claves en URL"
 
-#: dirmngr/dirmngr.c:240
+#: dirmngr/dirmngr.c:241
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr "|FILE|usar los certificados CA en FILE para HKP a través de TLS"
 
-#: dirmngr/dirmngr.c:242
+#: dirmngr/dirmngr.c:243
 msgid "Configuration for HTTP servers"
 msgstr "Configuración de servidores HTTP"
 
-#: dirmngr/dirmngr.c:244
+#: dirmngr/dirmngr.c:245
 msgid "inhibit the use of HTTP"
 msgstr "inhibir el uso de HTTP"
 
-#: dirmngr/dirmngr.c:246
+#: dirmngr/dirmngr.c:247
 msgid "ignore HTTP CRL distribution points"
 msgstr "ignorar puntos de distribución CRL HTTP"
 
-#: dirmngr/dirmngr.c:248
+#: dirmngr/dirmngr.c:249
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr "|URL|redirigir todos los pedidos HTTP a URL"
 
-#: dirmngr/dirmngr.c:250
+#: dirmngr/dirmngr.c:251
 msgid "use system's HTTP proxy setting"
 msgstr "usar configuración del proxy HTTP del sistema"
 
-#: dirmngr/dirmngr.c:254
+#: dirmngr/dirmngr.c:255
 msgid "Configuration of LDAP servers to use"
 msgstr "Configuración de servidores LDAP que se usará"
 
-#: dirmngr/dirmngr.c:256
+#: dirmngr/dirmngr.c:257
 msgid "inhibit the use of LDAP"
 msgstr "inhibir el uso de LDAP"
 
-#: dirmngr/dirmngr.c:258
+#: dirmngr/dirmngr.c:259
 msgid "ignore LDAP CRL distribution points"
 msgstr "ignorar puntos de distribución CRL LDAP"
 
-#: dirmngr/dirmngr.c:260
+#: dirmngr/dirmngr.c:261
 msgid "|HOST|use HOST for LDAP queries"
 msgstr "|HOST|usar HOST para las consultas LDAP"
 
-#: dirmngr/dirmngr.c:262
+#: dirmngr/dirmngr.c:263
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr "no usar hosts de reserva con --ldap-proxy"
 
-#: dirmngr/dirmngr.c:264
+#: dirmngr/dirmngr.c:267
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FILE|lee lista de servidores LDAP de FILE"
 
-#: dirmngr/dirmngr.c:266
+#: dirmngr/dirmngr.c:269
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 "añadir nuevos servidores descubiertos en los puntos de distribución CRL a la "
 "lista de servidores"
 
-#: dirmngr/dirmngr.c:269 dirmngr/dirmngr_ldap.c:104
+#: dirmngr/dirmngr.c:272
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|establecer vida máxima de LDAP en N segundos"
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:275
 msgid "Configuration for OCSP"
 msgstr "Configuración de OCSP"
 
-#: dirmngr/dirmngr.c:274
+#: dirmngr/dirmngr.c:277
 msgid "allow sending OCSP requests"
 msgstr "permitir el envío de búsquedas OSCP"
 
-#: dirmngr/dirmngr.c:276
+#: dirmngr/dirmngr.c:279
 msgid "ignore certificate contained OCSP service URLs"
 msgstr "ignorar URLs de servicio contenidas en los certificados OSCP"
 
-#: dirmngr/dirmngr.c:278
+#: dirmngr/dirmngr.c:281
 msgid "|URL|use OCSP responder at URL"
 msgstr "|URL|usar contestador OSCP en la URL"
 
-#: dirmngr/dirmngr.c:280
+#: dirmngr/dirmngr.c:283
 msgid "|FPR|OCSP response signed by FPR"
 msgstr "|FPR|respuesta OCSP firmada por FPR"
 
-#: dirmngr/dirmngr.c:288
+#: dirmngr/dirmngr.c:291
 msgid "force loading of outdated CRLs"
 msgstr "forzar la carga de CRLs caducados"
 
@@ -10529,7 +10519,7 @@ msgstr "forzar la carga de CRLs caducados"
 # página man -> página de manual
 # Vale. ¿del manual mejor?
 # Hmm, no sé, en man-db se usa "de". La verdad es que no lo he pensado.
-#: dirmngr/dirmngr.c:299
+#: dirmngr/dirmngr.c:302
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
@@ -10538,11 +10528,11 @@ msgstr ""
 "@\n"
 "(Véase en la página del manual la lista completa de órdenes y opciones)\n"
 
-#: dirmngr/dirmngr.c:441
+#: dirmngr/dirmngr.c:449
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Uso: @DIRMNGR@ [opciones] (-h para ayuda)"
 
-#: dirmngr/dirmngr.c:443
+#: dirmngr/dirmngr.c:451
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@ -10550,285 +10540,103 @@ msgstr ""
 "Sintaxis: @DIRMNGR@ [opciones] [orden [argumentos]]\n"
 "Acceso al servidor de claves, CRL y OCSP para @GNUPG@\n"
 
-#: dirmngr/dirmngr.c:523
+#: dirmngr/dirmngr.c:531
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr "los niveles de debug válidos son: %s\n"
 
-#: dirmngr/dirmngr.c:609 tools/gpgconf.c:667 tools/gpgconf.c:702
-#: tools/gpgconf.c:802
+#: dirmngr/dirmngr.c:617 tools/gpgconf.c:701 tools/gpgconf.c:736
+#: tools/gpgconf.c:836
 #, c-format
 msgid "usage: %s [options] "
 msgstr "uso: %s [opciones] "
 
-#: dirmngr/dirmngr.c:1260
+#: dirmngr/dirmngr.c:1299
 #, 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:1495 dirmngr/server.c:1824
+#: dirmngr/dirmngr.c:1534 dirmngr/server.c:1878
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "fallo al intentar descargar CRL desde '%s': %s\n"
 
-#: dirmngr/dirmngr.c:1501 dirmngr/server.c:1830
+#: dirmngr/dirmngr.c:1540 dirmngr/server.c:1884
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "falló el procesamiento CRL desde '%s': %s\n"
 
-#: dirmngr/dirmngr.c:1643
+#: dirmngr/dirmngr.c:1682
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: línea demasiado larga - omitida\n"
 
-#: dirmngr/dirmngr.c:1698 dirmngr/dirmngr.c:1782
+#: dirmngr/dirmngr.c:1737 dirmngr/dirmngr.c:1821
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: se detectó huella digital no válida\n"
 
-#: dirmngr/dirmngr.c:1734 dirmngr/dirmngr.c:1760 tools/gpgconf-comp.c:3539
+#: dirmngr/dirmngr.c:1773 dirmngr/dirmngr.c:1799 tools/gpgconf-comp.c:3549
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: error de lectura: %s\n"
 
-#: dirmngr/dirmngr.c:1789
+#: dirmngr/dirmngr.c:1828
 #, 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:1876
+#: dirmngr/dirmngr.c:1915
 #, 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:1917
+#: dirmngr/dirmngr.c:1956
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "SIGUSR2 recibido - ninguna acción definida\n"
 
-#: dirmngr/dirmngr.c:1922
+#: dirmngr/dirmngr.c:1961
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "SIGTERM recibido - apagando ...\n"
 
-#: dirmngr/dirmngr.c:1924
+#: dirmngr/dirmngr.c:1963
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "SIGTERM recibido - todavía %d conexiones activas\n"
 
-#: dirmngr/dirmngr.c:1929
+#: dirmngr/dirmngr.c:1968
 #, c-format
 msgid "shutdown forced\n"
 msgstr "apagado forzado\n"
 
-#: dirmngr/dirmngr.c:1937
+#: dirmngr/dirmngr.c:1976
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "SIGINT recibido - apagado inmediato\n"
 
-#: dirmngr/dirmngr.c:1944
+#: dirmngr/dirmngr.c:1983
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "señal %d recibida - ninguna acción definida\n"
 
-#: dirmngr/dirmngr_ldap.c:105
-msgid "return all values in a record oriented format"
-msgstr "devuelve todos los valores en un formato orientado a record"
-
-#: dirmngr/dirmngr_ldap.c:108
-msgid "|NAME|ignore host part and connect through NAME"
-msgstr "|NAME|ignorar la parte del host y conectar con el NAME"
-
-#: dirmngr/dirmngr_ldap.c:109
-msgid "force a TLS connection"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:110
-msgid "|NAME|connect to host NAME"
-msgstr "|NAME|conectar al host NAME"
-
-#: dirmngr/dirmngr_ldap.c:111
-msgid "|N|connect to port N"
-msgstr "|N|conectar al puerto N"
-
-#: dirmngr/dirmngr_ldap.c:112
-msgid "|NAME|use user NAME for authentication"
-msgstr "|NAME|usa NOMBRE como destinatario por defecto"
-
-#: dirmngr/dirmngr_ldap.c:113
-msgid "|PASS|use password PASS for authentication"
-msgstr "|PASS|usar la contraseña PASS para autentificación"
-
-#: dirmngr/dirmngr_ldap.c:115
-msgid "take password from $DIRMNGR_LDAP_PASS"
-msgstr "tomar el password de $DIRMNGR_LDAP_PASS"
-
-#: dirmngr/dirmngr_ldap.c:116
-msgid "|STRING|query DN STRING"
-msgstr "|STRING|preguntar DN STRING"
-
-#: dirmngr/dirmngr_ldap.c:117
-msgid "|STRING|use STRING as filter expression"
-msgstr "|STRING|usar FRASE como expresión de filtro"
-
-#: dirmngr/dirmngr_ldap.c:118
-msgid "|STRING|return the attribute STRING"
-msgstr "|STRING|devuelve el atributo STRING"
-
-#: dirmngr/dirmngr_ldap.c:179
-msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
-msgstr "Uso: dirmngr_ldap [opciones] [URL] (-h para ayuda)\n"
-
-#: dirmngr/dirmngr_ldap.c:182
-msgid ""
-"Syntax: dirmngr_ldap [options] [URL]\n"
-"Internal LDAP helper for Dirmngr\n"
-"Interface and options may change without notice\n"
-msgstr ""
-"Syntaxis: dirmngr_ldap [opciones] [URL]\n"
-"Ayudante interno de LDAP para Dirmngr\n"
-"La interfaz y las opciones pueden cambiar sin previo aviso\n"
-
-#: dirmngr/dirmngr_ldap.c:291
-#, c-format
-msgid "invalid port number %d\n"
-msgstr "número de puerto inválido %d\n"
-
-#: dirmngr/dirmngr_ldap.c:400
-#, c-format
-msgid "scanning result for attribute '%s'\n"
-msgstr "resultado del scanning para el atributo '%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:407 dirmngr/dirmngr_ldap.c:490
-#: dirmngr/dirmngr_ldap.c:514 dirmngr/dirmngr_ldap.c:526
-#: dirmngr/dirmngr_ldap.c:722
-#, c-format
-msgid "error writing to stdout: %s\n"
-msgstr "error al escribir a stdout: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:424
-#, c-format
-msgid "          available attribute '%s'\n"
-msgstr "          atributo disponible '%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:462
-#, c-format
-msgid "attribute '%s' not found\n"
-msgstr "atributo \"%s\" no encontrado\n"
-
-#: dirmngr/dirmngr_ldap.c:469
-#, c-format
-msgid "found attribute '%s'\n"
-msgstr "atributo \"%s\" encontrado\n"
-
-#: dirmngr/dirmngr_ldap.c:581
-#, c-format
-msgid "processing url '%s'\n"
-msgstr "procesando url '%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:588
-#, c-format
-msgid "          user '%s'\n"
-msgstr "       usuario '%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:590
-#, c-format
-msgid "          pass '%s'\n"
-msgstr "         pasar '%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:592
-#, c-format
-msgid "          host '%s'\n"
-msgstr "          host '%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:593
-#, c-format
-msgid "          port %d\n"
-msgstr "        puerto %d\n"
-
-#: dirmngr/dirmngr_ldap.c:595
-#, c-format
-msgid "            DN '%s'\n"
-msgstr "            DN '%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:597
-#, c-format
-msgid "        filter '%s'\n"
-msgstr "        filtro '%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:602 dirmngr/dirmngr_ldap.c:605
-#, c-format
-msgid "          attr '%s'\n"
-msgstr "           atr '%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:611
-#, c-format
-msgid "no host name in '%s'\n"
-msgstr "no hay hostname en '%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:616
-#, c-format
-msgid "no attribute given for query '%s'\n"
-msgstr "no se ha dado ningún atributo para la consulta '%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:622
-#, c-format
-msgid "WARNING: using first attribute only\n"
-msgstr "ATENCIÓN: ¡se está usando sólo el primer atributo!\n"
-
-#: dirmngr/dirmngr_ldap.c:637 dirmngr/dirmngr_ldap.c:678
-#, c-format
-msgid "LDAP init to '%s:%d' failed: %s\n"
-msgstr "Inicialización LDAP a '%s:%d' ha fallado: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:659
-#, fuzzy, c-format
-#| msgid "LDAP init to '%s:%d' failed: %s\n"
-msgid "LDAP init to '%s' failed: %s\n"
-msgstr "Inicialización LDAP a '%s:%d' ha fallado: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:665
-#, fuzzy, c-format
-#| msgid "LDAP init to '%s:%d' failed: %s\n"
-msgid "LDAP init to '%s' done\n"
-msgstr "Inicialización LDAP a '%s:%d' ha fallado: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:704
-#, c-format
-msgid "binding to '%s:%d' failed: %s\n"
-msgstr "ha fallado el binding con '%s:%d': %s\n"
-
-#: dirmngr/dirmngr_ldap.c:728
-#, c-format
-msgid "searching '%s' failed: %s\n"
-msgstr "ha fallado la búsqueda '%s': %s\n"
-
-#: dirmngr/dirmngr_ldap.c:759
-#, c-format
-msgid "'%s' is not an LDAP URL\n"
-msgstr "'%s' no es una URL LDAP\n"
-
-#: dirmngr/dirmngr_ldap.c:765
-#, c-format
-msgid "'%s' is an invalid LDAP URL\n"
-msgstr "'%s' no es una URL LDAP válida\n"
-
-#: dirmngr/http.c:1989 dirmngr/ocsp.c:255
+#: dirmngr/http.c:1998 dirmngr/ocsp.c:255
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "error mientras se accedía '%s': http status %u\n"
 
-#: dirmngr/http.c:3630 dirmngr/ocsp.c:229
+#: dirmngr/http.c:3652 dirmngr/ocsp.c:229
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr "URL '%s' redirigida a '%s' (%u)\n"
 
-#: dirmngr/http.c:3636 dirmngr/ocsp.c:246
+#: dirmngr/http.c:3658 dirmngr/ocsp.c:246
 #, c-format
 msgid "too many redirections\n"
 msgstr "demasiadas redirecciones\n"
 
-#: dirmngr/http.c:3748
+#: dirmngr/http.c:3768
 #, fuzzy, c-format
 #| msgid "writing to '%s'\n"
 msgid "redirection changed to '%s'\n"
@@ -10869,31 +10677,51 @@ msgstr "error al esperar el wrapper %d de ldap: %s\n"
 msgid "ldap wrapper %d stalled - killing\n"
 msgstr "el wrapper %d de ldap está parado - matándolo\n"
 
-#: dirmngr/ldap.c:91
+#: dirmngr/ldap.c:92
 #, c-format
 msgid "invalid char 0x%02x in host name - not added\n"
 msgstr "caracter incorrecto 0x%02x en el nombre de host - no añadido\n"
 
-#: dirmngr/ldap.c:95
+#: dirmngr/ldap.c:96
 #, c-format
 msgid "adding '%s:%d' to the ldap server list\n"
 msgstr "añadiendo '%s:%d' a la lista de servidores ldap\n"
 
-#: dirmngr/ldap.c:98 dirmngr/misc.c:512
+#: dirmngr/ldap.c:99 dirmngr/misc.c:512
 #, c-format
 msgid "malloc failed: %s\n"
 msgstr "ha fallado malloc: %s\n"
 
-#: dirmngr/ldap.c:634
+#: dirmngr/ldap.c:221
 #, c-format
-msgid "start_cert_fetch: invalid pattern '%s'\n"
-msgstr "start_cert_fetch: patrón '%s' incorrecto\n"
+msgid "'%s' is not an LDAP URL\n"
+msgstr "'%s' no es una URL LDAP\n"
 
-#: dirmngr/ldap.c:846
+#: dirmngr/ldap.c:227 dirmngr/ldap.c:233
+#, c-format
+msgid "'%s' is an invalid LDAP URL\n"
+msgstr "'%s' no es una URL LDAP válida\n"
+
+#: dirmngr/ldap.c:968
 #, c-format
 msgid "ldap_search hit the size limit of the server\n"
 msgstr "ldap_search ha llegado al límite de tamaño del servidor\n"
 
+#: dirmngr/ldapserver.c:119
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr "%s:%u: se dio contraseña sin usuario\n"
+
+#: dirmngr/ldapserver.c:181
+#, c-format
+msgid "%s:%u: ignoring unknown flag '%s'\n"
+msgstr ""
+
+#: dirmngr/ldapserver.c:203
+#, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr "%s:%u: omitir esta línea\n"
+
 #: dirmngr/misc.c:172
 #, c-format
 msgid "invalid canonical S-expression found\n"
@@ -10985,88 +10813,88 @@ msgstr "no firmada por un certificado predeterminado de firma OCSP"
 msgid "allocating list item failed: %s\n"
 msgstr "fallo al colocar item en la lista: %s\n"
 
-#: dirmngr/ocsp.c:537 dirmngr/ocsp.c:724
+#: dirmngr/ocsp.c:538 dirmngr/ocsp.c:725
 #, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "error intentando obtener identificador de responder: %s\n"
 
-#: dirmngr/ocsp.c:584
+#: dirmngr/ocsp.c:585
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr ""
 "no se ha encontrado un certificado adecuado para verificar la respuesta "
 "OCSP\n"
 
-#: dirmngr/ocsp.c:623 dirmngr/validate.c:648
+#: dirmngr/ocsp.c:624 dirmngr/validate.c:648
 #, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "no se encuentra el emisor de este certificado: %s\n"
 
-#: dirmngr/ocsp.c:633
+#: dirmngr/ocsp.c:634
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr "el caller no devolvió el certificado del target\n"
 
-#: dirmngr/ocsp.c:640
+#: dirmngr/ocsp.c:641
 #, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "el caller no devolvió el certificado emisor\n"
 
-#: dirmngr/ocsp.c:650
+#: dirmngr/ocsp.c:651
 #, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "fallo al asignar el contexto OCSP: %s\n"
 
-#: dirmngr/ocsp.c:689
+#: dirmngr/ocsp.c:690
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr "no hay un OCSP responder predeterminado\n"
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:696
 #, c-format
 msgid "no default OCSP signer defined\n"
 msgstr "no hay ningún firmante OCSP predeterminado definido\n"
 
-#: dirmngr/ocsp.c:702
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr "usar el contestador OCSP predeterminado '%s'\n"
 
-#: dirmngr/ocsp.c:707
+#: dirmngr/ocsp.c:708
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "usar OCSP responder '%s'\n"
 
-#: dirmngr/ocsp.c:764
+#: dirmngr/ocsp.c:765
 #, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "error al obtener status OCSP para certificado de destino: %s\n"
 
-#: dirmngr/ocsp.c:789
+#: dirmngr/ocsp.c:790
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr "el status del certificado es: %s (esta=%s próxima=%s)\n"
 
-#: dirmngr/ocsp.c:790
+#: dirmngr/ocsp.c:791
 msgid "good"
 msgstr "bien"
 
-#: dirmngr/ocsp.c:796
+#: dirmngr/ocsp.c:797
 #, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "el certificado ha sido revocado el: %s a causa de: %s\n"
 
-#: dirmngr/ocsp.c:831
+#: dirmngr/ocsp.c:832
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr "el OCSP respondor ha devuelto un estado en el futuro\n"
 
-#: dirmngr/ocsp.c:843
+#: dirmngr/ocsp.c:844
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr "el OCSP respondor ha devuelto un estado no actual\n"
 
-#: dirmngr/ocsp.c:858
+#: dirmngr/ocsp.c:859
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr "el OCSP respondor ha devuelto un estado demasiado antiguo\n"
@@ -11076,71 +10904,67 @@ msgstr "el OCSP respondor ha devuelto un estado demasiado antiguo\n"
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "ha fallado assuan_inquire(%s): %s\n"
 
-#: dirmngr/server.c:1158
-msgid "ldapserver missing"
-msgstr "falta el ldapserver"
-
-#: dirmngr/server.c:1224
+#: dirmngr/server.c:1277
 msgid "serialno missing in cert ID"
 msgstr "falta el número de serie en el ID del certificado"
 
-#: dirmngr/server.c:1387 dirmngr/server.c:1473 dirmngr/server.c:1909
-#: dirmngr/server.c:1980 dirmngr/server.c:2556 dirmngr/server.c:2571
+#: dirmngr/server.c:1440 dirmngr/server.c:1526 dirmngr/server.c:1963
+#: dirmngr/server.c:2034 dirmngr/server.c:2662 dirmngr/server.c:2677
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "ha fallado assuan_inquire: %s\n"
 
-#: dirmngr/server.c:1516
+#: dirmngr/server.c:1569
 #, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "ha fallado fetch_cert_by_url: %s\n"
 
-#: dirmngr/server.c:1528 dirmngr/server.c:1559 dirmngr/server.c:1718
+#: dirmngr/server.c:1581 dirmngr/server.c:1612 dirmngr/server.c:1772
 #, c-format
 msgid "error sending data: %s\n"
 msgstr "error al enviar datos: %s\n"
 
-#: dirmngr/server.c:1666
+#: dirmngr/server.c:1720
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "ha fallado start_cert_fetch: %s\n"
 
-#: dirmngr/server.c:1699
+#: dirmngr/server.c:1753
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "ha fallado fetch_next_cert: %s\n"
 
-#: dirmngr/server.c:1726
+#: dirmngr/server.c:1780
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr "se ha excedido el número de respuestas(max_replies) %d\n"
 
-#: dirmngr/server.c:2860
+#: dirmngr/server.c:2966
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "no puedo colocar la estructura de control: %s\n"
 
-#: dirmngr/server.c:2871
+#: dirmngr/server.c:2977
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "fallo al reservar el contexto assuan: %s\n"
 
-#: dirmngr/server.c:2892
+#: dirmngr/server.c:2998
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "ha fallado la inicialización del servidor: %s\n"
 
-#: dirmngr/server.c:2900
+#: dirmngr/server.c:3006
 #, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "fallo en las órdenes de registro con Assuan: %s\n"
 
-#: dirmngr/server.c:2933
+#: dirmngr/server.c:3039
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "problema de aceptación Assuan: %s\n"
 
-#: dirmngr/server.c:2952
+#: dirmngr/server.c:3058
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "ha fallado el procesado Assuan: %s\n"
@@ -11288,33 +11112,33 @@ msgstr "no hay agente dirmngr activo en esta sesión\n"
 msgid "error sending standard options: %s\n"
 msgstr "error enviando opciones estándar: %s\n"
 
-#: tools/gpgconf-comp.c:649
+#: tools/gpgconf-comp.c:655
 msgid "OpenPGP"
 msgstr "OpenPGP"
 
-#: tools/gpgconf-comp.c:653
+#: tools/gpgconf-comp.c:659
 msgid "S/MIME"
 msgstr "S/MIME"
 
-#: tools/gpgconf-comp.c:657
+#: tools/gpgconf-comp.c:663
 #, fuzzy
 #| msgid "public key is %s\n"
 msgid "Public Keys"
 msgstr "la clave pública es %s\n"
 
-#: tools/gpgconf-comp.c:661
+#: tools/gpgconf-comp.c:667
 msgid "Private Keys"
 msgstr "Claves privados"
 
-#: tools/gpgconf-comp.c:665
+#: tools/gpgconf-comp.c:671
 msgid "Smartcards"
 msgstr "Smartcards"
 
-#: tools/gpgconf-comp.c:669
+#: tools/gpgconf-comp.c:676
 msgid "TPM"
 msgstr ""
 
-#: tools/gpgconf-comp.c:673
+#: tools/gpgconf-comp.c:681
 msgid "Network"
 msgstr "Red"
 
@@ -11327,41 +11151,41 @@ msgstr "Red"
 # ¿Por qué los ingleses entonces sí que saben lo que es un "passphrase"?
 # ¿Es que son más listos? :-)
 #
-#: tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:685
 msgid "Passphrase Entry"
 msgstr "Frase contraseña"
 
-#: tools/gpgconf-comp.c:941
+#: tools/gpgconf-comp.c:951
 msgid "Component not suitable for launching"
 msgstr "Componente no adecuando para lanzamiento"
 
-#: tools/gpgconf-comp.c:947
+#: tools/gpgconf-comp.c:957
 #, fuzzy, c-format
 #| msgid "External verification of component %s failed"
 msgid "Configuration file of component %s is broken\n"
 msgstr "Verificación externa del componente %s fallida"
 
-#: tools/gpgconf-comp.c:950
+#: tools/gpgconf-comp.c:960
 #, fuzzy, c-format
 #| msgid "Note: Use the command \"%s\" to restart them.\n"
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr "Atención: Usa el comando \"%s\" para reiniciarlos.\n"
 
-#: tools/gpgconf-comp.c:2816
+#: tools/gpgconf-comp.c:2826
 #, c-format
 msgid "External verification of component %s failed"
 msgstr "Verificación externa del componente %s fallida"
 
-#: tools/gpgconf-comp.c:2946
+#: tools/gpgconf-comp.c:2956
 msgid "Note that group specifications are ignored\n"
 msgstr "Note que las especificación de grupo se ignoran\n"
 
-#: tools/gpgconf-comp.c:3543
+#: tools/gpgconf-comp.c:3553
 #, c-format
 msgid "error closing '%s'\n"
 msgstr "error al cerrar '%s'\n"
 
-#: tools/gpgconf-comp.c:3545
+#: tools/gpgconf-comp.c:3555
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr "error al leer '%s'\n"
@@ -11442,15 +11266,15 @@ msgstr ""
 "Sintaxis: @GPGCONF@ [opciones]\n"
 "Administra opciones de configuración de las herramientas GnuPG\n"
 
-#: tools/gpgconf.c:669 tools/gpgconf.c:704
+#: tools/gpgconf.c:703 tools/gpgconf.c:738
 msgid "Need one component argument"
 msgstr "Necesita un argumento de un componente"
 
-#: tools/gpgconf.c:678 tools/gpgconf.c:728 tools/gpgconf.c:778
+#: tools/gpgconf.c:712 tools/gpgconf.c:762 tools/gpgconf.c:812
 msgid "Component not found"
 msgstr "Componente no encontrado"
 
-#: tools/gpgconf.c:804
+#: tools/gpgconf.c:838
 msgid "No argument allowed"
 msgstr "No se permiten parámetros"
 
@@ -11468,90 +11292,217 @@ msgstr ""
 "Compara frase contraseña dada en entrada estándar con un fichero de "
 "patrones\n"
 
-#: tools/gpg-card.c:2390
+#: tools/gpg-card.c:2407
 #, fuzzy, c-format
 #| msgid "Note: keys are already stored on the card!\n"
 msgid "Note: key %s is already stored on the card!\n"
 msgstr "NOTA: ¡ya hay claves almacenadas en la tarjeta!\n"
 
-#: tools/gpg-card.c:2393
+#: tools/gpg-card.c:2410
 #, fuzzy, c-format
 #| msgid "Note: keys are already stored on the card!\n"
 msgid "Note: Keys are already stored on the card!\n"
 msgstr "NOTA: ¡ya hay claves almacenadas en la tarjeta!\n"
 
-#: tools/gpg-card.c:2396
+#: tools/gpg-card.c:2413
 #, fuzzy, c-format
 #| msgid "Replace existing keys? (y/N) "
 msgid "Replace existing key %s ? (y/N) "
 msgstr "¿Reemplazar las claves existentes? (s/N) "
 
-#: tools/gpg-card.c:2549 tools/gpg-card.c:2712 tools/gpg-card.c:2935
-#: tools/gpg-card.c:3044
+#: tools/gpg-card.c:2566 tools/gpg-card.c:2729 tools/gpg-card.c:2952
+#: tools/gpg-card.c:3061
 #, fuzzy, c-format
 #| msgid "OpenPGP card no. %s detected\n"
 msgid "%s card no. %s detected\n"
 msgstr "tarjeta OpenPGP num. %s detectada\n"
 
-#: tools/gpg-card.c:3396
+#: tools/gpg-card.c:3413
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3406 tools/gpg-card.c:3420
+#: tools/gpg-card.c:3423 tools/gpg-card.c:3437
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
 "         can only be reverted using a factory reset!\n"
 msgstr ""
 
-#: tools/gpg-card.c:3423
+#: tools/gpg-card.c:3440
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3669
+#: tools/gpg-card.c:3686
 #, fuzzy
 #| msgid "add a certificate to the cache"
 msgid "authenticate to the card"
 msgstr "añadir un certificado a la cache"
 
-#: tools/gpg-card.c:3671
+#: tools/gpg-card.c:3688
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3673
+#: tools/gpg-card.c:3690
 msgid "setup KDF for PIN authentication"
 msgstr "configurar KDF para autentificación de PIN"
 
-#: tools/gpg-card.c:3675
+#: tools/gpg-card.c:3692
 msgid "change a private data object"
 msgstr ""
 
-#: tools/gpg-card.c:3676
+#: tools/gpg-card.c:3693
 #, fuzzy
 #| msgid "add a certificate to the cache"
 msgid "read a certificate from a data object"
 msgstr "añadir un certificado a la cache"
 
-#: tools/gpg-card.c:3677
+#: tools/gpg-card.c:3694
 #, fuzzy
 #| msgid "add a certificate to the cache"
 msgid "store a certificate to a data object"
 msgstr "añadir un certificado a la cache"
 
-#: tools/gpg-card.c:3678
+#: tools/gpg-card.c:3695
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3679
+#: tools/gpg-card.c:3696
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3681
+#: tools/gpg-card.c:3698
 msgid "manage the command history"
 msgstr ""
 
+#~ msgid "requesting key %s from %s server %s\n"
+#~ msgstr "solicitando clave %s de %s servidor %s\n"
+
+#~ msgid "%s:%u: no hostname given\n"
+#~ msgstr "%s:%u: falta el nombre del host\n"
+
+#~ msgid "could not parse keyserver\n"
+#~ msgstr "no se puede interpretar el servidor de claves\n"
+
+#~ msgid "return all values in a record oriented format"
+#~ msgstr "devuelve todos los valores en un formato orientado a record"
+
+#~ msgid "|NAME|ignore host part and connect through NAME"
+#~ msgstr "|NAME|ignorar la parte del host y conectar con el NAME"
+
+#~ msgid "|NAME|connect to host NAME"
+#~ msgstr "|NAME|conectar al host NAME"
+
+#~ msgid "|N|connect to port N"
+#~ msgstr "|N|conectar al puerto N"
+
+#~ msgid "|NAME|use user NAME for authentication"
+#~ msgstr "|NAME|usa NOMBRE como destinatario por defecto"
+
+#~ msgid "|PASS|use password PASS for authentication"
+#~ msgstr "|PASS|usar la contraseña PASS para autentificación"
+
+#~ msgid "take password from $DIRMNGR_LDAP_PASS"
+#~ msgstr "tomar el password de $DIRMNGR_LDAP_PASS"
+
+#~ msgid "|STRING|query DN STRING"
+#~ msgstr "|STRING|preguntar DN STRING"
+
+#~ msgid "|STRING|use STRING as filter expression"
+#~ msgstr "|STRING|usar FRASE como expresión de filtro"
+
+#~ msgid "|STRING|return the attribute STRING"
+#~ msgstr "|STRING|devuelve el atributo STRING"
+
+#~ msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
+#~ msgstr "Uso: dirmngr_ldap [opciones] [URL] (-h para ayuda)\n"
+
+#~ msgid ""
+#~ "Syntax: dirmngr_ldap [options] [URL]\n"
+#~ "Internal LDAP helper for Dirmngr\n"
+#~ "Interface and options may change without notice\n"
+#~ msgstr ""
+#~ "Syntaxis: dirmngr_ldap [opciones] [URL]\n"
+#~ "Ayudante interno de LDAP para Dirmngr\n"
+#~ "La interfaz y las opciones pueden cambiar sin previo aviso\n"
+
+#~ msgid "invalid port number %d\n"
+#~ msgstr "número de puerto inválido %d\n"
+
+#~ msgid "scanning result for attribute '%s'\n"
+#~ msgstr "resultado del scanning para el atributo '%s'\n"
+
+#~ msgid "error writing to stdout: %s\n"
+#~ msgstr "error al escribir a stdout: %s\n"
+
+#~ msgid "          available attribute '%s'\n"
+#~ msgstr "          atributo disponible '%s'\n"
+
+#~ msgid "attribute '%s' not found\n"
+#~ msgstr "atributo \"%s\" no encontrado\n"
+
+#~ msgid "found attribute '%s'\n"
+#~ msgstr "atributo \"%s\" encontrado\n"
+
+#~ msgid "processing url '%s'\n"
+#~ msgstr "procesando url '%s'\n"
+
+#~ msgid "          user '%s'\n"
+#~ msgstr "       usuario '%s'\n"
+
+#~ msgid "          pass '%s'\n"
+#~ msgstr "         pasar '%s'\n"
+
+#~ msgid "          host '%s'\n"
+#~ msgstr "          host '%s'\n"
+
+#~ msgid "          port %d\n"
+#~ msgstr "        puerto %d\n"
+
+#~ msgid "            DN '%s'\n"
+#~ msgstr "            DN '%s'\n"
+
+#~ msgid "        filter '%s'\n"
+#~ msgstr "        filtro '%s'\n"
+
+#~ msgid "          attr '%s'\n"
+#~ msgstr "           atr '%s'\n"
+
+#~ msgid "no host name in '%s'\n"
+#~ msgstr "no hay hostname en '%s'\n"
+
+#~ msgid "no attribute given for query '%s'\n"
+#~ msgstr "no se ha dado ningún atributo para la consulta '%s'\n"
+
+#~ msgid "WARNING: using first attribute only\n"
+#~ msgstr "ATENCIÓN: ¡se está usando sólo el primer atributo!\n"
+
+#~ msgid "LDAP init to '%s:%d' failed: %s\n"
+#~ msgstr "Inicialización LDAP a '%s:%d' ha fallado: %s\n"
+
+#, fuzzy
+#~| msgid "LDAP init to '%s:%d' failed: %s\n"
+#~ msgid "LDAP init to '%s' failed: %s\n"
+#~ msgstr "Inicialización LDAP a '%s:%d' ha fallado: %s\n"
+
+#, fuzzy
+#~| msgid "LDAP init to '%s:%d' failed: %s\n"
+#~ msgid "LDAP init to '%s' done\n"
+#~ msgstr "Inicialización LDAP a '%s:%d' ha fallado: %s\n"
+
+#~ msgid "binding to '%s:%d' failed: %s\n"
+#~ msgstr "ha fallado el binding con '%s:%d': %s\n"
+
+#~ msgid "searching '%s' failed: %s\n"
+#~ msgstr "ha fallado la búsqueda '%s': %s\n"
+
+#~ msgid "start_cert_fetch: invalid pattern '%s'\n"
+#~ msgstr "start_cert_fetch: patrón '%s' incorrecto\n"
+
+#~ msgid "ldapserver missing"
+#~ msgstr "falta el ldapserver"
+
 #, fuzzy
 #~| msgid "change a passphrase"
 #~ msgid "Suggest a random passphrase."
diff --git a/po/et.po b/po/et.po
index 2a41f6d..74c64c6 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: 2021-04-20 12:38+0200\n"
+"POT-Creation-Date: 2021-08-24 18:50+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:328
+#: agent/call-pinentry.c:338
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
@@ -26,48 +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:546
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_OK"
 msgstr ""
 
-#: agent/call-pinentry.c:547
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
-#: agent/call-pinentry.c:548
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|_Yes"
 msgstr ""
 
-#: agent/call-pinentry.c:549
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_No"
 msgstr ""
 
-#: agent/call-pinentry.c:550
+#: agent/call-pinentry.c:560
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:551
+#: agent/call-pinentry.c:561
 msgid "|pinentry-label|_Save in password manager"
 msgstr ""
 
-#: agent/call-pinentry.c:552
+#: agent/call-pinentry.c:562
 #, 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:554
+#: agent/call-pinentry.c:564
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:555
+#: agent/call-pinentry.c:565
 #, fuzzy
 #| msgid "invalid passphrase"
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "vigane parool"
 
+#: agent/call-pinentry.c:566
+msgid "Caps Lock is on"
+msgstr ""
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:944
+#: agent/call-pinentry.c:1022
 msgid "Suggest"
 msgstr ""
 
@@ -78,13 +82,25 @@ 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:966
+#: agent/call-pinentry.c:1044
 msgid "pinentry.genpin.tooltip"
 msgstr ""
 
+#: agent/call-pinentry.c:1072
+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
+#, 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:998
+#: agent/call-pinentry.c:1198
 msgid "Quality:"
 msgstr ""
 
@@ -94,107 +110,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:1019
+#: agent/call-pinentry.c:1219
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:1263
+#: agent/call-pinentry.c:1477
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:1266
+#: agent/call-pinentry.c:1480
 #, 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:1303 agent/call-pinentry.c:1506
+#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1303 agent/call-pinentry.c:1506
-#: agent/protect-tool.c:728
+#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/protect-tool.c:729
 #, fuzzy
 msgid "Passphrase:"
 msgstr "halb parool"
 
-#: agent/call-pinentry.c:1330 agent/call-pinentry.c:1580 agent/command.c:1799
-#: agent/command.c:1852 agent/command-ssh.c:3046 agent/genkey.c:398
+#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
+#: agent/command.c:1988 agent/command-ssh.c:3046 agent/genkey.c:442
 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:1351 agent/call-pinentry.c:1603
+#: agent/call-pinentry.c:1566 agent/call-pinentry.c:1830
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:1362 agent/call-pinentry.c:1614
+#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
 msgid "Repeat:"
 msgstr ""
 
-#: agent/call-pinentry.c:1372 agent/call-pinentry.c:1384
-#: agent/call-pinentry.c:1624 agent/call-pinentry.c:1636
+#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
+#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
 #, fuzzy
 msgid "PIN too long"
 msgstr "rida on liiga pikk\n"
 
-#: agent/call-pinentry.c:1373 agent/call-pinentry.c:1625
+#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "liiga pikk parool\n"
 
-#: agent/call-pinentry.c:1381 agent/call-pinentry.c:1633
+#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Lubamatu sümbol nimes\n"
 
-#: agent/call-pinentry.c:1386 agent/call-pinentry.c:1638
+#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:1405 agent/call-pinentry.c:1656
+#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
 #, fuzzy
 msgid "Bad PIN"
 msgstr "halb MPI"
 
-#: agent/call-pinentry.c:1405 agent/call-pinentry.c:1656
+#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "halb parool"
 
-#: agent/command.c:697
+#: agent/command.c:823
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:698
+#: agent/command.c:824
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1106 g10/card-util.c:708 g10/card-util.c:729
+#: agent/command.c:1235 g10/card-util.c:713 g10/card-util.c:734
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: agent/command.c:1634 agent/command.c:1791 agent/command-ssh.c:2974
-#: agent/genkey.c:333
+#: agent/command.c:1756 agent/command.c:1921 agent/command-ssh.c:2974
+#: agent/genkey.c:377
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "muuda parooli"
 
-#: agent/command.c:2567
+#: agent/command.c:2703
 #, 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:2697
+#: agent/command.c:2833
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -205,26 +221,26 @@ msgstr ""
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "kaitse algoritm %d%s ei ole toetatud\n"
 
-#: agent/command-ssh.c:872 common/dotlock.c:852 g10/card-util.c:953
-#: g10/export.c:1329 g10/gpg.c:1431 g10/keygen.c:5347 g10/keyring.c:1319
-#: g10/keyring.c:1632 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
+#: agent/command-ssh.c:872 common/dotlock.c:852 g10/card-util.c:963
+#: g10/export.c:1329 g10/gpg.c:1431 g10/keygen.c:5377 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
 #: g10/sign.c:1106 g10/sign.c:1443 g10/tdbio.c:753 tools/gpg-card.c:479
 #, fuzzy, c-format
 #| msgid "can't create `%s': %s\n"
 msgid "can't create '%s': %s\n"
 msgstr "`%s' ei õnnestu luua: %s\n"
 
-#: agent/command-ssh.c:884 common/helpfile.c:57 g10/card-util.c:910
+#: agent/command-ssh.c:884 common/helpfile.c:57 g10/card-util.c:920
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
 #: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:721 g10/gpg.c:1432
-#: g10/import.c:371 g10/import.c:558 g10/import.c:793 g10/keygen.c:4322
-#: g10/keyring.c:1658 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
+#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4326
+#: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
 #: g10/plaintext.c:610 g10/sign.c:1086 g10/sign.c:1311 g10/sign.c:1424
 #: g10/sign.c:1596 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2380
-#: sm/gpgsm.c:2410 sm/gpgsm.c:2448 sm/keylist.c:1737 sm/qualified.c:65
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2236
+#: sm/gpgsm.c:2266 sm/gpgsm.c:2304 sm/keylist.c:1775 sm/qualified.c:65
 #: dirmngr/certcache.c:396 dirmngr/certcache.c:476 dirmngr/certcache.c:478
-#: dirmngr/crlcache.c:2588 dirmngr/dirmngr.c:1720 tools/gpg-card.c:408
+#: dirmngr/crlcache.c:2591 dirmngr/dirmngr.c:1759 tools/gpg-card.c:408
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
@@ -333,39 +349,39 @@ msgstr "parooli ei korratud õieti; proovige uuesti"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:109 sm/certreqgen-ui.c:433
+#: 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:116
+#: agent/genkey.c:150
 #, fuzzy, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "kirjutan faili `%s'\n"
 
-#: agent/genkey.c:154
+#: agent/genkey.c:191
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Sisestage parool\n"
 
-#: agent/genkey.c:184
+#: agent/genkey.c:227
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:186
+#: agent/genkey.c:229
 #, 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:198
+#: agent/genkey.c:241
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:215
+#: agent/genkey.c:258
 #, fuzzy, c-format
 #| msgid "Name must be at least 5 characters long\n"
 msgid "A passphrase should be at least %u character long."
@@ -373,7 +389,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:234
+#: agent/genkey.c:277
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -381,387 +397,386 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:260
+#: agent/genkey.c:304
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:275
+#: agent/genkey.c:319
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
-#: agent/genkey.c:296
+#: agent/genkey.c:340
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "Kasutan seda võtit ikka? "
 
-#: agent/genkey.c:464
+#: agent/genkey.c:508
 #, 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:590
+#: agent/genkey.c:637
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "muuda parooli"
 
-#: agent/gpg-agent.c:162 scd/scdaemon.c:115 dirmngr/dirmngr.c:182
+#: agent/gpg-agent.c:164 scd/scdaemon.c:115 dirmngr/dirmngr.c:183
 msgid "Options used for startup"
 msgstr ""
 
-#: agent/gpg-agent.c:164 scd/scdaemon.c:120 dirmngr/dirmngr.c:171
+#: agent/gpg-agent.c:166 scd/scdaemon.c:120 dirmngr/dirmngr.c:172
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:117 dirmngr/dirmngr.c:170
+#: agent/gpg-agent.c:167 scd/scdaemon.c:117 dirmngr/dirmngr.c:171
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:167 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:169 dirmngr/dirmngr.c:174
 #, fuzzy
 #| msgid "Key is superseded"
 msgid "run in supervised mode"
 msgstr "Võti on asendatud"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:121 dirmngr/dirmngr.c:184
+#: agent/gpg-agent.c:171 scd/scdaemon.c:121 dirmngr/dirmngr.c:185
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:170 scd/scdaemon.c:122 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:172 scd/scdaemon.c:122 dirmngr/dirmngr.c:186
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:171 scd/scdaemon.c:123 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:173 scd/scdaemon.c:123 dirmngr/dirmngr.c:187
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:179 g10/gpg.c:589 scd/scdaemon.c:125 sm/gpgsm.c:422
-#: dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:181 g10/gpg.c:589 scd/scdaemon.c:125 sm/gpgsm.c:423
+#: dirmngr/dirmngr.c:189
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:574 scd/scdaemon.c:129 sm/gpgsm.c:265
-#: dirmngr/dirmngr.c:192
+#: agent/gpg-agent.c:185 g10/gpg.c:574 scd/scdaemon.c:129 sm/gpgsm.c:265
+#: dirmngr/dirmngr.c:193
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: agent/gpg-agent.c:185 g10/gpg.c:576 g10/gpgv.c:78 kbx/kbxutil.c:89
+#: agent/gpg-agent.c:187 g10/gpg.c:576 g10/gpgv.c:78 kbx/kbxutil.c:89
 #: scd/scdaemon.c:131 sm/gpgsm.c:267 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:194 dirmngr/dirmngr_ldap.c:102
-#: tools/gpg-connect-agent.c:85 tools/gpgconf.c:111
+#: dirmngr/dirmngr.c:195 tools/gpg-connect-agent.c:85 tools/gpgconf.c:111
 msgid "verbose"
 msgstr "ole jutukas"
 
-#: agent/gpg-agent.c:186 g10/gpg.c:578 g10/gpgv.c:79 kbx/kbxutil.c:90
+#: agent/gpg-agent.c:188 g10/gpg.c:578 g10/gpgv.c:79 kbx/kbxutil.c:90
 #: scd/scdaemon.c:132 sm/gpgsm.c:269 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:195 dirmngr/dirmngr_ldap.c:103
+#: dirmngr/dirmngr.c:196
 msgid "be somewhat more quiet"
 msgstr "ole mõnevõrra vaiksem"
 
-#: agent/gpg-agent.c:194 g10/gpg.c:593 sm/gpgsm.c:283 dirmngr/dirmngr.c:205
+#: agent/gpg-agent.c:196 g10/gpg.c:593 sm/gpgsm.c:283 dirmngr/dirmngr.c:206
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 scd/scdaemon.c:146 sm/gpgsm.c:290
-#: dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:599 scd/scdaemon.c:146 sm/gpgsm.c:290
+#: dirmngr/dirmngr.c:210
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: agent/gpg-agent.c:201
+#: agent/gpg-agent.c:203
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "uuenda usalduse andmebaasi"
 
-#: agent/gpg-agent.c:203
+#: agent/gpg-agent.c:205
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 #, 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:213
+#: agent/gpg-agent.c:215
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:215
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:216
+#: agent/gpg-agent.c:218
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
 msgstr "ei ole toetatud"
 
-#: agent/gpg-agent.c:218
+#: agent/gpg-agent.c:220
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:221
+#: agent/gpg-agent.c:223
 #, fuzzy
 #| msgid "not supported"
 msgid "enable putty support"
 msgstr "ei ole toetatud"
 
-#: agent/gpg-agent.c:233 g10/gpg.c:844 scd/scdaemon.c:176 sm/gpgsm.c:382
+#: agent/gpg-agent.c:235 g10/gpg.c:844 scd/scdaemon.c:176 sm/gpgsm.c:383
 msgid "Options controlling the security"
 msgstr ""
 
-#: agent/gpg-agent.c:236
+#: agent/gpg-agent.c:238
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:238
+#: agent/gpg-agent.c:240
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:242
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:244
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:246
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:248
 #, fuzzy
 msgid "disallow the use of an external password cache"
 msgstr "viga parooli loomisel: %s\n"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:250
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:253
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "viga parooli loomisel: %s\n"
 
-#: agent/gpg-agent.c:256
+#: agent/gpg-agent.c:258
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:261
 msgid "do not allow bypassing the passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:261
+#: agent/gpg-agent.c:263
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:265
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:266
+#: agent/gpg-agent.c:268
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:268
+#: agent/gpg-agent.c:272
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|kasuta parooli moodi N"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:274
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "viga parooli loomisel: %s\n"
 
-#: agent/gpg-agent.c:273
+#: agent/gpg-agent.c:277
 msgid "Options controlling the PIN-Entry"
 msgstr ""
 
-#: agent/gpg-agent.c:275
+#: agent/gpg-agent.c:279
 #, fuzzy
 #| msgid "use the gpg-agent"
 msgid "never use the PIN-entry"
 msgstr "kasuta gpg-agenti"
 
-#: agent/gpg-agent.c:277
+#: agent/gpg-agent.c:281
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:283
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:282
+#: agent/gpg-agent.c:286
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:286
+#: agent/gpg-agent.c:290
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:294
 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:551 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: agent/gpg-agent.c:557 agent/preset-passphrase.c:99 agent/protect-tool.c:154
 #: g10/gpg.c:1132 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:612 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:438
-#: dirmngr/dirmngr_ldap.c:175 tools/gpg-connect-agent.c:220 tools/gpgconf.c:151
+#: sm/gpgsm.c:613 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:446
+#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:151
 #: 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:560
+#: agent/gpg-agent.c:566
 #, fuzzy
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
 
-#: agent/gpg-agent.c:562
+#: agent/gpg-agent.c:568
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:607 g10/gpg.c:1337 scd/scdaemon.c:384 sm/gpgsm.c:760
-#: dirmngr/dirmngr.c:522
+#: agent/gpg-agent.c:613 g10/gpg.c:1337 scd/scdaemon.c:384 sm/gpgsm.c:761
+#: dirmngr/dirmngr.c:530
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:972 g10/gpg.c:3910 g10/gpg.c:3934 sm/gpgsm.c:1769
-#: sm/gpgsm.c:1775
+#: agent/gpg-agent.c:986 g10/gpg.c:3907 g10/gpg.c:3931 sm/gpgsm.c:1622
+#: sm/gpgsm.c:1628
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "valitud lühendi algoritm ei ole lubatud\n"
 
-#: agent/gpg-agent.c:1196 agent/gpg-agent.c:2019 common/comopt.c:93
-#: g10/gpg.c:2591 scd/scdaemon.c:549 sm/gpgsm.c:1155 dirmngr/dirmngr.c:989
-#: dirmngr/dirmngr.c:1840
+#: agent/gpg-agent.c:1210 agent/gpg-agent.c:2035 common/comopt.c:93
+#: g10/gpg.c:2594 scd/scdaemon.c:549 sm/gpgsm.c:1028 dirmngr/dirmngr.c:1029
+#: dirmngr/dirmngr.c:1879
 #, 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:1335 g10/gpg.c:3861 scd/scdaemon.c:687 sm/gpgsm.c:1709
-#: dirmngr/dirmngr.c:1108 tools/gpg-connect-agent.c:1270 tools/gpgconf.c:634
+#: agent/gpg-agent.c:1349 g10/gpg.c:3858 scd/scdaemon.c:687 sm/gpgsm.c:1562
+#: dirmngr/dirmngr.c:1145 tools/gpg-connect-agent.c:1270 tools/gpgconf.c:668
 #, 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:2172 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1267
+#: agent/gpg-agent.c:2188 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1306
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s ei õnnestu luua: %s\n"
 
-#: agent/gpg-agent.c:2189 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1280
+#: agent/gpg-agent.c:2205 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1319
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2228
+#: agent/gpg-agent.c:2244
 #, 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:2239 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1312
+#: agent/gpg-agent.c:2255 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1351
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: agent/gpg-agent.c:2244 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1315
+#: agent/gpg-agent.c:2260 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1354
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "viga teate saatmisel serverile `%s': %s\n"
 
-#: agent/gpg-agent.c:2255 agent/gpg-agent.c:2295 agent/gpg-agent.c:2304
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1324
+#: agent/gpg-agent.c:2271 agent/gpg-agent.c:2311 agent/gpg-agent.c:2320
+#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1363
 #, fuzzy, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n"
 
-#: agent/gpg-agent.c:2269 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1336
+#: agent/gpg-agent.c:2285 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1375
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "kirjutan salajase võtme faili `%s'\n"
 
-#: agent/gpg-agent.c:2289 agent/gpg-agent.c:2342 common/homedir.c:517
+#: agent/gpg-agent.c:2305 agent/gpg-agent.c:2358 common/homedir.c:537
 #: 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:2292 agent/gpg-agent.c:2347 common/homedir.c:520
+#: agent/gpg-agent.c:2308 agent/gpg-agent.c:2363 common/homedir.c:540
 #: g10/openfile.c:402
 #, fuzzy, c-format
 msgid "directory '%s' created\n"
 msgstr "%s: kataloog on loodud\n"
 
-#: agent/gpg-agent.c:2353
+#: agent/gpg-agent.c:2369
 #, fuzzy, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "trustdb: lugemine ebaõnnestus (n=%d): %s\n"
 
-#: agent/gpg-agent.c:2357
+#: agent/gpg-agent.c:2373
 #, fuzzy, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "%s: kataloogi ei õnnestu luua: %s\n"
 
-#: agent/gpg-agent.c:2512 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2069
+#: agent/gpg-agent.c:2528 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2108
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: agent/gpg-agent.c:2719
+#: agent/gpg-agent.c:2735
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2724
+#: agent/gpg-agent.c:2740
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2799
+#: agent/gpg-agent.c:2815
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2804
+#: agent/gpg-agent.c:2820
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3026 scd/scdaemon.c:1374 dirmngr/dirmngr.c:2283
+#: agent/gpg-agent.c:3042 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2322
 #, fuzzy, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "salajase võtme uuendamine ebaõnnestus: %s\n"
 
-#: agent/gpg-agent.c:3114 scd/scdaemon.c:1439
+#: agent/gpg-agent.c:3130 scd/scdaemon.c:1441
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: jätsin vahele: %s\n"
 
-#: agent/gpg-agent.c:3252 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3271 common/simple-pwquery.c:247 g10/call-agent.c:260
 #: sm/call-agent.c:131 tools/gpg-connect-agent.c:2319 tools/card-call-scd.c:311
 #, fuzzy, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
 
-#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:70
+#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:66
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -783,7 +798,7 @@ msgid ""
 msgstr ""
 
 #: agent/protect-tool.c:107 g10/gpg.c:448 kbx/kbxutil.c:72 sm/gpgsm.c:215
-#: dirmngr/dirmngr.c:168 tools/gpgconf.c:81
+#: dirmngr/dirmngr.c:169 tools/gpgconf.c:81
 msgid ""
 "@Commands:\n"
 " "
@@ -813,40 +828,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:707
+#: agent/protect-tool.c:708 sm/import.c:775
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: agent/protect-tool.c:712
+#: agent/protect-tool.c:713 sm/export.c:727
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: agent/protect-tool.c:718
+#: agent/protect-tool.c:719
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:723
+#: agent/protect-tool.c:724
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: agent/protect-tool.c:734
+#: agent/protect-tool.c:735
 #, fuzzy, c-format
 msgid "cancelled\n"
 msgstr "Katkesta"
 
-#: agent/protect-tool.c:736
+#: agent/protect-tool.c:737
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: agent/trustlist.c:153 agent/trustlist.c:363 tools/gpgconf.c:424
+#: agent/trustlist.c:153 agent/trustlist.c:363 tools/gpgconf.c:458
 #, fuzzy, c-format
 msgid "error opening '%s': %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
@@ -1001,7 +1016,7 @@ msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
 msgid "secret key parts are not available\n"
 msgstr "salajase võtme komponendid ei ole kättesaadavad\n"
 
-#: agent/cvt-openpgp.c:343 g10/card-util.c:1562
+#: agent/cvt-openpgp.c:343 g10/card-util.c:1575
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -1033,7 +1048,7 @@ msgid "error creating a stream for a pipe: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
 #: common/exechelp-posix.c:505 common/exechelp-posix.c:580
-#: common/exechelp-posix.c:866 dirmngr/dirmngr.c:1354
+#: common/exechelp-posix.c:866 dirmngr/dirmngr.c:1393
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
@@ -1106,7 +1121,7 @@ msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "pakendamine ebaõnnestus: %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3082
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3099
 msgid "yes"
 msgstr "jah"
 
@@ -1161,7 +1176,7 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:115 g10/card-util.c:917 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:927 tools/no-libgcrypt.c:30
 #: tools/gpg-card.c:416
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
@@ -1233,7 +1248,7 @@ msgstr "viga võtmehoidla `%s' loomisel: %s\n"
 msgid "server '%s' is older than us (%s < %s)"
 msgstr ""
 
-#: common/asshelp.c:737 g10/call-dirmngr.c:408
+#: common/asshelp.c:737 g10/call-dirmngr.c:407
 #, fuzzy, c-format
 #| msgid "WARNING: %s overrides %s\n"
 msgid "WARNING: %s\n"
@@ -1328,7 +1343,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:4212
+#: scd/app-openpgp.c:4214
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
@@ -1412,12 +1427,12 @@ msgstr "See võti on aegunud!"
 msgid "Root certificate trustworthy"
 msgstr "halb sertifikaat"
 
-#: common/audit.c:1112 sm/certchain.c:1242
+#: common/audit.c:1112 sm/certchain.c:1243
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "halb sertifikaat"
 
-#: common/audit.c:1115 sm/certchain.c:1252
+#: common/audit.c:1115 sm/certchain.c:1253
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Võtme leiate: "
@@ -1469,22 +1484,22 @@ msgstr "tundmatu"
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "vigane radix64 sümbol %02x vahele jäetud\n"
 
-#: common/ttyio.c:433
+#: common/ttyio.c:447
 #, c-format
 msgid "Sorry, we are in batchmode - can't get input\n"
 msgstr ""
 
-#: common/ttyio.c:439
+#: common/ttyio.c:453
 #, c-format
 msgid "Sorry, no terminal at all requested - can't get input\n"
 msgstr ""
 
-#: common/ttyio.c:474 common/ttyio.c:484
+#: common/ttyio.c:488 common/ttyio.c:498
 #, c-format
 msgid "too many errors; giving up\n"
 msgstr ""
 
-#: common/ttyio.c:536
+#: common/ttyio.c:550
 #, c-format
 msgid "Control-D detected\n"
 msgstr ""
@@ -1538,8 +1553,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:1036 dirmngr/dirmngr.c:895
-#: dirmngr/dirmngr.c:904
+#: common/init.c:191 sm/gpgsm.c:909 dirmngr/dirmngr.c:935 dirmngr/dirmngr.c:944
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
@@ -1696,7 +1710,7 @@ msgid "Enter passphrase: "
 msgstr "Sisestage parool: "
 
 #: g10/call-agent.c:318 g10/encrypt.c:282 g10/encrypt.c:818 g10/sign.c:473
-#: sm/call-agent.c:180 sm/encrypt.c:701 sm/sign.c:436
+#: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
 #, fuzzy, c-format
 #| msgid "%s does not yet work with %s\n"
 msgid "%s is not compliant with %s mode\n"
@@ -1707,225 +1721,225 @@ msgstr "%s ei tööta veel koos %s-ga\n"
 msgid "error from TPM: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: g10/call-agent.c:2123 g10/passphrase.c:225 g10/passphrase.c:258
-#: tools/card-call-scd.c:1751
+#: g10/call-agent.c:2135 g10/passphrase.c:233 g10/passphrase.c:266
+#: tools/card-call-scd.c:1755
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "probleem agendiga: agent tagastas 0x%lx\n"
 
-#: g10/call-dirmngr.c:179 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2316
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2316
 #, fuzzy, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
 
-#: g10/call-dirmngr.c:213
+#: g10/call-dirmngr.c:212
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "keyserver option \"honor-keyserver-url\" may not be used in Tor mode\n"
 msgstr "%s ei ole moodis %s lubatud.\n"
 
-#: g10/call-dirmngr.c:386
+#: g10/call-dirmngr.c:385
 msgid "WKD uses a cached result"
 msgstr ""
 
-#: g10/call-dirmngr.c:389
+#: g10/call-dirmngr.c:388
 msgid "Tor is not running"
 msgstr ""
 
-#: g10/call-dirmngr.c:391
+#: g10/call-dirmngr.c:390
 #, fuzzy
 msgid "Tor is not properly configured"
 msgstr "viga: vigane sõrmejälg\n"
 
-#: g10/call-dirmngr.c:393
+#: g10/call-dirmngr.c:392
 #, fuzzy
 msgid "DNS is not properly configured"
 msgstr "viga: vigane sõrmejälg\n"
 
-#: g10/call-dirmngr.c:395
+#: g10/call-dirmngr.c:394
 msgid "unacceptable HTTP redirect from server"
 msgstr ""
 
-#: g10/call-dirmngr.c:397
+#: g10/call-dirmngr.c:396
 msgid "unacceptable HTTP redirect from server was cleaned up"
 msgstr ""
 
-#: g10/call-dirmngr.c:399
+#: g10/call-dirmngr.c:398
 #, fuzzy
 #| msgid "generate a revocation certificate"
 msgid "server uses an invalid certificate"
 msgstr "genereeri tühistamise sertifikaat"
 
-#: g10/call-dirmngr.c:406 g10/gpg.c:4599
+#: g10/call-dirmngr.c:405 g10/gpg.c:4596
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "pakend: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:369 g10/card-util.c:1924
-#: tools/gpg-card.c:3039
+#: g10/card-util.c:86 g10/card-util.c:374 g10/card-util.c:1937
+#: tools/gpg-card.c:3056
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "salajane võti ei ole kättesaadav"
 
-#: g10/card-util.c:91 g10/card-util.c:1930
+#: g10/card-util.c:91 g10/card-util.c:1943
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:97 g10/card-util.c:2309 g10/delkey.c:164 g10/keyedit.c:1428
-#: g10/keygen.c:4791 g10/revoke.c:214 g10/revoke.c:638
+#: g10/card-util.c:97 g10/card-util.c:2322 g10/delkey.c:164 g10/keyedit.c:1428
+#: g10/keygen.c:4795 g10/revoke.c:214 g10/revoke.c:639
 #, fuzzy, c-format
 msgid "can't do this in batch mode\n"
 msgstr "seda ei saa teha pakettmoodis\n"
 
-#: g10/card-util.c:105 tools/gpg-card.c:2943
+#: g10/card-util.c:105 tools/gpg-card.c:2960
 #, fuzzy, c-format
 msgid "This command is only available for version 2 cards\n"
 msgstr "See käsklus ei ole %s moodis lubatud.\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3398 tools/gpg-card.c:2948
+#: g10/card-util.c:107 scd/app-openpgp.c:3399 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"
 
-#: g10/card-util.c:140 g10/card-util.c:1448 g10/card-util.c:1710
-#: g10/card-util.c:1802 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1991 g10/keygen.c:2165 g10/keygen.c:2385 g10/keygen.c:2685
+#: g10/card-util.c:140 g10/card-util.c:1458 g10/card-util.c:1723
+#: g10/card-util.c:1815 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/keygen.c:1992 g10/keygen.c:2166 g10/keygen.c:2386 g10/keygen.c:2686
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
 #: tools/gpg-card.c:510
 msgid "Your selection? "
 msgstr "Teie valik? "
 
-#: g10/card-util.c:262 g10/card-util.c:313 tools/gpg-card.c:596
+#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:596
 #: tools/gpg-card.c:636
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:558 tools/gpg-card.c:903
+#: g10/card-util.c:563 tools/gpg-card.c:905
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:559 tools/gpg-card.c:904
+#: g10/card-util.c:564 tools/gpg-card.c:906
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:586 tools/gpg-card.c:931
+#: g10/card-util.c:591 tools/gpg-card.c:933
 #, fuzzy
 msgid "not forced"
 msgstr "ei töödeldud"
 
-#: g10/card-util.c:586 tools/gpg-card.c:931
+#: g10/card-util.c:591 tools/gpg-card.c:933
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:768 tools/gpg-card.c:1468
+#: g10/card-util.c:773 tools/gpg-card.c:1484
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:770 tools/gpg-card.c:1470
+#: g10/card-util.c:775 tools/gpg-card.c:1486
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:772 tools/gpg-card.c:1472
+#: g10/card-util.c:777 tools/gpg-card.c:1488
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:789 tools/gpg-card.c:1505
+#: g10/card-util.c:795 tools/gpg-card.c:1521
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:791 tools/gpg-card.c:1506
+#: g10/card-util.c:797 tools/gpg-card.c:1522
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:809 tools/gpg-card.c:1523
+#: g10/card-util.c:816 tools/gpg-card.c:1539
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:830 tools/gpg-card.c:1561
+#: g10/card-util.c:840 tools/gpg-card.c:1577
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "vastavat avalikku võtit pole: %s\n"
 
-#: g10/card-util.c:926 g10/decrypt-data.c:495 g10/import.c:406 g10/import.c:756
-#: g10/import.c:815 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1666
-#: tools/gpgconf.c:437 tools/gpgconf.c:483 tools/gpg-card.c:426
+#: g10/card-util.c:936 g10/decrypt-data.c:495 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:1705
+#: tools/gpgconf.c:471 tools/gpgconf.c:517 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:959 g10/decrypt-data.c:498 g10/export.c:2496
+#: g10/card-util.c:969 g10/decrypt-data.c:498 g10/export.c:2496
 #: dirmngr/crlcache.c:925 tools/gpg-card.c:486 tools/gpg-card.c:493
 #, fuzzy, c-format
 msgid "error writing '%s': %s\n"
 msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/card-util.c:986 tools/gpg-card.c:1650
+#: g10/card-util.c:996 tools/gpg-card.c:1666
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:1024 tools/gpg-card.c:1945
+#: g10/card-util.c:1034 tools/gpg-card.c:1962
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:1109 tools/gpg-card.c:1699
+#: g10/card-util.c:1119 tools/gpg-card.c:1715
 #, fuzzy
 msgid "Language preferences: "
 msgstr "uuendatud eelistused"
 
-#: g10/card-util.c:1117 tools/gpg-card.c:1710
+#: g10/card-util.c:1127 tools/gpg-card.c:1726
 #, fuzzy, c-format
 msgid "Error: invalid length of preference string.\n"
 msgstr "lubamatu sümbol eelistuste sõnes\n"
 
-#: g10/card-util.c:1126 tools/gpg-card.c:1719
+#: g10/card-util.c:1136 tools/gpg-card.c:1735
 #, fuzzy, c-format
 msgid "Error: invalid characters in preference string.\n"
 msgstr "lubamatu sümbol eelistuste sõnes\n"
 
-#: g10/card-util.c:1148 tools/gpg-card.c:1753
+#: g10/card-util.c:1158 tools/gpg-card.c:1769
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1162 tools/gpg-card.c:1770
+#: g10/card-util.c:1172 tools/gpg-card.c:1786
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "viga: vigane sõrmejälg\n"
 
-#: g10/card-util.c:1185 tools/gpg-card.c:1835
+#: g10/card-util.c:1195 tools/gpg-card.c:1852
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "näita sõrmejälge"
 
-#: g10/card-util.c:1209 tools/gpg-card.c:1861
+#: g10/card-util.c:1219 tools/gpg-card.c:1878
 #, fuzzy, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "viga: vigane sõrmejälg\n"
 
-#: g10/card-util.c:1259
+#: g10/card-util.c:1269
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Võtme genereerimine ebaõnnestus: %s\n"
 
-#: g10/card-util.c:1260
+#: g10/card-util.c:1270
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "ei leia OpenPGP andmeid.\n"
 
-#: g10/card-util.c:1273 g10/keygen.c:4811 g10/keygen.c:5972
+#: g10/card-util.c:1283 g10/keygen.c:4815 g10/keygen.c:6003
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "viga salajase võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/card-util.c:1358
+#: g10/card-util.c:1368
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1375 tools/gpg-card.c:3328
+#: g10/card-util.c:1385 tools/gpg-card.c:3345
 msgid ""
 "Note: There is no guarantee that the card supports the requested\n"
 "      key type or size.  If the key generation does not succeed,\n"
@@ -1933,102 +1947,102 @@ msgid ""
 "      key types and sizes are supported.\n"
 msgstr ""
 
-#: g10/card-util.c:1396 g10/keygen.c:2570 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1406 g10/keygen.c:2571 sm/certreqgen-ui.c:180
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Millist võtmepikkust te soovite? (1024) "
 
-#: g10/card-util.c:1406 g10/keygen.c:2493 g10/keygen.c:2525
+#: g10/card-util.c:1416 g10/keygen.c:2494 g10/keygen.c:2526
 #: sm/certreqgen-ui.c:195
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "ümardatud üles %u bitini\n"
 
-#: g10/card-util.c:1414 g10/keygen.c:2578 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1424 g10/keygen.c:2579 sm/certreqgen-ui.c:185
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/card-util.c:1433
+#: g10/card-util.c:1443
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1435
+#: g10/card-util.c:1445
 #, fuzzy
 msgid "Signature key\n"
 msgstr "Allkiri aegus %s\n"
 
-#: g10/card-util.c:1437
+#: g10/card-util.c:1447
 #, fuzzy
 msgid "Encryption key\n"
 msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
 
-#: g10/card-util.c:1439
+#: g10/card-util.c:1449
 msgid "Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1441 g10/keygen.c:2112 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1451 g10/keygen.c:2113 sm/certreqgen-ui.c:158
 msgid "Please select what kind of key you want:\n"
 msgstr "Palun valige, millist võtmetüüpi te soovite:\n"
 
-#: g10/card-util.c:1442 sm/certreqgen-ui.c:159
+#: g10/card-util.c:1452 sm/certreqgen-ui.c:159
 #, fuzzy, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA (ainult allkirjastamiseks)\n"
 
-#: g10/card-util.c:1443
+#: g10/card-util.c:1453
 #, fuzzy, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) DSA ja ElGamal (vaikimisi)\n"
 
-#: g10/card-util.c:1455 g10/card-util.c:1722 g10/card-util.c:1822
-#: g10/keyedit.c:900 g10/keygen.c:2017 g10/keygen.c:2045 g10/keygen.c:2172
-#: g10/keygen.c:2425 g10/keygen.c:2713 g10/revoke.c:836
+#: g10/card-util.c:1468 g10/card-util.c:1735 g10/card-util.c:1835
+#: g10/keyedit.c:900 g10/keygen.c:2018 g10/keygen.c:2046 g10/keygen.c:2173
+#: g10/keygen.c:2426 g10/keygen.c:2714 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Vigane valik.\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1541
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 
-#: g10/card-util.c:1533
+#: g10/card-util.c:1546
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1582
 #, fuzzy, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "viga teate saatmisel serverile `%s': %s\n"
 
-#: g10/card-util.c:1585 g10/card-util.c:2106 g10/card-util.c:2162
+#: g10/card-util.c:1598 g10/card-util.c:2119 g10/card-util.c:2175
 #, fuzzy, c-format
 msgid "error getting card info: %s\n"
 msgstr "viga salajase võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/card-util.c:1591 g10/card-util.c:1936 g10/card-util.c:2112
-#: g10/card-util.c:2171 tools/gpg-card.c:3057 tools/gpg-card.c:3296
-#: tools/gpg-card.c:3354
+#: g10/card-util.c:1604 g10/card-util.c:1949 g10/card-util.c:2125
+#: g10/card-util.c:2184 tools/gpg-card.c:3074 tools/gpg-card.c:3313
+#: tools/gpg-card.c:3371
 #, fuzzy, c-format
 #| msgid "This command is not allowed while in %s mode.\n"
 msgid "This command is not supported by this card\n"
 msgstr "See käsklus ei ole %s moodis lubatud.\n"
 
-#: g10/card-util.c:1637 tools/gpg-card.c:2426
+#: g10/card-util.c:1650 tools/gpg-card.c:2443
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1651
+#: g10/card-util.c:1664
 #, fuzzy, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "jätsin vahele: avalik võti on juba olemas\n"
 
-#: g10/card-util.c:1654 tools/gpg-card.c:2398
+#: g10/card-util.c:1667 tools/gpg-card.c:2415
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1666 tools/gpg-card.c:2457
+#: g10/card-util.c:1679 tools/gpg-card.c:2474
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2036,172 +2050,172 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1701
+#: g10/card-util.c:1714
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Palun valige, millist võtmetüüpi te soovite:\n"
 
-#: g10/card-util.c:1703 g10/card-util.c:1793
+#: g10/card-util.c:1716 g10/card-util.c:1806
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Allkiri aegus %s\n"
 
-#: g10/card-util.c:1704 g10/card-util.c:1795
+#: g10/card-util.c:1717 g10/card-util.c:1808
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
 
-#: g10/card-util.c:1705 g10/card-util.c:1797
+#: g10/card-util.c:1718 g10/card-util.c:1810
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1790
+#: g10/card-util.c:1803
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Palun valige tühistamise põhjus:\n"
 
-#: g10/card-util.c:1836
+#: g10/card-util.c:1849
 #, fuzzy, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "uuendamine ebaõnnestus: %s\n"
 
-#: g10/card-util.c:1941 tools/gpg-card.c:3065
+#: g10/card-util.c:1954 tools/gpg-card.c:3082
 #, fuzzy, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr "jätsin vahele: avalik võti on juba olemas\n"
 
-#: g10/card-util.c:1944 tools/gpg-card.c:3068 tools/gpg-card.c:3409
+#: g10/card-util.c:1957 tools/gpg-card.c:3085 tools/gpg-card.c:3426
 #, fuzzy
 msgid "Continue? (y/N) "
 msgstr "Allkirjastan tõesti? "
 
-#: g10/card-util.c:1949 tools/gpg-card.c:3079
+#: g10/card-util.c:1962 tools/gpg-card.c:3096
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2142
+#: g10/card-util.c:2155
 #, fuzzy, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: g10/card-util.c:2188
+#: g10/card-util.c:2201
 #, fuzzy, c-format
 msgid "error for setup UIF: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: g10/card-util.c:2212 g10/keyedit.c:1263 tools/gpg-card.c:3649
+#: g10/card-util.c:2225 g10/keyedit.c:1263 tools/gpg-card.c:3666
 msgid "quit this menu"
 msgstr "välju sellest menüüst"
 
-#: g10/card-util.c:2214
+#: g10/card-util.c:2227
 #, fuzzy
 msgid "show admin commands"
 msgstr "vastuolulised käsud\n"
 
-#: g10/card-util.c:2215 g10/keyedit.c:1266 tools/gpg-card.c:3652
+#: g10/card-util.c:2228 g10/keyedit.c:1266 tools/gpg-card.c:3669
 msgid "show this help"
 msgstr "näita seda abiinfot"
 
-#: g10/card-util.c:2217 tools/gpg-card.c:3654
+#: g10/card-util.c:2230 tools/gpg-card.c:3671
 #, fuzzy
 msgid "list all available data"
 msgstr "Võtme leiate: "
 
-#: g10/card-util.c:2220 tools/gpg-card.c:3656
+#: g10/card-util.c:2233 tools/gpg-card.c:3673
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:2221 tools/gpg-card.c:3657
+#: g10/card-util.c:2234 tools/gpg-card.c:3674
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:2222 tools/gpg-card.c:3658
+#: g10/card-util.c:2235 tools/gpg-card.c:3675
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:2223 tools/gpg-card.c:3659
+#: g10/card-util.c:2236 tools/gpg-card.c:3676
 #, fuzzy
 msgid "change the login name"
 msgstr "muuda aegumise kuupäeva"
 
-#: g10/card-util.c:2224 tools/gpg-card.c:3660
+#: g10/card-util.c:2237 tools/gpg-card.c:3677
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muuda omaniku usaldust"
 
-#: g10/card-util.c:2225 tools/gpg-card.c:3661
+#: g10/card-util.c:2238 tools/gpg-card.c:3678
 msgid "change card holder's salutation"
 msgstr ""
 
-#: g10/card-util.c:2227 tools/gpg-card.c:3663
+#: g10/card-util.c:2240 tools/gpg-card.c:3680
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "näita sõrmejälge"
 
-#: g10/card-util.c:2228 tools/gpg-card.c:3664
+#: g10/card-util.c:2241 tools/gpg-card.c:3681
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:2229 tools/gpg-card.c:3665
+#: g10/card-util.c:2242 tools/gpg-card.c:3682
 #, fuzzy
 msgid "generate new keys"
 msgstr "genereeri uus võtmepaar"
 
-#: g10/card-util.c:2230 tools/gpg-card.c:3666
+#: g10/card-util.c:2243 tools/gpg-card.c:3683
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:2231 tools/gpg-card.c:3667
+#: g10/card-util.c:2244 tools/gpg-card.c:3684
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:2232 tools/gpg-card.c:3668
+#: g10/card-util.c:2245 tools/gpg-card.c:3685
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:2233 tools/gpg-card.c:3672
+#: g10/card-util.c:2246 tools/gpg-card.c:3689
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2235
+#: g10/card-util.c:2248
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr "|NIMI|kasuta NIME vaikimisi saajana"
 
-#: g10/card-util.c:2236
+#: g10/card-util.c:2249
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "muuda omaniku usaldust"
 
-#: g10/card-util.c:2237 tools/gpg-card.c:3674
+#: g10/card-util.c:2250 tools/gpg-card.c:3691
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the User Interaction Flag"
 msgstr "muuda omaniku usaldust"
 
-#: g10/card-util.c:2361 tools/gpg-card.c:3924
+#: g10/card-util.c:2374 tools/gpg-card.c:3941
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2402
+#: g10/card-util.c:2415
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "vastuolulised käsud\n"
 
-#: g10/card-util.c:2433
+#: g10/card-util.c:2446
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "vastuolulised käsud\n"
 
-#: g10/card-util.c:2435
+#: g10/card-util.c:2448
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "kirjutan salajase võtme faili `%s'\n"
 
-#: g10/card-util.c:2546 g10/keyedit.c:2275 tools/gpg-card.c:3814
-#: tools/gpg-card.c:4072
+#: g10/card-util.c:2559 g10/keyedit.c:2275 tools/gpg-card.c:3831
+#: tools/gpg-card.c:4089
 #, c-format
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Vigane käsklus (proovige \"help\")\n"
@@ -2211,23 +2225,23 @@ msgstr "Vigane käsklus (proovige \"help\")\n"
 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:5293 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5292 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:1934 g10/export.c:2342 g10/export.c:2463
-#: g10/getkey.c:1907 g10/gpg.c:5238 g10/keyedit.c:1450 g10/keyedit.c:2382
-#: g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:703 g10/keyserver.c:1240
-#: g10/revoke.c:230 g10/tofu.c:2168
+#: g10/getkey.c:2032 g10/gpg.c:5237 g10/keyedit.c:1450 g10/keyedit.c:2382
+#: g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:703 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:2002 g10/getkey.c:1915 g10/getkey.c:4330
-#: g10/gpg.c:5247 g10/keyedit.c:2354 g10/keyserver.c:1258 g10/revoke.c:236
-#: g10/revoke.c:665 g10/tofu.c:2176
+#: g10/delkey.c:90 g10/export.c:2002 g10/getkey.c:2040 g10/getkey.c:4455
+#: g10/gpg.c:5246 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"
 msgstr "viga võtmebloki lugemisel: %s\n"
@@ -2353,14 +2367,14 @@ msgstr "Å¡ifri algoritm \"%s\" ei ole moodis %s lubatud\n"
 msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:555 g10/encrypt.c:808 g10/decrypt-data.c:261 g10/gpg.c:4083
-#: g10/gpg.c:4130 sm/decrypt.c:742 sm/encrypt.c:691 sm/gpgsm.c:1793
+#: g10/encrypt.c:555 g10/encrypt.c:808 g10/decrypt-data.c:261 g10/gpg.c:4080
+#: g10/gpg.c:4127 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1646
 #, 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:564 g10/gpg.c:4095 g10/gpg.c:4142 g10/sig-check.c:155
-#: g10/sign.c:452 sm/gpgsm.c:1803 sm/gpgsm.c:1813 sm/sign.c:596 sm/verify.c:510
+#: g10/encrypt.c:564 g10/gpg.c:4092 g10/gpg.c:4139 g10/sig-check.c:155
+#: g10/sign.c:452 sm/gpgsm.c:1656 sm/gpgsm.c:1666 sm/sign.c:596 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"
@@ -2378,7 +2392,7 @@ msgid ""
 msgstr ""
 "sümmetrilise šifri %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/encrypt.c:838 sm/encrypt.c:766
+#: g10/encrypt.c:838 sm/encrypt.c:767
 #, fuzzy, c-format
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "HOIATUS: võtit \"%s\" ei soovitata kasutada.\n"
@@ -2409,7 +2423,7 @@ msgstr "%s/%s krüptitud kasutajale: \"%s\"\n"
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "%s ei ole moodis %s lubatud.\n"
 
-#: g10/decrypt-data.c:239 g10/mainproc.c:380 sm/decrypt.c:494
+#: g10/decrypt-data.c:239 g10/mainproc.c:380 sm/decrypt.c:892
 #, fuzzy, c-format
 #| msgid "%s encrypted data\n"
 msgid "%s.%s encrypted data\n"
@@ -2420,7 +2434,7 @@ msgstr "%s krüpteeritud andmed\n"
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "krüpteeritud tundmatu algoritmiga %d\n"
 
-#: g10/decrypt-data.c:361 g10/decrypt-data.c:414 sm/decrypt.c:508
+#: g10/decrypt-data.c:361 g10/decrypt-data.c:414 sm/decrypt.c:906
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2468,7 +2482,7 @@ msgstr ""
 msgid " - skipped"
 msgstr "%s: jätsin vahele: %s\n"
 
-#: g10/export.c:1333 g10/import.c:2124 g10/openfile.c:202 g10/openfile.c:296
+#: g10/export.c:1333 g10/import.c:2132 g10/openfile.c:202 g10/openfile.c:296
 #: g10/sign.c:1110 g10/sign.c:1447
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
@@ -2507,66 +2521,66 @@ msgstr "viga `%s' loomisel: %s\n"
 msgid "[User ID not found]"
 msgstr "[Kasutaja id puudub]"
 
-#: g10/getkey.c:1199
+#: g10/getkey.c:1324
 #, fuzzy, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "viga `%s' loomisel: %s\n"
 
-#: g10/getkey.c:1205
+#: g10/getkey.c:1330
 #, fuzzy, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "viga `%s' loomisel: %s\n"
 
-#: g10/getkey.c:1207
+#: g10/getkey.c:1332
 #, fuzzy
 msgid "No fingerprint"
 msgstr "näita sõrmejälge"
 
-#: g10/getkey.c:1449
+#: g10/getkey.c:1574
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1884 g10/revoke.c:657 g10/revoke.c:718
+#: g10/getkey.c:2009 g10/revoke.c:658 g10/revoke.c:719
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "salajast võtit `%s' ei leitud: %s\n"
 
-#: g10/getkey.c:1887 g10/pkclist.c:1012
+#: g10/getkey.c:2012 g10/pkclist.c:1012
 #, fuzzy, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "vigased impordi võtmed\n"
 
-#: g10/getkey.c:1965
+#: g10/getkey.c:2090
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "|NIMI|kasuta NIME vaikimisi salajase võtmena"
 
-#: g10/getkey.c:1973
+#: g10/getkey.c:2098
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "|NIMI|kasuta NIME vaikimisi salajase võtmena"
 
-#: g10/getkey.c:1980
+#: g10/getkey.c:2105
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr ""
 
-#: g10/getkey.c:2837
+#: g10/getkey.c:2962
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Vigane võti %08lX muudeti kehtivaks võtme --allow-non-selfsigned-uid "
 "kasutamisega\n"
 
-#: g10/getkey.c:3703
+#: g10/getkey.c:3828
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "kasutan sekundaarset võtit %08lX primaarse võtme %08lX asemel\n"
 
-#: g10/getkey.c:4259 g10/gpg.c:2167
+#: g10/getkey.c:4384 g10/gpg.c:2168
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "vigased impordi võtmed\n"
@@ -2771,7 +2785,7 @@ msgstr ""
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:651 kbx/kbxutil.c:91 sm/gpgsm.c:424 tools/gpgconf.c:113
+#: g10/gpg.c:651 kbx/kbxutil.c:91 sm/gpgsm.c:425 tools/gpgconf.c:113
 msgid "do not make any changes"
 msgstr "ära tee mingeid muutusi"
 
@@ -2805,7 +2819,7 @@ msgstr "kasuta kanoonilist tekstimoodi"
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|määra pakkimise tase N (0 blokeerib)"
 
-#: g10/gpg.c:762 sm/gpgsm.c:357
+#: g10/gpg.c:762 sm/gpgsm.c:358
 msgid "Options controlling key import and export"
 msgstr ""
 
@@ -2824,11 +2838,11 @@ msgstr "impordi võtmed võtmeserverist"
 msgid "include the public key in signatures"
 msgstr "kontrolli võtmete allkirju"
 
-#: g10/gpg.c:776 sm/gpgsm.c:360
+#: g10/gpg.c:776 sm/gpgsm.c:361
 msgid "disable all access to the dirmngr"
 msgstr ""
 
-#: g10/gpg.c:788 sm/gpgsm.c:367
+#: g10/gpg.c:788 sm/gpgsm.c:368
 msgid "Options controlling key listings"
 msgstr ""
 
@@ -2848,15 +2862,15 @@ msgstr "|NIMI|krüpti NIMEle"
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "kasuta seda kasutaja IDd"
 
-#: g10/gpg.c:876 sm/gpgsm.c:408
+#: g10/gpg.c:876 sm/gpgsm.c:409
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:895 sm/gpgsm.c:420 dirmngr/dirmngr.c:286
+#: g10/gpg.c:895 sm/gpgsm.c:421 dirmngr/dirmngr.c:289
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:966 sm/gpgsm.c:453
+#: g10/gpg.c:966 sm/gpgsm.c:454
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2915,7 +2929,7 @@ msgstr ""
 "allkirjasta, kontrolli, krüpti ja dekrüpti\n"
 "vaikimisi operatsioon sõltub sisendandmetest\n"
 
-#: g10/gpg.c:1168 sm/gpgsm.c:636
+#: g10/gpg.c:1168 sm/gpgsm.c:637
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2939,12 +2953,12 @@ msgstr "Räsi: "
 msgid "Compression: "
 msgstr "Pakkimine: "
 
-#: g10/gpg.c:1274 sm/gpgsm.c:710
+#: g10/gpg.c:1274 sm/gpgsm.c:711
 #, fuzzy, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "kasuta: gpg [võtmed] "
 
-#: g10/gpg.c:1467 sm/gpgsm.c:803
+#: g10/gpg.c:1467 sm/gpgsm.c:804
 #, c-format
 msgid "conflicting commands\n"
 msgstr "vastuolulised käsud\n"
@@ -2954,535 +2968,535 @@ msgstr "vastuolulised käsud\n"
 msgid "no = sign found in group definition '%s'\n"
 msgstr "grupi definitsioonis \"%s\" puudub sümbol =\n"
 
-#: g10/gpg.c:1683
+#: g10/gpg.c:1684
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1686
+#: g10/gpg.c:1687
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1689
+#: g10/gpg.c:1690
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1695
+#: g10/gpg.c:1696
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n"
 
-#: g10/gpg.c:1698
+#: g10/gpg.c:1699
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n"
 
-#: g10/gpg.c:1701
+#: g10/gpg.c:1702
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1708
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1711
 #, 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:1713
+#: g10/gpg.c:1714
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1720
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr "Hoiatus: ebaturvalised kataloogi õigused %s \"%s\"\n"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1723
 #, 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:1725
+#: g10/gpg.c:1726
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr "Hoiatus: ebaturvalised kataloogi õigused %s \"%s\"\n"
 
-#: g10/gpg.c:1941
+#: g10/gpg.c:1942
 #, fuzzy, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "tundmatu seade \"%s\"\n"
 
-#: g10/gpg.c:2037
+#: g10/gpg.c:2038
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:2039
+#: g10/gpg.c:2040
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "Vastavat allkirja salajaste võtmete hoidlas pole\n"
 
-#: g10/gpg.c:2041
+#: g10/gpg.c:2042
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2043
+#: g10/gpg.c:2044
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Vastavat allkirja salajaste võtmete hoidlas pole\n"
 
-#: g10/gpg.c:2045
+#: g10/gpg.c:2046
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2049
+#: g10/gpg.c:2050
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2051
+#: g10/gpg.c:2052
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:2053
+#: g10/gpg.c:2054
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:2055
+#: g10/gpg.c:2056
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:2057
+#: g10/gpg.c:2058
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:2059
+#: g10/gpg.c:2060
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "näita millisesse võtmehoidlasse näidatud võti kuulub"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2062
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Vastavat allkirja salajaste võtmete hoidlas pole\n"
 
-#: g10/gpg.c:2178
+#: g10/gpg.c:2179
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "tundmatu vaikimisi saaja `%s'\n"
 
-#: g10/gpg.c:2180
+#: g10/gpg.c:2181
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2975 g10/gpg.c:3828 g10/gpg.c:3840
+#: g10/gpg.c:2978 g10/gpg.c:3825 g10/gpg.c:3837
 #, 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:3151 g10/gpg.c:3163
+#: g10/gpg.c:3154 g10/gpg.c:3166
 #, fuzzy, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:3185
+#: g10/gpg.c:3188
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "Selline e-posti aadress ei ole lubatud\n"
 
-#: g10/gpg.c:3217 sm/gpgsm.c:1270
+#: g10/gpg.c:3220 sm/gpgsm.c:1143
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "vigane räsialgoritm `%s'\n"
 
-#: g10/gpg.c:3223 sm/gpgsm.c:1276
+#: g10/gpg.c:3226 sm/gpgsm.c:1149
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "vigased impordi võtmed\n"
 
-#: g10/gpg.c:3280
+#: g10/gpg.c:3283
 #, fuzzy, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:3302 g10/gpg.c:3511 g10/keyedit.c:5319
+#: g10/gpg.c:3305 g10/gpg.c:3514 g10/keyedit.c:5322
 #, fuzzy, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "ei saa parsida võtmeserveri URI\n"
 
-#: g10/gpg.c:3320
+#: g10/gpg.c:3323
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: vigased ekspordi võtmed\n"
 
-#: g10/gpg.c:3323
+#: g10/gpg.c:3326
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "vigased ekspordi võtmed\n"
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3333
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: vigased impordi võtmed\n"
 
-#: g10/gpg.c:3333
+#: g10/gpg.c:3336
 #, c-format
 msgid "invalid import options\n"
 msgstr "vigased impordi võtmed\n"
 
-#: g10/gpg.c:3339 g10/gpg.c:3354
+#: g10/gpg.c:3342 g10/gpg.c:3357
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "vigased impordi võtmed\n"
 
-#: g10/gpg.c:3345
+#: g10/gpg.c:3348
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: vigased ekspordi võtmed\n"
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3351
 #, c-format
 msgid "invalid export options\n"
 msgstr "vigased ekspordi võtmed\n"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3363
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: vigased impordi võtmed\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3366
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "vigased impordi võtmed\n"
 
-#: g10/gpg.c:3371
+#: g10/gpg.c:3374
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3373
+#: g10/gpg.c:3376
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3378
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:3377
+#: g10/gpg.c:3380
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3384
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3386
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:3385
+#: g10/gpg.c:3388
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:3387
+#: g10/gpg.c:3390
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3389
+#: g10/gpg.c:3392
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:3396
+#: g10/gpg.c:3399
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: vigased ekspordi võtmed\n"
 
-#: g10/gpg.c:3399
+#: g10/gpg.c:3402
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "vigased ekspordi võtmed\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3409
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path väärtuseks ei õnnestu seada %s\n"
 
-#: g10/gpg.c:3613
+#: g10/gpg.c:3616
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: vigased ekspordi võtmed\n"
 
-#: g10/gpg.c:3616
+#: g10/gpg.c:3619
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3625
+#: g10/gpg.c:3628
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "vigased impordi võtmed\n"
 
-#: g10/gpg.c:3807 sm/gpgsm.c:1675
+#: g10/gpg.c:3804 sm/gpgsm.c:1528
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "HOIATUS: programm võib salvestada oma mälupildi!\n"
 
-#: g10/gpg.c:3821
+#: g10/gpg.c:3818
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "HOIATUS: %s määrab üle %s\n"
 
-#: g10/gpg.c:3830
+#: g10/gpg.c:3827
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s ei ole koos lubatud!\n"
 
-#: g10/gpg.c:3833
+#: g10/gpg.c:3830
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s ei oma koos mõtet!\n"
 
-#: g10/gpg.c:3848 sm/gpgsm.c:1696 dirmngr/dirmngr.c:1123
+#: g10/gpg.c:3845 sm/gpgsm.c:1549 dirmngr/dirmngr.c:1160
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3869
+#: g10/gpg.c:3866
 #, 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:3897 g10/gpg.c:3928 sm/gpgsm.c:1763
+#: g10/gpg.c:3894 g10/gpg.c:3925 sm/gpgsm.c:1616
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valitud Å¡ifri algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3901
 #, 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:3916
+#: g10/gpg.c:3913
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "valitud Å¡ifri algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3922
+#: g10/gpg.c:3919
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valitud sertifikaadi lühendi algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3937
+#: g10/gpg.c:3934
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed peab olema suurem, kui 0\n"
 
-#: g10/gpg.c:3939
+#: g10/gpg.c:3936
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed peab olema suurem, kui 1\n"
 
-#: g10/gpg.c:3941
+#: g10/gpg.c:3938
 #, 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:3943
+#: g10/gpg.c:3940
 #, 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:3945
+#: g10/gpg.c:3942
 #, 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:3949
+#: g10/gpg.c:3946
 #, 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:3953
+#: g10/gpg.c:3950
 #, 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:3960
+#: g10/gpg.c:3957
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "vigased vaikimisi eelistused\n"
 
-#: g10/gpg.c:3964
+#: g10/gpg.c:3961
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "vigased isikliku Å¡ifri eelistused\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3964
 #, fuzzy, c-format
 #| msgid "invalid personal cipher preferences\n"
 msgid "invalid personal AEAD preferences\n"
 msgstr "vigased isikliku Å¡ifri eelistused\n"
 
-#: g10/gpg.c:3971
+#: g10/gpg.c:3968
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "vigased isikliku lühendi eelistused\n"
 
-#: g10/gpg.c:3975
+#: g10/gpg.c:3972
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "vigased isikliku pakkimise eelistused\n"
 
-#: g10/gpg.c:3984 g10/gpg.c:3989
+#: g10/gpg.c:3981 g10/gpg.c:3986
 #, 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:4026
+#: g10/gpg.c:4023
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ei tööta veel koos %s-ga\n"
 
-#: g10/gpg.c:4089
+#: g10/gpg.c:4086
 #, 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:4101
+#: g10/gpg.c:4098
 #, 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:4256
+#: g10/gpg.c:4253
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
 
-#: g10/gpg.c:4268
+#: g10/gpg.c:4265
 #, 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:4340
+#: g10/gpg.c:4337
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "lahtikrüpteerimine ebaõnnestus: %s\n"
 
-#: g10/gpg.c:4369
+#: g10/gpg.c:4366
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4372
+#: g10/gpg.c:4369
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "%s ei ole moodis %s lubatud.\n"
 
-#: g10/gpg.c:4430
+#: g10/gpg.c:4427
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4433
+#: g10/gpg.c:4430
 #, 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:4821 g10/keyserver.c:1870
+#: g10/gpg.c:4818 g10/keyserver.c:1629
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "võtmeserverile saatmine ebaõnnestus: %s\n"
 
-#: g10/gpg.c:4826
+#: g10/gpg.c:4823
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "võtmeserverilt lugemine ebaõnnestus: %s\n"
 
-#: g10/gpg.c:4832
+#: g10/gpg.c:4829
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "võtme eksport ebaõnnestus: %s\n"
 
-#: g10/gpg.c:4845
+#: g10/gpg.c:4842
 #, 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:4857
+#: g10/gpg.c:4854
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "võtmeserveri otsing ebaõnnestus: %s\n"
 
-#: g10/gpg.c:4870
+#: g10/gpg.c:4867
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "võtmeserveri uuendamine ebaõnnestus: %s\n"
 
-#: g10/gpg.c:4937
+#: g10/gpg.c:4936
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "lahtipakendamine ebaõnnestus: %s\n"
 
-#: g10/gpg.c:4948
+#: g10/gpg.c:4947
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "pakendamine ebaõnnestus: %s\n"
 
-#: g10/gpg.c:5053
+#: g10/gpg.c:5052
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "vigane räsialgoritm `%s'\n"
 
-#: g10/gpg.c:5205 g10/tofu.c:2156
+#: g10/gpg.c:5204 g10/tofu.c:2160
 #, fuzzy, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: g10/gpg.c:5216
+#: g10/gpg.c:5215
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5272
+#: g10/gpg.c:5271
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5283
+#: g10/gpg.c:5282
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjutage nüüd oma teade ...\n"
 
-#: g10/gpg.c:5630
+#: g10/gpg.c:5629
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "antud sertifikaadi poliisi URL on vigane\n"
 
-#: g10/gpg.c:5632
+#: g10/gpg.c:5631
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:5665
+#: g10/gpg.c:5664
 #, fuzzy, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
@@ -3496,7 +3510,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:414 tools/gpgconf.c:116 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:415 tools/gpgconf.c:116 tools/gpg-card.c:95
 msgid "|FD|write status info to this FD"
 msgstr "|FP|kirjuta olekuinfo sellesse failipidemesse"
 
@@ -3591,272 +3605,272 @@ msgstr ""
 msgid "repair keys on import"
 msgstr "näita sõrmejälge"
 
-#: g10/import.c:399 g10/import.c:721
+#: g10/import.c:407 g10/import.c:729
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "jätan bloki tüübiga %d vahele\n"
 
-#: g10/import.c:738
+#: g10/import.c:746
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu võtit on seni töödeldud\n"
 
-#: g10/import.c:831
+#: g10/import.c:839
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Töödeldud kokku: %lu\n"
 
-#: g10/import.c:834
+#: g10/import.c:842
 #, fuzzy, c-format
 #| msgid "      skipped new keys: %lu\n"
 msgid "    skipped PGP-2 keys: %lu\n"
 msgstr " vahele jäetud uusi võtmeid: %lu\n"
 
-#: g10/import.c:836
+#: g10/import.c:844
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr " vahele jäetud uusi võtmeid: %lu\n"
 
-#: g10/import.c:839
+#: g10/import.c:847
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "    puudub kasutaja ID: %lu\n"
 
-#: g10/import.c:842 sm/import.c:129
+#: g10/import.c:850 sm/import.c:129
 #, c-format
 msgid "              imported: %lu"
 msgstr "            imporditud: %lu"
 
-#: g10/import.c:846 sm/import.c:133
+#: g10/import.c:854 sm/import.c:133
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "              muutmata: %lu\n"
 
-#: g10/import.c:848
+#: g10/import.c:856
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "       uusi kasutajaid: %lu\n"
 
-#: g10/import.c:850
+#: g10/import.c:858
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "      uusi alamvõtmeid: %lu\n"
 
-#: g10/import.c:852
+#: g10/import.c:860
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "         uusi allkirju: %lu\n"
 
-#: g10/import.c:854
+#: g10/import.c:862
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "      uusi tühistamisi: %lu\n"
 
-#: g10/import.c:856 sm/import.c:135
+#: g10/import.c:864 sm/import.c:135
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr " loetud salajasi võtmeid: %lu\n"
 
-#: g10/import.c:858 sm/import.c:137
+#: g10/import.c:866 sm/import.c:137
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr " salajasi võtmeid imporditud: %lu\n"
 
-#: g10/import.c:860 sm/import.c:139
+#: g10/import.c:868 sm/import.c:139
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " muutmata salajasi võtmeid: %lu\n"
 
-#: g10/import.c:862 sm/import.c:141
+#: g10/import.c:870 sm/import.c:141
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "       pole imporditud: %lu\n"
 
-#: g10/import.c:864
+#: g10/import.c:872
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "         uusi allkirju: %lu\n"
 
-#: g10/import.c:866
+#: g10/import.c:874
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr " loetud salajasi võtmeid: %lu\n"
 
-#: g10/import.c:1291
+#: g10/import.c:1299
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:1333
+#: g10/import.c:1341
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:1351
+#: g10/import.c:1359
 #, fuzzy, c-format
 msgid "         \"%s\": preference for AEAD algorithm %s\n"
 msgstr "%s allkiri, sõnumilühendi algoritm %s\n"
 
-#: g10/import.c:1366
+#: g10/import.c:1374
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s allkiri, sõnumilühendi algoritm %s\n"
 
-#: g10/import.c:1378
+#: g10/import.c:1386
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:1391
+#: g10/import.c:1399
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:1393
+#: g10/import.c:1401
 #, c-format
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:1418
+#: g10/import.c:1426
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:1932 g10/import.c:3053
+#: g10/import.c:1940 g10/import.c:3061
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "võti %08lX: kasutaja ID puudub\n"
 
-#: g10/import.c:1938
+#: g10/import.c:1946
 #, fuzzy, c-format
 msgid "key %s: %s\n"
 msgstr "`%s' jätsin vahele: %s\n"
 
-#: g10/import.c:1939 g10/import.c:3025
+#: g10/import.c:1947 g10/import.c:3033
 msgid "rejected by import screener"
 msgstr ""
 
-#: g10/import.c:1988
+#: g10/import.c:1996
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "võti %08lX: HKP alamvõtme rike parandatud\n"
 
-#: g10/import.c:2009
+#: g10/import.c:2017
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr ""
 "võti %08lX: aktsepteerisin iseenda poolt allakirjutamata kasutaja ID '%s'\n"
 
-#: g10/import.c:2020 g10/import.c:2051
+#: g10/import.c:2028 g10/import.c:2059
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "võti %08lX: puudub kehtiv kasutaja ID\n"
 
-#: g10/import.c:2022
+#: g10/import.c:2030
 #, c-format
 msgid "this may be caused by a missing self-signature\n"
 msgstr "see võib olla põhjustatud puuduvast iseenda allkirjast\n"
 
-#: g10/import.c:2101 g10/import.c:3439
+#: g10/import.c:2109 g10/import.c:3447
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "võti %08lX: avalikku võtit ei leitud: %s\n"
 
-#: g10/import.c:2107
+#: g10/import.c:2115
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "võti %08lX: uus võti - jätsin vahele\n"
 
-#: g10/import.c:2119
+#: g10/import.c:2127
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "ei leia kirjutatavat võtmehoidlat: %s\n"
 
-#: g10/import.c:2151 g10/import.c:2253 g10/import.c:3514
+#: g10/import.c:2159 g10/import.c:2261 g10/import.c:3522
 #, fuzzy, c-format
 #| msgid "error writing keyring `%s': %s\n"
 msgid "error writing keyring '%s': %s\n"
 msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/import.c:2174
+#: g10/import.c:2182
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "võti %08lX: avalik võti \"%s\" on imporditud\n"
 
-#: g10/import.c:2201
+#: g10/import.c:2209
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "võti %08lX: ei sobi meie koopiaga\n"
 
-#: g10/import.c:2269
+#: g10/import.c:2277
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "võti %08lX: \"%s\" 1 uus kasutaja ID\n"
 
-#: g10/import.c:2272
+#: g10/import.c:2280
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "võti %08lX: \"%s\" %d uut kasutaja IDd\n"
 
-#: g10/import.c:2275
+#: g10/import.c:2283
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "võti %08lX: \"%s\" 1 uus allkiri\n"
 
-#: g10/import.c:2278
+#: g10/import.c:2286
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "võti %08lX: \"%s\" %d uut allkirja\n"
 
-#: g10/import.c:2281
+#: g10/import.c:2289
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "võti %08lX: \"%s\" 1 uus alamvõti\n"
 
-#: g10/import.c:2284
+#: g10/import.c:2292
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "võti %08lX: \"%s\" %d uut alamvõtit\n"
 
-#: g10/import.c:2287
+#: g10/import.c:2295
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "võti %08lX: \"%s\" %d uut allkirja\n"
 
-#: g10/import.c:2290
+#: g10/import.c:2298
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "võti %08lX: \"%s\" %d uut allkirja\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2301
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "võti %08lX: \"%s\" %d uut kasutaja IDd\n"
 
-#: g10/import.c:2296
+#: g10/import.c:2304
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "võti %08lX: \"%s\" %d uut kasutaja IDd\n"
 
-#: g10/import.c:2332
+#: g10/import.c:2340
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "võti %08lX: \"%s\" ei muudetud\n"
 
-#: g10/import.c:2692 g10/import.c:2887
+#: g10/import.c:2700 g10/import.c:2895
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "võti %08lX: salajane võti on imporditud\n"
 
-#: g10/import.c:2700
+#: g10/import.c:2708
 #, fuzzy, c-format
 #| msgid "skipped: secret key already present\n"
 msgid "key %s: secret key already exists\n"
 msgstr "jätsin vahele: avalik võti on juba olemas\n"
 
-#: g10/import.c:2708
+#: g10/import.c:2716
 #, fuzzy, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "viga teate saatmisel serverile `%s': %s\n"
@@ -3869,206 +3883,205 @@ msgstr "viga teate saatmisel serverile `%s': %s\n"
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2877
+#: g10/import.c:2885
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:3024
+#: g10/import.c:3032
 #, fuzzy, c-format
 msgid "secret key %s: %s\n"
 msgstr "salajast võtit `%s' ei leitud: %s\n"
 
-#: g10/import.c:3045 g10/import.c:3084
+#: g10/import.c:3053 g10/import.c:3092
 #, fuzzy, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "kirjutan salajase võtme faili `%s'\n"
 
-#: g10/import.c:3072
+#: g10/import.c:3080
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "võti %08lX: salajane võti vigase šifriga %d - jätsin vahele\n"
 
-#: g10/import.c:3234 g10/pkclist.c:75 g10/revoke.c:774
+#: g10/import.c:3242 g10/pkclist.c:75 g10/revoke.c:775
 msgid "No reason specified"
 msgstr "Põhjus puudub"
 
-#: g10/import.c:3235 g10/pkclist.c:77 g10/revoke.c:776
+#: g10/import.c:3243 g10/pkclist.c:77 g10/revoke.c:777
 msgid "Key is superseded"
 msgstr "Võti on asendatud"
 
-#: g10/import.c:3236 g10/pkclist.c:79 g10/revoke.c:775
+#: g10/import.c:3244 g10/pkclist.c:79 g10/revoke.c:776
 msgid "Key has been compromised"
 msgstr "Võti on kompromiteeritud"
 
-#: g10/import.c:3237 g10/pkclist.c:81 g10/revoke.c:777
+#: g10/import.c:3245 g10/pkclist.c:81 g10/revoke.c:778
 msgid "Key is no longer used"
 msgstr "Võti ei ole enam kasutusel"
 
-#: g10/import.c:3238 g10/pkclist.c:83 g10/revoke.c:778
+#: g10/import.c:3246 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "Kasutaja ID ei ole enam kehtiv"
 
-#: g10/import.c:3363 g10/keylist.c:1105 g10/pkclist.c:87
+#: g10/import.c:3371 g10/keylist.c:1105 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "tühistamise põhjus: "
 
-#: g10/import.c:3382 g10/keylist.c:1124 g10/pkclist.c:103
+#: g10/import.c:3390 g10/keylist.c:1124 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "tühistamise kommentaar: "
 
-#: g10/import.c:3432
+#: g10/import.c:3440
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "võti %08lX: avalik võti puudub - tühistamise sertifikaati ei saa rakendada\n"
 
-#: g10/import.c:3461
+#: g10/import.c:3469
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "võti %08lX: ei leia algset võtmeblokki: %s\n"
 
-#: g10/import.c:3468
+#: g10/import.c:3476
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "võti %08lX: ei õnnestu lugeda algset võtmeblokki: %s\n"
 
-#: g10/import.c:3488
+#: g10/import.c:3496
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "võti %08lX: vigane tühistamise sertifikaat: %s - lükkasin tagasi\n"
 
-#: g10/import.c:3523
+#: g10/import.c:3531
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "võti %08lX: \"%s\" tühistamise sertifikaat imporditud\n"
 
-#: g10/import.c:3609
+#: g10/import.c:3617
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "võti %08lX: allkirjal puudub kasutaja ID\n"
 
-#: g10/import.c:3626
+#: g10/import.c:3634
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "võti %08lX: mittetoetatud avaliku võtme algoritm kasutajaga \"%s\"\n"
 
-#: g10/import.c:3628
+#: g10/import.c:3636
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "võti %08lX: kasutajal \"%s\" on vigane iseenda allkiri\n"
 
-#: g10/import.c:3645 g10/import.c:3673 g10/import.c:3729
+#: g10/import.c:3653 g10/import.c:3681 g10/import.c:3737
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "võti %08lX: mittetoetatud avaliku võtme algoritm\n"
 
-#: g10/import.c:3646
+#: g10/import.c:3654
 #, fuzzy, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "võti %08lX: lisatud vahetu võtme allkiri\n"
 
-#: g10/import.c:3660
+#: g10/import.c:3668
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "võti %08lX: võtmeseosel puudub alamvõti\n"
 
-#: g10/import.c:3675
+#: g10/import.c:3683
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "võti %08lX: vigane alamvõtme seos\n"
 
-#: g10/import.c:3694
+#: g10/import.c:3702
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "võti %08lX: vigane mitme alamvõtme seos\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3726
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "võti %08lX: võtme tühistamiseks puudub alamvõti\n"
 
-#: g10/import.c:3731
+#: g10/import.c:3739
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "võti %08lX: vigane alamvõtme tühistamine\n"
 
-#: g10/import.c:3746
+#: g10/import.c:3754
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "võti %08lX: eemaldasin mitme alamvõtme tühistamise\n"
 
-#: g10/import.c:3790
+#: g10/import.c:3798
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "võti %08lX: jätsin vahele kasutaja ID '"
 
-#: g10/import.c:3817
+#: g10/import.c:3825
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "võti %08lX: jätsin alamvõtme vahele\n"
 
-#: g10/import.c:3849
+#: g10/import.c:3857
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "võti %08lX: mitte eksporditav allkiri (klass %02x) - jätan vahele\n"
 
-#: g10/import.c:3860
+#: g10/import.c:3868
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "võti %08lX: tühistamise sertifikaat on vales kohas - jätan vahele\n"
 
-#: g10/import.c:3878
+#: g10/import.c:3886
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "võti %08lX: vigane tühistamise sertifikaat: %s - jätan vahele\n"
 
-#: g10/import.c:3892
+#: g10/import.c:3900
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "võti %08lX: alamvõtme allkiri on vales kohas - jätan vahele\n"
 
-#: g10/import.c:3900
+#: g10/import.c:3908
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "võti %08lX: ootamatu allkirja klass (0x%02x) - jätan vahele\n"
 
-#: g10/import.c:4073
+#: g10/import.c:4081
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "võti %08lX: tuvastasin dubleeritud kasutaja ID - mestisin\n"
 
-#: g10/import.c:4180
+#: g10/import.c:4188
 #, fuzzy, c-format
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr "võti %08lX: tuvastasin dubleeritud kasutaja ID - mestisin\n"
 
-#: g10/import.c:4245
+#: g10/import.c:4253
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "HOIATUS: võti %08lX võib olla tühistatud: laen tühistamise võtit %08lX\n"
 
-#: g10/import.c:4261
+#: g10/import.c:4269
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "HOIATUS: võti %08lX võib olla tühistatud: tühistamise võtit %08lX pole.\n"
 
-#: g10/import.c:4327
+#: g10/import.c:4335
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "võti %08lX: \"%s\" tühistamise sertifikaat lisatud\n"
 
-#: g10/import.c:4365
+#: g10/import.c:4373
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "võti %08lX: lisatud vahetu võtme allkiri\n"
 
-#: g10/key-check.c:133 dirmngr/dirmngr_ldap.c:650 dirmngr/ldap-wrapper.c:835
-#: dirmngr/ldap-wrapper.c:852
+#: g10/key-check.c:133 dirmngr/ldap-wrapper.c:835 dirmngr/ldap-wrapper.c:852
 #, fuzzy, c-format
 msgid "error allocating memory: %s\n"
 msgstr "viga võtmehoidla `%s' loomisel: %s\n"
@@ -4131,7 +4144,7 @@ msgid ""
 "all signatures.\n"
 msgstr ""
 
-#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:284 sm/keydb.c:297
+#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:289 sm/keydb.c:302
 #, fuzzy, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "viga võtmehoidla `%s' loomisel: %s\n"
@@ -4142,7 +4155,7 @@ msgstr "viga võtmehoidla `%s' loomisel: %s\n"
 msgid "error creating keyring '%s': %s\n"
 msgstr "viga võtmehoidla `%s' loomisel: %s\n"
 
-#: g10/keydb.c:388 sm/keydb.c:303
+#: g10/keydb.c:388 sm/keydb.c:308
 #, fuzzy, c-format
 msgid "keybox '%s' created\n"
 msgstr "võtmehoidla `%s' on loodud\n"
@@ -4422,8 +4435,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Allkirjastan tõesti? "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6192 g10/keyedit.c:6275 g10/keyedit.c:6404
-#: g10/keyedit.c:6466 g10/sign.c:528
+#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
+#: g10/keyedit.c:6474 g10/sign.c:528
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "allkirjastamine ebaõnnestus: %s\n"
@@ -4830,7 +4843,7 @@ msgstr "Tundmatu kasutaja ID.\n"
 msgid "Nothing to sign.\n"
 msgstr "Võtmega %08lX pole midagi allkirjastada\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6057
+#: g10/keyedit.c:2973 g10/keyedit.c:6065
 #, fuzzy, c-format
 msgid "Not signed by you.\n"
 msgstr "   allkirjastanud %08lX %s%s\n"
@@ -4900,7 +4913,7 @@ msgstr "Selle võtme võib olla tühistanud %s võti "
 msgid "(sensitive)"
 msgstr " (tundlik)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:525
+#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s ei õnnestu luua: %s\n"
@@ -4916,7 +4929,7 @@ msgid "expired: %s"
 msgstr " [aegub: %s]"
 
 #: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2262
-#: g10/keyserver.c:531
+#: g10/keyserver.c:354
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [aegub: %s]"
@@ -4952,14 +4965,14 @@ 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:535
-#: g10/mainproc.c:2280 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
+#: g10/mainproc.c:2282 g10/tofu.c:1789 g10/trust.c:426 dirmngr/ocsp.c:792
 #, fuzzy
 msgid "revoked"
 msgstr "[tühistatud] "
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:539
-#: g10/mainproc.c:2282 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
+#: g10/mainproc.c:2284 g10/tofu.c:1794 g10/trust.c:113
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -5001,7 +5014,7 @@ msgstr "Olete kindel, et soovite seda ikka lisada? (j/E) "
 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:3107
+#: g10/keyedit.c:4273 g10/keygen.c:3111
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
@@ -5150,7 +5163,7 @@ msgstr ""
 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:5357 g10/keyedit.c:5495
+#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "jätan kasutaja \"%s\" v3 iseenda allkirja vahele\n"
@@ -5159,133 +5172,133 @@ msgstr "jätan kasutaja \"%s\" v3 iseenda allkirja vahele\n"
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5380
+#: g10/keyedit.c:5383
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
 
-#: g10/keyedit.c:5381
+#: g10/keyedit.c:5384
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
 
-#: g10/keyedit.c:5441
+#: g10/keyedit.c:5449
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Allkirja noteerimine: "
 
-#: g10/keyedit.c:5588
+#: g10/keyedit.c:5596
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Kirjutan üle (j/E)? "
 
-#: g10/keyedit.c:5658
+#: g10/keyedit.c:5666
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:5720
+#: g10/keyedit.c:5728
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:5821
+#: g10/keyedit.c:5829
 #, fuzzy, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:5843
+#: g10/keyedit.c:5851
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:5984
+#: g10/keyedit.c:5992
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "kasutaja ID: \""
 
-#: g10/keyedit.c:5987 g10/keyedit.c:6089 g10/keyedit.c:6137
+#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   allkirjastanud %08lX %s%s%s\n"
 
-#: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
+#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
 msgid " (non-exportable)"
 msgstr " (mitte-eksporditav)"
 
-#: g10/keyedit.c:5993
+#: g10/keyedit.c:6001
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "See allkiri aegub %s.\n"
 
-#: g10/keyedit.c:5998
+#: g10/keyedit.c:6006
 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:6003
+#: g10/keyedit.c:6011
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Loon sellele allkirjale tühistamise sertifikaadi? (j/E) "
 
-#: g10/keyedit.c:6063
+#: g10/keyedit.c:6071
 #, 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:6092
+#: g10/keyedit.c:6100
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (mitte-eksporditav)"
 
-#: g10/keyedit.c:6099
+#: g10/keyedit.c:6107
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   tühistanud %08lX %s\n"
 
-#: g10/keyedit.c:6124
+#: g10/keyedit.c:6132
 msgid "You are about to revoke these signatures:\n"
 msgstr "Te asute tühistama järgmisi allkirju:\n"
 
-#: g10/keyedit.c:6147
+#: g10/keyedit.c:6155
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Kas tõesti loon tühistamise sertifikaadid? (j/E) "
 
-#: g10/keyedit.c:6180
+#: g10/keyedit.c:6188
 #, c-format
 msgid "no secret key\n"
 msgstr "salajast võtit pole\n"
 
-#: g10/keyedit.c:6228
+#: g10/keyedit.c:6236
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6238
+#: g10/keyedit.c:6246
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "kasutaja ID \"%s\" on juba tühistatud\n"
 
-#: g10/keyedit.c:6255
+#: g10/keyedit.c:6263
 #, 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:6351
+#: g10/keyedit.c:6359
 #, 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:6389
+#: g10/keyedit.c:6397
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "kasutaja ID \"%s\" on juba tühistatud\n"
 
-#: g10/keyedit.c:6451
+#: g10/keyedit.c:6459
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "kasutaja ID \"%s\" on juba tühistatud\n"
 
-#: g10/keyedit.c:6548
+#: g10/keyedit.c:6556
 #, 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"
@@ -5295,83 +5308,83 @@ msgstr "Näitan %s foto IDd suurusega %ld, võti 0x%08lX (uid %d)\n"
 msgid "invalid value for option '%s'\n"
 msgstr "vigased impordi võtmed\n"
 
-#: g10/keygen.c:338
+#: g10/keygen.c:339
 #, fuzzy, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "eelistus %c%lu on duplikaat\n"
 
-#: g10/keygen.c:345
+#: g10/keygen.c:346
 #, fuzzy, c-format
 msgid "too many cipher preferences\n"
 msgstr "liiga palju `%c' eelistusi\n"
 
-#: g10/keygen.c:347
+#: g10/keygen.c:348
 #, fuzzy, c-format
 msgid "too many digest preferences\n"
 msgstr "liiga palju `%c' eelistusi\n"
 
-#: g10/keygen.c:349
+#: g10/keygen.c:350
 #, fuzzy, c-format
 msgid "too many compression preferences\n"
 msgstr "liiga palju `%c' eelistusi\n"
 
-#: g10/keygen.c:351
+#: g10/keygen.c:352
 #, fuzzy, c-format
 msgid "too many AEAD preferences\n"
 msgstr "liiga palju `%c' eelistusi\n"
 
-#: g10/keygen.c:521
+#: g10/keygen.c:522
 #, fuzzy, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "lubamatu sümbol eelistuste sõnes\n"
 
-#: g10/keygen.c:1130
+#: g10/keygen.c:1131
 #, c-format
 msgid "writing direct signature\n"
 msgstr "kirjutan otsese allkirja\n"
 
-#: g10/keygen.c:1176
+#: g10/keygen.c:1177
 #, c-format
 msgid "writing self signature\n"
 msgstr "kirjutan iseenda allkirja\n"
 
-#: g10/keygen.c:1233
+#: g10/keygen.c:1234
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "kirjutan võtit siduva allkirja\n"
 
-#: g10/keygen.c:1598 g10/keygen.c:1603 g10/keygen.c:1655 g10/keygen.c:1660
-#: g10/keygen.c:1832 g10/keygen.c:1837
+#: g10/keygen.c:1599 g10/keygen.c:1604 g10/keygen.c:1656 g10/keygen.c:1661
+#: g10/keygen.c:1833 g10/keygen.c:1838
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "vigane võtme suurus; kasutan %u bitti\n"
 
-#: g10/keygen.c:1609 g10/keygen.c:1666 g10/keygen.c:1674 g10/keygen.c:1843
+#: g10/keygen.c:1610 g10/keygen.c:1667 g10/keygen.c:1675 g10/keygen.c:1844
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "võtme suurus ümardatud üles %u bitini\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1701
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1899
+#: g10/keygen.c:1900
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1902
+#: g10/keygen.c:1903
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1906
 #, fuzzy
 msgid "Encrypt"
 msgstr "krüpteeri andmed"
 
-#: g10/keygen.c:1908
+#: g10/keygen.c:1909
 msgid "Authenticate"
 msgstr ""
 
@@ -5385,179 +5398,179 @@ msgstr ""
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1929
+#: g10/keygen.c:1930
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1967
 #, c-format
 msgid "Possible actions for this %s key: "
 msgstr ""
 
-#: g10/keygen.c:1973
+#: g10/keygen.c:1974
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1979
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1981
+#: g10/keygen.c:1982
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (ainult krüptimiseks)\n"
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1985
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1987
+#: g10/keygen.c:1988
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:2116
+#: g10/keygen.c:2117
 #, fuzzy, c-format
 msgid "   (%d) RSA and RSA%s\n"
 msgstr "   (%d) DSA ja ElGamal (vaikimisi)\n"
 
-#: g10/keygen.c:2120
+#: g10/keygen.c:2121
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal%s\n"
 msgstr "   (%d) DSA ja ElGamal (vaikimisi)\n"
 
-#: g10/keygen.c:2123
+#: g10/keygen.c:2124
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "   (%d) DSA (sign only)%s\n"
 msgstr "   (%d) DSA (ainult allkirjastamiseks)\n"
 
-#: g10/keygen.c:2125
+#: g10/keygen.c:2126
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (sign only)\n"
 msgid "   (%d) RSA (sign only)%s\n"
 msgstr "   (%d) RSA (ainult allkirjastamiseks)\n"
 
-#: g10/keygen.c:2131
+#: g10/keygen.c:2132
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)%s\n"
 msgstr "   (%d) ElGamal (ainult krüptimiseks)\n"
 
-#: g10/keygen.c:2133
+#: g10/keygen.c:2134
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (encrypt only)\n"
 msgid "   (%d) RSA (encrypt only)%s\n"
 msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
 
-#: g10/keygen.c:2139
+#: g10/keygen.c:2140
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
 
-#: g10/keygen.c:2141
+#: g10/keygen.c:2142
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2148
 #, fuzzy, c-format
 msgid "   (%d) ECC (sign and encrypt)%s\n"
 msgstr "   (%d) RSA (allkirjastamiseks ja krüptimiseks)\n"
 
-#: g10/keygen.c:2147 g10/keygen.c:2678
+#: g10/keygen.c:2148 g10/keygen.c:2679
 #, fuzzy
 #| msgid " (default)"
 msgid " *default*"
 msgstr " (vaikimisi)"
 
-#: g10/keygen.c:2148
+#: g10/keygen.c:2149
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "  (%d) ECC (sign only)\n"
 msgstr "   (%d) DSA (ainult allkirjastamiseks)\n"
 
-#: g10/keygen.c:2150
+#: g10/keygen.c:2151
 #, fuzzy, c-format
 msgid "  (%d) ECC (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
 
-#: g10/keygen.c:2152
+#: g10/keygen.c:2153
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (encrypt only)\n"
 msgid "  (%d) ECC (encrypt only)%s\n"
 msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
 
-#: g10/keygen.c:2156
+#: g10/keygen.c:2157
 #, fuzzy, c-format
 msgid "  (%d) Existing key%s\n"
 msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
 
-#: g10/keygen.c:2158
+#: g10/keygen.c:2159
 #, fuzzy, c-format
 msgid "  (%d) Existing key from card%s\n"
 msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
 
-#: g10/keygen.c:2254 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2255 sm/certreqgen-ui.c:203
 #, fuzzy
 msgid "Enter the keygrip: "
 msgstr "Allkirja noteerimine: "
 
-#: g10/keygen.c:2267 sm/certreqgen-ui.c:211 tools/gpg-card.c:2280
+#: g10/keygen.c:2268 sm/certreqgen-ui.c:211 tools/gpg-card.c:2297
 #, c-format
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr ""
 
-#: g10/keygen.c:2269 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2270 sm/certreqgen-ui.c:213
 #, fuzzy
 msgid "No key with this keygrip\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keygen.c:2288 g10/keygen.c:2298 g10/keygen.c:3440 g10/keygen.c:3451
+#: g10/keygen.c:2289 g10/keygen.c:2299 g10/keygen.c:3444 g10/keygen.c:3455
 #: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
 #, fuzzy, c-format
 msgid "error reading the card: %s\n"
 msgstr "%s: viga vaba kirje lugemisel: %s\n"
 
-#: g10/keygen.c:2292 g10/keygen.c:3444 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2293 g10/keygen.c:3448 sm/certreqgen-ui.c:234
 #, fuzzy, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: g10/keygen.c:2311 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2312 sm/certreqgen-ui.c:246
 #, fuzzy
 msgid "Available keys:\n"
 msgstr "blokeeri võti"
 
-#: g10/keygen.c:2504 g10/keygen.c:2518
+#: g10/keygen.c:2505 g10/keygen.c:2519
 #, fuzzy, c-format
 #| msgid "rounded up to %u bits\n"
 msgid "rounded to %u bits\n"
 msgstr "ümardatud üles %u bitini\n"
 
-#: g10/keygen.c:2559
+#: g10/keygen.c:2560
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:2567
+#: g10/keygen.c:2568
 #, fuzzy, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Millist võtmepikkust te soovite? (1024) "
 
-#: g10/keygen.c:2584 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2585 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Soovitud võtmepikkus on %u bitti\n"
 
-#: g10/keygen.c:2630
+#: g10/keygen.c:2631
 #, fuzzy
 #| msgid "Please select what kind of key you want:\n"
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Palun valige, millist võtmetüüpi te soovite:\n"
 
-#: g10/keygen.c:2819
+#: g10/keygen.c:2820
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5573,7 +5586,7 @@ msgstr ""
 "      <n>m = võti aegub n kuuga\n"
 "      <n>y = võti aegub n aastaga\n"
 
-#: g10/keygen.c:2830
+#: g10/keygen.c:2831
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5589,40 +5602,40 @@ msgstr ""
 "      <n>m = allkiri aegub n kuuga\n"
 "      <n>y = allkiri aegub n aastaga\n"
 
-#: g10/keygen.c:2853
+#: g10/keygen.c:2854
 msgid "Key is valid for? (0) "
 msgstr "Võti on kehtiv kuni? (0) "
 
-#: g10/keygen.c:2858
+#: g10/keygen.c:2859
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Allkiri on kehtiv kuni? (0) "
 
-#: g10/keygen.c:2871 g10/keygen.c:2896
+#: g10/keygen.c:2875 g10/keygen.c:2900
 msgid "invalid value\n"
 msgstr "vigane väärtus\n"
 
-#: g10/keygen.c:2878
+#: g10/keygen.c:2882
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s ei aegu kunagi\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2883
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s ei aegu kunagi\n"
 
-#: g10/keygen.c:2884
+#: g10/keygen.c:2888
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s aegub %s\n"
 
-#: g10/keygen.c:2885
+#: g10/keygen.c:2889
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Allkiri aegub %s\n"
 
-#: g10/keygen.c:2889
+#: g10/keygen.c:2893
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5630,12 +5643,12 @@ msgstr ""
 "Teie süsteem ei saa esitada kuupäevi peale aastat 2038.\n"
 "Siiski käsitletakse neid korrektselt aastani 2106.\n"
 
-#: g10/keygen.c:2902
+#: g10/keygen.c:2906
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "On see õige (j/e)? "
 
-#: g10/keygen.c:2970
+#: g10/keygen.c:2974
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5646,7 +5659,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2985
+#: g10/keygen.c:2989
 #, fuzzy
 msgid ""
 "\n"
@@ -5662,50 +5675,50 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:3004
+#: g10/keygen.c:3008
 msgid "Real name: "
 msgstr "Pärisnimi: "
 
-#: g10/keygen.c:3013
+#: g10/keygen.c:3017
 msgid "Invalid character in name\n"
 msgstr "Lubamatu sümbol nimes\n"
 
-#: g10/keygen.c:3014
+#: g10/keygen.c:3018
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:3018
+#: g10/keygen.c:3022
 msgid "Name may not start with a digit\n"
 msgstr "Nimi ei või alata numbriga\n"
 
-#: g10/keygen.c:3021
+#: g10/keygen.c:3025
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nimes peab olema vähemalt 5 sümbolit\n"
 
-#: g10/keygen.c:3031
+#: g10/keygen.c:3035
 msgid "Email address: "
 msgstr "E-posti aadress: "
 
-#: g10/keygen.c:3037
+#: g10/keygen.c:3041
 msgid "Not a valid email address\n"
 msgstr "Selline e-posti aadress ei ole lubatud\n"
 
-#: g10/keygen.c:3046
+#: g10/keygen.c:3050
 msgid "Comment: "
 msgstr "Kommentaar: "
 
-#: g10/keygen.c:3052
+#: g10/keygen.c:3056
 msgid "Invalid character in comment\n"
 msgstr "Lubamatu sümbol kommentaaris\n"
 
-#: g10/keygen.c:3088
+#: g10/keygen.c:3092
 #, fuzzy, c-format
 #| msgid "You are using the `%s' character set.\n"
 msgid "You are using the '%s' character set.\n"
 msgstr "Te kasutate kooditabelit `%s'.\n"
 
-#: g10/keygen.c:3094
+#: g10/keygen.c:3098
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5716,7 +5729,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3099
+#: g10/keygen.c:3103
 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"
 
@@ -5731,35 +5744,35 @@ msgstr "Ärge palun kirjutage e-posti aadressi pärisnimesse ega kommentaari\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3124
+#: g10/keygen.c:3128
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoVv"
 
-#: g10/keygen.c:3134
+#: g10/keygen.c:3138
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Muuda (N)ime, (K)ommentaari, (E)posti või (V)älju? "
 
-#: g10/keygen.c:3135
+#: g10/keygen.c:3139
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Muuda (N)ime, (K)ommentaari, (E)posti või (O)k/(V)älju? "
 
-#: g10/keygen.c:3140
+#: g10/keygen.c:3144
 #, fuzzy
 #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Muuda (N)ime, (K)ommentaari, (E)posti või (V)älju? "
 
-#: g10/keygen.c:3141
+#: g10/keygen.c:3145
 #, fuzzy
 #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "Muuda (N)ime, (K)ommentaari, (E)posti või (O)k/(V)älju? "
 
-#: g10/keygen.c:3160
+#: g10/keygen.c:3164
 msgid "Please correct the error first\n"
 msgstr "Palun parandage kõigepealt viga\n"
 
-#: g10/keygen.c:3206
+#: g10/keygen.c:3210
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -5771,18 +5784,18 @@ msgstr ""
 "kasutada kettaid jne), see annaks juhuarvude generaatorile võimaluse\n"
 "koguda paremat entroopiat.\n"
 
-#: g10/keygen.c:3591
+#: g10/keygen.c:3595
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4590 g10/keygen.c:4663 g10/keygen.c:4681 g10/keygen.c:4710
-#: g10/keygen.c:5086 g10/keygen.c:5632 g10/keygen.c:5943 g10/keygen.c:6050
+#: g10/keygen.c:4594 g10/keygen.c:4667 g10/keygen.c:4685 g10/keygen.c:4714
+#: g10/keygen.c:5113 g10/keygen.c:5663 g10/keygen.c:5974 g10/keygen.c:6081
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Võtme genereerimine ebaõnnestus: %s\n"
 
-#: g10/keygen.c:4599
+#: g10/keygen.c:4603
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5790,67 +5803,67 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:4601
+#: g10/keygen.c:4605
 msgid "Continue? (Y/n) "
 msgstr ""
 
-#: g10/keygen.c:4622
+#: g10/keygen.c:4626
 #, fuzzy, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "`%s' on juba pakitud\n"
 
-#: g10/keygen.c:4627
+#: g10/keygen.c:4631
 #, fuzzy
 msgid "Create anyway? (y/N) "
 msgstr "Kasutan seda võtit ikka? "
 
-#: g10/keygen.c:4633
+#: g10/keygen.c:4637
 #, fuzzy, c-format
 msgid "creating anyway\n"
 msgstr "genereeri uus võtmepaar"
 
-#: g10/keygen.c:5069
+#: g10/keygen.c:5096
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 
-#: g10/keygen.c:5118
+#: g10/keygen.c:5145
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Võtme genereerimine katkestati.\n"
 
-#: g10/keygen.c:5178
+#: g10/keygen.c:5205
 #, fuzzy, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "`%s' ei õnnestu luua: %s\n"
 
-#: g10/keygen.c:5198
+#: g10/keygen.c:5225
 #, fuzzy, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "MÄRKUS: salajane võti %08lX aegus %s\n"
 
-#: g10/keygen.c:5359 g10/keygen.c:5561
+#: g10/keygen.c:5389 g10/keygen.c:5591
 #, fuzzy, c-format
 #| msgid "writing public key to `%s'\n"
 msgid "writing public key to '%s'\n"
 msgstr "kirjutan avaliku võtme faili `%s'\n"
 
-#: g10/keygen.c:5555
+#: g10/keygen.c:5585
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kirjutatavat avalike võtmete hoidlat pole: %s\n"
 
-#: g10/keygen.c:5569
+#: g10/keygen.c:5599
 #, fuzzy, c-format
 #| msgid "error writing public keyring `%s': %s\n"
 msgid "error writing public keyring '%s': %s\n"
 msgstr "viga avaliku võtme võtmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/keygen.c:5603
+#: g10/keygen.c:5634
 msgid "public and secret key created and signed.\n"
 msgstr "avalik ja salajane võti on loodud ja allkirjastatud.\n"
 
-#: g10/keygen.c:5619
+#: g10/keygen.c:5650
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -5860,35 +5873,35 @@ msgstr ""
 "Krüptimiseks tuleb genereerida teine võti, seda saate teha\n"
 "kasutades võtit \"--edit-key\".\n"
 
-#: g10/keygen.c:5801 g10/keygen.c:6000
+#: g10/keygen.c:5832 g10/keygen.c:6031
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "võti loodi %lu sekund tulevikus (ajahüpe või kella probleem)\n"
 
-#: g10/keygen.c:5803 g10/keygen.c:6002
+#: g10/keygen.c:5834 g10/keygen.c:6033
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "võti loodi %lu sekundit tulevikus (ajahüpe või kella probleem)\n"
 
-#: g10/keygen.c:5814 g10/keygen.c:6013
+#: g10/keygen.c:5845 g10/keygen.c:6044
 #, fuzzy, c-format
 #| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "MÄRKUS: v3 võtmetele alamvõtmete loomine ei ole OpenPGP ühilduv\n"
 
-#: g10/keygen.c:5826 g10/keygen.c:5828
+#: g10/keygen.c:5857 g10/keygen.c:5859
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Primaarse võtme salajased komponendid ei ole kättesaadavad.\n"
 
-#: g10/keygen.c:5835 g10/keygen.c:5837
+#: g10/keygen.c:5866 g10/keygen.c:5868
 #, fuzzy, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Primaarse võtme salajased komponendid ei ole kättesaadavad.\n"
 
-#: g10/keygen.c:5857 g10/keygen.c:6027
+#: g10/keygen.c:5888 g10/keygen.c:6058
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Loon tõesti? "
@@ -5971,26 +5984,26 @@ msgstr "     Võtme sõrmejälg ="
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1467
+#: g10/keyring.c:1477
 #, fuzzy, c-format
 msgid "caching keyring '%s'\n"
 msgstr "kontrollin võtmehoidlat `%s'\n"
 
-#: g10/keyring.c:1541
+#: g10/keyring.c:1551
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signature)\n"
 msgid_plural "%lu keys cached so far (%lu signatures)\n"
 msgstr[0] "kontrollitud %lu võtit (%lu allkirja)\n"
 msgstr[1] "kontrollitud %lu võtit (%lu allkirja)\n"
 
-#: g10/keyring.c:1557
+#: g10/keyring.c:1567
 #, c-format
 msgid "%lu key cached"
 msgid_plural "%lu keys cached"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/keyring.c:1559
+#: g10/keyring.c:1569
 #, fuzzy, c-format
 #| msgid "1 bad signature\n"
 msgid " (%lu signature)\n"
@@ -5998,7 +6011,7 @@ msgid_plural " (%lu signatures)\n"
 msgstr[0] "1 halb allkiri\n"
 msgstr[1] "1 halb allkiri\n"
 
-#: g10/keyring.c:1636
+#: g10/keyring.c:1646
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: võtmehoidla on loodud\n"
@@ -6028,80 +6041,75 @@ msgstr ""
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/keyserver.c:537
+#: g10/keyserver.c:360
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:740
+#: g10/keyserver.c:563
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:846
+#: g10/keyserver.c:669
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "vigased ekspordi võtmed\n"
 
-#: g10/keyserver.c:986 g10/keyserver.c:1096
+#: g10/keyserver.c:809 g10/keyserver.c:919
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1420 g10/keyserver.c:1453
+#: g10/keyserver.c:1217 g10/keyserver.c:1250
 #, 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:1427
+#: g10/keyserver.c:1224
 #, 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:1531
+#: g10/keyserver.c:1316
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "võtit '%s' ei leitud: %s\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1319
 #, fuzzy, c-format
 msgid "key not found on keyserver\n"
 msgstr "võtit '%s' ei leitud: %s\n"
 
-#: g10/keyserver.c:1722
-#, fuzzy, c-format
-msgid "requesting key %s from %s server %s\n"
-msgstr "küsin võtit %08lX võtmeserverist %s\n"
-
-#: g10/keyserver.c:1726
+#: g10/keyserver.c:1481
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "küsin võtit %08lX võtmeserverist %s\n"
 
-#: g10/keyserver.c:1841 g10/keyserver.c:2020
+#: g10/keyserver.c:1600 g10/keyserver.c:1793
 #, fuzzy, c-format
 msgid "no keyserver known\n"
 msgstr "vigased ekspordi võtmed\n"
 
-#: g10/keyserver.c:1856 g10/skclist.c:213 g10/skclist.c:241
+#: g10/keyserver.c:1615 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:1860
+#: g10/keyserver.c:1619
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "allkirjastatud teie võtmega %08lX %s\n"
 
-#: g10/keyserver.c:1901
+#: g10/keyserver.c:1662
 #, fuzzy, c-format
 msgid "requesting key from '%s'\n"
 msgstr "küsin võtit %08lX võtmeserverist %s\n"
 
-#: g10/keyserver.c:1917
+#: g10/keyserver.c:1680
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
@@ -6128,251 +6136,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:472
+#: g10/mainproc.c:473
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "avalik võti on %08lX\n"
 
-#: g10/mainproc.c:524
+#: g10/mainproc.c:525
 #, 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:528 g10/pkclist.c:231
+#: g10/mainproc.c:529 g10/pkclist.c:231
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                 ka \""
 
-#: g10/mainproc.c:532
+#: g10/mainproc.c:533
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "krüpteeritud %s võtmega, ID %08lX\n"
 
-#: g10/mainproc.c:552 g10/mainproc.c:935
+#: g10/mainproc.c:553 g10/mainproc.c:937
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:560
+#: g10/mainproc.c:561
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "krüpteeritud kasutades %lu parooli\n"
 
-#: g10/mainproc.c:562
+#: g10/mainproc.c:563
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "krüpteeritud ühe parooliga\n"
 
-#: g10/mainproc.c:577 g10/mainproc.c:602
+#: g10/mainproc.c:578 g10/mainproc.c:603
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "avaliku võtmega lahtikrüpteerimine ebaõnnestus: %s\n"
 
-#: g10/mainproc.c:613
+#: g10/mainproc.c:614
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "avaliku võtmega krüpteeritud andmed: hea DEK\n"
 
-#: g10/mainproc.c:642 g10/mainproc.c:663
+#: g10/mainproc.c:643 g10/mainproc.c:664
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "eeldan %s krüpteeritud andmeid\n"
 
-#: g10/mainproc.c:649
+#: g10/mainproc.c:650
 #, 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:742 g10/mainproc.c:780
+#: g10/mainproc.c:744 g10/mainproc.c:782
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "HOIATUS: teate kooskõlalisus ei ole tagatud\n"
 
-#: g10/mainproc.c:753
+#: g10/mainproc.c:755
 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:756
+#: g10/mainproc.c:758
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:761
+#: g10/mainproc.c:763
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "lahtikrüpteerimine ebaõnnestus: %s\n"
 
-#: g10/mainproc.c:773
+#: g10/mainproc.c:775
 #, c-format
 msgid "decryption okay\n"
 msgstr "lahtikrüpteerimine õnnestus\n"
 
-#: g10/mainproc.c:786
+#: g10/mainproc.c:788
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "HOIATUS: krüpteeritud teadet on muudetud!\n"
 
-#: g10/mainproc.c:804
+#: g10/mainproc.c:806
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "lahtikrüpteerimine ebaõnnestus: %s\n"
 
-#: g10/mainproc.c:851
+#: g10/mainproc.c:853
 #, 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:858
+#: g10/mainproc.c:860
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "algne failinimi on='%.*s'\n"
 
-#: g10/mainproc.c:1135
+#: g10/mainproc.c:1137
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "eraldiseisev tühistus - realiseerimiseks kasutage \"gpg --import\"\n"
 
-#: g10/mainproc.c:1440 g10/mainproc.c:1483
+#: g10/mainproc.c:1442 g10/mainproc.c:1485
 #, fuzzy, c-format
 msgid "no signature found\n"
 msgstr "Korrektne allkiri kasutajalt \""
 
-#: g10/mainproc.c:1763
+#: g10/mainproc.c:1765
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "HALB allkiri kasutajalt \""
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1767
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Aegunud allkiri kasutajalt \""
 
-#: g10/mainproc.c:1767
+#: g10/mainproc.c:1769
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Korrektne allkiri kasutajalt \""
 
-#: g10/mainproc.c:1789
+#: g10/mainproc.c:1791
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "allkirja kontroll jäeti ära\n"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1905
 #, fuzzy, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "neid allkirju ei õnnestu töödelda\n"
 
-#: g10/mainproc.c:1919 g10/mainproc.c:1926
+#: g10/mainproc.c:1921 g10/mainproc.c:1928
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Allkiri aegus %s\n"
 
-#: g10/mainproc.c:1920 g10/mainproc.c:1927 sm/verify.c:480
+#: g10/mainproc.c:1922 g10/mainproc.c:1929 sm/verify.c:480
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                 ka \""
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1933
 #, 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:1937
+#: g10/mainproc.c:1939
 #, fuzzy, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "                 ka \""
 
-#: g10/mainproc.c:1992
+#: g10/mainproc.c:1994
 #, c-format
 msgid "Key available at: "
 msgstr "Võtme leiate: "
 
-#: g10/mainproc.c:2034
+#: g10/mainproc.c:2036
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2234
+#: g10/mainproc.c:2236
 msgid "[uncertain]"
 msgstr "[ebakindel]"
 
-#: g10/mainproc.c:2272
+#: g10/mainproc.c:2274
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                 ka \""
 
-#: g10/mainproc.c:2347
+#: g10/mainproc.c:2349
 #, 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:2363
+#: g10/mainproc.c:2365
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Allkiri aegus %s\n"
 
-#: g10/mainproc.c:2368
+#: g10/mainproc.c:2370
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Allkiri aegub %s\n"
 
-#: g10/mainproc.c:2379
+#: g10/mainproc.c:2381
 #, 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:2380
+#: g10/mainproc.c:2382
 msgid "binary"
 msgstr "binaarne"
 
-#: g10/mainproc.c:2381
+#: g10/mainproc.c:2383
 msgid "textmode"
 msgstr "tekstimood"
 
-#: g10/mainproc.c:2381 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2383 g10/trust.c:112 dirmngr/ocsp.c:793
 msgid "unknown"
 msgstr "tundmatu"
 
-#: g10/mainproc.c:2383
+#: g10/mainproc.c:2385
 #, fuzzy
 #| msgid "unknown pubkey algorithm"
 msgid ", key algorithm "
 msgstr "tundmatu avaliku võtme algoritm"
 
-#: g10/mainproc.c:2418
+#: g10/mainproc.c:2420
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2457
+#: g10/mainproc.c:2459
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Allkirja ei saa kontrollida: %s\n"
 
-#: g10/mainproc.c:2553 g10/mainproc.c:2572 g10/mainproc.c:2696
+#: g10/mainproc.c:2555 g10/mainproc.c:2574 g10/mainproc.c:2698
 #, c-format
 msgid "not a detached signature\n"
 msgstr "ei ole eraldiseisev allkiri\n"
 
-#: g10/mainproc.c:2606
+#: g10/mainproc.c:2608
 #, 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:2615
+#: g10/mainproc.c:2617
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "eraldiseisev allkiri klassiga 0x%02x\n"
 
-#: g10/mainproc.c:2700
+#: g10/mainproc.c:2702
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "vana stiili (PGP 2.x) allkiri\n"
@@ -6561,51 +6569,56 @@ msgstr "Kriitiline allkirja noteerimine: "
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "alampaketil tüübiga %d on kriitiline bitt seatud\n"
 
-#: g10/passphrase.c:208
+#: g10/passphrase.c:201 sm/decrypt.c:669
+#, fuzzy
+msgid "Please enter the passphrase for decryption."
+msgstr "muuda parooli"
+
+#: g10/passphrase.c:203
 msgid "Enter passphrase\n"
 msgstr "Sisestage parool\n"
 
-#: g10/passphrase.c:219
+#: g10/passphrase.c:227
 #, c-format
 msgid "cancelled by user\n"
 msgstr "katkestatud kasutaja poolt\n"
 
-#: g10/passphrase.c:460
+#: g10/passphrase.c:472
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (peamise võtme ID %08lX)"
 
-#: g10/passphrase.c:467
+#: g10/passphrase.c:479
 #, fuzzy
 msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: g10/passphrase.c:471
+#: g10/passphrase.c:483
 #, fuzzy
 msgid "Please enter the passphrase to import the OpenPGP secret key:"
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: g10/passphrase.c:476
+#: g10/passphrase.c:488
 #, fuzzy
 msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: g10/passphrase.c:479
+#: g10/passphrase.c:491
 #, fuzzy
 msgid "Please enter the passphrase to export the OpenPGP secret key:"
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: g10/passphrase.c:484
+#: g10/passphrase.c:496
 #, fuzzy
 msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 msgstr "Kas te tõesti soovite valitud võtmeid kustutada? "
 
-#: g10/passphrase.c:487
+#: g10/passphrase.c:499
 #, fuzzy
 msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgstr "Kas te tõesti soovite valitud võtmeid kustutada? "
 
-#: g10/passphrase.c:496
+#: g10/passphrase.c:508
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -6778,7 +6791,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:313 g10/revoke.c:803
+#: g10/pkclist.c:313 g10/revoke.c:804
 msgid "Your decision? "
 msgstr "Teie otsus? "
 
@@ -7075,7 +7088,7 @@ msgstr "allkirjastatud andmete avamine ebaõnnestus `%s'\n"
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "allkirjastatud andmete avamine ebaõnnestus `%s'\n"
 
-#: g10/pubkey-enc.c:99 sm/decrypt.c:879
+#: g10/pubkey-enc.c:99 sm/decrypt.c:1329
 #, fuzzy, c-format
 msgid "key %s is not suitable for decryption in %s mode\n"
 msgstr "võti %08lX: kasutaja ID puudub\n"
@@ -7122,7 +7135,7 @@ msgid "Note: key has been revoked"
 msgstr "MÄRKUS: võti on tühistatud"
 
 #: g10/revoke.c:100 g10/revoke.c:126 g10/revoke.c:172 g10/revoke.c:184
-#: g10/revoke.c:502
+#: g10/revoke.c:503
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet ebaõnnestus: %s\n"
@@ -7151,11 +7164,11 @@ msgstr "Salajane võti on kasutatav.\n"
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Loon sellele võtmele tühistamise sertifikaadi? "
 
-#: g10/revoke.c:334 g10/revoke.c:744
+#: g10/revoke.c:334 g10/revoke.c:745
 msgid "ASCII armored output forced.\n"
 msgstr "Väljundis sunnitakse kasutama ASCII vormingut.\n"
 
-#: g10/revoke.c:350 g10/revoke.c:481
+#: g10/revoke.c:350 g10/revoke.c:482
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet ebaõnnestus: %s\n"
@@ -7171,19 +7184,19 @@ msgstr ""
 "`%s' jaoks pole tühistamise võtmeid\n"
 "\n"
 
-#: g10/revoke.c:567
+#: g10/revoke.c:568
 #, fuzzy
 msgid "This is a revocation certificate for the OpenPGP key:"
 msgstr "Loon sellele võtmele tühistamise sertifikaadi? "
 
-#: g10/revoke.c:583
+#: g10/revoke.c:584
 msgid ""
 "A revocation certificate is a kind of \"kill switch\" to publicly\n"
 "declare that a key shall not anymore be used.  It is not possible\n"
 "to retract such a revocation certificate once it has been published."
 msgstr ""
 
-#: g10/revoke.c:586
+#: g10/revoke.c:587
 msgid ""
 "Use it to revoke this key in case of a compromise or loss of\n"
 "the secret key.  However, if the secret key is still accessible,\n"
@@ -7192,20 +7205,20 @@ msgid ""
 "of the gpg command \"--generate-revocation\" in the GnuPG manual."
 msgstr ""
 
-#: g10/revoke.c:592
+#: g10/revoke.c:593
 msgid ""
 "To avoid an accidental use of this file, a colon has been inserted\n"
 "before the 5 dashes below.  Remove this colon with a text editor\n"
 "before importing and publishing this revocation certificate."
 msgstr ""
 
-#: g10/revoke.c:611
+#: g10/revoke.c:612
 #, fuzzy, c-format
 #| msgid "Revocation certificate created.\n"
 msgid "revocation certificate stored as '%s.rev'\n"
 msgstr "Tühistamise sertifikaat on loodud.\n"
 
-#: g10/revoke.c:655
+#: g10/revoke.c:656
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found\n"
 msgstr "salajast võtit `%s' ei leitud: %s\n"
@@ -7213,23 +7226,23 @@ msgstr "salajast võtit `%s' ei leitud: %s\n"
 #. TRANSLATORS: The %s prints a key specification which
 #. for example has been given at the command line.  Several lines
 #. lines with secret key infos are printed after this message.
-#: g10/revoke.c:680
+#: g10/revoke.c:681
 #, c-format
 msgid "'%s' matches multiple secret keys:\n"
 msgstr ""
 
-#: g10/revoke.c:705
+#: g10/revoke.c:706
 #, fuzzy, c-format
 #| msgid "error creating keyring `%s': %s\n"
 msgid "error searching the keyring: %s\n"
 msgstr "viga võtmehoidla `%s' loomisel: %s\n"
 
-#: g10/revoke.c:728
+#: g10/revoke.c:729
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Loon sellele võtmele tühistamise sertifikaadi? "
 
-#: g10/revoke.c:752
+#: g10/revoke.c:753
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -7250,33 +7263,33 @@ msgstr ""
 "trükisüsteem\n"
 "võib salvestada need andmed ja teha teistele kättesaadavaks! \n"
 
-#: g10/revoke.c:786
+#: g10/revoke.c:787
 msgid "Please select the reason for the revocation:\n"
 msgstr "Palun valige tühistamise põhjus:\n"
 
-#: g10/revoke.c:796
+#: g10/revoke.c:797
 msgid "Cancel"
 msgstr "Katkesta"
 
-#: g10/revoke.c:798
+#: g10/revoke.c:799
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Tõenäoliselt soovite siin valida %d)\n"
 
-#: g10/revoke.c:839
+#: g10/revoke.c:843
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Sisestage mittekohustuslik kirjeldus. Lõpetage tühja reaga:\n"
 
-#: g10/revoke.c:867
+#: g10/revoke.c:871
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Tühistamise põhjus: %s\n"
 
-#: g10/revoke.c:869
+#: g10/revoke.c:873
 msgid "(No description given)\n"
 msgstr "(Kirjeldust ei antud)\n"
 
-#: g10/revoke.c:874
+#: g10/revoke.c:878
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "On see hästi? "
@@ -7444,23 +7457,23 @@ msgstr "allkirjastan:"
 msgid "%s.%s encryption will be used\n"
 msgstr "kasutatakse %s krüpteerimist\n"
 
-#: g10/skclist.c:172 g10/skclist.c:253
+#: g10/skclist.c:173 g10/skclist.c:254
 #, c-format
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "võti ei ole märgitud ebaturvaliseks - sellega ei saa võlts RNGd kasutada!\n"
 
-#: g10/skclist.c:204
+#: g10/skclist.c:205
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "`%s' jätsin vahele: duplikaat\n"
 
-#: g10/skclist.c:223
+#: g10/skclist.c:224
 #, c-format
 msgid "skipped: secret key already present\n"
 msgstr "jätsin vahele: avalik võti on juba olemas\n"
 
-#: g10/skclist.c:242
+#: g10/skclist.c:243
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
@@ -7689,10 +7702,10 @@ msgstr ""
 msgid "TOFU DB error"
 msgstr ""
 
-#: g10/tofu.c:687 g10/tofu.c:2073 g10/tofu.c:2354 g10/tofu.c:2373
-#: g10/tofu.c:2386 g10/tofu.c:2398 g10/tofu.c:2413 g10/tofu.c:2425
-#: g10/tofu.c:3021 g10/tofu.c:3038 g10/tofu.c:3075 g10/tofu.c:3092
-#: g10/tofu.c:3404
+#: g10/tofu.c:687 g10/tofu.c:2077 g10/tofu.c:2358 g10/tofu.c:2377
+#: g10/tofu.c:2390 g10/tofu.c:2402 g10/tofu.c:2417 g10/tofu.c:2429
+#: g10/tofu.c:3025 g10/tofu.c:3042 g10/tofu.c:3079 g10/tofu.c:3096
+#: g10/tofu.c:3408
 #, fuzzy, c-format
 msgid "error reading TOFU database: %s\n"
 msgstr "viga teate saatmisel serverile `%s': %s\n"
@@ -7714,7 +7727,7 @@ msgstr "%s: viga kataloogikirje kirjutamisel: %s\n"
 msgid "error opening TOFU database '%s': %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: g10/tofu.c:1148 g10/tofu.c:3458 g10/tofu.c:3604
+#: g10/tofu.c:1148 g10/tofu.c:3462 g10/tofu.c:3608
 #, fuzzy, c-format
 msgid "error updating TOFU database: %s\n"
 msgstr "viga teate saatmisel serverile `%s': %s\n"
@@ -7754,43 +7767,43 @@ msgstr "viga parooli loomisel: %s\n"
 msgid "This key's user IDs:\n"
 msgstr "näita võtit ja kasutaja IDd"
 
-#: g10/tofu.c:1634 g10/tofu.c:1799
+#: g10/tofu.c:1634 g10/tofu.c:1801
 #, fuzzy, c-format
 #| msgid "Policy: "
 msgid "policy: %s"
 msgstr "Poliis: "
 
-#: g10/tofu.c:1725
+#: g10/tofu.c:1727
 #, fuzzy, c-format
 msgid "error gathering signature stats: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: g10/tofu.c:1729
+#: g10/tofu.c:1731
 #, c-format
 msgid "The email address \"%s\" is associated with %d key:\n"
 msgid_plural "The email address \"%s\" is associated with %d keys:\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1747
+#: g10/tofu.c:1749
 #, c-format
 msgid "Statistics for keys with the email address \"%s\":\n"
 msgstr ""
 
-#: g10/tofu.c:1797
+#: g10/tofu.c:1799
 #, fuzzy
 #| msgid "list keys"
 msgid "this key"
 msgstr "näita võtmeid"
 
-#: g10/tofu.c:1823
+#: g10/tofu.c:1825
 #, fuzzy, c-format
 msgid "Verified %d message."
 msgid_plural "Verified %d messages."
 msgstr[0] "|algo [failid]|trüki teatelühendid"
 msgstr[1] "|algo [failid]|trüki teatelühendid"
 
-#: g10/tofu.c:1827
+#: g10/tofu.c:1829
 #, fuzzy, c-format
 #| msgid "encrypted with %lu passphrases\n"
 msgid "Encrypted %d message."
@@ -7798,68 +7811,68 @@ msgid_plural "Encrypted %d messages."
 msgstr[0] "krüpteeritud kasutades %lu parooli\n"
 msgstr[1] "krüpteeritud kasutades %lu parooli\n"
 
-#: g10/tofu.c:1834
+#: g10/tofu.c:1836
 #, fuzzy, c-format
 msgid "Verified %d message in the future."
 msgid_plural "Verified %d messages in the future."
 msgstr[0] "|algo [failid]|trüki teatelühendid"
 msgstr[1] "|algo [failid]|trüki teatelühendid"
 
-#: g10/tofu.c:1838
+#: g10/tofu.c:1840
 #, fuzzy, c-format
 msgid "Encrypted %d message in the future."
 msgid_plural "Encrypted %d messages in the future."
 msgstr[0] "|algo [failid]|trüki teatelühendid"
 msgstr[1] "|algo [failid]|trüki teatelühendid"
 
-#: g10/tofu.c:1852
+#: g10/tofu.c:1854
 #, c-format
 msgid "Messages verified over the past %d day: %d."
 msgid_plural "Messages verified over the past %d days: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1858
+#: g10/tofu.c:1860
 #, c-format
 msgid "Messages encrypted over the past %d day: %d."
 msgid_plural "Messages encrypted over the past %d days: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1868
+#: g10/tofu.c:1870
 #, c-format
 msgid "Messages verified over the past %d month: %d."
 msgid_plural "Messages verified over the past %d months: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1874
+#: g10/tofu.c:1876
 #, c-format
 msgid "Messages encrypted over the past %d month: %d."
 msgid_plural "Messages encrypted over the past %d months: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1884
+#: g10/tofu.c:1886
 #, c-format
 msgid "Messages verified over the past %d year: %d."
 msgid_plural "Messages verified over the past %d years: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1890
+#: g10/tofu.c:1892
 #, c-format
 msgid "Messages encrypted over the past %d year: %d."
 msgid_plural "Messages encrypted over the past %d years: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1898
+#: g10/tofu.c:1900
 #, c-format
 msgid "Messages verified in the past: %d."
 msgstr ""
 
-#: g10/tofu.c:1902
+#: g10/tofu.c:1904
 #, fuzzy, c-format
 msgid "Messages encrypted in the past: %d."
 msgstr "|algo [failid]|trüki teatelühendid"
@@ -7867,130 +7880,130 @@ msgstr "|algo [failid]|trüki teatelühendid"
 #. TRANSLATORS: Please translate the text found in the source
 #. * file below.  We don't directly internationalize that text so
 #. * that we can tweak it without breaking translations.
-#: g10/tofu.c:1919
+#: g10/tofu.c:1921
 msgid "TOFU detected a binding conflict"
 msgstr ""
 
 #. TRANSLATORS: Two letters (normally the lower and upper case
 #. * version of the hotkey) for each of the five choices.  If
 #. * there is only one choice in your language, repeat it.
-#: g10/tofu.c:1961
+#: g10/tofu.c:1963
 msgid "gGaAuUrRbB"
 msgstr ""
 
-#: g10/tofu.c:1967
+#: g10/tofu.c:1969
 msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 
-#: g10/tofu.c:1975
+#: g10/tofu.c:1978
 msgid "Defaulting to unknown.\n"
 msgstr ""
 
-#: g10/tofu.c:2093 g10/tofu.c:2228
+#: g10/tofu.c:2097 g10/tofu.c:2232
 #, c-format
 msgid "TOFU db corruption detected.\n"
 msgstr ""
 
-#: g10/tofu.c:2829
+#: g10/tofu.c:2833
 #, fuzzy, c-format
 msgid "error changing TOFU policy: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: g10/tofu.c:2880
+#: g10/tofu.c:2884
 #, c-format
 msgid "%lld~year"
 msgid_plural "%lld~years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2885
+#: g10/tofu.c:2889
 #, c-format
 msgid "%lld~month"
 msgid_plural "%lld~months"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2890
+#: g10/tofu.c:2894
 #, c-format
 msgid "%lld~week"
 msgid_plural "%lld~weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2895
+#: g10/tofu.c:2899
 #, c-format
 msgid "%lld~day"
 msgid_plural "%lld~days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2900
+#: g10/tofu.c:2904
 #, c-format
 msgid "%lld~hour"
 msgid_plural "%lld~hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2905
+#: g10/tofu.c:2909
 #, c-format
 msgid "%lld~minute"
 msgid_plural "%lld~minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2907
+#: g10/tofu.c:2911
 #, c-format
 msgid "%lld~second"
 msgid_plural "%lld~seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:3145
+#: g10/tofu.c:3149
 #, c-format
 msgid "%s: Verified 0~signatures and encrypted 0~messages."
 msgstr ""
 
-#: g10/tofu.c:3151
+#: g10/tofu.c:3155
 #, fuzzy, c-format
 #| msgid "Deleted %d signatures.\n"
 msgid "%s: Verified 0 signatures."
 msgstr "Kustutatud %d allkirja.\n"
 
-#: g10/tofu.c:3165
+#: g10/tofu.c:3169
 #, fuzzy
 #| msgid "encrypted with %lu passphrases\n"
 msgid "Encrypted 0 messages."
 msgstr "krüpteeritud kasutades %lu parooli\n"
 
-#: g10/tofu.c:3181
+#: g10/tofu.c:3185
 #, fuzzy, c-format
 #| msgid "Policy: "
 msgid "(policy: %s)"
 msgstr "Poliis: "
 
-#: g10/tofu.c:3215
+#: g10/tofu.c:3219
 #, c-format
 msgid ""
 "Warning: we have yet to see a message signed using this key and user id!\n"
 msgstr ""
 
-#: g10/tofu.c:3218
+#: g10/tofu.c:3222
 #, c-format
 msgid ""
 "Warning: we've only seen one message signed using this key and user id!\n"
 msgstr ""
 
-#: g10/tofu.c:3222
+#: g10/tofu.c:3226
 #, c-format
 msgid "Warning: you have yet to encrypt a message to this key!\n"
 msgstr ""
 
-#: g10/tofu.c:3225
+#: g10/tofu.c:3229
 #, c-format
 msgid "Warning: you have only encrypted one message to this key!\n"
 msgstr ""
 
-#: g10/tofu.c:3254
+#: g10/tofu.c:3258
 #, c-format
 msgid ""
 "Warning: if you think you've seen more signatures by this key and user id, "
@@ -8007,13 +8020,13 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:3339 g10/tofu.c:3502 g10/tofu.c:3708 g10/tofu.c:3761
-#: g10/tofu.c:3902 g10/tofu.c:3979 g10/tofu.c:4017
+#: g10/tofu.c:3343 g10/tofu.c:3506 g10/tofu.c:3712 g10/tofu.c:3765
+#: g10/tofu.c:3906 g10/tofu.c:3983 g10/tofu.c:4021
 #, fuzzy, c-format
 msgid "error opening TOFU database: %s\n"
 msgstr "viga teate saatmisel serverile `%s': %s\n"
 
-#: g10/tofu.c:3535
+#: g10/tofu.c:3539
 #, c-format
 msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
 msgstr ""
@@ -8079,7 +8092,7 @@ msgstr ""
 msgid "no need for a trustdb check\n"
 msgstr "trustdb kontrolliks puudub vajadus\n"
 
-#: g10/trustdb.c:601 g10/trustdb.c:2272
+#: g10/trustdb.c:601 g10/trustdb.c:2273
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "trustdb järgmine kontroll %s\n"
@@ -8109,14 +8122,14 @@ msgstr "palun tehke --check-trustdb\n"
 msgid "checking the trustdb\n"
 msgstr "kontrollin trustdb faili\n"
 
-#: g10/trustdb.c:1993
+#: g10/trustdb.c:1994
 #, fuzzy, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr[0] "%lu võtit on seni töödeldud\n"
 msgstr[1] "%lu võtit on seni töödeldud\n"
 
-#: g10/trustdb.c:1996
+#: g10/trustdb.c:1997
 #, fuzzy, c-format
 #| msgid "%d keys processed (%d validity counts cleared)\n"
 msgid " (%d validity count cleared)\n"
@@ -8124,45 +8137,45 @@ msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] "%d võtit töödeldud (%d kehtivust puhastatud)\n"
 msgstr[1] "%d võtit töödeldud (%d kehtivust puhastatud)\n"
 
-#: g10/trustdb.c:2066
+#: g10/trustdb.c:2067
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "absoluutselt usaldatavaid võtmeid pole\n"
 
-#: g10/trustdb.c:2080
+#: g10/trustdb.c:2081
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "puudub absoluutselt usaldatava võtme %08lX avalik võti\n"
 
-#: g10/trustdb.c:2198
+#: g10/trustdb.c:2199
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2279
+#: g10/trustdb.c:2280
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "usalduse kirje %lu, tüüp %d: kirjutamine ebaõnnestus: %s\n"
 
-#: g10/trust.c:125
+#: g10/trust.c:114
 msgid "undefined"
 msgstr ""
 
-#: g10/trust.c:126
+#: g10/trust.c:115
 #, fuzzy
 msgid "never"
 msgstr "mitte kunagi"
 
-#: g10/trust.c:127
+#: g10/trust.c:116
 msgid "marginal"
 msgstr ""
 
-#: g10/trust.c:128
+#: g10/trust.c:117
 msgid "full"
 msgstr ""
 
-#: g10/trust.c:129
+#: g10/trust.c:118
 msgid "ultimate"
 msgstr ""
 
@@ -8174,43 +8187,43 @@ msgstr ""
 #. It gets passed to atoi() so everything after the number is
 #. essentially a comment and need not be translated.  Either key and
 #. uid are both NULL, or neither are NULL.
-#: g10/trust.c:166
+#: g10/trust.c:155
 msgid "10 translator see trust.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trust.c:169
+#: g10/trust.c:158
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[tühistatud] "
 
-#: g10/trust.c:171 g10/trust.c:177
+#: g10/trust.c:160 g10/trust.c:166
 #, fuzzy
 msgid "[ expired]"
 msgstr "[aegunud] "
 
-#: g10/trust.c:176
+#: g10/trust.c:165
 #, fuzzy
 msgid "[ unknown]"
 msgstr "tundmatu"
 
-#: g10/trust.c:178
+#: g10/trust.c:167
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trust.c:179
+#: g10/trust.c:168
 #, fuzzy
 msgid "[  never ]"
 msgstr "mitte kunagi"
 
-#: g10/trust.c:180
+#: g10/trust.c:169
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trust.c:181
+#: g10/trust.c:170
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trust.c:182
+#: g10/trust.c:171
 msgid "[ultimate]"
 msgstr ""
 
@@ -8269,16 +8282,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:4937 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2386
+#: scd/app-piv.c:1770 scd/app-p15.c:5035 scd/app-nks.c:1530
+#: scd/app-openpgp.c:2387
 #, 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:4956 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2402
+#: scd/app-piv.c:1787 scd/app-p15.c:5054 scd/app-nks.c:1549
+#: scd/app-openpgp.c:2403
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
@@ -8313,10 +8326,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:2669
-#: scd/app-openpgp.c:2693 scd/app-openpgp.c:2871 scd/app-openpgp.c:2893
-#: scd/app-openpgp.c:3074 scd/app-openpgp.c:3361 scd/app-openpgp.c:3408
-#: scd/app-openpgp.c:3545 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2670
+#: scd/app-openpgp.c:2694 scd/app-openpgp.c:2872 scd/app-openpgp.c:2894
+#: scd/app-openpgp.c:3075 scd/app-openpgp.c:3362 scd/app-openpgp.c:3409
+#: scd/app-openpgp.c:3547 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -8336,96 +8349,96 @@ msgstr ""
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr ""
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3616
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3618
 #, fuzzy, c-format
 msgid "key already exists\n"
 msgstr "`%s' on juba pakitud\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3620
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3622
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3622
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3624
 #, fuzzy, c-format
 msgid "generating new key\n"
 msgstr "genereeri uus võtmepaar"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3624
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3626
 #, fuzzy, c-format
 msgid "writing new key\n"
 msgstr "genereeri uus võtmepaar"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4484 scd/app-openpgp.c:4767
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4486 scd/app-openpgp.c:4761
 #, 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:1615
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1616
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1622
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1623
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1732
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1733
 #, 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:4943
+#: scd/app-piv.c:3279 scd/app-openpgp.c:4937
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4951
+#: scd/app-piv.c:3294 scd/app-openpgp.c:4945
 #, 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:4957
+#: scd/app-piv.c:3300 scd/app-openpgp.c:4951
 #, 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:1842 scd/app-openpgp.c:4966
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1843 scd/app-openpgp.c:4960
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-p15.c:5035 scd/app-nks.c:2038
+#: scd/app-p15.c:5133 scd/app-nks.c:2038
 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:5038 scd/app-openpgp.c:2818
+#: scd/app-p15.c:5136 scd/app-openpgp.c:2819
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "muuda parooli"
 
-#: scd/app-p15.c:5040 scd/app-nks.c:2028
+#: scd/app-p15.c:5138 scd/app-nks.c:2028
 #, 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:5043 scd/app-nks.c:2019
+#: scd/app-p15.c:5141 scd/app-nks.c:2019
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "muuda parooli"
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4321
+#: scd/app-nks.c:1468 scd/app-openpgp.c:4323
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1476 scd/app-openpgp.c:4333
+#: scd/app-nks.c:1476 scd/app-openpgp.c:4335
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
@@ -8467,27 +8480,27 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3442 scd/app-dinsig.c:534
+#: scd/app-nks.c:2221 scd/app-openpgp.c:3443 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:943
+#: scd/app-openpgp.c:944
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
 
-#: scd/app-openpgp.c:956
+#: scd/app-openpgp.c:957
 #, 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:1427 scd/app-openpgp.c:3389 scd/app-openpgp.c:5715
+#: scd/app-openpgp.c:1428 scd/app-openpgp.c:3390 scd/app-openpgp.c:5709
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1949
+#: scd/app-openpgp.c:1950
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
@@ -8495,43 +8508,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:2373
+#: scd/app-openpgp.c:2374
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2621
+#: scd/app-openpgp.c:2622
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2628
+#: scd/app-openpgp.c:2629
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2641
+#: scd/app-openpgp.c:2642
 #, fuzzy
 msgid "||Please unlock the card"
 msgstr "muuda parooli"
 
-#: scd/app-openpgp.c:2700 scd/app-openpgp.c:2900 scd/app-openpgp.c:3368
+#: scd/app-openpgp.c:2701 scd/app-openpgp.c:2901 scd/app-openpgp.c:3369
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2717 scd/app-openpgp.c:2760 scd/app-openpgp.c:2917
-#: scd/app-openpgp.c:5325
+#: scd/app-openpgp.c:2718 scd/app-openpgp.c:2761 scd/app-openpgp.c:2918
+#: scd/app-openpgp.c:5319
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "võtmeserverile saatmine ebaõnnestus: %s\n"
 
-#: scd/app-openpgp.c:2804 scd/app-openpgp.c:5724
+#: scd/app-openpgp.c:2805 scd/app-openpgp.c:5718
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2808
+#: scd/app-openpgp.c:2809
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8539,22 +8552,22 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: scd/app-openpgp.c:2841
+#: scd/app-openpgp.c:2842
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3355
+#: scd/app-openpgp.c:3356
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "muuda parooli"
 
-#: scd/app-openpgp.c:3404
+#: scd/app-openpgp.c:3405
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Palun valige tühistamise põhjus:\n"
 
-#: scd/app-openpgp.c:3414 scd/app-openpgp.c:3481
+#: scd/app-openpgp.c:3415 scd/app-openpgp.c:3484
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
@@ -8562,81 +8575,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:3437
+#: scd/app-openpgp.c:3438
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3439
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3439
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3541
+#: scd/app-openpgp.c:3543
 #, fuzzy
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "muuda parooli"
 
-#: scd/app-openpgp.c:3542
+#: scd/app-openpgp.c:3544
 #, fuzzy
 msgid "||Please enter the PIN and New PIN"
 msgstr "muuda parooli"
 
-#: scd/app-openpgp.c:3600 scd/app-openpgp.c:5026
+#: scd/app-openpgp.c:3602 scd/app-openpgp.c:5020
 #, fuzzy, c-format
 msgid "error reading application data\n"
 msgstr "viga võtmebloki lugemisel: %s\n"
 
-#: scd/app-openpgp.c:3606 scd/app-openpgp.c:5033
+#: scd/app-openpgp.c:3608 scd/app-openpgp.c:5027
 #, fuzzy, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "%s: viga vaba kirje lugemisel: %s\n"
 
-#: scd/app-openpgp.c:4302 scd/app-openpgp.c:4657
+#: scd/app-openpgp.c:4304 scd/app-openpgp.c:4653
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4343 scd/app-openpgp.c:4351
+#: scd/app-openpgp.c:4345 scd/app-openpgp.c:4353
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4651
+#: scd/app-openpgp.c:4647
 #, fuzzy, c-format
 #| msgid "unsupported URI"
 msgid "unsupported curve\n"
 msgstr "mittetoetatud URI"
 
-#: scd/app-openpgp.c:4991
+#: scd/app-openpgp.c:4985
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5041
+#: scd/app-openpgp.c:5035
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5240
+#: scd/app-openpgp.c:5234
 #, 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:5298
+#: scd/app-openpgp.c:5292
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5729
+#: scd/app-openpgp.c:5723
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:6241 scd/app-openpgp.c:6252
+#: scd/app-openpgp.c:6250 scd/app-openpgp.c:6261
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "ei leia OpenPGP andmeid.\n"
@@ -8657,7 +8670,7 @@ msgstr ""
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:274 dirmngr/dirmngr.c:198
+#: scd/scdaemon.c:136 sm/gpgsm.c:274 dirmngr/dirmngr.c:199
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
@@ -8722,12 +8735,12 @@ msgstr ""
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2104
+#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2143
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2112
+#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2151
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -8737,11 +8750,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:199 sm/certchain.c:2172
+#: sm/certchain.c:199 sm/certchain.c:2174
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:200 sm/certchain.c:2172
+#: sm/certchain.c:200 sm/certchain.c:2174
 #, fuzzy
 msgid "shell"
 msgstr "help"
@@ -8775,231 +8788,231 @@ msgstr "kirjutan salajase võtme faili `%s'\n"
 msgid "certificate policy not allowed"
 msgstr "kirjutan salajase võtme faili `%s'\n"
 
-#: sm/certchain.c:595 sm/keydb.c:1891 sm/keydb.c:1980
+#: sm/certchain.c:596 sm/keydb.c:1913 sm/keydb.c:2002
 #, fuzzy, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
 
-#: sm/certchain.c:624
+#: sm/certchain.c:625
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:644
+#: sm/certchain.c:645
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#: sm/certchain.c:724 dirmngr/ocsp.c:683
 #, fuzzy, c-format
 #| msgid "%s: can't access: %s\n"
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "%s: ei õnnestu kasutada: %s\n"
 
-#: sm/certchain.c:791
+#: sm/certchain.c:792
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr ""
 
-#: sm/certchain.c:816
+#: sm/certchain.c:817
 #, fuzzy, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: sm/certchain.c:819
+#: sm/certchain.c:820
 #, fuzzy, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
 
-#: sm/certchain.c:1046 sm/certchain.c:1561 sm/certchain.c:2200 sm/decrypt.c:643
-#: sm/encrypt.c:620 sm/import.c:414 sm/keydb.c:1898 sm/keydb.c:1987
-#: sm/sign.c:428 sm/verify.c:117
+#: sm/certchain.c:1047 sm/certchain.c:1562 sm/certchain.c:2202
+#: sm/decrypt.c:1084 sm/encrypt.c:621 sm/import.c:414 sm/keydb.c:1920
+#: sm/keydb.c:2009 sm/sign.c:428 sm/verify.c:117
 #, fuzzy, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
 
-#: sm/certchain.c:1232
+#: sm/certchain.c:1233
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "MÄRKUS: võti on tühistatud"
 
-#: sm/certchain.c:1247
+#: sm/certchain.c:1248
 msgid "the status of the certificate is unknown"
 msgstr ""
 
-#: sm/certchain.c:1254
+#: sm/certchain.c:1255
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:1260
+#: sm/certchain.c:1261
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
 
-#: sm/certchain.c:1289 sm/certchain.c:1357 dirmngr/validate.c:497
+#: sm/certchain.c:1290 sm/certchain.c:1358 dirmngr/validate.c:497
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:1304 sm/certchain.c:1389 dirmngr/validate.c:515
+#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:515
 #, c-format
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1305 sm/certchain.c:1390
+#: sm/certchain.c:1306 sm/certchain.c:1391
 #, fuzzy
 msgid "root certificate not yet valid"
 msgstr "kirjutan salajase võtme faili `%s'\n"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1307 sm/certchain.c:1392
 msgid "intermediate certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1319 dirmngr/validate.c:526
+#: sm/certchain.c:1320 dirmngr/validate.c:526
 #, fuzzy, c-format
 msgid "certificate has expired"
 msgstr "See võti on aegunud!"
 
-#: sm/certchain.c:1320
+#: sm/certchain.c:1321
 #, fuzzy
 msgid "root certificate has expired"
 msgstr "See võti on aegunud!"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1322
 #, fuzzy
 msgid "intermediate certificate has expired"
 msgstr "See võti on aegunud!"
 
-#: sm/certchain.c:1363
+#: sm/certchain.c:1364
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:1372
+#: sm/certchain.c:1373
 #, fuzzy
 msgid "certificate with invalid validity"
 msgstr "See võti on aegunud!"
 
-#: sm/certchain.c:1409
+#: sm/certchain.c:1410
 msgid "signature not created during lifetime of certificate"
 msgstr ""
 
-#: sm/certchain.c:1411
+#: sm/certchain.c:1412
 msgid "certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1413
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1416
+#: sm/certchain.c:1417
 #, fuzzy, c-format
 msgid "  (  signature created at "
 msgstr "         uusi allkirju: %lu\n"
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1418
 #, fuzzy, c-format
 msgid "  (certificate created at "
 msgstr "Tühistamise sertifikaat on loodud.\n"
 
-#: sm/certchain.c:1420
+#: sm/certchain.c:1421
 #, fuzzy, c-format
 msgid "  (certificate valid from "
 msgstr "halb sertifikaat"
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1422
 #, c-format
 msgid "  (     issuer valid from "
 msgstr ""
 
-#: sm/certchain.c:1451 dirmngr/validate.c:577
+#: sm/certchain.c:1452 dirmngr/validate.c:577
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "näita sõrmejälge"
 
-#: sm/certchain.c:1460
+#: sm/certchain.c:1461
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:1473
+#: sm/certchain.c:1474
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1479
+#: sm/certchain.c:1480
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1538
+#: sm/certchain.c:1539
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 
-#: sm/certchain.c:1602
+#: sm/certchain.c:1603
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "genereeri tühistamise sertifikaat"
 
-#: sm/certchain.c:1680
+#: sm/certchain.c:1681
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1749 dirmngr/validate.c:575
+#: sm/certchain.c:1750 dirmngr/validate.c:575
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:1765
+#: sm/certchain.c:1766
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
 
-#: sm/certchain.c:1796 sm/import.c:175 dirmngr/validate.c:630
+#: sm/certchain.c:1797 sm/import.c:175 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1808 dirmngr/validate.c:642
+#: sm/certchain.c:1809 dirmngr/validate.c:642
 #, c-format
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1842 dirmngr/validate.c:668
+#: sm/certchain.c:1844 dirmngr/validate.c:668
 #, fuzzy, c-format
 msgid "certificate has a BAD signature"
 msgstr "kontrolli allkirja"
 
-#: sm/certchain.c:1874 dirmngr/validate.c:692
+#: sm/certchain.c:1876 dirmngr/validate.c:692
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1933 dirmngr/validate.c:717
+#: sm/certchain.c:1935 dirmngr/validate.c:717
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1975 sm/certchain.c:2275 dirmngr/validate.c:747
+#: sm/certchain.c:1977 sm/certchain.c:2278 dirmngr/validate.c:747
 #, fuzzy, c-format
 msgid "certificate is good\n"
 msgstr "eelistus %c%lu on duplikaat\n"
 
-#: sm/certchain.c:1976
+#: sm/certchain.c:1978
 #, fuzzy, c-format
 msgid "intermediate certificate is good\n"
 msgstr "Tühistamise sertifikaat on loodud.\n"
 
-#: sm/certchain.c:1977
+#: sm/certchain.c:1979
 #, fuzzy, c-format
 msgid "root certificate is good\n"
 msgstr "halb sertifikaat"
 
-#: sm/certchain.c:2159
+#: sm/certchain.c:2161
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:2168
+#: sm/certchain.c:2170
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -9010,18 +9023,18 @@ 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:1372 dirmngr/validate.c:903
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1411 dirmngr/validate.c:903
 #: dirmngr/validate.c:927
 #, fuzzy, c-format
 msgid "out of core\n"
 msgstr "ei töödeldud"
 
-#: sm/certcheck.c:389 sm/verify.c:212
+#: sm/certcheck.c:388 sm/verify.c:212
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:793
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:794
 #, fuzzy
 msgid "none"
 msgstr "ei"
@@ -9318,17 +9331,17 @@ msgstr ""
 msgid "resource problem: out of core\n"
 msgstr ""
 
-#: sm/decrypt.c:719
+#: sm/decrypt.c:1159
 #, c-format
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
 
-#: sm/decrypt.c:721
+#: sm/decrypt.c:1161
 #, c-format
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr ""
 
-#: sm/decrypt.c:868
+#: sm/decrypt.c:1318
 #, fuzzy, c-format
 msgid "encrypted to %s key %s\n"
 msgstr "krüpteeritud %s võtmega, ID %08lX\n"
@@ -9338,7 +9351,7 @@ msgstr "krüpteeritud %s võtmega, ID %08lX\n"
 msgid "certificate '%s' not found: %s\n"
 msgstr "võtit '%s' ei leitud: %s\n"
 
-#: sm/delete.c:120 sm/keydb.c:1999 sm/keydb.c:2098
+#: sm/delete.c:120 sm/keydb.c:2021 sm/keydb.c:2120
 #, fuzzy, c-format
 msgid "error locking keybox: %s\n"
 msgstr "viga võtmebloki lugemisel: %s\n"
@@ -9358,7 +9371,7 @@ msgstr "eelistus %c%lu on duplikaat\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
 
-#: sm/encrypt.c:606
+#: sm/encrypt.c:607
 #, fuzzy, c-format
 msgid "no valid recipients given\n"
 msgstr "(Kirjeldust ei antud)\n"
@@ -9434,68 +9447,68 @@ msgstr "|NIMI|kasuta NIME vaikimisi salajase võtmena"
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "lisa see võtmehoidla võtmehoidlate nimekirja"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:352 dirmngr/dirmngr.c:265
 #, fuzzy
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|HOST|kasuta seda võtmeserverit"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:363
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:364
+#: sm/gpgsm.c:365
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NIMI|kasuta paroolidega Å¡ifri algoritmi NIMI"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:386
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:389
+#: sm/gpgsm.c:390
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: sm/gpgsm.c:393
+#: sm/gpgsm.c:394
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:396
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:398
+#: sm/gpgsm.c:399
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NIMI|kasuta Å¡ifri algoritmi NIMI"
 
-#: sm/gpgsm.c:400
+#: sm/gpgsm.c:401
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NIMI|kasuta teatelühendi algoritmi NIMI"
 
-#: sm/gpgsm.c:410
+#: sm/gpgsm.c:411
 msgid "batch mode: never ask"
 msgstr "pakettmood: ära küsi kunagi"
 
-#: sm/gpgsm.c:412
+#: sm/gpgsm.c:413
 msgid "assume yes on most questions"
 msgstr "eelda enamus küsimustele jah vastust"
 
-#: sm/gpgsm.c:413
+#: sm/gpgsm.c:414
 msgid "assume no on most questions"
 msgstr "eelda enamus küsimustele ei vastust"
 
-#: sm/gpgsm.c:430
+#: sm/gpgsm.c:431
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-#: sm/gpgsm.c:615
+#: sm/gpgsm.c:616
 #, 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:618
+#: sm/gpgsm.c:619
 #, fuzzy
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
@@ -9506,52 +9519,27 @@ msgstr ""
 "allkirjasta, kontrolli, krüpti ja dekrüpti\n"
 "vaikimisi operatsioon sõltub sisendandmetest\n"
 
-#: sm/gpgsm.c:826
+#: sm/gpgsm.c:827
 #, 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:837
+#: sm/gpgsm.c:838
 #, fuzzy, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "tundmatu vaikimisi saaja `%s'\n"
 
-#: sm/gpgsm.c:896 dirmngr/ldapserver.c:89
-#, fuzzy, c-format
-msgid "%s:%u: no hostname given\n"
-msgstr "(Kirjeldust ei antud)\n"
-
-#: sm/gpgsm.c:915 dirmngr/ldapserver.c:108
-#, c-format
-msgid "%s:%u: password given without user\n"
-msgstr ""
-
-#: sm/gpgsm.c:946 dirmngr/ldapserver.c:139
-#, c-format
-msgid "%s:%u: ignoring unknown flag '%s'\n"
-msgstr ""
-
-#: sm/gpgsm.c:962 dirmngr/ldapserver.c:155
-#, fuzzy, c-format
-msgid "%s:%u: skipping this line\n"
-msgstr " j = jäta see võti vahele\n"
-
-#: sm/gpgsm.c:1550
-#, fuzzy, c-format
-msgid "could not parse keyserver\n"
-msgstr "ei saa parsida võtmeserveri URI\n"
-
-#: sm/gpgsm.c:1858
+#: sm/gpgsm.c:1711
 #, fuzzy, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "kirjutan faili `%s'\n"
 
-#: sm/gpgsm.c:1904
+#: sm/gpgsm.c:1757
 #, fuzzy, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "`%s' ei õnnestu sulgeda: %s\n"
 
-#: sm/gpgsm.c:2273
+#: sm/gpgsm.c:2129
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
@@ -9571,52 +9559,52 @@ msgstr "genereeri tühistamise sertifikaat"
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:471 sm/keydb.c:2018 sm/keydb.c:2111
+#: sm/import.c:472 sm/keydb.c:2040 sm/keydb.c:2133
 #, fuzzy, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: sm/import.c:530 sm/import.c:562
+#: sm/import.c:531 sm/import.c:563
 #, fuzzy, c-format
 msgid "error importing certificate: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: sm/import.c:751 tools/gpg-connect-agent.c:1475
+#: sm/import.c:752 tools/gpg-connect-agent.c:1475
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: sm/keydb.c:503
+#: sm/keydb.c:508
 #, fuzzy, c-format
 msgid "no keyboxd running in this session\n"
 msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
 
-#: sm/keydb.c:595
+#: sm/keydb.c:600
 #, fuzzy, c-format
 msgid "error opening key DB: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: sm/keydb.c:1936
+#: sm/keydb.c:1958
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1948
+#: sm/keydb.c:1970
 #, fuzzy, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: sm/keydb.c:1956
+#: sm/keydb.c:1978
 #, fuzzy, c-format
 msgid "error storing certificate: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: sm/keydb.c:2009
+#: sm/keydb.c:2031
 #, fuzzy, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "rev? probleem tühistamise kontrollimisel: %s\n"
 
-#: sm/keydb.c:2030 sm/keydb.c:2122
+#: sm/keydb.c:2052 sm/keydb.c:2144
 #, fuzzy, c-format
 msgid "error storing flags: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
@@ -9788,57 +9776,57 @@ msgstr ""
 msgid "error loading certificate '%s': %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: dirmngr/certcache.c:819
+#: dirmngr/certcache.c:820
 #, fuzzy, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "halb sertifikaat"
 
-#: dirmngr/certcache.c:821
+#: dirmngr/certcache.c:822
 #, fuzzy, c-format
 msgid "    runtime cached certificates: %u\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: dirmngr/certcache.c:823
+#: dirmngr/certcache.c:824
 #, fuzzy, c-format
 msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: dirmngr/certcache.c:851 dirmngr/dirmngr-client.c:392
+#: dirmngr/certcache.c:852 dirmngr/dirmngr-client.c:392
 #, fuzzy, c-format
 msgid "certificate already cached\n"
 msgstr "Tühistamise sertifikaat on loodud.\n"
 
-#: dirmngr/certcache.c:853
+#: dirmngr/certcache.c:854
 #, fuzzy, c-format
 msgid "certificate cached\n"
 msgstr "eelistus %c%lu on duplikaat\n"
 
-#: dirmngr/certcache.c:855 dirmngr/certcache.c:875 dirmngr/dirmngr-client.c:396
+#: dirmngr/certcache.c:856 dirmngr/certcache.c:876 dirmngr/dirmngr-client.c:396
 #, fuzzy, c-format
 msgid "error caching certificate: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: dirmngr/certcache.c:938
+#: dirmngr/certcache.c:939
 #, fuzzy, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "viga: vigane sõrmejälg\n"
 
-#: dirmngr/certcache.c:1384 dirmngr/certcache.c:1393
+#: dirmngr/certcache.c:1385 dirmngr/certcache.c:1394
 #, fuzzy, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: dirmngr/certcache.c:1579 dirmngr/certcache.c:1588
+#: dirmngr/certcache.c:1580 dirmngr/certcache.c:1589
 #, fuzzy, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: dirmngr/certcache.c:1694 dirmngr/validate.c:483
+#: dirmngr/certcache.c:1695 dirmngr/validate.c:483
 #, fuzzy, c-format
 msgid "no issuer found in certificate\n"
 msgstr "genereeri tühistamise sertifikaat"
 
-#: dirmngr/certcache.c:1704
+#: dirmngr/certcache.c:1705
 #, fuzzy, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "viga parooli loomisel: %s\n"
@@ -9875,7 +9863,7 @@ msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
 msgid "not removing file '%s'\n"
 msgstr "pakendamine ebaõnnestus: %s\n"
 
-#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2380
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2383
 #, fuzzy, c-format
 msgid "error closing cache file: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
@@ -10108,14 +10096,14 @@ msgid "error getting data from cache file: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
 #: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1672 dirmngr/crlcache.c:1697
-#: dirmngr/crlcache.c:1763
+#: dirmngr/crlcache.c:1766
 #, fuzzy, c-format
 #| msgid "invalid response from agent\n"
 msgid "got an invalid S-expression from libksba\n"
 msgstr "vigane vastus agendilt\n"
 
 #: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1679 dirmngr/crlcache.c:1705
-#: dirmngr/crlcache.c:1770 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1773 dirmngr/misc.c:176
 #, fuzzy, c-format
 msgid "converting S-expression failed: %s\n"
 msgstr "faili ei õnnestu avada: %s\n"
@@ -10131,201 +10119,201 @@ msgstr "vigane räsialgoritm `%s'\n"
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1797 dirmngr/ocsp.c:478
+#: dirmngr/crlcache.c:1800 dirmngr/ocsp.c:478
 #, fuzzy, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
 
-#: dirmngr/crlcache.c:1871
+#: dirmngr/crlcache.c:1874
 #, fuzzy, c-format
 #| msgid "build_packet failed: %s\n"
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "build_packet ebaõnnestus: %s\n"
 
-#: dirmngr/crlcache.c:1886
+#: dirmngr/crlcache.c:1889
 #, fuzzy, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: dirmngr/crlcache.c:1893
+#: dirmngr/crlcache.c:1896
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1897
+#: dirmngr/crlcache.c:1900
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1917
+#: dirmngr/crlcache.c:1920
 #, fuzzy, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: dirmngr/crlcache.c:1932
+#: dirmngr/crlcache.c:1935
 #, fuzzy, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "kirjutan faili `%s'\n"
 
-#: dirmngr/crlcache.c:1959
+#: dirmngr/crlcache.c:1962
 #, fuzzy, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "genereeri tühistamise sertifikaat"
 
-#: dirmngr/crlcache.c:1974
+#: dirmngr/crlcache.c:1977
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2020
+#: dirmngr/crlcache.c:2023
 #, fuzzy, c-format
 #| msgid "signature verification suppressed\n"
 msgid "CRL signature verification failed: %s\n"
 msgstr "allkirja kontroll jäeti ära\n"
 
-#: dirmngr/crlcache.c:2032
+#: dirmngr/crlcache.c:2035
 #, fuzzy, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
 
-#: dirmngr/crlcache.c:2174
+#: dirmngr/crlcache.c:2177
 #, fuzzy, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
 
-#: dirmngr/crlcache.c:2181
+#: dirmngr/crlcache.c:2184
 #, fuzzy, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "uuendamine ebaõnnestus: %s\n"
 
-#: dirmngr/crlcache.c:2215
+#: dirmngr/crlcache.c:2218
 #, fuzzy, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "kataloogi `%s' ei õnnestu luua: %s\n"
 
-#: dirmngr/crlcache.c:2219
+#: dirmngr/crlcache.c:2222
 #, fuzzy, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "kataloogi `%s' ei õnnestu luua: %s\n"
 
-#: dirmngr/crlcache.c:2229
+#: dirmngr/crlcache.c:2232
 #, fuzzy, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: dirmngr/crlcache.c:2239
+#: dirmngr/crlcache.c:2242
 #, fuzzy, c-format
 #| msgid "update secret failed: %s\n"
 msgid "crl_parse_insert failed: %s\n"
 msgstr "salajase võtme uuendamine ebaõnnestus: %s\n"
 
-#: dirmngr/crlcache.c:2249
+#: dirmngr/crlcache.c:2252
 #, fuzzy, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "kirjutan faili `%s'\n"
 
-#: dirmngr/crlcache.c:2256
+#: dirmngr/crlcache.c:2259
 #, fuzzy, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: dirmngr/crlcache.c:2281
+#: dirmngr/crlcache.c:2284
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2285
+#: dirmngr/crlcache.c:2288
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2301
+#: dirmngr/crlcache.c:2304
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2311
+#: dirmngr/crlcache.c:2314
 #, fuzzy, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2365
 #, fuzzy, c-format
 msgid "creating cache file '%s'\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: dirmngr/crlcache.c:2394
+#: dirmngr/crlcache.c:2397
 #, fuzzy, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "pakendamine ebaõnnestus: %s\n"
 
-#: dirmngr/crlcache.c:2408
+#: dirmngr/crlcache.c:2411
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
 "program start\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2448
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2468
+#: dirmngr/crlcache.c:2471
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2471
+#: dirmngr/crlcache.c:2474
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2474
+#: dirmngr/crlcache.c:2477
 msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2481
+#: dirmngr/crlcache.c:2484
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2499
+#: dirmngr/crlcache.c:2502
 #, fuzzy, c-format
 #| msgid "WARNING: invalid size of random_seed file - not used\n"
 msgid " WARNING: invalid cache record length\n"
 msgstr "HOIATUS: vigane random_seed faili suurus - ei kasuta\n"
 
-#: dirmngr/crlcache.c:2506
+#: dirmngr/crlcache.c:2509
 #, fuzzy, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "%s: viga vaba kirje lugemisel: %s\n"
 
-#: dirmngr/crlcache.c:2517
+#: dirmngr/crlcache.c:2520
 #, fuzzy, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "rev? probleem tühistamise kontrollimisel: %s\n"
 
-#: dirmngr/crlcache.c:2548
+#: dirmngr/crlcache.c:2551
 #, fuzzy, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: dirmngr/crlcache.c:2551
+#: dirmngr/crlcache.c:2554
 msgid "End CRL dump\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2672
+#: dirmngr/crlcache.c:2675
 #, fuzzy, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "uuendamine ebaõnnestus: %s\n"
 
-#: dirmngr/crlcache.c:2683
+#: dirmngr/crlcache.c:2686
 #, fuzzy, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
 
-#: dirmngr/crlcache.c:2743
+#: dirmngr/crlcache.c:2746
 #, fuzzy, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
@@ -10346,7 +10334,7 @@ msgstr ""
 msgid "error retrieving '%s': %s\n"
 msgstr "viga `%s' loomisel: %s\n"
 
-#: dirmngr/crlfetch.c:218 dirmngr/ldap-wrapper.c:881 dirmngr/misc.c:573
+#: dirmngr/crlfetch.c:218 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
 #, fuzzy, c-format
 #| msgid "%s: error writing dir record: %s\n"
 msgid "error initializing reader object: %s\n"
@@ -10514,135 +10502,135 @@ msgstr ""
 msgid "looking up '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:175
+#: dirmngr/dirmngr.c:176
 msgid "list the contents of the CRL cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:176
+#: dirmngr/dirmngr.c:177
 #, fuzzy
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-#: dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr.c:178
 msgid "|URL|fetch a CRL from URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:178
+#: dirmngr/dirmngr.c:179
 msgid "shutdown the dirmngr"
 msgstr ""
 
-#: dirmngr/dirmngr.c:179
+#: dirmngr/dirmngr.c:180
 msgid "flush the cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:213
 msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:215
+#: dirmngr/dirmngr.c:216
 msgid "|N|do not return more than N items in one query"
 msgstr ""
 
-#: dirmngr/dirmngr.c:221
+#: dirmngr/dirmngr.c:222
 msgid "Network related options"
 msgstr ""
 
-#: dirmngr/dirmngr.c:223
+#: dirmngr/dirmngr.c:224
 msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:235
+#: dirmngr/dirmngr.c:236
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:238
+#: dirmngr/dirmngr.c:239
 #, fuzzy
 msgid "|URL|use keyserver at URL"
 msgstr "ei saa parsida võtmeserveri URI\n"
 
-#: dirmngr/dirmngr.c:240
+#: dirmngr/dirmngr.c:241
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-#: dirmngr/dirmngr.c:242
+#: dirmngr/dirmngr.c:243
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:244
+#: dirmngr/dirmngr.c:245
 msgid "inhibit the use of HTTP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:246
+#: dirmngr/dirmngr.c:247
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:248
+#: dirmngr/dirmngr.c:249
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:250
+#: dirmngr/dirmngr.c:251
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: dirmngr/dirmngr.c:254
+#: dirmngr/dirmngr.c:255
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: dirmngr/dirmngr.c:256
+#: dirmngr/dirmngr.c:257
 msgid "inhibit the use of LDAP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:258
+#: dirmngr/dirmngr.c:259
 msgid "ignore LDAP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:260
+#: dirmngr/dirmngr.c:261
 msgid "|HOST|use HOST for LDAP queries"
 msgstr ""
 
-#: dirmngr/dirmngr.c:262
+#: dirmngr/dirmngr.c:263
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr ""
 
-#: dirmngr/dirmngr.c:264
+#: dirmngr/dirmngr.c:267
 #, fuzzy
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-#: dirmngr/dirmngr.c:266
+#: dirmngr/dirmngr.c:269
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 
-#: dirmngr/dirmngr.c:269 dirmngr/dirmngr_ldap.c:104
+#: dirmngr/dirmngr.c:272
 msgid "|N|set LDAP timeout to N seconds"
 msgstr ""
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:275
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:274
+#: dirmngr/dirmngr.c:277
 msgid "allow sending OCSP requests"
 msgstr ""
 
-#: dirmngr/dirmngr.c:276
+#: dirmngr/dirmngr.c:279
 msgid "ignore certificate contained OCSP service URLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:278
+#: dirmngr/dirmngr.c:281
 #, fuzzy
 msgid "|URL|use OCSP responder at URL"
 msgstr "ei saa parsida võtmeserveri URI\n"
 
-#: dirmngr/dirmngr.c:280
+#: dirmngr/dirmngr.c:283
 msgid "|FPR|OCSP response signed by FPR"
 msgstr ""
 
-#: dirmngr/dirmngr.c:288
+#: dirmngr/dirmngr.c:291
 msgid "force loading of outdated CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:299
+#: dirmngr/dirmngr.c:302
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -10655,304 +10643,115 @@ msgstr ""
 "@\n"
 "(Kõikide käskude ja võtmete täieliku kirjelduse leiate manualist)\n"
 
-#: dirmngr/dirmngr.c:441
+#: dirmngr/dirmngr.c:449
 #, fuzzy
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
 
-#: dirmngr/dirmngr.c:443
+#: dirmngr/dirmngr.c:451
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:523
+#: dirmngr/dirmngr.c:531
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:609 tools/gpgconf.c:667 tools/gpgconf.c:702
-#: tools/gpgconf.c:802
+#: dirmngr/dirmngr.c:617 tools/gpgconf.c:701 tools/gpgconf.c:736
+#: tools/gpgconf.c:836
 #, fuzzy, c-format
 msgid "usage: %s [options] "
 msgstr "kasuta: gpg [võtmed] "
 
-#: dirmngr/dirmngr.c:1260
+#: dirmngr/dirmngr.c:1299
 #, 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:1495 dirmngr/server.c:1824
+#: dirmngr/dirmngr.c:1534 dirmngr/server.c:1878
 #, fuzzy, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "pakendamine ebaõnnestus: %s\n"
 
-#: dirmngr/dirmngr.c:1501 dirmngr/server.c:1830
+#: dirmngr/dirmngr.c:1540 dirmngr/server.c:1884
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "pakendamine ebaõnnestus: %s\n"
 
-#: dirmngr/dirmngr.c:1643
+#: dirmngr/dirmngr.c:1682
 #, fuzzy, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "rida on liiga pikk\n"
 
-#: dirmngr/dirmngr.c:1698 dirmngr/dirmngr.c:1782
+#: dirmngr/dirmngr.c:1737 dirmngr/dirmngr.c:1821
 #, fuzzy, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "viga: vigane sõrmejälg\n"
 
-#: dirmngr/dirmngr.c:1734 dirmngr/dirmngr.c:1760 tools/gpgconf-comp.c:3539
+#: dirmngr/dirmngr.c:1773 dirmngr/dirmngr.c:1799 tools/gpgconf-comp.c:3549
 #, fuzzy, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "viga lugemisel: %s\n"
 
-#: dirmngr/dirmngr.c:1789
+#: dirmngr/dirmngr.c:1828
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1876
+#: dirmngr/dirmngr.c:1915
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1917
+#: dirmngr/dirmngr.c:1956
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1922
+#: dirmngr/dirmngr.c:1961
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1924
+#: dirmngr/dirmngr.c:1963
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1929
+#: dirmngr/dirmngr.c:1968
 #, fuzzy, c-format
 msgid "shutdown forced\n"
 msgstr "ei töödeldud"
 
-#: dirmngr/dirmngr.c:1937
+#: dirmngr/dirmngr.c:1976
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1944
+#: dirmngr/dirmngr.c:1983
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:105
-msgid "return all values in a record oriented format"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:108
-msgid "|NAME|ignore host part and connect through NAME"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:109
-msgid "force a TLS connection"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:110
-#, fuzzy
-#| msgid "|NAME|set terminal charset to NAME"
-msgid "|NAME|connect to host NAME"
-msgstr "|NIMI|terminali kooditabel on NIMI"
-
-#: dirmngr/dirmngr_ldap.c:111
-msgid "|N|connect to port N"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:112
-#, fuzzy
-#| msgid "|NAME|use NAME as default recipient"
-msgid "|NAME|use user NAME for authentication"
-msgstr "|NIMI|kasuta NIME vaikimisi saajana"
-
-#: dirmngr/dirmngr_ldap.c:113
-msgid "|PASS|use password PASS for authentication"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:115
-msgid "take password from $DIRMNGR_LDAP_PASS"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:116
-msgid "|STRING|query DN STRING"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:117
-msgid "|STRING|use STRING as filter expression"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:118
-msgid "|STRING|return the attribute STRING"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:179
-#, fuzzy
-#| msgid "Usage: gpg [options] [files] (-h for help)"
-msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
-msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
-
-#: dirmngr/dirmngr_ldap.c:182
-msgid ""
-"Syntax: dirmngr_ldap [options] [URL]\n"
-"Internal LDAP helper for Dirmngr\n"
-"Interface and options may change without notice\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:291
-#, fuzzy, c-format
-#| msgid "invalid import options\n"
-msgid "invalid port number %d\n"
-msgstr "vigased impordi võtmed\n"
-
-#: dirmngr/dirmngr_ldap.c:400
-#, c-format
-msgid "scanning result for attribute '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:407 dirmngr/dirmngr_ldap.c:490
-#: dirmngr/dirmngr_ldap.c:514 dirmngr/dirmngr_ldap.c:526
-#: dirmngr/dirmngr_ldap.c:722
-#, fuzzy, c-format
-msgid "error writing to stdout: %s\n"
-msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:424
-#, c-format
-msgid "          available attribute '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:462
-#, fuzzy, c-format
-msgid "attribute '%s' not found\n"
-msgstr "võtit '%s' ei leitud: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:469
-#, c-format
-msgid "found attribute '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:581
-#, fuzzy, c-format
-#| msgid "reading from `%s'\n"
-msgid "processing url '%s'\n"
-msgstr "loen failist `%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:588
-#, fuzzy, c-format
-#| msgid "          w/o user IDs: %lu\n"
-msgid "          user '%s'\n"
-msgstr "    puudub kasutaja ID: %lu\n"
-
-#: dirmngr/dirmngr_ldap.c:590
-#, fuzzy, c-format
-msgid "          pass '%s'\n"
-msgstr "                 ka \""
-
-#: dirmngr/dirmngr_ldap.c:592
-#, fuzzy, c-format
-msgid "          host '%s'\n"
-msgstr "                 ka \""
-
-#: dirmngr/dirmngr_ldap.c:593
-#, fuzzy, c-format
-#| msgid "          not imported: %lu\n"
-msgid "          port %d\n"
-msgstr "       pole imporditud: %lu\n"
-
-#: dirmngr/dirmngr_ldap.c:595
-#, fuzzy, c-format
-msgid "            DN '%s'\n"
-msgstr "                 ka \""
-
-#: dirmngr/dirmngr_ldap.c:597
-#, c-format
-msgid "        filter '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:602 dirmngr/dirmngr_ldap.c:605
-#, fuzzy, c-format
-msgid "          attr '%s'\n"
-msgstr "                 ka \""
-
-#: dirmngr/dirmngr_ldap.c:611
-#, fuzzy, c-format
-msgid "no host name in '%s'\n"
-msgstr "(Kirjeldust ei antud)\n"
-
-#: dirmngr/dirmngr_ldap.c:616
-#, c-format
-msgid "no attribute given for query '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:622
-#, fuzzy, c-format
-#| msgid "WARNING: using insecure memory!\n"
-msgid "WARNING: using first attribute only\n"
-msgstr "HOIATUS: kasutan ebaturvalist mälu!\n"
-
-#: dirmngr/dirmngr_ldap.c:637 dirmngr/dirmngr_ldap.c:678
-#, fuzzy, c-format
-msgid "LDAP init to '%s:%d' failed: %s\n"
-msgstr "pakendamine ebaõnnestus: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:659
-#, fuzzy, c-format
-msgid "LDAP init to '%s' failed: %s\n"
-msgstr "pakendamine ebaõnnestus: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:665
-#, fuzzy, c-format
-msgid "LDAP init to '%s' done\n"
-msgstr "pakendamine ebaõnnestus: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:704
-#, fuzzy, c-format
-msgid "binding to '%s:%d' failed: %s\n"
-msgstr "pakendamine ebaõnnestus: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:728
-#, fuzzy, c-format
-#| msgid "dearmoring failed: %s\n"
-msgid "searching '%s' failed: %s\n"
-msgstr "lahtipakendamine ebaõnnestus: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:759
-#, fuzzy, c-format
-msgid "'%s' is not an LDAP URL\n"
-msgstr "\"%s\": ei ole JPEG fail\n"
-
-#: dirmngr/dirmngr_ldap.c:765
-#, c-format
-msgid "'%s' is an invalid LDAP URL\n"
-msgstr ""
-
-#: dirmngr/http.c:1989 dirmngr/ocsp.c:255
+#: dirmngr/http.c:1998 dirmngr/ocsp.c:255
 #, fuzzy, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: dirmngr/http.c:3630 dirmngr/ocsp.c:229
+#: dirmngr/http.c:3652 dirmngr/ocsp.c:229
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr ""
 
-#: dirmngr/http.c:3636 dirmngr/ocsp.c:246
+#: dirmngr/http.c:3658 dirmngr/ocsp.c:246
 #, fuzzy, c-format
 msgid "too many redirections\n"
 msgstr "liiga palju `%c' eelistusi\n"
 
-#: dirmngr/http.c:3748
+#: dirmngr/http.c:3768
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "redirection changed to '%s'\n"
@@ -10993,31 +10792,51 @@ msgstr "uuendamine ebaõnnestus: %s\n"
 msgid "ldap wrapper %d stalled - killing\n"
 msgstr ""
 
-#: dirmngr/ldap.c:91
+#: dirmngr/ldap.c:92
 #, c-format
 msgid "invalid char 0x%02x in host name - not added\n"
 msgstr ""
 
-#: dirmngr/ldap.c:95
+#: dirmngr/ldap.c:96
 #, fuzzy, c-format
 msgid "adding '%s:%d' to the ldap server list\n"
 msgstr "otsin \"%s\" HKP serverist %s\n"
 
-#: dirmngr/ldap.c:98 dirmngr/misc.c:512
+#: dirmngr/ldap.c:99 dirmngr/misc.c:512
 #, fuzzy, c-format
 msgid "malloc failed: %s\n"
 msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
 
-#: dirmngr/ldap.c:634
+#: dirmngr/ldap.c:221
+#, fuzzy, c-format
+msgid "'%s' is not an LDAP URL\n"
+msgstr "\"%s\": ei ole JPEG fail\n"
+
+#: dirmngr/ldap.c:227 dirmngr/ldap.c:233
 #, c-format
-msgid "start_cert_fetch: invalid pattern '%s'\n"
+msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
-#: dirmngr/ldap.c:846
+#: dirmngr/ldap.c:968
 #, c-format
 msgid "ldap_search hit the size limit of the server\n"
 msgstr ""
 
+#: dirmngr/ldapserver.c:119
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr ""
+
+#: dirmngr/ldapserver.c:181
+#, c-format
+msgid "%s:%u: ignoring unknown flag '%s'\n"
+msgstr ""
+
+#: dirmngr/ldapserver.c:203
+#, fuzzy, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr " j = jäta see võti vahele\n"
+
 #: dirmngr/misc.c:172
 #, fuzzy, c-format
 #| msgid "%s: invalid file version %d\n"
@@ -11110,88 +10929,88 @@ msgstr ""
 msgid "allocating list item failed: %s\n"
 msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
 
-#: dirmngr/ocsp.c:537 dirmngr/ocsp.c:724
+#: dirmngr/ocsp.c:538 dirmngr/ocsp.c:725
 #, fuzzy, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: dirmngr/ocsp.c:584
+#: dirmngr/ocsp.c:585
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:623 dirmngr/validate.c:648
+#: dirmngr/ocsp.c:624 dirmngr/validate.c:648
 #, fuzzy, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "võtit '%s' ei leitud: %s\n"
 
-#: dirmngr/ocsp.c:633
+#: dirmngr/ocsp.c:634
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:640
+#: dirmngr/ocsp.c:641
 #, fuzzy, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "genereeri tühistamise sertifikaat"
 
-#: dirmngr/ocsp.c:650
+#: dirmngr/ocsp.c:651
 #, fuzzy, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
 
-#: dirmngr/ocsp.c:689
+#: dirmngr/ocsp.c:690
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:696
 #, fuzzy, c-format
 #| msgid "no default secret keyring: %s\n"
 msgid "no default OCSP signer defined\n"
 msgstr "puudub salajaste võtmete vaikimisi võtmehoidla: %s\n"
 
-#: dirmngr/ocsp.c:702
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:707
+#: dirmngr/ocsp.c:708
 #, fuzzy, c-format
 #| msgid "using cipher %s\n"
 msgid "using OCSP responder '%s'\n"
 msgstr "kasutan Å¡iffrit %s\n"
 
-#: dirmngr/ocsp.c:764
+#: dirmngr/ocsp.c:765
 #, fuzzy, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: dirmngr/ocsp.c:789
+#: dirmngr/ocsp.c:790
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:790
+#: dirmngr/ocsp.c:791
 msgid "good"
 msgstr ""
 
-#: dirmngr/ocsp.c:796
+#: dirmngr/ocsp.c:797
 #, fuzzy, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "MÄRKUS: võti on tühistatud"
 
-#: dirmngr/ocsp.c:831
+#: dirmngr/ocsp.c:832
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:843
+#: dirmngr/ocsp.c:844
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:858
+#: dirmngr/ocsp.c:859
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr ""
@@ -11201,72 +11020,68 @@ msgstr ""
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "allkirjastamine ebaõnnestus: %s\n"
 
-#: dirmngr/server.c:1158
-msgid "ldapserver missing"
-msgstr ""
-
-#: dirmngr/server.c:1224
+#: dirmngr/server.c:1277
 msgid "serialno missing in cert ID"
 msgstr ""
 
-#: dirmngr/server.c:1387 dirmngr/server.c:1473 dirmngr/server.c:1909
-#: dirmngr/server.c:1980 dirmngr/server.c:2556 dirmngr/server.c:2571
+#: dirmngr/server.c:1440 dirmngr/server.c:1526 dirmngr/server.c:1963
+#: dirmngr/server.c:2034 dirmngr/server.c:2662 dirmngr/server.c:2677
 #, fuzzy, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "allkirjastamine ebaõnnestus: %s\n"
 
-#: dirmngr/server.c:1516
+#: dirmngr/server.c:1569
 #, fuzzy, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
 
-#: dirmngr/server.c:1528 dirmngr/server.c:1559 dirmngr/server.c:1718
+#: dirmngr/server.c:1581 dirmngr/server.c:1612 dirmngr/server.c:1772
 #, fuzzy, c-format
 msgid "error sending data: %s\n"
 msgstr "viga teate saatmisel serverile `%s': %s\n"
 
-#: dirmngr/server.c:1666
+#: dirmngr/server.c:1720
 #, fuzzy, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
 
-#: dirmngr/server.c:1699
+#: dirmngr/server.c:1753
 #, fuzzy, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
 
-#: dirmngr/server.c:1726
+#: dirmngr/server.c:1780
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:2860
+#: dirmngr/server.c:2966
 #, fuzzy, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "`%s' ei õnnestu luua: %s\n"
 
-#: dirmngr/server.c:2871
+#: dirmngr/server.c:2977
 #, fuzzy, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "%s: paisktabeli loomine ebaõnnestus: %s\n"
 
-#: dirmngr/server.c:2892
+#: dirmngr/server.c:2998
 #, fuzzy, c-format
 #| msgid "failed to initialize the TrustDB: %s\n"
 msgid "failed to initialize the server: %s\n"
 msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
 
-#: dirmngr/server.c:2900
+#: dirmngr/server.c:3006
 #, fuzzy, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "võtmehoidla vahemälu uuesti loomine ebaõnnestus: %s\n"
 
-#: dirmngr/server.c:2933
+#: dirmngr/server.c:3039
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:2952
+#: dirmngr/server.c:3058
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -11415,73 +11230,73 @@ msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
 msgid "error sending standard options: %s\n"
 msgstr "viga teate saatmisel serverile `%s': %s\n"
 
-#: tools/gpgconf-comp.c:649
+#: tools/gpgconf-comp.c:655
 msgid "OpenPGP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:653
+#: tools/gpgconf-comp.c:659
 msgid "S/MIME"
 msgstr ""
 
-#: tools/gpgconf-comp.c:657
+#: tools/gpgconf-comp.c:663
 #, fuzzy
 msgid "Public Keys"
 msgstr "avalik võti on %08lX\n"
 
-#: tools/gpgconf-comp.c:661
+#: tools/gpgconf-comp.c:667
 msgid "Private Keys"
 msgstr ""
 
-#: tools/gpgconf-comp.c:665
+#: tools/gpgconf-comp.c:671
 msgid "Smartcards"
 msgstr ""
 
-#: tools/gpgconf-comp.c:669
+#: tools/gpgconf-comp.c:676
 msgid "TPM"
 msgstr ""
 
-#: tools/gpgconf-comp.c:673
+#: tools/gpgconf-comp.c:681
 #, fuzzy
 #| msgid "network error"
 msgid "Network"
 msgstr "võrgu viga"
 
-#: tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:685
 #, fuzzy
 msgid "Passphrase Entry"
 msgstr "halb parool"
 
-#: tools/gpgconf-comp.c:941
+#: tools/gpgconf-comp.c:951
 #, fuzzy
 msgid "Component not suitable for launching"
 msgstr "ei leia avalikku võtit"
 
-#: tools/gpgconf-comp.c:947
+#: tools/gpgconf-comp.c:957
 #, c-format
 msgid "Configuration file of component %s is broken\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:950
+#: tools/gpgconf-comp.c:960
 #, fuzzy, c-format
 #| msgid "Please use the command \"toggle\" first.\n"
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr "Palun kasutage kõigepealt käsku \"toggle\".\n"
 
-#: tools/gpgconf-comp.c:2816
+#: tools/gpgconf-comp.c:2826
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2946
+#: tools/gpgconf-comp.c:2956
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3543
+#: tools/gpgconf-comp.c:3553
 #, fuzzy, c-format
 msgid "error closing '%s'\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: tools/gpgconf-comp.c:3545
+#: tools/gpgconf-comp.c:3555
 #, fuzzy, c-format
 msgid "error parsing '%s'\n"
 msgstr "viga `%s' lugemisel: %s\n"
@@ -11565,16 +11380,16 @@ msgid ""
 "Manage configuration options for tools of the @GNUPG@ system\n"
 msgstr ""
 
-#: tools/gpgconf.c:669 tools/gpgconf.c:704
+#: tools/gpgconf.c:703 tools/gpgconf.c:738
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:678 tools/gpgconf.c:728 tools/gpgconf.c:778
+#: tools/gpgconf.c:712 tools/gpgconf.c:762 tools/gpgconf.c:812
 #, fuzzy
 msgid "Component not found"
 msgstr "ei leia avalikku võtit"
 
-#: tools/gpgconf.c:804
+#: tools/gpgconf.c:838
 #, fuzzy
 msgid "No argument allowed"
 msgstr "kirjutan salajase võtme faili `%s'\n"
@@ -11590,88 +11405,189 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
-#: tools/gpg-card.c:2390
+#: tools/gpg-card.c:2407
 #, fuzzy, c-format
 msgid "Note: key %s is already stored on the card!\n"
 msgstr "jätsin vahele: avalik võti on juba olemas\n"
 
-#: tools/gpg-card.c:2393
+#: tools/gpg-card.c:2410
 #, fuzzy, c-format
 msgid "Note: Keys are already stored on the card!\n"
 msgstr "jätsin vahele: avalik võti on juba olemas\n"
 
-#: tools/gpg-card.c:2396
+#: tools/gpg-card.c:2413
 #, c-format
 msgid "Replace existing key %s ? (y/N) "
 msgstr ""
 
-#: tools/gpg-card.c:2549 tools/gpg-card.c:2712 tools/gpg-card.c:2935
-#: tools/gpg-card.c:3044
+#: tools/gpg-card.c:2566 tools/gpg-card.c:2729 tools/gpg-card.c:2952
+#: tools/gpg-card.c:3061
 #, c-format
 msgid "%s card no. %s detected\n"
 msgstr ""
 
-#: tools/gpg-card.c:3396
+#: tools/gpg-card.c:3413
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3406 tools/gpg-card.c:3420
+#: tools/gpg-card.c:3423 tools/gpg-card.c:3437
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
 "         can only be reverted using a factory reset!\n"
 msgstr ""
 
-#: tools/gpg-card.c:3423
+#: tools/gpg-card.c:3440
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3669
+#: tools/gpg-card.c:3686
 #, fuzzy
 msgid "authenticate to the card"
 msgstr "Tühistamise sertifikaat on loodud.\n"
 
-#: tools/gpg-card.c:3671
+#: tools/gpg-card.c:3688
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3673
+#: tools/gpg-card.c:3690
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication"
 msgstr "|NIMI|kasuta NIME vaikimisi saajana"
 
-#: tools/gpg-card.c:3675
+#: tools/gpg-card.c:3692
 #, fuzzy
 #| msgid "change the expire date"
 msgid "change a private data object"
 msgstr "muuda aegumise kuupäeva"
 
-#: tools/gpg-card.c:3676
+#: tools/gpg-card.c:3693
 #, fuzzy
 msgid "read a certificate from a data object"
 msgstr "Tühistamise sertifikaat on loodud.\n"
 
-#: tools/gpg-card.c:3677
+#: tools/gpg-card.c:3694
 #, fuzzy
 msgid "store a certificate to a data object"
 msgstr "Tühistamise sertifikaat on loodud.\n"
 
-#: tools/gpg-card.c:3678
+#: tools/gpg-card.c:3695
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3679
+#: tools/gpg-card.c:3696
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3681
+#: tools/gpg-card.c:3698
 msgid "manage the command history"
 msgstr ""
 
 #, fuzzy
+#~ msgid "requesting key %s from %s server %s\n"
+#~ msgstr "küsin võtit %08lX võtmeserverist %s\n"
+
+#, fuzzy
+#~ msgid "%s:%u: no hostname given\n"
+#~ msgstr "(Kirjeldust ei antud)\n"
+
+#, fuzzy
+#~ msgid "could not parse keyserver\n"
+#~ msgstr "ei saa parsida võtmeserveri URI\n"
+
+#, fuzzy
+#~| msgid "|NAME|set terminal charset to NAME"
+#~ msgid "|NAME|connect to host NAME"
+#~ msgstr "|NIMI|terminali kooditabel on NIMI"
+
+#, fuzzy
+#~| msgid "|NAME|use NAME as default recipient"
+#~ msgid "|NAME|use user NAME for authentication"
+#~ msgstr "|NIMI|kasuta NIME vaikimisi saajana"
+
+#, fuzzy
+#~| msgid "Usage: gpg [options] [files] (-h for help)"
+#~ msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
+#~ msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
+
+#, fuzzy
+#~| msgid "invalid import options\n"
+#~ msgid "invalid port number %d\n"
+#~ msgstr "vigased impordi võtmed\n"
+
+#, fuzzy
+#~ msgid "error writing to stdout: %s\n"
+#~ msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
+
+#, fuzzy
+#~ msgid "attribute '%s' not found\n"
+#~ msgstr "võtit '%s' ei leitud: %s\n"
+
+#, fuzzy
+#~| msgid "reading from `%s'\n"
+#~ msgid "processing url '%s'\n"
+#~ msgstr "loen failist `%s'\n"
+
+#, fuzzy
+#~| msgid "          w/o user IDs: %lu\n"
+#~ msgid "          user '%s'\n"
+#~ msgstr "    puudub kasutaja ID: %lu\n"
+
+#, fuzzy
+#~ msgid "          pass '%s'\n"
+#~ msgstr "                 ka \""
+
+#, fuzzy
+#~ msgid "          host '%s'\n"
+#~ msgstr "                 ka \""
+
+#, fuzzy
+#~| msgid "          not imported: %lu\n"
+#~ msgid "          port %d\n"
+#~ msgstr "       pole imporditud: %lu\n"
+
+#, fuzzy
+#~ msgid "            DN '%s'\n"
+#~ msgstr "                 ka \""
+
+#, fuzzy
+#~ msgid "          attr '%s'\n"
+#~ msgstr "                 ka \""
+
+#, fuzzy
+#~ msgid "no host name in '%s'\n"
+#~ msgstr "(Kirjeldust ei antud)\n"
+
+#, fuzzy
+#~| msgid "WARNING: using insecure memory!\n"
+#~ msgid "WARNING: using first attribute only\n"
+#~ msgstr "HOIATUS: kasutan ebaturvalist mälu!\n"
+
+#, fuzzy
+#~ msgid "LDAP init to '%s:%d' failed: %s\n"
+#~ msgstr "pakendamine ebaõnnestus: %s\n"
+
+#, fuzzy
+#~ msgid "LDAP init to '%s' failed: %s\n"
+#~ msgstr "pakendamine ebaõnnestus: %s\n"
+
+#, fuzzy
+#~ msgid "LDAP init to '%s' done\n"
+#~ msgstr "pakendamine ebaõnnestus: %s\n"
+
+#, fuzzy
+#~ msgid "binding to '%s:%d' failed: %s\n"
+#~ msgstr "pakendamine ebaõnnestus: %s\n"
+
+#, fuzzy
+#~| msgid "dearmoring failed: %s\n"
+#~ msgid "searching '%s' failed: %s\n"
+#~ msgstr "lahtipakendamine ebaõnnestus: %s\n"
+
+#, fuzzy
 #~ msgid "Suggest a random passphrase."
 #~ msgstr "muuda parooli"
 
diff --git a/po/fi.po b/po/fi.po
index d2d2b39..91deaba 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: 2021-04-20 12:38+0200\n"
+"POT-Creation-Date: 2021-08-24 18:50+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:328
+#: agent/call-pinentry.c:338
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
@@ -42,48 +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:546
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_OK"
 msgstr ""
 
-#: agent/call-pinentry.c:547
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
-#: agent/call-pinentry.c:548
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|_Yes"
 msgstr ""
 
-#: agent/call-pinentry.c:549
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_No"
 msgstr ""
 
-#: agent/call-pinentry.c:550
+#: agent/call-pinentry.c:560
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:551
+#: agent/call-pinentry.c:561
 msgid "|pinentry-label|_Save in password manager"
 msgstr ""
 
-#: agent/call-pinentry.c:552
+#: agent/call-pinentry.c:562
 #, fuzzy
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "Haluatko varmasti poistaa valitut avaimet? "
 
-#: agent/call-pinentry.c:554
+#: agent/call-pinentry.c:564
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:555
+#: agent/call-pinentry.c:565
 #, fuzzy
 #| msgid "invalid passphrase"
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "väärä salasana"
 
+#: agent/call-pinentry.c:566
+msgid "Caps Lock is on"
+msgstr ""
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:944
+#: agent/call-pinentry.c:1022
 msgid "Suggest"
 msgstr ""
 
@@ -94,13 +98,25 @@ 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:966
+#: agent/call-pinentry.c:1044
 msgid "pinentry.genpin.tooltip"
 msgstr ""
 
+#: agent/call-pinentry.c:1072
+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
+#, 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:998
+#: agent/call-pinentry.c:1198
 msgid "Quality:"
 msgstr ""
 
@@ -110,107 +126,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:1019
+#: agent/call-pinentry.c:1219
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:1263
+#: agent/call-pinentry.c:1477
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:1266
+#: agent/call-pinentry.c:1480
 #, 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:1303 agent/call-pinentry.c:1506
+#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1303 agent/call-pinentry.c:1506
-#: agent/protect-tool.c:728
+#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/protect-tool.c:729
 #, fuzzy
 msgid "Passphrase:"
 msgstr "väärä salasana"
 
-#: agent/call-pinentry.c:1330 agent/call-pinentry.c:1580 agent/command.c:1799
-#: agent/command.c:1852 agent/command-ssh.c:3046 agent/genkey.c:398
+#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
+#: agent/command.c:1988 agent/command-ssh.c:3046 agent/genkey.c:442
 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:1351 agent/call-pinentry.c:1603
+#: agent/call-pinentry.c:1566 agent/call-pinentry.c:1830
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:1362 agent/call-pinentry.c:1614
+#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
 msgid "Repeat:"
 msgstr ""
 
-#: agent/call-pinentry.c:1372 agent/call-pinentry.c:1384
-#: agent/call-pinentry.c:1624 agent/call-pinentry.c:1636
+#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
+#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
 #, fuzzy
 msgid "PIN too long"
 msgstr "rivi on liian pitkä\n"
 
-#: agent/call-pinentry.c:1373 agent/call-pinentry.c:1625
+#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "salasana on liian pitkä\n"
 
-#: agent/call-pinentry.c:1381 agent/call-pinentry.c:1633
+#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Nimessä on epäkelpo merkki\n"
 
-#: agent/call-pinentry.c:1386 agent/call-pinentry.c:1638
+#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:1405 agent/call-pinentry.c:1656
+#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI ei kelpaa"
 
-#: agent/call-pinentry.c:1405 agent/call-pinentry.c:1656
+#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "väärä salasana"
 
-#: agent/command.c:697
+#: agent/command.c:823
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:698
+#: agent/command.c:824
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1106 g10/card-util.c:708 g10/card-util.c:729
+#: agent/command.c:1235 g10/card-util.c:713 g10/card-util.c:734
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: agent/command.c:1634 agent/command.c:1791 agent/command-ssh.c:2974
-#: agent/genkey.c:333
+#: agent/command.c:1756 agent/command.c:1921 agent/command-ssh.c:2974
+#: agent/genkey.c:377
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "muuta salasanaa"
 
-#: agent/command.c:2567
+#: agent/command.c:2703
 #, 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:2697
+#: agent/command.c:2833
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -221,26 +237,26 @@ msgstr ""
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
 
-#: agent/command-ssh.c:872 common/dotlock.c:852 g10/card-util.c:953
-#: g10/export.c:1329 g10/gpg.c:1431 g10/keygen.c:5347 g10/keyring.c:1319
-#: g10/keyring.c:1632 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
+#: agent/command-ssh.c:872 common/dotlock.c:852 g10/card-util.c:963
+#: g10/export.c:1329 g10/gpg.c:1431 g10/keygen.c:5377 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
 #: g10/sign.c:1106 g10/sign.c:1443 g10/tdbio.c:753 tools/gpg-card.c:479
 #, fuzzy, c-format
 #| msgid "can't create `%s': %s\n"
 msgid "can't create '%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
-#: agent/command-ssh.c:884 common/helpfile.c:57 g10/card-util.c:910
+#: agent/command-ssh.c:884 common/helpfile.c:57 g10/card-util.c:920
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
 #: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:721 g10/gpg.c:1432
-#: g10/import.c:371 g10/import.c:558 g10/import.c:793 g10/keygen.c:4322
-#: g10/keyring.c:1658 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
+#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4326
+#: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
 #: g10/plaintext.c:610 g10/sign.c:1086 g10/sign.c:1311 g10/sign.c:1424
 #: g10/sign.c:1596 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2380
-#: sm/gpgsm.c:2410 sm/gpgsm.c:2448 sm/keylist.c:1737 sm/qualified.c:65
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2236
+#: sm/gpgsm.c:2266 sm/gpgsm.c:2304 sm/keylist.c:1775 sm/qualified.c:65
 #: dirmngr/certcache.c:396 dirmngr/certcache.c:476 dirmngr/certcache.c:478
-#: dirmngr/crlcache.c:2588 dirmngr/dirmngr.c:1720 tools/gpg-card.c:408
+#: dirmngr/crlcache.c:2591 dirmngr/dirmngr.c:1759 tools/gpg-card.c:408
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
@@ -349,39 +365,39 @@ msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:109 sm/certreqgen-ui.c:433
+#: 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:116
+#: agent/genkey.c:150
 #, fuzzy, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "kirjoitetaan kohteeseen \"%s\"\n"
 
-#: agent/genkey.c:154
+#: agent/genkey.c:191
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Syötä salasana\n"
 
-#: agent/genkey.c:184
+#: agent/genkey.c:227
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:186
+#: agent/genkey.c:229
 #, 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:198
+#: agent/genkey.c:241
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:215
+#: agent/genkey.c:258
 #, fuzzy, c-format
 #| msgid "Name must be at least 5 characters long\n"
 msgid "A passphrase should be at least %u character long."
@@ -389,7 +405,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:234
+#: agent/genkey.c:277
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -397,388 +413,387 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:260
+#: agent/genkey.c:304
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:275
+#: agent/genkey.c:319
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
-#: agent/genkey.c:296
+#: agent/genkey.c:340
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "Haluatko käyttää tätä avainta kaikesta huolimatta? "
 
-#: agent/genkey.c:464
+#: agent/genkey.c:508
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr ""
 "Tarvitset salasanan suojaamaan salaista avaintasi.\n"
 "\n"
 
-#: agent/genkey.c:590
+#: agent/genkey.c:637
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "muuta salasanaa"
 
-#: agent/gpg-agent.c:162 scd/scdaemon.c:115 dirmngr/dirmngr.c:182
+#: agent/gpg-agent.c:164 scd/scdaemon.c:115 dirmngr/dirmngr.c:183
 msgid "Options used for startup"
 msgstr ""
 
-#: agent/gpg-agent.c:164 scd/scdaemon.c:120 dirmngr/dirmngr.c:171
+#: agent/gpg-agent.c:166 scd/scdaemon.c:120 dirmngr/dirmngr.c:172
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:117 dirmngr/dirmngr.c:170
+#: agent/gpg-agent.c:167 scd/scdaemon.c:117 dirmngr/dirmngr.c:171
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:167 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:169 dirmngr/dirmngr.c:174
 #, fuzzy
 #| msgid "Key is superseded"
 msgid "run in supervised mode"
 msgstr "Avain on uusittu"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:121 dirmngr/dirmngr.c:184
+#: agent/gpg-agent.c:171 scd/scdaemon.c:121 dirmngr/dirmngr.c:185
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:170 scd/scdaemon.c:122 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:172 scd/scdaemon.c:122 dirmngr/dirmngr.c:186
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:171 scd/scdaemon.c:123 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:173 scd/scdaemon.c:123 dirmngr/dirmngr.c:187
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:179 g10/gpg.c:589 scd/scdaemon.c:125 sm/gpgsm.c:422
-#: dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:181 g10/gpg.c:589 scd/scdaemon.c:125 sm/gpgsm.c:423
+#: dirmngr/dirmngr.c:189
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:574 scd/scdaemon.c:129 sm/gpgsm.c:265
-#: dirmngr/dirmngr.c:192
+#: agent/gpg-agent.c:185 g10/gpg.c:574 scd/scdaemon.c:129 sm/gpgsm.c:265
+#: dirmngr/dirmngr.c:193
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: agent/gpg-agent.c:185 g10/gpg.c:576 g10/gpgv.c:78 kbx/kbxutil.c:89
+#: agent/gpg-agent.c:187 g10/gpg.c:576 g10/gpgv.c:78 kbx/kbxutil.c:89
 #: scd/scdaemon.c:131 sm/gpgsm.c:267 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:194 dirmngr/dirmngr_ldap.c:102
-#: tools/gpg-connect-agent.c:85 tools/gpgconf.c:111
+#: dirmngr/dirmngr.c:195 tools/gpg-connect-agent.c:85 tools/gpgconf.c:111
 msgid "verbose"
 msgstr "monisanainen"
 
-#: agent/gpg-agent.c:186 g10/gpg.c:578 g10/gpgv.c:79 kbx/kbxutil.c:90
+#: agent/gpg-agent.c:188 g10/gpg.c:578 g10/gpgv.c:79 kbx/kbxutil.c:90
 #: scd/scdaemon.c:132 sm/gpgsm.c:269 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:195 dirmngr/dirmngr_ldap.c:103
+#: dirmngr/dirmngr.c:196
 msgid "be somewhat more quiet"
 msgstr "ole jonkinverran hiljaisempi"
 
-#: agent/gpg-agent.c:194 g10/gpg.c:593 sm/gpgsm.c:283 dirmngr/dirmngr.c:205
+#: agent/gpg-agent.c:196 g10/gpg.c:593 sm/gpgsm.c:283 dirmngr/dirmngr.c:206
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 scd/scdaemon.c:146 sm/gpgsm.c:290
-#: dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:599 scd/scdaemon.c:146 sm/gpgsm.c:290
+#: dirmngr/dirmngr.c:210
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: agent/gpg-agent.c:201
+#: agent/gpg-agent.c:203
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "päivitä luottamustietokanta"
 
-#: agent/gpg-agent.c:203
+#: agent/gpg-agent.c:205
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 #, 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:213
+#: agent/gpg-agent.c:215
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:215
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:216
+#: agent/gpg-agent.c:218
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
 msgstr "ei tuettu"
 
-#: agent/gpg-agent.c:218
+#: agent/gpg-agent.c:220
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:221
+#: agent/gpg-agent.c:223
 #, fuzzy
 #| msgid "not supported"
 msgid "enable putty support"
 msgstr "ei tuettu"
 
-#: agent/gpg-agent.c:233 g10/gpg.c:844 scd/scdaemon.c:176 sm/gpgsm.c:382
+#: agent/gpg-agent.c:235 g10/gpg.c:844 scd/scdaemon.c:176 sm/gpgsm.c:383
 msgid "Options controlling the security"
 msgstr ""
 
-#: agent/gpg-agent.c:236
+#: agent/gpg-agent.c:238
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:238
+#: agent/gpg-agent.c:240
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:242
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:244
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:246
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:248
 #, fuzzy
 msgid "disallow the use of an external password cache"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:250
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:253
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: agent/gpg-agent.c:256
+#: agent/gpg-agent.c:258
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:261
 msgid "do not allow bypassing the passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:261
+#: agent/gpg-agent.c:263
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:265
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:266
+#: agent/gpg-agent.c:268
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:268
+#: agent/gpg-agent.c:272
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|käytä salasanoissa toimintatapaa N"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:274
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: agent/gpg-agent.c:273
+#: agent/gpg-agent.c:277
 msgid "Options controlling the PIN-Entry"
 msgstr ""
 
-#: agent/gpg-agent.c:275
+#: agent/gpg-agent.c:279
 #, fuzzy
 #| msgid "use the gpg-agent"
 msgid "never use the PIN-entry"
 msgstr "käytä gpg-agentia"
 
-#: agent/gpg-agent.c:277
+#: agent/gpg-agent.c:281
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:283
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:282
+#: agent/gpg-agent.c:286
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:286
+#: agent/gpg-agent.c:290
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:294
 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:551 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: agent/gpg-agent.c:557 agent/preset-passphrase.c:99 agent/protect-tool.c:154
 #: g10/gpg.c:1132 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:612 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:438
-#: dirmngr/dirmngr_ldap.c:175 tools/gpg-connect-agent.c:220 tools/gpgconf.c:151
+#: sm/gpgsm.c:613 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:446
+#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:151
 #: 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:560
+#: agent/gpg-agent.c:566
 #, fuzzy
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: agent/gpg-agent.c:562
+#: agent/gpg-agent.c:568
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:607 g10/gpg.c:1337 scd/scdaemon.c:384 sm/gpgsm.c:760
-#: dirmngr/dirmngr.c:522
+#: agent/gpg-agent.c:613 g10/gpg.c:1337 scd/scdaemon.c:384 sm/gpgsm.c:761
+#: dirmngr/dirmngr.c:530
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:972 g10/gpg.c:3910 g10/gpg.c:3934 sm/gpgsm.c:1769
-#: sm/gpgsm.c:1775
+#: agent/gpg-agent.c:986 g10/gpg.c:3907 g10/gpg.c:3931 sm/gpgsm.c:1622
+#: sm/gpgsm.c:1628
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "valittu tiivistealgoritmi ei kelpaa\n"
 
-#: agent/gpg-agent.c:1196 agent/gpg-agent.c:2019 common/comopt.c:93
-#: g10/gpg.c:2591 scd/scdaemon.c:549 sm/gpgsm.c:1155 dirmngr/dirmngr.c:989
-#: dirmngr/dirmngr.c:1840
+#: agent/gpg-agent.c:1210 agent/gpg-agent.c:2035 common/comopt.c:93
+#: g10/gpg.c:2594 scd/scdaemon.c:549 sm/gpgsm.c:1028 dirmngr/dirmngr.c:1029
+#: dirmngr/dirmngr.c:1879
 #, 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:1335 g10/gpg.c:3861 scd/scdaemon.c:687 sm/gpgsm.c:1709
-#: dirmngr/dirmngr.c:1108 tools/gpg-connect-agent.c:1270 tools/gpgconf.c:634
+#: agent/gpg-agent.c:1349 g10/gpg.c:3858 scd/scdaemon.c:687 sm/gpgsm.c:1562
+#: dirmngr/dirmngr.c:1145 tools/gpg-connect-agent.c:1270 tools/gpgconf.c:668
 #, 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:2172 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1267
+#: agent/gpg-agent.c:2188 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1306
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "ei voida luoda kohdetta %s: %s\n"
 
-#: agent/gpg-agent.c:2189 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1280
+#: agent/gpg-agent.c:2205 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1319
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2228
+#: agent/gpg-agent.c:2244
 #, 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:2239 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1312
+#: agent/gpg-agent.c:2255 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1351
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: agent/gpg-agent.c:2244 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1315
+#: agent/gpg-agent.c:2260 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1354
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
 
-#: agent/gpg-agent.c:2255 agent/gpg-agent.c:2295 agent/gpg-agent.c:2304
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1324
+#: agent/gpg-agent.c:2271 agent/gpg-agent.c:2311 agent/gpg-agent.c:2320
+#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1363
 #, 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:2269 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1336
+#: agent/gpg-agent.c:2285 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1375
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: agent/gpg-agent.c:2289 agent/gpg-agent.c:2342 common/homedir.c:517
+#: agent/gpg-agent.c:2305 agent/gpg-agent.c:2358 common/homedir.c:537
 #: 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:2292 agent/gpg-agent.c:2347 common/homedir.c:520
+#: agent/gpg-agent.c:2308 agent/gpg-agent.c:2363 common/homedir.c:540
 #: g10/openfile.c:402
 #, fuzzy, c-format
 msgid "directory '%s' created\n"
 msgstr "%s: hakemisto luotu\n"
 
-#: agent/gpg-agent.c:2353
+#: agent/gpg-agent.c:2369
 #, fuzzy, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "trustdb: luku epäonnistui (n=%d): %s\n"
 
-#: agent/gpg-agent.c:2357
+#: agent/gpg-agent.c:2373
 #, fuzzy, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "%s: hakemistoa ei voi luoda: %s\n"
 
-#: agent/gpg-agent.c:2512 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2069
+#: agent/gpg-agent.c:2528 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2108
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: agent/gpg-agent.c:2719
+#: agent/gpg-agent.c:2735
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2724
+#: agent/gpg-agent.c:2740
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2799
+#: agent/gpg-agent.c:2815
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2804
+#: agent/gpg-agent.c:2820
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3026 scd/scdaemon.c:1374 dirmngr/dirmngr.c:2283
+#: agent/gpg-agent.c:3042 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2322
 #, fuzzy, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "salaisen päivitys epäonnistui: %s\n"
 
-#: agent/gpg-agent.c:3114 scd/scdaemon.c:1439
+#: agent/gpg-agent.c:3130 scd/scdaemon.c:1441
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: ohitettu: %s\n"
 
-#: agent/gpg-agent.c:3252 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3271 common/simple-pwquery.c:247 g10/call-agent.c:260
 #: sm/call-agent.c:131 tools/gpg-connect-agent.c:2319 tools/card-call-scd.c:311
 #, fuzzy, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
 
-#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:70
+#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:66
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -800,7 +815,7 @@ msgid ""
 msgstr ""
 
 #: agent/protect-tool.c:107 g10/gpg.c:448 kbx/kbxutil.c:72 sm/gpgsm.c:215
-#: dirmngr/dirmngr.c:168 tools/gpgconf.c:81
+#: dirmngr/dirmngr.c:169 tools/gpgconf.c:81
 msgid ""
 "@Commands:\n"
 " "
@@ -830,40 +845,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:707
+#: agent/protect-tool.c:708 sm/import.c:775
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
-#: agent/protect-tool.c:712
+#: agent/protect-tool.c:713 sm/export.c:727
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
-#: agent/protect-tool.c:718
+#: agent/protect-tool.c:719
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:723
+#: agent/protect-tool.c:724
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
-#: agent/protect-tool.c:734
+#: agent/protect-tool.c:735
 #, fuzzy, c-format
 msgid "cancelled\n"
 msgstr "Peru"
 
-#: agent/protect-tool.c:736
+#: agent/protect-tool.c:737
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: agent/trustlist.c:153 agent/trustlist.c:363 tools/gpgconf.c:424
+#: agent/trustlist.c:153 agent/trustlist.c:363 tools/gpgconf.c:458
 #, fuzzy, c-format
 msgid "error opening '%s': %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@ -1018,7 +1033,7 @@ msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
 msgid "secret key parts are not available\n"
 msgstr "salaisen avaimen osat eivät ole käytettävissä\n"
 
-#: agent/cvt-openpgp.c:343 g10/card-util.c:1562
+#: agent/cvt-openpgp.c:343 g10/card-util.c:1575
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -1050,7 +1065,7 @@ msgid "error creating a stream for a pipe: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
 #: common/exechelp-posix.c:505 common/exechelp-posix.c:580
-#: common/exechelp-posix.c:866 dirmngr/dirmngr.c:1354
+#: common/exechelp-posix.c:866 dirmngr/dirmngr.c:1393
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@ -1123,7 +1138,7 @@ msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3082
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3099
 msgid "yes"
 msgstr "kyllä|kylla|joo"
 
@@ -1178,7 +1193,7 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:115 g10/card-util.c:917 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:927 tools/no-libgcrypt.c:30
 #: tools/gpg-card.c:416
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
@@ -1250,7 +1265,7 @@ msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
 msgid "server '%s' is older than us (%s < %s)"
 msgstr ""
 
-#: common/asshelp.c:737 g10/call-dirmngr.c:408
+#: common/asshelp.c:737 g10/call-dirmngr.c:407
 #, fuzzy, c-format
 #| msgid "WARNING: %s overrides %s\n"
 msgid "WARNING: %s\n"
@@ -1345,7 +1360,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:4212
+#: scd/app-openpgp.c:4214
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
@@ -1429,12 +1444,12 @@ msgstr "Tämä avain on vanhentunut!"
 msgid "Root certificate trustworthy"
 msgstr "virheellinen varmenne"
 
-#: common/audit.c:1112 sm/certchain.c:1242
+#: common/audit.c:1112 sm/certchain.c:1243
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "virheellinen varmenne"
 
-#: common/audit.c:1115 sm/certchain.c:1252
+#: common/audit.c:1115 sm/certchain.c:1253
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Avain saatavilla kohteessa: "
@@ -1486,22 +1501,22 @@ msgstr "tuntematon "
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "epäkelpo radix64-merkki %02x ohitettu\n"
 
-#: common/ttyio.c:433
+#: common/ttyio.c:447
 #, c-format
 msgid "Sorry, we are in batchmode - can't get input\n"
 msgstr ""
 
-#: common/ttyio.c:439
+#: common/ttyio.c:453
 #, c-format
 msgid "Sorry, no terminal at all requested - can't get input\n"
 msgstr ""
 
-#: common/ttyio.c:474 common/ttyio.c:484
+#: common/ttyio.c:488 common/ttyio.c:498
 #, c-format
 msgid "too many errors; giving up\n"
 msgstr ""
 
-#: common/ttyio.c:536
+#: common/ttyio.c:550
 #, c-format
 msgid "Control-D detected\n"
 msgstr ""
@@ -1555,8 +1570,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:1036 dirmngr/dirmngr.c:895
-#: dirmngr/dirmngr.c:904
+#: common/init.c:191 sm/gpgsm.c:909 dirmngr/dirmngr.c:935 dirmngr/dirmngr.c:944
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
@@ -1715,7 +1729,7 @@ msgid "Enter passphrase: "
 msgstr "Syötä salasana: "
 
 #: g10/call-agent.c:318 g10/encrypt.c:282 g10/encrypt.c:818 g10/sign.c:473
-#: sm/call-agent.c:180 sm/encrypt.c:701 sm/sign.c:436
+#: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
 #, fuzzy, c-format
 #| msgid "%s does not yet work with %s\n"
 msgid "%s is not compliant with %s mode\n"
@@ -1726,225 +1740,225 @@ msgstr "%s ja %s eivät vielä toimi yhdessä\n"
 msgid "error from TPM: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: g10/call-agent.c:2123 g10/passphrase.c:225 g10/passphrase.c:258
-#: tools/card-call-scd.c:1751
+#: g10/call-agent.c:2135 g10/passphrase.c:233 g10/passphrase.c:266
+#: tools/card-call-scd.c:1755
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "agentin käytössä on ongelmia: agentti vastaa 0x%lx\n"
 
-#: g10/call-dirmngr.c:179 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2316
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2316
 #, fuzzy, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
 
-#: g10/call-dirmngr.c:213
+#: g10/call-dirmngr.c:212
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "keyserver option \"honor-keyserver-url\" may not be used in Tor mode\n"
 msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
 
-#: g10/call-dirmngr.c:386
+#: g10/call-dirmngr.c:385
 msgid "WKD uses a cached result"
 msgstr ""
 
-#: g10/call-dirmngr.c:389
+#: g10/call-dirmngr.c:388
 msgid "Tor is not running"
 msgstr ""
 
-#: g10/call-dirmngr.c:391
+#: g10/call-dirmngr.c:390
 #, fuzzy
 msgid "Tor is not properly configured"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: g10/call-dirmngr.c:393
+#: g10/call-dirmngr.c:392
 #, fuzzy
 msgid "DNS is not properly configured"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: g10/call-dirmngr.c:395
+#: g10/call-dirmngr.c:394
 msgid "unacceptable HTTP redirect from server"
 msgstr ""
 
-#: g10/call-dirmngr.c:397
+#: g10/call-dirmngr.c:396
 msgid "unacceptable HTTP redirect from server was cleaned up"
 msgstr ""
 
-#: g10/call-dirmngr.c:399
+#: g10/call-dirmngr.c:398
 #, fuzzy
 #| msgid "generate a revocation certificate"
 msgid "server uses an invalid certificate"
 msgstr "luo mitätöintivarmenne"
 
-#: g10/call-dirmngr.c:406 g10/gpg.c:4599
+#: g10/call-dirmngr.c:405 g10/gpg.c:4596
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "ascii-koodaus: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:369 g10/card-util.c:1924
-#: tools/gpg-card.c:3039
+#: g10/card-util.c:86 g10/card-util.c:374 g10/card-util.c:1937
+#: tools/gpg-card.c:3056
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "salaista avainta ei löydy"
 
-#: g10/card-util.c:91 g10/card-util.c:1930
+#: g10/card-util.c:91 g10/card-util.c:1943
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:97 g10/card-util.c:2309 g10/delkey.c:164 g10/keyedit.c:1428
-#: g10/keygen.c:4791 g10/revoke.c:214 g10/revoke.c:638
+#: g10/card-util.c:97 g10/card-util.c:2322 g10/delkey.c:164 g10/keyedit.c:1428
+#: g10/keygen.c:4795 g10/revoke.c:214 g10/revoke.c:639
 #, fuzzy, c-format
 msgid "can't do this in batch mode\n"
 msgstr "tätä ei voi tehdä eräajossa\n"
 
-#: g10/card-util.c:105 tools/gpg-card.c:2943
+#: g10/card-util.c:105 tools/gpg-card.c:2960
 #, fuzzy, c-format
 msgid "This command is only available for version 2 cards\n"
 msgstr "Tätä komentoa ei sallita %s-tilassa.\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3398 tools/gpg-card.c:2948
+#: g10/card-util.c:107 scd/app-openpgp.c:3399 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"
 
-#: g10/card-util.c:140 g10/card-util.c:1448 g10/card-util.c:1710
-#: g10/card-util.c:1802 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1991 g10/keygen.c:2165 g10/keygen.c:2385 g10/keygen.c:2685
+#: g10/card-util.c:140 g10/card-util.c:1458 g10/card-util.c:1723
+#: g10/card-util.c:1815 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/keygen.c:1992 g10/keygen.c:2166 g10/keygen.c:2386 g10/keygen.c:2686
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
 #: tools/gpg-card.c:510
 msgid "Your selection? "
 msgstr "Valintasi? "
 
-#: g10/card-util.c:262 g10/card-util.c:313 tools/gpg-card.c:596
+#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:596
 #: tools/gpg-card.c:636
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:558 tools/gpg-card.c:903
+#: g10/card-util.c:563 tools/gpg-card.c:905
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:559 tools/gpg-card.c:904
+#: g10/card-util.c:564 tools/gpg-card.c:906
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:586 tools/gpg-card.c:931
+#: g10/card-util.c:591 tools/gpg-card.c:933
 #, fuzzy
 msgid "not forced"
 msgstr "ei käsitelty"
 
-#: g10/card-util.c:586 tools/gpg-card.c:931
+#: g10/card-util.c:591 tools/gpg-card.c:933
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:768 tools/gpg-card.c:1468
+#: g10/card-util.c:773 tools/gpg-card.c:1484
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:770 tools/gpg-card.c:1470
+#: g10/card-util.c:775 tools/gpg-card.c:1486
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:772 tools/gpg-card.c:1472
+#: g10/card-util.c:777 tools/gpg-card.c:1488
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:789 tools/gpg-card.c:1505
+#: g10/card-util.c:795 tools/gpg-card.c:1521
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:791 tools/gpg-card.c:1506
+#: g10/card-util.c:797 tools/gpg-card.c:1522
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:809 tools/gpg-card.c:1523
+#: g10/card-util.c:816 tools/gpg-card.c:1539
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:830 tools/gpg-card.c:1561
+#: g10/card-util.c:840 tools/gpg-card.c:1577
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "ei vastaavaa julkista avainta: %s\n"
 
-#: g10/card-util.c:926 g10/decrypt-data.c:495 g10/import.c:406 g10/import.c:756
-#: g10/import.c:815 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1666
-#: tools/gpgconf.c:437 tools/gpgconf.c:483 tools/gpg-card.c:426
+#: g10/card-util.c:936 g10/decrypt-data.c:495 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:1705
+#: tools/gpgconf.c:471 tools/gpgconf.c:517 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:959 g10/decrypt-data.c:498 g10/export.c:2496
+#: g10/card-util.c:969 g10/decrypt-data.c:498 g10/export.c:2496
 #: dirmngr/crlcache.c:925 tools/gpg-card.c:486 tools/gpg-card.c:493
 #, fuzzy, c-format
 msgid "error writing '%s': %s\n"
 msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
 
-#: g10/card-util.c:986 tools/gpg-card.c:1650
+#: g10/card-util.c:996 tools/gpg-card.c:1666
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:1024 tools/gpg-card.c:1945
+#: g10/card-util.c:1034 tools/gpg-card.c:1962
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:1109 tools/gpg-card.c:1699
+#: g10/card-util.c:1119 tools/gpg-card.c:1715
 #, fuzzy
 msgid "Language preferences: "
 msgstr "päivitä valinnat"
 
-#: g10/card-util.c:1117 tools/gpg-card.c:1710
+#: g10/card-util.c:1127 tools/gpg-card.c:1726
 #, fuzzy, c-format
 msgid "Error: invalid length of preference string.\n"
 msgstr "Valinnassa on luvaton merkki\n"
 
-#: g10/card-util.c:1126 tools/gpg-card.c:1719
+#: g10/card-util.c:1136 tools/gpg-card.c:1735
 #, fuzzy, c-format
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Valinnassa on luvaton merkki\n"
 
-#: g10/card-util.c:1148 tools/gpg-card.c:1753
+#: g10/card-util.c:1158 tools/gpg-card.c:1769
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1162 tools/gpg-card.c:1770
+#: g10/card-util.c:1172 tools/gpg-card.c:1786
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: g10/card-util.c:1185 tools/gpg-card.c:1835
+#: g10/card-util.c:1195 tools/gpg-card.c:1852
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "näytä sormenjälki"
 
-#: g10/card-util.c:1209 tools/gpg-card.c:1861
+#: g10/card-util.c:1219 tools/gpg-card.c:1878
 #, fuzzy, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: g10/card-util.c:1259
+#: g10/card-util.c:1269
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Avaimen luonti epäonnistui: %s\n"
 
-#: g10/card-util.c:1260
+#: g10/card-util.c:1270
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
 
-#: g10/card-util.c:1273 g10/keygen.c:4811 g10/keygen.c:5972
+#: g10/card-util.c:1283 g10/keygen.c:4815 g10/keygen.c:6003
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
 
-#: g10/card-util.c:1358
+#: g10/card-util.c:1368
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1375 tools/gpg-card.c:3328
+#: g10/card-util.c:1385 tools/gpg-card.c:3345
 msgid ""
 "Note: There is no guarantee that the card supports the requested\n"
 "      key type or size.  If the key generation does not succeed,\n"
@@ -1952,102 +1966,102 @@ msgid ""
 "      key types and sizes are supported.\n"
 msgstr ""
 
-#: g10/card-util.c:1396 g10/keygen.c:2570 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1406 g10/keygen.c:2571 sm/certreqgen-ui.c:180
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Minkä kokoisen avaimen haluat? (1024) "
 
-#: g10/card-util.c:1406 g10/keygen.c:2493 g10/keygen.c:2525
+#: g10/card-util.c:1416 g10/keygen.c:2494 g10/keygen.c:2526
 #: sm/certreqgen-ui.c:195
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "pyöristetty %u bittiin\n"
 
-#: g10/card-util.c:1414 g10/keygen.c:2578 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1424 g10/keygen.c:2579 sm/certreqgen-ui.c:185
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/card-util.c:1433
+#: g10/card-util.c:1443
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1435
+#: g10/card-util.c:1445
 #, fuzzy
 msgid "Signature key\n"
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: g10/card-util.c:1437
+#: g10/card-util.c:1447
 #, fuzzy
 msgid "Encryption key\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/card-util.c:1439
+#: g10/card-util.c:1449
 msgid "Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1441 g10/keygen.c:2112 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1451 g10/keygen.c:2113 sm/certreqgen-ui.c:158
 msgid "Please select what kind of key you want:\n"
 msgstr "Valitse millaisen avaimen haluat:\n"
 
-#: g10/card-util.c:1442 sm/certreqgen-ui.c:159
+#: g10/card-util.c:1452 sm/certreqgen-ui.c:159
 #, fuzzy, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA (vain allekirjoitus)\n"
 
-#: g10/card-util.c:1443
+#: g10/card-util.c:1453
 #, fuzzy, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) DSA ja ElGamal (oletus)\n"
 
-#: g10/card-util.c:1455 g10/card-util.c:1722 g10/card-util.c:1822
-#: g10/keyedit.c:900 g10/keygen.c:2017 g10/keygen.c:2045 g10/keygen.c:2172
-#: g10/keygen.c:2425 g10/keygen.c:2713 g10/revoke.c:836
+#: g10/card-util.c:1468 g10/card-util.c:1735 g10/card-util.c:1835
+#: g10/keyedit.c:900 g10/keygen.c:2018 g10/keygen.c:2046 g10/keygen.c:2173
+#: g10/keygen.c:2426 g10/keygen.c:2714 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Valinta ei kelpaa.\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1541
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 
-#: g10/card-util.c:1533
+#: g10/card-util.c:1546
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1582
 #, fuzzy, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
 
-#: g10/card-util.c:1585 g10/card-util.c:2106 g10/card-util.c:2162
+#: g10/card-util.c:1598 g10/card-util.c:2119 g10/card-util.c:2175
 #, fuzzy, c-format
 msgid "error getting card info: %s\n"
 msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
 
-#: g10/card-util.c:1591 g10/card-util.c:1936 g10/card-util.c:2112
-#: g10/card-util.c:2171 tools/gpg-card.c:3057 tools/gpg-card.c:3296
-#: tools/gpg-card.c:3354
+#: g10/card-util.c:1604 g10/card-util.c:1949 g10/card-util.c:2125
+#: g10/card-util.c:2184 tools/gpg-card.c:3074 tools/gpg-card.c:3313
+#: tools/gpg-card.c:3371
 #, fuzzy, c-format
 #| msgid "This command is not allowed while in %s mode.\n"
 msgid "This command is not supported by this card\n"
 msgstr "Tätä komentoa ei sallita %s-tilassa.\n"
 
-#: g10/card-util.c:1637 tools/gpg-card.c:2426
+#: g10/card-util.c:1650 tools/gpg-card.c:2443
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1651
+#: g10/card-util.c:1664
 #, fuzzy, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "ohitetaan: salainen avain on jo paikalla\n"
 
-#: g10/card-util.c:1654 tools/gpg-card.c:2398
+#: g10/card-util.c:1667 tools/gpg-card.c:2415
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1666 tools/gpg-card.c:2457
+#: g10/card-util.c:1679 tools/gpg-card.c:2474
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2055,172 +2069,172 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1701
+#: g10/card-util.c:1714
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Valitse millaisen avaimen haluat:\n"
 
-#: g10/card-util.c:1703 g10/card-util.c:1793
+#: g10/card-util.c:1716 g10/card-util.c:1806
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: g10/card-util.c:1704 g10/card-util.c:1795
+#: g10/card-util.c:1717 g10/card-util.c:1808
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/card-util.c:1705 g10/card-util.c:1797
+#: g10/card-util.c:1718 g10/card-util.c:1810
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1790
+#: g10/card-util.c:1803
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Valitse mitätöinnin syy:\n"
 
-#: g10/card-util.c:1836
+#: g10/card-util.c:1849
 #, fuzzy, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: g10/card-util.c:1941 tools/gpg-card.c:3065
+#: g10/card-util.c:1954 tools/gpg-card.c:3082
 #, fuzzy, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr "ohitetaan: salainen avain on jo paikalla\n"
 
-#: g10/card-util.c:1944 tools/gpg-card.c:3068 tools/gpg-card.c:3409
+#: g10/card-util.c:1957 tools/gpg-card.c:3085 tools/gpg-card.c:3426
 #, fuzzy
 msgid "Continue? (y/N) "
 msgstr "Varmastiko allekirjoita? "
 
-#: g10/card-util.c:1949 tools/gpg-card.c:3079
+#: g10/card-util.c:1962 tools/gpg-card.c:3096
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2142
+#: g10/card-util.c:2155
 #, fuzzy, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: g10/card-util.c:2188
+#: g10/card-util.c:2201
 #, fuzzy, c-format
 msgid "error for setup UIF: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: g10/card-util.c:2212 g10/keyedit.c:1263 tools/gpg-card.c:3649
+#: g10/card-util.c:2225 g10/keyedit.c:1263 tools/gpg-card.c:3666
 msgid "quit this menu"
 msgstr "ulos tästä valikosta"
 
-#: g10/card-util.c:2214
+#: g10/card-util.c:2227
 #, fuzzy
 msgid "show admin commands"
 msgstr "ristiriitainen komento\n"
 
-#: g10/card-util.c:2215 g10/keyedit.c:1266 tools/gpg-card.c:3652
+#: g10/card-util.c:2228 g10/keyedit.c:1266 tools/gpg-card.c:3669
 msgid "show this help"
 msgstr "näytä tämä ohje"
 
-#: g10/card-util.c:2217 tools/gpg-card.c:3654
+#: g10/card-util.c:2230 tools/gpg-card.c:3671
 #, fuzzy
 msgid "list all available data"
 msgstr "Avain saatavilla kohteessa: "
 
-#: g10/card-util.c:2220 tools/gpg-card.c:3656
+#: g10/card-util.c:2233 tools/gpg-card.c:3673
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:2221 tools/gpg-card.c:3657
+#: g10/card-util.c:2234 tools/gpg-card.c:3674
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:2222 tools/gpg-card.c:3658
+#: g10/card-util.c:2235 tools/gpg-card.c:3675
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:2223 tools/gpg-card.c:3659
+#: g10/card-util.c:2236 tools/gpg-card.c:3676
 #, fuzzy
 msgid "change the login name"
 msgstr "muuta voimassoloaikaa"
 
-#: g10/card-util.c:2224 tools/gpg-card.c:3660
+#: g10/card-util.c:2237 tools/gpg-card.c:3677
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muuta luottamusastetta"
 
-#: g10/card-util.c:2225 tools/gpg-card.c:3661
+#: g10/card-util.c:2238 tools/gpg-card.c:3678
 msgid "change card holder's salutation"
 msgstr ""
 
-#: g10/card-util.c:2227 tools/gpg-card.c:3663
+#: g10/card-util.c:2240 tools/gpg-card.c:3680
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "näytä sormenjälki"
 
-#: g10/card-util.c:2228 tools/gpg-card.c:3664
+#: g10/card-util.c:2241 tools/gpg-card.c:3681
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:2229 tools/gpg-card.c:3665
+#: g10/card-util.c:2242 tools/gpg-card.c:3682
 #, fuzzy
 msgid "generate new keys"
 msgstr "luo uusi avainpari"
 
-#: g10/card-util.c:2230 tools/gpg-card.c:3666
+#: g10/card-util.c:2243 tools/gpg-card.c:3683
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:2231 tools/gpg-card.c:3667
+#: g10/card-util.c:2244 tools/gpg-card.c:3684
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:2232 tools/gpg-card.c:3668
+#: g10/card-util.c:2245 tools/gpg-card.c:3685
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:2233 tools/gpg-card.c:3672
+#: g10/card-util.c:2246 tools/gpg-card.c:3689
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2235
+#: g10/card-util.c:2248
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr "|NIMI|käytä NIMI oletusvastaanottajana"
 
-#: g10/card-util.c:2236
+#: g10/card-util.c:2249
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "muuta luottamusastetta"
 
-#: g10/card-util.c:2237 tools/gpg-card.c:3674
+#: g10/card-util.c:2250 tools/gpg-card.c:3691
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the User Interaction Flag"
 msgstr "muuta luottamusastetta"
 
-#: g10/card-util.c:2361 tools/gpg-card.c:3924
+#: g10/card-util.c:2374 tools/gpg-card.c:3941
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2402
+#: g10/card-util.c:2415
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "ristiriitainen komento\n"
 
-#: g10/card-util.c:2433
+#: g10/card-util.c:2446
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "ristiriitainen komento\n"
 
-#: g10/card-util.c:2435
+#: g10/card-util.c:2448
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/card-util.c:2546 g10/keyedit.c:2275 tools/gpg-card.c:3814
-#: tools/gpg-card.c:4072
+#: g10/card-util.c:2559 g10/keyedit.c:2275 tools/gpg-card.c:3831
+#: tools/gpg-card.c:4089
 #, c-format
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Komento ei kelpaa (kirjoita \"help\")\n"
@@ -2230,23 +2244,23 @@ msgstr "Komento ei kelpaa (kirjoita \"help\")\n"
 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:5293 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5292 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:1934 g10/export.c:2342 g10/export.c:2463
-#: g10/getkey.c:1907 g10/gpg.c:5238 g10/keyedit.c:1450 g10/keyedit.c:2382
-#: g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:703 g10/keyserver.c:1240
-#: g10/revoke.c:230 g10/tofu.c:2168
+#: g10/getkey.c:2032 g10/gpg.c:5237 g10/keyedit.c:1450 g10/keyedit.c:2382
+#: g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:703 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:2002 g10/getkey.c:1915 g10/getkey.c:4330
-#: g10/gpg.c:5247 g10/keyedit.c:2354 g10/keyserver.c:1258 g10/revoke.c:236
-#: g10/revoke.c:665 g10/tofu.c:2176
+#: g10/delkey.c:90 g10/export.c:2002 g10/getkey.c:2040 g10/getkey.c:4455
+#: g10/gpg.c:5246 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"
 msgstr "virhe luettaessa avainlohkoa: %s\n"
@@ -2372,14 +2386,14 @@ msgstr "salausalgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
 msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:555 g10/encrypt.c:808 g10/decrypt-data.c:261 g10/gpg.c:4083
-#: g10/gpg.c:4130 sm/decrypt.c:742 sm/encrypt.c:691 sm/gpgsm.c:1793
+#: g10/encrypt.c:555 g10/encrypt.c:808 g10/decrypt-data.c:261 g10/gpg.c:4080
+#: g10/gpg.c:4127 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1646
 #, 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:564 g10/gpg.c:4095 g10/gpg.c:4142 g10/sig-check.c:155
-#: g10/sign.c:452 sm/gpgsm.c:1803 sm/gpgsm.c:1813 sm/sign.c:596 sm/verify.c:510
+#: g10/encrypt.c:564 g10/gpg.c:4092 g10/gpg.c:4139 g10/sig-check.c:155
+#: g10/sign.c:452 sm/gpgsm.c:1656 sm/gpgsm.c:1666 sm/sign.c:596 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"
@@ -2396,7 +2410,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "valittu symmetrinen salain %s (%d) ei ole vastaanottajan suosima\n"
 
-#: g10/encrypt.c:838 sm/encrypt.c:766
+#: g10/encrypt.c:838 sm/encrypt.c:767
 #, fuzzy, c-format
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
@@ -2425,7 +2439,7 @@ msgstr "%s/%s salattu vastaanottajalle: \"%s\"\n"
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
 
-#: g10/decrypt-data.c:239 g10/mainproc.c:380 sm/decrypt.c:494
+#: g10/decrypt-data.c:239 g10/mainproc.c:380 sm/decrypt.c:892
 #, fuzzy, c-format
 #| msgid "%s encrypted data\n"
 msgid "%s.%s encrypted data\n"
@@ -2436,7 +2450,7 @@ msgstr "%s salattua dataa\n"
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "salattu tuntemattomalla algoritmilla %d\n"
 
-#: g10/decrypt-data.c:361 g10/decrypt-data.c:414 sm/decrypt.c:508
+#: g10/decrypt-data.c:361 g10/decrypt-data.c:414 sm/decrypt.c:906
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2484,7 +2498,7 @@ msgstr ""
 msgid " - skipped"
 msgstr "%s: ohitettu: %s\n"
 
-#: g10/export.c:1333 g10/import.c:2124 g10/openfile.c:202 g10/openfile.c:296
+#: g10/export.c:1333 g10/import.c:2132 g10/openfile.c:202 g10/openfile.c:296
 #: g10/sign.c:1110 g10/sign.c:1447
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
@@ -2523,66 +2537,66 @@ msgstr "virhe luotaessa \"%s\": %s\n"
 msgid "[User ID not found]"
 msgstr "[Käyttäjätunnusta ei löytynyt]"
 
-#: g10/getkey.c:1199
+#: g10/getkey.c:1324
 #, fuzzy, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "virhe luotaessa \"%s\": %s\n"
 
-#: g10/getkey.c:1205
+#: g10/getkey.c:1330
 #, fuzzy, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "virhe luotaessa \"%s\": %s\n"
 
-#: g10/getkey.c:1207
+#: g10/getkey.c:1332
 #, fuzzy
 msgid "No fingerprint"
 msgstr "näytä sormenjälki"
 
-#: g10/getkey.c:1449
+#: g10/getkey.c:1574
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1884 g10/revoke.c:657 g10/revoke.c:718
+#: g10/getkey.c:2009 g10/revoke.c:658 g10/revoke.c:719
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "salaista avainta \"%s\" ei löydy: %s\n"
 
-#: g10/getkey.c:1887 g10/pkclist.c:1012
+#: g10/getkey.c:2012 g10/pkclist.c:1012
 #, fuzzy, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/getkey.c:1965
+#: g10/getkey.c:2090
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "|NIMI|käytä oletusarvoisesti salaista avainta NIMI"
 
-#: g10/getkey.c:1973
+#: g10/getkey.c:2098
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "|NIMI|käytä oletusarvoisesti salaista avainta NIMI"
 
-#: g10/getkey.c:1980
+#: g10/getkey.c:2105
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr ""
 
-#: g10/getkey.c:2837
+#: g10/getkey.c:2962
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Epäkelpo avain %08lX hyväksytty valitsimella --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:3703
+#: g10/getkey.c:3828
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr ""
 "käytetään toissijaista avainta %08lX ensisijaisen avaimen %08lX sijasta\n"
 
-#: g10/getkey.c:4259 g10/gpg.c:2167
+#: g10/getkey.c:4384 g10/gpg.c:2168
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "virheelliset tuontivalitsimet\n"
@@ -2787,7 +2801,7 @@ msgstr ""
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:651 kbx/kbxutil.c:91 sm/gpgsm.c:424 tools/gpgconf.c:113
+#: g10/gpg.c:651 kbx/kbxutil.c:91 sm/gpgsm.c:425 tools/gpgconf.c:113
 msgid "do not make any changes"
 msgstr "älä tee muutoksia"
 
@@ -2821,7 +2835,7 @@ msgstr "käytä tekstimuotoa"
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|aseta pakkausaste N (0 poistaa käytöstä)"
 
-#: g10/gpg.c:762 sm/gpgsm.c:357
+#: g10/gpg.c:762 sm/gpgsm.c:358
 msgid "Options controlling key import and export"
 msgstr ""
 
@@ -2840,11 +2854,11 @@ msgstr "nouda avaimia avainpalvelimelta"
 msgid "include the public key in signatures"
 msgstr "tarkista avainten allekirjoitukset"
 
-#: g10/gpg.c:776 sm/gpgsm.c:360
+#: g10/gpg.c:776 sm/gpgsm.c:361
 msgid "disable all access to the dirmngr"
 msgstr ""
 
-#: g10/gpg.c:788 sm/gpgsm.c:367
+#: g10/gpg.c:788 sm/gpgsm.c:368
 msgid "Options controlling key listings"
 msgstr ""
 
@@ -2864,15 +2878,15 @@ msgstr "|NIMI|salaa vastaanottajalle NIMI"
 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:876 sm/gpgsm.c:408
+#: g10/gpg.c:876 sm/gpgsm.c:409
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:895 sm/gpgsm.c:420 dirmngr/dirmngr.c:286
+#: g10/gpg.c:895 sm/gpgsm.c:421 dirmngr/dirmngr.c:289
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:966 sm/gpgsm.c:453
+#: g10/gpg.c:966 sm/gpgsm.c:454
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2931,7 +2945,7 @@ msgstr ""
 "allekirjoita, tarkista, salaa tai avaa\n"
 "oletustoiminto riippuu syötteestä\n"
 
-#: g10/gpg.c:1168 sm/gpgsm.c:636
+#: g10/gpg.c:1168 sm/gpgsm.c:637
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2955,12 +2969,12 @@ msgstr "Tiiviste: "
 msgid "Compression: "
 msgstr "Pakkaus: "
 
-#: g10/gpg.c:1274 sm/gpgsm.c:710
+#: g10/gpg.c:1274 sm/gpgsm.c:711
 #, fuzzy, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "käyttö: gpg [valitsimet] "
 
-#: g10/gpg.c:1467 sm/gpgsm.c:803
+#: g10/gpg.c:1467 sm/gpgsm.c:804
 #, c-format
 msgid "conflicting commands\n"
 msgstr "ristiriitainen komento\n"
@@ -2970,536 +2984,536 @@ msgstr "ristiriitainen komento\n"
 msgid "no = sign found in group definition '%s'\n"
 msgstr "=-merkkiä ei löytynyt ryhmämäärityksessä \"%s\"\n"
 
-#: g10/gpg.c:1683
+#: g10/gpg.c:1684
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/gpg.c:1686
+#: g10/gpg.c:1687
 #, 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:1689
+#: g10/gpg.c:1690
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/gpg.c:1695
+#: g10/gpg.c:1696
 #, 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:1698
+#: g10/gpg.c:1699
 #, 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:1701
+#: g10/gpg.c:1702
 #, 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:1707
+#: g10/gpg.c:1708
 #, 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:1710
+#: g10/gpg.c:1711
 #, 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:1713
+#: g10/gpg.c:1714
 #, 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:1719
+#: g10/gpg.c:1720
 #, 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:1722
+#: g10/gpg.c:1723
 #, 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:1725
+#: g10/gpg.c:1726
 #, 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:1941
+#: g10/gpg.c:1942
 #, fuzzy, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "tuntematon asetus \"%s\"\n"
 
-#: g10/gpg.c:2037
+#: g10/gpg.c:2038
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:2039
+#: g10/gpg.c:2040
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/gpg.c:2041
+#: g10/gpg.c:2042
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2043
+#: g10/gpg.c:2044
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/gpg.c:2045
+#: g10/gpg.c:2046
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2049
+#: g10/gpg.c:2050
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2051
+#: g10/gpg.c:2052
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:2053
+#: g10/gpg.c:2054
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:2055
+#: g10/gpg.c:2056
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:2057
+#: g10/gpg.c:2058
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:2059
+#: g10/gpg.c:2060
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "näytä mihin avainrenkaaseen tulostettu avain kuuluu"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2062
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/gpg.c:2178
+#: g10/gpg.c:2179
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
 
-#: g10/gpg.c:2180
+#: g10/gpg.c:2181
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2975 g10/gpg.c:3828 g10/gpg.c:3840
+#: g10/gpg.c:2978 g10/gpg.c:3825 g10/gpg.c:3837
 #, 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:3151 g10/gpg.c:3163
+#: g10/gpg.c:3154 g10/gpg.c:3166
 #, fuzzy, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:3185
+#: g10/gpg.c:3188
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "Sähköpostiosoite ei kelpaa\n"
 
-#: g10/gpg.c:3217 sm/gpgsm.c:1270
+#: g10/gpg.c:3220 sm/gpgsm.c:1143
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
 
-#: g10/gpg.c:3223 sm/gpgsm.c:1276
+#: g10/gpg.c:3226 sm/gpgsm.c:1149
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:3280
+#: g10/gpg.c:3283
 #, fuzzy, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:3302 g10/gpg.c:3511 g10/keyedit.c:5319
+#: g10/gpg.c:3305 g10/gpg.c:3514 g10/keyedit.c:5322
 #, fuzzy, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
 
-#: g10/gpg.c:3320
+#: g10/gpg.c:3323
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:3323
+#: g10/gpg.c:3326
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3333
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:3333
+#: g10/gpg.c:3336
 #, c-format
 msgid "invalid import options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:3339 g10/gpg.c:3354
+#: g10/gpg.c:3342 g10/gpg.c:3357
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:3345
+#: g10/gpg.c:3348
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3351
 #, c-format
 msgid "invalid export options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3363
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3366
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:3371
+#: g10/gpg.c:3374
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3373
+#: g10/gpg.c:3376
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3378
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:3377
+#: g10/gpg.c:3380
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3384
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3386
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:3385
+#: g10/gpg.c:3388
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:3387
+#: g10/gpg.c:3390
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3389
+#: g10/gpg.c:3392
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:3396
+#: g10/gpg.c:3399
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:3399
+#: g10/gpg.c:3402
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3409
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-polkua kohteeseen %s ei voi asettaa\n"
 
-#: g10/gpg.c:3613
+#: g10/gpg.c:3616
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:3616
+#: g10/gpg.c:3619
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3625
+#: g10/gpg.c:3628
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:3807 sm/gpgsm.c:1675
+#: g10/gpg.c:3804 sm/gpgsm.c:1528
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROITUS: ohjelma voi luoda core-tiedoston!\n"
 
-#: g10/gpg.c:3821
+#: g10/gpg.c:3818
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROITUS: %s korvaa %s:n\n"
 
-#: g10/gpg.c:3830
+#: g10/gpg.c:3827
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s eivät ole sallittuja yhdessä!\n"
 
-#: g10/gpg.c:3833
+#: g10/gpg.c:3830
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s yhdessä on järjetöntä!\n"
 
-#: g10/gpg.c:3848 sm/gpgsm.c:1696 dirmngr/dirmngr.c:1123
+#: g10/gpg.c:3845 sm/gpgsm.c:1549 dirmngr/dirmngr.c:1160
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3869
+#: g10/gpg.c:3866
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/gpg.c:3897 g10/gpg.c:3928 sm/gpgsm.c:1763
+#: g10/gpg.c:3894 g10/gpg.c:3925 sm/gpgsm.c:1616
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3901
 #, 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:3916
+#: g10/gpg.c:3913
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3922
+#: g10/gpg.c:3919
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valittu varmenteen tiivistealgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3937
+#: g10/gpg.c:3934
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed täytyy olla suurempi kuin 0\n"
 
-#: g10/gpg.c:3939
+#: g10/gpg.c:3936
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed täytyy olla suurempi kuin 1\n"
 
-#: g10/gpg.c:3941
+#: g10/gpg.c:3938
 #, 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:3943
+#: g10/gpg.c:3940
 #, 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:3945
+#: g10/gpg.c:3942
 #, 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:3949
+#: g10/gpg.c:3946
 #, 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:3953
+#: g10/gpg.c:3950
 #, 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:3960
+#: g10/gpg.c:3957
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "virheelliset oletusarvoiset valinnat\n"
 
-#: g10/gpg.c:3964
+#: g10/gpg.c:3961
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "virheelliset henkilökohtaisen salaimen valinnat\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3964
 #, 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:3971
+#: g10/gpg.c:3968
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "virheelliset henkilökohtaiset tiivisteen valinnat\n"
 
-#: g10/gpg.c:3975
+#: g10/gpg.c:3972
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "virheelliset henkilökohtaiset pakkausvalinnat\n"
 
-#: g10/gpg.c:3984 g10/gpg.c:3989
+#: g10/gpg.c:3981 g10/gpg.c:3986
 #, 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:4026
+#: g10/gpg.c:4023
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ja %s eivät vielä toimi yhdessä\n"
 
-#: g10/gpg.c:4089
+#: g10/gpg.c:4086
 #, 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:4101
+#: g10/gpg.c:4098
 #, 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:4256
+#: g10/gpg.c:4253
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: g10/gpg.c:4268
+#: g10/gpg.c:4265
 #, 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:4340
+#: g10/gpg.c:4337
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "avaus epäonnistui: %s\n"
 
-#: g10/gpg.c:4369
+#: g10/gpg.c:4366
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4372
+#: g10/gpg.c:4369
 #, 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:4430
+#: g10/gpg.c:4427
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4433
+#: g10/gpg.c:4430
 #, 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:4821 g10/keyserver.c:1870
+#: g10/gpg.c:4818 g10/keyserver.c:1629
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
 
-#: g10/gpg.c:4826
+#: g10/gpg.c:4823
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
 
-#: g10/gpg.c:4832
+#: g10/gpg.c:4829
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "avaimen vienti epäonnistui: %s\n"
 
-#: g10/gpg.c:4845
+#: g10/gpg.c:4842
 #, 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:4857
+#: g10/gpg.c:4854
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "avainpalvelimelta etsiminen epäonnistui: %s\n"
 
-#: g10/gpg.c:4870
+#: g10/gpg.c:4867
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "avainpalvelimen päivitys epäonnistui: %s\n"
 
-#: g10/gpg.c:4937
+#: g10/gpg.c:4936
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ascii-koodauksen purku epäonnistui: %s\n"
 
-#: g10/gpg.c:4948
+#: g10/gpg.c:4947
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: g10/gpg.c:5053
+#: g10/gpg.c:5052
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
 
-#: g10/gpg.c:5205 g10/tofu.c:2156
+#: g10/gpg.c:5204 g10/tofu.c:2160
 #, fuzzy, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: g10/gpg.c:5216
+#: g10/gpg.c:5215
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5272
+#: g10/gpg.c:5271
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5283
+#: g10/gpg.c:5282
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjoita viestisi...\n"
 
-#: g10/gpg.c:5630
+#: g10/gpg.c:5629
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "annettu varmennekäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:5632
+#: g10/gpg.c:5631
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:5665
+#: g10/gpg.c:5664
 #, fuzzy, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
@@ -3513,7 +3527,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:414 tools/gpgconf.c:116 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:415 tools/gpgconf.c:116 tools/gpg-card.c:95
 msgid "|FD|write status info to this FD"
 msgstr "|FD|tilatiedot kirjoitetaan FD:iin"
 
@@ -3608,274 +3622,274 @@ msgstr ""
 msgid "repair keys on import"
 msgstr "näytä sormenjälki"
 
-#: g10/import.c:399 g10/import.c:721
+#: g10/import.c:407 g10/import.c:729
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ohitetaan tyypin %d lohko\n"
 
-#: g10/import.c:738
+#: g10/import.c:746
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "tähän mennessä käsitelty %lu avainta\n"
 
-#: g10/import.c:831
+#: g10/import.c:839
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Kaikkiaan käsitelty: %lu\n"
 
-#: g10/import.c:834
+#: g10/import.c:842
 #, fuzzy, c-format
 #| msgid "      skipped new keys: %lu\n"
 msgid "    skipped PGP-2 keys: %lu\n"
 msgstr "      ohitetaan uudet avaimet: %lu\n"
 
-#: g10/import.c:836
+#: g10/import.c:844
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      ohitetaan uudet avaimet: %lu\n"
 
-#: g10/import.c:839
+#: g10/import.c:847
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          ilman käyttäjätunnuksia: %lu\n"
 
-#: g10/import.c:842 sm/import.c:129
+#: g10/import.c:850 sm/import.c:129
 #, c-format
 msgid "              imported: %lu"
 msgstr "              tuotu: %lu"
 
-#: g10/import.c:846 sm/import.c:133
+#: g10/import.c:854 sm/import.c:133
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             muuttamatonta: %lu\n"
 
-#: g10/import.c:848
+#: g10/import.c:856
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          uusia käyttäjätunnuksia: %lu\n"
 
-#: g10/import.c:850
+#: g10/import.c:858
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           uusia aliavaimia: %lu\n"
 
-#: g10/import.c:852
+#: g10/import.c:860
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        uusia allekirjoituksia: %lu\n"
 
-#: g10/import.c:854
+#: g10/import.c:862
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   uusia avainten mitätöintejä: %lu\n"
 
-#: g10/import.c:856 sm/import.c:135
+#: g10/import.c:864 sm/import.c:135
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      luettuja salaisia avaimia: %lu\n"
 
-#: g10/import.c:858 sm/import.c:137
+#: g10/import.c:866 sm/import.c:137
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  tuotuja salaisia avaimia: %lu\n"
 
-#: g10/import.c:860 sm/import.c:139
+#: g10/import.c:868 sm/import.c:139
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " muuttamattomia salaisia avaimia: %lu\n"
 
-#: g10/import.c:862 sm/import.c:141
+#: g10/import.c:870 sm/import.c:141
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "          ei tuotu: %lu\n"
 
-#: g10/import.c:864
+#: g10/import.c:872
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "        uusia allekirjoituksia: %lu\n"
 
-#: g10/import.c:866
+#: g10/import.c:874
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "      luettuja salaisia avaimia: %lu\n"
 
-#: g10/import.c:1291
+#: g10/import.c:1299
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:1333
+#: g10/import.c:1341
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
 # Ensimmäinen %s on binary, textmode tai unknown, ks. alla
-#: g10/import.c:1351
+#: g10/import.c:1359
 #, fuzzy, c-format
 msgid "         \"%s\": preference for AEAD algorithm %s\n"
 msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
 
 # Ensimmäinen %s on binary, textmode tai unknown, ks. alla
-#: g10/import.c:1366
+#: g10/import.c:1374
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
 
-#: g10/import.c:1378
+#: g10/import.c:1386
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:1391
+#: g10/import.c:1399
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:1393
+#: g10/import.c:1401
 #, c-format
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:1418
+#: g10/import.c:1426
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:1932 g10/import.c:3053
+#: g10/import.c:1940 g10/import.c:3061
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "avain %08lX: ei käyttäjätunnusta\n"
 
-#: g10/import.c:1938
+#: g10/import.c:1946
 #, fuzzy, c-format
 msgid "key %s: %s\n"
 msgstr "ohitetaan \"%s\": %s\n"
 
-#: g10/import.c:1939 g10/import.c:3025
+#: g10/import.c:1947 g10/import.c:3033
 msgid "rejected by import screener"
 msgstr ""
 
-#: g10/import.c:1988
+#: g10/import.c:1996
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "avain %08lX: HKP-aliavainvirhe korjattu\n"
 
-#: g10/import.c:2009
+#: g10/import.c:2017
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr ""
 "avain %08lX: käyttäjätunnus \"%s\" hyväksytty ilman omaa allekirjoitusta\n"
 
-#: g10/import.c:2020 g10/import.c:2051
+#: g10/import.c:2028 g10/import.c:2059
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "avain %08lX: ei voimassaolevia käyttäjätunnuksia\n"
 
-#: g10/import.c:2022
+#: g10/import.c:2030
 #, c-format
 msgid "this may be caused by a missing self-signature\n"
 msgstr "tämän voi aiheuttaa puuttuva oma-allekirjoitus\n"
 
-#: g10/import.c:2101 g10/import.c:3439
+#: g10/import.c:2109 g10/import.c:3447
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "avain %08lX: julkista avainta ei löydetty: %s\n"
 
-#: g10/import.c:2107
+#: g10/import.c:2115
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "avain %08lX: uusi avain - ohitetaan\n"
 
-#: g10/import.c:2119
+#: g10/import.c:2127
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "kirjoitettavissa olevaa avainrengasta ei löydy: %s\n"
 
-#: g10/import.c:2151 g10/import.c:2253 g10/import.c:3514
+#: g10/import.c:2159 g10/import.c:2261 g10/import.c:3522
 #, fuzzy, c-format
 #| msgid "error writing keyring `%s': %s\n"
 msgid "error writing keyring '%s': %s\n"
 msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
 
-#: g10/import.c:2174
+#: g10/import.c:2182
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "avain %08lX: julkinen avain \"%s\" tuotu\n"
 
-#: g10/import.c:2201
+#: g10/import.c:2209
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "avain %08lX: ei vastaa omaa kopiotamme\n"
 
-#: g10/import.c:2269
+#: g10/import.c:2277
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "avain %08lX: \"%s\" 1 uusi käyttäjätunnus\n"
 
-#: g10/import.c:2272
+#: g10/import.c:2280
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "avain %08lX: \"%s\" %d uutta käyttäjätunnusta\n"
 
-#: g10/import.c:2275
+#: g10/import.c:2283
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "avain %08lX: \"%s\" 1 uusi allekirjoitus\n"
 
-#: g10/import.c:2278
+#: g10/import.c:2286
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n"
 
-#: g10/import.c:2281
+#: g10/import.c:2289
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "avain %08lX: \"%s\" 1 uusi aliavain\n"
 
-#: g10/import.c:2284
+#: g10/import.c:2292
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "avain %08lX: \"%s\" %d uutta aliavainta\n"
 
-#: g10/import.c:2287
+#: g10/import.c:2295
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n"
 
-#: g10/import.c:2290
+#: g10/import.c:2298
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2301
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "avain %08lX: \"%s\" %d uutta käyttäjätunnusta\n"
 
-#: g10/import.c:2296
+#: g10/import.c:2304
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "avain %08lX: \"%s\" %d uutta käyttäjätunnusta\n"
 
-#: g10/import.c:2332
+#: g10/import.c:2340
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "avain %08lX: \"%s\" ei muutoksia\n"
 
-#: g10/import.c:2692 g10/import.c:2887
+#: g10/import.c:2700 g10/import.c:2895
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "avain %08lX: salainen avain tuotu\n"
 
-#: g10/import.c:2700
+#: g10/import.c:2708
 #, fuzzy, c-format
 #| msgid "skipped: secret key already present\n"
 msgid "key %s: secret key already exists\n"
 msgstr "ohitetaan: salainen avain on jo paikalla\n"
 
-#: g10/import.c:2708
+#: g10/import.c:2716
 #, fuzzy, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
@@ -3888,208 +3902,207 @@ msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2877
+#: g10/import.c:2885
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:3024
+#: g10/import.c:3032
 #, fuzzy, c-format
 msgid "secret key %s: %s\n"
 msgstr "salaista avainta \"%s\" ei löydy: %s\n"
 
-#: g10/import.c:3045 g10/import.c:3084
+#: g10/import.c:3053 g10/import.c:3092
 #, fuzzy, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/import.c:3072
+#: g10/import.c:3080
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "avain %08lX: avaimella on epäkelpo salain %d - ohitetaan\n"
 
-#: g10/import.c:3234 g10/pkclist.c:75 g10/revoke.c:774
+#: g10/import.c:3242 g10/pkclist.c:75 g10/revoke.c:775
 msgid "No reason specified"
 msgstr "Ei eriteltyä syytä"
 
-#: g10/import.c:3235 g10/pkclist.c:77 g10/revoke.c:776
+#: g10/import.c:3243 g10/pkclist.c:77 g10/revoke.c:777
 msgid "Key is superseded"
 msgstr "Avain on uusittu"
 
-#: g10/import.c:3236 g10/pkclist.c:79 g10/revoke.c:775
+#: g10/import.c:3244 g10/pkclist.c:79 g10/revoke.c:776
 msgid "Key has been compromised"
 msgstr "Avain on murrettu"
 
-#: g10/import.c:3237 g10/pkclist.c:81 g10/revoke.c:777
+#: g10/import.c:3245 g10/pkclist.c:81 g10/revoke.c:778
 msgid "Key is no longer used"
 msgstr "Avain ei ole enää käytössä"
 
-#: g10/import.c:3238 g10/pkclist.c:83 g10/revoke.c:778
+#: g10/import.c:3246 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "Käyttäjätunnus ei ole enää käytössä"
 
-#: g10/import.c:3363 g10/keylist.c:1105 g10/pkclist.c:87
+#: g10/import.c:3371 g10/keylist.c:1105 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "mitätöinnin syy: "
 
-#: g10/import.c:3382 g10/keylist.c:1124 g10/pkclist.c:103
+#: g10/import.c:3390 g10/keylist.c:1124 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "mitätöintikommentti: "
 
-#: g10/import.c:3432
+#: g10/import.c:3440
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "avain %08lX: ei julkista avainta - mitätöintivarmennetta ei voida käyttää\n"
 
-#: g10/import.c:3461
+#: g10/import.c:3469
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "avain %08lX: alkuperäistä avainlohkoa ei löydy: %s\n"
 
-#: g10/import.c:3468
+#: g10/import.c:3476
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "avain %08lX. alkuperäisen avainlohko lukeminen ei onnistu: %s\n"
 
-#: g10/import.c:3488
+#: g10/import.c:3496
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "avain %08lX: pätemätön mitätöintivarmenne: %s - hylätty\n"
 
-#: g10/import.c:3523
+#: g10/import.c:3531
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "avain %08lX: mitätöintivarmenne \"%s\" tuotu\n"
 
-#: g10/import.c:3609
+#: g10/import.c:3617
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "avain %08lX: allekirjoitukselle ei ole käyttäjätunnusta\n"
 
-#: g10/import.c:3626
+#: g10/import.c:3634
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "avain %08lX: julkisen avaimen algoritmia \"%s\" ei tueta\n"
 
-#: g10/import.c:3628
+#: g10/import.c:3636
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "avain %08lX: epäkelpo oma-allekirjoitus käyttäjätunnuksella \"%s\"\n"
 
-#: g10/import.c:3645 g10/import.c:3673 g10/import.c:3729
+#: g10/import.c:3653 g10/import.c:3681 g10/import.c:3737
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "avain %08lX: julkisen avaimen algoritmia ei tueta\n"
 
-#: g10/import.c:3646
+#: g10/import.c:3654
 #, fuzzy, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "avain %08lX: lisättiin suora avainallekirjoitus\n"
 
-#: g10/import.c:3660
+#: g10/import.c:3668
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "avain %08lX: ei aliavainta avainten riippuvuuksiin\n"
 
-#: g10/import.c:3675
+#: g10/import.c:3683
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "avain %08lX: pätemätön aliavainriippuvuus\n"
 
-#: g10/import.c:3694
+#: g10/import.c:3702
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "avain %08lX: moninkertainen aliavainriippuvuus poistettu\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3726
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "avain %08lX: ei aliavainta avainten mitätöintiä varten\n"
 
-#: g10/import.c:3731
+#: g10/import.c:3739
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "avain %08lX: epäkelpo aliavaimen mitätöinti\n"
 
-#: g10/import.c:3746
+#: g10/import.c:3754
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "avain %08lX: useiden aliavainten mitätöinti poistettu\n"
 
-#: g10/import.c:3790
+#: g10/import.c:3798
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "avain %08lX: käyttäjätunnus ohitettu '"
 
-#: g10/import.c:3817
+#: g10/import.c:3825
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "avain %08lX: aliavain ohitettu\n"
 
-#: g10/import.c:3849
+#: g10/import.c:3857
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr ""
 "avain %08lX: allekirjoitusta ei voida viedä (luokka %02x) - ohitetaan\n"
 
-#: g10/import.c:3860
+#: g10/import.c:3868
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "avain %08lX: mitätöintivarmenne väärässä paikassa - ohitetaan\n"
 
-#: g10/import.c:3878
+#: g10/import.c:3886
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "avain %08lX: epäkelpo mitätöintivarmenne: %s - ohitetaan\n"
 
-#: g10/import.c:3892
+#: g10/import.c:3900
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "avain %08lX: aliavaimen allekirjoitus väärässä paikassa - ohitetaan\n"
 
-#: g10/import.c:3900
+#: g10/import.c:3908
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "avain %08lX: odottamaton allekirjoitusluokka (0x%02X) - ohitetaan\n"
 
-#: g10/import.c:4073
+#: g10/import.c:4081
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "avain %08lX: käyttäjätunnuksen kaksoiskappale havaittu - liitetty\n"
 
-#: g10/import.c:4180
+#: g10/import.c:4188
 #, fuzzy, c-format
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr "avain %08lX: käyttäjätunnuksen kaksoiskappale havaittu - liitetty\n"
 
-#: g10/import.c:4245
+#: g10/import.c:4253
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "VAROITUS: avain %08lX saattaa olla mitätöity: haetaan mitätöintiavain %08lX\n"
 
-#: g10/import.c:4261
+#: g10/import.c:4269
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "VAROITUS: avain %08lX saattaa olla mitätöity: mitätöintiavainta %08lX \n"
 "ei saatavilla.\n"
 
-#: g10/import.c:4327
+#: g10/import.c:4335
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "avain %08lX: \"%s\"-mitätöintivarmenne lisätty\n"
 
-#: g10/import.c:4365
+#: g10/import.c:4373
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "avain %08lX: lisättiin suora avainallekirjoitus\n"
 
-#: g10/key-check.c:133 dirmngr/dirmngr_ldap.c:650 dirmngr/ldap-wrapper.c:835
-#: dirmngr/ldap-wrapper.c:852
+#: g10/key-check.c:133 dirmngr/ldap-wrapper.c:835 dirmngr/ldap-wrapper.c:852
 #, fuzzy, c-format
 msgid "error allocating memory: %s\n"
 msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
@@ -4153,7 +4166,7 @@ msgid ""
 "all signatures.\n"
 msgstr ""
 
-#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:284 sm/keydb.c:297
+#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:289 sm/keydb.c:302
 #, fuzzy, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
@@ -4164,7 +4177,7 @@ msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
 msgid "error creating keyring '%s': %s\n"
 msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
 
-#: g10/keydb.c:388 sm/keydb.c:303
+#: g10/keydb.c:388 sm/keydb.c:308
 #, fuzzy, c-format
 msgid "keybox '%s' created\n"
 msgstr "avainrengas \"%s\" luotu\n"
@@ -4445,8 +4458,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Varmastiko allekirjoita? "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6192 g10/keyedit.c:6275 g10/keyedit.c:6404
-#: g10/keyedit.c:6466 g10/sign.c:528
+#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
+#: g10/keyedit.c:6474 g10/sign.c:528
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "allekirjoitus epäonnistui: %s\n"
@@ -4853,7 +4866,7 @@ msgstr "Käyttäjätunnusta ei löydy.\n"
 msgid "Nothing to sign.\n"
 msgstr "Avaimelle %08lX ei löydy mitään mitä allekirjoittaa\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6057
+#: g10/keyedit.c:2973 g10/keyedit.c:6065
 #, fuzzy, c-format
 msgid "Not signed by you.\n"
 msgstr "   %08lX allekirjoitti tämän %s%s\n"
@@ -4923,7 +4936,7 @@ msgstr "Tämä avain voidaan mitätöidä %s-avaimella "
 msgid "(sensitive)"
 msgstr " (luottamuksellinen)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:525
+#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "ei voida luoda kohdetta %s: %s\n"
@@ -4939,7 +4952,7 @@ msgid "expired: %s"
 msgstr " [vanhenee: %s]"
 
 #: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2262
-#: g10/keyserver.c:531
+#: g10/keyserver.c:354
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [vanhenee: %s]"
@@ -4975,14 +4988,14 @@ 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:535
-#: g10/mainproc.c:2280 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
+#: g10/mainproc.c:2282 g10/tofu.c:1789 g10/trust.c:426 dirmngr/ocsp.c:792
 #, fuzzy
 msgid "revoked"
 msgstr "[mitätöity] "
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:539
-#: g10/mainproc.c:2282 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
+#: g10/mainproc.c:2284 g10/tofu.c:1794 g10/trust.c:113
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -5024,7 +5037,7 @@ msgstr "Haluatko edelleen varmasti lisätä sen? (k/E) "
 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:3107
+#: g10/keyedit.c:4273 g10/keygen.c:3111
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
@@ -5174,7 +5187,7 @@ msgstr ""
 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:5357 g10/keyedit.c:5495
+#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
 #, 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"
@@ -5183,135 +5196,135 @@ msgstr "ohitetaan v3-muodon oma-allekirjoitus käyttäjätunnukselle \"%s\"\n"
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5380
+#: g10/keyedit.c:5383
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Haluatko varmasti käyttää sitä (k/E)? "
 
-#: g10/keyedit.c:5381
+#: g10/keyedit.c:5384
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Haluatko varmasti käyttää sitä (k/E)? "
 
-#: g10/keyedit.c:5441
+#: g10/keyedit.c:5449
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Allekirjoitusnotaatio: "
 
-#: g10/keyedit.c:5588
+#: g10/keyedit.c:5596
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Ylikirjoita (k/E)? "
 
-#: g10/keyedit.c:5658
+#: g10/keyedit.c:5666
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keyedit.c:5720
+#: g10/keyedit.c:5728
 #, 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:5821
+#: g10/keyedit.c:5829
 #, 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:5843
+#: g10/keyedit.c:5851
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keyedit.c:5984
+#: g10/keyedit.c:5992
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "käyttäjätunnus: \""
 
-#: g10/keyedit.c:5987 g10/keyedit.c:6089 g10/keyedit.c:6137
+#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
 #, 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:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
+#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
 msgid " (non-exportable)"
 msgstr " (vientiin kelpaamaton)"
 
-#: g10/keyedit.c:5993
+#: g10/keyedit.c:6001
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Tämä allekirjoitus vanheni %s.\n"
 
-#: g10/keyedit.c:5998
+#: g10/keyedit.c:6006
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Haluatko varmasti mitätöidä sen? (k/E) "
 
-#: g10/keyedit.c:6003
+#: g10/keyedit.c:6011
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Luodaanko tälle alekirjoitukselle mitätöintivarmenne? (k/E) "
 
-#: g10/keyedit.c:6063
+#: g10/keyedit.c:6071
 #, 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:6092
+#: g10/keyedit.c:6100
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (vientiin kelpaamaton)"
 
-#: g10/keyedit.c:6099
+#: g10/keyedit.c:6107
 #, 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:6124
+#: g10/keyedit.c:6132
 msgid "You are about to revoke these signatures:\n"
 msgstr "Olet mitätöimässä seuraavat allekirjoitukset:\n"
 
-#: g10/keyedit.c:6147
+#: g10/keyedit.c:6155
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Varmastiko luo mitätöintivarmenteet? (k/E) "
 
-#: g10/keyedit.c:6180
+#: g10/keyedit.c:6188
 #, c-format
 msgid "no secret key\n"
 msgstr "salainen avain ei ole saatavilla\n"
 
-#: g10/keyedit.c:6228
+#: g10/keyedit.c:6236
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6238
+#: g10/keyedit.c:6246
 #, 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:6255
+#: g10/keyedit.c:6263
 #, 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:6351
+#: g10/keyedit.c:6359
 #, 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:6389
+#: g10/keyedit.c:6397
 #, 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:6451
+#: g10/keyedit.c:6459
 #, 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:6548
+#: g10/keyedit.c:6556
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -5323,83 +5336,83 @@ msgstr ""
 msgid "invalid value for option '%s'\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/keygen.c:338
+#: g10/keygen.c:339
 #, fuzzy, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "valinta %c%lu on kopio\n"
 
-#: g10/keygen.c:345
+#: g10/keygen.c:346
 #, fuzzy, c-format
 msgid "too many cipher preferences\n"
 msgstr "liian monta \"%c\" valintaa\n"
 
-#: g10/keygen.c:347
+#: g10/keygen.c:348
 #, fuzzy, c-format
 msgid "too many digest preferences\n"
 msgstr "liian monta \"%c\" valintaa\n"
 
-#: g10/keygen.c:349
+#: g10/keygen.c:350
 #, fuzzy, c-format
 msgid "too many compression preferences\n"
 msgstr "liian monta \"%c\" valintaa\n"
 
-#: g10/keygen.c:351
+#: g10/keygen.c:352
 #, fuzzy, c-format
 msgid "too many AEAD preferences\n"
 msgstr "liian monta \"%c\" valintaa\n"
 
-#: g10/keygen.c:521
+#: g10/keygen.c:522
 #, fuzzy, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "Valinnassa on luvaton merkki\n"
 
-#: g10/keygen.c:1130
+#: g10/keygen.c:1131
 #, c-format
 msgid "writing direct signature\n"
 msgstr "kirjoitetaan suora allekirjoitus\n"
 
-#: g10/keygen.c:1176
+#: g10/keygen.c:1177
 #, c-format
 msgid "writing self signature\n"
 msgstr "kirjoitetaan oma-allekirjoitus\n"
 
-#: g10/keygen.c:1233
+#: g10/keygen.c:1234
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "kirjoitetaan avaimen varmentava allekirjoitus\n"
 
-#: g10/keygen.c:1598 g10/keygen.c:1603 g10/keygen.c:1655 g10/keygen.c:1660
-#: g10/keygen.c:1832 g10/keygen.c:1837
+#: g10/keygen.c:1599 g10/keygen.c:1604 g10/keygen.c:1656 g10/keygen.c:1661
+#: g10/keygen.c:1833 g10/keygen.c:1838
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "avaimen koko on virheellinen, käytetään %u bittiä\n"
 
-#: g10/keygen.c:1609 g10/keygen.c:1666 g10/keygen.c:1674 g10/keygen.c:1843
+#: g10/keygen.c:1610 g10/keygen.c:1667 g10/keygen.c:1675 g10/keygen.c:1844
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "avaimen koko on pyöristetty %u bittiin\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1701
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1899
+#: g10/keygen.c:1900
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1902
+#: g10/keygen.c:1903
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1906
 #, fuzzy
 msgid "Encrypt"
 msgstr "salaa tiedot"
 
-#: g10/keygen.c:1908
+#: g10/keygen.c:1909
 msgid "Authenticate"
 msgstr ""
 
@@ -5413,179 +5426,179 @@ msgstr ""
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1929
+#: g10/keygen.c:1930
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1967
 #, c-format
 msgid "Possible actions for this %s key: "
 msgstr ""
 
-#: g10/keygen.c:1973
+#: g10/keygen.c:1974
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1979
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1981
+#: g10/keygen.c:1982
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (vain salaus)\n"
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1985
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1987
+#: g10/keygen.c:1988
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:2116
+#: g10/keygen.c:2117
 #, fuzzy, c-format
 msgid "   (%d) RSA and RSA%s\n"
 msgstr "   (%d) DSA ja ElGamal (oletus)\n"
 
-#: g10/keygen.c:2120
+#: g10/keygen.c:2121
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal%s\n"
 msgstr "   (%d) DSA ja ElGamal (oletus)\n"
 
-#: g10/keygen.c:2123
+#: g10/keygen.c:2124
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "   (%d) DSA (sign only)%s\n"
 msgstr "   (%d) DSA (vain allekirjoitus)\n"
 
-#: g10/keygen.c:2125
+#: g10/keygen.c:2126
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (sign only)\n"
 msgid "   (%d) RSA (sign only)%s\n"
 msgstr "   (%d) RSA (vain allekirjoitus)\n"
 
-#: g10/keygen.c:2131
+#: g10/keygen.c:2132
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)%s\n"
 msgstr "   (%d) ElGamal (vain salaus)\n"
 
-#: g10/keygen.c:2133
+#: g10/keygen.c:2134
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (encrypt only)\n"
 msgid "   (%d) RSA (encrypt only)%s\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/keygen.c:2139
+#: g10/keygen.c:2140
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/keygen.c:2141
+#: g10/keygen.c:2142
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2148
 #, fuzzy, c-format
 msgid "   (%d) ECC (sign and encrypt)%s\n"
 msgstr "   (%d) RSA (salaus ja allekirjoitus)\n"
 
-#: g10/keygen.c:2147 g10/keygen.c:2678
+#: g10/keygen.c:2148 g10/keygen.c:2679
 #, fuzzy
 #| msgid " (default)"
 msgid " *default*"
 msgstr " (oletusarvo)"
 
-#: g10/keygen.c:2148
+#: g10/keygen.c:2149
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "  (%d) ECC (sign only)\n"
 msgstr "   (%d) DSA (vain allekirjoitus)\n"
 
-#: g10/keygen.c:2150
+#: g10/keygen.c:2151
 #, fuzzy, c-format
 msgid "  (%d) ECC (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/keygen.c:2152
+#: g10/keygen.c:2153
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (encrypt only)\n"
 msgid "  (%d) ECC (encrypt only)%s\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/keygen.c:2156
+#: g10/keygen.c:2157
 #, fuzzy, c-format
 msgid "  (%d) Existing key%s\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/keygen.c:2158
+#: g10/keygen.c:2159
 #, fuzzy, c-format
 msgid "  (%d) Existing key from card%s\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/keygen.c:2254 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2255 sm/certreqgen-ui.c:203
 #, fuzzy
 msgid "Enter the keygrip: "
 msgstr "Allekirjoitusnotaatio: "
 
-#: g10/keygen.c:2267 sm/certreqgen-ui.c:211 tools/gpg-card.c:2280
+#: g10/keygen.c:2268 sm/certreqgen-ui.c:211 tools/gpg-card.c:2297
 #, c-format
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr ""
 
-#: g10/keygen.c:2269 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2270 sm/certreqgen-ui.c:213
 #, fuzzy
 msgid "No key with this keygrip\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keygen.c:2288 g10/keygen.c:2298 g10/keygen.c:3440 g10/keygen.c:3451
+#: g10/keygen.c:2289 g10/keygen.c:2299 g10/keygen.c:3444 g10/keygen.c:3455
 #: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
 #, fuzzy, c-format
 msgid "error reading the card: %s\n"
 msgstr "%s: virhe luettaessa vapaata tietuetta: %s\n"
 
-#: g10/keygen.c:2292 g10/keygen.c:3444 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2293 g10/keygen.c:3448 sm/certreqgen-ui.c:234
 #, fuzzy, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: g10/keygen.c:2311 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2312 sm/certreqgen-ui.c:246
 #, fuzzy
 msgid "Available keys:\n"
 msgstr "poista avain käytöstä"
 
-#: g10/keygen.c:2504 g10/keygen.c:2518
+#: g10/keygen.c:2505 g10/keygen.c:2519
 #, fuzzy, c-format
 #| msgid "rounded up to %u bits\n"
 msgid "rounded to %u bits\n"
 msgstr "pyöristetty %u bittiin\n"
 
-#: g10/keygen.c:2559
+#: g10/keygen.c:2560
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:2567
+#: g10/keygen.c:2568
 #, fuzzy, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Minkä kokoisen avaimen haluat? (1024) "
 
-#: g10/keygen.c:2584 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2585 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Halutun avaimen koko on %u bittiä\n"
 
-#: g10/keygen.c:2630
+#: g10/keygen.c:2631
 #, fuzzy
 #| msgid "Please select what kind of key you want:\n"
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Valitse millaisen avaimen haluat:\n"
 
-#: g10/keygen.c:2819
+#: g10/keygen.c:2820
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5601,7 +5614,7 @@ msgstr ""
 "     <n>m = Avain vanhenee n kuukauden kuluttua\n"
 "     <n>y = Avain vanhenee n vuoden kuluttua\n"
 
-#: g10/keygen.c:2830
+#: g10/keygen.c:2831
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5617,40 +5630,40 @@ msgstr ""
 "     <n>m = Allekirjoitus vanhenee n kuukauden kuluttua\n"
 "     <n>y = Allekirjoitus vanhenee n vuoden kuluttua\n"
 
-#: g10/keygen.c:2853
+#: g10/keygen.c:2854
 msgid "Key is valid for? (0) "
 msgstr "Avain on voimassa? (0) "
 
-#: g10/keygen.c:2858
+#: g10/keygen.c:2859
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Allekirjoitus on voimassa? (0) "
 
-#: g10/keygen.c:2871 g10/keygen.c:2896
+#: g10/keygen.c:2875 g10/keygen.c:2900
 msgid "invalid value\n"
 msgstr "arvo ei kelpaa\n"
 
-#: g10/keygen.c:2878
+#: g10/keygen.c:2882
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s ei vanhene koskaan\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2883
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s ei vanhene koskaan\n"
 
-#: g10/keygen.c:2884
+#: g10/keygen.c:2888
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s vanhenee %s\n"
 
-#: g10/keygen.c:2885
+#: g10/keygen.c:2889
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Allekirjoitus vanhenee %s\n"
 
-#: g10/keygen.c:2889
+#: g10/keygen.c:2893
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5658,12 +5671,12 @@ msgstr ""
 "Järjestelmäsi ei osaa näyttää päiväyksiä kuin vuoteen 2038.\n"
 "Se kuitenkin käsittelee päiväykset oikein vuoteen 2106.\n"
 
-#: g10/keygen.c:2902
+#: g10/keygen.c:2906
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Onko tämä oikein (k/e) "
 
-#: g10/keygen.c:2970
+#: g10/keygen.c:2974
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5674,7 +5687,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2985
+#: g10/keygen.c:2989
 #, fuzzy
 msgid ""
 "\n"
@@ -5692,50 +5705,50 @@ msgstr ""
 "     \"Matti Meikäläinen (nuorempi) <matti.meikalainen@osoite.fi>\"\n"
 "\n"
 
-#: g10/keygen.c:3004
+#: g10/keygen.c:3008
 msgid "Real name: "
 msgstr "Oikea nimi: "
 
-#: g10/keygen.c:3013
+#: g10/keygen.c:3017
 msgid "Invalid character in name\n"
 msgstr "Nimessä on epäkelpo merkki\n"
 
-#: g10/keygen.c:3014
+#: g10/keygen.c:3018
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:3018
+#: g10/keygen.c:3022
 msgid "Name may not start with a digit\n"
 msgstr "Nimi ei voi alkaa numerolla\n"
 
-#: g10/keygen.c:3021
+#: g10/keygen.c:3025
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nimen täytyy olla vähintään 5 merkkiä pitkä\n"
 
-#: g10/keygen.c:3031
+#: g10/keygen.c:3035
 msgid "Email address: "
 msgstr "Sähköpostiosoite: "
 
-#: g10/keygen.c:3037
+#: g10/keygen.c:3041
 msgid "Not a valid email address\n"
 msgstr "Sähköpostiosoite ei kelpaa\n"
 
-#: g10/keygen.c:3046
+#: g10/keygen.c:3050
 msgid "Comment: "
 msgstr "Huomautus: "
 
-#: g10/keygen.c:3052
+#: g10/keygen.c:3056
 msgid "Invalid character in comment\n"
 msgstr "Huomautuksessa on epäkelpo merkki\n"
 
-#: g10/keygen.c:3088
+#: g10/keygen.c:3092
 #, fuzzy, c-format
 #| msgid "You are using the `%s' character set.\n"
 msgid "You are using the '%s' character set.\n"
 msgstr "Käytät merkistöä \"%s\".\n"
 
-#: g10/keygen.c:3094
+#: g10/keygen.c:3098
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5746,7 +5759,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3099
+#: g10/keygen.c:3103
 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"
 
@@ -5761,35 +5774,35 @@ msgstr "Älä syötä sähköpostiosoitetta nimen tai huomautuksen paikalle\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3124
+#: g10/keygen.c:3128
 msgid "NnCcEeOoQq"
 msgstr "NnHhSsOoLl"
 
-#: g10/keygen.c:3134
+#: g10/keygen.c:3138
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Muuta (N)imi, (H)uomautus, (S)ähköposti vai (L)opeta?"
 
-#: g10/keygen.c:3135
+#: g10/keygen.c:3139
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Muuta (N)imi, (H)uomautus, (S)ähköposti vai (O)k/(L)opeta?"
 
-#: g10/keygen.c:3140
+#: g10/keygen.c:3144
 #, fuzzy
 #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Muuta (N)imi, (H)uomautus, (S)ähköposti vai (L)opeta?"
 
-#: g10/keygen.c:3141
+#: g10/keygen.c:3145
 #, fuzzy
 #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "Muuta (N)imi, (H)uomautus, (S)ähköposti vai (O)k/(L)opeta?"
 
-#: g10/keygen.c:3160
+#: g10/keygen.c:3164
 msgid "Please correct the error first\n"
 msgstr "Ole hyvä ja korjaa ensin virhe\n"
 
-#: g10/keygen.c:3206
+#: g10/keygen.c:3210
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -5801,18 +5814,18 @@ msgstr ""
 "alkulukujen luomisen aikana, tämä antaa satunnaislukugeneraattorille\n"
 "paremmat mahdollisuudet kerätä riittävästi entropiaa.\n"
 
-#: g10/keygen.c:3591
+#: g10/keygen.c:3595
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4590 g10/keygen.c:4663 g10/keygen.c:4681 g10/keygen.c:4710
-#: g10/keygen.c:5086 g10/keygen.c:5632 g10/keygen.c:5943 g10/keygen.c:6050
+#: g10/keygen.c:4594 g10/keygen.c:4667 g10/keygen.c:4685 g10/keygen.c:4714
+#: g10/keygen.c:5113 g10/keygen.c:5663 g10/keygen.c:5974 g10/keygen.c:6081
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Avaimen luonti epäonnistui: %s\n"
 
-#: g10/keygen.c:4599
+#: g10/keygen.c:4603
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5820,67 +5833,67 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:4601
+#: g10/keygen.c:4605
 msgid "Continue? (Y/n) "
 msgstr ""
 
-#: g10/keygen.c:4622
+#: g10/keygen.c:4626
 #, fuzzy, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "\"%s\" on jo pakattu\n"
 
-#: g10/keygen.c:4627
+#: g10/keygen.c:4631
 #, fuzzy
 msgid "Create anyway? (y/N) "
 msgstr "Haluatko käyttää tätä avainta kaikesta huolimatta? "
 
-#: g10/keygen.c:4633
+#: g10/keygen.c:4637
 #, fuzzy, c-format
 msgid "creating anyway\n"
 msgstr "luo uusi avainpari"
 
-#: g10/keygen.c:5069
+#: g10/keygen.c:5096
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 
-#: g10/keygen.c:5118
+#: g10/keygen.c:5145
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Avaimen luonti keskeytetty.\n"
 
-#: g10/keygen.c:5178
+#: g10/keygen.c:5205
 #, fuzzy, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
-#: g10/keygen.c:5198
+#: g10/keygen.c:5225
 #, fuzzy, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "HUOM: salainen avain %08lX vanheni %s\n"
 
-#: g10/keygen.c:5359 g10/keygen.c:5561
+#: g10/keygen.c:5389 g10/keygen.c:5591
 #, fuzzy, c-format
 #| msgid "writing public key to `%s'\n"
 msgid "writing public key to '%s'\n"
 msgstr "kirjoitan julkisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/keygen.c:5555
+#: g10/keygen.c:5585
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kirjoitettavissa olevaa julkista avainrengasta ei löydy: %s\n"
 
-#: g10/keygen.c:5569
+#: g10/keygen.c:5599
 #, fuzzy, c-format
 #| msgid "error writing public keyring `%s': %s\n"
 msgid "error writing public keyring '%s': %s\n"
 msgstr "virhe kirjoitettaessa julkiseen avainrenkaaseen \"%s\": %s\n"
 
-#: g10/keygen.c:5603
+#: g10/keygen.c:5634
 msgid "public and secret key created and signed.\n"
 msgstr "julkinen ja salainen avain on luotu ja allekirjoitettu.\n"
 
-#: g10/keygen.c:5619
+#: g10/keygen.c:5650
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -5889,7 +5902,7 @@ msgstr ""
 "Huomaa, että tätä avainta ei voida käyttää salaamiseen.  Käytä komentoa\n"
 "\"--edit-key\" luodaksesi toissijaisen avaimen salaustarkoitukseen.\n"
 
-#: g10/keygen.c:5801 g10/keygen.c:6000
+#: g10/keygen.c:5832 g10/keygen.c:6031
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5897,7 +5910,7 @@ msgstr ""
 "avain on luotu %lu sekunti tulevaisuudessa (on tapahtunut aikahyppy tai\n"
 "kellon kanssa on ongelmia)\n"
 
-#: g10/keygen.c:5803 g10/keygen.c:6002
+#: g10/keygen.c:5834 g10/keygen.c:6033
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5905,23 +5918,23 @@ msgstr ""
 "avain on luotu %lu sekuntia tulevaisuudessa (on tapahtunut aikahyppy tai\n"
 "kellon kanssa on ongelmia)\n"
 
-#: g10/keygen.c:5814 g10/keygen.c:6013
+#: g10/keygen.c:5845 g10/keygen.c:6044
 #, fuzzy, c-format
 #| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "HUOM: v3-aliavainten luonti ei ole OpenPGP:n mukaista\n"
 
-#: g10/keygen.c:5826 g10/keygen.c:5828
+#: g10/keygen.c:5857 g10/keygen.c:5859
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
 
-#: g10/keygen.c:5835 g10/keygen.c:5837
+#: g10/keygen.c:5866 g10/keygen.c:5868
 #, fuzzy, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
 
-#: g10/keygen.c:5857 g10/keygen.c:6027
+#: g10/keygen.c:5888 g10/keygen.c:6058
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Haluatko varmasti luoda? "
@@ -6004,26 +6017,26 @@ msgstr "     Avaimen sormenjälki ="
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1467
+#: g10/keyring.c:1477
 #, fuzzy, c-format
 msgid "caching keyring '%s'\n"
 msgstr "tarkistetaan avainrengasta \"%s\"\n"
 
-#: g10/keyring.c:1541
+#: g10/keyring.c:1551
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signature)\n"
 msgid_plural "%lu keys cached so far (%lu signatures)\n"
 msgstr[0] "käsiteltiin %lu avainta (%lu allekirjoitusta)\n"
 msgstr[1] "käsiteltiin %lu avainta (%lu allekirjoitusta)\n"
 
-#: g10/keyring.c:1557
+#: g10/keyring.c:1567
 #, c-format
 msgid "%lu key cached"
 msgid_plural "%lu keys cached"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/keyring.c:1559
+#: g10/keyring.c:1569
 #, fuzzy, c-format
 #| msgid "1 bad signature\n"
 msgid " (%lu signature)\n"
@@ -6031,7 +6044,7 @@ msgid_plural " (%lu signatures)\n"
 msgstr[0] "1 väärä allekirjoitus\n"
 msgstr[1] "1 väärä allekirjoitus\n"
 
-#: g10/keyring.c:1636
+#: g10/keyring.c:1646
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: avainrengas luotu\n"
@@ -6061,80 +6074,75 @@ msgstr ""
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/keyserver.c:537
+#: g10/keyserver.c:360
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:740
+#: g10/keyserver.c:563
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:846
+#: g10/keyserver.c:669
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/keyserver.c:986 g10/keyserver.c:1096
+#: g10/keyserver.c:809 g10/keyserver.c:919
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1420 g10/keyserver.c:1453
+#: g10/keyserver.c:1217 g10/keyserver.c:1250
 #, 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:1427
+#: g10/keyserver.c:1224
 #, 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:1531
+#: g10/keyserver.c:1316
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1319
 #, fuzzy, c-format
 msgid "key not found on keyserver\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: g10/keyserver.c:1722
-#, fuzzy, c-format
-msgid "requesting key %s from %s server %s\n"
-msgstr "pyydetään avainta %08lX kohteesta %s\n"
-
-#: g10/keyserver.c:1726
+#: g10/keyserver.c:1481
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/keyserver.c:1841 g10/keyserver.c:2020
+#: g10/keyserver.c:1600 g10/keyserver.c:1793
 #, fuzzy, c-format
 msgid "no keyserver known\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/keyserver.c:1856 g10/skclist.c:213 g10/skclist.c:241
+#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "ohitetaan \"%s\": %s\n"
 
-#: g10/keyserver.c:1860
+#: g10/keyserver.c:1619
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "allekirjoitettu avaimellasi %08lX %s\n"
 
-#: g10/keyserver.c:1901
+#: g10/keyserver.c:1662
 #, fuzzy, c-format
 msgid "requesting key from '%s'\n"
 msgstr "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/keyserver.c:1917
+#: g10/keyserver.c:1680
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
@@ -6161,245 +6169,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:472
+#: g10/mainproc.c:473
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "julkinen avain on %08lX\n"
 
-#: g10/mainproc.c:524
+#: g10/mainproc.c:525
 #, 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:528 g10/pkclist.c:231
+#: g10/mainproc.c:529 g10/pkclist.c:231
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                aka \""
 
-#: g10/mainproc.c:532
+#: g10/mainproc.c:533
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "salattu %s-avaimella, tunnus %08lX\n"
 
-#: g10/mainproc.c:552 g10/mainproc.c:935
+#: g10/mainproc.c:553 g10/mainproc.c:937
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:560
+#: g10/mainproc.c:561
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "salattu %lu salasanalla\n"
 
-#: g10/mainproc.c:562
+#: g10/mainproc.c:563
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "salattu yhdellä salasanalla\n"
 
-#: g10/mainproc.c:577 g10/mainproc.c:602
+#: g10/mainproc.c:578 g10/mainproc.c:603
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "julkisen avaimen avaus epäonnistui: %s\n"
 
-#: g10/mainproc.c:613
+#: g10/mainproc.c:614
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "julkisella avaimella salattu data: DEK kelpaa\n"
 
-#: g10/mainproc.c:642 g10/mainproc.c:663
+#: g10/mainproc.c:643 g10/mainproc.c:664
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "oletettavasti %s-salattua dataa\n"
 
-#: g10/mainproc.c:649
+#: g10/mainproc.c:650
 #, 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:742 g10/mainproc.c:780
+#: g10/mainproc.c:744 g10/mainproc.c:782
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "VAROITUS: viestin eheyttä ei oltu suojattu\n"
 
-#: g10/mainproc.c:753
+#: g10/mainproc.c:755
 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:756
+#: g10/mainproc.c:758
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:761
+#: g10/mainproc.c:763
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "avaus epäonnistui: %s\n"
 
-#: g10/mainproc.c:773
+#: g10/mainproc.c:775
 #, c-format
 msgid "decryption okay\n"
 msgstr "avaus onnistui\n"
 
-#: g10/mainproc.c:786
+#: g10/mainproc.c:788
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VAROITUS: salattua viestiä on muokattu!\n"
 
-#: g10/mainproc.c:804
+#: g10/mainproc.c:806
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "avaus epäonnistui: %s\n"
 
-#: g10/mainproc.c:851
+#: g10/mainproc.c:853
 #, 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:858
+#: g10/mainproc.c:860
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "alkuperäisen tiedoston nimi=\"%.*s\"\n"
 
-#: g10/mainproc.c:1135
+#: g10/mainproc.c:1137
 #, 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:1440 g10/mainproc.c:1483
+#: g10/mainproc.c:1442 g10/mainproc.c:1485
 #, fuzzy, c-format
 msgid "no signature found\n"
 msgstr "Allekirjoitus täsmää lähettäjään \""
 
-#: g10/mainproc.c:1763
+#: g10/mainproc.c:1765
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "VÄÄRÄ allekirjoitus lähettäjältä \""
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1767
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Vanhentunut allekirjoitus lähettäjältä \""
 
-#: g10/mainproc.c:1767
+#: g10/mainproc.c:1769
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Allekirjoitus täsmää lähettäjään \""
 
-#: g10/mainproc.c:1789
+#: g10/mainproc.c:1791
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "allekirjoituksen varmistus vaiennetaan\n"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1905
 #, fuzzy, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "näitä allekirjoituksia ei voi käsitellä\n"
 
-#: g10/mainproc.c:1919 g10/mainproc.c:1926
+#: g10/mainproc.c:1921 g10/mainproc.c:1928
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: g10/mainproc.c:1920 g10/mainproc.c:1927 sm/verify.c:480
+#: g10/mainproc.c:1922 g10/mainproc.c:1929 sm/verify.c:480
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                aka \""
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1933
 #, 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:1937
+#: g10/mainproc.c:1939
 #, fuzzy, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "                aka \""
 
-#: g10/mainproc.c:1992
+#: g10/mainproc.c:1994
 #, c-format
 msgid "Key available at: "
 msgstr "Avain saatavilla kohteessa: "
 
-#: g10/mainproc.c:2034
+#: g10/mainproc.c:2036
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2234
+#: g10/mainproc.c:2236
 msgid "[uncertain]"
 msgstr "[ei tiedossa]"
 
-#: g10/mainproc.c:2272
+#: g10/mainproc.c:2274
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                aka \""
 
-#: g10/mainproc.c:2347
+#: g10/mainproc.c:2349
 #, 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:2363
+#: g10/mainproc.c:2365
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: g10/mainproc.c:2368
+#: g10/mainproc.c:2370
 #, 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:2379
+#: g10/mainproc.c:2381
 #, 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:2380
+#: g10/mainproc.c:2382
 msgid "binary"
 msgstr "binääri"
 
-#: g10/mainproc.c:2381
+#: g10/mainproc.c:2383
 msgid "textmode"
 msgstr "teksti"
 
-#: g10/mainproc.c:2381 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2383 g10/trust.c:112 dirmngr/ocsp.c:793
 msgid "unknown"
 msgstr "tuntematon "
 
-#: g10/mainproc.c:2383
+#: g10/mainproc.c:2385
 #, fuzzy
 #| msgid "unknown pubkey algorithm"
 msgid ", key algorithm "
 msgstr "tuntematon julkisen avaimen algoritmi"
 
-#: g10/mainproc.c:2418
+#: g10/mainproc.c:2420
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2457
+#: g10/mainproc.c:2459
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Allekirjoitusta ei voi tarkistaa: %s\n"
 
-#: g10/mainproc.c:2553 g10/mainproc.c:2572 g10/mainproc.c:2696
+#: g10/mainproc.c:2555 g10/mainproc.c:2574 g10/mainproc.c:2698
 #, c-format
 msgid "not a detached signature\n"
 msgstr "allekirjoitus ei ole erillinen\n"
 
-#: g10/mainproc.c:2606
+#: g10/mainproc.c:2608
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
@@ -6407,12 +6415,12 @@ msgstr ""
 "VAROITUS: useita allekirjoituksia havaittu.  Vain ensimmäisen voi "
 "tarkistaa.\n"
 
-#: g10/mainproc.c:2615
+#: g10/mainproc.c:2617
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "itsenäinen allekirjoitus luokkaa 0x%02x\n"
 
-#: g10/mainproc.c:2700
+#: g10/mainproc.c:2702
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "vanhan tyylin (PGP 2.x) allekirjoitus\n"
@@ -6602,51 +6610,56 @@ msgstr "Kriittinen allekirjoitusnotaatio: "
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "tyypin %d alipaketilla on kriittinen bitti asetettuna\n"
 
-#: g10/passphrase.c:208
+#: g10/passphrase.c:201 sm/decrypt.c:669
+#, fuzzy
+msgid "Please enter the passphrase for decryption."
+msgstr "muuta salasanaa"
+
+#: g10/passphrase.c:203
 msgid "Enter passphrase\n"
 msgstr "Syötä salasana\n"
 
-#: g10/passphrase.c:219
+#: g10/passphrase.c:227
 #, c-format
 msgid "cancelled by user\n"
 msgstr "käyttäjän peruma\n"
 
-#: g10/passphrase.c:460
+#: g10/passphrase.c:472
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (pääavaimen tunnus %08lX)"
 
-#: g10/passphrase.c:467
+#: g10/passphrase.c:479
 #, fuzzy
 msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
-#: g10/passphrase.c:471
+#: g10/passphrase.c:483
 #, fuzzy
 msgid "Please enter the passphrase to import the OpenPGP secret key:"
 msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
-#: g10/passphrase.c:476
+#: g10/passphrase.c:488
 #, fuzzy
 msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
-#: g10/passphrase.c:479
+#: g10/passphrase.c:491
 #, fuzzy
 msgid "Please enter the passphrase to export the OpenPGP secret key:"
 msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
-#: g10/passphrase.c:484
+#: g10/passphrase.c:496
 #, fuzzy
 msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 msgstr "Haluatko varmasti poistaa valitut avaimet? "
 
-#: g10/passphrase.c:487
+#: g10/passphrase.c:499
 #, fuzzy
 msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgstr "Haluatko varmasti poistaa valitut avaimet? "
 
-#: g10/passphrase.c:496
+#: g10/passphrase.c:508
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -6819,7 +6832,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:313 g10/revoke.c:803
+#: g10/pkclist.c:313 g10/revoke.c:804
 msgid "Your decision? "
 msgstr "Valintasi? "
 
@@ -7127,7 +7140,7 @@ msgstr "allekirjoitetun datan \"%s\" avaaminen ei onnistu\n"
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "allekirjoitetun datan \"%s\" avaaminen ei onnistu\n"
 
-#: g10/pubkey-enc.c:99 sm/decrypt.c:879
+#: g10/pubkey-enc.c:99 sm/decrypt.c:1329
 #, fuzzy, c-format
 msgid "key %s is not suitable for decryption in %s mode\n"
 msgstr "avain %08lX: ei käyttäjätunnusta\n"
@@ -7174,7 +7187,7 @@ msgid "Note: key has been revoked"
 msgstr "HUOM: avain on mitätöity!"
 
 #: g10/revoke.c:100 g10/revoke.c:126 g10/revoke.c:172 g10/revoke.c:184
-#: g10/revoke.c:502
+#: g10/revoke.c:503
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet epäonnistui: %s\n"
@@ -7203,11 +7216,11 @@ msgstr "Salainen avain on saatavilla.\n"
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Luo tälle avaimelle mitätöintivarmenne? "
 
-#: g10/revoke.c:334 g10/revoke.c:744
+#: g10/revoke.c:334 g10/revoke.c:745
 msgid "ASCII armored output forced.\n"
 msgstr "ASCII-koodattu tuloste määritetty.\n"
 
-#: g10/revoke.c:350 g10/revoke.c:481
+#: g10/revoke.c:350 g10/revoke.c:482
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet epäonnistui: %s\n"
@@ -7221,19 +7234,19 @@ msgstr "Mitätöintivarmenne luotu.\n"
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "mitätöintiavainta ei löydy avaimelle \"%s\"\n"
 
-#: g10/revoke.c:567
+#: g10/revoke.c:568
 #, fuzzy
 msgid "This is a revocation certificate for the OpenPGP key:"
 msgstr "Luo tälle avaimelle mitätöintivarmenne? "
 
-#: g10/revoke.c:583
+#: g10/revoke.c:584
 msgid ""
 "A revocation certificate is a kind of \"kill switch\" to publicly\n"
 "declare that a key shall not anymore be used.  It is not possible\n"
 "to retract such a revocation certificate once it has been published."
 msgstr ""
 
-#: g10/revoke.c:586
+#: g10/revoke.c:587
 msgid ""
 "Use it to revoke this key in case of a compromise or loss of\n"
 "the secret key.  However, if the secret key is still accessible,\n"
@@ -7242,20 +7255,20 @@ msgid ""
 "of the gpg command \"--generate-revocation\" in the GnuPG manual."
 msgstr ""
 
-#: g10/revoke.c:592
+#: g10/revoke.c:593
 msgid ""
 "To avoid an accidental use of this file, a colon has been inserted\n"
 "before the 5 dashes below.  Remove this colon with a text editor\n"
 "before importing and publishing this revocation certificate."
 msgstr ""
 
-#: g10/revoke.c:611
+#: g10/revoke.c:612
 #, fuzzy, c-format
 #| msgid "Revocation certificate created.\n"
 msgid "revocation certificate stored as '%s.rev'\n"
 msgstr "Mitätöintivarmenne luotu.\n"
 
-#: g10/revoke.c:655
+#: g10/revoke.c:656
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found\n"
 msgstr "salaista avainta \"%s\" ei löydy: %s\n"
@@ -7263,23 +7276,23 @@ msgstr "salaista avainta \"%s\" ei löydy: %s\n"
 #. TRANSLATORS: The %s prints a key specification which
 #. for example has been given at the command line.  Several lines
 #. lines with secret key infos are printed after this message.
-#: g10/revoke.c:680
+#: g10/revoke.c:681
 #, c-format
 msgid "'%s' matches multiple secret keys:\n"
 msgstr ""
 
-#: g10/revoke.c:705
+#: g10/revoke.c:706
 #, fuzzy, c-format
 #| msgid "error creating keyring `%s': %s\n"
 msgid "error searching the keyring: %s\n"
 msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
 
-#: g10/revoke.c:728
+#: g10/revoke.c:729
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Luo tälle avaimelle mitätöintivarmenne? "
 
-#: g10/revoke.c:752
+#: g10/revoke.c:753
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -7299,33 +7312,33 @@ msgstr ""
 "tulostusjärjestelmä saattaa tallentaa datan ja saattaa sen muiden "
 "saataville!\n"
 
-#: g10/revoke.c:786
+#: g10/revoke.c:787
 msgid "Please select the reason for the revocation:\n"
 msgstr "Valitse mitätöinnin syy:\n"
 
-#: g10/revoke.c:796
+#: g10/revoke.c:797
 msgid "Cancel"
 msgstr "Peru"
 
-#: g10/revoke.c:798
+#: g10/revoke.c:799
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Todennäköisesti haluat valita %d tässä)\n"
 
-#: g10/revoke.c:839
+#: g10/revoke.c:843
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Syötä vapaaehtoinen kuvaus; lopeta tyhjään riviin:\n"
 
-#: g10/revoke.c:867
+#: g10/revoke.c:871
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Mitätöinnin syy: %s\n"
 
-#: g10/revoke.c:869
+#: g10/revoke.c:873
 msgid "(No description given)\n"
 msgstr "(Kuvausta ei annettu)\n"
 
-#: g10/revoke.c:874
+#: g10/revoke.c:878
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Kelpaako tämä? "
@@ -7504,24 +7517,24 @@ msgstr "allekirjoitetaan:"
 msgid "%s.%s encryption will be used\n"
 msgstr "käytetään %s-salausta\n"
 
-#: g10/skclist.c:172 g10/skclist.c:253
+#: g10/skclist.c:173 g10/skclist.c:254
 #, c-format
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "avainta ei ole merkitty turvattomaksi - sitä ei voida käyttää jäljitellyn\n"
 "satunnaislukugeneraattorin kanssa!\n"
 
-#: g10/skclist.c:204
+#: g10/skclist.c:205
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "ohitetaan \"%s\": kopio\n"
 
-#: g10/skclist.c:223
+#: g10/skclist.c:224
 #, c-format
 msgid "skipped: secret key already present\n"
 msgstr "ohitetaan: salainen avain on jo paikalla\n"
 
-#: g10/skclist.c:242
+#: g10/skclist.c:243
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
@@ -7750,10 +7763,10 @@ msgstr ""
 msgid "TOFU DB error"
 msgstr ""
 
-#: g10/tofu.c:687 g10/tofu.c:2073 g10/tofu.c:2354 g10/tofu.c:2373
-#: g10/tofu.c:2386 g10/tofu.c:2398 g10/tofu.c:2413 g10/tofu.c:2425
-#: g10/tofu.c:3021 g10/tofu.c:3038 g10/tofu.c:3075 g10/tofu.c:3092
-#: g10/tofu.c:3404
+#: g10/tofu.c:687 g10/tofu.c:2077 g10/tofu.c:2358 g10/tofu.c:2377
+#: g10/tofu.c:2390 g10/tofu.c:2402 g10/tofu.c:2417 g10/tofu.c:2429
+#: g10/tofu.c:3025 g10/tofu.c:3042 g10/tofu.c:3079 g10/tofu.c:3096
+#: g10/tofu.c:3408
 #, fuzzy, c-format
 msgid "error reading TOFU database: %s\n"
 msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
@@ -7775,7 +7788,7 @@ msgstr "%s: virhe kirjoitettaessa hakemistotietuetta: %s\n"
 msgid "error opening TOFU database '%s': %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: g10/tofu.c:1148 g10/tofu.c:3458 g10/tofu.c:3604
+#: g10/tofu.c:1148 g10/tofu.c:3462 g10/tofu.c:3608
 #, fuzzy, c-format
 msgid "error updating TOFU database: %s\n"
 msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
@@ -7815,43 +7828,43 @@ msgstr "virhe luotaessa salasanaa: %s\n"
 msgid "This key's user IDs:\n"
 msgstr "näytä avaimet ja käyttäjätunnukset"
 
-#: g10/tofu.c:1634 g10/tofu.c:1799
+#: g10/tofu.c:1634 g10/tofu.c:1801
 #, fuzzy, c-format
 #| msgid "Policy: "
 msgid "policy: %s"
 msgstr "Käytäntö: "
 
-#: g10/tofu.c:1725
+#: g10/tofu.c:1727
 #, fuzzy, c-format
 msgid "error gathering signature stats: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: g10/tofu.c:1729
+#: g10/tofu.c:1731
 #, c-format
 msgid "The email address \"%s\" is associated with %d key:\n"
 msgid_plural "The email address \"%s\" is associated with %d keys:\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1747
+#: g10/tofu.c:1749
 #, c-format
 msgid "Statistics for keys with the email address \"%s\":\n"
 msgstr ""
 
-#: g10/tofu.c:1797
+#: g10/tofu.c:1799
 #, fuzzy
 #| msgid "list keys"
 msgid "this key"
 msgstr "näytä avaimet"
 
-#: g10/tofu.c:1823
+#: g10/tofu.c:1825
 #, fuzzy, c-format
 msgid "Verified %d message."
 msgid_plural "Verified %d messages."
 msgstr[0] "|algo [tiedostot]|tulosta viestien tiivisteet"
 msgstr[1] "|algo [tiedostot]|tulosta viestien tiivisteet"
 
-#: g10/tofu.c:1827
+#: g10/tofu.c:1829
 #, fuzzy, c-format
 #| msgid "encrypted with %lu passphrases\n"
 msgid "Encrypted %d message."
@@ -7859,68 +7872,68 @@ msgid_plural "Encrypted %d messages."
 msgstr[0] "salattu %lu salasanalla\n"
 msgstr[1] "salattu %lu salasanalla\n"
 
-#: g10/tofu.c:1834
+#: g10/tofu.c:1836
 #, fuzzy, c-format
 msgid "Verified %d message in the future."
 msgid_plural "Verified %d messages in the future."
 msgstr[0] "|algo [tiedostot]|tulosta viestien tiivisteet"
 msgstr[1] "|algo [tiedostot]|tulosta viestien tiivisteet"
 
-#: g10/tofu.c:1838
+#: g10/tofu.c:1840
 #, fuzzy, c-format
 msgid "Encrypted %d message in the future."
 msgid_plural "Encrypted %d messages in the future."
 msgstr[0] "|algo [tiedostot]|tulosta viestien tiivisteet"
 msgstr[1] "|algo [tiedostot]|tulosta viestien tiivisteet"
 
-#: g10/tofu.c:1852
+#: g10/tofu.c:1854
 #, c-format
 msgid "Messages verified over the past %d day: %d."
 msgid_plural "Messages verified over the past %d days: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1858
+#: g10/tofu.c:1860
 #, c-format
 msgid "Messages encrypted over the past %d day: %d."
 msgid_plural "Messages encrypted over the past %d days: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1868
+#: g10/tofu.c:1870
 #, c-format
 msgid "Messages verified over the past %d month: %d."
 msgid_plural "Messages verified over the past %d months: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1874
+#: g10/tofu.c:1876
 #, c-format
 msgid "Messages encrypted over the past %d month: %d."
 msgid_plural "Messages encrypted over the past %d months: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1884
+#: g10/tofu.c:1886
 #, c-format
 msgid "Messages verified over the past %d year: %d."
 msgid_plural "Messages verified over the past %d years: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1890
+#: g10/tofu.c:1892
 #, c-format
 msgid "Messages encrypted over the past %d year: %d."
 msgid_plural "Messages encrypted over the past %d years: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1898
+#: g10/tofu.c:1900
 #, c-format
 msgid "Messages verified in the past: %d."
 msgstr ""
 
-#: g10/tofu.c:1902
+#: g10/tofu.c:1904
 #, fuzzy, c-format
 msgid "Messages encrypted in the past: %d."
 msgstr "|algo [tiedostot]|tulosta viestien tiivisteet"
@@ -7928,130 +7941,130 @@ msgstr "|algo [tiedostot]|tulosta viestien tiivisteet"
 #. TRANSLATORS: Please translate the text found in the source
 #. * file below.  We don't directly internationalize that text so
 #. * that we can tweak it without breaking translations.
-#: g10/tofu.c:1919
+#: g10/tofu.c:1921
 msgid "TOFU detected a binding conflict"
 msgstr ""
 
 #. TRANSLATORS: Two letters (normally the lower and upper case
 #. * version of the hotkey) for each of the five choices.  If
 #. * there is only one choice in your language, repeat it.
-#: g10/tofu.c:1961
+#: g10/tofu.c:1963
 msgid "gGaAuUrRbB"
 msgstr ""
 
-#: g10/tofu.c:1967
+#: g10/tofu.c:1969
 msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 
-#: g10/tofu.c:1975
+#: g10/tofu.c:1978
 msgid "Defaulting to unknown.\n"
 msgstr ""
 
-#: g10/tofu.c:2093 g10/tofu.c:2228
+#: g10/tofu.c:2097 g10/tofu.c:2232
 #, c-format
 msgid "TOFU db corruption detected.\n"
 msgstr ""
 
-#: g10/tofu.c:2829
+#: g10/tofu.c:2833
 #, fuzzy, c-format
 msgid "error changing TOFU policy: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: g10/tofu.c:2880
+#: g10/tofu.c:2884
 #, c-format
 msgid "%lld~year"
 msgid_plural "%lld~years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2885
+#: g10/tofu.c:2889
 #, c-format
 msgid "%lld~month"
 msgid_plural "%lld~months"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2890
+#: g10/tofu.c:2894
 #, c-format
 msgid "%lld~week"
 msgid_plural "%lld~weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2895
+#: g10/tofu.c:2899
 #, c-format
 msgid "%lld~day"
 msgid_plural "%lld~days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2900
+#: g10/tofu.c:2904
 #, c-format
 msgid "%lld~hour"
 msgid_plural "%lld~hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2905
+#: g10/tofu.c:2909
 #, c-format
 msgid "%lld~minute"
 msgid_plural "%lld~minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2907
+#: g10/tofu.c:2911
 #, c-format
 msgid "%lld~second"
 msgid_plural "%lld~seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:3145
+#: g10/tofu.c:3149
 #, c-format
 msgid "%s: Verified 0~signatures and encrypted 0~messages."
 msgstr ""
 
-#: g10/tofu.c:3151
+#: g10/tofu.c:3155
 #, fuzzy, c-format
 #| msgid "Deleted %d signatures.\n"
 msgid "%s: Verified 0 signatures."
 msgstr "%d allekirjoitusta poistettu.\n"
 
-#: g10/tofu.c:3165
+#: g10/tofu.c:3169
 #, fuzzy
 #| msgid "encrypted with %lu passphrases\n"
 msgid "Encrypted 0 messages."
 msgstr "salattu %lu salasanalla\n"
 
-#: g10/tofu.c:3181
+#: g10/tofu.c:3185
 #, fuzzy, c-format
 #| msgid "Policy: "
 msgid "(policy: %s)"
 msgstr "Käytäntö: "
 
-#: g10/tofu.c:3215
+#: g10/tofu.c:3219
 #, c-format
 msgid ""
 "Warning: we have yet to see a message signed using this key and user id!\n"
 msgstr ""
 
-#: g10/tofu.c:3218
+#: g10/tofu.c:3222
 #, c-format
 msgid ""
 "Warning: we've only seen one message signed using this key and user id!\n"
 msgstr ""
 
-#: g10/tofu.c:3222
+#: g10/tofu.c:3226
 #, c-format
 msgid "Warning: you have yet to encrypt a message to this key!\n"
 msgstr ""
 
-#: g10/tofu.c:3225
+#: g10/tofu.c:3229
 #, c-format
 msgid "Warning: you have only encrypted one message to this key!\n"
 msgstr ""
 
-#: g10/tofu.c:3254
+#: g10/tofu.c:3258
 #, c-format
 msgid ""
 "Warning: if you think you've seen more signatures by this key and user id, "
@@ -8068,13 +8081,13 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:3339 g10/tofu.c:3502 g10/tofu.c:3708 g10/tofu.c:3761
-#: g10/tofu.c:3902 g10/tofu.c:3979 g10/tofu.c:4017
+#: g10/tofu.c:3343 g10/tofu.c:3506 g10/tofu.c:3712 g10/tofu.c:3765
+#: g10/tofu.c:3906 g10/tofu.c:3983 g10/tofu.c:4021
 #, fuzzy, c-format
 msgid "error opening TOFU database: %s\n"
 msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
 
-#: g10/tofu.c:3535
+#: g10/tofu.c:3539
 #, c-format
 msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
 msgstr ""
@@ -8141,7 +8154,7 @@ msgstr ""
 msgid "no need for a trustdb check\n"
 msgstr "trustdb:n tarkistusta ei tarvita\n"
 
-#: g10/trustdb.c:601 g10/trustdb.c:2272
+#: g10/trustdb.c:601 g10/trustdb.c:2273
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "seuraava trustdb tarkistus %s\n"
@@ -8171,14 +8184,14 @@ msgstr "tee --check-trustdb, kiitos\n"
 msgid "checking the trustdb\n"
 msgstr "tarkistetaan trustdb:tä\n"
 
-#: g10/trustdb.c:1993
+#: g10/trustdb.c:1994
 #, fuzzy, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr[0] "tähän mennessä käsitelty %lu avainta\n"
 msgstr[1] "tähän mennessä käsitelty %lu avainta\n"
 
-#: g10/trustdb.c:1996
+#: g10/trustdb.c:1997
 #, fuzzy, c-format
 #| msgid "%d keys processed (%d validity counts cleared)\n"
 msgid " (%d validity count cleared)\n"
@@ -8186,45 +8199,45 @@ msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] "%d avainta käsitelty (%d kelpoisuuslaskuria tyhjätty)\n"
 msgstr[1] "%d avainta käsitelty (%d kelpoisuuslaskuria tyhjätty)\n"
 
-#: g10/trustdb.c:2066
+#: g10/trustdb.c:2067
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "ehdottomasti luotettavia avaimia ei löytynyt\n"
 
-#: g10/trustdb.c:2080
+#: g10/trustdb.c:2081
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "ehdottomasti luotettu julkinen avain %08lX ei löytynyt\n"
 
-#: g10/trustdb.c:2198
+#: g10/trustdb.c:2199
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2279
+#: g10/trustdb.c:2280
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "luottamustietue %lu, tyyppi %d: kirjoittaminen epäonnistui: %s\n"
 
-#: g10/trust.c:125
+#: g10/trust.c:114
 msgid "undefined"
 msgstr ""
 
-#: g10/trust.c:126
+#: g10/trust.c:115
 #, fuzzy
 msgid "never"
 msgstr "ei koskaan"
 
-#: g10/trust.c:127
+#: g10/trust.c:116
 msgid "marginal"
 msgstr ""
 
-#: g10/trust.c:128
+#: g10/trust.c:117
 msgid "full"
 msgstr ""
 
-#: g10/trust.c:129
+#: g10/trust.c:118
 msgid "ultimate"
 msgstr ""
 
@@ -8236,43 +8249,43 @@ msgstr ""
 #. It gets passed to atoi() so everything after the number is
 #. essentially a comment and need not be translated.  Either key and
 #. uid are both NULL, or neither are NULL.
-#: g10/trust.c:166
+#: g10/trust.c:155
 msgid "10 translator see trust.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trust.c:169
+#: g10/trust.c:158
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[mitätöity] "
 
-#: g10/trust.c:171 g10/trust.c:177
+#: g10/trust.c:160 g10/trust.c:166
 #, fuzzy
 msgid "[ expired]"
 msgstr "[vanhentunut] "
 
-#: g10/trust.c:176
+#: g10/trust.c:165
 #, fuzzy
 msgid "[ unknown]"
 msgstr "tuntematon "
 
-#: g10/trust.c:178
+#: g10/trust.c:167
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trust.c:179
+#: g10/trust.c:168
 #, fuzzy
 msgid "[  never ]"
 msgstr "ei koskaan"
 
-#: g10/trust.c:180
+#: g10/trust.c:169
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trust.c:181
+#: g10/trust.c:170
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trust.c:182
+#: g10/trust.c:171
 msgid "[ultimate]"
 msgstr ""
 
@@ -8331,16 +8344,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:4937 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2386
+#: scd/app-piv.c:1770 scd/app-p15.c:5035 scd/app-nks.c:1530
+#: scd/app-openpgp.c:2387
 #, 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:4956 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2402
+#: scd/app-piv.c:1787 scd/app-p15.c:5054 scd/app-nks.c:1549
+#: scd/app-openpgp.c:2403
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
@@ -8375,10 +8388,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:2669
-#: scd/app-openpgp.c:2693 scd/app-openpgp.c:2871 scd/app-openpgp.c:2893
-#: scd/app-openpgp.c:3074 scd/app-openpgp.c:3361 scd/app-openpgp.c:3408
-#: scd/app-openpgp.c:3545 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2670
+#: scd/app-openpgp.c:2694 scd/app-openpgp.c:2872 scd/app-openpgp.c:2894
+#: scd/app-openpgp.c:3075 scd/app-openpgp.c:3362 scd/app-openpgp.c:3409
+#: scd/app-openpgp.c:3547 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -8398,96 +8411,96 @@ msgstr ""
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr ""
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3616
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3618
 #, fuzzy, c-format
 msgid "key already exists\n"
 msgstr "\"%s\" on jo pakattu\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3620
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3622
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3622
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3624
 #, fuzzy, c-format
 msgid "generating new key\n"
 msgstr "luo uusi avainpari"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3624
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3626
 #, fuzzy, c-format
 msgid "writing new key\n"
 msgstr "luo uusi avainpari"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4484 scd/app-openpgp.c:4767
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4486 scd/app-openpgp.c:4761
 #, 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:1615
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1616
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1622
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1623
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1732
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1733
 #, 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:4943
+#: scd/app-piv.c:3279 scd/app-openpgp.c:4937
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4951
+#: scd/app-piv.c:3294 scd/app-openpgp.c:4945
 #, fuzzy, c-format
 msgid "generating key failed\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4957
+#: scd/app-piv.c:3300 scd/app-openpgp.c:4951
 #, 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:1842 scd/app-openpgp.c:4966
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1843 scd/app-openpgp.c:4960
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-p15.c:5035 scd/app-nks.c:2038
+#: scd/app-p15.c:5133 scd/app-nks.c:2038
 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:5038 scd/app-openpgp.c:2818
+#: scd/app-p15.c:5136 scd/app-openpgp.c:2819
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "muuta salasanaa"
 
-#: scd/app-p15.c:5040 scd/app-nks.c:2028
+#: scd/app-p15.c:5138 scd/app-nks.c:2028
 #, 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:5043 scd/app-nks.c:2019
+#: scd/app-p15.c:5141 scd/app-nks.c:2019
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "muuta salasanaa"
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4321
+#: scd/app-nks.c:1468 scd/app-openpgp.c:4323
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1476 scd/app-openpgp.c:4333
+#: scd/app-nks.c:1476 scd/app-openpgp.c:4335
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
@@ -8529,27 +8542,27 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3442 scd/app-dinsig.c:534
+#: scd/app-nks.c:2221 scd/app-openpgp.c:3443 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:943
+#: scd/app-openpgp.c:944
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: scd/app-openpgp.c:956
+#: scd/app-openpgp.c:957
 #, 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:1427 scd/app-openpgp.c:3389 scd/app-openpgp.c:5715
+#: scd/app-openpgp.c:1428 scd/app-openpgp.c:3390 scd/app-openpgp.c:5709
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1949
+#: scd/app-openpgp.c:1950
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
@@ -8557,43 +8570,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:2373
+#: scd/app-openpgp.c:2374
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2621
+#: scd/app-openpgp.c:2622
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2628
+#: scd/app-openpgp.c:2629
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2641
+#: scd/app-openpgp.c:2642
 #, fuzzy
 msgid "||Please unlock the card"
 msgstr "muuta salasanaa"
 
-#: scd/app-openpgp.c:2700 scd/app-openpgp.c:2900 scd/app-openpgp.c:3368
+#: scd/app-openpgp.c:2701 scd/app-openpgp.c:2901 scd/app-openpgp.c:3369
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2717 scd/app-openpgp.c:2760 scd/app-openpgp.c:2917
-#: scd/app-openpgp.c:5325
+#: scd/app-openpgp.c:2718 scd/app-openpgp.c:2761 scd/app-openpgp.c:2918
+#: scd/app-openpgp.c:5319
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
 
-#: scd/app-openpgp.c:2804 scd/app-openpgp.c:5724
+#: scd/app-openpgp.c:2805 scd/app-openpgp.c:5718
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2808
+#: scd/app-openpgp.c:2809
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8601,22 +8614,22 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: scd/app-openpgp.c:2841
+#: scd/app-openpgp.c:2842
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3355
+#: scd/app-openpgp.c:3356
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "muuta salasanaa"
 
-#: scd/app-openpgp.c:3404
+#: scd/app-openpgp.c:3405
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Valitse mitätöinnin syy:\n"
 
-#: scd/app-openpgp.c:3414 scd/app-openpgp.c:3481
+#: scd/app-openpgp.c:3415 scd/app-openpgp.c:3484
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
@@ -8624,82 +8637,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:3437
+#: scd/app-openpgp.c:3438
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3439
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3439
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3541
+#: scd/app-openpgp.c:3543
 #, fuzzy
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "muuta salasanaa"
 
-#: scd/app-openpgp.c:3542
+#: scd/app-openpgp.c:3544
 #, fuzzy
 msgid "||Please enter the PIN and New PIN"
 msgstr "muuta salasanaa"
 
-#: scd/app-openpgp.c:3600 scd/app-openpgp.c:5026
+#: scd/app-openpgp.c:3602 scd/app-openpgp.c:5020
 #, fuzzy, c-format
 msgid "error reading application data\n"
 msgstr "virhe luettaessa avainlohkoa: %s\n"
 
-#: scd/app-openpgp.c:3606 scd/app-openpgp.c:5033
+#: scd/app-openpgp.c:3608 scd/app-openpgp.c:5027
 #, fuzzy, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "%s: virhe luettaessa vapaata tietuetta: %s\n"
 
-#: scd/app-openpgp.c:4302 scd/app-openpgp.c:4657
+#: scd/app-openpgp.c:4304 scd/app-openpgp.c:4653
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4343 scd/app-openpgp.c:4351
+#: scd/app-openpgp.c:4345 scd/app-openpgp.c:4353
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4651
+#: scd/app-openpgp.c:4647
 #, fuzzy, c-format
 #| msgid "unsupported URI"
 msgid "unsupported curve\n"
 msgstr "URI-muotoa ei tueta"
 
-#: scd/app-openpgp.c:4991
+#: scd/app-openpgp.c:4985
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5041
+#: scd/app-openpgp.c:5035
 #, 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:5240
+#: scd/app-openpgp.c:5234
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
 
-#: scd/app-openpgp.c:5298
+#: scd/app-openpgp.c:5292
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5729
+#: scd/app-openpgp.c:5723
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:6241 scd/app-openpgp.c:6252
+#: scd/app-openpgp.c:6250 scd/app-openpgp.c:6261
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
@@ -8720,7 +8733,7 @@ msgstr ""
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:274 dirmngr/dirmngr.c:198
+#: scd/scdaemon.c:136 sm/gpgsm.c:274 dirmngr/dirmngr.c:199
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
@@ -8785,12 +8798,12 @@ msgstr ""
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2104
+#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2143
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2112
+#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2151
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -8800,11 +8813,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:199 sm/certchain.c:2172
+#: sm/certchain.c:199 sm/certchain.c:2174
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:200 sm/certchain.c:2172
+#: sm/certchain.c:200 sm/certchain.c:2174
 #, fuzzy
 msgid "shell"
 msgstr "apua"
@@ -8838,231 +8851,231 @@ msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 msgid "certificate policy not allowed"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: sm/certchain.c:595 sm/keydb.c:1891 sm/keydb.c:1980
+#: sm/certchain.c:596 sm/keydb.c:1913 sm/keydb.c:2002
 #, fuzzy, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: sm/certchain.c:624
+#: sm/certchain.c:625
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:644
+#: sm/certchain.c:645
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#: sm/certchain.c:724 dirmngr/ocsp.c:683
 #, fuzzy, c-format
 #| msgid "%s: can't access: %s\n"
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "%s: kohteeseen ei päästä: %s\n"
 
-#: sm/certchain.c:791
+#: sm/certchain.c:792
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr ""
 
-#: sm/certchain.c:816
+#: sm/certchain.c:817
 #, fuzzy, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: sm/certchain.c:819
+#: sm/certchain.c:820
 #, fuzzy, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: sm/certchain.c:1046 sm/certchain.c:1561 sm/certchain.c:2200 sm/decrypt.c:643
-#: sm/encrypt.c:620 sm/import.c:414 sm/keydb.c:1898 sm/keydb.c:1987
-#: sm/sign.c:428 sm/verify.c:117
+#: sm/certchain.c:1047 sm/certchain.c:1562 sm/certchain.c:2202
+#: sm/decrypt.c:1084 sm/encrypt.c:621 sm/import.c:414 sm/keydb.c:1920
+#: sm/keydb.c:2009 sm/sign.c:428 sm/verify.c:117
 #, fuzzy, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: sm/certchain.c:1232
+#: sm/certchain.c:1233
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "HUOM: avain on mitätöity!"
 
-#: sm/certchain.c:1247
+#: sm/certchain.c:1248
 msgid "the status of the certificate is unknown"
 msgstr ""
 
-#: sm/certchain.c:1254
+#: sm/certchain.c:1255
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:1260
+#: sm/certchain.c:1261
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
 
-#: sm/certchain.c:1289 sm/certchain.c:1357 dirmngr/validate.c:497
+#: sm/certchain.c:1290 sm/certchain.c:1358 dirmngr/validate.c:497
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:1304 sm/certchain.c:1389 dirmngr/validate.c:515
+#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:515
 #, c-format
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1305 sm/certchain.c:1390
+#: sm/certchain.c:1306 sm/certchain.c:1391
 #, fuzzy
 msgid "root certificate not yet valid"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1307 sm/certchain.c:1392
 msgid "intermediate certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1319 dirmngr/validate.c:526
+#: sm/certchain.c:1320 dirmngr/validate.c:526
 #, fuzzy, c-format
 msgid "certificate has expired"
 msgstr "Tämä avain on vanhentunut!"
 
-#: sm/certchain.c:1320
+#: sm/certchain.c:1321
 #, fuzzy
 msgid "root certificate has expired"
 msgstr "Tämä avain on vanhentunut!"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1322
 #, fuzzy
 msgid "intermediate certificate has expired"
 msgstr "Tämä avain on vanhentunut!"
 
-#: sm/certchain.c:1363
+#: sm/certchain.c:1364
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:1372
+#: sm/certchain.c:1373
 #, fuzzy
 msgid "certificate with invalid validity"
 msgstr "Tämä avain on vanhentunut!"
 
-#: sm/certchain.c:1409
+#: sm/certchain.c:1410
 msgid "signature not created during lifetime of certificate"
 msgstr ""
 
-#: sm/certchain.c:1411
+#: sm/certchain.c:1412
 msgid "certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1413
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1416
+#: sm/certchain.c:1417
 #, fuzzy, c-format
 msgid "  (  signature created at "
 msgstr "        uusia allekirjoituksia: %lu\n"
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1418
 #, fuzzy, c-format
 msgid "  (certificate created at "
 msgstr "Mitätöintivarmenne luotu.\n"
 
-#: sm/certchain.c:1420
+#: sm/certchain.c:1421
 #, fuzzy, c-format
 msgid "  (certificate valid from "
 msgstr "virheellinen varmenne"
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1422
 #, c-format
 msgid "  (     issuer valid from "
 msgstr ""
 
-#: sm/certchain.c:1451 dirmngr/validate.c:577
+#: sm/certchain.c:1452 dirmngr/validate.c:577
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "näytä sormenjälki"
 
-#: sm/certchain.c:1460
+#: sm/certchain.c:1461
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:1473
+#: sm/certchain.c:1474
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1479
+#: sm/certchain.c:1480
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1538
+#: sm/certchain.c:1539
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 
-#: sm/certchain.c:1602
+#: sm/certchain.c:1603
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "luo mitätöintivarmenne"
 
-#: sm/certchain.c:1680
+#: sm/certchain.c:1681
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1749 dirmngr/validate.c:575
+#: sm/certchain.c:1750 dirmngr/validate.c:575
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:1765
+#: sm/certchain.c:1766
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
 
-#: sm/certchain.c:1796 sm/import.c:175 dirmngr/validate.c:630
+#: sm/certchain.c:1797 sm/import.c:175 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1808 dirmngr/validate.c:642
+#: sm/certchain.c:1809 dirmngr/validate.c:642
 #, c-format
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1842 dirmngr/validate.c:668
+#: sm/certchain.c:1844 dirmngr/validate.c:668
 #, fuzzy, c-format
 msgid "certificate has a BAD signature"
 msgstr "tarkista allekirjoitus"
 
-#: sm/certchain.c:1874 dirmngr/validate.c:692
+#: sm/certchain.c:1876 dirmngr/validate.c:692
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1933 dirmngr/validate.c:717
+#: sm/certchain.c:1935 dirmngr/validate.c:717
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1975 sm/certchain.c:2275 dirmngr/validate.c:747
+#: sm/certchain.c:1977 sm/certchain.c:2278 dirmngr/validate.c:747
 #, fuzzy, c-format
 msgid "certificate is good\n"
 msgstr "valinta %c%lu on kopio\n"
 
-#: sm/certchain.c:1976
+#: sm/certchain.c:1978
 #, fuzzy, c-format
 msgid "intermediate certificate is good\n"
 msgstr "Mitätöintivarmenne luotu.\n"
 
-#: sm/certchain.c:1977
+#: sm/certchain.c:1979
 #, fuzzy, c-format
 msgid "root certificate is good\n"
 msgstr "virheellinen varmenne"
 
-#: sm/certchain.c:2159
+#: sm/certchain.c:2161
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:2168
+#: sm/certchain.c:2170
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -9073,18 +9086,18 @@ 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:1372 dirmngr/validate.c:903
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1411 dirmngr/validate.c:903
 #: dirmngr/validate.c:927
 #, fuzzy, c-format
 msgid "out of core\n"
 msgstr "ei käsitelty"
 
-#: sm/certcheck.c:389 sm/verify.c:212
+#: sm/certcheck.c:388 sm/verify.c:212
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:793
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:794
 #, fuzzy
 msgid "none"
 msgstr "ei"
@@ -9381,17 +9394,17 @@ msgstr ""
 msgid "resource problem: out of core\n"
 msgstr ""
 
-#: sm/decrypt.c:719
+#: sm/decrypt.c:1159
 #, c-format
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
 
-#: sm/decrypt.c:721
+#: sm/decrypt.c:1161
 #, c-format
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr ""
 
-#: sm/decrypt.c:868
+#: sm/decrypt.c:1318
 #, fuzzy, c-format
 msgid "encrypted to %s key %s\n"
 msgstr "salattu %s-avaimella, tunnus %08lX\n"
@@ -9401,7 +9414,7 @@ msgstr "salattu %s-avaimella, tunnus %08lX\n"
 msgid "certificate '%s' not found: %s\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: sm/delete.c:120 sm/keydb.c:1999 sm/keydb.c:2098
+#: sm/delete.c:120 sm/keydb.c:2021 sm/keydb.c:2120
 #, fuzzy, c-format
 msgid "error locking keybox: %s\n"
 msgstr "virhe luettaessa avainlohkoa: %s\n"
@@ -9421,7 +9434,7 @@ msgstr "valinta %c%lu on kopio\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: sm/encrypt.c:606
+#: sm/encrypt.c:607
 #, fuzzy, c-format
 msgid "no valid recipients given\n"
 msgstr "(Kuvausta ei annettu)\n"
@@ -9497,68 +9510,68 @@ msgstr "|NIMI|käytä oletusarvoisesti salaista avainta NIMI"
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "lisää tämä avainrengas avainrenkaiden luetteloon"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:352 dirmngr/dirmngr.c:265
 #, fuzzy
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|PALVELIN|käytä tätä palvelinta avainten etsimiseen"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:363
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:364
+#: sm/gpgsm.c:365
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NIMI|käytä salasanoihin salausalgoritmia NIMI"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:386
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:389
+#: sm/gpgsm.c:390
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: sm/gpgsm.c:393
+#: sm/gpgsm.c:394
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:396
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:398
+#: sm/gpgsm.c:399
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NIMI|käytä salausalgoritmia NIMI"
 
-#: sm/gpgsm.c:400
+#: sm/gpgsm.c:401
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NIMI|käytä viestintiivistealgoritmia NIMI"
 
-#: sm/gpgsm.c:410
+#: sm/gpgsm.c:411
 msgid "batch mode: never ask"
 msgstr "eräajo: älä kysy mitään"
 
-#: sm/gpgsm.c:412
+#: sm/gpgsm.c:413
 msgid "assume yes on most questions"
 msgstr "oleta myönteinen vastaust useimpiin kysymyksiin"
 
-#: sm/gpgsm.c:413
+#: sm/gpgsm.c:414
 msgid "assume no on most questions"
 msgstr "oleta kielteinen vastaust useimpiin kysymyksiin"
 
-#: sm/gpgsm.c:430
+#: sm/gpgsm.c:431
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
 
-#: sm/gpgsm.c:615
+#: sm/gpgsm.c:616
 #, 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:618
+#: sm/gpgsm.c:619
 #, fuzzy
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
@@ -9569,52 +9582,27 @@ msgstr ""
 "allekirjoita, tarkista, salaa tai avaa\n"
 "oletustoiminto riippuu syötteestä\n"
 
-#: sm/gpgsm.c:826
+#: sm/gpgsm.c:827
 #, 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:837
+#: sm/gpgsm.c:838
 #, fuzzy, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
 
-#: sm/gpgsm.c:896 dirmngr/ldapserver.c:89
-#, fuzzy, c-format
-msgid "%s:%u: no hostname given\n"
-msgstr "(Kuvausta ei annettu)\n"
-
-#: sm/gpgsm.c:915 dirmngr/ldapserver.c:108
-#, c-format
-msgid "%s:%u: password given without user\n"
-msgstr ""
-
-#: sm/gpgsm.c:946 dirmngr/ldapserver.c:139
-#, c-format
-msgid "%s:%u: ignoring unknown flag '%s'\n"
-msgstr ""
-
-#: sm/gpgsm.c:962 dirmngr/ldapserver.c:155
-#, fuzzy, c-format
-msgid "%s:%u: skipping this line\n"
-msgstr " o = ohita tämä avain\n"
-
-#: sm/gpgsm.c:1550
-#, fuzzy, c-format
-msgid "could not parse keyserver\n"
-msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
-
-#: sm/gpgsm.c:1858
+#: sm/gpgsm.c:1711
 #, fuzzy, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "kirjoitetaan kohteeseen \"%s\"\n"
 
-#: sm/gpgsm.c:1904
+#: sm/gpgsm.c:1757
 #, fuzzy, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi sulkea: %s\n"
 
-#: sm/gpgsm.c:2273
+#: sm/gpgsm.c:2129
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
@@ -9634,52 +9622,52 @@ msgstr "luo mitätöintivarmenne"
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:471 sm/keydb.c:2018 sm/keydb.c:2111
+#: sm/import.c:472 sm/keydb.c:2040 sm/keydb.c:2133
 #, fuzzy, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: sm/import.c:530 sm/import.c:562
+#: sm/import.c:531 sm/import.c:563
 #, fuzzy, c-format
 msgid "error importing certificate: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: sm/import.c:751 tools/gpg-connect-agent.c:1475
+#: sm/import.c:752 tools/gpg-connect-agent.c:1475
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: sm/keydb.c:503
+#: sm/keydb.c:508
 #, fuzzy, c-format
 msgid "no keyboxd running in this session\n"
 msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
 
-#: sm/keydb.c:595
+#: sm/keydb.c:600
 #, fuzzy, c-format
 msgid "error opening key DB: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: sm/keydb.c:1936
+#: sm/keydb.c:1958
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1948
+#: sm/keydb.c:1970
 #, fuzzy, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: sm/keydb.c:1956
+#: sm/keydb.c:1978
 #, fuzzy, c-format
 msgid "error storing certificate: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: sm/keydb.c:2009
+#: sm/keydb.c:2031
 #, fuzzy, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "rev? mitätöinnin tarkistuksessa ongelmia: %s\n"
 
-#: sm/keydb.c:2030 sm/keydb.c:2122
+#: sm/keydb.c:2052 sm/keydb.c:2144
 #, fuzzy, c-format
 msgid "error storing flags: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@ -9852,57 +9840,57 @@ msgstr ""
 msgid "error loading certificate '%s': %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: dirmngr/certcache.c:819
+#: dirmngr/certcache.c:820
 #, fuzzy, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "virheellinen varmenne"
 
-#: dirmngr/certcache.c:821
+#: dirmngr/certcache.c:822
 #, fuzzy, c-format
 msgid "    runtime cached certificates: %u\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: dirmngr/certcache.c:823
+#: dirmngr/certcache.c:824
 #, fuzzy, c-format
 msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: dirmngr/certcache.c:851 dirmngr/dirmngr-client.c:392
+#: dirmngr/certcache.c:852 dirmngr/dirmngr-client.c:392
 #, fuzzy, c-format
 msgid "certificate already cached\n"
 msgstr "Mitätöintivarmenne luotu.\n"
 
-#: dirmngr/certcache.c:853
+#: dirmngr/certcache.c:854
 #, fuzzy, c-format
 msgid "certificate cached\n"
 msgstr "valinta %c%lu on kopio\n"
 
-#: dirmngr/certcache.c:855 dirmngr/certcache.c:875 dirmngr/dirmngr-client.c:396
+#: dirmngr/certcache.c:856 dirmngr/certcache.c:876 dirmngr/dirmngr-client.c:396
 #, fuzzy, c-format
 msgid "error caching certificate: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: dirmngr/certcache.c:938
+#: dirmngr/certcache.c:939
 #, fuzzy, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: dirmngr/certcache.c:1384 dirmngr/certcache.c:1393
+#: dirmngr/certcache.c:1385 dirmngr/certcache.c:1394
 #, fuzzy, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: dirmngr/certcache.c:1579 dirmngr/certcache.c:1588
+#: dirmngr/certcache.c:1580 dirmngr/certcache.c:1589
 #, fuzzy, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: dirmngr/certcache.c:1694 dirmngr/validate.c:483
+#: dirmngr/certcache.c:1695 dirmngr/validate.c:483
 #, fuzzy, c-format
 msgid "no issuer found in certificate\n"
 msgstr "luo mitätöintivarmenne"
 
-#: dirmngr/certcache.c:1704
+#: dirmngr/certcache.c:1705
 #, fuzzy, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
@@ -9939,7 +9927,7 @@ msgstr "avainlohkojen poisto epäonnistui: %s\n"
 msgid "not removing file '%s'\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2380
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2383
 #, fuzzy, c-format
 msgid "error closing cache file: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@ -10173,14 +10161,14 @@ msgid "error getting data from cache file: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
 #: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1672 dirmngr/crlcache.c:1697
-#: dirmngr/crlcache.c:1763
+#: dirmngr/crlcache.c:1766
 #, fuzzy, c-format
 #| msgid "invalid response from agent\n"
 msgid "got an invalid S-expression from libksba\n"
 msgstr "agentin lähettämä vastaus ei kelpaa\n"
 
 #: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1679 dirmngr/crlcache.c:1705
-#: dirmngr/crlcache.c:1770 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1773 dirmngr/misc.c:176
 #, fuzzy, c-format
 msgid "converting S-expression failed: %s\n"
 msgstr "ei voi avata tiedostoa: %s\n"
@@ -10196,202 +10184,202 @@ msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1797 dirmngr/ocsp.c:478
+#: dirmngr/crlcache.c:1800 dirmngr/ocsp.c:478
 #, fuzzy, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: dirmngr/crlcache.c:1871
+#: dirmngr/crlcache.c:1874
 #, fuzzy, c-format
 #| msgid "build_packet failed: %s\n"
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "build_packet epäonnistui: %s\n"
 
-#: dirmngr/crlcache.c:1886
+#: dirmngr/crlcache.c:1889
 #, fuzzy, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: dirmngr/crlcache.c:1893
+#: dirmngr/crlcache.c:1896
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1897
+#: dirmngr/crlcache.c:1900
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1917
+#: dirmngr/crlcache.c:1920
 #, fuzzy, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: dirmngr/crlcache.c:1932
+#: dirmngr/crlcache.c:1935
 #, fuzzy, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "kirjoitetaan kohteeseen \"%s\"\n"
 
-#: dirmngr/crlcache.c:1959
+#: dirmngr/crlcache.c:1962
 #, fuzzy, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "luo mitätöintivarmenne"
 
-#: dirmngr/crlcache.c:1974
+#: dirmngr/crlcache.c:1977
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2020
+#: dirmngr/crlcache.c:2023
 #, fuzzy, c-format
 #| msgid "signature verification suppressed\n"
 msgid "CRL signature verification failed: %s\n"
 msgstr "allekirjoituksen varmistus vaiennetaan\n"
 
-#: dirmngr/crlcache.c:2032
+#: dirmngr/crlcache.c:2035
 #, fuzzy, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
 
-#: dirmngr/crlcache.c:2174
+#: dirmngr/crlcache.c:2177
 #, fuzzy, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: dirmngr/crlcache.c:2181
+#: dirmngr/crlcache.c:2184
 #, fuzzy, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: dirmngr/crlcache.c:2215
+#: dirmngr/crlcache.c:2218
 #, fuzzy, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "hakemiston \"%s\" luominen ei onnistu: %s\n"
 
-#: dirmngr/crlcache.c:2219
+#: dirmngr/crlcache.c:2222
 #, fuzzy, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "hakemiston \"%s\" luominen ei onnistu: %s\n"
 
-#: dirmngr/crlcache.c:2229
+#: dirmngr/crlcache.c:2232
 #, fuzzy, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: dirmngr/crlcache.c:2239
+#: dirmngr/crlcache.c:2242
 #, fuzzy, c-format
 #| msgid "update secret failed: %s\n"
 msgid "crl_parse_insert failed: %s\n"
 msgstr "salaisen päivitys epäonnistui: %s\n"
 
-#: dirmngr/crlcache.c:2249
+#: dirmngr/crlcache.c:2252
 #, fuzzy, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "kirjoitetaan kohteeseen \"%s\"\n"
 
-#: dirmngr/crlcache.c:2256
+#: dirmngr/crlcache.c:2259
 #, fuzzy, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: dirmngr/crlcache.c:2281
+#: dirmngr/crlcache.c:2284
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2285
+#: dirmngr/crlcache.c:2288
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2301
+#: dirmngr/crlcache.c:2304
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2311
+#: dirmngr/crlcache.c:2314
 #, fuzzy, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2365
 #, fuzzy, c-format
 msgid "creating cache file '%s'\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: dirmngr/crlcache.c:2394
+#: dirmngr/crlcache.c:2397
 #, fuzzy, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: dirmngr/crlcache.c:2408
+#: dirmngr/crlcache.c:2411
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
 "program start\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2448
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2468
+#: dirmngr/crlcache.c:2471
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2471
+#: dirmngr/crlcache.c:2474
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2474
+#: dirmngr/crlcache.c:2477
 msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2481
+#: dirmngr/crlcache.c:2484
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2499
+#: dirmngr/crlcache.c:2502
 #, fuzzy, c-format
 #| msgid "WARNING: invalid size of random_seed file - not used\n"
 msgid " WARNING: invalid cache record length\n"
 msgstr ""
 "VAROITUS: random_seed-tiedosto on väärän kokoinen - tiedostoa ei käytetä\n"
 
-#: dirmngr/crlcache.c:2506
+#: dirmngr/crlcache.c:2509
 #, fuzzy, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "%s: virhe luettaessa vapaata tietuetta: %s\n"
 
-#: dirmngr/crlcache.c:2517
+#: dirmngr/crlcache.c:2520
 #, fuzzy, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "rev? mitätöinnin tarkistuksessa ongelmia: %s\n"
 
-#: dirmngr/crlcache.c:2548
+#: dirmngr/crlcache.c:2551
 #, fuzzy, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: dirmngr/crlcache.c:2551
+#: dirmngr/crlcache.c:2554
 msgid "End CRL dump\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2672
+#: dirmngr/crlcache.c:2675
 #, fuzzy, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: dirmngr/crlcache.c:2683
+#: dirmngr/crlcache.c:2686
 #, fuzzy, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
 
-#: dirmngr/crlcache.c:2743
+#: dirmngr/crlcache.c:2746
 #, fuzzy, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
@@ -10412,7 +10400,7 @@ msgstr ""
 msgid "error retrieving '%s': %s\n"
 msgstr "virhe luotaessa \"%s\": %s\n"
 
-#: dirmngr/crlfetch.c:218 dirmngr/ldap-wrapper.c:881 dirmngr/misc.c:573
+#: dirmngr/crlfetch.c:218 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
 #, fuzzy, c-format
 #| msgid "%s: error writing dir record: %s\n"
 msgid "error initializing reader object: %s\n"
@@ -10580,135 +10568,135 @@ msgstr ""
 msgid "looking up '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:175
+#: dirmngr/dirmngr.c:176
 msgid "list the contents of the CRL cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:176
+#: dirmngr/dirmngr.c:177
 #, fuzzy
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
 
-#: dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr.c:178
 msgid "|URL|fetch a CRL from URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:178
+#: dirmngr/dirmngr.c:179
 msgid "shutdown the dirmngr"
 msgstr ""
 
-#: dirmngr/dirmngr.c:179
+#: dirmngr/dirmngr.c:180
 msgid "flush the cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:213
 msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:215
+#: dirmngr/dirmngr.c:216
 msgid "|N|do not return more than N items in one query"
 msgstr ""
 
-#: dirmngr/dirmngr.c:221
+#: dirmngr/dirmngr.c:222
 msgid "Network related options"
 msgstr ""
 
-#: dirmngr/dirmngr.c:223
+#: dirmngr/dirmngr.c:224
 msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:235
+#: dirmngr/dirmngr.c:236
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:238
+#: dirmngr/dirmngr.c:239
 #, fuzzy
 msgid "|URL|use keyserver at URL"
 msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
 
-#: dirmngr/dirmngr.c:240
+#: dirmngr/dirmngr.c:241
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-#: dirmngr/dirmngr.c:242
+#: dirmngr/dirmngr.c:243
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:244
+#: dirmngr/dirmngr.c:245
 msgid "inhibit the use of HTTP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:246
+#: dirmngr/dirmngr.c:247
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:248
+#: dirmngr/dirmngr.c:249
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:250
+#: dirmngr/dirmngr.c:251
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: dirmngr/dirmngr.c:254
+#: dirmngr/dirmngr.c:255
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: dirmngr/dirmngr.c:256
+#: dirmngr/dirmngr.c:257
 msgid "inhibit the use of LDAP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:258
+#: dirmngr/dirmngr.c:259
 msgid "ignore LDAP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:260
+#: dirmngr/dirmngr.c:261
 msgid "|HOST|use HOST for LDAP queries"
 msgstr ""
 
-#: dirmngr/dirmngr.c:262
+#: dirmngr/dirmngr.c:263
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr ""
 
-#: dirmngr/dirmngr.c:264
+#: dirmngr/dirmngr.c:267
 #, fuzzy
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
 
-#: dirmngr/dirmngr.c:266
+#: dirmngr/dirmngr.c:269
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 
-#: dirmngr/dirmngr.c:269 dirmngr/dirmngr_ldap.c:104
+#: dirmngr/dirmngr.c:272
 msgid "|N|set LDAP timeout to N seconds"
 msgstr ""
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:275
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:274
+#: dirmngr/dirmngr.c:277
 msgid "allow sending OCSP requests"
 msgstr ""
 
-#: dirmngr/dirmngr.c:276
+#: dirmngr/dirmngr.c:279
 msgid "ignore certificate contained OCSP service URLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:278
+#: dirmngr/dirmngr.c:281
 #, fuzzy
 msgid "|URL|use OCSP responder at URL"
 msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
 
-#: dirmngr/dirmngr.c:280
+#: dirmngr/dirmngr.c:283
 msgid "|FPR|OCSP response signed by FPR"
 msgstr ""
 
-#: dirmngr/dirmngr.c:288
+#: dirmngr/dirmngr.c:291
 msgid "force loading of outdated CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:299
+#: dirmngr/dirmngr.c:302
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -10722,304 +10710,115 @@ msgstr ""
 "(Katso täydellinen luettelo kaikista komennoista ja valitsimista man-"
 "sivuilta)\n"
 
-#: dirmngr/dirmngr.c:441
+#: dirmngr/dirmngr.c:449
 #, fuzzy
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: dirmngr/dirmngr.c:443
+#: dirmngr/dirmngr.c:451
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:523
+#: dirmngr/dirmngr.c:531
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:609 tools/gpgconf.c:667 tools/gpgconf.c:702
-#: tools/gpgconf.c:802
+#: dirmngr/dirmngr.c:617 tools/gpgconf.c:701 tools/gpgconf.c:736
+#: tools/gpgconf.c:836
 #, fuzzy, c-format
 msgid "usage: %s [options] "
 msgstr "käyttö: gpg [valitsimet] "
 
-#: dirmngr/dirmngr.c:1260
+#: dirmngr/dirmngr.c:1299
 #, 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:1495 dirmngr/server.c:1824
+#: dirmngr/dirmngr.c:1534 dirmngr/server.c:1878
 #, fuzzy, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: dirmngr/dirmngr.c:1501 dirmngr/server.c:1830
+#: dirmngr/dirmngr.c:1540 dirmngr/server.c:1884
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: dirmngr/dirmngr.c:1643
+#: dirmngr/dirmngr.c:1682
 #, fuzzy, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "rivi on liian pitkä\n"
 
-#: dirmngr/dirmngr.c:1698 dirmngr/dirmngr.c:1782
+#: dirmngr/dirmngr.c:1737 dirmngr/dirmngr.c:1821
 #, fuzzy, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: dirmngr/dirmngr.c:1734 dirmngr/dirmngr.c:1760 tools/gpgconf-comp.c:3539
+#: dirmngr/dirmngr.c:1773 dirmngr/dirmngr.c:1799 tools/gpgconf-comp.c:3549
 #, fuzzy, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "lukuvirhe: %s\n"
 
-#: dirmngr/dirmngr.c:1789
+#: dirmngr/dirmngr.c:1828
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1876
+#: dirmngr/dirmngr.c:1915
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1917
+#: dirmngr/dirmngr.c:1956
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1922
+#: dirmngr/dirmngr.c:1961
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1924
+#: dirmngr/dirmngr.c:1963
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1929
+#: dirmngr/dirmngr.c:1968
 #, fuzzy, c-format
 msgid "shutdown forced\n"
 msgstr "ei käsitelty"
 
-#: dirmngr/dirmngr.c:1937
+#: dirmngr/dirmngr.c:1976
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1944
+#: dirmngr/dirmngr.c:1983
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:105
-msgid "return all values in a record oriented format"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:108
-msgid "|NAME|ignore host part and connect through NAME"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:109
-msgid "force a TLS connection"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:110
-#, fuzzy
-#| msgid "|NAME|set terminal charset to NAME"
-msgid "|NAME|connect to host NAME"
-msgstr "|NIMI|aseta päätteen merkistöksi NIMI"
-
-#: dirmngr/dirmngr_ldap.c:111
-msgid "|N|connect to port N"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:112
-#, fuzzy
-#| msgid "|NAME|use NAME as default recipient"
-msgid "|NAME|use user NAME for authentication"
-msgstr "|NIMI|käytä NIMI oletusvastaanottajana"
-
-#: dirmngr/dirmngr_ldap.c:113
-msgid "|PASS|use password PASS for authentication"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:115
-msgid "take password from $DIRMNGR_LDAP_PASS"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:116
-msgid "|STRING|query DN STRING"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:117
-msgid "|STRING|use STRING as filter expression"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:118
-msgid "|STRING|return the attribute STRING"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:179
-#, fuzzy
-#| msgid "Usage: gpg [options] [files] (-h for help)"
-msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
-msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
-
-#: dirmngr/dirmngr_ldap.c:182
-msgid ""
-"Syntax: dirmngr_ldap [options] [URL]\n"
-"Internal LDAP helper for Dirmngr\n"
-"Interface and options may change without notice\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:291
-#, fuzzy, c-format
-#| msgid "invalid import options\n"
-msgid "invalid port number %d\n"
-msgstr "virheelliset tuontivalitsimet\n"
-
-#: dirmngr/dirmngr_ldap.c:400
-#, c-format
-msgid "scanning result for attribute '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:407 dirmngr/dirmngr_ldap.c:490
-#: dirmngr/dirmngr_ldap.c:514 dirmngr/dirmngr_ldap.c:526
-#: dirmngr/dirmngr_ldap.c:722
-#, fuzzy, c-format
-msgid "error writing to stdout: %s\n"
-msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
-
-#: dirmngr/dirmngr_ldap.c:424
-#, c-format
-msgid "          available attribute '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:462
-#, fuzzy, c-format
-msgid "attribute '%s' not found\n"
-msgstr "avainta \"%s\" ei löydy: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:469
-#, c-format
-msgid "found attribute '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:581
-#, fuzzy, c-format
-#| msgid "reading from `%s'\n"
-msgid "processing url '%s'\n"
-msgstr "luetaan kohteesta \"%s\"\n"
-
-#: dirmngr/dirmngr_ldap.c:588
-#, fuzzy, c-format
-#| msgid "          w/o user IDs: %lu\n"
-msgid "          user '%s'\n"
-msgstr "          ilman käyttäjätunnuksia: %lu\n"
-
-#: dirmngr/dirmngr_ldap.c:590
-#, fuzzy, c-format
-msgid "          pass '%s'\n"
-msgstr "                aka \""
-
-#: dirmngr/dirmngr_ldap.c:592
-#, fuzzy, c-format
-msgid "          host '%s'\n"
-msgstr "                aka \""
-
-#: dirmngr/dirmngr_ldap.c:593
-#, fuzzy, c-format
-#| msgid "          not imported: %lu\n"
-msgid "          port %d\n"
-msgstr "          ei tuotu: %lu\n"
-
-#: dirmngr/dirmngr_ldap.c:595
-#, fuzzy, c-format
-msgid "            DN '%s'\n"
-msgstr "                aka \""
-
-#: dirmngr/dirmngr_ldap.c:597
-#, c-format
-msgid "        filter '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:602 dirmngr/dirmngr_ldap.c:605
-#, fuzzy, c-format
-msgid "          attr '%s'\n"
-msgstr "                aka \""
-
-#: dirmngr/dirmngr_ldap.c:611
-#, fuzzy, c-format
-msgid "no host name in '%s'\n"
-msgstr "(Kuvausta ei annettu)\n"
-
-#: dirmngr/dirmngr_ldap.c:616
-#, c-format
-msgid "no attribute given for query '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:622
-#, fuzzy, c-format
-#| msgid "WARNING: using insecure memory!\n"
-msgid "WARNING: using first attribute only\n"
-msgstr "VAROITUS: käytetään suojaamatonta muistia!\n"
-
-#: dirmngr/dirmngr_ldap.c:637 dirmngr/dirmngr_ldap.c:678
-#, fuzzy, c-format
-msgid "LDAP init to '%s:%d' failed: %s\n"
-msgstr "ascii-koodaaminen epäonnistui: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:659
-#, fuzzy, c-format
-msgid "LDAP init to '%s' failed: %s\n"
-msgstr "ascii-koodaaminen epäonnistui: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:665
-#, fuzzy, c-format
-msgid "LDAP init to '%s' done\n"
-msgstr "ascii-koodaaminen epäonnistui: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:704
-#, fuzzy, c-format
-msgid "binding to '%s:%d' failed: %s\n"
-msgstr "ascii-koodaaminen epäonnistui: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:728
-#, fuzzy, c-format
-#| msgid "dearmoring failed: %s\n"
-msgid "searching '%s' failed: %s\n"
-msgstr "ascii-koodauksen purku epäonnistui: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:759
-#, fuzzy, c-format
-msgid "'%s' is not an LDAP URL\n"
-msgstr "\"%s\" ei ole JPEG-tiedosto\n"
-
-#: dirmngr/dirmngr_ldap.c:765
-#, c-format
-msgid "'%s' is an invalid LDAP URL\n"
-msgstr ""
-
-#: dirmngr/http.c:1989 dirmngr/ocsp.c:255
+#: dirmngr/http.c:1998 dirmngr/ocsp.c:255
 #, fuzzy, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: dirmngr/http.c:3630 dirmngr/ocsp.c:229
+#: dirmngr/http.c:3652 dirmngr/ocsp.c:229
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr ""
 
-#: dirmngr/http.c:3636 dirmngr/ocsp.c:246
+#: dirmngr/http.c:3658 dirmngr/ocsp.c:246
 #, fuzzy, c-format
 msgid "too many redirections\n"
 msgstr "liian monta \"%c\" valintaa\n"
 
-#: dirmngr/http.c:3748
+#: dirmngr/http.c:3768
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "redirection changed to '%s'\n"
@@ -11060,31 +10859,51 @@ msgstr "päivitys epäonnistui: %s\n"
 msgid "ldap wrapper %d stalled - killing\n"
 msgstr ""
 
-#: dirmngr/ldap.c:91
+#: dirmngr/ldap.c:92
 #, c-format
 msgid "invalid char 0x%02x in host name - not added\n"
 msgstr ""
 
-#: dirmngr/ldap.c:95
+#: dirmngr/ldap.c:96
 #, fuzzy, c-format
 msgid "adding '%s:%d' to the ldap server list\n"
 msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
 
-#: dirmngr/ldap.c:98 dirmngr/misc.c:512
+#: dirmngr/ldap.c:99 dirmngr/misc.c:512
 #, fuzzy, c-format
 msgid "malloc failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: dirmngr/ldap.c:634
+#: dirmngr/ldap.c:221
+#, fuzzy, c-format
+msgid "'%s' is not an LDAP URL\n"
+msgstr "\"%s\" ei ole JPEG-tiedosto\n"
+
+#: dirmngr/ldap.c:227 dirmngr/ldap.c:233
 #, c-format
-msgid "start_cert_fetch: invalid pattern '%s'\n"
+msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
-#: dirmngr/ldap.c:846
+#: dirmngr/ldap.c:968
 #, c-format
 msgid "ldap_search hit the size limit of the server\n"
 msgstr ""
 
+#: dirmngr/ldapserver.c:119
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr ""
+
+#: dirmngr/ldapserver.c:181
+#, c-format
+msgid "%s:%u: ignoring unknown flag '%s'\n"
+msgstr ""
+
+#: dirmngr/ldapserver.c:203
+#, fuzzy, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr " o = ohita tämä avain\n"
+
 #: dirmngr/misc.c:172
 #, fuzzy, c-format
 #| msgid "%s: invalid file version %d\n"
@@ -11177,88 +10996,88 @@ msgstr ""
 msgid "allocating list item failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: dirmngr/ocsp.c:537 dirmngr/ocsp.c:724
+#: dirmngr/ocsp.c:538 dirmngr/ocsp.c:725
 #, fuzzy, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: dirmngr/ocsp.c:584
+#: dirmngr/ocsp.c:585
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:623 dirmngr/validate.c:648
+#: dirmngr/ocsp.c:624 dirmngr/validate.c:648
 #, fuzzy, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: dirmngr/ocsp.c:633
+#: dirmngr/ocsp.c:634
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:640
+#: dirmngr/ocsp.c:641
 #, fuzzy, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "luo mitätöintivarmenne"
 
-#: dirmngr/ocsp.c:650
+#: dirmngr/ocsp.c:651
 #, fuzzy, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: dirmngr/ocsp.c:689
+#: dirmngr/ocsp.c:690
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:696
 #, fuzzy, c-format
 #| msgid "no default secret keyring: %s\n"
 msgid "no default OCSP signer defined\n"
 msgstr "salaiselle avainrenkaalle ei ole asetettu oletusarvoa: %s\n"
 
-#: dirmngr/ocsp.c:702
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:707
+#: dirmngr/ocsp.c:708
 #, fuzzy, c-format
 #| msgid "using cipher %s\n"
 msgid "using OCSP responder '%s'\n"
 msgstr "käytetään salakirjoitusalgoritmia %s\n"
 
-#: dirmngr/ocsp.c:764
+#: dirmngr/ocsp.c:765
 #, fuzzy, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: dirmngr/ocsp.c:789
+#: dirmngr/ocsp.c:790
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:790
+#: dirmngr/ocsp.c:791
 msgid "good"
 msgstr ""
 
-#: dirmngr/ocsp.c:796
+#: dirmngr/ocsp.c:797
 #, fuzzy, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "HUOM: avain on mitätöity!"
 
-#: dirmngr/ocsp.c:831
+#: dirmngr/ocsp.c:832
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:843
+#: dirmngr/ocsp.c:844
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:858
+#: dirmngr/ocsp.c:859
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr ""
@@ -11268,72 +11087,68 @@ msgstr ""
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "allekirjoitus epäonnistui: %s\n"
 
-#: dirmngr/server.c:1158
-msgid "ldapserver missing"
-msgstr ""
-
-#: dirmngr/server.c:1224
+#: dirmngr/server.c:1277
 msgid "serialno missing in cert ID"
 msgstr ""
 
-#: dirmngr/server.c:1387 dirmngr/server.c:1473 dirmngr/server.c:1909
-#: dirmngr/server.c:1980 dirmngr/server.c:2556 dirmngr/server.c:2571
+#: dirmngr/server.c:1440 dirmngr/server.c:1526 dirmngr/server.c:1963
+#: dirmngr/server.c:2034 dirmngr/server.c:2662 dirmngr/server.c:2677
 #, fuzzy, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "allekirjoitus epäonnistui: %s\n"
 
-#: dirmngr/server.c:1516
+#: dirmngr/server.c:1569
 #, fuzzy, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: dirmngr/server.c:1528 dirmngr/server.c:1559 dirmngr/server.c:1718
+#: dirmngr/server.c:1581 dirmngr/server.c:1612 dirmngr/server.c:1772
 #, fuzzy, c-format
 msgid "error sending data: %s\n"
 msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
 
-#: dirmngr/server.c:1666
+#: dirmngr/server.c:1720
 #, fuzzy, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: dirmngr/server.c:1699
+#: dirmngr/server.c:1753
 #, fuzzy, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: dirmngr/server.c:1726
+#: dirmngr/server.c:1780
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:2860
+#: dirmngr/server.c:2966
 #, fuzzy, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
-#: dirmngr/server.c:2871
+#: dirmngr/server.c:2977
 #, fuzzy, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "%s: hajautustaulukon luonti ei onnistu: %s\n"
 
-#: dirmngr/server.c:2892
+#: dirmngr/server.c:2998
 #, fuzzy, c-format
 #| msgid "failed to initialize the TrustDB: %s\n"
 msgid "failed to initialize the server: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: dirmngr/server.c:2900
+#: dirmngr/server.c:3006
 #, fuzzy, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "avainrenkaan välimuistin uudelleenluominen epäonnistui: %s\n"
 
-#: dirmngr/server.c:2933
+#: dirmngr/server.c:3039
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:2952
+#: dirmngr/server.c:3058
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -11482,73 +11297,73 @@ msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
 msgid "error sending standard options: %s\n"
 msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
 
-#: tools/gpgconf-comp.c:649
+#: tools/gpgconf-comp.c:655
 msgid "OpenPGP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:653
+#: tools/gpgconf-comp.c:659
 msgid "S/MIME"
 msgstr ""
 
-#: tools/gpgconf-comp.c:657
+#: tools/gpgconf-comp.c:663
 #, fuzzy
 msgid "Public Keys"
 msgstr "julkinen avain on %08lX\n"
 
-#: tools/gpgconf-comp.c:661
+#: tools/gpgconf-comp.c:667
 msgid "Private Keys"
 msgstr ""
 
-#: tools/gpgconf-comp.c:665
+#: tools/gpgconf-comp.c:671
 msgid "Smartcards"
 msgstr ""
 
-#: tools/gpgconf-comp.c:669
+#: tools/gpgconf-comp.c:676
 msgid "TPM"
 msgstr ""
 
-#: tools/gpgconf-comp.c:673
+#: tools/gpgconf-comp.c:681
 #, fuzzy
 #| msgid "network error"
 msgid "Network"
 msgstr "verkkovirhe"
 
-#: tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:685
 #, fuzzy
 msgid "Passphrase Entry"
 msgstr "väärä salasana"
 
-#: tools/gpgconf-comp.c:941
+#: tools/gpgconf-comp.c:951
 #, fuzzy
 msgid "Component not suitable for launching"
 msgstr "julkista avainta ei löydy"
 
-#: tools/gpgconf-comp.c:947
+#: tools/gpgconf-comp.c:957
 #, c-format
 msgid "Configuration file of component %s is broken\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:950
+#: tools/gpgconf-comp.c:960
 #, fuzzy, c-format
 #| msgid "Please use the command \"toggle\" first.\n"
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr "Käytä ensin komentoa \"toggle\".\n"
 
-#: tools/gpgconf-comp.c:2816
+#: tools/gpgconf-comp.c:2826
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2946
+#: tools/gpgconf-comp.c:2956
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3543
+#: tools/gpgconf-comp.c:3553
 #, fuzzy, c-format
 msgid "error closing '%s'\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: tools/gpgconf-comp.c:3545
+#: tools/gpgconf-comp.c:3555
 #, fuzzy, c-format
 msgid "error parsing '%s'\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@ -11632,16 +11447,16 @@ msgid ""
 "Manage configuration options for tools of the @GNUPG@ system\n"
 msgstr ""
 
-#: tools/gpgconf.c:669 tools/gpgconf.c:704
+#: tools/gpgconf.c:703 tools/gpgconf.c:738
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:678 tools/gpgconf.c:728 tools/gpgconf.c:778
+#: tools/gpgconf.c:712 tools/gpgconf.c:762 tools/gpgconf.c:812
 #, fuzzy
 msgid "Component not found"
 msgstr "julkista avainta ei löydy"
 
-#: tools/gpgconf.c:804
+#: tools/gpgconf.c:838
 #, fuzzy
 msgid "No argument allowed"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
@@ -11657,88 +11472,189 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
-#: tools/gpg-card.c:2390
+#: tools/gpg-card.c:2407
 #, fuzzy, c-format
 msgid "Note: key %s is already stored on the card!\n"
 msgstr "ohitetaan: salainen avain on jo paikalla\n"
 
-#: tools/gpg-card.c:2393
+#: tools/gpg-card.c:2410
 #, fuzzy, c-format
 msgid "Note: Keys are already stored on the card!\n"
 msgstr "ohitetaan: salainen avain on jo paikalla\n"
 
-#: tools/gpg-card.c:2396
+#: tools/gpg-card.c:2413
 #, c-format
 msgid "Replace existing key %s ? (y/N) "
 msgstr ""
 
-#: tools/gpg-card.c:2549 tools/gpg-card.c:2712 tools/gpg-card.c:2935
-#: tools/gpg-card.c:3044
+#: tools/gpg-card.c:2566 tools/gpg-card.c:2729 tools/gpg-card.c:2952
+#: tools/gpg-card.c:3061
 #, c-format
 msgid "%s card no. %s detected\n"
 msgstr ""
 
-#: tools/gpg-card.c:3396
+#: tools/gpg-card.c:3413
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3406 tools/gpg-card.c:3420
+#: tools/gpg-card.c:3423 tools/gpg-card.c:3437
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
 "         can only be reverted using a factory reset!\n"
 msgstr ""
 
-#: tools/gpg-card.c:3423
+#: tools/gpg-card.c:3440
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3669
+#: tools/gpg-card.c:3686
 #, fuzzy
 msgid "authenticate to the card"
 msgstr "Mitätöintivarmenne luotu.\n"
 
-#: tools/gpg-card.c:3671
+#: tools/gpg-card.c:3688
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3673
+#: tools/gpg-card.c:3690
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication"
 msgstr "|NIMI|käytä NIMI oletusvastaanottajana"
 
-#: tools/gpg-card.c:3675
+#: tools/gpg-card.c:3692
 #, fuzzy
 #| msgid "change the expire date"
 msgid "change a private data object"
 msgstr "muuta voimassoloaikaa"
 
-#: tools/gpg-card.c:3676
+#: tools/gpg-card.c:3693
 #, fuzzy
 msgid "read a certificate from a data object"
 msgstr "Mitätöintivarmenne luotu.\n"
 
-#: tools/gpg-card.c:3677
+#: tools/gpg-card.c:3694
 #, fuzzy
 msgid "store a certificate to a data object"
 msgstr "Mitätöintivarmenne luotu.\n"
 
-#: tools/gpg-card.c:3678
+#: tools/gpg-card.c:3695
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3679
+#: tools/gpg-card.c:3696
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3681
+#: tools/gpg-card.c:3698
 msgid "manage the command history"
 msgstr ""
 
 #, fuzzy
+#~ msgid "requesting key %s from %s server %s\n"
+#~ msgstr "pyydetään avainta %08lX kohteesta %s\n"
+
+#, fuzzy
+#~ msgid "%s:%u: no hostname given\n"
+#~ msgstr "(Kuvausta ei annettu)\n"
+
+#, fuzzy
+#~ msgid "could not parse keyserver\n"
+#~ msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
+
+#, fuzzy
+#~| msgid "|NAME|set terminal charset to NAME"
+#~ msgid "|NAME|connect to host NAME"
+#~ msgstr "|NIMI|aseta päätteen merkistöksi NIMI"
+
+#, fuzzy
+#~| msgid "|NAME|use NAME as default recipient"
+#~ msgid "|NAME|use user NAME for authentication"
+#~ msgstr "|NIMI|käytä NIMI oletusvastaanottajana"
+
+#, fuzzy
+#~| msgid "Usage: gpg [options] [files] (-h for help)"
+#~ msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
+#~ msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
+
+#, fuzzy
+#~| msgid "invalid import options\n"
+#~ msgid "invalid port number %d\n"
+#~ msgstr "virheelliset tuontivalitsimet\n"
+
+#, fuzzy
+#~ msgid "error writing to stdout: %s\n"
+#~ msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
+
+#, fuzzy
+#~ msgid "attribute '%s' not found\n"
+#~ msgstr "avainta \"%s\" ei löydy: %s\n"
+
+#, fuzzy
+#~| msgid "reading from `%s'\n"
+#~ msgid "processing url '%s'\n"
+#~ msgstr "luetaan kohteesta \"%s\"\n"
+
+#, fuzzy
+#~| msgid "          w/o user IDs: %lu\n"
+#~ msgid "          user '%s'\n"
+#~ msgstr "          ilman käyttäjätunnuksia: %lu\n"
+
+#, fuzzy
+#~ msgid "          pass '%s'\n"
+#~ msgstr "                aka \""
+
+#, fuzzy
+#~ msgid "          host '%s'\n"
+#~ msgstr "                aka \""
+
+#, fuzzy
+#~| msgid "          not imported: %lu\n"
+#~ msgid "          port %d\n"
+#~ msgstr "          ei tuotu: %lu\n"
+
+#, fuzzy
+#~ msgid "            DN '%s'\n"
+#~ msgstr "                aka \""
+
+#, fuzzy
+#~ msgid "          attr '%s'\n"
+#~ msgstr "                aka \""
+
+#, fuzzy
+#~ msgid "no host name in '%s'\n"
+#~ msgstr "(Kuvausta ei annettu)\n"
+
+#, fuzzy
+#~| msgid "WARNING: using insecure memory!\n"
+#~ msgid "WARNING: using first attribute only\n"
+#~ msgstr "VAROITUS: käytetään suojaamatonta muistia!\n"
+
+#, fuzzy
+#~ msgid "LDAP init to '%s:%d' failed: %s\n"
+#~ msgstr "ascii-koodaaminen epäonnistui: %s\n"
+
+#, fuzzy
+#~ msgid "LDAP init to '%s' failed: %s\n"
+#~ msgstr "ascii-koodaaminen epäonnistui: %s\n"
+
+#, fuzzy
+#~ msgid "LDAP init to '%s' done\n"
+#~ msgstr "ascii-koodaaminen epäonnistui: %s\n"
+
+#, fuzzy
+#~ msgid "binding to '%s:%d' failed: %s\n"
+#~ msgstr "ascii-koodaaminen epäonnistui: %s\n"
+
+#, fuzzy
+#~| msgid "dearmoring failed: %s\n"
+#~ msgid "searching '%s' failed: %s\n"
+#~ msgstr "ascii-koodauksen purku epäonnistui: %s\n"
+
+#, fuzzy
 #~ msgid "Suggest a random passphrase."
 #~ msgstr "muuta salasanaa"
 
diff --git a/po/fr.gmo b/po/fr.gmo
index ce3c63d..8715273 100644
--- a/po/fr.gmo
+++ b/po/fr.gmo
diff --git a/po/fr.po b/po/fr.po
index 66dcfa0..87dad44 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: 2021-04-20 12:38+0200\n"
+"POT-Creation-Date: 2021-08-24 18:50+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:328
+#: agent/call-pinentry.c:338
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "impossible d'obtenir le verrou pinentry : %s\n"
@@ -29,56 +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:546
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_OK"
 msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:547
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_Cancel"
 msgstr "|pinentry-label|_Annuler"
 
-#: agent/call-pinentry.c:548
+#: agent/call-pinentry.c:558
 #, fuzzy
 #| msgid "|pinentry-label|_OK"
 msgid "|pinentry-label|_Yes"
 msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:549
+#: agent/call-pinentry.c:559
 #, fuzzy
 #| msgid "|pinentry-label|_OK"
 msgid "|pinentry-label|_No"
 msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:550
+#: agent/call-pinentry.c:560
 msgid "|pinentry-label|PIN:"
 msgstr "|pinentry-label|Code personnel :"
 
-#: agent/call-pinentry.c:551
+#: agent/call-pinentry.c:561
 #, fuzzy
 #| msgid "|pinentry-label|_Cancel"
 msgid "|pinentry-label|_Save in password manager"
 msgstr "|pinentry-label|_Annuler"
 
-#: agent/call-pinentry.c:552
+#: agent/call-pinentry.c:562
 #, 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:554
+#: agent/call-pinentry.c:564
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:555
+#: agent/call-pinentry.c:565
 #, fuzzy
 #| msgid "invalid passphrase"
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "phrase de passe incorrecte"
 
+#: agent/call-pinentry.c:566
+msgid "Caps Lock is on"
+msgstr ""
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:944
+#: agent/call-pinentry.c:1022
 msgid "Suggest"
 msgstr ""
 
@@ -89,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:966
+#: agent/call-pinentry.c:1044
 #, fuzzy
 #| msgid "pinentry.qualitybar.tooltip"
 msgid "pinentry.genpin.tooltip"
@@ -97,9 +101,22 @@ msgstr ""
 "La qualité du texte entré ci-dessus.\n"
 "Veuillez demander à votre administrateur des précisions sur les critères."
 
+#: agent/call-pinentry.c:1072
+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
+#, fuzzy
+#| msgid "Passphrase too long"
+msgid "Passphrase Not Allowed"
+msgstr "Phrase secrète trop longue"
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:998
+#: agent/call-pinentry.c:1198
 msgid "Quality:"
 msgstr "Qualité :"
 
@@ -109,13 +126,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:1019
+#: agent/call-pinentry.c:1219
 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:1263
+#: agent/call-pinentry.c:1477
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
@@ -123,7 +140,7 @@ msgstr ""
 "Veuillez entrer votre code personnel, afin de débloquer la clef secrète "
 "pendant cette session"
 
-#: agent/call-pinentry.c:1266
+#: agent/call-pinentry.c:1480
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -131,76 +148,76 @@ msgstr ""
 "Veuillez entrer votre phrase secrète, afin de débloquer la clef secrète "
 "pendant cette session"
 
-#: agent/call-pinentry.c:1303 agent/call-pinentry.c:1506
+#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1303 agent/call-pinentry.c:1506
-#: agent/protect-tool.c:728
+#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/protect-tool.c:729
 msgid "Passphrase:"
 msgstr "Phrase secrète :"
 
-#: agent/call-pinentry.c:1330 agent/call-pinentry.c:1580 agent/command.c:1799
-#: agent/command.c:1852 agent/command-ssh.c:3046 agent/genkey.c:398
+#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
+#: agent/command.c:1988 agent/command-ssh.c:3046 agent/genkey.c:442
 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:1351 agent/call-pinentry.c:1603
+#: agent/call-pinentry.c:1566 agent/call-pinentry.c:1830
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (essai %d sur %d)"
 
-#: agent/call-pinentry.c:1362 agent/call-pinentry.c:1614
+#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
 msgid "Repeat:"
 msgstr "Répéter :"
 
-#: agent/call-pinentry.c:1372 agent/call-pinentry.c:1384
-#: agent/call-pinentry.c:1624 agent/call-pinentry.c:1636
+#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
+#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
 msgid "PIN too long"
 msgstr "Code personnel trop long"
 
-#: agent/call-pinentry.c:1373 agent/call-pinentry.c:1625
+#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
 msgid "Passphrase too long"
 msgstr "Phrase secrète trop longue"
 
-#: agent/call-pinentry.c:1381 agent/call-pinentry.c:1633
+#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
 msgid "Invalid characters in PIN"
 msgstr "Caractères incorrects dans le code personnel"
 
-#: agent/call-pinentry.c:1386 agent/call-pinentry.c:1638
+#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
 msgid "PIN too short"
 msgstr "Code personnel trop court"
 
-#: agent/call-pinentry.c:1405 agent/call-pinentry.c:1656
+#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
 msgid "Bad PIN"
 msgstr "Mauvais code personnel"
 
-#: agent/call-pinentry.c:1405 agent/call-pinentry.c:1656
+#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
 msgid "Bad Passphrase"
 msgstr "Mauvaise phrase secrète"
 
-#: agent/command.c:697
+#: agent/command.c:823
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:698
+#: agent/command.c:824
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1106 g10/card-util.c:708 g10/card-util.c:729
+#: agent/command.c:1235 g10/card-util.c:713 g10/card-util.c:734
 #, 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:1634 agent/command.c:1791 agent/command-ssh.c:2974
-#: agent/genkey.c:333
+#: agent/command.c:1756 agent/command.c:1921 agent/command-ssh.c:2974
+#: agent/genkey.c:377
 msgid "Please re-enter this passphrase"
 msgstr "Veuillez répéter cette phrase secrète"
 
-#: agent/command.c:2567
+#: agent/command.c:2703
 #, fuzzy, c-format
 #| msgid ""
 #| "Please enter the passphrase to protect the imported object within the "
@@ -212,7 +229,7 @@ msgstr ""
 "Veuillez entrer la phrase secrète pour protéger l'objet importé dans le "
 "système GnuPG."
 
-#: agent/command.c:2697
+#: agent/command.c:2833
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -223,25 +240,25 @@ msgstr ""
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "les clefs SSH plus grandes que %d bits ne sont pas prises en charge\n"
 
-#: agent/command-ssh.c:872 common/dotlock.c:852 g10/card-util.c:953
-#: g10/export.c:1329 g10/gpg.c:1431 g10/keygen.c:5347 g10/keyring.c:1319
-#: g10/keyring.c:1632 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
+#: agent/command-ssh.c:872 common/dotlock.c:852 g10/card-util.c:963
+#: g10/export.c:1329 g10/gpg.c:1431 g10/keygen.c:5377 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
 #: g10/sign.c:1106 g10/sign.c:1443 g10/tdbio.c:753 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:884 common/helpfile.c:57 g10/card-util.c:910
+#: agent/command-ssh.c:884 common/helpfile.c:57 g10/card-util.c:920
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
 #: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:721 g10/gpg.c:1432
-#: g10/import.c:371 g10/import.c:558 g10/import.c:793 g10/keygen.c:4322
-#: g10/keyring.c:1658 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
+#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4326
+#: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
 #: g10/plaintext.c:610 g10/sign.c:1086 g10/sign.c:1311 g10/sign.c:1424
 #: g10/sign.c:1596 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2380
-#: sm/gpgsm.c:2410 sm/gpgsm.c:2448 sm/keylist.c:1737 sm/qualified.c:65
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2236
+#: sm/gpgsm.c:2266 sm/gpgsm.c:2304 sm/keylist.c:1775 sm/qualified.c:65
 #: dirmngr/certcache.c:396 dirmngr/certcache.c:476 dirmngr/certcache.c:478
-#: dirmngr/crlcache.c:2588 dirmngr/dirmngr.c:1720 tools/gpg-card.c:408
+#: dirmngr/crlcache.c:2591 dirmngr/dirmngr.c:1759 tools/gpg-card.c:408
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "impossible d'ouvrir « %s » : %s\n"
@@ -352,21 +369,21 @@ msgstr "Les codes personnels ne correspondent pas ; veuillez réessayer"
 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:109 sm/certreqgen-ui.c:433
+#: 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:116
+#: 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
+#: agent/genkey.c:191
 msgid "Enter new passphrase"
 msgstr "Entrez la nouvelle phrase secrète"
 
-#: agent/genkey.c:184
+#: agent/genkey.c:227
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
@@ -374,7 +391,7 @@ msgstr ""
 "Aucune phrase secrète n'a été entrée.%0AUne phrase secrète vide n'est pas "
 "autorisée."
 
-#: agent/genkey.c:186
+#: agent/genkey.c:229
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -383,18 +400,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:198
+#: agent/genkey.c:241
 msgid "Yes, protection is not needed"
 msgstr "Oui, aucune protection n'est nécessaire"
 
-#: agent/genkey.c:215
+#: agent/genkey.c:258
 #, 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:234
+#: agent/genkey.c:277
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -406,7 +423,7 @@ msgstr[1] ""
 "Une phrase secrète devrait contenir au moins %u chiffres%%0Aou caractères "
 "spéciaux."
 
-#: agent/genkey.c:260
+#: agent/genkey.c:304
 #, 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."
@@ -414,228 +431,227 @@ msgstr ""
 "Une phrase secrète ne devrait ni être un mot commun,%%0Ani correspondre à un "
 "certain schéma."
 
-#: agent/genkey.c:275
+#: agent/genkey.c:319
 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:296
+#: agent/genkey.c:340
 msgid "Take this one anyway"
 msgstr "La prendre quand même"
 
-#: agent/genkey.c:464
+#: agent/genkey.c:508
 #, 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:590
+#: agent/genkey.c:637
 msgid "Please enter the new passphrase"
 msgstr "Veuillez entrer la nouvelle phrase secrète"
 
-#: agent/gpg-agent.c:162 scd/scdaemon.c:115 dirmngr/dirmngr.c:182
+#: agent/gpg-agent.c:164 scd/scdaemon.c:115 dirmngr/dirmngr.c:183
 #, fuzzy
 #| msgid "Options useful for debugging"
 msgid "Options used for startup"
 msgstr "Options pratiques pour le débogage"
 
-#: agent/gpg-agent.c:164 scd/scdaemon.c:120 dirmngr/dirmngr.c:171
+#: agent/gpg-agent.c:166 scd/scdaemon.c:120 dirmngr/dirmngr.c:172
 msgid "run in daemon mode (background)"
 msgstr "exécuter en mode démon (arrière-plan)"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:117 dirmngr/dirmngr.c:170
+#: agent/gpg-agent.c:167 scd/scdaemon.c:117 dirmngr/dirmngr.c:171
 msgid "run in server mode (foreground)"
 msgstr "exécuter en mode serveur (premier plan)"
 
-#: agent/gpg-agent.c:167 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:169 dirmngr/dirmngr.c:174
 #, fuzzy
 #| msgid "run in server mode"
 msgid "run in supervised mode"
 msgstr "exécuter en mode serveur"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:121 dirmngr/dirmngr.c:184
+#: agent/gpg-agent.c:171 scd/scdaemon.c:121 dirmngr/dirmngr.c:185
 msgid "do not detach from the console"
 msgstr "ne pas détacher de la console"
 
-#: agent/gpg-agent.c:170 scd/scdaemon.c:122 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:172 scd/scdaemon.c:122 dirmngr/dirmngr.c:186
 msgid "sh-style command output"
 msgstr "sortie de commandes à la sh"
 
-#: agent/gpg-agent.c:171 scd/scdaemon.c:123 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:173 scd/scdaemon.c:123 dirmngr/dirmngr.c:187
 msgid "csh-style command output"
 msgstr "sortie de commandes à la csh"
 
-#: agent/gpg-agent.c:179 g10/gpg.c:589 scd/scdaemon.c:125 sm/gpgsm.c:422
-#: dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:181 g10/gpg.c:589 scd/scdaemon.c:125 sm/gpgsm.c:423
+#: dirmngr/dirmngr.c:189
 msgid "|FILE|read options from FILE"
 msgstr "|FICHIER|lire les options depuis le FICHIER"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:574 scd/scdaemon.c:129 sm/gpgsm.c:265
-#: dirmngr/dirmngr.c:192
+#: agent/gpg-agent.c:185 g10/gpg.c:574 scd/scdaemon.c:129 sm/gpgsm.c:265
+#: dirmngr/dirmngr.c:193
 msgid "Options controlling the diagnostic output"
 msgstr "Options contrôlant la sortie de diagnostique"
 
-#: agent/gpg-agent.c:185 g10/gpg.c:576 g10/gpgv.c:78 kbx/kbxutil.c:89
+#: agent/gpg-agent.c:187 g10/gpg.c:576 g10/gpgv.c:78 kbx/kbxutil.c:89
 #: scd/scdaemon.c:131 sm/gpgsm.c:267 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:194 dirmngr/dirmngr_ldap.c:102
-#: tools/gpg-connect-agent.c:85 tools/gpgconf.c:111
+#: dirmngr/dirmngr.c:195 tools/gpg-connect-agent.c:85 tools/gpgconf.c:111
 msgid "verbose"
 msgstr "bavard"
 
-#: agent/gpg-agent.c:186 g10/gpg.c:578 g10/gpgv.c:79 kbx/kbxutil.c:90
+#: agent/gpg-agent.c:188 g10/gpg.c:578 g10/gpgv.c:79 kbx/kbxutil.c:90
 #: scd/scdaemon.c:132 sm/gpgsm.c:269 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:195 dirmngr/dirmngr_ldap.c:103
+#: dirmngr/dirmngr.c:196
 msgid "be somewhat more quiet"
 msgstr "devenir beaucoup plus silencieux"
 
-#: agent/gpg-agent.c:194 g10/gpg.c:593 sm/gpgsm.c:283 dirmngr/dirmngr.c:205
+#: agent/gpg-agent.c:196 g10/gpg.c:593 sm/gpgsm.c:283 dirmngr/dirmngr.c:206
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FICHIER|écrire les journaux serveur dans le FICHIER"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 scd/scdaemon.c:146 sm/gpgsm.c:290
-#: dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:599 scd/scdaemon.c:146 sm/gpgsm.c:290
+#: dirmngr/dirmngr.c:210
 msgid "Options controlling the configuration"
 msgstr "Options contrôlant la configuration"
 
-#: agent/gpg-agent.c:201
+#: agent/gpg-agent.c:203
 msgid "do not use the SCdaemon"
 msgstr "ne pas utiliser le SCdaemon"
 
-#: agent/gpg-agent.c:203
+#: agent/gpg-agent.c:205
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PROG|utiliser PROG comme SCdaemon"
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 #, 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:209
+#: agent/gpg-agent.c:211
 #, 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:213
+#: agent/gpg-agent.c:215
 msgid "ignore requests to change the TTY"
 msgstr "ignorer les demandes de modification du TTY"
 
-#: agent/gpg-agent.c:215
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the X display"
 msgstr "ignorer les demandes de modification d'aff. X"
 
-#: agent/gpg-agent.c:216
+#: agent/gpg-agent.c:218
 msgid "enable ssh support"
 msgstr "activer la prise en charge de SSH"
 
-#: agent/gpg-agent.c:218
+#: agent/gpg-agent.c:220
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:221
+#: agent/gpg-agent.c:223
 msgid "enable putty support"
 msgstr "activer la prise en charge de putty"
 
-#: agent/gpg-agent.c:233 g10/gpg.c:844 scd/scdaemon.c:176 sm/gpgsm.c:382
+#: agent/gpg-agent.c:235 g10/gpg.c:844 scd/scdaemon.c:176 sm/gpgsm.c:383
 msgid "Options controlling the security"
 msgstr "Options contrôlant la sécurité"
 
-#: agent/gpg-agent.c:236
+#: agent/gpg-agent.c:238
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|oublier les codes personnels après N secondes"
 
-#: agent/gpg-agent.c:238
+#: agent/gpg-agent.c:240
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|oublier les clefs SSH après N secondes"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:242
 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:242
+#: agent/gpg-agent.c:244
 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:244
+#: agent/gpg-agent.c:246
 msgid "do not use the PIN cache when signing"
 msgstr "ne pas utiliser le cache de code pour signer"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:248
 #, 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:248
+#: agent/gpg-agent.c:250
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "ne pas marquer les clefs comme de confiance"
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:253
 msgid "allow presetting passphrase"
 msgstr "permettre de préconfigurer la phrase secrète"
 
-#: agent/gpg-agent.c:256
+#: agent/gpg-agent.c:258
 msgid "Options enforcing a passphrase policy"
 msgstr "Options d'application d'une politique de phrase secrète"
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:261
 msgid "do not allow bypassing the passphrase policy"
 msgstr "pas de contournement de politique de phrase secrète"
 
-#: agent/gpg-agent.c:261
+#: agent/gpg-agent.c:263
 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:263
+#: agent/gpg-agent.c:265
 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:266
+#: agent/gpg-agent.c:268
 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:268
+#: agent/gpg-agent.c:272
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|la phrase secrète expire après N jours"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:274
 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:273
+#: agent/gpg-agent.c:277
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the PIN-Entry"
 msgstr "Options contrôlant la sécurité"
 
-#: agent/gpg-agent.c:275
+#: agent/gpg-agent.c:279
 msgid "never use the PIN-entry"
 msgstr ""
 
-#: agent/gpg-agent.c:277
+#: agent/gpg-agent.c:281
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:283
 #, 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:282
+#: agent/gpg-agent.c:286
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PROG|utiliser PROG pour entrer le code personnel"
 
-#: agent/gpg-agent.c:286
+#: agent/gpg-agent.c:290
 #, 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:288
+#: agent/gpg-agent.c:294
 msgid "allow passphrase to be prompted through Emacs"
 msgstr ""
 
@@ -643,21 +659,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:551 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: agent/gpg-agent.c:557 agent/preset-passphrase.c:99 agent/protect-tool.c:154
 #: g10/gpg.c:1132 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:612 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:438
-#: dirmngr/dirmngr_ldap.c:175 tools/gpg-connect-agent.c:220 tools/gpgconf.c:151
+#: sm/gpgsm.c:613 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:446
+#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:151
 #: 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:560
+#: agent/gpg-agent.c:566
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Utilisation : dirmngr @GPG_AGENT@ (-h pour l'aide)"
 
-#: agent/gpg-agent.c:562
+#: agent/gpg-agent.c:568
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -665,135 +681,135 @@ msgstr ""
 "Syntaxe : @GPG_AGENT@ [options] [commande [arguments]]\n"
 "Gestionnaire de clefs secrètes pour @GNUPG@\n"
 
-#: agent/gpg-agent.c:607 g10/gpg.c:1337 scd/scdaemon.c:384 sm/gpgsm.c:760
-#: dirmngr/dirmngr.c:522
+#: agent/gpg-agent.c:613 g10/gpg.c:1337 scd/scdaemon.c:384 sm/gpgsm.c:761
+#: dirmngr/dirmngr.c:530
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "niveau de débogage « %s » incorrect\n"
 
-#: agent/gpg-agent.c:972 g10/gpg.c:3910 g10/gpg.c:3934 sm/gpgsm.c:1769
-#: sm/gpgsm.c:1775
+#: agent/gpg-agent.c:986 g10/gpg.c:3907 g10/gpg.c:3931 sm/gpgsm.c:1622
+#: sm/gpgsm.c:1628
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "la fonction de hachage sélectionnée est incorrecte\n"
 
-#: agent/gpg-agent.c:1196 agent/gpg-agent.c:2019 common/comopt.c:93
-#: g10/gpg.c:2591 scd/scdaemon.c:549 sm/gpgsm.c:1155 dirmngr/dirmngr.c:989
-#: dirmngr/dirmngr.c:1840
+#: agent/gpg-agent.c:1210 agent/gpg-agent.c:2035 common/comopt.c:93
+#: g10/gpg.c:2594 scd/scdaemon.c:549 sm/gpgsm.c:1028 dirmngr/dirmngr.c:1029
+#: dirmngr/dirmngr.c:1879
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "lecture des options de « %s »\n"
 
-#: agent/gpg-agent.c:1335 g10/gpg.c:3861 scd/scdaemon.c:687 sm/gpgsm.c:1709
-#: dirmngr/dirmngr.c:1108 tools/gpg-connect-agent.c:1270 tools/gpgconf.c:634
+#: agent/gpg-agent.c:1349 g10/gpg.c:3858 scd/scdaemon.c:687 sm/gpgsm.c:1562
+#: dirmngr/dirmngr.c:1145 tools/gpg-connect-agent.c:1270 tools/gpgconf.c:668
 #, 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:2172 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1267
+#: agent/gpg-agent.c:2188 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1306
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "impossible de créer la socket : %s\n"
 
-#: agent/gpg-agent.c:2189 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1280
+#: agent/gpg-agent.c:2205 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1319
 #, 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:2228
+#: agent/gpg-agent.c:2244
 #, 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:2239 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1312
+#: agent/gpg-agent.c:2255 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1351
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "erreur de lecture du « nonce » de la socket\n"
 
-#: agent/gpg-agent.c:2244 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1315
+#: agent/gpg-agent.c:2260 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1354
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "erreur de lien de la socket à « %s » : %s\n"
 
-#: agent/gpg-agent.c:2255 agent/gpg-agent.c:2295 agent/gpg-agent.c:2304
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1324
+#: agent/gpg-agent.c:2271 agent/gpg-agent.c:2311 agent/gpg-agent.c:2320
+#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1363
 #, 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:2269 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1336
+#: agent/gpg-agent.c:2285 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1375
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "écoute sur la socket « %s »\n"
 
-#: agent/gpg-agent.c:2289 agent/gpg-agent.c:2342 common/homedir.c:517
+#: agent/gpg-agent.c:2305 agent/gpg-agent.c:2358 common/homedir.c:537
 #: 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:2292 agent/gpg-agent.c:2347 common/homedir.c:520
+#: agent/gpg-agent.c:2308 agent/gpg-agent.c:2363 common/homedir.c:540
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "répertoire « %s » créé\n"
 
-#: agent/gpg-agent.c:2353
+#: agent/gpg-agent.c:2369
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "échec de stat() pour « %s » : %s\n"
 
-#: agent/gpg-agent.c:2357
+#: agent/gpg-agent.c:2373
 #, 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:2512 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2069
+#: agent/gpg-agent.c:2528 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2108
 #, 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:2719
+#: agent/gpg-agent.c:2735
 #, 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:2724
+#: agent/gpg-agent.c:2740
 #, 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:2799
+#: agent/gpg-agent.c:2815
 #, 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:2804
+#: agent/gpg-agent.c:2820
 #, 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:3026 scd/scdaemon.c:1374 dirmngr/dirmngr.c:2283
+#: agent/gpg-agent.c:3042 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2322
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "échec de npth_pselect : %s — attente 1 s\n"
 
-#: agent/gpg-agent.c:3114 scd/scdaemon.c:1439
+#: agent/gpg-agent.c:3130 scd/scdaemon.c:1441
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s arrêté\n"
 
-#: agent/gpg-agent.c:3252 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3271 common/simple-pwquery.c:247 g10/call-agent.c:260
 #: sm/call-agent.c:131 tools/gpg-connect-agent.c:2319 tools/card-call-scd.c:311
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr ""
 "aucune instance de gpg-agent n'est en cours d'exécution dans cette session\n"
 
-#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:70
+#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:66
 msgid ""
 "@Options:\n"
 " "
@@ -815,7 +831,7 @@ msgstr ""
 "Maintenance du cache des mots de passe\n"
 
 #: agent/protect-tool.c:107 g10/gpg.c:448 kbx/kbxutil.c:72 sm/gpgsm.c:215
-#: dirmngr/dirmngr.c:168 tools/gpgconf.c:81
+#: dirmngr/dirmngr.c:169 tools/gpgconf.c:81
 msgid ""
 "@Commands:\n"
 " "
@@ -846,16 +862,16 @@ msgstr ""
 "Syntaxe : gpg-protect-tool [options] [arguments]\n"
 "Outils de maintenance des clefs secrètes\n"
 
-#: agent/protect-tool.c:707
+#: agent/protect-tool.c:708 sm/import.c:775
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Veuillez entrer la phrase secrète pour déprotéger l'objet PKCS#12."
 
-#: agent/protect-tool.c:712
+#: agent/protect-tool.c:713 sm/export.c:727
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr ""
 "Veuillez entrer la phrase secrète pour protéger le nouvel objet PKCS#12."
 
-#: agent/protect-tool.c:718
+#: agent/protect-tool.c:719
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
@@ -863,7 +879,7 @@ msgstr ""
 "Veuillez entrer la phrase secrète pour protéger l'objet importé dans le "
 "système GnuPG."
 
-#: agent/protect-tool.c:723
+#: agent/protect-tool.c:724
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -871,17 +887,17 @@ msgstr ""
 "Veuillez entrer la phrase secrète ou le code personnel\n"
 "nécessaires pour terminer cette opération."
 
-#: agent/protect-tool.c:734
+#: agent/protect-tool.c:735
 #, c-format
 msgid "cancelled\n"
 msgstr "annulé\n"
 
-#: agent/protect-tool.c:736
+#: agent/protect-tool.c:737
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "erreur de demande de la phrase secrète : %s\n"
 
-#: agent/trustlist.c:153 agent/trustlist.c:363 tools/gpgconf.c:424
+#: agent/trustlist.c:153 agent/trustlist.c:363 tools/gpgconf.c:458
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "erreur d'ouverture de « %s » : %s\n"
@@ -1047,7 +1063,7 @@ msgstr "échec de vérification de la signature créée : %s\n"
 msgid "secret key parts are not available\n"
 msgstr "des parties de la clef secrète ne sont pas disponibles\n"
 
-#: agent/cvt-openpgp.c:343 g10/card-util.c:1562
+#: agent/cvt-openpgp.c:343 g10/card-util.c:1575
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr "l'algorithme de clef publique %d (%s) n'est pas pris en charge\n"
@@ -1077,7 +1093,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:505 common/exechelp-posix.c:580
-#: common/exechelp-posix.c:866 dirmngr/dirmngr.c:1354
+#: common/exechelp-posix.c:866 dirmngr/dirmngr.c:1393
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "erreur de création de processus fils : %s\n"
@@ -1151,7 +1167,7 @@ msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "impossible de renommer « %s » en « %s » : %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3082
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3099
 msgid "yes"
 msgstr "oui"
 
@@ -1205,7 +1221,7 @@ msgstr "hors limite de la mémoire sécurisée lors de l'allocation de %lu octe
 msgid "out of core while allocating %lu bytes"
 msgstr "hors limite lors de l'allocation de %lu octets"
 
-#: common/miscellaneous.c:115 g10/card-util.c:917 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:927 tools/no-libgcrypt.c:30
 #: tools/gpg-card.c:416
 #, c-format
 msgid "error allocating enough memory: %s\n"
@@ -1283,7 +1299,7 @@ msgstr "erreur de création du porte-clefs « %s » : %s\n"
 msgid "server '%s' is older than us (%s < %s)"
 msgstr ""
 
-#: common/asshelp.c:737 g10/call-dirmngr.c:408
+#: common/asshelp.c:737 g10/call-dirmngr.c:407
 #, fuzzy, c-format
 #| msgid "WARNING: "
 msgid "WARNING: %s\n"
@@ -1368,7 +1384,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:4212
+#: scd/app-openpgp.c:4214
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "algorithme non pris en charge : %s"
@@ -1443,11 +1459,11 @@ msgstr "Chaîne de certificats correcte"
 msgid "Root certificate trustworthy"
 msgstr "Certificat racine digne de confiance"
 
-#: common/audit.c:1112 sm/certchain.c:1242
+#: common/audit.c:1112 sm/certchain.c:1243
 msgid "no CRL found for certificate"
 msgstr "aucune liste de révocations trouvée pour le certificat"
 
-#: common/audit.c:1115 sm/certchain.c:1252
+#: common/audit.c:1115 sm/certchain.c:1253
 msgid "the available CRL is too old"
 msgstr "la liste de révocations de certificat est trop vieille"
 
@@ -1493,22 +1509,22 @@ msgstr "[aucun]"
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "caractère %02x incorrect en radix64, ignoré\n"
 
-#: common/ttyio.c:433
+#: common/ttyio.c:447
 #, c-format
 msgid "Sorry, we are in batchmode - can't get input\n"
 msgstr ""
 
-#: common/ttyio.c:439
+#: common/ttyio.c:453
 #, c-format
 msgid "Sorry, no terminal at all requested - can't get input\n"
 msgstr ""
 
-#: common/ttyio.c:474 common/ttyio.c:484
+#: common/ttyio.c:488 common/ttyio.c:498
 #, c-format
 msgid "too many errors; giving up\n"
 msgstr ""
 
-#: common/ttyio.c:536
+#: common/ttyio.c:550
 #, c-format
 msgid "Control-D detected\n"
 msgstr ""
@@ -1562,8 +1578,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:1036 dirmngr/dirmngr.c:895
-#: dirmngr/dirmngr.c:904
+#: common/init.c:191 sm/gpgsm.c:909 dirmngr/dirmngr.c:935 dirmngr/dirmngr.c:944
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s est trop ancien (nécessaire : %s, utilisé : %s)\n"
@@ -1722,7 +1737,7 @@ msgid "Enter passphrase: "
 msgstr "Entrez la phrase secrète : "
 
 #: g10/call-agent.c:318 g10/encrypt.c:282 g10/encrypt.c:818 g10/sign.c:473
-#: sm/call-agent.c:180 sm/encrypt.c:701 sm/sign.c:436
+#: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
 #, fuzzy, c-format
 #| msgid "%s does not yet work with %s\n"
 msgid "%s is not compliant with %s mode\n"
@@ -1734,224 +1749,224 @@ msgstr "%s ne fonctionne pas encore avec %s\n"
 msgid "error from TPM: %s\n"
 msgstr "erreur de lecture de %s : %s\n"
 
-#: g10/call-agent.c:2123 g10/passphrase.c:225 g10/passphrase.c:258
-#: tools/card-call-scd.c:1751
+#: g10/call-agent.c:2135 g10/passphrase.c:233 g10/passphrase.c:266
+#: tools/card-call-scd.c:1755
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problème avec l'agent : %s\n"
 
-#: g10/call-dirmngr.c:179 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2316
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2316
 #, fuzzy, c-format
 #| msgid "no gpg-agent running in this session\n"
 msgid "no dirmngr running in this session\n"
 msgstr ""
 "aucune instance de gpg-agent n'est en cours d'exécution dans cette session\n"
 
-#: g10/call-dirmngr.c:213
+#: g10/call-dirmngr.c:212
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "keyserver option \"honor-keyserver-url\" may not be used in Tor mode\n"
 msgstr "impossible d'utiliser %s en mode %s.\n"
 
-#: g10/call-dirmngr.c:386
+#: g10/call-dirmngr.c:385
 msgid "WKD uses a cached result"
 msgstr ""
 
-#: g10/call-dirmngr.c:389
+#: g10/call-dirmngr.c:388
 msgid "Tor is not running"
 msgstr ""
 
-#: g10/call-dirmngr.c:391
+#: g10/call-dirmngr.c:390
 #, fuzzy
 #| msgid "\"%s\" is not a fingerprint\n"
 msgid "Tor is not properly configured"
 msgstr "« %s » n’est pas une empreinte\n"
 
-#: g10/call-dirmngr.c:393
+#: g10/call-dirmngr.c:392
 #, fuzzy
 #| msgid "\"%s\" is not a fingerprint\n"
 msgid "DNS is not properly configured"
 msgstr "« %s » n’est pas une empreinte\n"
 
-#: g10/call-dirmngr.c:395
+#: g10/call-dirmngr.c:394
 msgid "unacceptable HTTP redirect from server"
 msgstr ""
 
-#: g10/call-dirmngr.c:397
+#: g10/call-dirmngr.c:396
 msgid "unacceptable HTTP redirect from server was cleaned up"
 msgstr ""
 
-#: g10/call-dirmngr.c:399
+#: g10/call-dirmngr.c:398
 #, fuzzy
 #| msgid "generate a revocation certificate"
 msgid "server uses an invalid certificate"
 msgstr "générer un certificat de révocation"
 
-#: g10/call-dirmngr.c:406 g10/gpg.c:4599
+#: g10/call-dirmngr.c:405 g10/gpg.c:4596
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "armure : %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:369 g10/card-util.c:1924
-#: tools/gpg-card.c:3039
+#: g10/card-util.c:86 g10/card-util.c:374 g10/card-util.c:1937
+#: tools/gpg-card.c:3056
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "la carte OpenPGP n'est pas disponible : %s\n"
 
-#: g10/card-util.c:91 g10/card-util.c:1930
+#: g10/card-util.c:91 g10/card-util.c:1943
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "carte OpenPGP nº %s détectée\n"
 
-#: g10/card-util.c:97 g10/card-util.c:2309 g10/delkey.c:164 g10/keyedit.c:1428
-#: g10/keygen.c:4791 g10/revoke.c:214 g10/revoke.c:638
+#: g10/card-util.c:97 g10/card-util.c:2322 g10/delkey.c:164 g10/keyedit.c:1428
+#: g10/keygen.c:4795 g10/revoke.c:214 g10/revoke.c:639
 #, c-format
 msgid "can't do this in batch mode\n"
 msgstr "impossible de faire cela en mode automatique\n"
 
-#: g10/card-util.c:105 tools/gpg-card.c:2943
+#: g10/card-util.c:105 tools/gpg-card.c:2960
 #, c-format
 msgid "This command is only available for version 2 cards\n"
 msgstr "Cette commande n'est disponible que pour les cartes en version 2\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3398 tools/gpg-card.c:2948
+#: g10/card-util.c:107 scd/app-openpgp.c:3399 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"
 
-#: g10/card-util.c:140 g10/card-util.c:1448 g10/card-util.c:1710
-#: g10/card-util.c:1802 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1991 g10/keygen.c:2165 g10/keygen.c:2385 g10/keygen.c:2685
+#: g10/card-util.c:140 g10/card-util.c:1458 g10/card-util.c:1723
+#: g10/card-util.c:1815 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/keygen.c:1992 g10/keygen.c:2166 g10/keygen.c:2386 g10/keygen.c:2686
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
 #: tools/gpg-card.c:510
 msgid "Your selection? "
 msgstr "Quel est votre choix ? "
 
-#: g10/card-util.c:262 g10/card-util.c:313 tools/gpg-card.c:596
+#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:596
 #: tools/gpg-card.c:636
 msgid "[not set]"
 msgstr "[non positionné]"
 
-#: g10/card-util.c:558 tools/gpg-card.c:903
+#: g10/card-util.c:563 tools/gpg-card.c:905
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:559 tools/gpg-card.c:904
+#: g10/card-util.c:564 tools/gpg-card.c:906
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:586 tools/gpg-card.c:931
+#: g10/card-util.c:591 tools/gpg-card.c:933
 msgid "not forced"
 msgstr "non forcé"
 
-#: g10/card-util.c:586 tools/gpg-card.c:931
+#: g10/card-util.c:591 tools/gpg-card.c:933
 msgid "forced"
 msgstr "forcé"
 
-#: g10/card-util.c:768 tools/gpg-card.c:1468
+#: g10/card-util.c:773 tools/gpg-card.c:1484
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Erreur : seul l'ASCII standard est permis pour l'instant.\n"
 
-#: g10/card-util.c:770 tools/gpg-card.c:1470
+#: g10/card-util.c:775 tools/gpg-card.c:1486
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Erreur : le caractère « < » ne peut pas être utilisé.\n"
 
-#: g10/card-util.c:772 tools/gpg-card.c:1472
+#: g10/card-util.c:777 tools/gpg-card.c:1488
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Erreur : les espaces doubles ne sont pas permises.\n"
 
-#: g10/card-util.c:789 tools/gpg-card.c:1505
+#: g10/card-util.c:795 tools/gpg-card.c:1521
 msgid "Cardholder's surname: "
 msgstr "Nom du détenteur de la carte : "
 
-#: g10/card-util.c:791 tools/gpg-card.c:1506
+#: g10/card-util.c:797 tools/gpg-card.c:1522
 msgid "Cardholder's given name: "
 msgstr "Prénom du détenteur de la carte : "
 
-#: g10/card-util.c:809 tools/gpg-card.c:1523
+#: g10/card-util.c:816 tools/gpg-card.c:1539
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Erreur : nom combiné trop long (limité à %d caractères).\n"
 
-#: g10/card-util.c:830 tools/gpg-card.c:1561
+#: g10/card-util.c:840 tools/gpg-card.c:1577
 msgid "URL to retrieve public key: "
 msgstr "URL pour récupérer la clef publique : "
 
-#: g10/card-util.c:926 g10/decrypt-data.c:495 g10/import.c:406 g10/import.c:756
-#: g10/import.c:815 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1666
-#: tools/gpgconf.c:437 tools/gpgconf.c:483 tools/gpg-card.c:426
+#: g10/card-util.c:936 g10/decrypt-data.c:495 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:1705
+#: tools/gpgconf.c:471 tools/gpgconf.c:517 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:959 g10/decrypt-data.c:498 g10/export.c:2496
+#: g10/card-util.c:969 g10/decrypt-data.c:498 g10/export.c:2496
 #: dirmngr/crlcache.c:925 tools/gpg-card.c:486 tools/gpg-card.c:493
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr "erreur d'écriture de « %s » : %s\n"
 
-#: g10/card-util.c:986 tools/gpg-card.c:1650
+#: g10/card-util.c:996 tools/gpg-card.c:1666
 msgid "Login data (account name): "
 msgstr "Données d'identification (nom du compte) : "
 
-#: g10/card-util.c:1024 tools/gpg-card.c:1945
+#: g10/card-util.c:1034 tools/gpg-card.c:1962
 msgid "Private DO data: "
 msgstr "Données DO privées : "
 
-#: g10/card-util.c:1109 tools/gpg-card.c:1699
+#: g10/card-util.c:1119 tools/gpg-card.c:1715
 msgid "Language preferences: "
 msgstr "Préférences de langue : "
 
-#: g10/card-util.c:1117 tools/gpg-card.c:1710
+#: g10/card-util.c:1127 tools/gpg-card.c:1726
 #, c-format
 msgid "Error: invalid length of preference string.\n"
 msgstr "Erreur : taille incorrecte de la chaîne de préférences.\n"
 
-#: g10/card-util.c:1126 tools/gpg-card.c:1719
+#: g10/card-util.c:1136 tools/gpg-card.c:1735
 #, c-format
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Erreur : caractères incorrects dans la chaîne de préférences.\n"
 
-#: g10/card-util.c:1148 tools/gpg-card.c:1753
+#: g10/card-util.c:1158 tools/gpg-card.c:1769
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1162 tools/gpg-card.c:1770
+#: g10/card-util.c:1172 tools/gpg-card.c:1786
 msgid "Error: invalid response.\n"
 msgstr "Erreur : réponse incorrecte.\n"
 
-#: g10/card-util.c:1185 tools/gpg-card.c:1835
+#: g10/card-util.c:1195 tools/gpg-card.c:1852
 msgid "CA fingerprint: "
 msgstr "empreinte de l'autorité de certification : "
 
-#: g10/card-util.c:1209 tools/gpg-card.c:1861
+#: g10/card-util.c:1219 tools/gpg-card.c:1878
 #, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Erreur : formatage incorrect de l'empreinte.\n"
 
-#: g10/card-util.c:1259
+#: g10/card-util.c:1269
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "opération sur la clef impossible : %s\n"
 
-#: g10/card-util.c:1260
+#: g10/card-util.c:1270
 msgid "not an OpenPGP card"
 msgstr "ce n'est pas une carte OpenPGP"
 
-#: g10/card-util.c:1273 g10/keygen.c:4811 g10/keygen.c:5972
+#: g10/card-util.c:1283 g10/keygen.c:4815 g10/keygen.c:6003
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr ""
 "erreur de lecture des renseignements actuellement contenus\n"
 "dans la clef : %s\n"
 
-#: g10/card-util.c:1358
+#: g10/card-util.c:1368
 msgid "Replace existing key? (y/N) "
 msgstr "Faut-il remplacer la clef existante ? (o/N) "
 
-#: g10/card-util.c:1375 tools/gpg-card.c:3328
+#: g10/card-util.c:1385 tools/gpg-card.c:3345
 #, fuzzy
 #| msgid ""
 #| "Note: There is no guarantee that the card supports the requested size.\n"
@@ -1967,84 +1982,84 @@ msgstr ""
 "           En cas d'échec de génération de la clef, veuillez vérifier les\n"
 "           tailles permises dans la documentation de la carte.\n"
 
-#: g10/card-util.c:1396 g10/keygen.c:2570 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1406 g10/keygen.c:2571 sm/certreqgen-ui.c:180
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Quelle taille de clef désirez-vous ? (%u) "
 
-#: g10/card-util.c:1406 g10/keygen.c:2493 g10/keygen.c:2525
+#: g10/card-util.c:1416 g10/keygen.c:2494 g10/keygen.c:2526
 #: sm/certreqgen-ui.c:195
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrondie à %u bits\n"
 
-#: g10/card-util.c:1414 g10/keygen.c:2578 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1424 g10/keygen.c:2579 sm/certreqgen-ui.c:185
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "les tailles de clefs %s doivent être dans l'intervalle %u-%u\n"
 
-#: g10/card-util.c:1433
+#: g10/card-util.c:1443
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1435
+#: g10/card-util.c:1445
 #, fuzzy
 #| msgid "   (1) Signature key\n"
 msgid "Signature key\n"
 msgstr "   (1) Clef de signature\n"
 
-#: g10/card-util.c:1437
+#: g10/card-util.c:1447
 #, fuzzy
 #| msgid "   (2) Encryption key\n"
 msgid "Encryption key\n"
 msgstr "   (2) Clef de chiffrement\n"
 
-#: g10/card-util.c:1439
+#: g10/card-util.c:1449
 #, fuzzy
 #| msgid "   (3) Authentication key\n"
 msgid "Authentication key\n"
 msgstr "   (3) Clef d'authentification\n"
 
-#: g10/card-util.c:1441 g10/keygen.c:2112 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1451 g10/keygen.c:2113 sm/certreqgen-ui.c:158
 msgid "Please select what kind of key you want:\n"
 msgstr "Sélectionnez le type de clef désiré :\n"
 
-#: g10/card-util.c:1442 sm/certreqgen-ui.c:159
+#: g10/card-util.c:1452 sm/certreqgen-ui.c:159
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1443
+#: g10/card-util.c:1453
 #, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) ECC\n"
 
-#: g10/card-util.c:1455 g10/card-util.c:1722 g10/card-util.c:1822
-#: g10/keyedit.c:900 g10/keygen.c:2017 g10/keygen.c:2045 g10/keygen.c:2172
-#: g10/keygen.c:2425 g10/keygen.c:2713 g10/revoke.c:836
+#: g10/card-util.c:1468 g10/card-util.c:1735 g10/card-util.c:1835
+#: g10/keyedit.c:900 g10/keygen.c:2018 g10/keygen.c:2046 g10/keygen.c:2173
+#: g10/keygen.c:2426 g10/keygen.c:2714 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Choix incorrect.\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1541
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 "La carte sera maintenant reconfigurée pour générer une clef de %u bits\n"
 
-#: g10/card-util.c:1533
+#: g10/card-util.c:1546
 #, fuzzy, c-format
 #| msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr ""
 "La carte sera maintenant reconfigurée pour générer une clef de %u bits\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1582
 #, fuzzy, c-format
 #| msgid "error changing size of key %d to %u bits: %s\n"
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "erreur de modification de taille de clef %d en %u bits : %s\n"
 
-#: g10/card-util.c:1585 g10/card-util.c:2106 g10/card-util.c:2162
+#: g10/card-util.c:1598 g10/card-util.c:2119 g10/card-util.c:2175
 #, fuzzy, c-format
 #| msgid "error getting current key info: %s\n"
 msgid "error getting card info: %s\n"
@@ -2052,29 +2067,29 @@ msgstr ""
 "erreur de lecture des renseignements actuellement contenus\n"
 "dans la clef : %s\n"
 
-#: g10/card-util.c:1591 g10/card-util.c:1936 g10/card-util.c:2112
-#: g10/card-util.c:2171 tools/gpg-card.c:3057 tools/gpg-card.c:3296
-#: tools/gpg-card.c:3354
+#: g10/card-util.c:1604 g10/card-util.c:1949 g10/card-util.c:2125
+#: g10/card-util.c:2184 tools/gpg-card.c:3074 tools/gpg-card.c:3313
+#: tools/gpg-card.c:3371
 #, fuzzy, c-format
 #| msgid "This command is not allowed while in %s mode.\n"
 msgid "This command is not supported by this card\n"
 msgstr "Cette commande n'est pas permise en mode %s.\n"
 
-#: g10/card-util.c:1637 tools/gpg-card.c:2426
+#: g10/card-util.c:1650 tools/gpg-card.c:2443
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 "Faut-il faire une sauvegarde hors carte de la clef de chiffrement ? (O/n) "
 
-#: g10/card-util.c:1651
+#: g10/card-util.c:1664
 #, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "Remarque : les clefs sont déjà stockées sur la carte.\n"
 
-#: g10/card-util.c:1654 tools/gpg-card.c:2398
+#: g10/card-util.c:1667 tools/gpg-card.c:2415
 msgid "Replace existing keys? (y/N) "
 msgstr "Faut-il remplacer les clefs existantes ? (o/N) "
 
-#: g10/card-util.c:1666 tools/gpg-card.c:2457
+#: g10/card-util.c:1679 tools/gpg-card.c:2474
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2085,167 +2100,167 @@ msgstr ""
 "   code personnel = « %s »     code personnel d'admin. = « %s ».\n"
 "Vous devriez les modifier avec la commande --change-pin\n"
 
-#: g10/card-util.c:1701
+#: g10/card-util.c:1714
 msgid "Please select the type of key to generate:\n"
 msgstr "Veuillez sélectionner le type de clef à générer :\n"
 
-#: g10/card-util.c:1703 g10/card-util.c:1793
+#: g10/card-util.c:1716 g10/card-util.c:1806
 msgid "   (1) Signature key\n"
 msgstr "   (1) Clef de signature\n"
 
-#: g10/card-util.c:1704 g10/card-util.c:1795
+#: g10/card-util.c:1717 g10/card-util.c:1808
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Clef de chiffrement\n"
 
-#: g10/card-util.c:1705 g10/card-util.c:1797
+#: g10/card-util.c:1718 g10/card-util.c:1810
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Clef d'authentification\n"
 
-#: g10/card-util.c:1790
+#: g10/card-util.c:1803
 msgid "Please select where to store the key:\n"
 msgstr "Veuillez sélectionner l'endroit où stocker la clef :\n"
 
-#: g10/card-util.c:1836
+#: g10/card-util.c:1849
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "échec de KEYTOCARD : %s\n"
 
-#: g10/card-util.c:1941 tools/gpg-card.c:3065
+#: g10/card-util.c:1954 tools/gpg-card.c:3082
 #, fuzzy, c-format
 #| msgid "Note: keys are already stored on the card!\n"
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr "Remarque : les clefs sont déjà stockées sur la carte.\n"
 
-#: g10/card-util.c:1944 tools/gpg-card.c:3068 tools/gpg-card.c:3409
+#: g10/card-util.c:1957 tools/gpg-card.c:3085 tools/gpg-card.c:3426
 #, fuzzy
 #| msgid "Continue? (Y/n) "
 msgid "Continue? (y/N) "
 msgstr "Faut-il continuer ? (O/n) "
 
-#: g10/card-util.c:1949 tools/gpg-card.c:3079
+#: g10/card-util.c:1962 tools/gpg-card.c:3096
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2142
+#: g10/card-util.c:2155
 #, fuzzy, c-format
 #| msgid "error closing %s: %s\n"
 msgid "error for setup KDF: %s\n"
 msgstr "erreur de fermeture de %s : %s\n"
 
-#: g10/card-util.c:2188
+#: g10/card-util.c:2201
 #, fuzzy, c-format
 #| msgid "error closing %s: %s\n"
 msgid "error for setup UIF: %s\n"
 msgstr "erreur de fermeture de %s : %s\n"
 
-#: g10/card-util.c:2212 g10/keyedit.c:1263 tools/gpg-card.c:3649
+#: g10/card-util.c:2225 g10/keyedit.c:1263 tools/gpg-card.c:3666
 msgid "quit this menu"
 msgstr "quitter ce menu"
 
-#: g10/card-util.c:2214
+#: g10/card-util.c:2227
 msgid "show admin commands"
 msgstr "afficher les commandes d'administration"
 
-#: g10/card-util.c:2215 g10/keyedit.c:1266 tools/gpg-card.c:3652
+#: g10/card-util.c:2228 g10/keyedit.c:1266 tools/gpg-card.c:3669
 msgid "show this help"
 msgstr "afficher cette aide"
 
-#: g10/card-util.c:2217 tools/gpg-card.c:3654
+#: g10/card-util.c:2230 tools/gpg-card.c:3671
 msgid "list all available data"
 msgstr "afficher toutes les données disponibles"
 
-#: g10/card-util.c:2220 tools/gpg-card.c:3656
+#: g10/card-util.c:2233 tools/gpg-card.c:3673
 msgid "change card holder's name"
 msgstr "modifier le nom du détenteur de la carte"
 
-#: g10/card-util.c:2221 tools/gpg-card.c:3657
+#: g10/card-util.c:2234 tools/gpg-card.c:3674
 msgid "change URL to retrieve key"
 msgstr "modifier l'URL pour récupérer la clef"
 
-#: g10/card-util.c:2222 tools/gpg-card.c:3658
+#: g10/card-util.c:2235 tools/gpg-card.c:3675
 msgid "fetch the key specified in the card URL"
 msgstr "récupérer la clef indiquée dans l'URL de la carte"
 
-#: g10/card-util.c:2223 tools/gpg-card.c:3659
+#: g10/card-util.c:2236 tools/gpg-card.c:3676
 msgid "change the login name"
 msgstr "modifier l'identifiant de connexion"
 
-#: g10/card-util.c:2224 tools/gpg-card.c:3660
+#: g10/card-util.c:2237 tools/gpg-card.c:3677
 msgid "change the language preferences"
 msgstr "modifier les préférences de langue"
 
-#: g10/card-util.c:2225 tools/gpg-card.c:3661
+#: g10/card-util.c:2238 tools/gpg-card.c:3678
 #, fuzzy
 #| msgid "change card holder's sex"
 msgid "change card holder's salutation"
 msgstr "modifier le sexe du détenteur de la carte"
 
-#: g10/card-util.c:2227 tools/gpg-card.c:3663
+#: g10/card-util.c:2240 tools/gpg-card.c:3680
 msgid "change a CA fingerprint"
 msgstr "modifier une empreinte d'autorité de certification"
 
-#: g10/card-util.c:2228 tools/gpg-card.c:3664
+#: g10/card-util.c:2241 tools/gpg-card.c:3681
 msgid "toggle the signature force PIN flag"
 msgstr ""
 "inverser le paramètre obligeant à entrer le code personnel pour les\n"
 "signatures"
 
-#: g10/card-util.c:2229 tools/gpg-card.c:3665
+#: g10/card-util.c:2242 tools/gpg-card.c:3682
 msgid "generate new keys"
 msgstr "générer de nouvelles clefs"
 
-#: g10/card-util.c:2230 tools/gpg-card.c:3666
+#: g10/card-util.c:2243 tools/gpg-card.c:3683
 msgid "menu to change or unblock the PIN"
 msgstr "menu pour modifier ou déverrouiller le code personnel"
 
-#: g10/card-util.c:2231 tools/gpg-card.c:3667
+#: g10/card-util.c:2244 tools/gpg-card.c:3684
 msgid "verify the PIN and list all data"
 msgstr "vérifier le code personnel et afficher toutes les données"
 
-#: g10/card-util.c:2232 tools/gpg-card.c:3668
+#: g10/card-util.c:2245 tools/gpg-card.c:3685
 msgid "unblock the PIN using a Reset Code"
 msgstr "débloquer le code personnel en utilisant un code de réinitialisation"
 
-#: g10/card-util.c:2233 tools/gpg-card.c:3672
+#: g10/card-util.c:2246 tools/gpg-card.c:3689
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2235
+#: g10/card-util.c:2248
 #, fuzzy
 #| msgid "|NAME|use user NAME for authentication"
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr "|NOM|utiliser le NOM d'utilisateur pour authentif."
 
-#: g10/card-util.c:2236
+#: g10/card-util.c:2249
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "modifier la confiance du propriétaire"
 
-#: g10/card-util.c:2237 tools/gpg-card.c:3674
+#: g10/card-util.c:2250 tools/gpg-card.c:3691
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the User Interaction Flag"
 msgstr "modifier la confiance du propriétaire"
 
-#: g10/card-util.c:2361 tools/gpg-card.c:3924
+#: g10/card-util.c:2374 tools/gpg-card.c:3941
 msgid "gpg/card> "
 msgstr "gpg/carte> "
 
-#: g10/card-util.c:2402
+#: g10/card-util.c:2415
 msgid "Admin-only command\n"
 msgstr "La commande n'est utilisable qu'en mode administration\n"
 
-#: g10/card-util.c:2433
+#: g10/card-util.c:2446
 msgid "Admin commands are allowed\n"
 msgstr "Les commandes d'administration sont permises\n"
 
-#: g10/card-util.c:2435
+#: g10/card-util.c:2448
 msgid "Admin commands are not allowed\n"
 msgstr "Les commandes d'administration ne sont pas permises\n"
 
-#: g10/card-util.c:2546 g10/keyedit.c:2275 tools/gpg-card.c:3814
-#: tools/gpg-card.c:4072
+#: g10/card-util.c:2559 g10/keyedit.c:2275 tools/gpg-card.c:3831
+#: tools/gpg-card.c:4089
 #, c-format
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Commande incorrecte (essayez « help »)\n"
@@ -2255,22 +2270,22 @@ msgstr "Commande incorrecte (essayez « help »)\n"
 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:5293 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5292 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:1934 g10/export.c:2342 g10/export.c:2463
-#: g10/getkey.c:1907 g10/gpg.c:5238 g10/keyedit.c:1450 g10/keyedit.c:2382
-#: g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:703 g10/keyserver.c:1240
-#: g10/revoke.c:230 g10/tofu.c:2168
+#: g10/getkey.c:2032 g10/gpg.c:5237 g10/keyedit.c:1450 g10/keyedit.c:2382
+#: g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:703 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:2002 g10/getkey.c:1915 g10/getkey.c:4330
-#: g10/gpg.c:5247 g10/keyedit.c:2354 g10/keyserver.c:1258 g10/revoke.c:236
-#: g10/revoke.c:665 g10/tofu.c:2176
+#: g10/delkey.c:90 g10/export.c:2002 g10/getkey.c:2040 g10/getkey.c:4455
+#: g10/gpg.c:5246 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"
 msgstr "erreur de lecture du bloc de clef : %s\n"
@@ -2393,15 +2408,15 @@ msgstr "impossible d'utiliser l'algorithme de chiffrement « %s » en mode %s.
 msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:555 g10/encrypt.c:808 g10/decrypt-data.c:261 g10/gpg.c:4083
-#: g10/gpg.c:4130 sm/decrypt.c:742 sm/encrypt.c:691 sm/gpgsm.c:1793
+#: g10/encrypt.c:555 g10/encrypt.c:808 g10/decrypt-data.c:261 g10/gpg.c:4080
+#: g10/gpg.c:4127 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1646
 #, 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:564 g10/gpg.c:4095 g10/gpg.c:4142 g10/sig-check.c:155
-#: g10/sign.c:452 sm/gpgsm.c:1803 sm/gpgsm.c:1813 sm/sign.c:596 sm/verify.c:510
+#: g10/encrypt.c:564 g10/gpg.c:4092 g10/gpg.c:4139 g10/sig-check.c:155
+#: g10/sign.c:452 sm/gpgsm.c:1656 sm/gpgsm.c:1666 sm/sign.c:596 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"
@@ -2420,7 +2435,7 @@ msgstr ""
 "Attention : forcer le chiffrement symétrique %s (%d) est en\n"
 "            désaccord avec les préférences du destinataire\n"
 
-#: g10/encrypt.c:838 sm/encrypt.c:766
+#: g10/encrypt.c:838 sm/encrypt.c:767
 #, fuzzy, c-format
 #| msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
@@ -2454,7 +2469,7 @@ msgstr "%s/%s chiffré pour : « %s »\n"
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "impossible d'utiliser %s en mode %s.\n"
 
-#: g10/decrypt-data.c:239 g10/mainproc.c:380 sm/decrypt.c:494
+#: g10/decrypt-data.c:239 g10/mainproc.c:380 sm/decrypt.c:892
 #, fuzzy, c-format
 #| msgid "%s encrypted data\n"
 msgid "%s.%s encrypted data\n"
@@ -2465,7 +2480,7 @@ msgstr "données chiffrées avec %s\n"
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "chiffré avec l'algorithme inconnu %d\n"
 
-#: g10/decrypt-data.c:361 g10/decrypt-data.c:414 sm/decrypt.c:508
+#: g10/decrypt-data.c:361 g10/decrypt-data.c:414 sm/decrypt.c:906
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2506,7 +2521,7 @@ msgstr ""
 msgid " - skipped"
 msgstr " — ignoré"
 
-#: g10/export.c:1333 g10/import.c:2124 g10/openfile.c:202 g10/openfile.c:296
+#: g10/export.c:1333 g10/import.c:2132 g10/openfile.c:202 g10/openfile.c:296
 #: g10/sign.c:1110 g10/sign.c:1447
 #, c-format
 msgid "writing to '%s'\n"
@@ -2542,68 +2557,68 @@ msgstr "erreur de création de « %s » : %s\n"
 msgid "[User ID not found]"
 msgstr "[identité introuvable]"
 
-#: g10/getkey.c:1199
+#: g10/getkey.c:1324
 #, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "« %s » automatiquement récupéré par %s\n"
 
-#: g10/getkey.c:1205
+#: g10/getkey.c:1330
 #, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "erreur de récupération de « %s » avec %s : %s\n"
 
-#: g10/getkey.c:1207
+#: g10/getkey.c:1332
 msgid "No fingerprint"
 msgstr "Aucune empreinte"
 
-#: g10/getkey.c:1449
+#: g10/getkey.c:1574
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1884 g10/revoke.c:657 g10/revoke.c:718
+#: g10/getkey.c:2009 g10/revoke.c:658 g10/revoke.c:719
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "clef secrète « %s » introuvable : %s\n"
 
-#: g10/getkey.c:1887 g10/pkclist.c:1012
+#: g10/getkey.c:2012 g10/pkclist.c:1012
 #, fuzzy, c-format
 #| msgid "missing argument for option \"%.50s\"\n"
 msgid "(check argument of option '%s')\n"
 msgstr "argument manquant pour l'option « %.50s »\n"
 
-#: g10/getkey.c:1965
+#: g10/getkey.c:2090
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "|NOM|utiliser le NOM comme clef secrète par défaut"
 
-#: g10/getkey.c:1973
+#: g10/getkey.c:2098
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "|NOM|utiliser le NOM comme clef secrète par défaut"
 
-#: g10/getkey.c:1980
+#: g10/getkey.c:2105
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr ""
 
-#: g10/getkey.c:2837
+#: g10/getkey.c:2962
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "La clef incorrecte %s a été rendue valable par\n"
 "--allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:3703
+#: g10/getkey.c:3828
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr ""
 "utilisation de la sous-clef %s à la place de la clef\n"
 "principale %s\n"
 
-#: g10/getkey.c:4259 g10/gpg.c:2167
+#: g10/getkey.c:4384 g10/gpg.c:2168
 #, fuzzy, c-format
 #| msgid "invalid argument for option \"%.50s\"\n"
 msgid "valid values for option '%s':\n"
@@ -2797,7 +2812,7 @@ msgstr "|SPEC|configurer les alias d'adresse"
 msgid "use strict OpenPGP behavior"
 msgstr "utiliser le comportement strict d'OpenPGP"
 
-#: g10/gpg.c:651 kbx/kbxutil.c:91 sm/gpgsm.c:424 tools/gpgconf.c:113
+#: g10/gpg.c:651 kbx/kbxutil.c:91 sm/gpgsm.c:425 tools/gpgconf.c:113
 msgid "do not make any changes"
 msgstr "ne rien modifier"
 
@@ -2833,7 +2848,7 @@ msgstr "utiliser le mode texte canonique"
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|niveau de compression N (0 désactive)"
 
-#: g10/gpg.c:762 sm/gpgsm.c:357
+#: g10/gpg.c:762 sm/gpgsm.c:358
 #, fuzzy
 #| msgid "Options controlling the interactivity and enforcement"
 msgid "Options controlling key import and export"
@@ -2855,11 +2870,11 @@ msgstr "importer les clefs d'un serveur de clefs"
 msgid "include the public key in signatures"
 msgstr "afficher et vérifier les signatures de clefs"
 
-#: g10/gpg.c:776 sm/gpgsm.c:360
+#: g10/gpg.c:776 sm/gpgsm.c:361
 msgid "disable all access to the dirmngr"
 msgstr "désactiver tous les accès au dirmngr"
 
-#: g10/gpg.c:788 sm/gpgsm.c:367
+#: g10/gpg.c:788 sm/gpgsm.c:368
 #, fuzzy
 #| msgid "Options controlling the configuration"
 msgid "Options controlling key listings"
@@ -2880,15 +2895,15 @@ msgstr "|IDENTITÉ| chiffrer pour l'IDENTITÉ"
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|IDENTITÉ| utiliser l'IDENTITÉ pour signer ou déchiffrer"
 
-#: g10/gpg.c:876 sm/gpgsm.c:408
+#: g10/gpg.c:876 sm/gpgsm.c:409
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:895 sm/gpgsm.c:420 dirmngr/dirmngr.c:286
+#: g10/gpg.c:895 sm/gpgsm.c:421 dirmngr/dirmngr.c:289
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:966 sm/gpgsm.c:453
+#: g10/gpg.c:966 sm/gpgsm.c:454
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2941,7 +2956,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:1168 sm/gpgsm.c:636
+#: g10/gpg.c:1168 sm/gpgsm.c:637
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2965,12 +2980,12 @@ msgstr "Hachage : "
 msgid "Compression: "
 msgstr "Compression : "
 
-#: g10/gpg.c:1274 sm/gpgsm.c:710
+#: g10/gpg.c:1274 sm/gpgsm.c:711
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "utilisation : %s [options] %s\n"
 
-#: g10/gpg.c:1467 sm/gpgsm.c:803
+#: g10/gpg.c:1467 sm/gpgsm.c:804
 #, c-format
 msgid "conflicting commands\n"
 msgstr "commandes en conflit\n"
@@ -2980,56 +2995,56 @@ msgstr "commandes en conflit\n"
 msgid "no = sign found in group definition '%s'\n"
 msgstr "aucun signe = trouvé dans la définition du groupe « %s »\n"
 
-#: g10/gpg.c:1683
+#: g10/gpg.c:1684
 #, 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:1686
+#: g10/gpg.c:1687
 #, 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:1689
+#: g10/gpg.c:1690
 #, 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:1695
+#: g10/gpg.c:1696
 #, 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:1698
+#: g10/gpg.c:1699
 #, 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:1701
+#: g10/gpg.c:1702
 #, 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:1707
+#: g10/gpg.c:1708
 #, 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:1710
+#: g10/gpg.c:1711
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@ -3037,21 +3052,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:1713
+#: g10/gpg.c:1714
 #, 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:1719
+#: g10/gpg.c:1720
 #, 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:1722
+#: g10/gpg.c:1723
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@ -3059,483 +3074,483 @@ msgstr ""
 "Attention : les droits du répertoire contenant le fichier de configuration\n"
 "            « %s » ne sont pas sûrs\n"
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1726
 #, 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:1941
+#: g10/gpg.c:1942
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "élément de configuration « %s » inconnu\n"
 
-#: g10/gpg.c:2037
+#: g10/gpg.c:2038
 msgid "display photo IDs during key listings"
 msgstr "montrer les photos d'identité en affichant les clefs"
 
-#: g10/gpg.c:2039
+#: g10/gpg.c:2040
 msgid "show key usage information during key listings"
 msgstr "indiquer les informations sur l'utilisation en affichant les clefs"
 
-#: g10/gpg.c:2041
+#: g10/gpg.c:2042
 msgid "show policy URLs during signature listings"
 msgstr "montrer les URL de politique en affichant les signatures"
 
-#: g10/gpg.c:2043
+#: g10/gpg.c:2044
 msgid "show all notations during signature listings"
 msgstr "montrer toutes les notations en affichant les signatures"
 
-#: g10/gpg.c:2045
+#: g10/gpg.c:2046
 msgid "show IETF standard notations during signature listings"
 msgstr "utiliser les notations aux normes IETF en affichant les signatures"
 
-#: g10/gpg.c:2049
+#: g10/gpg.c:2050
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 "utiliser les notations fournies par l'utilisateur en affichant les signatures"
 
-#: g10/gpg.c:2051
+#: g10/gpg.c:2052
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 "montrer les URL des serveurs de clefs favoris en affichant les signatures"
 
-#: g10/gpg.c:2053
+#: g10/gpg.c:2054
 msgid "show user ID validity during key listings"
 msgstr "indiquer la validité de l'identité en affichant les clefs"
 
-#: g10/gpg.c:2055
+#: g10/gpg.c:2056
 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:2057
+#: g10/gpg.c:2058
 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:2059
+#: g10/gpg.c:2060
 msgid "show the keyring name in key listings"
 msgstr "montrer le nom du porte-clefs en affichant les clefs"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2062
 msgid "show expiration dates during signature listings"
 msgstr "montrer les dates d'expiration en affichant les signatures"
 
-#: g10/gpg.c:2178
+#: g10/gpg.c:2179
 #, fuzzy, c-format
 #| msgid "unknown option '%s'\n"
 msgid "unknown TOFU policy '%s'\n"
 msgstr "option « %s » inconnue\n"
 
-#: g10/gpg.c:2180
+#: g10/gpg.c:2181
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2975 g10/gpg.c:3828 g10/gpg.c:3840
+#: g10/gpg.c:2978 g10/gpg.c:3825 g10/gpg.c:3837
 #, 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:3151 g10/gpg.c:3163
+#: g10/gpg.c:3154 g10/gpg.c:3166
 #, 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:3185
+#: g10/gpg.c:3188
 #, 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:3217 sm/gpgsm.c:1270
+#: g10/gpg.c:3220 sm/gpgsm.c:1143
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "mode pinentry « %s » incorrect\n"
 
-#: g10/gpg.c:3223 sm/gpgsm.c:1276
+#: g10/gpg.c:3226 sm/gpgsm.c:1149
 #, 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:3280
+#: g10/gpg.c:3283
 #, 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:3302 g10/gpg.c:3511 g10/keyedit.c:5319
+#: g10/gpg.c:3305 g10/gpg.c:3514 g10/keyedit.c:5322
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "impossible d'analyser l'URL du serveur de clefs\n"
 
-#: g10/gpg.c:3320
+#: g10/gpg.c:3323
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s : %d : les options du serveur de clefs sont incorrectes\n"
 
-#: g10/gpg.c:3323
+#: g10/gpg.c:3326
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "les options du serveur de clefs sont incorrectes\n"
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3333
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s : %d : options d'importation incorrectes\n"
 
-#: g10/gpg.c:3333
+#: g10/gpg.c:3336
 #, c-format
 msgid "invalid import options\n"
 msgstr "options d'importation incorrectes\n"
 
-#: g10/gpg.c:3339 g10/gpg.c:3354
+#: g10/gpg.c:3342 g10/gpg.c:3357
 #, fuzzy, c-format
 #| msgid "invalid list options\n"
 msgid "invalid filter option: %s\n"
 msgstr "options de liste incorrectes\n"
 
-#: g10/gpg.c:3345
+#: g10/gpg.c:3348
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s : %d : options d'exportation incorrectes\n"
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3351
 #, c-format
 msgid "invalid export options\n"
 msgstr "options d'exportation incorrectes\n"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3363
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s : %d : options de liste incorrectes\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3366
 #, c-format
 msgid "invalid list options\n"
 msgstr "options de liste incorrectes\n"
 
-#: g10/gpg.c:3371
+#: g10/gpg.c:3374
 msgid "display photo IDs during signature verification"
 msgstr "montrer les photos d'identité en vérifiant les signatures"
 
-#: g10/gpg.c:3373
+#: g10/gpg.c:3376
 msgid "show policy URLs during signature verification"
 msgstr "montrer les URL de politique en vérifiant les signatures"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3378
 msgid "show all notations during signature verification"
 msgstr "montrer toutes les notations en vérifiant les signatures"
 
-#: g10/gpg.c:3377
+#: g10/gpg.c:3380
 msgid "show IETF standard notations during signature verification"
 msgstr "utiliser les notations aux normes IETF en vérifiant les signatures"
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3384
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 "utiliser les notations fournies par l'utilisateur en vérifiant les signatures"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3386
 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:3385
+#: g10/gpg.c:3388
 msgid "show user ID validity during signature verification"
 msgstr "indiquer la validité de l'identité en vérifiant les signatures"
 
-#: g10/gpg.c:3387
+#: g10/gpg.c:3390
 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:3389
+#: g10/gpg.c:3392
 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:3396
+#: g10/gpg.c:3399
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s : %d : options de vérification incorrectes\n"
 
-#: g10/gpg.c:3399
+#: g10/gpg.c:3402
 #, c-format
 msgid "invalid verify options\n"
 msgstr "options de vérification incorrectes\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3409
 #, 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:3613
+#: g10/gpg.c:3616
 #, 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:3616
+#: g10/gpg.c:3619
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "liste de recherche automatique de clef incorrecte\n"
 
-#: g10/gpg.c:3625
+#: g10/gpg.c:3628
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "argument incorrect pour l'option « %.50s »\n"
 
-#: g10/gpg.c:3807 sm/gpgsm.c:1675
+#: g10/gpg.c:3804 sm/gpgsm.c:1528
 #, 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:3821
+#: g10/gpg.c:3818
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "Attention : %s remplace %s\n"
 
-#: g10/gpg.c:3830
+#: g10/gpg.c:3827
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n'est pas permis avec %s.\n"
 
-#: g10/gpg.c:3833
+#: g10/gpg.c:3830
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n'a aucun sens avec %s.\n"
 
-#: g10/gpg.c:3848 sm/gpgsm.c:1696 dirmngr/dirmngr.c:1123
+#: g10/gpg.c:3845 sm/gpgsm.c:1549 dirmngr/dirmngr.c:1160
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "Attention : exécution avec un système de temps contrefait : "
 
-#: g10/gpg.c:3869
+#: g10/gpg.c:3866
 #, 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:3897 g10/gpg.c:3928 sm/gpgsm.c:1763
+#: g10/gpg.c:3894 g10/gpg.c:3925 sm/gpgsm.c:1616
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorithme de chiffrement sélectionné est incorrect\n"
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3901
 #, 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:3916
+#: g10/gpg.c:3913
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algorithme de compression sélectionné est incorrect\n"
 
-#: g10/gpg.c:3922
+#: g10/gpg.c:3919
 #, 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:3937
+#: g10/gpg.c:3934
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "« completes-needed » doit être supérieur à 0\n"
 
-#: g10/gpg.c:3939
+#: g10/gpg.c:3936
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "« marginals-needed » doit être supérieur à 1\n"
 
-#: g10/gpg.c:3941
+#: g10/gpg.c:3938
 #, 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:3943
+#: g10/gpg.c:3940
 #, 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:3945
+#: g10/gpg.c:3942
 #, 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:3949
+#: g10/gpg.c:3946
 #, 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:3953
+#: g10/gpg.c:3950
 #, 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:3960
+#: g10/gpg.c:3957
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "préférences par défaut incorrectes\n"
 
-#: g10/gpg.c:3964
+#: g10/gpg.c:3961
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "préférences personnelles de chiffrement incorrectes\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3964
 #, 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:3971
+#: g10/gpg.c:3968
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "préférences personnelles de hachage incorrectes\n"
 
-#: g10/gpg.c:3975
+#: g10/gpg.c:3972
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "préférences personnelles de compression incorrectes\n"
 
-#: g10/gpg.c:3984 g10/gpg.c:3989
+#: g10/gpg.c:3981 g10/gpg.c:3986
 #, 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:4026
+#: g10/gpg.c:4023
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne fonctionne pas encore avec %s\n"
 
-#: g10/gpg.c:4089
+#: g10/gpg.c:4086
 #, 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:4101
+#: g10/gpg.c:4098
 #, 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:4256
+#: g10/gpg.c:4253
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "impossible d'initialiser la base de confiance : %s\n"
 
-#: g10/gpg.c:4268
+#: g10/gpg.c:4265
 #, 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:4340
+#: g10/gpg.c:4337
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "échec du chiffrement symétrique de « %s » : %s\n"
 
-#: g10/gpg.c:4369
+#: g10/gpg.c:4366
 #, 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:4372
+#: g10/gpg.c:4369
 #, 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:4430
+#: g10/gpg.c:4427
 #, 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:4433
+#: g10/gpg.c:4430
 #, 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:4821 g10/keyserver.c:1870
+#: g10/gpg.c:4818 g10/keyserver.c:1629
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "échec d'envoi vers le serveur de clefs : %s\n"
 
-#: g10/gpg.c:4826
+#: g10/gpg.c:4823
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "échec de réception depuis le serveur de clefs : %s\n"
 
-#: g10/gpg.c:4832
+#: g10/gpg.c:4829
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "échec d'exportation de la clef : %s\n"
 
-#: g10/gpg.c:4845
+#: g10/gpg.c:4842
 #, 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:4857
+#: g10/gpg.c:4854
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "échec de recherche au sein du serveur de clefs : %s\n"
 
-#: g10/gpg.c:4870
+#: g10/gpg.c:4867
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "échec de rafraîchissement par le serveur de clefs : %s\n"
 
-#: g10/gpg.c:4937
+#: g10/gpg.c:4936
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "échec de déconstruction d'une armure : %s\n"
 
-#: g10/gpg.c:4948
+#: g10/gpg.c:4947
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "échec de construction d'une armure : %s \n"
 
-#: g10/gpg.c:5053
+#: g10/gpg.c:5052
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "algorithme de hachage « %s » incorrect\n"
 
-#: g10/gpg.c:5205 g10/tofu.c:2156
+#: g10/gpg.c:5204 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:5216
+#: g10/gpg.c:5215
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5272
+#: g10/gpg.c:5271
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5283
+#: g10/gpg.c:5282
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Vous pouvez taper votre message…\n"
 
-#: g10/gpg.c:5630
+#: g10/gpg.c:5629
 #, 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:5632
+#: g10/gpg.c:5631
 #, 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:5665
+#: g10/gpg.c:5664
 #, 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"
@@ -3548,7 +3563,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:414 tools/gpgconf.c:116 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:415 tools/gpgconf.c:116 tools/gpg-card.c:95
 msgid "|FD|write status info to this FD"
 msgstr "|FD|écrire l'état sur ce descripteur"
 
@@ -3645,98 +3660,98 @@ msgstr "entrée supposée au format binaire"
 msgid "repair keys on import"
 msgstr "afficher l'empreinte de la clef"
 
-#: g10/import.c:399 g10/import.c:721
+#: g10/import.c:407 g10/import.c:729
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "un bloc de type %d a été ignoré\n"
 
-#: g10/import.c:738
+#: g10/import.c:746
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu clefs traitées jusqu'à présent\n"
 
-#: g10/import.c:831
+#: g10/import.c:839
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "      Quantité totale traitée : %lu\n"
 
-#: g10/import.c:834
+#: g10/import.c:842
 #, fuzzy, c-format
 #| msgid "      skipped new keys: %lu\n"
 msgid "    skipped PGP-2 keys: %lu\n"
 msgstr "     nouvelles clefs ignorées : %lu\n"
 
-#: g10/import.c:836
+#: g10/import.c:844
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "     nouvelles clefs ignorées : %lu\n"
 
-#: g10/import.c:839
+#: g10/import.c:847
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "                sans identité : %lu\n"
 
-#: g10/import.c:842 sm/import.c:129
+#: g10/import.c:850 sm/import.c:129
 #, c-format
 msgid "              imported: %lu"
 msgstr "                    importées : %lu"
 
-#: g10/import.c:846 sm/import.c:133
+#: g10/import.c:854 sm/import.c:133
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                non modifiées : %lu\n"
 
-#: g10/import.c:848
+#: g10/import.c:856
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          nouvelles identités : %lu\n"
 
-#: g10/import.c:850
+#: g10/import.c:858
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "         nouvelles sous-clefs : %lu\n"
 
-#: g10/import.c:852
+#: g10/import.c:860
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "         nouvelles signatures : %lu\n"
 
-#: g10/import.c:854
+#: g10/import.c:862
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "nouvelles révocations de clef : %lu\n"
 
-#: g10/import.c:856 sm/import.c:135
+#: g10/import.c:864 sm/import.c:135
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "          clefs secrètes lues : %lu\n"
 
-#: g10/import.c:858 sm/import.c:137
+#: g10/import.c:866 sm/import.c:137
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "     clefs secrètes importées : %lu\n"
 
-#: g10/import.c:860 sm/import.c:139
+#: g10/import.c:868 sm/import.c:139
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " clefs secrètes non modifiées : %lu\n"
 
-#: g10/import.c:862 sm/import.c:141
+#: g10/import.c:870 sm/import.c:141
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "                non importées : %lu\n"
 
-#: g10/import.c:864
+#: g10/import.c:872
 #, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "         signatures nettoyées : %lu\n"
 
-#: g10/import.c:866
+#: g10/import.c:874
 #, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "          identités nettoyées : %lu\n"
 
-#: g10/import.c:1291
+#: g10/import.c:1299
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
@@ -3745,174 +3760,174 @@ msgstr ""
 "Attention : la clef %s contient des préférences pour des\n"
 "            algorithmes indisponibles pour ces identités :\n"
 
-#: g10/import.c:1333
+#: g10/import.c:1341
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "            « %s » : préférence pour l'algorithme de chiffrement %s\n"
 
-#: g10/import.c:1351
+#: g10/import.c:1359
 #, fuzzy, c-format
 #| msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgid "         \"%s\": preference for AEAD algorithm %s\n"
 msgstr "            « %s » : préférence pour l'algorithme de chiffrement %s\n"
 
-#: g10/import.c:1366
+#: g10/import.c:1374
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "            « %s » : préférence pour l'algorithme de hachage %s\n"
 
-#: g10/import.c:1378
+#: g10/import.c:1386
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "            « %s » : préférence pour l'algorithme de compression %s\n"
 
-#: g10/import.c:1391
+#: g10/import.c:1399
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "vous devriez mettre à jour vos préférences et redistribuer cette\n"
 
-#: g10/import.c:1393
+#: g10/import.c:1401
 #, c-format
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr "clef pour éviter d'éventuels problèmes d'algorithmes non appropriés\n"
 
-#: g10/import.c:1418
+#: g10/import.c:1426
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 "vous pouvez mettre à jour vos préférences avec :\n"
 "gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:1932 g10/import.c:3053
+#: g10/import.c:1940 g10/import.c:3061
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "clef %s : pas d'identité\n"
 
-#: g10/import.c:1938
+#: g10/import.c:1946
 #, c-format
 msgid "key %s: %s\n"
 msgstr "clef %s : %s\n"
 
-#: g10/import.c:1939 g10/import.c:3025
+#: g10/import.c:1947 g10/import.c:3033
 msgid "rejected by import screener"
 msgstr "rejetée par le filtre d’importation"
 
-#: g10/import.c:1988
+#: g10/import.c:1996
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "clef %s : corruption de sous-clef PKS réparée\n"
 
-#: g10/import.c:2009
+#: g10/import.c:2017
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "clef %s : identité « %s » non autosignée acceptée\n"
 
-#: g10/import.c:2020 g10/import.c:2051
+#: g10/import.c:2028 g10/import.c:2059
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "clef %s : pas d'identité valable\n"
 
-#: g10/import.c:2022
+#: g10/import.c:2030
 #, c-format
 msgid "this may be caused by a missing self-signature\n"
 msgstr "cela pourrait provenir d'une autosignature manquante\n"
 
-#: g10/import.c:2101 g10/import.c:3439
+#: g10/import.c:2109 g10/import.c:3447
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "clef %s : clef publique introuvable : %s\n"
 
-#: g10/import.c:2107
+#: g10/import.c:2115
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "clef %s : nouvelle clef — ignorée\n"
 
-#: g10/import.c:2119
+#: g10/import.c:2127
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "aucun porte-clefs accessible en écriture n'a été trouvé : %s\n"
 
-#: g10/import.c:2151 g10/import.c:2253 g10/import.c:3514
+#: g10/import.c:2159 g10/import.c:2261 g10/import.c:3522
 #, c-format
 msgid "error writing keyring '%s': %s\n"
 msgstr "erreur d'écriture du porte-clefs « %s » : %s\n"
 
-#: g10/import.c:2174
+#: g10/import.c:2182
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "clef %s : clef publique « %s » importée\n"
 
-#: g10/import.c:2201
+#: g10/import.c:2209
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "clef %s : ne correspond pas à notre copie\n"
 
-#: g10/import.c:2269
+#: g10/import.c:2277
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "clef %s : « %s » 1 nouvelle identité\n"
 
-#: g10/import.c:2272
+#: g10/import.c:2280
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "clef %s : « %s » %d nouvelles identités\n"
 
-#: g10/import.c:2275
+#: g10/import.c:2283
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "clef %s : « %s » 1 nouvelle signature\n"
 
-#: g10/import.c:2278
+#: g10/import.c:2286
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "clef %s : « %s » %d nouvelles signatures\n"
 
-#: g10/import.c:2281
+#: g10/import.c:2289
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "clef %s : « %s » 1 nouvelle sous-clef\n"
 
-#: g10/import.c:2284
+#: g10/import.c:2292
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "clef %s : « %s » %d nouvelles sous-clefs\n"
 
-#: g10/import.c:2287
+#: g10/import.c:2295
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "clef %s : « %s » %d signature nettoyée\n"
 
-#: g10/import.c:2290
+#: g10/import.c:2298
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "clef %s : « %s » %d signatures nettoyées\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2301
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "clef %s : « %s » %d identité nettoyée\n"
 
-#: g10/import.c:2296
+#: g10/import.c:2304
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "clef %s : « %s » %d identités nettoyées\n"
 
-#: g10/import.c:2332
+#: g10/import.c:2340
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "clef %s : « %s » n'est pas modifiée\n"
 
-#: g10/import.c:2692 g10/import.c:2887
+#: g10/import.c:2700 g10/import.c:2895
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "clef %s : clef secrète importée\n"
 
-#: g10/import.c:2700
+#: g10/import.c:2708
 #, c-format
 msgid "key %s: secret key already exists\n"
 msgstr "clef %s : la clef secrète clef existe déjà\n"
 
-#: g10/import.c:2708
+#: g10/import.c:2716
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "clef %s : erreur d'envoi à l'agent : %s\n"
@@ -3925,210 +3940,209 @@ msgstr "clef %s : erreur d'envoi à l'agent : %s\n"
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2877
+#: g10/import.c:2885
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:3024
+#: g10/import.c:3032
 #, c-format
 msgid "secret key %s: %s\n"
 msgstr "clef secrète %s : %s\n"
 
-#: g10/import.c:3045 g10/import.c:3084
+#: g10/import.c:3053 g10/import.c:3092
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "impossible d'importer des clefs secrètes\n"
 
-#: g10/import.c:3072
+#: g10/import.c:3080
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "clef %s : clef secrète avec chiffrement %d incorrect — ignorée\n"
 
-#: g10/import.c:3234 g10/pkclist.c:75 g10/revoke.c:774
+#: g10/import.c:3242 g10/pkclist.c:75 g10/revoke.c:775
 msgid "No reason specified"
 msgstr "Aucune cause indiquée"
 
-#: g10/import.c:3235 g10/pkclist.c:77 g10/revoke.c:776
+#: g10/import.c:3243 g10/pkclist.c:77 g10/revoke.c:777
 msgid "Key is superseded"
 msgstr "La clef a été remplacée"
 
-#: g10/import.c:3236 g10/pkclist.c:79 g10/revoke.c:775
+#: g10/import.c:3244 g10/pkclist.c:79 g10/revoke.c:776
 msgid "Key has been compromised"
 msgstr "La clef a été compromise"
 
-#: g10/import.c:3237 g10/pkclist.c:81 g10/revoke.c:777
+#: g10/import.c:3245 g10/pkclist.c:81 g10/revoke.c:778
 msgid "Key is no longer used"
 msgstr "La clef n'est plus utilisée"
 
-#: g10/import.c:3238 g10/pkclist.c:83 g10/revoke.c:778
+#: g10/import.c:3246 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "L'identité n'est plus valable"
 
-#: g10/import.c:3363 g10/keylist.c:1105 g10/pkclist.c:87
+#: g10/import.c:3371 g10/keylist.c:1105 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "cause de révocation : "
 
-#: g10/import.c:3382 g10/keylist.c:1124 g10/pkclist.c:103
+#: g10/import.c:3390 g10/keylist.c:1124 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "commentaire de révocation : "
 
-#: g10/import.c:3432
+#: g10/import.c:3440
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "clef %s : pas de clef publique — impossible d'appliquer le certificat\n"
 "          de révocation\n"
 
-#: g10/import.c:3461
+#: g10/import.c:3469
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "clef %s : impossible de trouver le bloc de clef d'origine : %s\n"
 
-#: g10/import.c:3468
+#: g10/import.c:3476
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "clef %s : impossible de lire le bloc de clef d'origine : %s\n"
 
-#: g10/import.c:3488
+#: g10/import.c:3496
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "clef %s : certificat de révocation incorrect : %s — rejeté\n"
 
-#: g10/import.c:3523
+#: g10/import.c:3531
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "clef %s : « %s » certificat de révocation importé\n"
 
-#: g10/import.c:3609
+#: g10/import.c:3617
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "clef %s : pas d'identité pour la signature\n"
 
-#: g10/import.c:3626
+#: g10/import.c:3634
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "clef %s : algorithme à clef publique non géré avec l'identité « %s »\n"
 
-#: g10/import.c:3628
+#: g10/import.c:3636
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "clef %s : autosignature de l'identité « %s » incorrecte\n"
 
-#: g10/import.c:3645 g10/import.c:3673 g10/import.c:3729
+#: g10/import.c:3653 g10/import.c:3681 g10/import.c:3737
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "clef %s : algorithme à clef publique non pris en charge\n"
 
-#: g10/import.c:3646
+#: g10/import.c:3654
 #, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "clef %s : signature directe de clef incorrecte\n"
 
-#: g10/import.c:3660
+#: g10/import.c:3668
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "clef %s : pas de sous-clef pour relier la clef\n"
 
-#: g10/import.c:3675
+#: g10/import.c:3683
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "clef %s : lien à la sous-clef incorrect\n"
 
-#: g10/import.c:3694
+#: g10/import.c:3702
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "clef %s : suppression de lien multiple aux sous-clefs\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3726
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "clef %s : pas de sous-clef pour révoquer la clef\n"
 
-#: g10/import.c:3731
+#: g10/import.c:3739
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "clef %s : révocation de sous-clef incorrecte\n"
 
-#: g10/import.c:3746
+#: g10/import.c:3754
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "clef %s : suppression de la révocation de sous-clefs multiples\n"
 
-#: g10/import.c:3790
+#: g10/import.c:3798
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "clef %s : identité « %s » ignorée\n"
 
-#: g10/import.c:3817
+#: g10/import.c:3825
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "clef %s : sous-clef ignorée\n"
 
-#: g10/import.c:3849
+#: g10/import.c:3857
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "clef %s : signature non exportable (classe 0x%02X) — ignorée\n"
 
-#: g10/import.c:3860
+#: g10/import.c:3868
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "clef %s : certificat de révocation au mauvais endroit — ignoré\n"
 
-#: g10/import.c:3878
+#: g10/import.c:3886
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "clef %s : certificat de révocation incorrect : %s — ignoré\n"
 
-#: g10/import.c:3892
+#: g10/import.c:3900
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "clef %s : signature de sous-clef au mauvais endroit — ignorée\n"
 
-#: g10/import.c:3900
+#: g10/import.c:3908
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "clef %s : classe de signature inattendue (0x%02X) — ignorée\n"
 
-#: g10/import.c:4073
+#: g10/import.c:4081
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "clef %s : identités en double détectées — fusionnées\n"
 
-#: g10/import.c:4180
+#: g10/import.c:4188
 #, fuzzy, c-format
 #| msgid "key %s: duplicated user ID detected - merged\n"
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr "clef %s : identités en double détectées — fusionnées\n"
 
-#: g10/import.c:4245
+#: g10/import.c:4253
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "Attention : la clef %s est peut-être révoquée :\n"
 "            récupération de la clef de révocation %s\n"
 
-#: g10/import.c:4261
+#: g10/import.c:4269
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "Attention : la clef %s est peut-être révoquée :\n"
 "            la clef de révocation %s est absente.\n"
 
-#: g10/import.c:4327
+#: g10/import.c:4335
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "clef %s : ajout du certificat de révocation « %s »\n"
 
-#: g10/import.c:4365
+#: g10/import.c:4373
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "clef %s : ajout de la signature directe de clef\n"
 
-#: g10/key-check.c:133 dirmngr/dirmngr_ldap.c:650 dirmngr/ldap-wrapper.c:835
-#: dirmngr/ldap-wrapper.c:852
+#: g10/key-check.c:133 dirmngr/ldap-wrapper.c:835 dirmngr/ldap-wrapper.c:852
 #, c-format
 msgid "error allocating memory: %s\n"
 msgstr "erreur d'allocation de mémoire : %s\n"
@@ -4197,7 +4211,7 @@ msgid ""
 "all signatures.\n"
 msgstr ""
 
-#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:284 sm/keydb.c:297
+#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:289 sm/keydb.c:302
 #, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "erreur de création du trousseau local « %s » : %s\n"
@@ -4207,7 +4221,7 @@ msgstr "erreur de création du trousseau local « %s » : %s\n"
 msgid "error creating keyring '%s': %s\n"
 msgstr "erreur de création du porte-clefs « %s » : %s\n"
 
-#: g10/keydb.c:388 sm/keydb.c:303
+#: g10/keydb.c:388 sm/keydb.c:308
 #, c-format
 msgid "keybox '%s' created\n"
 msgstr "le trousseau local « %s » a été créé\n"
@@ -4462,8 +4476,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:6192 g10/keyedit.c:6275 g10/keyedit.c:6404
-#: g10/keyedit.c:6466 g10/sign.c:528
+#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
+#: g10/keyedit.c:6474 g10/sign.c:528
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "échec de la signature : %s\n"
@@ -4851,7 +4865,7 @@ msgstr "Pas d’identités correspondantes."
 msgid "Nothing to sign.\n"
 msgstr "Rien à signer.\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6057
+#: g10/keyedit.c:2973 g10/keyedit.c:6065
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "Non signée par vous.\n"
@@ -4922,7 +4936,7 @@ msgstr "Cette clef peut être révoquée par la clef %s %s"
 msgid "(sensitive)"
 msgstr "(sensible)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:525
+#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "créé : %s"
@@ -4938,7 +4952,7 @@ msgid "expired: %s"
 msgstr "expirée : %s"
 
 #: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2262
-#: g10/keyserver.c:531
+#: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "expire : %s"
@@ -4974,13 +4988,13 @@ 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:535
-#: g10/mainproc.c:2280 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
+#: g10/mainproc.c:2282 g10/tofu.c:1789 g10/trust.c:426 dirmngr/ocsp.c:792
 msgid "revoked"
 msgstr "révoquée"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:539
-#: g10/mainproc.c:2282 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
+#: g10/mainproc.c:2284 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "expirée"
 
@@ -5022,7 +5036,7 @@ 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:3107
+#: g10/keyedit.c:4273 g10/keygen.c:3111
 msgid "Such a user ID already exists on this key!\n"
 msgstr "Cette identité existe déjà pour cette clef.\n"
 
@@ -5180,7 +5194,7 @@ msgstr ""
 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:5357 g10/keyedit.c:5495
+#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
 #, 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"
@@ -5189,131 +5203,131 @@ msgstr "l'autosignature v3 de l'identité « %s » a été ignorée\n"
 msgid "Enter your preferred keyserver URL: "
 msgstr "Entrez l'URL de votre serveur de clefs favori : "
 
-#: g10/keyedit.c:5380
+#: g10/keyedit.c:5383
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Voulez-vous vraiment le remplacer ? (o/N) "
 
-#: g10/keyedit.c:5381
+#: g10/keyedit.c:5384
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Voulez-vous vraiment le supprimer ? (o/N) "
 
-#: g10/keyedit.c:5441
+#: g10/keyedit.c:5449
 msgid "Enter the notation: "
 msgstr "Entrez la notation : "
 
-#: g10/keyedit.c:5588
+#: g10/keyedit.c:5596
 msgid "Proceed? (y/N) "
 msgstr "Faut-il continuer ? (o/N) "
 
-#: g10/keyedit.c:5658
+#: g10/keyedit.c:5666
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Pas d'identité d'indice %d\n"
 
-#: g10/keyedit.c:5720
+#: g10/keyedit.c:5728
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Pas d'identité avec le hachage %s\n"
 
-#: g10/keyedit.c:5821
+#: g10/keyedit.c:5829
 #, 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:5843
+#: g10/keyedit.c:5851
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Pas de sous-clef d'indice %d\n"
 
-#: g10/keyedit.c:5984
+#: g10/keyedit.c:5992
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "identité : « %s »\n"
 
-#: g10/keyedit.c:5987 g10/keyedit.c:6089 g10/keyedit.c:6137
+#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
 #, 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:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
+#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
 msgid " (non-exportable)"
 msgstr " (non exportable)"
 
-#: g10/keyedit.c:5993
+#: g10/keyedit.c:6001
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Cette signature a expiré le %s.\n"
 
-#: g10/keyedit.c:5998
+#: g10/keyedit.c:6006
 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:6003
+#: g10/keyedit.c:6011
 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:6063
+#: g10/keyedit.c:6071
 #, 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:6092
+#: g10/keyedit.c:6100
 msgid " (non-revocable)"
 msgstr " (non révocable)"
 
-#: g10/keyedit.c:6099
+#: g10/keyedit.c:6107
 #, 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:6124
+#: g10/keyedit.c:6132
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vous êtes sur le point de révoquer ces signatures :\n"
 
-#: g10/keyedit.c:6147
+#: g10/keyedit.c:6155
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Faut-il vraiment créer les certificats de révocation ? (o/N) "
 
-#: g10/keyedit.c:6180
+#: g10/keyedit.c:6188
 #, c-format
 msgid "no secret key\n"
 msgstr "pas de clef secrète\n"
 
-#: g10/keyedit.c:6228
+#: g10/keyedit.c:6236
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6238
+#: g10/keyedit.c:6246
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "l'identité « %s »\" est déjà révoquée.\n"
 
-#: g10/keyedit.c:6255
+#: g10/keyedit.c:6263
 #, 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:6351
+#: g10/keyedit.c:6359
 #, 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:6389
+#: g10/keyedit.c:6397
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "La clef %s est déjà révoqué.\n"
 
-#: g10/keyedit.c:6451
+#: g10/keyedit.c:6459
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "La sous-clef %s est déjà révoquée.\n"
 
-#: g10/keyedit.c:6548
+#: g10/keyedit.c:6556
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -5326,67 +5340,67 @@ msgstr ""
 msgid "invalid value for option '%s'\n"
 msgstr "argument incorrect pour l'option « %.50s »\n"
 
-#: g10/keygen.c:338
+#: g10/keygen.c:339
 #, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "préférence « %s » en double\n"
 
-#: g10/keygen.c:345
+#: g10/keygen.c:346
 #, c-format
 msgid "too many cipher preferences\n"
 msgstr "trop de préférences de chiffrement\n"
 
-#: g10/keygen.c:347
+#: g10/keygen.c:348
 #, c-format
 msgid "too many digest preferences\n"
 msgstr "trop de préférences de hachage\n"
 
-#: g10/keygen.c:349
+#: g10/keygen.c:350
 #, c-format
 msgid "too many compression preferences\n"
 msgstr "trop de préférences de compression\n"
 
-#: g10/keygen.c:351
+#: g10/keygen.c:352
 #, fuzzy, c-format
 #| msgid "too many cipher preferences\n"
 msgid "too many AEAD preferences\n"
 msgstr "trop de préférences de chiffrement\n"
 
-#: g10/keygen.c:521
+#: g10/keygen.c:522
 #, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "élément « %s » incorrect dans la chaîne de préférences\n"
 
 # g10/keygen.c:123 ???
-#: g10/keygen.c:1130
+#: g10/keygen.c:1131
 #, c-format
 msgid "writing direct signature\n"
 msgstr "écriture de la signature directe\n"
 
 # g10/keygen.c:123 ???
-#: g10/keygen.c:1176
+#: g10/keygen.c:1177
 #, c-format
 msgid "writing self signature\n"
 msgstr "écriture de l'autosignature\n"
 
 # g10/keygen.c:161 ???
-#: g10/keygen.c:1233
+#: g10/keygen.c:1234
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "écriture de la signature de lien à la clef\n"
 
-#: g10/keygen.c:1598 g10/keygen.c:1603 g10/keygen.c:1655 g10/keygen.c:1660
-#: g10/keygen.c:1832 g10/keygen.c:1837
+#: g10/keygen.c:1599 g10/keygen.c:1604 g10/keygen.c:1656 g10/keygen.c:1661
+#: g10/keygen.c:1833 g10/keygen.c:1838
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "taille incorrecte ; utilisation de %u bits\n"
 
-#: g10/keygen.c:1609 g10/keygen.c:1666 g10/keygen.c:1674 g10/keygen.c:1843
+#: g10/keygen.c:1610 g10/keygen.c:1667 g10/keygen.c:1675 g10/keygen.c:1844
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "taille arrondie à %u bits\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1701
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
@@ -5394,19 +5408,19 @@ msgstr ""
 "Attention : certains programmes OpenPGP ne peuvent pas gérer\n"
 "            de clef DSA avec cette taille de hachage\n"
 
-#: g10/keygen.c:1899
+#: g10/keygen.c:1900
 msgid "Sign"
 msgstr "Signer"
 
-#: g10/keygen.c:1902
+#: g10/keygen.c:1903
 msgid "Certify"
 msgstr "Certifier"
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1906
 msgid "Encrypt"
 msgstr "Chiffrer"
 
-#: g10/keygen.c:1908
+#: g10/keygen.c:1909
 msgid "Authenticate"
 msgstr "Authentifier"
 
@@ -5420,180 +5434,180 @@ msgstr "Authentifier"
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1929
+#: g10/keygen.c:1930
 msgid "SsEeAaQq"
 msgstr "SsCcAaQq"
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1967
 #, fuzzy, c-format
 #| msgid "Possible actions for a %s key: "
 msgid "Possible actions for this %s key: "
 msgstr "Actions possibles pour une clef %s : "
 
-#: g10/keygen.c:1973
+#: g10/keygen.c:1974
 msgid "Current allowed actions: "
 msgstr "Actions actuellement permises : "
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1979
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Inverser la capacité de signature\n"
 
-#: g10/keygen.c:1981
+#: g10/keygen.c:1982
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Inverser la capacité de chiffrement\n"
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1985
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Inverser la capacité d'authentification\n"
 
-#: g10/keygen.c:1987
+#: g10/keygen.c:1988
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Terminé\n"
 
-#: g10/keygen.c:2116
+#: g10/keygen.c:2117
 #, fuzzy, c-format
 #| msgid "   (%d) RSA and RSA (default)\n"
 msgid "   (%d) RSA and RSA%s\n"
 msgstr "   (%d) RSA et RSA (par défaut)\n"
 
-#: g10/keygen.c:2120
+#: g10/keygen.c:2121
 #, fuzzy, c-format
 #| msgid "   (%d) DSA and Elgamal\n"
 msgid "   (%d) DSA and Elgamal%s\n"
 msgstr "   (%d) DSA et Elgamal\n"
 
-#: g10/keygen.c:2123
+#: g10/keygen.c:2124
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "   (%d) DSA (sign only)%s\n"
 msgstr "   (%d) DSA (signature seule)\n"
 
-#: g10/keygen.c:2125
+#: g10/keygen.c:2126
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (sign only)\n"
 msgid "   (%d) RSA (sign only)%s\n"
 msgstr "   (%d) RSA (signature seule)\n"
 
-#: g10/keygen.c:2131
+#: g10/keygen.c:2132
 #, fuzzy, c-format
 #| msgid "   (%d) Elgamal (encrypt only)\n"
 msgid "   (%d) Elgamal (encrypt only)%s\n"
 msgstr "   (%d) Elgamal (chiffrement seul)\n"
 
-#: g10/keygen.c:2133
+#: g10/keygen.c:2134
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (encrypt only)\n"
 msgid "   (%d) RSA (encrypt only)%s\n"
 msgstr "   (%d) RSA (chiffrement seul)\n"
 
-#: g10/keygen.c:2139
+#: g10/keygen.c:2140
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (set your own capabilities)\n"
 msgid "   (%d) DSA (set your own capabilities)%s\n"
 msgstr "   (%d) DSA (indiquez vous-même les capacités)\n"
 
-#: g10/keygen.c:2141
+#: g10/keygen.c:2142
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (set your own capabilities)\n"
 msgid "   (%d) RSA (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (indiquez vous-même les capacités)\n"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2148
 #, fuzzy, c-format
 #| msgid "   (%d) sign, encrypt\n"
 msgid "   (%d) ECC (sign and encrypt)%s\n"
 msgstr "   (%d) signer, chiffrer\n"
 
-#: g10/keygen.c:2147 g10/keygen.c:2678
+#: g10/keygen.c:2148 g10/keygen.c:2679
 msgid " *default*"
 msgstr ""
 
-#: g10/keygen.c:2148
+#: g10/keygen.c:2149
 #, c-format
 msgid "  (%d) ECC (sign only)\n"
 msgstr "  (%d) ECC (signature seule)\n"
 
-#: g10/keygen.c:2150
+#: g10/keygen.c:2151
 #, fuzzy, c-format
 #| msgid "  (%d) ECC (set your own capabilities)\n"
 msgid "  (%d) ECC (set your own capabilities)%s\n"
 msgstr "  (%d) ECC (indiquez vous-même les capacités)\n"
 
-#: g10/keygen.c:2152
+#: g10/keygen.c:2153
 #, fuzzy, c-format
 #| msgid "  (%d) ECC (encrypt only)\n"
 msgid "  (%d) ECC (encrypt only)%s\n"
 msgstr "  (%d) ECC (chiffrement seul)\n"
 
-#: g10/keygen.c:2156
+#: g10/keygen.c:2157
 #, fuzzy, c-format
 #| msgid "  (%d) Existing key\n"
 msgid "  (%d) Existing key%s\n"
 msgstr "  (%d) Clef existante\n"
 
-#: g10/keygen.c:2158
+#: g10/keygen.c:2159
 #, fuzzy, c-format
 #| msgid "   (%d) Existing key from card\n"
 msgid "  (%d) Existing key from card%s\n"
 msgstr "   (%d) Clef existante sur la carte\n"
 
-#: g10/keygen.c:2254 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2255 sm/certreqgen-ui.c:203
 msgid "Enter the keygrip: "
 msgstr "Entrez le keygrip : "
 
-#: g10/keygen.c:2267 sm/certreqgen-ui.c:211 tools/gpg-card.c:2280
+#: g10/keygen.c:2268 sm/certreqgen-ui.c:211 tools/gpg-card.c:2297
 #, c-format
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr "Ce n'est pas un keygrip valable (40 chiffres hexadécimaux attendus)\n"
 
-#: g10/keygen.c:2269 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2270 sm/certreqgen-ui.c:213
 msgid "No key with this keygrip\n"
 msgstr "Pas de clef avec ce keygrip\n"
 
-#: g10/keygen.c:2288 g10/keygen.c:2298 g10/keygen.c:3440 g10/keygen.c:3451
+#: g10/keygen.c:2289 g10/keygen.c:2299 g10/keygen.c:3444 g10/keygen.c:3455
 #: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
 #, c-format
 msgid "error reading the card: %s\n"
 msgstr "erreur de lecture de la carte : %s\n"
 
-#: g10/keygen.c:2292 g10/keygen.c:3444 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2293 g10/keygen.c:3448 sm/certreqgen-ui.c:234
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "Numéro de série de la carte : %s\n"
 
-#: g10/keygen.c:2311 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2312 sm/certreqgen-ui.c:246
 msgid "Available keys:\n"
 msgstr "Clefs disponibles :\n"
 
-#: g10/keygen.c:2504 g10/keygen.c:2518
+#: g10/keygen.c:2505 g10/keygen.c:2519
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr "arrondie à %u bits\n"
 
-#: g10/keygen.c:2559
+#: g10/keygen.c:2560
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "les clefs %s peuvent faire une taille comprise entre %u et %u bits.\n"
 
-#: g10/keygen.c:2567
+#: g10/keygen.c:2568
 #, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Quelle taille de clef désirez-vous pour la sous-clef ? (%u) "
 
-#: g10/keygen.c:2584 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2585 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La taille demandée est %u bits\n"
 
-#: g10/keygen.c:2630
+#: g10/keygen.c:2631
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Sélectionnez le type de courbe elliptique désiré :\n"
 
-#: g10/keygen.c:2819
+#: g10/keygen.c:2820
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5609,7 +5623,7 @@ msgstr ""
 "      <n>m = la clef expire dans n mois\n"
 "      <n>y = la clef expire dans n ans\n"
 
-#: g10/keygen.c:2830
+#: g10/keygen.c:2831
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5626,38 +5640,38 @@ msgstr ""
 "      <n>m = la signature expire dans n mois\n"
 "      <n>y = la signature expire dans n ans\n"
 
-#: g10/keygen.c:2853
+#: g10/keygen.c:2854
 msgid "Key is valid for? (0) "
 msgstr "Pendant combien de temps la clef est-elle valable ? (0) "
 
-#: g10/keygen.c:2858
+#: g10/keygen.c:2859
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Pendant combien de temps la signature est-elle valable ? (%s) "
 
-#: g10/keygen.c:2871 g10/keygen.c:2896
+#: g10/keygen.c:2875 g10/keygen.c:2900
 msgid "invalid value\n"
 msgstr "valeur incorrecte\n"
 
-#: g10/keygen.c:2878
+#: g10/keygen.c:2882
 msgid "Key does not expire at all\n"
 msgstr "La clef n'expire pas du tout\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2883
 msgid "Signature does not expire at all\n"
 msgstr "La signature n'expire pas du tout\n"
 
-#: g10/keygen.c:2884
+#: g10/keygen.c:2888
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "La clef expire le %s\n"
 
-#: g10/keygen.c:2885
+#: g10/keygen.c:2889
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "La signature expire le %s\n"
 
-#: g10/keygen.c:2889
+#: g10/keygen.c:2893
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5665,11 +5679,11 @@ msgstr ""
 "Le système ne peut pas afficher les dates au-delà de 2038.\n"
 "Cependant, la gestion des dates sera correcte jusqu'en 2106.\n"
 
-#: g10/keygen.c:2902
+#: g10/keygen.c:2906
 msgid "Is this correct? (y/N) "
 msgstr "Est-ce correct ? (o/N) "
 
-#: g10/keygen.c:2970
+#: g10/keygen.c:2974
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5683,7 +5697,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2985
+#: g10/keygen.c:2989
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5699,49 +5713,49 @@ msgstr ""
 "   « Heinrich Heine (le poète) <heinrichh@duesseldorf.de> »\n"
 "\n"
 
-#: g10/keygen.c:3004
+#: g10/keygen.c:3008
 msgid "Real name: "
 msgstr "Nom réel : "
 
-#: g10/keygen.c:3013
+#: g10/keygen.c:3017
 msgid "Invalid character in name\n"
 msgstr "Caractère incorrect dans le nom\n"
 
-#: g10/keygen.c:3014
+#: g10/keygen.c:3018
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:3018
+#: g10/keygen.c:3022
 msgid "Name may not start with a digit\n"
 msgstr "Le nom ne doit pas commencer par un chiffre\n"
 
-#: g10/keygen.c:3021
+#: g10/keygen.c:3025
 msgid "Name must be at least 5 characters long\n"
 msgstr "Le nom doit contenir au moins cinq caractères\n"
 
-#: g10/keygen.c:3031
+#: g10/keygen.c:3035
 msgid "Email address: "
 msgstr "Adresse électronique : "
 
-#: g10/keygen.c:3037
+#: g10/keygen.c:3041
 msgid "Not a valid email address\n"
 msgstr "Ce n'est pas une adresse électronique valable\n"
 
-#: g10/keygen.c:3046
+#: g10/keygen.c:3050
 msgid "Comment: "
 msgstr "Commentaire : "
 
-#: g10/keygen.c:3052
+#: g10/keygen.c:3056
 msgid "Invalid character in comment\n"
 msgstr "Caractère incorrect dans le commentaire\n"
 
-#: g10/keygen.c:3088
+#: g10/keygen.c:3092
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr "Vous utilisez le jeu de caractères « %s ».\n"
 
-#: g10/keygen.c:3094
+#: g10/keygen.c:3098
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5752,7 +5766,7 @@ msgstr ""
 "    « %s »\n"
 "\n"
 
-#: g10/keygen.c:3099
+#: g10/keygen.c:3103
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Ne mettez pas d'adresse électronique dans le nom réel ou dans le "
@@ -5769,34 +5783,34 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3124
+#: g10/keygen.c:3128
 msgid "NnCcEeOoQq"
 msgstr "NnCcAaOoQq"
 
-#: g10/keygen.c:3134
+#: g10/keygen.c:3138
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr ""
 "Changer le (N)om, le (C)ommentaire, l'(A)dresse électronique ou (Q)uitter ? "
 
-#: g10/keygen.c:3135
+#: g10/keygen.c:3139
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "Changer le (N)om, le (C)ommentaire, l'(A)dresse électronique\n"
 "ou (O)ui/(Q)uitter ? "
 
-#: g10/keygen.c:3140
+#: g10/keygen.c:3144
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Changer le (N)om, l’(A)dresse électronique ou (Q)uitter ? "
 
-#: g10/keygen.c:3141
+#: g10/keygen.c:3145
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "Changer le (N)om, l'(A)dresse électronique ou (O)ui/(Q)uitter ? "
 
-#: g10/keygen.c:3160
+#: g10/keygen.c:3164
 msgid "Please correct the error first\n"
 msgstr "Veuillez d'abord corriger l'erreur\n"
 
-#: g10/keygen.c:3206
+#: g10/keygen.c:3210
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -5808,18 +5822,18 @@ msgstr ""
 "pendant la génération de nombres premiers ; cela donne au générateur de\n"
 "nombres aléatoires une meilleure chance d'obtenir suffisamment d'entropie.\n"
 
-#: g10/keygen.c:3591
+#: g10/keygen.c:3595
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4590 g10/keygen.c:4663 g10/keygen.c:4681 g10/keygen.c:4710
-#: g10/keygen.c:5086 g10/keygen.c:5632 g10/keygen.c:5943 g10/keygen.c:6050
+#: g10/keygen.c:4594 g10/keygen.c:4667 g10/keygen.c:4685 g10/keygen.c:4714
+#: g10/keygen.c:5113 g10/keygen.c:5663 g10/keygen.c:5974 g10/keygen.c:6081
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Échec de génération de la clef : %s\n"
 
-#: g10/keygen.c:4599
+#: g10/keygen.c:4603
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5830,66 +5844,66 @@ msgstr ""
 "   « %s »\n"
 "\n"
 
-#: g10/keygen.c:4601
+#: g10/keygen.c:4605
 msgid "Continue? (Y/n) "
 msgstr "Faut-il continuer ? (O/n) "
 
-#: g10/keygen.c:4622
+#: g10/keygen.c:4626
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "Une clef pour « %s » existe déjà\n"
 
-#: g10/keygen.c:4627
+#: g10/keygen.c:4631
 msgid "Create anyway? (y/N) "
 msgstr "Faut-il quand même créer ? (o/N) "
 
-#: g10/keygen.c:4633
+#: g10/keygen.c:4637
 #, c-format
 msgid "creating anyway\n"
 msgstr "création quand même\n"
 
-#: g10/keygen.c:5069
+#: g10/keygen.c:5096
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 "Remarque : Utilisez « %s %s » pour une fenêtre de dialogue de génération de "
 "clef complète.\n"
 
-#: g10/keygen.c:5118
+#: g10/keygen.c:5145
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "La génération de clef a été annulée.\n"
 
-#: g10/keygen.c:5178
+#: g10/keygen.c:5205
 #, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "impossible de créer le fichier de sauvegarde « %s » : %s\n"
 
-#: g10/keygen.c:5198
+#: g10/keygen.c:5225
 #, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "Remarque : sauvegarde de la clef de la carte dans « %s »\n"
 
-#: g10/keygen.c:5359 g10/keygen.c:5561
+#: g10/keygen.c:5389 g10/keygen.c:5591
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr "écriture de la clef publique dans « %s »\n"
 
-#: g10/keygen.c:5555
+#: g10/keygen.c:5585
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "aucun porte-clefs public accessible en écriture n'a été trouvé : %s\n"
 
-#: g10/keygen.c:5569
+#: g10/keygen.c:5599
 #, c-format
 msgid "error writing public keyring '%s': %s\n"
 msgstr "erreur d'écriture du porte-clefs public « %s » : %s\n"
 
-#: g10/keygen.c:5603
+#: g10/keygen.c:5634
 msgid "public and secret key created and signed.\n"
 msgstr "les clefs publique et secrète ont été créées et signées.\n"
 
-#: g10/keygen.c:5619
+#: g10/keygen.c:5650
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -5898,7 +5912,7 @@ msgstr ""
 "pouvez\n"
 "utiliser la commande « --edit-key » pour générer une sous-clef à cette fin.\n"
 
-#: g10/keygen.c:5801 g10/keygen.c:6000
+#: g10/keygen.c:5832 g10/keygen.c:6031
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5906,7 +5920,7 @@ msgstr ""
 "la clef a été créée %lu seconde dans le futur (faille temporelle ou\n"
 "problème d'horloge)\n"
 
-#: g10/keygen.c:5803 g10/keygen.c:6002
+#: g10/keygen.c:5834 g10/keygen.c:6033
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5914,25 +5928,25 @@ msgstr ""
 "la clef a été créée %lu secondes dans le futur (faille temporelle ou\n"
 "problème d'horloge)\n"
 
-#: g10/keygen.c:5814 g10/keygen.c:6013
+#: g10/keygen.c:5845 g10/keygen.c:6044
 #, c-format
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "Remarque : la création de sous-clefs pour des clefs v3 n'est pas compatible\n"
 "           avec OpenPGP\n"
 
-#: g10/keygen.c:5826 g10/keygen.c:5828
+#: g10/keygen.c:5857 g10/keygen.c:5859
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Les parties secrètes de la clef principale ne sont pas disponibles.\n"
 
-#: g10/keygen.c:5835 g10/keygen.c:5837
+#: g10/keygen.c:5866 g10/keygen.c:5868
 #, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr ""
 "Les parties secrètes de la clef principale sont stockées sur la carte.\n"
 
-#: g10/keygen.c:5857 g10/keygen.c:6027
+#: g10/keygen.c:5888 g10/keygen.c:6058
 msgid "Really create? (y/N) "
 msgstr "Faut-il vraiment la créer ? (o/N) "
 
@@ -6014,12 +6028,12 @@ msgstr " Empreinte de la clef ="
 msgid "      Card serial no. ="
 msgstr " Nº de série de carte ="
 
-#: g10/keyring.c:1467
+#: g10/keyring.c:1477
 #, c-format
 msgid "caching keyring '%s'\n"
 msgstr "mise en cache du porte-clefs « %s »\n"
 
-#: g10/keyring.c:1541
+#: g10/keyring.c:1551
 #, fuzzy, c-format
 #| msgid "%lu keys cached so far (%lu signatures)\n"
 msgid "%lu keys cached so far (%lu signature)\n"
@@ -6027,7 +6041,7 @@ msgid_plural "%lu keys cached so far (%lu signatures)\n"
 msgstr[0] "%lu clefs mises en cache pour l'instant (%lu signatures)\n"
 msgstr[1] "%lu clefs mises en cache pour l'instant (%lu signatures)\n"
 
-#: g10/keyring.c:1557
+#: g10/keyring.c:1567
 #, fuzzy, c-format
 #| msgid "flush the cache"
 msgid "%lu key cached"
@@ -6035,7 +6049,7 @@ msgid_plural "%lu keys cached"
 msgstr[0] "vider le cache"
 msgstr[1] "vider le cache"
 
-#: g10/keyring.c:1559
+#: g10/keyring.c:1569
 #, fuzzy, c-format
 #| msgid "1 bad signature\n"
 msgid " (%lu signature)\n"
@@ -6043,7 +6057,7 @@ msgid_plural " (%lu signatures)\n"
 msgstr[0] "1 mauvaise signature\n"
 msgstr[1] "1 mauvaise signature\n"
 
-#: g10/keyring.c:1636
+#: g10/keyring.c:1646
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s : porte-clefs créé\n"
@@ -6072,25 +6086,25 @@ msgstr "récupérer les clefs automatiquement en vérifiant les signatures"
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "respecter l'URL de serveur de clefs favori indiqué dans la clef"
 
-#: g10/keyserver.c:537
+#: g10/keyserver.c:360
 msgid "disabled"
 msgstr "désactivée"
 
-#: g10/keyserver.c:740
+#: g10/keyserver.c:563
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Entrez le ou les nombres, (S)uivant, ou (Q)uitter > "
 
-#: g10/keyserver.c:846
+#: g10/keyserver.c:669
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "protocole de serveur de clefs incorrect (nous %d!=gestionnaire %d)\n"
 
-#: g10/keyserver.c:986 g10/keyserver.c:1096
+#: g10/keyserver.c:809 g10/keyserver.c:919
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "« %s » n'est pas un identifiant de clef : ignoré\n"
 
-#: g10/keyserver.c:1420 g10/keyserver.c:1453
+#: g10/keyserver.c:1217 g10/keyserver.c:1250
 #, fuzzy, c-format
 #| msgid "refreshing %d keys from %s\n"
 msgid "refreshing %d key from %s\n"
@@ -6098,55 +6112,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:1427
+#: g10/keyserver.c:1224
 #, 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:1531
+#: g10/keyserver.c:1316
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "clef « %s » introuvable sur le serveur de clefs\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1319
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "clef introuvable sur le serveur de clefs\n"
 
-#: g10/keyserver.c:1722
-#, c-format
-msgid "requesting key %s from %s server %s\n"
-msgstr "demande de la clef %s sur le serveur %s %s\n"
-
-#: g10/keyserver.c:1726
+#: g10/keyserver.c:1481
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "requête de la clef %s sur %s\n"
 
-#: g10/keyserver.c:1841 g10/keyserver.c:2020
+#: g10/keyserver.c:1600 g10/keyserver.c:1793
 #, 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:1856 g10/skclist.c:213 g10/skclist.c:241
+#: g10/keyserver.c:1615 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:1860
+#: g10/keyserver.c:1619
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "envoi de la clef %s à %s\n"
 
-#: g10/keyserver.c:1901
+#: g10/keyserver.c:1662
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr "requête de la clef sur « %s »\n"
 
-#: g10/keyserver.c:1917
+#: g10/keyserver.c:1680
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "Attention : impossible de récupérer l'URI %s : %s\n"
@@ -6173,243 +6182,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:472
+#: g10/mainproc.c:473
 #, c-format
 msgid "public key is %s\n"
 msgstr "la clef publique est %s\n"
 
-#: g10/mainproc.c:524
+#: g10/mainproc.c:525
 #, 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:528 g10/pkclist.c:231
+#: g10/mainproc.c:529 g10/pkclist.c:231
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      « %s »\n"
 
-#: g10/mainproc.c:532
+#: g10/mainproc.c:533
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "chiffré avec une clef %s, identifiant %s\n"
 
-#: g10/mainproc.c:552 g10/mainproc.c:935
+#: g10/mainproc.c:553 g10/mainproc.c:937
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "Attention : plusieurs textes en clair ont été vus\n"
 
-#: g10/mainproc.c:560
+#: g10/mainproc.c:561
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "chiffré avec %lu phrases secrètes\n"
 
-#: g10/mainproc.c:562
+#: g10/mainproc.c:563
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "chiffré avec 1 phrase secrète\n"
 
-#: g10/mainproc.c:577 g10/mainproc.c:602
+#: g10/mainproc.c:578 g10/mainproc.c:603
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "échec du déchiffrement par clef publique : %s\n"
 
-#: g10/mainproc.c:613
+#: g10/mainproc.c:614
 #, 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:642 g10/mainproc.c:663
+#: g10/mainproc.c:643 g10/mainproc.c:664
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "les données sont supposées chiffrées avec %s\n"
 
-#: g10/mainproc.c:649
+#: g10/mainproc.c:650
 #, 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:742 g10/mainproc.c:780
+#: g10/mainproc.c:744 g10/mainproc.c:782
 #, 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:753
+#: g10/mainproc.c:755
 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:756
+#: g10/mainproc.c:758
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:761
+#: g10/mainproc.c:763
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "échec du déchiffrement : %s\n"
 
-#: g10/mainproc.c:773
+#: g10/mainproc.c:775
 #, c-format
 msgid "decryption okay\n"
 msgstr "le déchiffrement a réussi\n"
 
-#: g10/mainproc.c:786
+#: g10/mainproc.c:788
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "Attention : le message chiffré a été manipulé.\n"
 
-#: g10/mainproc.c:804
+#: g10/mainproc.c:806
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "échec du déchiffrement : %s\n"
 
-#: g10/mainproc.c:851
+#: g10/mainproc.c:853
 #, 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:858
+#: g10/mainproc.c:860
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nom de fichier original : « %.*s »\n"
 
-#: g10/mainproc.c:1135
+#: g10/mainproc.c:1137
 #, 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:1440 g10/mainproc.c:1483
+#: g10/mainproc.c:1442 g10/mainproc.c:1485
 #, c-format
 msgid "no signature found\n"
 msgstr "aucune signature trouvée\n"
 
-#: g10/mainproc.c:1763
+#: g10/mainproc.c:1765
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "MAUVAISE signature de « %s »"
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1767
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Signature expirée de « %s »"
 
-#: g10/mainproc.c:1767
+#: g10/mainproc.c:1769
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Bonne signature de « %s »"
 
-#: g10/mainproc.c:1789
+#: g10/mainproc.c:1791
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "vérification de signature supprimée\n"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1905
 #, 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:1919 g10/mainproc.c:1926
+#: g10/mainproc.c:1921 g10/mainproc.c:1928
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Signature faite le %s\n"
 
-#: g10/mainproc.c:1920 g10/mainproc.c:1927 sm/verify.c:480
+#: g10/mainproc.c:1922 g10/mainproc.c:1929 sm/verify.c:480
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               avec la clef %s %s\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1933
 #, 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:1937
+#: g10/mainproc.c:1939
 #, fuzzy, c-format
 #| msgid "                aka \"%s\""
 msgid "               issuer \"%s\"\n"
 msgstr "                alias « %s »"
 
-#: g10/mainproc.c:1992
+#: g10/mainproc.c:1994
 #, c-format
 msgid "Key available at: "
 msgstr "Clef disponible sur : "
 
-#: g10/mainproc.c:2034
+#: g10/mainproc.c:2036
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2234
+#: g10/mainproc.c:2236
 msgid "[uncertain]"
 msgstr "[doute]"
 
-#: g10/mainproc.c:2272
+#: g10/mainproc.c:2274
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                alias « %s »"
 
-#: g10/mainproc.c:2347
+#: g10/mainproc.c:2349
 #, 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:2363
+#: g10/mainproc.c:2365
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "La signature a expiré le %s\n"
 
-#: g10/mainproc.c:2368
+#: g10/mainproc.c:2370
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "La signature expire le %s\n"
 
-#: g10/mainproc.c:2379
+#: g10/mainproc.c:2381
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "signature %s, algorithme de hachage %s%s%s\n"
 
-#: g10/mainproc.c:2380
+#: g10/mainproc.c:2382
 msgid "binary"
 msgstr "binaire"
 
-#: g10/mainproc.c:2381
+#: g10/mainproc.c:2383
 msgid "textmode"
 msgstr "mode texte"
 
-#: g10/mainproc.c:2381 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2383 g10/trust.c:112 dirmngr/ocsp.c:793
 msgid "unknown"
 msgstr "inconnu"
 
-#: g10/mainproc.c:2383
+#: g10/mainproc.c:2385
 msgid ", key algorithm "
 msgstr ", algorithme de clef "
 
-#: g10/mainproc.c:2418
+#: g10/mainproc.c:2420
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2457
+#: g10/mainproc.c:2459
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossible de vérifier la signature : %s\n"
 
-#: g10/mainproc.c:2553 g10/mainproc.c:2572 g10/mainproc.c:2696
+#: g10/mainproc.c:2555 g10/mainproc.c:2574 g10/mainproc.c:2698
 #, c-format
 msgid "not a detached signature\n"
 msgstr "la signature n'est pas détachée\n"
 
-#: g10/mainproc.c:2606
+#: g10/mainproc.c:2608
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
@@ -6417,12 +6426,12 @@ msgstr ""
 "Attention : plusieurs signatures ont été détectées.\n"
 "            Seule la première sera vérifiée.\n"
 
-#: g10/mainproc.c:2615
+#: g10/mainproc.c:2617
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "signature autonome de classe 0x%02x\n"
 
-#: g10/mainproc.c:2700
+#: g10/mainproc.c:2702
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature d'un ancien type (PGP 2.x)\n"
@@ -6617,55 +6626,61 @@ msgstr "Notation de signature critique : "
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "un sous-paquet de type %d possède un bit critique\n"
 
-#: g10/passphrase.c:208
+#: g10/passphrase.c:201 sm/decrypt.c:669
+#, fuzzy
+#| msgid "Please enter the new passphrase"
+msgid "Please enter the passphrase for decryption."
+msgstr "Veuillez entrer la nouvelle phrase secrète"
+
+#: g10/passphrase.c:203
 msgid "Enter passphrase\n"
 msgstr "Entrez la phrase secrète\n"
 
-#: g10/passphrase.c:219
+#: g10/passphrase.c:227
 #, c-format
 msgid "cancelled by user\n"
 msgstr "annulé par l'utilisateur\n"
 
-#: g10/passphrase.c:460
+#: g10/passphrase.c:472
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (identifiant de clef principale %s)"
 
-#: g10/passphrase.c:467
+#: g10/passphrase.c:479
 msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 msgstr ""
 "Veuillez entrer la phrase secrète pour déverrouiller la clef secrète "
 "OpenPGP :"
 
-#: g10/passphrase.c:471
+#: g10/passphrase.c:483
 msgid "Please enter the passphrase to import the OpenPGP secret key:"
 msgstr ""
 "Veuillez entrer la phrase secrète pour importer la clef secrète OpenPGP :"
 
-#: g10/passphrase.c:476
+#: g10/passphrase.c:488
 msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 msgstr ""
 "Veuillez entrer la phrase secrète pour exporter la sous-clef secrète "
 "OpenPGP :"
 
-#: g10/passphrase.c:479
+#: g10/passphrase.c:491
 msgid "Please enter the passphrase to export the OpenPGP secret key:"
 msgstr ""
 "Veuillez entrer la phrase secrète pour exporter la clef secrète OpenPGP :"
 
 # NOTE:  s/subkey key/subkey/
-#: g10/passphrase.c:484
+#: g10/passphrase.c:496
 msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 msgstr ""
 "Voulez-vous vraiment supprimer de façon permanente la sous-clef secrète "
 "OpenPGP :"
 
-#: g10/passphrase.c:487
+#: g10/passphrase.c:499
 msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgstr ""
 "Voulez-vous vraiment supprimer de façon permanente la clef secrète OpenPGP :"
 
-#: g10/passphrase.c:496
+#: g10/passphrase.c:508
 #, c-format
 msgid ""
 "%s\n"
@@ -6841,7 +6856,7 @@ msgstr ""
 "Le niveau de confiance minimal pour cette clef est : %s\n"
 "\n"
 
-#: g10/pkclist.c:313 g10/revoke.c:803
+#: g10/pkclist.c:313 g10/revoke.c:804
 msgid "Your decision? "
 msgstr "Quelle est votre décision ? "
 
@@ -7158,7 +7173,7 @@ msgstr "impossible d'ouvrir les données signées « %s »\n"
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "impossible d'ouvrir les données signées fd=%d : %s\n"
 
-#: g10/pubkey-enc.c:99 sm/decrypt.c:879
+#: g10/pubkey-enc.c:99 sm/decrypt.c:1329
 #, fuzzy, c-format
 #| msgid "certificate is not usable for encryption\n"
 msgid "key %s is not suitable for decryption in %s mode\n"
@@ -7209,7 +7224,7 @@ msgid "Note: key has been revoked"
 msgstr "Remarque : la clef a été révoquée"
 
 #: g10/revoke.c:100 g10/revoke.c:126 g10/revoke.c:172 g10/revoke.c:184
-#: g10/revoke.c:502
+#: g10/revoke.c:503
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "échec de build_packet : %s\n"
@@ -7238,11 +7253,11 @@ msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr ""
 "Faut-il créer un certificat de révocation désigné pour cette clef ? (o/N) "
 
-#: g10/revoke.c:334 g10/revoke.c:744
+#: g10/revoke.c:334 g10/revoke.c:745
 msgid "ASCII armored output forced.\n"
 msgstr "sortie forcée avec armure ASCII.\n"
 
-#: g10/revoke.c:350 g10/revoke.c:481
+#: g10/revoke.c:350 g10/revoke.c:482
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "échec de make_keysig_packet : %s\n"
@@ -7256,18 +7271,18 @@ msgstr "Certificat de révocation créé.\n"
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "aucune clef de révocation trouvée pour « %s »\n"
 
-#: g10/revoke.c:567
+#: g10/revoke.c:568
 msgid "This is a revocation certificate for the OpenPGP key:"
 msgstr "Ceci est un certificat de révocation pour la clef OpenPGP :"
 
-#: g10/revoke.c:583
+#: g10/revoke.c:584
 msgid ""
 "A revocation certificate is a kind of \"kill switch\" to publicly\n"
 "declare that a key shall not anymore be used.  It is not possible\n"
 "to retract such a revocation certificate once it has been published."
 msgstr ""
 
-#: g10/revoke.c:586
+#: g10/revoke.c:587
 #, fuzzy
 #| msgid ""
 #| "Use it to revoke this key in case of a compromise or loss of\n"
@@ -7286,7 +7301,7 @@ msgstr ""
 "encore accessible, créer un nouveau certificat de révocation\n"
 "est préférable afin d’indiquer la cause de révocation."
 
-#: g10/revoke.c:592
+#: g10/revoke.c:593
 #, fuzzy
 #| msgid ""
 #| "To avoid an accidental use of this file, a colon has been inserted\n"
@@ -7302,13 +7317,13 @@ msgstr ""
 "Supprimez ce deux-points avec un éditeur de texte avant\n"
 "d’utiliser ce certificat de révocation."
 
-#: g10/revoke.c:611
+#: g10/revoke.c:612
 #, fuzzy, c-format
 #| msgid "Revocation certificate created.\n"
 msgid "revocation certificate stored as '%s.rev'\n"
 msgstr "Certificat de révocation créé.\n"
 
-#: g10/revoke.c:655
+#: g10/revoke.c:656
 #, fuzzy, c-format
 #| msgid "secret key \"%s\" not found: %s\n"
 msgid "secret key \"%s\" not found\n"
@@ -7317,22 +7332,22 @@ msgstr "clef secrète « %s » introuvable : %s\n"
 #. TRANSLATORS: The %s prints a key specification which
 #. for example has been given at the command line.  Several lines
 #. lines with secret key infos are printed after this message.
-#: g10/revoke.c:680
+#: g10/revoke.c:681
 #, c-format
 msgid "'%s' matches multiple secret keys:\n"
 msgstr ""
 
-#: g10/revoke.c:705
+#: g10/revoke.c:706
 #, fuzzy, c-format
 #| msgid "error creating keyring '%s': %s\n"
 msgid "error searching the keyring: %s\n"
 msgstr "erreur de création du porte-clefs « %s » : %s\n"
 
-#: g10/revoke.c:728
+#: g10/revoke.c:729
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Faut-il créer un certificat de révocation pour cette clef ? (o/N) "
 
-#: g10/revoke.c:752
+#: g10/revoke.c:753
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -7353,34 +7368,34 @@ msgstr ""
 "d'impression\n"
 "utilisé pourrait stocker ces données et les rendre accessibles à d'autres.\n"
 
-#: g10/revoke.c:786
+#: g10/revoke.c:787
 msgid "Please select the reason for the revocation:\n"
 msgstr "choisissez la cause de la révocation :\n"
 
-#: g10/revoke.c:796
+#: g10/revoke.c:797
 msgid "Cancel"
 msgstr "Annuler"
 
-#: g10/revoke.c:798
+#: g10/revoke.c:799
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Vous devriez sûrement sélectionner %d ici)\n"
 
-#: g10/revoke.c:839
+#: g10/revoke.c:843
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 "Entrez une description facultative, en terminant par une ligne vide :\n"
 
-#: g10/revoke.c:867
+#: g10/revoke.c:871
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Cause de révocation : %s\n"
 
-#: g10/revoke.c:869
+#: g10/revoke.c:873
 msgid "(No description given)\n"
 msgstr "(Aucune description donnée)\n"
 
-#: g10/revoke.c:874
+#: g10/revoke.c:878
 msgid "Is this okay? (y/N) "
 msgstr "Est-ce d'accord ? (o/N) "
 
@@ -7575,24 +7590,24 @@ msgstr "signature :"
 msgid "%s.%s encryption will be used\n"
 msgstr "le chiffrement %s sera utilisé\n"
 
-#: g10/skclist.c:172 g10/skclist.c:253
+#: g10/skclist.c:173 g10/skclist.c:254
 #, c-format
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "la clef n'est pas marquée comme non sécurisée — elle ne peut pas être\n"
 "utilisée avec le soi-disant générateur de nombres aléatoires.\n"
 
-#: g10/skclist.c:204
+#: g10/skclist.c:205
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "« %s » a été ignorée : en double\n"
 
-#: g10/skclist.c:223
+#: g10/skclist.c:224
 #, c-format
 msgid "skipped: secret key already present\n"
 msgstr "ignoré : clef secrète déjà présente\n"
 
-#: g10/skclist.c:242
+#: g10/skclist.c:243
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "c'est une clef Elgamal générée par PGP qui n'est pas sûre pour les "
@@ -7817,10 +7832,10 @@ msgstr "algorithme non pris en charge : %s"
 msgid "TOFU DB error"
 msgstr ""
 
-#: g10/tofu.c:687 g10/tofu.c:2073 g10/tofu.c:2354 g10/tofu.c:2373
-#: g10/tofu.c:2386 g10/tofu.c:2398 g10/tofu.c:2413 g10/tofu.c:2425
-#: g10/tofu.c:3021 g10/tofu.c:3038 g10/tofu.c:3075 g10/tofu.c:3092
-#: g10/tofu.c:3404
+#: g10/tofu.c:687 g10/tofu.c:2077 g10/tofu.c:2358 g10/tofu.c:2377
+#: g10/tofu.c:2390 g10/tofu.c:2402 g10/tofu.c:2417 g10/tofu.c:2429
+#: g10/tofu.c:3025 g10/tofu.c:3042 g10/tofu.c:3079 g10/tofu.c:3096
+#: g10/tofu.c:3408
 #, fuzzy, c-format
 #| msgid "error sending data: %s\n"
 msgid "error reading TOFU database: %s\n"
@@ -7844,7 +7859,7 @@ msgstr "erreur d'initialisation de l'objet lecteur : %s\n"
 msgid "error opening TOFU database '%s': %s\n"
 msgstr "erreur d'ouverture de « %s » : %s\n"
 
-#: g10/tofu.c:1148 g10/tofu.c:3458 g10/tofu.c:3604
+#: g10/tofu.c:1148 g10/tofu.c:3462 g10/tofu.c:3608
 #, fuzzy, c-format
 #| msgid "error sending data: %s\n"
 msgid "error updating TOFU database: %s\n"
@@ -7886,37 +7901,37 @@ msgstr "erreur de lecture de l'identifiant de répondeur : %s\n"
 msgid "This key's user IDs:\n"
 msgstr "afficher la clef et les identités"
 
-#: g10/tofu.c:1634 g10/tofu.c:1799
+#: g10/tofu.c:1634 g10/tofu.c:1801
 #, fuzzy, c-format
 #| msgid "validity: %s"
 msgid "policy: %s"
 msgstr "validité : %s"
 
-#: g10/tofu.c:1725
+#: g10/tofu.c:1727
 #, fuzzy, c-format
 #| msgid "error getting stored flags: %s\n"
 msgid "error gathering signature stats: %s\n"
 msgstr "erreur de lecture des options stockées : %s\n"
 
-#: g10/tofu.c:1729
+#: g10/tofu.c:1731
 #, c-format
 msgid "The email address \"%s\" is associated with %d key:\n"
 msgid_plural "The email address \"%s\" is associated with %d keys:\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1747
+#: g10/tofu.c:1749
 #, c-format
 msgid "Statistics for keys with the email address \"%s\":\n"
 msgstr ""
 
-#: g10/tofu.c:1797
+#: g10/tofu.c:1799
 #, fuzzy
 #| msgid "list keys"
 msgid "this key"
 msgstr "afficher les clefs"
 
-#: g10/tofu.c:1823
+#: g10/tofu.c:1825
 #, fuzzy, c-format
 #| msgid "print message digests"
 msgid "Verified %d message."
@@ -7924,7 +7939,7 @@ msgid_plural "Verified %d messages."
 msgstr[0] "indiquer les fonctions de hachage"
 msgstr[1] "indiquer les fonctions de hachage"
 
-#: g10/tofu.c:1827
+#: g10/tofu.c:1829
 #, fuzzy, c-format
 #| msgid "encrypted with %lu passphrases\n"
 msgid "Encrypted %d message."
@@ -7932,7 +7947,7 @@ msgid_plural "Encrypted %d messages."
 msgstr[0] "chiffré avec %lu phrases secrètes\n"
 msgstr[1] "chiffré avec %lu phrases secrètes\n"
 
-#: g10/tofu.c:1834
+#: g10/tofu.c:1836
 #, fuzzy, c-format
 #| msgid "print message digests"
 msgid "Verified %d message in the future."
@@ -7940,7 +7955,7 @@ msgid_plural "Verified %d messages in the future."
 msgstr[0] "indiquer les fonctions de hachage"
 msgstr[1] "indiquer les fonctions de hachage"
 
-#: g10/tofu.c:1838
+#: g10/tofu.c:1840
 #, fuzzy, c-format
 #| msgid "print message digests"
 msgid "Encrypted %d message in the future."
@@ -7948,54 +7963,54 @@ msgid_plural "Encrypted %d messages in the future."
 msgstr[0] "indiquer les fonctions de hachage"
 msgstr[1] "indiquer les fonctions de hachage"
 
-#: g10/tofu.c:1852
+#: g10/tofu.c:1854
 #, c-format
 msgid "Messages verified over the past %d day: %d."
 msgid_plural "Messages verified over the past %d days: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1858
+#: g10/tofu.c:1860
 #, c-format
 msgid "Messages encrypted over the past %d day: %d."
 msgid_plural "Messages encrypted over the past %d days: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1868
+#: g10/tofu.c:1870
 #, c-format
 msgid "Messages verified over the past %d month: %d."
 msgid_plural "Messages verified over the past %d months: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1874
+#: g10/tofu.c:1876
 #, c-format
 msgid "Messages encrypted over the past %d month: %d."
 msgid_plural "Messages encrypted over the past %d months: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1884
+#: g10/tofu.c:1886
 #, c-format
 msgid "Messages verified over the past %d year: %d."
 msgid_plural "Messages verified over the past %d years: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1890
+#: g10/tofu.c:1892
 #, c-format
 msgid "Messages encrypted over the past %d year: %d."
 msgid_plural "Messages encrypted over the past %d years: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1898
+#: g10/tofu.c:1900
 #, c-format
 msgid "Messages verified in the past: %d."
 msgstr ""
 
-#: g10/tofu.c:1902
+#: g10/tofu.c:1904
 #, fuzzy, c-format
 #| msgid "print message digests"
 msgid "Messages encrypted in the past: %d."
@@ -8004,131 +8019,131 @@ msgstr "indiquer les fonctions de hachage"
 #. TRANSLATORS: Please translate the text found in the source
 #. * file below.  We don't directly internationalize that text so
 #. * that we can tweak it without breaking translations.
-#: g10/tofu.c:1919
+#: g10/tofu.c:1921
 msgid "TOFU detected a binding conflict"
 msgstr ""
 
 #. TRANSLATORS: Two letters (normally the lower and upper case
 #. * version of the hotkey) for each of the five choices.  If
 #. * there is only one choice in your language, repeat it.
-#: g10/tofu.c:1961
+#: g10/tofu.c:1963
 msgid "gGaAuUrRbB"
 msgstr ""
 
-#: g10/tofu.c:1967
+#: g10/tofu.c:1969
 msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 
-#: g10/tofu.c:1975
+#: g10/tofu.c:1978
 msgid "Defaulting to unknown.\n"
 msgstr ""
 
-#: g10/tofu.c:2093 g10/tofu.c:2228
+#: g10/tofu.c:2097 g10/tofu.c:2232
 #, c-format
 msgid "TOFU db corruption detected.\n"
 msgstr ""
 
-#: g10/tofu.c:2829
+#: g10/tofu.c:2833
 #, fuzzy, c-format
 #| msgid "error creating a pipe: %s\n"
 msgid "error changing TOFU policy: %s\n"
 msgstr "erreur de création d'un tube : %s\n"
 
-#: g10/tofu.c:2880
+#: g10/tofu.c:2884
 #, c-format
 msgid "%lld~year"
 msgid_plural "%lld~years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2885
+#: g10/tofu.c:2889
 #, c-format
 msgid "%lld~month"
 msgid_plural "%lld~months"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2890
+#: g10/tofu.c:2894
 #, c-format
 msgid "%lld~week"
 msgid_plural "%lld~weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2895
+#: g10/tofu.c:2899
 #, c-format
 msgid "%lld~day"
 msgid_plural "%lld~days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2900
+#: g10/tofu.c:2904
 #, c-format
 msgid "%lld~hour"
 msgid_plural "%lld~hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2905
+#: g10/tofu.c:2909
 #, c-format
 msgid "%lld~minute"
 msgid_plural "%lld~minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2907
+#: g10/tofu.c:2911
 #, c-format
 msgid "%lld~second"
 msgid_plural "%lld~seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:3145
+#: g10/tofu.c:3149
 #, c-format
 msgid "%s: Verified 0~signatures and encrypted 0~messages."
 msgstr ""
 
-#: g10/tofu.c:3151
+#: g10/tofu.c:3155
 #, fuzzy, c-format
 #| msgid "Deleted %d signatures.\n"
 msgid "%s: Verified 0 signatures."
 msgstr "%d signatures supprimées\n"
 
-#: g10/tofu.c:3165
+#: g10/tofu.c:3169
 #, fuzzy
 #| msgid "encrypted with %lu passphrases\n"
 msgid "Encrypted 0 messages."
 msgstr "chiffré avec %lu phrases secrètes\n"
 
-#: g10/tofu.c:3181
+#: g10/tofu.c:3185
 #, fuzzy, c-format
 #| msgid "validity: %s"
 msgid "(policy: %s)"
 msgstr "validité : %s"
 
-#: g10/tofu.c:3215
+#: g10/tofu.c:3219
 #, c-format
 msgid ""
 "Warning: we have yet to see a message signed using this key and user id!\n"
 msgstr ""
 
-#: g10/tofu.c:3218
+#: g10/tofu.c:3222
 #, c-format
 msgid ""
 "Warning: we've only seen one message signed using this key and user id!\n"
 msgstr ""
 
-#: g10/tofu.c:3222
+#: g10/tofu.c:3226
 #, c-format
 msgid "Warning: you have yet to encrypt a message to this key!\n"
 msgstr ""
 
-#: g10/tofu.c:3225
+#: g10/tofu.c:3229
 #, c-format
 msgid "Warning: you have only encrypted one message to this key!\n"
 msgstr ""
 
-#: g10/tofu.c:3254
+#: g10/tofu.c:3258
 #, c-format
 msgid ""
 "Warning: if you think you've seen more signatures by this key and user id, "
@@ -8145,14 +8160,14 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:3339 g10/tofu.c:3502 g10/tofu.c:3708 g10/tofu.c:3761
-#: g10/tofu.c:3902 g10/tofu.c:3979 g10/tofu.c:4017
+#: g10/tofu.c:3343 g10/tofu.c:3506 g10/tofu.c:3712 g10/tofu.c:3765
+#: g10/tofu.c:3906 g10/tofu.c:3983 g10/tofu.c:4021
 #, fuzzy, c-format
 #| msgid "error sending data: %s\n"
 msgid "error opening TOFU database: %s\n"
 msgstr "erreur d'envoi de données : %s\n"
 
-#: g10/tofu.c:3535
+#: g10/tofu.c:3539
 #, c-format
 msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
 msgstr ""
@@ -8221,7 +8236,7 @@ msgstr "utilisation du modèle de confiance %s\n"
 msgid "no need for a trustdb check\n"
 msgstr "inutile de vérifier la base de confiance\n"
 
-#: g10/trustdb.c:601 g10/trustdb.c:2272
+#: g10/trustdb.c:601 g10/trustdb.c:2273
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "la prochaine vérification de la base de confiance aura lieu le %s\n"
@@ -8255,7 +8270,7 @@ msgstr "veuillez faire un --check-trustdb\n"
 msgid "checking the trustdb\n"
 msgstr "vérification de la base de confiance\n"
 
-#: g10/trustdb.c:1993
+#: g10/trustdb.c:1994
 #, fuzzy, c-format
 #| msgid "%lu keys processed so far\n"
 msgid "%d key processed"
@@ -8263,7 +8278,7 @@ msgid_plural "%d keys processed"
 msgstr[0] "%lu clefs traitées jusqu'à présent\n"
 msgstr[1] "%lu clefs traitées jusqu'à présent\n"
 
-#: g10/trustdb.c:1996
+#: g10/trustdb.c:1997
 #, fuzzy, c-format
 #| msgid "%d keys processed (%d validity counts cleared)\n"
 msgid " (%d validity count cleared)\n"
@@ -8271,17 +8286,17 @@ msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] "%d clefs traitées (%d comptes de validité réinitialisés)\n"
 msgstr[1] "%d clefs traitées (%d comptes de validité réinitialisés)\n"
 
-#: g10/trustdb.c:2066
+#: g10/trustdb.c:2067
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "aucune clef de confiance ultime n'a été trouvée\n"
 
-#: g10/trustdb.c:2080
+#: g10/trustdb.c:2081
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "la clef publique de la clef de confiance ultime %s est introuvable\n"
 
-#: g10/trustdb.c:2198
+#: g10/trustdb.c:2199
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -8289,30 +8304,30 @@ msgstr ""
 "profondeur : %d  valables : %3d  signées : %3d\n"
 "     confiance : %d i., %d n.d., %d j., %d m., %d t., %d u.\n"
 
-#: g10/trustdb.c:2279
+#: g10/trustdb.c:2280
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
 "impossible de mettre à jour l'enregistrement de version de la\n"
 "base de confiance : échec d'écriture : %s\n"
 
-#: g10/trust.c:125
+#: g10/trust.c:114
 msgid "undefined"
 msgstr "indéfinie"
 
-#: g10/trust.c:126
+#: g10/trust.c:115
 msgid "never"
 msgstr "jamais"
 
-#: g10/trust.c:127
+#: g10/trust.c:116
 msgid "marginal"
 msgstr "marginale"
 
-#: g10/trust.c:128
+#: g10/trust.c:117
 msgid "full"
 msgstr "totale"
 
-#: g10/trust.c:129
+#: g10/trust.c:118
 msgid "ultimate"
 msgstr "ultime"
 
@@ -8324,41 +8339,41 @@ msgstr "ultime"
 #. It gets passed to atoi() so everything after the number is
 #. essentially a comment and need not be translated.  Either key and
 #. uid are both NULL, or neither are NULL.
-#: g10/trust.c:166
+#: g10/trust.c:155
 msgid "10 translator see trust.c:uid_trust_string_fixed"
 msgstr "11 le traducteur a bien lu ce qu'il fallait :)"
 
-#: g10/trust.c:169
+#: g10/trust.c:158
 msgid "[ revoked]"
 msgstr "[ révoquée]"
 
-#: g10/trust.c:171 g10/trust.c:177
+#: g10/trust.c:160 g10/trust.c:166
 msgid "[ expired]"
 msgstr "[ expirée ]"
 
-#: g10/trust.c:176
+#: g10/trust.c:165
 msgid "[ unknown]"
 msgstr "[ inconnue]"
 
-#: g10/trust.c:178
+#: g10/trust.c:167
 msgid "[  undef ]"
 msgstr "[indéfinie]"
 
-#: g10/trust.c:179
+#: g10/trust.c:168
 #, fuzzy
 #| msgid "never"
 msgid "[  never ]"
 msgstr "jamais"
 
-#: g10/trust.c:180
+#: g10/trust.c:169
 msgid "[marginal]"
 msgstr "[marginale]"
 
-#: g10/trust.c:181
+#: g10/trust.c:170
 msgid "[  full  ]"
 msgstr "[  totale ]"
 
-#: g10/trust.c:182
+#: g10/trust.c:171
 msgid "[ultimate]"
 msgstr "[  ultime ]"
 
@@ -8420,16 +8435,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:4937 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2386
+#: scd/app-piv.c:1770 scd/app-p15.c:5035 scd/app-nks.c:1530
+#: scd/app-openpgp.c:2387
 #, 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:4956 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2402
+#: scd/app-piv.c:1787 scd/app-p15.c:5054 scd/app-nks.c:1549
+#: scd/app-openpgp.c:2403
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
@@ -8472,10 +8487,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:2669
-#: scd/app-openpgp.c:2693 scd/app-openpgp.c:2871 scd/app-openpgp.c:2893
-#: scd/app-openpgp.c:3074 scd/app-openpgp.c:3361 scd/app-openpgp.c:3408
-#: scd/app-openpgp.c:3545 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2670
+#: scd/app-openpgp.c:2694 scd/app-openpgp.c:2872 scd/app-openpgp.c:2894
+#: scd/app-openpgp.c:3075 scd/app-openpgp.c:3362 scd/app-openpgp.c:3409
+#: scd/app-openpgp.c:3547 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"
@@ -8501,58 +8516,58 @@ msgstr ""
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr ""
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3616
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3618
 #, c-format
 msgid "key already exists\n"
 msgstr "la clef existe déjà\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3620
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3622
 #, 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:3622
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3624
 #, 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:3624
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3626
 #, c-format
 msgid "writing new key\n"
 msgstr "écriture d'une nouvelle clef\n"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4484 scd/app-openpgp.c:4767
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4486 scd/app-openpgp.c:4761
 #, 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:1615
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1616
 #, 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:1622
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1623
 #, 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:1732
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1733
 #, 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:4943
+#: scd/app-piv.c:3279 scd/app-openpgp.c:4937
 #, 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:4951
+#: scd/app-piv.c:3294 scd/app-openpgp.c:4945
 #, 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:4957
+#: scd/app-piv.c:3300 scd/app-openpgp.c:4951
 #, fuzzy, c-format
 #| msgid "key generation completed (%d seconds)\n"
 msgid "key generation completed (%d second)\n"
@@ -8560,12 +8575,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:1842 scd/app-openpgp.c:4966
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1843 scd/app-openpgp.c:4960
 #, 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:5035 scd/app-nks.c:2038
+#: scd/app-p15.c:5133 scd/app-nks.c:2038
 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 "
@@ -8573,26 +8588,26 @@ 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:5038 scd/app-openpgp.c:2818
+#: scd/app-p15.c:5136 scd/app-openpgp.c:2819
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Veuillez entrer le code personnel d'administration"
 
-#: scd/app-p15.c:5040 scd/app-nks.c:2028
+#: scd/app-p15.c:5138 scd/app-nks.c:2028
 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:5043 scd/app-nks.c:2019
+#: scd/app-p15.c:5141 scd/app-nks.c:2019
 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:4321
+#: scd/app-nks.c:1468 scd/app-openpgp.c:4323
 #, 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:4333
+#: scd/app-nks.c:1476 scd/app-openpgp.c:4335
 #, 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"
@@ -8640,27 +8655,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:3442 scd/app-dinsig.c:534
+#: scd/app-nks.c:2221 scd/app-openpgp.c:3443 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:943
+#: scd/app-openpgp.c:944
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "impossible de stocker l'empreinte : %s\n"
 
-#: scd/app-openpgp.c:956
+#: scd/app-openpgp.c:957
 #, 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:1427 scd/app-openpgp.c:3389 scd/app-openpgp.c:5715
+#: scd/app-openpgp.c:1428 scd/app-openpgp.c:3390 scd/app-openpgp.c:5709
 #, 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:1949
+#: scd/app-openpgp.c:1950
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "échec de lecture de clef publique : %s\n"
@@ -8668,48 +8683,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:2373
+#: scd/app-openpgp.c:2374
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2621
+#: scd/app-openpgp.c:2622
 #, 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:2628
+#: scd/app-openpgp.c:2629
 #, 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:2641
+#: scd/app-openpgp.c:2642
 #, fuzzy
 #| msgid "||Please enter the PIN"
 msgid "||Please unlock the card"
 msgstr "||Veuillez entrer le code personnel"
 
-#: scd/app-openpgp.c:2700 scd/app-openpgp.c:2900 scd/app-openpgp.c:3368
+#: scd/app-openpgp.c:2701 scd/app-openpgp.c:2901 scd/app-openpgp.c:3369
 #, 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:2717 scd/app-openpgp.c:2760 scd/app-openpgp.c:2917
-#: scd/app-openpgp.c:5325
+#: scd/app-openpgp.c:2718 scd/app-openpgp.c:2761 scd/app-openpgp.c:2918
+#: scd/app-openpgp.c:5319
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "échec de vérification CHV%d : %s\n"
 
-#: scd/app-openpgp.c:2804 scd/app-openpgp.c:5724
+#: scd/app-openpgp.c:2805 scd/app-openpgp.c:5718
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "la carte est irrémédiablement bloquée.\n"
 
-#: scd/app-openpgp.c:2808
+#: scd/app-openpgp.c:2809
 #, 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"
@@ -8722,20 +8737,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:2841
+#: scd/app-openpgp.c:2842
 #, 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:3355
+#: scd/app-openpgp.c:3356
 msgid "||Please enter the PIN"
 msgstr "||Veuillez entrer le code personnel"
 
-#: scd/app-openpgp.c:3404
+#: scd/app-openpgp.c:3405
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Veuillez entrer le code de réinitialisation pour la carte"
 
-#: scd/app-openpgp.c:3414 scd/app-openpgp.c:3481
+#: scd/app-openpgp.c:3415 scd/app-openpgp.c:3484
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
@@ -8745,77 +8760,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:3437
+#: scd/app-openpgp.c:3438
 msgid "|RN|New Reset Code"
 msgstr "|RN|Nouveau code de réinitialisation"
 
-#: scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3439
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Nouveau code personnel d'administration"
 
-#: scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3439
 msgid "|N|New PIN"
 msgstr "|N|Nouveau code personnel"
 
-#: scd/app-openpgp.c:3541
+#: scd/app-openpgp.c:3543
 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:3542
+#: scd/app-openpgp.c:3544
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Veuillez entrer le code personnel et le nouveau code personnel"
 
-#: scd/app-openpgp.c:3600 scd/app-openpgp.c:5026
+#: scd/app-openpgp.c:3602 scd/app-openpgp.c:5020
 #, c-format
 msgid "error reading application data\n"
 msgstr "erreur de lecture des données d'application\n"
 
-#: scd/app-openpgp.c:3606 scd/app-openpgp.c:5033
+#: scd/app-openpgp.c:3608 scd/app-openpgp.c:5027
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "erreur de lecture de l'empreinte DO\n"
 
-#: scd/app-openpgp.c:4302 scd/app-openpgp.c:4657
+#: scd/app-openpgp.c:4304 scd/app-openpgp.c:4653
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "la date de création est manquant\n"
 
-#: scd/app-openpgp.c:4343 scd/app-openpgp.c:4351
+#: scd/app-openpgp.c:4345 scd/app-openpgp.c:4353
 #, 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:4651
+#: scd/app-openpgp.c:4647
 #, fuzzy, c-format
 #| msgid "unsupported URI"
 msgid "unsupported curve\n"
 msgstr "URI non pris en charge"
 
-#: scd/app-openpgp.c:4991
+#: scd/app-openpgp.c:4985
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "structure de carte OpenPGP incorrecte (DO 0x93)\n"
 
-#: scd/app-openpgp.c:5041
+#: scd/app-openpgp.c:5035
 #, 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:5240
+#: scd/app-openpgp.c:5234
 #, 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:5298
+#: scd/app-openpgp.c:5292
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "signatures créées jusqu'à présent : %lu\n"
 
-#: scd/app-openpgp.c:5729
+#: scd/app-openpgp.c:5723
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
@@ -8823,7 +8838,7 @@ msgstr ""
 "la vérification du code personnel d'administration est actuellement\n"
 "interdite avec cette commande\n"
 
-#: scd/app-openpgp.c:6241 scd/app-openpgp.c:6252
+#: scd/app-openpgp.c:6250 scd/app-openpgp.c:6261
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr ""
@@ -8845,7 +8860,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:274 dirmngr/dirmngr.c:198
+#: scd/scdaemon.c:136 sm/gpgsm.c:274 dirmngr/dirmngr.c:199
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|NIVEAU|définir le niveau de débogage à NIVEAU"
 
@@ -8908,12 +8923,12 @@ msgstr ""
 "veuillez utiliser l'option « --daemon » pour exécuter le programme\n"
 "en arrière-plan\n"
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2104
+#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2143
 #, 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:2112
+#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2151
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "gestionnaire pour le descripteur %d terminé\n"
@@ -8923,11 +8938,11 @@ msgstr "gestionnaire pour le descripteur %d terminé\n"
 msgid "validation model requested by certificate: %s"
 msgstr "modèle de validation demandé par le certificat : %s"
 
-#: sm/certchain.c:199 sm/certchain.c:2172
+#: sm/certchain.c:199 sm/certchain.c:2174
 msgid "chain"
 msgstr "chaîne"
 
-#: sm/certchain.c:200 sm/certchain.c:2172
+#: sm/certchain.c:200 sm/certchain.c:2174
 msgid "shell"
 msgstr "invite"
 
@@ -8961,231 +8976,231 @@ msgstr "Remarque : politique de certificat non critique non autorisée"
 msgid "certificate policy not allowed"
 msgstr "politique de certificat non autorisée"
 
-#: sm/certchain.c:595 sm/keydb.c:1891 sm/keydb.c:1980
+#: sm/certchain.c:596 sm/keydb.c:1913 sm/keydb.c:2002
 #, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "impossible d'obtenir l'empreinte\n"
 
-#: sm/certchain.c:624
+#: sm/certchain.c:625
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr "recherche d'émetteur à l'extérieur\n"
 
-#: sm/certchain.c:644
+#: sm/certchain.c:645
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "nombre d'émetteurs correspondants : %d\n"
 
-#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#: sm/certchain.c:724 dirmngr/ocsp.c:683
 #, c-format
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "impossible d'obtenir authorityInfoAccess : %s\n"
 
-#: sm/certchain.c:791
+#: sm/certchain.c:792
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr "recherche d'émetteur dans le cache du Dirmngr\n"
 
-#: sm/certchain.c:816
+#: sm/certchain.c:817
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "nombre de certificats correspondants : %d\n"
 
-#: sm/certchain.c:819
+#: sm/certchain.c:820
 #, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "échec de recherche de clef seulement dans le cache du dirmngr : %s\n"
 
-#: sm/certchain.c:1046 sm/certchain.c:1561 sm/certchain.c:2200 sm/decrypt.c:643
-#: sm/encrypt.c:620 sm/import.c:414 sm/keydb.c:1898 sm/keydb.c:1987
-#: sm/sign.c:428 sm/verify.c:117
+#: sm/certchain.c:1047 sm/certchain.c:1562 sm/certchain.c:2202
+#: sm/decrypt.c:1084 sm/encrypt.c:621 sm/import.c:414 sm/keydb.c:1920
+#: sm/keydb.c:2009 sm/sign.c:428 sm/verify.c:117
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "impossible d'allouer la gestion de base de clefs\n"
 
-#: sm/certchain.c:1232
+#: sm/certchain.c:1233
 msgid "certificate has been revoked"
 msgstr "le certificat a été révoquée"
 
-#: sm/certchain.c:1247
+#: sm/certchain.c:1248
 msgid "the status of the certificate is unknown"
 msgstr "l'état du certificat est inconnu"
 
-#: sm/certchain.c:1254
+#: sm/certchain.c:1255
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr "veuillez vous assurer que le « dirmngr » est correctement installé\n"
 
-#: sm/certchain.c:1260
+#: sm/certchain.c:1261
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "échec de vérification de la liste de révocations de certificat : %s"
 
-#: sm/certchain.c:1289 sm/certchain.c:1357 dirmngr/validate.c:497
+#: sm/certchain.c:1290 sm/certchain.c:1358 dirmngr/validate.c:497
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "certificat avec validité incorrecte : %s"
 
-#: sm/certchain.c:1304 sm/certchain.c:1389 dirmngr/validate.c:515
+#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:515
 #, c-format
 msgid "certificate not yet valid"
 msgstr "certificat pas encore valable"
 
-#: sm/certchain.c:1305 sm/certchain.c:1390
+#: sm/certchain.c:1306 sm/certchain.c:1391
 msgid "root certificate not yet valid"
 msgstr "certificat racine pas encore valable"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1307 sm/certchain.c:1392
 msgid "intermediate certificate not yet valid"
 msgstr "certificat intermédiaire pas encore valable"
 
-#: sm/certchain.c:1319 dirmngr/validate.c:526
+#: sm/certchain.c:1320 dirmngr/validate.c:526
 #, c-format
 msgid "certificate has expired"
 msgstr "le certificat a expiré"
 
-#: sm/certchain.c:1320
+#: sm/certchain.c:1321
 msgid "root certificate has expired"
 msgstr "le certificat racine a expiré"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1322
 msgid "intermediate certificate has expired"
 msgstr "le certificat intermédiaire a expiré"
 
-#: sm/certchain.c:1363
+#: sm/certchain.c:1364
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr "des attributs nécessaires du certificat sont manquants : %s%s%s"
 
-#: sm/certchain.c:1372
+#: sm/certchain.c:1373
 msgid "certificate with invalid validity"
 msgstr "certificat avec validité incorrecte"
 
-#: sm/certchain.c:1409
+#: sm/certchain.c:1410
 msgid "signature not created during lifetime of certificate"
 msgstr "signature non créée pendant la durée de vie du certificat"
 
-#: sm/certchain.c:1411
+#: sm/certchain.c:1412
 msgid "certificate not created during lifetime of issuer"
 msgstr "certificat non créé pendant la durée de vie de l'émetteur"
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1413
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
 "certificat intermédiaire non créé pendant la durée de vie de l'émetteur"
 
-#: sm/certchain.c:1416
+#: sm/certchain.c:1417
 #, c-format
 msgid "  (  signature created at "
 msgstr "  (       signature créée le "
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1418
 #, c-format
 msgid "  (certificate created at "
 msgstr "  (       certificat créé le "
 
-#: sm/certchain.c:1420
+#: sm/certchain.c:1421
 #, c-format
 msgid "  (certificate valid from "
 msgstr "  (certificat valable depuis "
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1422
 #, c-format
 msgid "  (     issuer valid from "
 msgstr "  (  émetteur valable depuis "
 
-#: sm/certchain.c:1451 dirmngr/validate.c:577
+#: sm/certchain.c:1452 dirmngr/validate.c:577
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "empreinte=%s\n"
 
-#: sm/certchain.c:1460
+#: sm/certchain.c:1461
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr "le certificat racine a maintenant été marqué de confiance\n"
 
-#: sm/certchain.c:1473
+#: sm/certchain.c:1474
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr "marquage de confiance interactif non activé dans gpg-agent\n"
 
-#: sm/certchain.c:1479
+#: sm/certchain.c:1480
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr "marquage de confiance interactif désactivé pour cette session\n"
 
-#: sm/certchain.c:1538
+#: sm/certchain.c:1539
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 "Attention : date de création de la signature inconnue — date supposée "
 "actuelle"
 
-#: sm/certchain.c:1602
+#: sm/certchain.c:1603
 msgid "no issuer found in certificate"
 msgstr "aucun émetteur trouvé dans le certificat"
 
-#: sm/certchain.c:1680
+#: sm/certchain.c:1681
 msgid "self-signed certificate has a BAD signature"
 msgstr "certificat autosigné avec une mauvaise signature"
 
-#: sm/certchain.c:1749 dirmngr/validate.c:575
+#: sm/certchain.c:1750 dirmngr/validate.c:575
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "le certificat racine n'est pas marqué de confiance"
 
-#: sm/certchain.c:1765
+#: sm/certchain.c:1766
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "échec de vérification de la liste de confiance : %s\n"
 
-#: sm/certchain.c:1796 sm/import.c:175 dirmngr/validate.c:630
+#: sm/certchain.c:1797 sm/import.c:175 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "chaîne de certificats trop longue\n"
 
-#: sm/certchain.c:1808 dirmngr/validate.c:642
+#: sm/certchain.c:1809 dirmngr/validate.c:642
 #, c-format
 msgid "issuer certificate not found"
 msgstr "certificat d'émetteur introuvable"
 
-#: sm/certchain.c:1842 dirmngr/validate.c:668
+#: sm/certchain.c:1844 dirmngr/validate.c:668
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr "certificat avec une mauvaise signature"
 
-#: sm/certchain.c:1874 dirmngr/validate.c:692
+#: sm/certchain.c:1876 dirmngr/validate.c:692
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 "un autre certificat d'autorité de certification pouvant correspondre a été "
 "trouvé — nouvel essai"
 
-#: sm/certchain.c:1933 dirmngr/validate.c:717
+#: sm/certchain.c:1935 dirmngr/validate.c:717
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 "chaîne de certificats plus longue que celle autorisée par l'autorité de "
 "certification (%d)"
 
-#: sm/certchain.c:1975 sm/certchain.c:2275 dirmngr/validate.c:747
+#: sm/certchain.c:1977 sm/certchain.c:2278 dirmngr/validate.c:747
 #, c-format
 msgid "certificate is good\n"
 msgstr "le certificat est correct\n"
 
-#: sm/certchain.c:1976
+#: sm/certchain.c:1978
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "le certificat intermédiaire est correct\n"
 
-#: sm/certchain.c:1977
+#: sm/certchain.c:1979
 #, c-format
 msgid "root certificate is good\n"
 msgstr "le certificat racine est correct\n"
 
-#: sm/certchain.c:2159
+#: sm/certchain.c:2161
 msgid "switching to chain model"
 msgstr "basculement en modèle chaîne"
 
-#: sm/certchain.c:2168
+#: sm/certchain.c:2170
 #, c-format
 msgid "validation model used: %s"
 msgstr "modèle de validation utilisé : %s"
@@ -9197,18 +9212,18 @@ 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:1372 dirmngr/validate.c:903
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1411 dirmngr/validate.c:903
 #: dirmngr/validate.c:927
 #, c-format
 msgid "out of core\n"
 msgstr "hors limite\n"
 
-#: sm/certcheck.c:389 sm/verify.c:212
+#: sm/certcheck.c:388 sm/verify.c:212
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(c'est l'algorithme MD2)\n"
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:793
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:794
 msgid "none"
 msgstr "aucun"
 
@@ -9505,17 +9520,17 @@ msgstr ""
 msgid "resource problem: out of core\n"
 msgstr "problème de ressources : hors limite\n"
 
-#: sm/decrypt.c:719
+#: sm/decrypt.c:1159
 #, c-format
 msgid "(this is the RC2 algorithm)\n"
 msgstr "(c'est l'algorithme RC2)\n"
 
-#: sm/decrypt.c:721
+#: sm/decrypt.c:1161
 #, c-format
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr "(ça ne ressemble pas à un message chiffré)\n"
 
-#: sm/decrypt.c:868
+#: sm/decrypt.c:1318
 #, fuzzy, c-format
 #| msgid "encrypted with %s key, ID %s\n"
 msgid "encrypted to %s key %s\n"
@@ -9526,7 +9541,7 @@ msgstr "chiffré avec une clef %s, identifiant %s\n"
 msgid "certificate '%s' not found: %s\n"
 msgstr "certificat « %s » introuvable : %s\n"
 
-#: sm/delete.c:120 sm/keydb.c:1999 sm/keydb.c:2098
+#: sm/delete.c:120 sm/keydb.c:2021 sm/keydb.c:2120
 #, c-format
 msgid "error locking keybox: %s\n"
 msgstr "erreur de verrouillage du trousseau local : %s\n"
@@ -9546,7 +9561,7 @@ msgstr "certificat « %s » supprimé\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "échec de suppression du certificat « %s » : %s\n"
 
-#: sm/encrypt.c:606
+#: sm/encrypt.c:607
 #, c-format
 msgid "no valid recipients given\n"
 msgstr "aucune destinataire valable donnée\n"
@@ -9615,63 +9630,63 @@ msgstr "|IDENTITÉ| utiliser IDENTITÉ comme clef secr. par défaut"
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|FICHIER|ajouter le trousseau à la liste de trousseaux"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:352 dirmngr/dirmngr.c:265
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|SPEC|utiliser ce serveur pour rechercher les clefs"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:363
 msgid "fetch missing issuer certificates"
 msgstr "récupérer certificats d'émetteur manquants"
 
-#: sm/gpgsm.c:364
+#: sm/gpgsm.c:365
 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:385
+#: sm/gpgsm.c:386
 msgid "never consult a CRL"
 msgstr "ne pas consulter liste de révocations de cert."
 
-#: sm/gpgsm.c:389
+#: sm/gpgsm.c:390
 msgid "do not check CRLs for root certificates"
 msgstr "ne pas vérifier les listes de révocations de certificat racine"
 
-#: sm/gpgsm.c:393
+#: sm/gpgsm.c:394
 msgid "check validity using OCSP"
 msgstr "vérifier la validité avec OCSP"
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:396
 msgid "do not check certificate policies"
 msgstr "ne pas vérifier les politiques de certificat"
 
-#: sm/gpgsm.c:398
+#: sm/gpgsm.c:399
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOM|utiliser l'algorithme de chiffrement NOM"
 
-#: sm/gpgsm.c:400
+#: sm/gpgsm.c:401
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOM|utiliser l'algorithme de hachage NOM"
 
-#: sm/gpgsm.c:410
+#: sm/gpgsm.c:411
 msgid "batch mode: never ask"
 msgstr "mode automatique : aucune question"
 
-#: sm/gpgsm.c:412
+#: sm/gpgsm.c:413
 msgid "assume yes on most questions"
 msgstr "oui comme réponse à la plupart des questions"
 
-#: sm/gpgsm.c:413
+#: sm/gpgsm.c:414
 msgid "assume no on most questions"
 msgstr "non comme réponse à la plupart des questions"
 
-#: sm/gpgsm.c:430
+#: sm/gpgsm.c:431
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FICHIER|écrire un journal d'audit dans le FICHIER"
 
-#: sm/gpgsm.c:615
+#: sm/gpgsm.c:616
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Utilisation : @GPGSM@ [options] [fichiers] (-h pour l'aide)"
 
-#: sm/gpgsm.c:618
+#: sm/gpgsm.c:619
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -9681,52 +9696,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:826
+#: sm/gpgsm.c:827
 #, 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:837
+#: sm/gpgsm.c:838
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "modèle de validation « %s » inconnu\n"
 
-#: sm/gpgsm.c:896 dirmngr/ldapserver.c:89
-#, c-format
-msgid "%s:%u: no hostname given\n"
-msgstr "%s : %u : aucun nom d'hôte donné\n"
-
-#: sm/gpgsm.c:915 dirmngr/ldapserver.c:108
-#, c-format
-msgid "%s:%u: password given without user\n"
-msgstr "%s : %u : mot de passe donné sans utilisateur\n"
-
-#: sm/gpgsm.c:946 dirmngr/ldapserver.c:139
-#, c-format
-msgid "%s:%u: ignoring unknown flag '%s'\n"
-msgstr ""
-
-#: sm/gpgsm.c:962 dirmngr/ldapserver.c:155
-#, c-format
-msgid "%s:%u: skipping this line\n"
-msgstr "%s : %u : ignorer cette ligne\n"
-
-#: sm/gpgsm.c:1550
-#, c-format
-msgid "could not parse keyserver\n"
-msgstr "impossible d'analyser le serveur de clefs\n"
-
-#: sm/gpgsm.c:1858
+#: sm/gpgsm.c:1711
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "importation des certificats commun « %s »\n"
 
-#: sm/gpgsm.c:1904
+#: sm/gpgsm.c:1757
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "impossible de signer en utilisant « %s » : %s\n"
 
-#: sm/gpgsm.c:2273
+#: sm/gpgsm.c:2129
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "commande incorrecte (il n'y a pas de commande implicite)\n"
@@ -9746,55 +9736,55 @@ msgstr "erreur de stockage du certificat\n"
 msgid "basic certificate checks failed - not imported\n"
 msgstr "échec des vérifications de base du certificat — non importé\n"
 
-#: sm/import.c:471 sm/keydb.c:2018 sm/keydb.c:2111
+#: sm/import.c:472 sm/keydb.c:2040 sm/keydb.c:2133
 #, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "erreur de lecture des options stockées : %s\n"
 
-#: sm/import.c:530 sm/import.c:562
+#: sm/import.c:531 sm/import.c:563
 #, c-format
 msgid "error importing certificate: %s\n"
 msgstr "erreur d'importation du certificat : %s\n"
 
-#: sm/import.c:751 tools/gpg-connect-agent.c:1475
+#: sm/import.c:752 tools/gpg-connect-agent.c:1475
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "erreur de lecture de l'entrée : %s\n"
 
-#: sm/keydb.c:503
+#: sm/keydb.c:508
 #, fuzzy, c-format
 #| msgid "no gpg-agent running in this session\n"
 msgid "no keyboxd running in this session\n"
 msgstr ""
 "aucune instance de gpg-agent n'est en cours d'exécution dans cette session\n"
 
-#: sm/keydb.c:595
+#: sm/keydb.c:600
 #, fuzzy, c-format
 #| msgid "error opening '%s': %s\n"
 msgid "error opening key DB: %s\n"
 msgstr "erreur d'ouverture de « %s » : %s\n"
 
-#: sm/keydb.c:1936
+#: sm/keydb.c:1958
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr "problème de recherche de certificat existant : %s\n"
 
-#: sm/keydb.c:1948
+#: sm/keydb.c:1970
 #, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "impossible de trouver une base de clefs inscriptible : %s\n"
 
-#: sm/keydb.c:1956
+#: sm/keydb.c:1978
 #, c-format
 msgid "error storing certificate: %s\n"
 msgstr "erreur de stockage du certificat : %s\n"
 
-#: sm/keydb.c:2009
+#: sm/keydb.c:2031
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "problème de nouvelle recherche de certificat : %s\n"
 
-#: sm/keydb.c:2030 sm/keydb.c:2122
+#: sm/keydb.c:2052 sm/keydb.c:2144
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr "erreur de stockage des options : %s\n"
@@ -9986,58 +9976,58 @@ msgstr "    sujet ="
 msgid "error loading certificate '%s': %s\n"
 msgstr "erreur de chargement du certificat « %s » : %s\n"
 
-#: dirmngr/certcache.c:819
+#: dirmngr/certcache.c:820
 #, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "certificats chargés de façon permanente : %u\n"
 
-#: dirmngr/certcache.c:821
+#: dirmngr/certcache.c:822
 #, c-format
 msgid "    runtime cached certificates: %u\n"
 msgstr "      certificats actuellement en cache : %u\n"
 
-#: dirmngr/certcache.c:823
+#: dirmngr/certcache.c:824
 #, fuzzy, c-format
 #| msgid "    runtime cached certificates: %u\n"
 msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "      certificats actuellement en cache : %u\n"
 
-#: dirmngr/certcache.c:851 dirmngr/dirmngr-client.c:392
+#: dirmngr/certcache.c:852 dirmngr/dirmngr-client.c:392
 #, c-format
 msgid "certificate already cached\n"
 msgstr "certificat déjà en cache\n"
 
-#: dirmngr/certcache.c:853
+#: dirmngr/certcache.c:854
 #, c-format
 msgid "certificate cached\n"
 msgstr "certificat en cache\n"
 
-#: dirmngr/certcache.c:855 dirmngr/certcache.c:875 dirmngr/dirmngr-client.c:396
+#: dirmngr/certcache.c:856 dirmngr/certcache.c:876 dirmngr/dirmngr-client.c:396
 #, c-format
 msgid "error caching certificate: %s\n"
 msgstr "erreur de mise en cache du certificat : %s\n"
 
-#: dirmngr/certcache.c:938
+#: dirmngr/certcache.c:939
 #, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "chaîne « %s » d'empreinte SHA1 incorrecte\n"
 
-#: dirmngr/certcache.c:1384 dirmngr/certcache.c:1393
+#: dirmngr/certcache.c:1385 dirmngr/certcache.c:1394
 #, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "erreur de récupération du certificat par numéro de série : %s\n"
 
-#: dirmngr/certcache.c:1579 dirmngr/certcache.c:1588
+#: dirmngr/certcache.c:1580 dirmngr/certcache.c:1589
 #, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "erreur de récupération du certificat par sujet : %s\n"
 
-#: dirmngr/certcache.c:1694 dirmngr/validate.c:483
+#: dirmngr/certcache.c:1695 dirmngr/validate.c:483
 #, c-format
 msgid "no issuer found in certificate\n"
 msgstr "aucun émetteur trouvé dans le certificat\n"
 
-#: dirmngr/certcache.c:1704
+#: dirmngr/certcache.c:1705
 #, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "erreur de lecture d'authorityKeyIdentifier : %s\n"
@@ -10072,7 +10062,7 @@ msgstr "suppression du fichier de cache « %s »\n"
 msgid "not removing file '%s'\n"
 msgstr "pas de suppression du fichier « %s »\n"
 
-#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2380
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2383
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr "erreur de fermeture du fichier de cache : %s\n"
@@ -10321,13 +10311,13 @@ msgid "error getting data from cache file: %s\n"
 msgstr "erreur de lecture des données du fichier de cache : %s\n"
 
 #: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1672 dirmngr/crlcache.c:1697
-#: dirmngr/crlcache.c:1763
+#: dirmngr/crlcache.c:1766
 #, c-format
 msgid "got an invalid S-expression from libksba\n"
 msgstr "expression symbolique incorrecte obtenue de libksba\n"
 
 #: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1679 dirmngr/crlcache.c:1705
-#: dirmngr/crlcache.c:1770 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1773 dirmngr/misc.c:176
 #, c-format
 msgid "converting S-expression failed: %s\n"
 msgstr "échec de conversion d'expression symbolique : %s\n"
@@ -10342,151 +10332,151 @@ msgstr "algorithme de hachage « %s » inconnu\n"
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr "échec de gcry_md_open pour l'algorithme %d : %s\n"
 
-#: dirmngr/crlcache.c:1797 dirmngr/ocsp.c:478
+#: dirmngr/crlcache.c:1800 dirmngr/ocsp.c:478
 #, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "échec de création d'expression symbolique : %s\n"
 
-#: dirmngr/crlcache.c:1871
+#: dirmngr/crlcache.c:1874
 #, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "échec de ksba_crl_parse : %s\n"
 
-#: dirmngr/crlcache.c:1886
+#: dirmngr/crlcache.c:1889
 #, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr ""
 "erreur de lecture des dates de mises à jour de la liste de révocations de "
 "certificat : %s\n"
 
-#: dirmngr/crlcache.c:1893
+#: dirmngr/crlcache.c:1896
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 "dates de mises à jour de la liste de révocations de certificat : celle-ci=%s "
 "prochaine=%s\n"
 
-#: dirmngr/crlcache.c:1897
+#: dirmngr/crlcache.c:1900
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr "nextUpdate non donné ; période de validité supposée d'un jour\n"
 
-#: dirmngr/crlcache.c:1917
+#: dirmngr/crlcache.c:1920
 #, c-format
 msgid "error getting CRL item: %s\n"
 msgstr ""
 "erreur de lecture de l'élément de liste de révocations de certificat : %s\n"
 
-#: dirmngr/crlcache.c:1932
+#: dirmngr/crlcache.c:1935
 #, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "erreur d'insertion d'élément dans le fichier cache temporaire : %s\n"
 
-#: dirmngr/crlcache.c:1959
+#: dirmngr/crlcache.c:1962
 #, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr ""
 "aucun émetteur de liste de révocations de certificat trouvé dans la liste : "
 "%s\n"
 
-#: dirmngr/crlcache.c:1974
+#: dirmngr/crlcache.c:1977
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 "localisation du certificat d'émetteur de liste de révocations par "
 "authorityKeyIdentifier\n"
 
-#: dirmngr/crlcache.c:2020
+#: dirmngr/crlcache.c:2023
 #, c-format
 msgid "CRL signature verification failed: %s\n"
 msgstr ""
 "échec de vérification de signature de liste de révocations de certificat : "
 "%s\n"
 
-#: dirmngr/crlcache.c:2032
+#: dirmngr/crlcache.c:2035
 #, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr ""
 "erreur de vérification de la validité du certificat d'émetteur de liste de "
 "révocations : %s\n"
 
-#: dirmngr/crlcache.c:2174
+#: dirmngr/crlcache.c:2177
 #, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "échec de ksba_crl_new : %s\n"
 
-#: dirmngr/crlcache.c:2181
+#: dirmngr/crlcache.c:2184
 #, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "échec de ksba_crl_set_reader : %s\n"
 
-#: dirmngr/crlcache.c:2215
+#: dirmngr/crlcache.c:2218
 #, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "vieux fichier de cache temporaire « %s » supprimé\n"
 
-#: dirmngr/crlcache.c:2219
+#: dirmngr/crlcache.c:2222
 #, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr ""
 "problème de suppression du vieux fichier de cache temporaire « %s » : %s\n"
 
-#: dirmngr/crlcache.c:2229
+#: dirmngr/crlcache.c:2232
 #, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "erreur de création du fichier de cache temporaire « %s » : %s\n"
 
-#: dirmngr/crlcache.c:2239
+#: dirmngr/crlcache.c:2242
 #, c-format
 msgid "crl_parse_insert failed: %s\n"
 msgstr "échec de crl_parse_insert : %s\n"
 
-#: dirmngr/crlcache.c:2249
+#: dirmngr/crlcache.c:2252
 #, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "erreur de finalisation du fichier de cache temporaire « %s » : %s\n"
 
-#: dirmngr/crlcache.c:2256
+#: dirmngr/crlcache.c:2259
 #, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "erreur de fermeture du fichier de cache temporaire « %s » : %s\n"
 
-#: dirmngr/crlcache.c:2281
+#: dirmngr/crlcache.c:2284
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 "Attention : la nouvelle liste de révocations de certificat est trop "
 "ancienne ; elle a expiré le %s — chargement quand même\n"
 
-#: dirmngr/crlcache.c:2285
+#: dirmngr/crlcache.c:2288
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 "la nouvelle liste de révocations de certificat est trop ancienne ; elle a "
 "expiré le %s\n"
 
-#: dirmngr/crlcache.c:2301
+#: dirmngr/crlcache.c:2304
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr "extension %s de liste de révocations de certificat critique inconnue\n"
 
-#: dirmngr/crlcache.c:2311
+#: dirmngr/crlcache.c:2314
 #, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr ""
 "erreur de lecture des extensions de liste de révocations de certificat : %s\n"
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2365
 #, c-format
 msgid "creating cache file '%s'\n"
 msgstr "création du fichier de cache « %s »\n"
 
-#: dirmngr/crlcache.c:2394
+#: dirmngr/crlcache.c:2397
 #, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "problème en renommant « %s » en « %s » : %s\n"
 
-#: dirmngr/crlcache.c:2408
+#: dirmngr/crlcache.c:2411
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
@@ -10495,14 +10485,14 @@ msgstr ""
 "échec de mise à jour du fichier DIR — l'entrée de cache sera perdue avec le "
 "prochain démarrage du programme\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2448
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 "Démarrage du vidage de liste de révocations de certificat (récupérée par "
 "%s)\n"
 
-#: dirmngr/crlcache.c:2468
+#: dirmngr/crlcache.c:2471
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
@@ -10510,59 +10500,59 @@ msgstr ""
 " Erreur : la liste de révocations de certificat ne sera pas utilisée car "
 "elle était encore trop ancienne après une mise à jour.\n"
 
-#: dirmngr/crlcache.c:2471
+#: dirmngr/crlcache.c:2474
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 " Erreur : la liste de révocations de certificat ne sera pas utilisée à cause "
 "d'une extension critique inconnue.\n"
 
-#: dirmngr/crlcache.c:2474
+#: dirmngr/crlcache.c:2477
 msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 " Erreur : la liste de révocations de certificat ne sera pas utilisée.\n"
 
-#: dirmngr/crlcache.c:2481
+#: dirmngr/crlcache.c:2484
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 " Erreur : cette liste de révocations de certificat en cache a pu être "
 "modifiée.\n"
 
-#: dirmngr/crlcache.c:2499
+#: dirmngr/crlcache.c:2502
 #, c-format
 msgid " WARNING: invalid cache record length\n"
 msgstr " Attention : taille d'enregistrement de cache incorrecte\n"
 
-#: dirmngr/crlcache.c:2506
+#: dirmngr/crlcache.c:2509
 #, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "problème de lecture d'enregistrement de cache : %s\n"
 
-#: dirmngr/crlcache.c:2517
+#: dirmngr/crlcache.c:2520
 #, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "problème de lecture d'enregistrement de clef : %s\n"
 
-#: dirmngr/crlcache.c:2548
+#: dirmngr/crlcache.c:2551
 #, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "erreur de lecture de l'entrée de cache dans la base de données : %s\n"
 
-#: dirmngr/crlcache.c:2551
+#: dirmngr/crlcache.c:2554
 msgid "End CRL dump\n"
 msgstr "Fin du vidage de liste de révocations de certificat\n"
 
-#: dirmngr/crlcache.c:2672
+#: dirmngr/crlcache.c:2675
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "échec de crl_fetch par points de distribution : %s\n"
 
-#: dirmngr/crlcache.c:2683
+#: dirmngr/crlcache.c:2686
 #, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "échec de crl_cache_insert par points de distribution : %s\n"
 
-#: dirmngr/crlcache.c:2743
+#: dirmngr/crlcache.c:2746
 #, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "échec de crl_cache_insert par émetteur : %s\n"
@@ -10585,7 +10575,7 @@ msgstr ""
 msgid "error retrieving '%s': %s\n"
 msgstr "erreur de récupération de « %s » : %s\n"
 
-#: dirmngr/crlfetch.c:218 dirmngr/ldap-wrapper.c:881 dirmngr/misc.c:573
+#: dirmngr/crlfetch.c:218 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
 #, c-format
 msgid "error initializing reader object: %s\n"
 msgstr "erreur d'initialisation de l'objet lecteur : %s\n"
@@ -10747,139 +10737,139 @@ msgstr "nom de fichier absolu attendu\n"
 msgid "looking up '%s'\n"
 msgstr "recherche de « %s »\n"
 
-#: dirmngr/dirmngr.c:175
+#: dirmngr/dirmngr.c:176
 msgid "list the contents of the CRL cache"
 msgstr "afficher le contenu du cache de la liste de révocations de certificat"
 
-#: dirmngr/dirmngr.c:176
+#: dirmngr/dirmngr.c:177
 msgid "|FILE|load CRL from FILE into cache"
 msgstr ""
 "|FICHIER|charger la liste de révocations de certificat du FICHIER dans le "
 "cache"
 
-#: dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr.c:178
 msgid "|URL|fetch a CRL from URL"
 msgstr "|URL|récupérer une liste de révocations de certificat d'une URL"
 
-#: dirmngr/dirmngr.c:178
+#: dirmngr/dirmngr.c:179
 msgid "shutdown the dirmngr"
 msgstr "arrêter le dirmngr"
 
-#: dirmngr/dirmngr.c:179
+#: dirmngr/dirmngr.c:180
 msgid "flush the cache"
 msgstr "vider le cache"
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:213
 msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:215
+#: dirmngr/dirmngr.c:216
 msgid "|N|do not return more than N items in one query"
 msgstr "|N|ne pas renvoyer plus de N éléments dans une requête"
 
-#: dirmngr/dirmngr.c:221
+#: dirmngr/dirmngr.c:222
 msgid "Network related options"
 msgstr ""
 
-#: dirmngr/dirmngr.c:223
+#: dirmngr/dirmngr.c:224
 msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:235
+#: dirmngr/dirmngr.c:236
 msgid "Configuration for Keyservers"
 msgstr "Configuration pour les serveurs de clefs"
 
-#: dirmngr/dirmngr.c:238
+#: dirmngr/dirmngr.c:239
 msgid "|URL|use keyserver at URL"
 msgstr "|URL|utiliser le serveur de clefs à l'URL"
 
-#: dirmngr/dirmngr.c:240
+#: dirmngr/dirmngr.c:241
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr "|FICHIER|utiliser les certificats de CA dans FICHIER pour HKP par TLS"
 
-#: dirmngr/dirmngr.c:242
+#: dirmngr/dirmngr.c:243
 msgid "Configuration for HTTP servers"
 msgstr "Configuration pour les serveurs HTTP"
 
-#: dirmngr/dirmngr.c:244
+#: dirmngr/dirmngr.c:245
 msgid "inhibit the use of HTTP"
 msgstr "interdire l'utilisation d'HTTP"
 
-#: dirmngr/dirmngr.c:246
+#: dirmngr/dirmngr.c:247
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 "ignorer les points de distribution de liste de révocations de certificat en "
 "HTTP"
 
-#: dirmngr/dirmngr.c:248
+#: dirmngr/dirmngr.c:249
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr "|URL|rediriger toutes les requêtes HTTP vers l'URL"
 
-#: dirmngr/dirmngr.c:250
+#: dirmngr/dirmngr.c:251
 msgid "use system's HTTP proxy setting"
 msgstr "utiliser la configuration de serveur mandataire (proxy) du système"
 
-#: dirmngr/dirmngr.c:254
+#: dirmngr/dirmngr.c:255
 msgid "Configuration of LDAP servers to use"
 msgstr "Configuration des serveurs LDAP à utiliser"
 
-#: dirmngr/dirmngr.c:256
+#: dirmngr/dirmngr.c:257
 msgid "inhibit the use of LDAP"
 msgstr "interdire l'utilisation de LDAP"
 
-#: dirmngr/dirmngr.c:258
+#: dirmngr/dirmngr.c:259
 msgid "ignore LDAP CRL distribution points"
 msgstr ""
 "ignorer les points de distribution de liste de révocations de certificat en "
 "LDAP"
 
-#: dirmngr/dirmngr.c:260
+#: dirmngr/dirmngr.c:261
 msgid "|HOST|use HOST for LDAP queries"
 msgstr "|HÔTE|utiliser l'HÔTE pour les requêtes LDAP"
 
-#: dirmngr/dirmngr.c:262
+#: dirmngr/dirmngr.c:263
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr "ne pas utiliser d'hôtes de repli avec --ldap-proxy"
 
-#: dirmngr/dirmngr.c:264
+#: dirmngr/dirmngr.c:267
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FICHIER|lire la liste de serveurs LDAP depuis le FICHIER"
 
-#: dirmngr/dirmngr.c:266
+#: dirmngr/dirmngr.c:269
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 "ajouter les nouveaux serveurs découverts dans les points de distribution de "
 "liste de révocations de certificat à la liste de serveurs"
 
-#: dirmngr/dirmngr.c:269 dirmngr/dirmngr_ldap.c:104
+#: dirmngr/dirmngr.c:272
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|définir le temps d'expiration de LDAP à N secondes"
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:275
 msgid "Configuration for OCSP"
 msgstr "Configuration pour OCSP"
 
-#: dirmngr/dirmngr.c:274
+#: dirmngr/dirmngr.c:277
 msgid "allow sending OCSP requests"
 msgstr "permettre l'envoi de requêtes OCSP"
 
-#: dirmngr/dirmngr.c:276
+#: dirmngr/dirmngr.c:279
 msgid "ignore certificate contained OCSP service URLs"
 msgstr "ignorer les URL de service OCSP contenues dans le certificat"
 
-#: dirmngr/dirmngr.c:278
+#: dirmngr/dirmngr.c:281
 msgid "|URL|use OCSP responder at URL"
 msgstr "|URL|utiliser le répondeur OCSP à l'URL"
 
-#: dirmngr/dirmngr.c:280
+#: dirmngr/dirmngr.c:283
 msgid "|FPR|OCSP response signed by FPR"
 msgstr "|EMPR|réponse OCSP signée par EMPR"
 
-#: dirmngr/dirmngr.c:288
+#: dirmngr/dirmngr.c:291
 msgid "force loading of outdated CRLs"
 msgstr "forcer le chargement des listes de révocations de certificat obsolètes"
 
-#: dirmngr/dirmngr.c:299
+#: dirmngr/dirmngr.c:302
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
@@ -10889,11 +10879,11 @@ msgstr ""
 "(Consultez le manuel « info » pour obtenir une liste complète des commandes\n"
 "et options)\n"
 
-#: dirmngr/dirmngr.c:441
+#: dirmngr/dirmngr.c:449
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Utilisation : @DIRMNGR@ [options] (-h pour l'aide)"
 
-#: dirmngr/dirmngr.c:443
+#: dirmngr/dirmngr.c:451
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@ -10902,287 +10892,105 @@ msgstr ""
 "Serveur de clefs, liste de révocations de certificat et accès OCSP pour "
 "@GNUPG@\n"
 
-#: dirmngr/dirmngr.c:523
+#: dirmngr/dirmngr.c:531
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr "les niveaux de débogage possibles sont : %s\n"
 
-#: dirmngr/dirmngr.c:609 tools/gpgconf.c:667 tools/gpgconf.c:702
-#: tools/gpgconf.c:802
+#: dirmngr/dirmngr.c:617 tools/gpgconf.c:701 tools/gpgconf.c:736
+#: tools/gpgconf.c:836
 #, c-format
 msgid "usage: %s [options] "
 msgstr "utilisation : %s [options] "
 
-#: dirmngr/dirmngr.c:1260
+#: dirmngr/dirmngr.c:1299
 #, 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:1495 dirmngr/server.c:1824
+#: dirmngr/dirmngr.c:1534 dirmngr/server.c:1878
 #, 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:1501 dirmngr/server.c:1830
+#: dirmngr/dirmngr.c:1540 dirmngr/server.c:1884
 #, 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:1643
+#: dirmngr/dirmngr.c:1682
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s : %u : ligne trop longue — ignorée\n"
 
-#: dirmngr/dirmngr.c:1698 dirmngr/dirmngr.c:1782
+#: dirmngr/dirmngr.c:1737 dirmngr/dirmngr.c:1821
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s : %u : empreinte incorrecte détectée\n"
 
-#: dirmngr/dirmngr.c:1734 dirmngr/dirmngr.c:1760 tools/gpgconf-comp.c:3539
+#: dirmngr/dirmngr.c:1773 dirmngr/dirmngr.c:1799 tools/gpgconf-comp.c:3549
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s : %u : erreur de lecture : %s\n"
 
-#: dirmngr/dirmngr.c:1789
+#: dirmngr/dirmngr.c:1828
 #, 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:1876
+#: dirmngr/dirmngr.c:1915
 #, 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:1917
+#: dirmngr/dirmngr.c:1956
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "SIGUSR2 reçu — aucune action définie\n"
 
-#: dirmngr/dirmngr.c:1922
+#: dirmngr/dirmngr.c:1961
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "SIGTERM reçu — arrêt…\n"
 
-#: dirmngr/dirmngr.c:1924
+#: dirmngr/dirmngr.c:1963
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "SIGTERM reçu — encore %d connexions actives\n"
 
-#: dirmngr/dirmngr.c:1929
+#: dirmngr/dirmngr.c:1968
 #, c-format
 msgid "shutdown forced\n"
 msgstr "arrêt forcé\n"
 
-#: dirmngr/dirmngr.c:1937
+#: dirmngr/dirmngr.c:1976
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "SIGINT reçu — arrêt immédiat\n"
 
-#: dirmngr/dirmngr.c:1944
+#: dirmngr/dirmngr.c:1983
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "signal %d reçu — aucune action définie\n"
 
-#: dirmngr/dirmngr_ldap.c:105
-msgid "return all values in a record oriented format"
-msgstr "renvoyer toutes les valeurs au format enreg."
-
-#: dirmngr/dirmngr_ldap.c:108
-msgid "|NAME|ignore host part and connect through NAME"
-msgstr "|NOM|ignorer l'hôte et se connecter par NOM"
-
-#: dirmngr/dirmngr_ldap.c:109
-msgid "force a TLS connection"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:110
-msgid "|NAME|connect to host NAME"
-msgstr "|NOM|se connecter à l'hôte NOM"
-
-#: dirmngr/dirmngr_ldap.c:111
-msgid "|N|connect to port N"
-msgstr "|N|se connecter au port N"
-
-#: dirmngr/dirmngr_ldap.c:112
-msgid "|NAME|use user NAME for authentication"
-msgstr "|NOM|utiliser le NOM d'utilisateur pour authentif."
-
-#: dirmngr/dirmngr_ldap.c:113
-msgid "|PASS|use password PASS for authentication"
-msgstr "|MDP|utiliser le mot de passe MDP pour authentif."
-
-#: dirmngr/dirmngr_ldap.c:115
-msgid "take password from $DIRMNGR_LDAP_PASS"
-msgstr "prendre le mot de passe de $DIRMNGR_LDAP_PASS"
-
-#: dirmngr/dirmngr_ldap.c:116
-msgid "|STRING|query DN STRING"
-msgstr "|CHAÃŽNE|demander la CHAÃŽNE DN"
-
-#: dirmngr/dirmngr_ldap.c:117
-msgid "|STRING|use STRING as filter expression"
-msgstr "|CHAÃŽNE|utiliser la CHAÃŽNE comme expression de filtre"
-
-#: dirmngr/dirmngr_ldap.c:118
-msgid "|STRING|return the attribute STRING"
-msgstr "|CHAÃŽNE|renvoyer l'attribut CHAÃŽNE"
-
-#: dirmngr/dirmngr_ldap.c:179
-msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
-msgstr "Utilisation : dirmngr_ldap [options] [URL] (-h pour l'aide)\n"
-
-#: dirmngr/dirmngr_ldap.c:182
-msgid ""
-"Syntax: dirmngr_ldap [options] [URL]\n"
-"Internal LDAP helper for Dirmngr\n"
-"Interface and options may change without notice\n"
-msgstr ""
-"Syntaxe : dirmngr_ldap [options] [URL]\n"
-"Assistant LDAP interne pour Dirmngr\n"
-"L'interface et les options pourraient changer sans prévenir\n"
-
-#: dirmngr/dirmngr_ldap.c:291
-#, c-format
-msgid "invalid port number %d\n"
-msgstr "numéro de port %d incorrect\n"
-
-#: dirmngr/dirmngr_ldap.c:400
-#, c-format
-msgid "scanning result for attribute '%s'\n"
-msgstr "examen de résultat pour l'attribut « %s »\n"
-
-#: dirmngr/dirmngr_ldap.c:407 dirmngr/dirmngr_ldap.c:490
-#: dirmngr/dirmngr_ldap.c:514 dirmngr/dirmngr_ldap.c:526
-#: dirmngr/dirmngr_ldap.c:722
-#, c-format
-msgid "error writing to stdout: %s\n"
-msgstr "erreur d'écriture sur la sortie standard : %s\n"
-
-#: dirmngr/dirmngr_ldap.c:424
-#, c-format
-msgid "          available attribute '%s'\n"
-msgstr "          attribut « %s » disponible\n"
-
-#: dirmngr/dirmngr_ldap.c:462
-#, c-format
-msgid "attribute '%s' not found\n"
-msgstr "attribut « %s » introuvable\n"
-
-#: dirmngr/dirmngr_ldap.c:469
-#, c-format
-msgid "found attribute '%s'\n"
-msgstr "attribut « %s » trouvé\n"
-
-#: dirmngr/dirmngr_ldap.c:581
-#, c-format
-msgid "processing url '%s'\n"
-msgstr "traitement de l'URL « %s »\n"
-
-#: dirmngr/dirmngr_ldap.c:588
-#, c-format
-msgid "          user '%s'\n"
-msgstr "  utilisateur « %s »\n"
-
-#: dirmngr/dirmngr_ldap.c:590
-#, c-format
-msgid "          pass '%s'\n"
-msgstr " mot de passe « %s »\n"
-
-#: dirmngr/dirmngr_ldap.c:592
-#, c-format
-msgid "          host '%s'\n"
-msgstr "         hôte « %s »\n"
-
-#: dirmngr/dirmngr_ldap.c:593
-#, c-format
-msgid "          port %d\n"
-msgstr "         port %d\n"
-
-#: dirmngr/dirmngr_ldap.c:595
-#, c-format
-msgid "            DN '%s'\n"
-msgstr "           DN « %s »\n"
-
-#: dirmngr/dirmngr_ldap.c:597
-#, c-format
-msgid "        filter '%s'\n"
-msgstr "       filtre « %s »\n"
-
-#: dirmngr/dirmngr_ldap.c:602 dirmngr/dirmngr_ldap.c:605
-#, c-format
-msgid "          attr '%s'\n"
-msgstr "     attribut « %s »\n"
-
-#: dirmngr/dirmngr_ldap.c:611
-#, c-format
-msgid "no host name in '%s'\n"
-msgstr "aucun nom d'hôte donné dans « %s »\n"
-
-#: dirmngr/dirmngr_ldap.c:616
-#, c-format
-msgid "no attribute given for query '%s'\n"
-msgstr "pas d'attribut donné pour la requête « %s »\n"
-
-#: dirmngr/dirmngr_ldap.c:622
-#, c-format
-msgid "WARNING: using first attribute only\n"
-msgstr "Attention : utilisation du premier attribut seulement\n"
-
-#: dirmngr/dirmngr_ldap.c:637 dirmngr/dirmngr_ldap.c:678
-#, c-format
-msgid "LDAP init to '%s:%d' failed: %s\n"
-msgstr "échec d'initialisation de LDAP à « %s : %d » : %s\n"
-
-#: dirmngr/dirmngr_ldap.c:659
-#, fuzzy, c-format
-#| msgid "LDAP init to '%s:%d' failed: %s\n"
-msgid "LDAP init to '%s' failed: %s\n"
-msgstr "échec d'initialisation de LDAP à « %s : %d » : %s\n"
-
-#: dirmngr/dirmngr_ldap.c:665
-#, fuzzy, c-format
-#| msgid "LDAP init to '%s:%d' failed: %s\n"
-msgid "LDAP init to '%s' done\n"
-msgstr "échec d'initialisation de LDAP à « %s : %d » : %s\n"
-
-#: dirmngr/dirmngr_ldap.c:704
-#, c-format
-msgid "binding to '%s:%d' failed: %s\n"
-msgstr "échec du lien de « %s : %d » : %s\n"
-
-#: dirmngr/dirmngr_ldap.c:728
-#, c-format
-msgid "searching '%s' failed: %s\n"
-msgstr "échec de recherche de « %s » : %s\n"
-
-#: dirmngr/dirmngr_ldap.c:759
-#, c-format
-msgid "'%s' is not an LDAP URL\n"
-msgstr "« %s » n'est pas une URL LDAP\n"
-
-#: dirmngr/dirmngr_ldap.c:765
-#, c-format
-msgid "'%s' is an invalid LDAP URL\n"
-msgstr "« %s » est une URL LDAP incorrecte\n"
-
-#: dirmngr/http.c:1989 dirmngr/ocsp.c:255
+#: dirmngr/http.c:1998 dirmngr/ocsp.c:255
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "erreur d'accès à « %s » : état HTTP %u\n"
 
-#: dirmngr/http.c:3630 dirmngr/ocsp.c:229
+#: dirmngr/http.c:3652 dirmngr/ocsp.c:229
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr "URL « %s » redirigée vers « %s » (%u)\n"
 
-#: dirmngr/http.c:3636 dirmngr/ocsp.c:246
+#: dirmngr/http.c:3658 dirmngr/ocsp.c:246
 #, c-format
 msgid "too many redirections\n"
 msgstr "trop de redirections\n"
 
-#: dirmngr/http.c:3748
+#: dirmngr/http.c:3768
 #, fuzzy, c-format
 #| msgid "writing to '%s'\n"
 msgid "redirection changed to '%s'\n"
@@ -11223,31 +11031,51 @@ msgstr "échec d'attente de l'enveloppe LDAP %d : %s\n"
 msgid "ldap wrapper %d stalled - killing\n"
 msgstr "enveloppe LDAP %d à l'arrêt — le processus va être tué\n"
 
-#: dirmngr/ldap.c:91
+#: dirmngr/ldap.c:92
 #, c-format
 msgid "invalid char 0x%02x in host name - not added\n"
 msgstr "caractère 0x%02x incorrect dans le nom d'hôte — non ajouté\n"
 
-#: dirmngr/ldap.c:95
+#: dirmngr/ldap.c:96
 #, c-format
 msgid "adding '%s:%d' to the ldap server list\n"
 msgstr "ajout de « %s : %d » à la liste de serveurs LDAP\n"
 
-#: dirmngr/ldap.c:98 dirmngr/misc.c:512
+#: dirmngr/ldap.c:99 dirmngr/misc.c:512
 #, c-format
 msgid "malloc failed: %s\n"
 msgstr "échec de malloc : %s\n"
 
-#: dirmngr/ldap.c:634
+#: dirmngr/ldap.c:221
 #, c-format
-msgid "start_cert_fetch: invalid pattern '%s'\n"
-msgstr "start_cert_fetch : motif « %s » incorrect\n"
+msgid "'%s' is not an LDAP URL\n"
+msgstr "« %s » n'est pas une URL LDAP\n"
 
-#: dirmngr/ldap.c:846
+#: dirmngr/ldap.c:227 dirmngr/ldap.c:233
+#, c-format
+msgid "'%s' is an invalid LDAP URL\n"
+msgstr "« %s » est une URL LDAP incorrecte\n"
+
+#: dirmngr/ldap.c:968
 #, c-format
 msgid "ldap_search hit the size limit of the server\n"
 msgstr "ldap_search a atteint la taille limite du serveur\n"
 
+#: dirmngr/ldapserver.c:119
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr "%s : %u : mot de passe donné sans utilisateur\n"
+
+#: dirmngr/ldapserver.c:181
+#, c-format
+msgid "%s:%u: ignoring unknown flag '%s'\n"
+msgstr ""
+
+#: dirmngr/ldapserver.c:203
+#, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr "%s : %u : ignorer cette ligne\n"
+
 #: dirmngr/misc.c:172
 #, c-format
 msgid "invalid canonical S-expression found\n"
@@ -11339,87 +11167,87 @@ msgstr "non signée par un certificat de signataire OCSP par défaut"
 msgid "allocating list item failed: %s\n"
 msgstr "erreur d'allocation d'élément de liste : %s\n"
 
-#: dirmngr/ocsp.c:537 dirmngr/ocsp.c:724
+#: dirmngr/ocsp.c:538 dirmngr/ocsp.c:725
 #, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "erreur de lecture de l'identifiant de répondeur : %s\n"
 
-#: dirmngr/ocsp.c:584
+#: dirmngr/ocsp.c:585
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr ""
 "aucun certificat convenable n'a été trouvée pour vérifier la réponse OCSP\n"
 
-#: dirmngr/ocsp.c:623 dirmngr/validate.c:648
+#: dirmngr/ocsp.c:624 dirmngr/validate.c:648
 #, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "certificat d'émetteur introuvable : %s\n"
 
-#: dirmngr/ocsp.c:633
+#: dirmngr/ocsp.c:634
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr "l'appelant n'a pas renvoyé le certificat cible\n"
 
-#: dirmngr/ocsp.c:640
+#: dirmngr/ocsp.c:641
 #, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "l'appelant n'a pas renvoyé le certificat émetteur\n"
 
-#: dirmngr/ocsp.c:650
+#: dirmngr/ocsp.c:651
 #, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "échec d'allocation du contexte OCSP : %s\n"
 
-#: dirmngr/ocsp.c:689
+#: dirmngr/ocsp.c:690
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr "aucun répondeur OCSP par défaut défini\n"
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:696
 #, c-format
 msgid "no default OCSP signer defined\n"
 msgstr "aucun signataire OCSP par défaut défini\n"
 
-#: dirmngr/ocsp.c:702
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr "utilisation du répondeur OCSP « %s » par défaut\n"
 
-#: dirmngr/ocsp.c:707
+#: dirmngr/ocsp.c:708
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "utilisation du répondeur OCSP « %s »\n"
 
-#: dirmngr/ocsp.c:764
+#: dirmngr/ocsp.c:765
 #, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "erreur de lecture de l'état OCSP pour le certificat cible : %s\n"
 
-#: dirmngr/ocsp.c:789
+#: dirmngr/ocsp.c:790
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr "l'état du certificat est : %s  (celui-ci=%s  prochain=%s)\n"
 
-#: dirmngr/ocsp.c:790
+#: dirmngr/ocsp.c:791
 msgid "good"
 msgstr "correct"
 
-#: dirmngr/ocsp.c:796
+#: dirmngr/ocsp.c:797
 #, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "le certificat a été révoquée le : %s à cause de : %s\n"
 
-#: dirmngr/ocsp.c:831
+#: dirmngr/ocsp.c:832
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr "le répondeur OCSP a renvoyé un état dans le futur\n"
 
-#: dirmngr/ocsp.c:843
+#: dirmngr/ocsp.c:844
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr "le répondeur OCSP a renvoyé un état non actuel\n"
 
-#: dirmngr/ocsp.c:858
+#: dirmngr/ocsp.c:859
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr "le répondeur OCSP a renvoyé un trop vieil état\n"
@@ -11429,71 +11257,67 @@ msgstr "le répondeur OCSP a renvoyé un trop vieil état\n"
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "échec d'assuan_inquire(%s) : %s\n"
 
-#: dirmngr/server.c:1158
-msgid "ldapserver missing"
-msgstr "ldapserver manquant"
-
-#: dirmngr/server.c:1224
+#: dirmngr/server.c:1277
 msgid "serialno missing in cert ID"
 msgstr "serialno manquant dans l'identifiant de certificat"
 
-#: dirmngr/server.c:1387 dirmngr/server.c:1473 dirmngr/server.c:1909
-#: dirmngr/server.c:1980 dirmngr/server.c:2556 dirmngr/server.c:2571
+#: dirmngr/server.c:1440 dirmngr/server.c:1526 dirmngr/server.c:1963
+#: dirmngr/server.c:2034 dirmngr/server.c:2662 dirmngr/server.c:2677
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "échec d'assuan_inquire : %s\n"
 
-#: dirmngr/server.c:1516
+#: dirmngr/server.c:1569
 #, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "échec de fetch_cert_by_url : %s\n"
 
-#: dirmngr/server.c:1528 dirmngr/server.c:1559 dirmngr/server.c:1718
+#: dirmngr/server.c:1581 dirmngr/server.c:1612 dirmngr/server.c:1772
 #, c-format
 msgid "error sending data: %s\n"
 msgstr "erreur d'envoi de données : %s\n"
 
-#: dirmngr/server.c:1666
+#: dirmngr/server.c:1720
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "échec de start_cert_fetch : %s\n"
 
-#: dirmngr/server.c:1699
+#: dirmngr/server.c:1753
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "échec de fetch_next_cert : %s\n"
 
-#: dirmngr/server.c:1726
+#: dirmngr/server.c:1780
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr "max_replies %d dépassé\n"
 
-#: dirmngr/server.c:2860
+#: dirmngr/server.c:2966
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "impossible d'allouer une structure de contrôle : %s\n"
 
-#: dirmngr/server.c:2871
+#: dirmngr/server.c:2977
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "échec d'allocation du contexte Assuan : %s\n"
 
-#: dirmngr/server.c:2892
+#: dirmngr/server.c:2998
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "impossible d'initialiser le serveur : %s\n"
 
-#: dirmngr/server.c:2900
+#: dirmngr/server.c:3006
 #, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "impossible d'enregistrer les commandes avec Assuan : %s\n"
 
-#: dirmngr/server.c:2933
+#: dirmngr/server.c:3039
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "problème d'accept_assuan : %s\n"
 
-#: dirmngr/server.c:2952
+#: dirmngr/server.c:3058
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "problème de traitement Assuan : %s\n"
@@ -11649,82 +11473,82 @@ msgstr ""
 msgid "error sending standard options: %s\n"
 msgstr "erreur d'envoi d'options standards : %s\n"
 
-#: tools/gpgconf-comp.c:649
+#: tools/gpgconf-comp.c:655
 #, fuzzy
 #| msgid "GPG for OpenPGP"
 msgid "OpenPGP"
 msgstr "GPG pour OpenPGP"
 
-#: tools/gpgconf-comp.c:653
+#: tools/gpgconf-comp.c:659
 #, fuzzy
 #| msgid "GPG for S/MIME"
 msgid "S/MIME"
 msgstr "GPG pour S/MIME"
 
-#: tools/gpgconf-comp.c:657
+#: tools/gpgconf-comp.c:663
 #, fuzzy
 #| msgid "public key is %s\n"
 msgid "Public Keys"
 msgstr "la clef publique est %s\n"
 
-#: tools/gpgconf-comp.c:661
+#: tools/gpgconf-comp.c:667
 msgid "Private Keys"
 msgstr ""
 
-#: tools/gpgconf-comp.c:665
+#: tools/gpgconf-comp.c:671
 #, fuzzy
 #| msgid "Smartcard Daemon"
 msgid "Smartcards"
 msgstr "Démon de carte à puce"
 
-#: tools/gpgconf-comp.c:669
+#: tools/gpgconf-comp.c:676
 msgid "TPM"
 msgstr ""
 
-#: tools/gpgconf-comp.c:673
+#: tools/gpgconf-comp.c:681
 #, fuzzy
 #| msgid "network error"
 msgid "Network"
 msgstr "erreur de réseau"
 
-#: tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:685
 #, fuzzy
 #| msgid "PIN and Passphrase Entry"
 msgid "Passphrase Entry"
 msgstr "Entrée de code personnel et de phrase secrète"
 
-#: tools/gpgconf-comp.c:941
+#: tools/gpgconf-comp.c:951
 msgid "Component not suitable for launching"
 msgstr "Composant non convenable pour le lancement"
 
-#: tools/gpgconf-comp.c:947
+#: tools/gpgconf-comp.c:957
 #, fuzzy, c-format
 #| msgid "External verification of component %s failed"
 msgid "Configuration file of component %s is broken\n"
 msgstr "Échec de vérification externe du composant %s"
 
-#: tools/gpgconf-comp.c:950
+#: tools/gpgconf-comp.c:960
 #, fuzzy, c-format
 #| msgid "Please use the command \"toggle\" first.\n"
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr "Veuillez d'abord utiliser la commande « toggle ».\n"
 
-#: tools/gpgconf-comp.c:2816
+#: tools/gpgconf-comp.c:2826
 #, c-format
 msgid "External verification of component %s failed"
 msgstr "Échec de vérification externe du composant %s"
 
-#: tools/gpgconf-comp.c:2946
+#: tools/gpgconf-comp.c:2956
 msgid "Note that group specifications are ignored\n"
 msgstr "Remarquez que les spécifications de groupe sont ignorées\n"
 
-#: tools/gpgconf-comp.c:3543
+#: tools/gpgconf-comp.c:3553
 #, 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:3545
+#: tools/gpgconf-comp.c:3555
 #, fuzzy, c-format
 #| msgid "error hashing '%s': %s\n"
 msgid "error parsing '%s'\n"
@@ -11810,15 +11634,15 @@ msgstr ""
 "Syntaxe : @GPGCONF@ [options]\n"
 "Gérer les options de configuration pour les outils du système @GNUPG@\n"
 
-#: tools/gpgconf.c:669 tools/gpgconf.c:704
+#: tools/gpgconf.c:703 tools/gpgconf.c:738
 msgid "Need one component argument"
 msgstr "Un argument de composant nécessaire"
 
-#: tools/gpgconf.c:678 tools/gpgconf.c:728 tools/gpgconf.c:778
+#: tools/gpgconf.c:712 tools/gpgconf.c:762 tools/gpgconf.c:812
 msgid "Component not found"
 msgstr "Composant introuvable"
 
-#: tools/gpgconf.c:804
+#: tools/gpgconf.c:838
 msgid "No argument allowed"
 msgstr "Aucun argument permis"
 
@@ -11835,92 +11659,219 @@ msgstr ""
 "Vérifier une phrase secrète donnée sur l'entrée standard par rapport à "
 "ficmotif\n"
 
-#: tools/gpg-card.c:2390
+#: tools/gpg-card.c:2407
 #, fuzzy, c-format
 #| msgid "Note: keys are already stored on the card!\n"
 msgid "Note: key %s is already stored on the card!\n"
 msgstr "Remarque : les clefs sont déjà stockées sur la carte.\n"
 
-#: tools/gpg-card.c:2393
+#: tools/gpg-card.c:2410
 #, fuzzy, c-format
 #| msgid "Note: keys are already stored on the card!\n"
 msgid "Note: Keys are already stored on the card!\n"
 msgstr "Remarque : les clefs sont déjà stockées sur la carte.\n"
 
-#: tools/gpg-card.c:2396
+#: tools/gpg-card.c:2413
 #, fuzzy, c-format
 #| msgid "Replace existing keys? (y/N) "
 msgid "Replace existing key %s ? (y/N) "
 msgstr "Faut-il remplacer les clefs existantes ? (o/N) "
 
-#: tools/gpg-card.c:2549 tools/gpg-card.c:2712 tools/gpg-card.c:2935
-#: tools/gpg-card.c:3044
+#: tools/gpg-card.c:2566 tools/gpg-card.c:2729 tools/gpg-card.c:2952
+#: tools/gpg-card.c:3061
 #, fuzzy, c-format
 #| msgid "OpenPGP card no. %s detected\n"
 msgid "%s card no. %s detected\n"
 msgstr "carte OpenPGP nº %s détectée\n"
 
-#: tools/gpg-card.c:3396
+#: tools/gpg-card.c:3413
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3406 tools/gpg-card.c:3420
+#: tools/gpg-card.c:3423 tools/gpg-card.c:3437
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
 "         can only be reverted using a factory reset!\n"
 msgstr ""
 
-#: tools/gpg-card.c:3423
+#: tools/gpg-card.c:3440
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3669
+#: tools/gpg-card.c:3686
 #, fuzzy
 #| msgid "add a certificate to the cache"
 msgid "authenticate to the card"
 msgstr "ajouter un certificat au cache"
 
-#: tools/gpg-card.c:3671
+#: tools/gpg-card.c:3688
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3673
+#: tools/gpg-card.c:3690
 #, fuzzy
 #| msgid "|NAME|use user NAME for authentication"
 msgid "setup KDF for PIN authentication"
 msgstr "|NOM|utiliser le NOM d'utilisateur pour authentif."
 
-#: tools/gpg-card.c:3675
+#: tools/gpg-card.c:3692
 msgid "change a private data object"
 msgstr ""
 
-#: tools/gpg-card.c:3676
+#: tools/gpg-card.c:3693
 #, fuzzy
 #| msgid "add a certificate to the cache"
 msgid "read a certificate from a data object"
 msgstr "ajouter un certificat au cache"
 
-#: tools/gpg-card.c:3677
+#: tools/gpg-card.c:3694
 #, fuzzy
 #| msgid "add a certificate to the cache"
 msgid "store a certificate to a data object"
 msgstr "ajouter un certificat au cache"
 
-#: tools/gpg-card.c:3678
+#: tools/gpg-card.c:3695
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3679
+#: tools/gpg-card.c:3696
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3681
+#: tools/gpg-card.c:3698
 msgid "manage the command history"
 msgstr ""
 
+#~ msgid "requesting key %s from %s server %s\n"
+#~ msgstr "demande de la clef %s sur le serveur %s %s\n"
+
+#~ msgid "%s:%u: no hostname given\n"
+#~ msgstr "%s : %u : aucun nom d'hôte donné\n"
+
+#~ msgid "could not parse keyserver\n"
+#~ msgstr "impossible d'analyser le serveur de clefs\n"
+
+#~ msgid "return all values in a record oriented format"
+#~ msgstr "renvoyer toutes les valeurs au format enreg."
+
+#~ msgid "|NAME|ignore host part and connect through NAME"
+#~ msgstr "|NOM|ignorer l'hôte et se connecter par NOM"
+
+#~ msgid "|NAME|connect to host NAME"
+#~ msgstr "|NOM|se connecter à l'hôte NOM"
+
+#~ msgid "|N|connect to port N"
+#~ msgstr "|N|se connecter au port N"
+
+#~ msgid "|NAME|use user NAME for authentication"
+#~ msgstr "|NOM|utiliser le NOM d'utilisateur pour authentif."
+
+#~ msgid "|PASS|use password PASS for authentication"
+#~ msgstr "|MDP|utiliser le mot de passe MDP pour authentif."
+
+#~ msgid "take password from $DIRMNGR_LDAP_PASS"
+#~ msgstr "prendre le mot de passe de $DIRMNGR_LDAP_PASS"
+
+#~ msgid "|STRING|query DN STRING"
+#~ msgstr "|CHAÃŽNE|demander la CHAÃŽNE DN"
+
+#~ msgid "|STRING|use STRING as filter expression"
+#~ msgstr "|CHAÃŽNE|utiliser la CHAÃŽNE comme expression de filtre"
+
+#~ msgid "|STRING|return the attribute STRING"
+#~ msgstr "|CHAÃŽNE|renvoyer l'attribut CHAÃŽNE"
+
+#~ msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
+#~ msgstr "Utilisation : dirmngr_ldap [options] [URL] (-h pour l'aide)\n"
+
+#~ msgid ""
+#~ "Syntax: dirmngr_ldap [options] [URL]\n"
+#~ "Internal LDAP helper for Dirmngr\n"
+#~ "Interface and options may change without notice\n"
+#~ msgstr ""
+#~ "Syntaxe : dirmngr_ldap [options] [URL]\n"
+#~ "Assistant LDAP interne pour Dirmngr\n"
+#~ "L'interface et les options pourraient changer sans prévenir\n"
+
+#~ msgid "invalid port number %d\n"
+#~ msgstr "numéro de port %d incorrect\n"
+
+#~ msgid "scanning result for attribute '%s'\n"
+#~ msgstr "examen de résultat pour l'attribut « %s »\n"
+
+#~ msgid "error writing to stdout: %s\n"
+#~ msgstr "erreur d'écriture sur la sortie standard : %s\n"
+
+#~ msgid "          available attribute '%s'\n"
+#~ msgstr "          attribut « %s » disponible\n"
+
+#~ msgid "attribute '%s' not found\n"
+#~ msgstr "attribut « %s » introuvable\n"
+
+#~ msgid "found attribute '%s'\n"
+#~ msgstr "attribut « %s » trouvé\n"
+
+#~ msgid "processing url '%s'\n"
+#~ msgstr "traitement de l'URL « %s »\n"
+
+#~ msgid "          user '%s'\n"
+#~ msgstr "  utilisateur « %s »\n"
+
+#~ msgid "          pass '%s'\n"
+#~ msgstr " mot de passe « %s »\n"
+
+#~ msgid "          host '%s'\n"
+#~ msgstr "         hôte « %s »\n"
+
+#~ msgid "          port %d\n"
+#~ msgstr "         port %d\n"
+
+#~ msgid "            DN '%s'\n"
+#~ msgstr "           DN « %s »\n"
+
+#~ msgid "        filter '%s'\n"
+#~ msgstr "       filtre « %s »\n"
+
+#~ msgid "          attr '%s'\n"
+#~ msgstr "     attribut « %s »\n"
+
+#~ msgid "no host name in '%s'\n"
+#~ msgstr "aucun nom d'hôte donné dans « %s »\n"
+
+#~ msgid "no attribute given for query '%s'\n"
+#~ msgstr "pas d'attribut donné pour la requête « %s »\n"
+
+#~ msgid "WARNING: using first attribute only\n"
+#~ msgstr "Attention : utilisation du premier attribut seulement\n"
+
+#~ msgid "LDAP init to '%s:%d' failed: %s\n"
+#~ msgstr "échec d'initialisation de LDAP à « %s : %d » : %s\n"
+
+#, fuzzy
+#~| msgid "LDAP init to '%s:%d' failed: %s\n"
+#~ msgid "LDAP init to '%s' failed: %s\n"
+#~ msgstr "échec d'initialisation de LDAP à « %s : %d » : %s\n"
+
+#, fuzzy
+#~| msgid "LDAP init to '%s:%d' failed: %s\n"
+#~ msgid "LDAP init to '%s' done\n"
+#~ msgstr "échec d'initialisation de LDAP à « %s : %d » : %s\n"
+
+#~ msgid "binding to '%s:%d' failed: %s\n"
+#~ msgstr "échec du lien de « %s : %d » : %s\n"
+
+#~ msgid "searching '%s' failed: %s\n"
+#~ msgstr "échec de recherche de « %s » : %s\n"
+
+#~ msgid "start_cert_fetch: invalid pattern '%s'\n"
+#~ msgstr "start_cert_fetch : motif « %s » incorrect\n"
+
+#~ msgid "ldapserver missing"
+#~ msgstr "ldapserver manquant"
+
 #, fuzzy
 #~| msgid "change a passphrase"
 #~ msgid "Suggest a random passphrase."
diff --git a/po/gl.po b/po/gl.po
index ed94e86..009b469 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: 2021-04-20 12:38+0200\n"
+"POT-Creation-Date: 2021-08-24 18:50+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:328
+#: agent/call-pinentry.c:338
 #, 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,49 +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:546
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_OK"
 msgstr ""
 
-#: agent/call-pinentry.c:547
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
-#: agent/call-pinentry.c:548
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|_Yes"
 msgstr ""
 
-#: agent/call-pinentry.c:549
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_No"
 msgstr ""
 
-#: agent/call-pinentry.c:550
+#: agent/call-pinentry.c:560
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:551
+#: agent/call-pinentry.c:561
 msgid "|pinentry-label|_Save in password manager"
 msgstr ""
 
-#: agent/call-pinentry.c:552
+#: agent/call-pinentry.c:562
 #, 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:554
+#: agent/call-pinentry.c:564
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:555
+#: agent/call-pinentry.c:565
 #, fuzzy
 #| msgid "invalid passphrase"
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "contrasinal incorrecto"
 
+#: agent/call-pinentry.c:566
+msgid "Caps Lock is on"
+msgstr ""
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:944
+#: agent/call-pinentry.c:1022
 msgid "Suggest"
 msgstr ""
 
@@ -79,13 +83,25 @@ 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:966
+#: agent/call-pinentry.c:1044
 msgid "pinentry.genpin.tooltip"
 msgstr ""
 
+#: agent/call-pinentry.c:1072
+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
+#, 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:998
+#: agent/call-pinentry.c:1198
 msgid "Quality:"
 msgstr ""
 
@@ -95,107 +111,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:1019
+#: agent/call-pinentry.c:1219
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:1263
+#: agent/call-pinentry.c:1477
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:1266
+#: agent/call-pinentry.c:1480
 #, 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:1303 agent/call-pinentry.c:1506
+#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1303 agent/call-pinentry.c:1506
-#: agent/protect-tool.c:728
+#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/protect-tool.c:729
 #, fuzzy
 msgid "Passphrase:"
 msgstr "contrasinal erróneo"
 
-#: agent/call-pinentry.c:1330 agent/call-pinentry.c:1580 agent/command.c:1799
-#: agent/command.c:1852 agent/command-ssh.c:3046 agent/genkey.c:398
+#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
+#: agent/command.c:1988 agent/command-ssh.c:3046 agent/genkey.c:442
 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:1351 agent/call-pinentry.c:1603
+#: agent/call-pinentry.c:1566 agent/call-pinentry.c:1830
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:1362 agent/call-pinentry.c:1614
+#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
 msgid "Repeat:"
 msgstr ""
 
-#: agent/call-pinentry.c:1372 agent/call-pinentry.c:1384
-#: agent/call-pinentry.c:1624 agent/call-pinentry.c:1636
+#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
+#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
 #, fuzzy
 msgid "PIN too long"
 msgstr "liña longa de máis\n"
 
-#: agent/call-pinentry.c:1373 agent/call-pinentry.c:1625
+#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "contrasinal demasiado longo\n"
 
-#: agent/call-pinentry.c:1381 agent/call-pinentry.c:1633
+#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caracter non válido no nome\n"
 
-#: agent/call-pinentry.c:1386 agent/call-pinentry.c:1638
+#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:1405 agent/call-pinentry.c:1656
+#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI erróneo"
 
-#: agent/call-pinentry.c:1405 agent/call-pinentry.c:1656
+#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "contrasinal erróneo"
 
-#: agent/command.c:697
+#: agent/command.c:823
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:698
+#: agent/command.c:824
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1106 g10/card-util.c:708 g10/card-util.c:729
+#: agent/command.c:1235 g10/card-util.c:713 g10/card-util.c:734
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: agent/command.c:1634 agent/command.c:1791 agent/command-ssh.c:2974
-#: agent/genkey.c:333
+#: agent/command.c:1756 agent/command.c:1921 agent/command-ssh.c:2974
+#: agent/genkey.c:377
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: agent/command.c:2567
+#: agent/command.c:2703
 #, 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:2697
+#: agent/command.c:2833
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -206,26 +222,26 @@ msgstr ""
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "o algoritmo de protección %d%s non está soportado\n"
 
-#: agent/command-ssh.c:872 common/dotlock.c:852 g10/card-util.c:953
-#: g10/export.c:1329 g10/gpg.c:1431 g10/keygen.c:5347 g10/keyring.c:1319
-#: g10/keyring.c:1632 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
+#: agent/command-ssh.c:872 common/dotlock.c:852 g10/card-util.c:963
+#: g10/export.c:1329 g10/gpg.c:1431 g10/keygen.c:5377 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
 #: g10/sign.c:1106 g10/sign.c:1443 g10/tdbio.c:753 tools/gpg-card.c:479
 #, fuzzy, c-format
 #| msgid "can't create `%s': %s\n"
 msgid "can't create '%s': %s\n"
 msgstr "non se pode crear `%s': %s\n"
 
-#: agent/command-ssh.c:884 common/helpfile.c:57 g10/card-util.c:910
+#: agent/command-ssh.c:884 common/helpfile.c:57 g10/card-util.c:920
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
 #: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:721 g10/gpg.c:1432
-#: g10/import.c:371 g10/import.c:558 g10/import.c:793 g10/keygen.c:4322
-#: g10/keyring.c:1658 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
+#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4326
+#: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
 #: g10/plaintext.c:610 g10/sign.c:1086 g10/sign.c:1311 g10/sign.c:1424
 #: g10/sign.c:1596 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2380
-#: sm/gpgsm.c:2410 sm/gpgsm.c:2448 sm/keylist.c:1737 sm/qualified.c:65
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2236
+#: sm/gpgsm.c:2266 sm/gpgsm.c:2304 sm/keylist.c:1775 sm/qualified.c:65
 #: dirmngr/certcache.c:396 dirmngr/certcache.c:476 dirmngr/certcache.c:478
-#: dirmngr/crlcache.c:2588 dirmngr/dirmngr.c:1720 tools/gpg-card.c:408
+#: dirmngr/crlcache.c:2591 dirmngr/dirmngr.c:1759 tools/gpg-card.c:408
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
@@ -335,39 +351,39 @@ msgstr "o contrasinal non se repetiu correctamente; ténteo de novo"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:109 sm/certreqgen-ui.c:433
+#: 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:116
+#: agent/genkey.c:150
 #, fuzzy, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "escribindo a `%s'\n"
 
-#: agent/genkey.c:154
+#: agent/genkey.c:191
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Introduza o contrasinal\n"
 
-#: agent/genkey.c:184
+#: agent/genkey.c:227
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:186
+#: agent/genkey.c:229
 #, 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:198
+#: agent/genkey.c:241
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:215
+#: agent/genkey.c:258
 #, fuzzy, c-format
 #| msgid "Name must be at least 5 characters long\n"
 msgid "A passphrase should be at least %u character long."
@@ -375,7 +391,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:234
+#: agent/genkey.c:277
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -383,244 +399,243 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:260
+#: agent/genkey.c:304
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:275
+#: agent/genkey.c:319
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
-#: agent/genkey.c:296
+#: agent/genkey.c:340
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "¿Empregar esta chave de tódolos xeitos?"
 
-#: agent/genkey.c:464
+#: agent/genkey.c:508
 #, 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:590
+#: agent/genkey.c:637
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: agent/gpg-agent.c:162 scd/scdaemon.c:115 dirmngr/dirmngr.c:182
+#: agent/gpg-agent.c:164 scd/scdaemon.c:115 dirmngr/dirmngr.c:183
 #, fuzzy
 msgid "Options used for startup"
 msgstr "habilitar depuración total"
 
-#: agent/gpg-agent.c:164 scd/scdaemon.c:120 dirmngr/dirmngr.c:171
+#: agent/gpg-agent.c:166 scd/scdaemon.c:120 dirmngr/dirmngr.c:172
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:117 dirmngr/dirmngr.c:170
+#: agent/gpg-agent.c:167 scd/scdaemon.c:117 dirmngr/dirmngr.c:171
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:167 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:169 dirmngr/dirmngr.c:174
 #, fuzzy
 #| msgid "Key is superseded"
 msgid "run in supervised mode"
 msgstr "A chave é obsoleta"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:121 dirmngr/dirmngr.c:184
+#: agent/gpg-agent.c:171 scd/scdaemon.c:121 dirmngr/dirmngr.c:185
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:170 scd/scdaemon.c:122 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:172 scd/scdaemon.c:122 dirmngr/dirmngr.c:186
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:171 scd/scdaemon.c:123 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:173 scd/scdaemon.c:123 dirmngr/dirmngr.c:187
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:179 g10/gpg.c:589 scd/scdaemon.c:125 sm/gpgsm.c:422
-#: dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:181 g10/gpg.c:589 scd/scdaemon.c:125 sm/gpgsm.c:423
+#: dirmngr/dirmngr.c:189
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FICHEIRO|carga-lo módulo de extensión FICHEIRO"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:574 scd/scdaemon.c:129 sm/gpgsm.c:265
-#: dirmngr/dirmngr.c:192
+#: agent/gpg-agent.c:185 g10/gpg.c:574 scd/scdaemon.c:129 sm/gpgsm.c:265
+#: dirmngr/dirmngr.c:193
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: agent/gpg-agent.c:185 g10/gpg.c:576 g10/gpgv.c:78 kbx/kbxutil.c:89
+#: agent/gpg-agent.c:187 g10/gpg.c:576 g10/gpgv.c:78 kbx/kbxutil.c:89
 #: scd/scdaemon.c:131 sm/gpgsm.c:267 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:194 dirmngr/dirmngr_ldap.c:102
-#: tools/gpg-connect-agent.c:85 tools/gpgconf.c:111
+#: dirmngr/dirmngr.c:195 tools/gpg-connect-agent.c:85 tools/gpgconf.c:111
 msgid "verbose"
 msgstr "lareto"
 
-#: agent/gpg-agent.c:186 g10/gpg.c:578 g10/gpgv.c:79 kbx/kbxutil.c:90
+#: agent/gpg-agent.c:188 g10/gpg.c:578 g10/gpgv.c:79 kbx/kbxutil.c:90
 #: scd/scdaemon.c:132 sm/gpgsm.c:269 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:195 dirmngr/dirmngr_ldap.c:103
+#: dirmngr/dirmngr.c:196
 msgid "be somewhat more quiet"
 msgstr "ser un pouquiño máis calado"
 
-#: agent/gpg-agent.c:194 g10/gpg.c:593 sm/gpgsm.c:283 dirmngr/dirmngr.c:205
+#: agent/gpg-agent.c:196 g10/gpg.c:593 sm/gpgsm.c:283 dirmngr/dirmngr.c:206
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 scd/scdaemon.c:146 sm/gpgsm.c:290
-#: dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:599 scd/scdaemon.c:146 sm/gpgsm.c:290
+#: dirmngr/dirmngr.c:210
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: agent/gpg-agent.c:201
+#: agent/gpg-agent.c:203
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualiza-la base de datos de confianza"
 
-#: agent/gpg-agent.c:203
+#: agent/gpg-agent.c:205
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 #, 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:213
+#: agent/gpg-agent.c:215
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:215
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:216
+#: agent/gpg-agent.c:218
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
 msgstr "non está soportado"
 
-#: agent/gpg-agent.c:218
+#: agent/gpg-agent.c:220
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:221
+#: agent/gpg-agent.c:223
 #, fuzzy
 #| msgid "not supported"
 msgid "enable putty support"
 msgstr "non está soportado"
 
-#: agent/gpg-agent.c:233 g10/gpg.c:844 scd/scdaemon.c:176 sm/gpgsm.c:382
+#: agent/gpg-agent.c:235 g10/gpg.c:844 scd/scdaemon.c:176 sm/gpgsm.c:383
 msgid "Options controlling the security"
 msgstr ""
 
-#: agent/gpg-agent.c:236
+#: agent/gpg-agent.c:238
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:238
+#: agent/gpg-agent.c:240
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:242
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:244
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:246
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:248
 #, fuzzy
 msgid "disallow the use of an external password cache"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:250
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:253
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: agent/gpg-agent.c:256
+#: agent/gpg-agent.c:258
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:261
 msgid "do not allow bypassing the passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:261
+#: agent/gpg-agent.c:263
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:265
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:266
+#: agent/gpg-agent.c:268
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:268
+#: agent/gpg-agent.c:272
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|emprega-lo modo de contrasinal N"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:274
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: agent/gpg-agent.c:273
+#: agent/gpg-agent.c:277
 msgid "Options controlling the PIN-Entry"
 msgstr ""
 
-#: agent/gpg-agent.c:275
+#: agent/gpg-agent.c:279
 #, fuzzy
 #| msgid "use the gpg-agent"
 msgid "never use the PIN-entry"
 msgstr "emprega-lo gpg-agent"
 
-#: agent/gpg-agent.c:277
+#: agent/gpg-agent.c:281
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:283
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:282
+#: agent/gpg-agent.c:286
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:286
+#: agent/gpg-agent.c:290
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:294
 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:551 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: agent/gpg-agent.c:557 agent/preset-passphrase.c:99 agent/protect-tool.c:154
 #: g10/gpg.c:1132 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:612 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:438
-#: dirmngr/dirmngr_ldap.c:175 tools/gpg-connect-agent.c:220 tools/gpgconf.c:151
+#: sm/gpgsm.c:613 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:446
+#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:151
 #: tools/gpg-check-pattern.c:143
 #, fuzzy
 msgid "Please report bugs to <@EMAIL@>.\n"
@@ -628,145 +643,145 @@ 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:560
+#: agent/gpg-agent.c:566
 #, fuzzy
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
 
-#: agent/gpg-agent.c:562
+#: agent/gpg-agent.c:568
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:607 g10/gpg.c:1337 scd/scdaemon.c:384 sm/gpgsm.c:760
-#: dirmngr/dirmngr.c:522
+#: agent/gpg-agent.c:613 g10/gpg.c:1337 scd/scdaemon.c:384 sm/gpgsm.c:761
+#: dirmngr/dirmngr.c:530
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:972 g10/gpg.c:3910 g10/gpg.c:3934 sm/gpgsm.c:1769
-#: sm/gpgsm.c:1775
+#: agent/gpg-agent.c:986 g10/gpg.c:3907 g10/gpg.c:3931 sm/gpgsm.c:1622
+#: sm/gpgsm.c:1628
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo seleccionado non é válido\n"
 
-#: agent/gpg-agent.c:1196 agent/gpg-agent.c:2019 common/comopt.c:93
-#: g10/gpg.c:2591 scd/scdaemon.c:549 sm/gpgsm.c:1155 dirmngr/dirmngr.c:989
-#: dirmngr/dirmngr.c:1840
+#: agent/gpg-agent.c:1210 agent/gpg-agent.c:2035 common/comopt.c:93
+#: g10/gpg.c:2594 scd/scdaemon.c:549 sm/gpgsm.c:1028 dirmngr/dirmngr.c:1029
+#: dirmngr/dirmngr.c:1879
 #, 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:1335 g10/gpg.c:3861 scd/scdaemon.c:687 sm/gpgsm.c:1709
-#: dirmngr/dirmngr.c:1108 tools/gpg-connect-agent.c:1270 tools/gpgconf.c:634
+#: agent/gpg-agent.c:1349 g10/gpg.c:3858 scd/scdaemon.c:687 sm/gpgsm.c:1562
+#: dirmngr/dirmngr.c:1145 tools/gpg-connect-agent.c:1270 tools/gpgconf.c:668
 #, 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:2172 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1267
+#: agent/gpg-agent.c:2188 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1306
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "non foi posible crear %s: %s\n"
 
-#: agent/gpg-agent.c:2189 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1280
+#: agent/gpg-agent.c:2205 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1319
 #, fuzzy, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "Revocación de certificado válida"
 
-#: agent/gpg-agent.c:2228
+#: agent/gpg-agent.c:2244
 #, 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:2239 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1312
+#: agent/gpg-agent.c:2255 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1351
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: agent/gpg-agent.c:2244 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1315
+#: agent/gpg-agent.c:2260 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1354
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "erro ao enviar a `%s': %s\n"
 
-#: agent/gpg-agent.c:2255 agent/gpg-agent.c:2295 agent/gpg-agent.c:2304
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1324
+#: agent/gpg-agent.c:2271 agent/gpg-agent.c:2311 agent/gpg-agent.c:2320
+#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1363
 #, fuzzy, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: agent/gpg-agent.c:2269 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1336
+#: agent/gpg-agent.c:2285 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1375
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: agent/gpg-agent.c:2289 agent/gpg-agent.c:2342 common/homedir.c:517
+#: agent/gpg-agent.c:2305 agent/gpg-agent.c:2358 common/homedir.c:537
 #: 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:2292 agent/gpg-agent.c:2347 common/homedir.c:520
+#: agent/gpg-agent.c:2308 agent/gpg-agent.c:2363 common/homedir.c:540
 #: g10/openfile.c:402
 #, fuzzy, c-format
 msgid "directory '%s' created\n"
 msgstr "%s: directorio creado\n"
 
-#: agent/gpg-agent.c:2353
+#: agent/gpg-agent.c:2369
 #, 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:2357
+#: agent/gpg-agent.c:2373
 #, 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:2512 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2069
+#: agent/gpg-agent.c:2528 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2108
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: agent/gpg-agent.c:2719
+#: agent/gpg-agent.c:2735
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2724
+#: agent/gpg-agent.c:2740
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2799
+#: agent/gpg-agent.c:2815
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2804
+#: agent/gpg-agent.c:2820
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3026 scd/scdaemon.c:1374 dirmngr/dirmngr.c:2283
+#: agent/gpg-agent.c:3042 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2322
 #, fuzzy, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "o segredo da actualización fallou: %s\n"
 
-#: agent/gpg-agent.c:3114 scd/scdaemon.c:1439
+#: agent/gpg-agent.c:3130 scd/scdaemon.c:1441
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu chaves omitidas\n"
 
-#: agent/gpg-agent.c:3252 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3271 common/simple-pwquery.c:247 g10/call-agent.c:260
 #: sm/call-agent.c:131 tools/gpg-connect-agent.c:2319 tools/card-call-scd.c:311
 #, fuzzy, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent non está dispoñible nesta sesión\n"
 
-#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:70
+#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:66
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -788,7 +803,7 @@ msgid ""
 msgstr ""
 
 #: agent/protect-tool.c:107 g10/gpg.c:448 kbx/kbxutil.c:72 sm/gpgsm.c:215
-#: dirmngr/dirmngr.c:168 tools/gpgconf.c:81
+#: dirmngr/dirmngr.c:169 tools/gpgconf.c:81
 msgid ""
 "@Commands:\n"
 " "
@@ -818,40 +833,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:707
+#: agent/protect-tool.c:708 sm/import.c:775
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Por favor, introduza o contrasinal; esta é unha frase secreta \n"
 
-#: agent/protect-tool.c:712
+#: agent/protect-tool.c:713 sm/export.c:727
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Por favor, introduza o contrasinal; esta é unha frase secreta \n"
 
-#: agent/protect-tool.c:718
+#: agent/protect-tool.c:719
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:723
+#: agent/protect-tool.c:724
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Por favor, introduza o contrasinal; esta é unha frase secreta \n"
 
-#: agent/protect-tool.c:734
+#: agent/protect-tool.c:735
 #, fuzzy, c-format
 msgid "cancelled\n"
 msgstr "Cancelar"
 
-#: agent/protect-tool.c:736
+#: agent/protect-tool.c:737
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: agent/trustlist.c:153 agent/trustlist.c:363 tools/gpgconf.c:424
+#: agent/trustlist.c:153 agent/trustlist.c:363 tools/gpgconf.c:458
 #, fuzzy, c-format
 msgid "error opening '%s': %s\n"
 msgstr "erro lendo `%s': %s\n"
@@ -1006,7 +1021,7 @@ msgstr "fallou a comprobación da sinatura creada: %s\n"
 msgid "secret key parts are not available\n"
 msgstr "hai partes da chave secreta non dispoñibles\n"
 
-#: agent/cvt-openpgp.c:343 g10/card-util.c:1562
+#: agent/cvt-openpgp.c:343 g10/card-util.c:1575
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -1038,7 +1053,7 @@ msgid "error creating a stream for a pipe: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
 #: common/exechelp-posix.c:505 common/exechelp-posix.c:580
-#: common/exechelp-posix.c:866 dirmngr/dirmngr.c:1354
+#: common/exechelp-posix.c:866 dirmngr/dirmngr.c:1393
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "erro lendo `%s': %s\n"
@@ -1111,7 +1126,7 @@ msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "non se puido poñe-la armadura: %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3082
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3099
 msgid "yes"
 msgstr "si|sim"
 
@@ -1166,7 +1181,7 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:115 g10/card-util.c:917 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:927 tools/no-libgcrypt.c:30
 #: tools/gpg-card.c:416
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
@@ -1238,7 +1253,7 @@ msgstr "erro ao crea-lo chaveiro `%s': %s\n"
 msgid "server '%s' is older than us (%s < %s)"
 msgstr ""
 
-#: common/asshelp.c:737 g10/call-dirmngr.c:408
+#: common/asshelp.c:737 g10/call-dirmngr.c:407
 #, fuzzy, c-format
 #| msgid "WARNING: %s overrides %s\n"
 msgid "WARNING: %s\n"
@@ -1335,7 +1350,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:4212
+#: scd/app-openpgp.c:4214
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
@@ -1421,12 +1436,12 @@ msgstr ""
 "Non se atoparon certificados con confianza non definida.\n"
 "\n"
 
-#: common/audit.c:1112 sm/certchain.c:1242
+#: common/audit.c:1112 sm/certchain.c:1243
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "Certificado correcto"
 
-#: common/audit.c:1115 sm/certchain.c:1252
+#: common/audit.c:1115 sm/certchain.c:1253
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Chave dispoñible en: "
@@ -1478,22 +1493,22 @@ msgstr "descoñecido"
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "carácter radix64 non válido %02x omitido\n"
 
-#: common/ttyio.c:433
+#: common/ttyio.c:447
 #, c-format
 msgid "Sorry, we are in batchmode - can't get input\n"
 msgstr ""
 
-#: common/ttyio.c:439
+#: common/ttyio.c:453
 #, c-format
 msgid "Sorry, no terminal at all requested - can't get input\n"
 msgstr ""
 
-#: common/ttyio.c:474 common/ttyio.c:484
+#: common/ttyio.c:488 common/ttyio.c:498
 #, c-format
 msgid "too many errors; giving up\n"
 msgstr ""
 
-#: common/ttyio.c:536
+#: common/ttyio.c:550
 #, c-format
 msgid "Control-D detected\n"
 msgstr ""
@@ -1547,8 +1562,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:1036 dirmngr/dirmngr.c:895
-#: dirmngr/dirmngr.c:904
+#: common/init.c:191 sm/gpgsm.c:909 dirmngr/dirmngr.c:935 dirmngr/dirmngr.c:944
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
@@ -1706,7 +1720,7 @@ msgid "Enter passphrase: "
 msgstr "Introduza o contrasinal: "
 
 #: g10/call-agent.c:318 g10/encrypt.c:282 g10/encrypt.c:818 g10/sign.c:473
-#: sm/call-agent.c:180 sm/encrypt.c:701 sm/sign.c:436
+#: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
 #, fuzzy, c-format
 #| msgid "%s does not yet work with %s\n"
 msgid "%s is not compliant with %s mode\n"
@@ -1717,225 +1731,225 @@ msgstr "¡%s aínda non traballa con %s!\n"
 msgid "error from TPM: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: g10/call-agent.c:2123 g10/passphrase.c:225 g10/passphrase.c:258
-#: tools/card-call-scd.c:1751
+#: g10/call-agent.c:2135 g10/passphrase.c:233 g10/passphrase.c:266
+#: tools/card-call-scd.c:1755
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problema co axente: o axente voltou coa resposta 0x%lx\n"
 
-#: g10/call-dirmngr.c:179 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2316
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2316
 #, fuzzy, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "gpg-agent non está dispoñible nesta sesión\n"
 
-#: g10/call-dirmngr.c:213
+#: g10/call-dirmngr.c:212
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "keyserver option \"honor-keyserver-url\" may not be used in Tor mode\n"
 msgstr "non se pode empregar %s no modo %s\n"
 
-#: g10/call-dirmngr.c:386
+#: g10/call-dirmngr.c:385
 msgid "WKD uses a cached result"
 msgstr ""
 
-#: g10/call-dirmngr.c:389
+#: g10/call-dirmngr.c:388
 msgid "Tor is not running"
 msgstr ""
 
-#: g10/call-dirmngr.c:391
+#: g10/call-dirmngr.c:390
 #, fuzzy
 msgid "Tor is not properly configured"
 msgstr "erro: pegada dactilar non válida\n"
 
-#: g10/call-dirmngr.c:393
+#: g10/call-dirmngr.c:392
 #, fuzzy
 msgid "DNS is not properly configured"
 msgstr "erro: pegada dactilar non válida\n"
 
-#: g10/call-dirmngr.c:395
+#: g10/call-dirmngr.c:394
 msgid "unacceptable HTTP redirect from server"
 msgstr ""
 
-#: g10/call-dirmngr.c:397
+#: g10/call-dirmngr.c:396
 msgid "unacceptable HTTP redirect from server was cleaned up"
 msgstr ""
 
-#: g10/call-dirmngr.c:399
+#: g10/call-dirmngr.c:398
 #, fuzzy
 #| msgid "generate a revocation certificate"
 msgid "server uses an invalid certificate"
 msgstr "xerar un certificado de revocación"
 
-#: g10/call-dirmngr.c:406 g10/gpg.c:4599
+#: g10/call-dirmngr.c:405 g10/gpg.c:4596
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:369 g10/card-util.c:1924
-#: tools/gpg-card.c:3039
+#: g10/card-util.c:86 g10/card-util.c:374 g10/card-util.c:1937
+#: tools/gpg-card.c:3056
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "a chave secreta non está dispoñible"
 
-#: g10/card-util.c:91 g10/card-util.c:1930
+#: g10/card-util.c:91 g10/card-util.c:1943
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:97 g10/card-util.c:2309 g10/delkey.c:164 g10/keyedit.c:1428
-#: g10/keygen.c:4791 g10/revoke.c:214 g10/revoke.c:638
+#: g10/card-util.c:97 g10/card-util.c:2322 g10/delkey.c:164 g10/keyedit.c:1428
+#: g10/keygen.c:4795 g10/revoke.c:214 g10/revoke.c:639
 #, fuzzy, c-format
 msgid "can't do this in batch mode\n"
 msgstr "non se pode facer iso no modo por lotes\n"
 
-#: g10/card-util.c:105 tools/gpg-card.c:2943
+#: g10/card-util.c:105 tools/gpg-card.c:2960
 #, fuzzy, c-format
 msgid "This command is only available for version 2 cards\n"
 msgstr "Non se admite este comando no modo %s.\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3398 tools/gpg-card.c:2948
+#: g10/card-util.c:107 scd/app-openpgp.c:3399 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"
 
-#: g10/card-util.c:140 g10/card-util.c:1448 g10/card-util.c:1710
-#: g10/card-util.c:1802 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1991 g10/keygen.c:2165 g10/keygen.c:2385 g10/keygen.c:2685
+#: g10/card-util.c:140 g10/card-util.c:1458 g10/card-util.c:1723
+#: g10/card-util.c:1815 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/keygen.c:1992 g10/keygen.c:2166 g10/keygen.c:2386 g10/keygen.c:2686
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
 #: tools/gpg-card.c:510
 msgid "Your selection? "
 msgstr "¿A súa selección? "
 
-#: g10/card-util.c:262 g10/card-util.c:313 tools/gpg-card.c:596
+#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:596
 #: tools/gpg-card.c:636
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:558 tools/gpg-card.c:903
+#: g10/card-util.c:563 tools/gpg-card.c:905
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:559 tools/gpg-card.c:904
+#: g10/card-util.c:564 tools/gpg-card.c:906
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:586 tools/gpg-card.c:931
+#: g10/card-util.c:591 tools/gpg-card.c:933
 #, fuzzy
 msgid "not forced"
 msgstr "non procesado"
 
-#: g10/card-util.c:586 tools/gpg-card.c:931
+#: g10/card-util.c:591 tools/gpg-card.c:933
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:768 tools/gpg-card.c:1468
+#: g10/card-util.c:773 tools/gpg-card.c:1484
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:770 tools/gpg-card.c:1470
+#: g10/card-util.c:775 tools/gpg-card.c:1486
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:772 tools/gpg-card.c:1472
+#: g10/card-util.c:777 tools/gpg-card.c:1488
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:789 tools/gpg-card.c:1505
+#: g10/card-util.c:795 tools/gpg-card.c:1521
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:791 tools/gpg-card.c:1506
+#: g10/card-util.c:797 tools/gpg-card.c:1522
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:809 tools/gpg-card.c:1523
+#: g10/card-util.c:816 tools/gpg-card.c:1539
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:830 tools/gpg-card.c:1561
+#: g10/card-util.c:840 tools/gpg-card.c:1577
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "non hai unha chave pública correspondente: %s\n"
 
-#: g10/card-util.c:926 g10/decrypt-data.c:495 g10/import.c:406 g10/import.c:756
-#: g10/import.c:815 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1666
-#: tools/gpgconf.c:437 tools/gpgconf.c:483 tools/gpg-card.c:426
+#: g10/card-util.c:936 g10/decrypt-data.c:495 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:1705
+#: tools/gpgconf.c:471 tools/gpgconf.c:517 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:959 g10/decrypt-data.c:498 g10/export.c:2496
+#: g10/card-util.c:969 g10/decrypt-data.c:498 g10/export.c:2496
 #: dirmngr/crlcache.c:925 tools/gpg-card.c:486 tools/gpg-card.c:493
 #, fuzzy, c-format
 msgid "error writing '%s': %s\n"
 msgstr "erro escribindo no chaveiro `%s': %s\n"
 
-#: g10/card-util.c:986 tools/gpg-card.c:1650
+#: g10/card-util.c:996 tools/gpg-card.c:1666
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:1024 tools/gpg-card.c:1945
+#: g10/card-util.c:1034 tools/gpg-card.c:1962
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:1109 tools/gpg-card.c:1699
+#: g10/card-util.c:1119 tools/gpg-card.c:1715
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferencias actualizadas"
 
-#: g10/card-util.c:1117 tools/gpg-card.c:1710
+#: g10/card-util.c:1127 tools/gpg-card.c:1726
 #, fuzzy, c-format
 msgid "Error: invalid length of preference string.\n"
 msgstr "caracter non válido na cadea de preferencias\n"
 
-#: g10/card-util.c:1126 tools/gpg-card.c:1719
+#: g10/card-util.c:1136 tools/gpg-card.c:1735
 #, fuzzy, c-format
 msgid "Error: invalid characters in preference string.\n"
 msgstr "caracter non válido na cadea de preferencias\n"
 
-#: g10/card-util.c:1148 tools/gpg-card.c:1753
+#: g10/card-util.c:1158 tools/gpg-card.c:1769
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1162 tools/gpg-card.c:1770
+#: g10/card-util.c:1172 tools/gpg-card.c:1786
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "erro: pegada dactilar non válida\n"
 
-#: g10/card-util.c:1185 tools/gpg-card.c:1835
+#: g10/card-util.c:1195 tools/gpg-card.c:1852
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Pegada dactilar:"
 
-#: g10/card-util.c:1209 tools/gpg-card.c:1861
+#: g10/card-util.c:1219 tools/gpg-card.c:1878
 #, fuzzy, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "erro: pegada dactilar non válida\n"
 
-#: g10/card-util.c:1259
+#: g10/card-util.c:1269
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "A xeración da chave fallou: %s\n"
 
-#: g10/card-util.c:1260
+#: g10/card-util.c:1270
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "non se atoparon datos OpenPGP válidos.\n"
 
-#: g10/card-util.c:1273 g10/keygen.c:4811 g10/keygen.c:5972
+#: g10/card-util.c:1283 g10/keygen.c:4815 g10/keygen.c:6003
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
 
-#: g10/card-util.c:1358
+#: g10/card-util.c:1368
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1375 tools/gpg-card.c:3328
+#: g10/card-util.c:1385 tools/gpg-card.c:3345
 msgid ""
 "Note: There is no guarantee that the card supports the requested\n"
 "      key type or size.  If the key generation does not succeed,\n"
@@ -1943,102 +1957,102 @@ msgid ""
 "      key types and sizes are supported.\n"
 msgstr ""
 
-#: g10/card-util.c:1396 g10/keygen.c:2570 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1406 g10/keygen.c:2571 sm/certreqgen-ui.c:180
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "¿Qué tamaño de chave quere? (1024) "
 
-#: g10/card-util.c:1406 g10/keygen.c:2493 g10/keygen.c:2525
+#: g10/card-util.c:1416 g10/keygen.c:2494 g10/keygen.c:2526
 #: sm/certreqgen-ui.c:195
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "redondeado a %u bits\n"
 
-#: g10/card-util.c:1414 g10/keygen.c:2578 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1424 g10/keygen.c:2579 sm/certreqgen-ui.c:185
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/card-util.c:1433
+#: g10/card-util.c:1443
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1435
+#: g10/card-util.c:1445
 #, fuzzy
 msgid "Signature key\n"
 msgstr "A sinatura caducou o %s\n"
 
-#: g10/card-util.c:1437
+#: g10/card-util.c:1447
 #, fuzzy
 msgid "Encryption key\n"
 msgstr "   (%d) RSA (só cifrar)\n"
 
-#: g10/card-util.c:1439
+#: g10/card-util.c:1449
 msgid "Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1441 g10/keygen.c:2112 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1451 g10/keygen.c:2113 sm/certreqgen-ui.c:158
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor, seleccione o tipo de chave que quere:\n"
 
-#: g10/card-util.c:1442 sm/certreqgen-ui.c:159
+#: g10/card-util.c:1452 sm/certreqgen-ui.c:159
 #, fuzzy, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA (só asinar)\n"
 
-#: g10/card-util.c:1443
+#: g10/card-util.c:1453
 #, fuzzy, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) DSA e ElGamal (por defecto)\n"
 
-#: g10/card-util.c:1455 g10/card-util.c:1722 g10/card-util.c:1822
-#: g10/keyedit.c:900 g10/keygen.c:2017 g10/keygen.c:2045 g10/keygen.c:2172
-#: g10/keygen.c:2425 g10/keygen.c:2713 g10/revoke.c:836
+#: g10/card-util.c:1468 g10/card-util.c:1735 g10/card-util.c:1835
+#: g10/keyedit.c:900 g10/keygen.c:2018 g10/keygen.c:2046 g10/keygen.c:2173
+#: g10/keygen.c:2426 g10/keygen.c:2714 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Selección non válida.\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1541
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 
-#: g10/card-util.c:1533
+#: g10/card-util.c:1546
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1582
 #, fuzzy, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "erro ao enviar a `%s': %s\n"
 
-#: g10/card-util.c:1585 g10/card-util.c:2106 g10/card-util.c:2162
+#: g10/card-util.c:1598 g10/card-util.c:2119 g10/card-util.c:2175
 #, fuzzy, c-format
 msgid "error getting card info: %s\n"
 msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
 
-#: g10/card-util.c:1591 g10/card-util.c:1936 g10/card-util.c:2112
-#: g10/card-util.c:2171 tools/gpg-card.c:3057 tools/gpg-card.c:3296
-#: tools/gpg-card.c:3354
+#: g10/card-util.c:1604 g10/card-util.c:1949 g10/card-util.c:2125
+#: g10/card-util.c:2184 tools/gpg-card.c:3074 tools/gpg-card.c:3313
+#: tools/gpg-card.c:3371
 #, fuzzy, c-format
 #| msgid "This command is not allowed while in %s mode.\n"
 msgid "This command is not supported by this card\n"
 msgstr "Non se admite este comando no modo %s.\n"
 
-#: g10/card-util.c:1637 tools/gpg-card.c:2426
+#: g10/card-util.c:1650 tools/gpg-card.c:2443
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1651
+#: g10/card-util.c:1664
 #, fuzzy, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "omítese: a chave secreta xa está presente\n"
 
-#: g10/card-util.c:1654 tools/gpg-card.c:2398
+#: g10/card-util.c:1667 tools/gpg-card.c:2415
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1666 tools/gpg-card.c:2457
+#: g10/card-util.c:1679 tools/gpg-card.c:2474
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2046,172 +2060,172 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1701
+#: g10/card-util.c:1714
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Por favor, seleccione o tipo de chave que quere:\n"
 
-#: g10/card-util.c:1703 g10/card-util.c:1793
+#: g10/card-util.c:1716 g10/card-util.c:1806
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "A sinatura caducou o %s\n"
 
-#: g10/card-util.c:1704 g10/card-util.c:1795
+#: g10/card-util.c:1717 g10/card-util.c:1808
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (só cifrar)\n"
 
-#: g10/card-util.c:1705 g10/card-util.c:1797
+#: g10/card-util.c:1718 g10/card-util.c:1810
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1790
+#: g10/card-util.c:1803
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Por favor, escolla o motivo da revocación:\n"
 
-#: g10/card-util.c:1836
+#: g10/card-util.c:1849
 #, fuzzy, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "a actualización fallou: %s\n"
 
-#: g10/card-util.c:1941 tools/gpg-card.c:3065
+#: g10/card-util.c:1954 tools/gpg-card.c:3082
 #, fuzzy, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr "omítese: a chave secreta xa está presente\n"
 
-#: g10/card-util.c:1944 tools/gpg-card.c:3068 tools/gpg-card.c:3409
+#: g10/card-util.c:1957 tools/gpg-card.c:3085 tools/gpg-card.c:3426
 #, fuzzy
 msgid "Continue? (y/N) "
 msgstr "¿Asinar de verdade? "
 
-#: g10/card-util.c:1949 tools/gpg-card.c:3079
+#: g10/card-util.c:1962 tools/gpg-card.c:3096
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2142
+#: g10/card-util.c:2155
 #, fuzzy, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: g10/card-util.c:2188
+#: g10/card-util.c:2201
 #, fuzzy, c-format
 msgid "error for setup UIF: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: g10/card-util.c:2212 g10/keyedit.c:1263 tools/gpg-card.c:3649
+#: g10/card-util.c:2225 g10/keyedit.c:1263 tools/gpg-card.c:3666
 msgid "quit this menu"
 msgstr "saír deste menú"
 
-#: g10/card-util.c:2214
+#: g10/card-util.c:2227
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandos conflictivos\n"
 
-#: g10/card-util.c:2215 g10/keyedit.c:1266 tools/gpg-card.c:3652
+#: g10/card-util.c:2228 g10/keyedit.c:1266 tools/gpg-card.c:3669
 msgid "show this help"
 msgstr "amosar esta axuda"
 
-#: g10/card-util.c:2217 tools/gpg-card.c:3654
+#: g10/card-util.c:2230 tools/gpg-card.c:3671
 #, fuzzy
 msgid "list all available data"
 msgstr "Chave dispoñible en: "
 
-#: g10/card-util.c:2220 tools/gpg-card.c:3656
+#: g10/card-util.c:2233 tools/gpg-card.c:3673
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:2221 tools/gpg-card.c:3657
+#: g10/card-util.c:2234 tools/gpg-card.c:3674
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:2222 tools/gpg-card.c:3658
+#: g10/card-util.c:2235 tools/gpg-card.c:3675
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:2223 tools/gpg-card.c:3659
+#: g10/card-util.c:2236 tools/gpg-card.c:3676
 #, fuzzy
 msgid "change the login name"
 msgstr "cambia-la fecha de expiración"
 
-#: g10/card-util.c:2224 tools/gpg-card.c:3660
+#: g10/card-util.c:2237 tools/gpg-card.c:3677
 #, fuzzy
 msgid "change the language preferences"
 msgstr "cambia-la confianza sobre o dono"
 
-#: g10/card-util.c:2225 tools/gpg-card.c:3661
+#: g10/card-util.c:2238 tools/gpg-card.c:3678
 msgid "change card holder's salutation"
 msgstr ""
 
-#: g10/card-util.c:2227 tools/gpg-card.c:3663
+#: g10/card-util.c:2240 tools/gpg-card.c:3680
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "amosar fingerprint"
 
-#: g10/card-util.c:2228 tools/gpg-card.c:3664
+#: g10/card-util.c:2241 tools/gpg-card.c:3681
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:2229 tools/gpg-card.c:3665
+#: g10/card-util.c:2242 tools/gpg-card.c:3682
 #, fuzzy
 msgid "generate new keys"
 msgstr "xerar un novo par de chaves"
 
-#: g10/card-util.c:2230 tools/gpg-card.c:3666
+#: g10/card-util.c:2243 tools/gpg-card.c:3683
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:2231 tools/gpg-card.c:3667
+#: g10/card-util.c:2244 tools/gpg-card.c:3684
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:2232 tools/gpg-card.c:3668
+#: g10/card-util.c:2245 tools/gpg-card.c:3685
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:2233 tools/gpg-card.c:3672
+#: g10/card-util.c:2246 tools/gpg-card.c:3689
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2235
+#: g10/card-util.c:2248
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr "|NOME|empregar NOME como valor por defecto do destinatario"
 
-#: g10/card-util.c:2236
+#: g10/card-util.c:2249
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "cambia-la confianza sobre o dono"
 
-#: g10/card-util.c:2237 tools/gpg-card.c:3674
+#: g10/card-util.c:2250 tools/gpg-card.c:3691
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the User Interaction Flag"
 msgstr "cambia-la confianza sobre o dono"
 
-#: g10/card-util.c:2361 tools/gpg-card.c:3924
+#: g10/card-util.c:2374 tools/gpg-card.c:3941
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2402
+#: g10/card-util.c:2415
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/card-util.c:2433
+#: g10/card-util.c:2446
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/card-util.c:2435
+#: g10/card-util.c:2448
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/card-util.c:2546 g10/keyedit.c:2275 tools/gpg-card.c:3814
-#: tools/gpg-card.c:4072
+#: g10/card-util.c:2559 g10/keyedit.c:2275 tools/gpg-card.c:3831
+#: tools/gpg-card.c:4089
 #, c-format
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando incorrecto (tente \"help\")\n"
@@ -2221,23 +2235,23 @@ msgstr "Comando incorrecto (tente \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output non traballa con este comando\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5293 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5292 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:1934 g10/export.c:2342 g10/export.c:2463
-#: g10/getkey.c:1907 g10/gpg.c:5238 g10/keyedit.c:1450 g10/keyedit.c:2382
-#: g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:703 g10/keyserver.c:1240
-#: g10/revoke.c:230 g10/tofu.c:2168
+#: g10/getkey.c:2032 g10/gpg.c:5237 g10/keyedit.c:1450 g10/keyedit.c:2382
+#: g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:703 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:2002 g10/getkey.c:1915 g10/getkey.c:4330
-#: g10/gpg.c:5247 g10/keyedit.c:2354 g10/keyserver.c:1258 g10/revoke.c:236
-#: g10/revoke.c:665 g10/tofu.c:2176
+#: g10/delkey.c:90 g10/export.c:2002 g10/getkey.c:2040 g10/getkey.c:4455
+#: g10/gpg.c:5246 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"
 msgstr "erro ao le-lo bloque de chaves: %s\n"
@@ -2363,14 +2377,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:555 g10/encrypt.c:808 g10/decrypt-data.c:261 g10/gpg.c:4083
-#: g10/gpg.c:4130 sm/decrypt.c:742 sm/encrypt.c:691 sm/gpgsm.c:1793
+#: g10/encrypt.c:555 g10/encrypt.c:808 g10/decrypt-data.c:261 g10/gpg.c:4080
+#: g10/gpg.c:4127 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1646
 #, 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:564 g10/gpg.c:4095 g10/gpg.c:4142 g10/sig-check.c:155
-#: g10/sign.c:452 sm/gpgsm.c:1803 sm/gpgsm.c:1813 sm/sign.c:596 sm/verify.c:510
+#: g10/encrypt.c:564 g10/gpg.c:4092 g10/gpg.c:4139 g10/sig-check.c:155
+#: g10/sign.c:452 sm/gpgsm.c:1656 sm/gpgsm.c:1666 sm/sign.c:596 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"
@@ -2388,7 +2402,7 @@ msgid ""
 msgstr ""
 "forza-la cifra simétrica %s (%d) viola as preferencias do destinatario\n"
 
-#: g10/encrypt.c:838 sm/encrypt.c:766
+#: g10/encrypt.c:838 sm/encrypt.c:767
 #, fuzzy, c-format
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "AVISO: \"%s\" é unha opción a extinguir\n"
@@ -2420,7 +2434,7 @@ msgstr "%s/%s cifrado para: \"%s\"\n"
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "non se pode empregar %s no modo %s\n"
 
-#: g10/decrypt-data.c:239 g10/mainproc.c:380 sm/decrypt.c:494
+#: g10/decrypt-data.c:239 g10/mainproc.c:380 sm/decrypt.c:892
 #, fuzzy, c-format
 #| msgid "%s encrypted data\n"
 msgid "%s.%s encrypted data\n"
@@ -2431,7 +2445,7 @@ msgstr "datos cifrados con %s\n"
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrado cun algoritmo descoñecido %d\n"
 
-#: g10/decrypt-data.c:361 g10/decrypt-data.c:414 sm/decrypt.c:508
+#: g10/decrypt-data.c:361 g10/decrypt-data.c:414 sm/decrypt.c:906
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2477,7 +2491,7 @@ msgstr ""
 msgid " - skipped"
 msgstr "%s: omitido: %s\n"
 
-#: g10/export.c:1333 g10/import.c:2124 g10/openfile.c:202 g10/openfile.c:296
+#: g10/export.c:1333 g10/import.c:2132 g10/openfile.c:202 g10/openfile.c:296
 #: g10/sign.c:1110 g10/sign.c:1447
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
@@ -2516,65 +2530,65 @@ msgstr "erro ao crear `%s': %s\n"
 msgid "[User ID not found]"
 msgstr "[Non se atopou o id de usuario]"
 
-#: g10/getkey.c:1199
+#: g10/getkey.c:1324
 #, fuzzy, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "erro ao crear `%s': %s\n"
 
-#: g10/getkey.c:1205
+#: g10/getkey.c:1330
 #, fuzzy, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "erro ao crear `%s': %s\n"
 
-#: g10/getkey.c:1207
+#: g10/getkey.c:1332
 #, fuzzy
 msgid "No fingerprint"
 msgstr "Pegada dactilar:"
 
-#: g10/getkey.c:1449
+#: g10/getkey.c:1574
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1884 g10/revoke.c:657 g10/revoke.c:718
+#: g10/getkey.c:2009 g10/revoke.c:658 g10/revoke.c:719
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "non se atopou a chave secreta `%s': %s\n"
 
-#: g10/getkey.c:1887 g10/pkclist.c:1012
+#: g10/getkey.c:2012 g10/pkclist.c:1012
 #, fuzzy, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "opcións de importación non válidas\n"
 
-#: g10/getkey.c:1965
+#: g10/getkey.c:2090
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "|NOME|empregar NOME coma chave secreta por defecto"
 
-#: g10/getkey.c:1973
+#: g10/getkey.c:2098
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "|NOME|empregar NOME coma chave secreta por defecto"
 
-#: g10/getkey.c:1980
+#: g10/getkey.c:2105
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr ""
 
-#: g10/getkey.c:2837
+#: g10/getkey.c:2962
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Chave %08lX non válida convertida en válida por --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:3703
+#: g10/getkey.c:3828
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "emprégase a chave secundaria %08lX no canto da primaria %08lX\n"
 
-#: g10/getkey.c:4259 g10/gpg.c:2167
+#: g10/getkey.c:4384 g10/gpg.c:2168
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "opcións de importación non válidas\n"
@@ -2779,7 +2793,7 @@ msgstr ""
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:651 kbx/kbxutil.c:91 sm/gpgsm.c:424 tools/gpgconf.c:113
+#: g10/gpg.c:651 kbx/kbxutil.c:91 sm/gpgsm.c:425 tools/gpgconf.c:113
 msgid "do not make any changes"
 msgstr "non facer ningún cambio"
 
@@ -2813,7 +2827,7 @@ msgstr "usar modo de texto canónico"
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|axusta-lo nivel de compresión a N (0 desactiva)"
 
-#: g10/gpg.c:762 sm/gpgsm.c:357
+#: g10/gpg.c:762 sm/gpgsm.c:358
 msgid "Options controlling key import and export"
 msgstr ""
 
@@ -2832,11 +2846,11 @@ msgstr "importar chaves dun servidor de chaves"
 msgid "include the public key in signatures"
 msgstr "verifica-las sinaturas das chaves"
 
-#: g10/gpg.c:776 sm/gpgsm.c:360
+#: g10/gpg.c:776 sm/gpgsm.c:361
 msgid "disable all access to the dirmngr"
 msgstr ""
 
-#: g10/gpg.c:788 sm/gpgsm.c:367
+#: g10/gpg.c:788 sm/gpgsm.c:368
 msgid "Options controlling key listings"
 msgstr ""
 
@@ -2856,15 +2870,15 @@ msgstr "|NOME|cifrar para NOME"
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "empregar este id de usuario para asinar ou descifrar"
 
-#: g10/gpg.c:876 sm/gpgsm.c:408
+#: g10/gpg.c:876 sm/gpgsm.c:409
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:895 sm/gpgsm.c:420 dirmngr/dirmngr.c:286
+#: g10/gpg.c:895 sm/gpgsm.c:421 dirmngr/dirmngr.c:289
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:966 sm/gpgsm.c:453
+#: g10/gpg.c:966 sm/gpgsm.c:454
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2923,7 +2937,7 @@ msgstr ""
 "asinar, verificar, cifrar ou descifrar\n"
 "a operación por defecto depende dos datos de entrada\n"
 
-#: g10/gpg.c:1168 sm/gpgsm.c:636
+#: g10/gpg.c:1168 sm/gpgsm.c:637
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2947,12 +2961,12 @@ msgstr "Hash: "
 msgid "Compression: "
 msgstr "Compresión: "
 
-#: g10/gpg.c:1274 sm/gpgsm.c:710
+#: g10/gpg.c:1274 sm/gpgsm.c:711
 #, fuzzy, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "uso: gpg [opcións] "
 
-#: g10/gpg.c:1467 sm/gpgsm.c:803
+#: g10/gpg.c:1467 sm/gpgsm.c:804
 #, c-format
 msgid "conflicting commands\n"
 msgstr "comandos conflictivos\n"
@@ -2962,535 +2976,535 @@ msgstr "comandos conflictivos\n"
 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:1683
+#: g10/gpg.c:1684
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1686
+#: g10/gpg.c:1687
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1689
+#: g10/gpg.c:1690
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1695
+#: g10/gpg.c:1696
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1698
+#: g10/gpg.c:1699
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1701
+#: g10/gpg.c:1702
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1708
 #, 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:1710
+#: g10/gpg.c:1711
 #, 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:1713
+#: g10/gpg.c:1714
 #, 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:1719
+#: g10/gpg.c:1720
 #, 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:1722
+#: g10/gpg.c:1723
 #, 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:1725
+#: g10/gpg.c:1726
 #, 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:1941
+#: g10/gpg.c:1942
 #, fuzzy, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr " creouse un novo ficheiro de configuración `%s'\n"
 
-#: g10/gpg.c:2037
+#: g10/gpg.c:2038
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:2039
+#: g10/gpg.c:2040
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/gpg.c:2041
+#: g10/gpg.c:2042
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2043
+#: g10/gpg.c:2044
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/gpg.c:2045
+#: g10/gpg.c:2046
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2049
+#: g10/gpg.c:2050
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2051
+#: g10/gpg.c:2052
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "o URL de normativa de sinaturas dado non é válido\n"
 
-#: g10/gpg.c:2053
+#: g10/gpg.c:2054
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:2055
+#: g10/gpg.c:2056
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:2057
+#: g10/gpg.c:2058
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:2059
+#: g10/gpg.c:2060
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "amosar en que chaveiro está unha chave listada"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2062
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/gpg.c:2178
+#: g10/gpg.c:2179
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "destinatario por defecto `%s' descoñecido\n"
 
-#: g10/gpg.c:2180
+#: g10/gpg.c:2181
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2975 g10/gpg.c:3828 g10/gpg.c:3840
+#: g10/gpg.c:2978 g10/gpg.c:3825 g10/gpg.c:3837
 #, 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:3151 g10/gpg.c:3163
+#: g10/gpg.c:3154 g10/gpg.c:3166
 #, 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:3185
+#: g10/gpg.c:3188
 #, 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:3217 sm/gpgsm.c:1270
+#: g10/gpg.c:3220 sm/gpgsm.c:1143
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "algoritmo de hash non válido `%s'\n"
 
-#: g10/gpg.c:3223 sm/gpgsm.c:1276
+#: g10/gpg.c:3226 sm/gpgsm.c:1149
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "opcións de importación non válidas\n"
 
-#: g10/gpg.c:3280
+#: g10/gpg.c:3283
 #, 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:3302 g10/gpg.c:3511 g10/keyedit.c:5319
+#: g10/gpg.c:3305 g10/gpg.c:3514 g10/keyedit.c:5322
 #, 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:3320
+#: g10/gpg.c:3323
 #, 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:3323
+#: g10/gpg.c:3326
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "opcións de exportación non válidas\n"
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3333
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opcións de importación non válidas\n"
 
-#: g10/gpg.c:3333
+#: g10/gpg.c:3336
 #, c-format
 msgid "invalid import options\n"
 msgstr "opcións de importación non válidas\n"
 
-#: g10/gpg.c:3339 g10/gpg.c:3354
+#: g10/gpg.c:3342 g10/gpg.c:3357
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "opcións de importación non válidas\n"
 
-#: g10/gpg.c:3345
+#: g10/gpg.c:3348
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opcións de exportación non válidas\n"
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3351
 #, c-format
 msgid "invalid export options\n"
 msgstr "opcións de exportación non válidas\n"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3363
 #, 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:3363
+#: g10/gpg.c:3366
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "opcións de importación non válidas\n"
 
-#: g10/gpg.c:3371
+#: g10/gpg.c:3374
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3373
+#: g10/gpg.c:3376
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3378
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s non é un xogo de caracteres válido\n"
 
-#: g10/gpg.c:3377
+#: g10/gpg.c:3380
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3384
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3386
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "o URL de normativa de sinaturas dado non é válido\n"
 
-#: g10/gpg.c:3385
+#: g10/gpg.c:3388
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s non é un xogo de caracteres válido\n"
 
-#: g10/gpg.c:3387
+#: g10/gpg.c:3390
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3389
+#: g10/gpg.c:3392
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s non é un xogo de caracteres válido\n"
 
-#: g10/gpg.c:3396
+#: g10/gpg.c:3399
 #, 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:3399
+#: g10/gpg.c:3402
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "opcións de exportación non válidas\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3409
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "non se puido estabrecer exec-path a %s\n"
 
-#: g10/gpg.c:3613
+#: g10/gpg.c:3616
 #, 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:3616
+#: g10/gpg.c:3619
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3625
+#: g10/gpg.c:3628
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "opcións de importación non válidas\n"
 
-#: g10/gpg.c:3807 sm/gpgsm.c:1675
+#: g10/gpg.c:3804 sm/gpgsm.c:1528
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: ¡o programa pode crear un ficheiro 'core'!\n"
 
-#: g10/gpg.c:3821
+#: g10/gpg.c:3818
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s fai que se ignore %s\n"
 
-#: g10/gpg.c:3830
+#: g10/gpg.c:3827
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "¡%s non se admite con %s!\n"
 
-#: g10/gpg.c:3833
+#: g10/gpg.c:3830
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "¡%s non ten sentido empregándoo con %s!\n"
 
-#: g10/gpg.c:3848 sm/gpgsm.c:1696 dirmngr/dirmngr.c:1123
+#: g10/gpg.c:3845 sm/gpgsm.c:1549 dirmngr/dirmngr.c:1160
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3869
+#: g10/gpg.c:3866
 #, 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:3897 g10/gpg.c:3928 sm/gpgsm.c:1763
+#: g10/gpg.c:3894 g10/gpg.c:3925 sm/gpgsm.c:1616
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non é válido\n"
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3901
 #, 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:3916
+#: g10/gpg.c:3913
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non é válido\n"
 
-#: g10/gpg.c:3922
+#: g10/gpg.c:3919
 #, 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:3937
+#: g10/gpg.c:3934
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser superior a 0\n"
 
-#: g10/gpg.c:3939
+#: g10/gpg.c:3936
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser superior a 1\n"
 
-#: g10/gpg.c:3941
+#: g10/gpg.c:3938
 #, 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:3943
+#: g10/gpg.c:3940
 #, 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:3945
+#: g10/gpg.c:3942
 #, 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:3949
+#: g10/gpg.c:3946
 #, 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:3953
+#: g10/gpg.c:3950
 #, 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:3960
+#: g10/gpg.c:3957
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto non válidas\n"
 
-#: g10/gpg.c:3964
+#: g10/gpg.c:3961
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias de cifrado personais non válidas\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3964
 #, 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:3971
+#: g10/gpg.c:3968
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias de resumo personais non válidas\n"
 
-#: g10/gpg.c:3975
+#: g10/gpg.c:3972
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias de compresión personais non válidas\n"
 
-#: g10/gpg.c:3984 g10/gpg.c:3989
+#: g10/gpg.c:3981 g10/gpg.c:3986
 #, 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:4026
+#: g10/gpg.c:4023
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "¡%s aínda non traballa con %s!\n"
 
-#: g10/gpg.c:4089
+#: g10/gpg.c:4086
 #, 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:4101
+#: g10/gpg.c:4098
 #, 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:4256
+#: g10/gpg.c:4253
 #, 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:4268
+#: g10/gpg.c:4265
 #, 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:4340
+#: g10/gpg.c:4337
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "o descifrado fallou: %s\n"
 
-#: g10/gpg.c:4369
+#: g10/gpg.c:4366
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4372
+#: g10/gpg.c:4369
 #, 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:4430
+#: g10/gpg.c:4427
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4433
+#: g10/gpg.c:4430
 #, 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:4821 g10/keyserver.c:1870
+#: g10/gpg.c:4818 g10/keyserver.c:1629
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "o envío ao servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:4826
+#: g10/gpg.c:4823
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "a recepción do servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:4832
+#: g10/gpg.c:4829
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "a exportación da chave fallou: %s\n"
 
-#: g10/gpg.c:4845
+#: g10/gpg.c:4842
 #, 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:4857
+#: g10/gpg.c:4854
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "a busca no servidor de chaves fallou fallou: %s\n"
 
-#: g10/gpg.c:4870
+#: g10/gpg.c:4867
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "a actualización no servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:4937
+#: g10/gpg.c:4936
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "non se puido quita-la armadura: %s\n"
 
-#: g10/gpg.c:4948
+#: g10/gpg.c:4947
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "non se puido poñe-la armadura: %s\n"
 
-#: g10/gpg.c:5053
+#: g10/gpg.c:5052
 #, 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:5205 g10/tofu.c:2156
+#: g10/gpg.c:5204 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:5216
+#: g10/gpg.c:5215
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5272
+#: g10/gpg.c:5271
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5283
+#: g10/gpg.c:5282
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Escriba a súa mensaxe ...\n"
 
-#: g10/gpg.c:5630
+#: g10/gpg.c:5629
 #, 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:5632
+#: g10/gpg.c:5631
 #, 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:5665
+#: g10/gpg.c:5664
 #, fuzzy, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "o URL de normativa de sinaturas dado non é válido\n"
@@ -3504,7 +3518,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:414 tools/gpgconf.c:116 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:415 tools/gpgconf.c:116 tools/gpg-card.c:95
 msgid "|FD|write status info to this FD"
 msgstr "|DF|escribi-la información de estado a este DF"
 
@@ -3599,271 +3613,271 @@ msgstr ""
 msgid "repair keys on import"
 msgstr "amosar fingerprint"
 
-#: g10/import.c:399 g10/import.c:721
+#: g10/import.c:407 g10/import.c:729
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "pasando por alto un bloque de tipo %d\n"
 
-#: g10/import.c:738
+#: g10/import.c:746
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu chaves procesadas hasta polo momento\n"
 
-#: g10/import.c:831
+#: g10/import.c:839
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Número total procesado: %lu\n"
 
-#: g10/import.c:834
+#: g10/import.c:842
 #, fuzzy, c-format
 #| msgid "      skipped new keys: %lu\n"
 msgid "    skipped PGP-2 keys: %lu\n"
 msgstr "novas chaves omitidas: %lu\n"
 
-#: g10/import.c:836
+#: g10/import.c:844
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "novas chaves omitidas: %lu\n"
 
-#: g10/import.c:839
+#: g10/import.c:847
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "   sin IDs de usuario: %lu\n"
 
-#: g10/import.c:842 sm/import.c:129
+#: g10/import.c:850 sm/import.c:129
 #, c-format
 msgid "              imported: %lu"
 msgstr "           importadas: %lu"
 
-#: g10/import.c:846 sm/import.c:133
+#: g10/import.c:854 sm/import.c:133
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "          sin cambios: %lu\n"
 
-#: g10/import.c:848
+#: g10/import.c:856
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr " novos IDs de usuario: %lu\n"
 
-#: g10/import.c:850
+#: g10/import.c:858
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "     novas sub-chaves: %lu\n"
 
-#: g10/import.c:852
+#: g10/import.c:860
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "         novas sinaturas: %lu\n"
 
-#: g10/import.c:854
+#: g10/import.c:862
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr " novas revocacións de chaves: %lu\n"
 
-#: g10/import.c:856 sm/import.c:135
+#: g10/import.c:864 sm/import.c:135
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "chaves secretas lidas: %lu\n"
 
-#: g10/import.c:858 sm/import.c:137
+#: g10/import.c:866 sm/import.c:137
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "chaves secretas importadas: %lu\n"
 
-#: g10/import.c:860 sm/import.c:139
+#: g10/import.c:868 sm/import.c:139
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "chaves secretas sin cambios: %lu\n"
 
-#: g10/import.c:862 sm/import.c:141
+#: g10/import.c:870 sm/import.c:141
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "       non importadas: %lu\n"
 
-#: g10/import.c:864
+#: g10/import.c:872
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "         novas sinaturas: %lu\n"
 
-#: g10/import.c:866
+#: g10/import.c:874
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "chaves secretas lidas: %lu\n"
 
-#: g10/import.c:1291
+#: g10/import.c:1299
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:1333
+#: g10/import.c:1341
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:1351
+#: g10/import.c:1359
 #, fuzzy, c-format
 msgid "         \"%s\": preference for AEAD algorithm %s\n"
 msgstr "Sinatura %s, algoritmo de resumo %s\n"
 
-#: g10/import.c:1366
+#: g10/import.c:1374
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "Sinatura %s, algoritmo de resumo %s\n"
 
-#: g10/import.c:1378
+#: g10/import.c:1386
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:1391
+#: g10/import.c:1399
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:1393
+#: g10/import.c:1401
 #, c-format
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:1418
+#: g10/import.c:1426
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:1932 g10/import.c:3053
+#: g10/import.c:1940 g10/import.c:3061
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "chave %08lX: non hai ID de usuario\n"
 
-#: g10/import.c:1938
+#: g10/import.c:1946
 #, fuzzy, c-format
 msgid "key %s: %s\n"
 msgstr "omítese `%s': %s\n"
 
-#: g10/import.c:1939 g10/import.c:3025
+#: g10/import.c:1947 g10/import.c:3033
 msgid "rejected by import screener"
 msgstr ""
 
-#: g10/import.c:1988
+#: g10/import.c:1996
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "chave %08lX: arranxouse a corrupción da sub-chave HKP\n"
 
-#: g10/import.c:2009
+#: g10/import.c:2017
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "chave %08lX: aceptouse o ID de usuario '%s' sen auto-sinatura\n"
 
-#: g10/import.c:2020 g10/import.c:2051
+#: g10/import.c:2028 g10/import.c:2059
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "chave %08lX: non hai IDs de usuario válidos\n"
 
-#: g10/import.c:2022
+#: g10/import.c:2030
 #, c-format
 msgid "this may be caused by a missing self-signature\n"
 msgstr "isto pode ser causado por unha auto-sinatura que falta\n"
 
-#: g10/import.c:2101 g10/import.c:3439
+#: g10/import.c:2109 g10/import.c:3447
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "chave %08lX: chave pública non atopada: %s\n"
 
-#: g10/import.c:2107
+#: g10/import.c:2115
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "chave %08lX: nova chave - omitida\n"
 
-#: g10/import.c:2119
+#: g10/import.c:2127
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "non se atopou un chaveiro no que se poida escribir: %s\n"
 
-#: g10/import.c:2151 g10/import.c:2253 g10/import.c:3514
+#: g10/import.c:2159 g10/import.c:2261 g10/import.c:3522
 #, fuzzy, c-format
 #| msgid "error writing keyring `%s': %s\n"
 msgid "error writing keyring '%s': %s\n"
 msgstr "erro escribindo no chaveiro `%s': %s\n"
 
-#: g10/import.c:2174
+#: g10/import.c:2182
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "chave %08lX: chave pública \"%s\" importada\n"
 
-#: g10/import.c:2201
+#: g10/import.c:2209
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "chave %08lX: non coincide coa nosa copia\n"
 
-#: g10/import.c:2269
+#: g10/import.c:2277
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "chave %08lX: \"%s\" 1 novo ID de usuario\n"
 
-#: g10/import.c:2272
+#: g10/import.c:2280
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "chave %08lX: \"%s\" %d novos IDs de usuario\n"
 
-#: g10/import.c:2275
+#: g10/import.c:2283
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "chave %08lX: \"%s\" 1 nova sinatura\n"
 
-#: g10/import.c:2278
+#: g10/import.c:2286
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "chave %08lX: \"%s\" %d novas sinaturas\n"
 
-#: g10/import.c:2281
+#: g10/import.c:2289
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "chave %08lX: \"%s\" 1 nova sub-chave\n"
 
-#: g10/import.c:2284
+#: g10/import.c:2292
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "chave %08lX: \"%s\" %d novas sub-chaves\n"
 
-#: g10/import.c:2287
+#: g10/import.c:2295
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novas sinaturas\n"
 
-#: g10/import.c:2290
+#: g10/import.c:2298
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novas sinaturas\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2301
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novos IDs de usuario\n"
 
-#: g10/import.c:2296
+#: g10/import.c:2304
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novos IDs de usuario\n"
 
-#: g10/import.c:2332
+#: g10/import.c:2340
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "chave %08lX: \"%s\" sen cambios\n"
 
-#: g10/import.c:2692 g10/import.c:2887
+#: g10/import.c:2700 g10/import.c:2895
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "chave %08lX: chave secreta importada\n"
 
-#: g10/import.c:2700
+#: g10/import.c:2708
 #, fuzzy, c-format
 #| msgid "skipped: secret key already present\n"
 msgid "key %s: secret key already exists\n"
 msgstr "omítese: a chave secreta xa está presente\n"
 
-#: g10/import.c:2708
+#: g10/import.c:2716
 #, fuzzy, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "erro ao enviar a `%s': %s\n"
@@ -3876,218 +3890,217 @@ msgstr "erro ao enviar a `%s': %s\n"
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2877
+#: g10/import.c:2885
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:3024
+#: g10/import.c:3032
 #, fuzzy, c-format
 msgid "secret key %s: %s\n"
 msgstr "non se atopou a chave secreta `%s': %s\n"
 
-#: g10/import.c:3045 g10/import.c:3084
+#: g10/import.c:3053 g10/import.c:3092
 #, fuzzy, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/import.c:3072
+#: g10/import.c:3080
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "chave %08lX: chave secreta cunha cifra %d non válida - omitida\n"
 
-#: g10/import.c:3234 g10/pkclist.c:75 g10/revoke.c:774
+#: g10/import.c:3242 g10/pkclist.c:75 g10/revoke.c:775
 msgid "No reason specified"
 msgstr "Non se especificou un motivo"
 
-#: g10/import.c:3235 g10/pkclist.c:77 g10/revoke.c:776
+#: g10/import.c:3243 g10/pkclist.c:77 g10/revoke.c:777
 msgid "Key is superseded"
 msgstr "A chave é obsoleta"
 
-#: g10/import.c:3236 g10/pkclist.c:79 g10/revoke.c:775
+#: g10/import.c:3244 g10/pkclist.c:79 g10/revoke.c:776
 msgid "Key has been compromised"
 msgstr "Esta chave quedou descoberta"
 
-#: g10/import.c:3237 g10/pkclist.c:81 g10/revoke.c:777
+#: g10/import.c:3245 g10/pkclist.c:81 g10/revoke.c:778
 msgid "Key is no longer used"
 msgstr "Xa non se emprega esta chave"
 
-#: g10/import.c:3238 g10/pkclist.c:83 g10/revoke.c:778
+#: g10/import.c:3246 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "O ID de usuario xa non é válido"
 
-#: g10/import.c:3363 g10/keylist.c:1105 g10/pkclist.c:87
+#: g10/import.c:3371 g10/keylist.c:1105 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "motivo para a revocación: "
 
-#: g10/import.c:3382 g10/keylist.c:1124 g10/pkclist.c:103
+#: g10/import.c:3390 g10/keylist.c:1124 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "comentario de revocación: "
 
-#: g10/import.c:3432
+#: g10/import.c:3440
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "chave %08lX: non hai chave pública - non se pode aplica-lo\n"
 "certificado de revocación\n"
 
-#: g10/import.c:3461
+#: g10/import.c:3469
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr ""
 "chave %08lX: non foi posible localiza-lo bloque de chaves original:\n"
 "%s\n"
 
-#: g10/import.c:3468
+#: g10/import.c:3476
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr ""
 "chave %08lX: non foi posible le-lo bloque de chaves original:\n"
 "%s\n"
 
-#: g10/import.c:3488
+#: g10/import.c:3496
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 "chave %08lX: certificado de revocación incorrecto:\n"
 "%s - rechazado\n"
 
-#: g10/import.c:3523
+#: g10/import.c:3531
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "chave %08lX: \"%s\" certificado de revocación importado\n"
 
-#: g10/import.c:3609
+#: g10/import.c:3617
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "chave %08lX: non hai ID de usuario para a sinatura\n"
 
-#: g10/import.c:3626
+#: g10/import.c:3634
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "chave %08lX: algoritmo de chave pública non soportado no ID de usuario \"%s"
 "\"\n"
 
-#: g10/import.c:3628
+#: g10/import.c:3636
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr ""
 "chave %08lX: auto-sinatura non válida no identificadr de usuario \"%s\"\n"
 
-#: g10/import.c:3645 g10/import.c:3673 g10/import.c:3729
+#: g10/import.c:3653 g10/import.c:3681 g10/import.c:3737
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "chave %08lX: algoritmo de chave pública non soportado\n"
 
-#: g10/import.c:3646
+#: g10/import.c:3654
 #, fuzzy, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "chave %08lX: engadiuse unha sinatura de chave directa\n"
 
-#: g10/import.c:3660
+#: g10/import.c:3668
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "chave %08lX: non hai sub-chave para a ligazón da chave\n"
 
-#: g10/import.c:3675
+#: g10/import.c:3683
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "chave %08lX: ligazón de sub-chave incorrecta\n"
 
-#: g10/import.c:3694
+#: g10/import.c:3702
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "chave %08lX: eliminouse unha ligazón de sub-chave múltiple\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3726
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "chave %08lX: non hai unha sub-chave para a revocación da chave\n"
 
-#: g10/import.c:3731
+#: g10/import.c:3739
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "chave %08lX: revocación de sub-chave non válida\n"
 
-#: g10/import.c:3746
+#: g10/import.c:3754
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "chave %08lX: eliminouse a revocación de sub-chaves múltiples\n"
 
-#: g10/import.c:3790
+#: g10/import.c:3798
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "chave %08lX: omitido o ID de usuario '"
 
-#: g10/import.c:3817
+#: g10/import.c:3825
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "chave %08lX: omitida a sub-chave\n"
 
-#: g10/import.c:3849
+#: g10/import.c:3857
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "chave %08lX: sinatura non exportable (clase %02x) - omitida\n"
 
-#: g10/import.c:3860
+#: g10/import.c:3868
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "chave %08lX: certificado de revocación no lugar erróneo - omitido\n"
 
-#: g10/import.c:3878
+#: g10/import.c:3886
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "chave %08lX: certificado de revocación incorrecto: %s - omitido\n"
 
-#: g10/import.c:3892
+#: g10/import.c:3900
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "chave %08lX: sinatura da sub-chave nun lugar incorrecto - omitida\n"
 
-#: g10/import.c:3900
+#: g10/import.c:3908
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "chave %08lX: clase de sinatura non esperada (0x%02X) - omitida\n"
 
-#: g10/import.c:4073
+#: g10/import.c:4081
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "chave %08lX: ID de usuario duplicado detectado - mesturado\n"
 
-#: g10/import.c:4180
+#: g10/import.c:4188
 #, fuzzy, c-format
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr "chave %08lX: ID de usuario duplicado detectado - mesturado\n"
 
-#: g10/import.c:4245
+#: g10/import.c:4253
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "AVISO: a chave %08lX pode estar revocada: obtendo a chave de revocación "
 "%08lX\n"
 
-#: g10/import.c:4261
+#: g10/import.c:4269
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVISO: a chave %08lX pode estar revocada: chave de revocación %08lX "
 "ausente.\n"
 
-#: g10/import.c:4327
+#: g10/import.c:4335
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "chave %08lX: \"%s\" certificado de revocación engadido\n"
 
-#: g10/import.c:4365
+#: g10/import.c:4373
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "chave %08lX: engadiuse unha sinatura de chave directa\n"
 
-#: g10/key-check.c:133 dirmngr/dirmngr_ldap.c:650 dirmngr/ldap-wrapper.c:835
-#: dirmngr/ldap-wrapper.c:852
+#: g10/key-check.c:133 dirmngr/ldap-wrapper.c:835 dirmngr/ldap-wrapper.c:852
 #, fuzzy, c-format
 msgid "error allocating memory: %s\n"
 msgstr "erro ao crea-lo chaveiro `%s': %s\n"
@@ -4150,7 +4163,7 @@ msgid ""
 "all signatures.\n"
 msgstr ""
 
-#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:284 sm/keydb.c:297
+#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:289 sm/keydb.c:302
 #, fuzzy, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "erro ao crea-lo chaveiro `%s': %s\n"
@@ -4161,7 +4174,7 @@ msgstr "erro ao crea-lo chaveiro `%s': %s\n"
 msgid "error creating keyring '%s': %s\n"
 msgstr "erro ao crea-lo chaveiro `%s': %s\n"
 
-#: g10/keydb.c:388 sm/keydb.c:303
+#: g10/keydb.c:388 sm/keydb.c:308
 #, fuzzy, c-format
 msgid "keybox '%s' created\n"
 msgstr "chaveiro `%s' creado\n"
@@ -4438,8 +4451,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "¿Asinar de verdade? "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6192 g10/keyedit.c:6275 g10/keyedit.c:6404
-#: g10/keyedit.c:6466 g10/sign.c:528
+#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
+#: g10/keyedit.c:6474 g10/sign.c:528
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "fallou a sinatura: %s\n"
@@ -4854,7 +4867,7 @@ msgstr "Non hai tal ID de usuario.\n"
 msgid "Nothing to sign.\n"
 msgstr "Nada que asinar coa chave %08lX\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6057
+#: g10/keyedit.c:2973 g10/keyedit.c:6065
 #, fuzzy, c-format
 msgid "Not signed by you.\n"
 msgstr "   asinada por %08lX no %s%s\n"
@@ -4924,7 +4937,7 @@ msgstr "Esta chave pode estar revocada por %s chave "
 msgid "(sensitive)"
 msgstr " (sensible)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:525
+#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "non foi posible crear %s: %s\n"
@@ -4940,7 +4953,7 @@ msgid "expired: %s"
 msgstr " [caduca: %s]"
 
 #: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2262
-#: g10/keyserver.c:531
+#: g10/keyserver.c:354
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [caduca: %s]"
@@ -4976,14 +4989,14 @@ 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:535
-#: g10/mainproc.c:2280 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
+#: g10/mainproc.c:2282 g10/tofu.c:1789 g10/trust.c:426 dirmngr/ocsp.c:792
 #, fuzzy
 msgid "revoked"
 msgstr "[revocada] "
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:539
-#: g10/mainproc.c:2282 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
+#: g10/mainproc.c:2284 g10/tofu.c:1794 g10/trust.c:113
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -5027,7 +5040,7 @@ msgstr ""
 "Non pode engadir unha identificación fotográfica a unha chave de estilo "
 "PGP2.\n"
 
-#: g10/keyedit.c:4273 g10/keygen.c:3107
+#: g10/keyedit.c:4273 g10/keygen.c:3111
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
@@ -5183,7 +5196,7 @@ msgstr ""
 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:5357 g10/keyedit.c:5495
+#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
 #, 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"
@@ -5192,134 +5205,134 @@ msgstr "omitindo a auto-sinatura v3 do id de usuario \"%s\"\n"
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5380
+#: g10/keyedit.c:5383
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "¿Está seguro de que quere empregala (s/N)? "
 
-#: g10/keyedit.c:5381
+#: g10/keyedit.c:5384
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "¿Está seguro de que quere empregala (s/N)? "
 
-#: g10/keyedit.c:5441
+#: g10/keyedit.c:5449
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notación de sinaturas: "
 
-#: g10/keyedit.c:5588
+#: g10/keyedit.c:5596
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "¿Sobrescribir? (s/N) "
 
-#: g10/keyedit.c:5658
+#: g10/keyedit.c:5666
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Non hai ID de usuario con índice %d\n"
 
-#: g10/keyedit.c:5720
+#: g10/keyedit.c:5728
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Non hai ID de usuario con índice %d\n"
 
-#: g10/keyedit.c:5821
+#: g10/keyedit.c:5829
 #, fuzzy, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Non hai ID de usuario con índice %d\n"
 
-#: g10/keyedit.c:5843
+#: g10/keyedit.c:5851
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Non hai ID de usuario con índice %d\n"
 
-#: g10/keyedit.c:5984
+#: g10/keyedit.c:5992
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usuario: \""
 
-#: g10/keyedit.c:5987 g10/keyedit.c:6089 g10/keyedit.c:6137
+#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
 #, 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:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
+#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
 msgid " (non-exportable)"
 msgstr " (non exportable)"
 
-#: g10/keyedit.c:5993
+#: g10/keyedit.c:6001
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta sinatura caducou o %s.\n"
 
-#: g10/keyedit.c:5998
+#: g10/keyedit.c:6006
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "¿Está seguro de que quere revocala? (s/N) "
 
-#: g10/keyedit.c:6003
+#: g10/keyedit.c:6011
 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:6063
+#: g10/keyedit.c:6071
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Asinou estes IDs de usuario: \n"
 
-#: g10/keyedit.c:6092
+#: g10/keyedit.c:6100
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (non exportable)"
 
-#: g10/keyedit.c:6099
+#: g10/keyedit.c:6107
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocada por %08lX no %s\n"
 
-#: g10/keyedit.c:6124
+#: g10/keyedit.c:6132
 msgid "You are about to revoke these signatures:\n"
 msgstr "Está a punto de revocar estas sinaturas:\n"
 
-#: g10/keyedit.c:6147
+#: g10/keyedit.c:6155
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "¿Realmente desexa crea-los certificados de revocación? (s/N) "
 
-#: g10/keyedit.c:6180
+#: g10/keyedit.c:6188
 #, c-format
 msgid "no secret key\n"
 msgstr "non hai chave secreta\n"
 
-#: g10/keyedit.c:6228
+#: g10/keyedit.c:6236
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6238
+#: g10/keyedit.c:6246
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "o ID de usuario \"%s\" xa está revocado\n"
 
-#: g10/keyedit.c:6255
+#: g10/keyedit.c:6263
 #, 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:6351
+#: g10/keyedit.c:6359
 #, 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:6389
+#: g10/keyedit.c:6397
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "o ID de usuario \"%s\" xa está revocado\n"
 
-#: g10/keyedit.c:6451
+#: g10/keyedit.c:6459
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "o ID de usuario \"%s\" xa está revocado\n"
 
-#: g10/keyedit.c:6548
+#: g10/keyedit.c:6556
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -5330,83 +5343,83 @@ msgstr ""
 msgid "invalid value for option '%s'\n"
 msgstr "opcións de importación non válidas\n"
 
-#: g10/keygen.c:338
+#: g10/keygen.c:339
 #, fuzzy, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "preferencia %c%lu duplicada\n"
 
-#: g10/keygen.c:345
+#: g10/keygen.c:346
 #, fuzzy, c-format
 msgid "too many cipher preferences\n"
 msgstr "demasiadas preferencias `%c'\n"
 
-#: g10/keygen.c:347
+#: g10/keygen.c:348
 #, fuzzy, c-format
 msgid "too many digest preferences\n"
 msgstr "demasiadas preferencias `%c'\n"
 
-#: g10/keygen.c:349
+#: g10/keygen.c:350
 #, fuzzy, c-format
 msgid "too many compression preferences\n"
 msgstr "demasiadas preferencias `%c'\n"
 
-#: g10/keygen.c:351
+#: g10/keygen.c:352
 #, fuzzy, c-format
 msgid "too many AEAD preferences\n"
 msgstr "demasiadas preferencias `%c'\n"
 
-#: g10/keygen.c:521
+#: g10/keygen.c:522
 #, fuzzy, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "caracter non válido na cadea de preferencias\n"
 
-#: g10/keygen.c:1130
+#: g10/keygen.c:1131
 #, c-format
 msgid "writing direct signature\n"
 msgstr "escribindo unha sinatura directa\n"
 
-#: g10/keygen.c:1176
+#: g10/keygen.c:1177
 #, c-format
 msgid "writing self signature\n"
 msgstr "escribindo a propia sinatura\n"
 
-#: g10/keygen.c:1233
+#: g10/keygen.c:1234
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "escribindo unha sinatura que liga a chave\n"
 
-#: g10/keygen.c:1598 g10/keygen.c:1603 g10/keygen.c:1655 g10/keygen.c:1660
-#: g10/keygen.c:1832 g10/keygen.c:1837
+#: g10/keygen.c:1599 g10/keygen.c:1604 g10/keygen.c:1656 g10/keygen.c:1661
+#: g10/keygen.c:1833 g10/keygen.c:1838
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tamaño de chave non válido; empregando %u bits\n"
 
-#: g10/keygen.c:1609 g10/keygen.c:1666 g10/keygen.c:1674 g10/keygen.c:1843
+#: g10/keygen.c:1610 g10/keygen.c:1667 g10/keygen.c:1675 g10/keygen.c:1844
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tamaño de chave redondeado a %u bits\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1701
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1899
+#: g10/keygen.c:1900
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1902
+#: g10/keygen.c:1903
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1906
 #, fuzzy
 msgid "Encrypt"
 msgstr "cifrar datos"
 
-#: g10/keygen.c:1908
+#: g10/keygen.c:1909
 msgid "Authenticate"
 msgstr ""
 
@@ -5420,180 +5433,180 @@ msgstr ""
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1929
+#: g10/keygen.c:1930
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1967
 #, c-format
 msgid "Possible actions for this %s key: "
 msgstr ""
 
-#: g10/keygen.c:1973
+#: g10/keygen.c:1974
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1979
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1981
+#: g10/keygen.c:1982
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (só cifrar)\n"
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1985
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1987
+#: g10/keygen.c:1988
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:2116
+#: g10/keygen.c:2117
 #, fuzzy, c-format
 msgid "   (%d) RSA and RSA%s\n"
 msgstr "   (%d) DSA e ElGamal (por defecto)\n"
 
-#: g10/keygen.c:2120
+#: g10/keygen.c:2121
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal%s\n"
 msgstr "   (%d) DSA e ElGamal (por defecto)\n"
 
-#: g10/keygen.c:2123
+#: g10/keygen.c:2124
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "   (%d) DSA (sign only)%s\n"
 msgstr "   (%d) DSA (só asinar)\n"
 
-#: g10/keygen.c:2125
+#: g10/keygen.c:2126
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (sign only)\n"
 msgid "   (%d) RSA (sign only)%s\n"
 msgstr "   (%d) RSA (só asinar)\n"
 
-#: g10/keygen.c:2131
+#: g10/keygen.c:2132
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)%s\n"
 msgstr "   (%d) ElGamal (só cifrar)\n"
 
-#: g10/keygen.c:2133
+#: g10/keygen.c:2134
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (encrypt only)\n"
 msgid "   (%d) RSA (encrypt only)%s\n"
 msgstr "   (%d) RSA (só cifrar)\n"
 
-#: g10/keygen.c:2139
+#: g10/keygen.c:2140
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (só cifrar)\n"
 
-#: g10/keygen.c:2141
+#: g10/keygen.c:2142
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (só cifrar)\n"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2148
 #, fuzzy, c-format
 #| msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgid "   (%d) ECC (sign and encrypt)%s\n"
 msgstr "   (%d) ElGamal (asinar e cifrar)\n"
 
-#: g10/keygen.c:2147 g10/keygen.c:2678
+#: g10/keygen.c:2148 g10/keygen.c:2679
 #, fuzzy
 #| msgid " (default)"
 msgid " *default*"
 msgstr " (por defecto)"
 
-#: g10/keygen.c:2148
+#: g10/keygen.c:2149
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "  (%d) ECC (sign only)\n"
 msgstr "   (%d) DSA (só asinar)\n"
 
-#: g10/keygen.c:2150
+#: g10/keygen.c:2151
 #, fuzzy, c-format
 msgid "  (%d) ECC (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (só cifrar)\n"
 
-#: g10/keygen.c:2152
+#: g10/keygen.c:2153
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (encrypt only)\n"
 msgid "  (%d) ECC (encrypt only)%s\n"
 msgstr "   (%d) RSA (só cifrar)\n"
 
-#: g10/keygen.c:2156
+#: g10/keygen.c:2157
 #, fuzzy, c-format
 msgid "  (%d) Existing key%s\n"
 msgstr "   (%d) RSA (só cifrar)\n"
 
-#: g10/keygen.c:2158
+#: g10/keygen.c:2159
 #, fuzzy, c-format
 msgid "  (%d) Existing key from card%s\n"
 msgstr "   (%d) RSA (só cifrar)\n"
 
-#: g10/keygen.c:2254 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2255 sm/certreqgen-ui.c:203
 #, fuzzy
 msgid "Enter the keygrip: "
 msgstr "Notación de sinaturas: "
 
-#: g10/keygen.c:2267 sm/certreqgen-ui.c:211 tools/gpg-card.c:2280
+#: g10/keygen.c:2268 sm/certreqgen-ui.c:211 tools/gpg-card.c:2297
 #, c-format
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr ""
 
-#: g10/keygen.c:2269 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2270 sm/certreqgen-ui.c:213
 #, fuzzy
 msgid "No key with this keygrip\n"
 msgstr "Non hai ID de usuario con índice %d\n"
 
-#: g10/keygen.c:2288 g10/keygen.c:2298 g10/keygen.c:3440 g10/keygen.c:3451
+#: g10/keygen.c:2289 g10/keygen.c:2299 g10/keygen.c:3444 g10/keygen.c:3455
 #: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
 #, fuzzy, c-format
 msgid "error reading the card: %s\n"
 msgstr "%s: erro ao ler un rexistro libre: %s\n"
 
-#: g10/keygen.c:2292 g10/keygen.c:3444 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2293 g10/keygen.c:3448 sm/certreqgen-ui.c:234
 #, fuzzy, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: g10/keygen.c:2311 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2312 sm/certreqgen-ui.c:246
 #, fuzzy
 msgid "Available keys:\n"
 msgstr "deshabilitar unha chave"
 
-#: g10/keygen.c:2504 g10/keygen.c:2518
+#: g10/keygen.c:2505 g10/keygen.c:2519
 #, fuzzy, c-format
 #| msgid "rounded up to %u bits\n"
 msgid "rounded to %u bits\n"
 msgstr "redondeado a %u bits\n"
 
-#: g10/keygen.c:2559
+#: g10/keygen.c:2560
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:2567
+#: g10/keygen.c:2568
 #, fuzzy, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "¿Qué tamaño de chave quere? (1024) "
 
-#: g10/keygen.c:2584 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2585 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tamaño de chave requerido son %u bits\n"
 
-#: g10/keygen.c:2630
+#: g10/keygen.c:2631
 #, fuzzy
 #| msgid "Please select what kind of key you want:\n"
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Por favor, seleccione o tipo de chave que quere:\n"
 
-#: g10/keygen.c:2819
+#: g10/keygen.c:2820
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5609,7 +5622,7 @@ msgstr ""
 "      <n>m = a chave caduca en n meses\n"
 "      <n>y = a chave caduca en n anos\n"
 
-#: g10/keygen.c:2830
+#: g10/keygen.c:2831
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5625,40 +5638,40 @@ msgstr ""
 "      <n>m = a sinatura caduca en n meses\n"
 "      <n>y = a sinatura caduca en n anos\n"
 
-#: g10/keygen.c:2853
+#: g10/keygen.c:2854
 msgid "Key is valid for? (0) "
 msgstr "¿Por canto tempo é válida a chave? (0) "
 
-#: g10/keygen.c:2858
+#: g10/keygen.c:2859
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "¿Por canto tempo é válida a sinatura? (0) "
 
-#: g10/keygen.c:2871 g10/keygen.c:2896
+#: g10/keygen.c:2875 g10/keygen.c:2900
 msgid "invalid value\n"
 msgstr "valor non válido\n"
 
-#: g10/keygen.c:2878
+#: g10/keygen.c:2882
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s non caduca nunca\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2883
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s non caduca nunca\n"
 
-#: g10/keygen.c:2884
+#: g10/keygen.c:2888
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s caduca o %s\n"
 
-#: g10/keygen.c:2885
+#: g10/keygen.c:2889
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "A sinatura caduca o %s\n"
 
-#: g10/keygen.c:2889
+#: g10/keygen.c:2893
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5666,12 +5679,12 @@ msgstr ""
 "O seu sistema non pode amosar datas máis aló do 2038.\n"
 "Aínda así, hase tratar correctamente ata o 2106.\n"
 
-#: g10/keygen.c:2902
+#: g10/keygen.c:2906
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "¿Isto é correcto? (s/n) "
 
-#: g10/keygen.c:2970
+#: g10/keygen.c:2974
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5682,7 +5695,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2985
+#: g10/keygen.c:2989
 #, fuzzy
 msgid ""
 "\n"
@@ -5699,50 +5712,50 @@ msgstr ""
 "     \"Heinrich Heime (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:3004
+#: g10/keygen.c:3008
 msgid "Real name: "
 msgstr "Nome: "
 
-#: g10/keygen.c:3013
+#: g10/keygen.c:3017
 msgid "Invalid character in name\n"
 msgstr "Caracter non válido no nome\n"
 
-#: g10/keygen.c:3014
+#: g10/keygen.c:3018
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:3018
+#: g10/keygen.c:3022
 msgid "Name may not start with a digit\n"
 msgstr "O nome non pode comezar cun díxito\n"
 
-#: g10/keygen.c:3021
+#: g10/keygen.c:3025
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome debe ter alomenos 5 caracteres\n"
 
-#: g10/keygen.c:3031
+#: g10/keygen.c:3035
 msgid "Email address: "
 msgstr "Enderezo de E-mail: "
 
-#: g10/keygen.c:3037
+#: g10/keygen.c:3041
 msgid "Not a valid email address\n"
 msgstr "Non é un enderezo de e-mail válido\n"
 
-#: g10/keygen.c:3046
+#: g10/keygen.c:3050
 msgid "Comment: "
 msgstr "Comentario: "
 
-#: g10/keygen.c:3052
+#: g10/keygen.c:3056
 msgid "Invalid character in comment\n"
 msgstr "Carácter non válido no comentario\n"
 
-#: g10/keygen.c:3088
+#: g10/keygen.c:3092
 #, fuzzy, c-format
 #| msgid "You are using the `%s' character set.\n"
 msgid "You are using the '%s' character set.\n"
 msgstr "Está a usa-lo xogo de caracteres `%s'.\n"
 
-#: g10/keygen.c:3094
+#: g10/keygen.c:3098
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5753,7 +5766,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3099
+#: g10/keygen.c:3103
 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"
@@ -5769,35 +5782,35 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3124
+#: g10/keygen.c:3128
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeAaSs"
 
-#: g10/keygen.c:3134
+#: g10/keygen.c:3138
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "¿Cambia-lo (N)ome, (C)omentario, (E)-mail ou (S)aír? "
 
-#: g10/keygen.c:3135
+#: g10/keygen.c:3139
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "¿Cambiar (N)ome, (C)omentario, (E)-mail ou (A)ceptar/(S)aír? "
 
-#: g10/keygen.c:3140
+#: g10/keygen.c:3144
 #, fuzzy
 #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "¿Cambia-lo (N)ome, (C)omentario, (E)-mail ou (S)aír? "
 
-#: g10/keygen.c:3141
+#: g10/keygen.c:3145
 #, fuzzy
 #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "¿Cambiar (N)ome, (C)omentario, (E)-mail ou (A)ceptar/(S)aír? "
 
-#: g10/keygen.c:3160
+#: g10/keygen.c:3164
 msgid "Please correct the error first\n"
 msgstr "Por favor, corrixa antes o erro\n"
 
-#: g10/keygen.c:3206
+#: g10/keygen.c:3210
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -5809,18 +5822,18 @@ msgstr ""
 "mentres se xeran os números primos; isto proporciónalle ao xerador de\n"
 "números aleatorios unha opoertunidade de acumular entropía de abondo.\n"
 
-#: g10/keygen.c:3591
+#: g10/keygen.c:3595
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4590 g10/keygen.c:4663 g10/keygen.c:4681 g10/keygen.c:4710
-#: g10/keygen.c:5086 g10/keygen.c:5632 g10/keygen.c:5943 g10/keygen.c:6050
+#: g10/keygen.c:4594 g10/keygen.c:4667 g10/keygen.c:4685 g10/keygen.c:4714
+#: g10/keygen.c:5113 g10/keygen.c:5663 g10/keygen.c:5974 g10/keygen.c:6081
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A xeración da chave fallou: %s\n"
 
-#: g10/keygen.c:4599
+#: g10/keygen.c:4603
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5828,69 +5841,69 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:4601
+#: g10/keygen.c:4605
 msgid "Continue? (Y/n) "
 msgstr ""
 
-#: g10/keygen.c:4622
+#: g10/keygen.c:4626
 #, fuzzy, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "`%s' xa está comprimido\n"
 
-#: g10/keygen.c:4627
+#: g10/keygen.c:4631
 #, fuzzy
 #| msgid "Create anyway? "
 msgid "Create anyway? (y/N) "
 msgstr "¿Crear de tódolos xeitos? "
 
-#: g10/keygen.c:4633
+#: g10/keygen.c:4637
 #, fuzzy, c-format
 #| msgid "Create anyway? "
 msgid "creating anyway\n"
 msgstr "¿Crear de tódolos xeitos? "
 
-#: g10/keygen.c:5069
+#: g10/keygen.c:5096
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 
-#: g10/keygen.c:5118
+#: g10/keygen.c:5145
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Cancelouse a xeración de chaves.\n"
 
-#: g10/keygen.c:5178
+#: g10/keygen.c:5205
 #, fuzzy, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "non se pode crear `%s': %s\n"
 
-#: g10/keygen.c:5198
+#: g10/keygen.c:5225
 #, fuzzy, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "NOTA: a chave secreta %08lX caducou o %s\n"
 
-#: g10/keygen.c:5359 g10/keygen.c:5561
+#: g10/keygen.c:5389 g10/keygen.c:5591
 #, fuzzy, c-format
 #| msgid "writing public key to `%s'\n"
 msgid "writing public key to '%s'\n"
 msgstr "gravando a chave pública en `%s'\n"
 
-#: g10/keygen.c:5555
+#: g10/keygen.c:5585
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "non se atopou un chaveiro público no que se poida escribir: %s\n"
 
-#: g10/keygen.c:5569
+#: g10/keygen.c:5599
 #, fuzzy, c-format
 #| msgid "error writing public keyring `%s': %s\n"
 msgid "error writing public keyring '%s': %s\n"
 msgstr "erro escribindo no chaveiro público `%s': %s\n"
 
-#: g10/keygen.c:5603
+#: g10/keygen.c:5634
 msgid "public and secret key created and signed.\n"
 msgstr "creáronse e asináronse as chaves pública e secreta.\n"
 
-#: g10/keygen.c:5619
+#: g10/keygen.c:5650
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -5900,7 +5913,7 @@ msgstr ""
 "queira emprega-lo comando \"--edit-key\" para xerar unha chave secundaria\n"
 "con esa finalidade.\n"
 
-#: g10/keygen.c:5801 g10/keygen.c:6000
+#: g10/keygen.c:5832 g10/keygen.c:6031
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5908,7 +5921,7 @@ msgstr ""
 "creouse a chave %lu segundo no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/keygen.c:5803 g10/keygen.c:6002
+#: g10/keygen.c:5834 g10/keygen.c:6033
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5916,23 +5929,23 @@ msgstr ""
 "creouse a chave %lu segundos no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/keygen.c:5814 g10/keygen.c:6013
+#: g10/keygen.c:5845 g10/keygen.c:6044
 #, fuzzy, c-format
 #| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOTA: a creación de subchaves para chaves v3 non cumpre OpenPGP\n"
 
-#: g10/keygen.c:5826 g10/keygen.c:5828
+#: g10/keygen.c:5857 g10/keygen.c:5859
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "as partes secretas da chave primaria non están dispoñibles.\n"
 
-#: g10/keygen.c:5835 g10/keygen.c:5837
+#: g10/keygen.c:5866 g10/keygen.c:5868
 #, fuzzy, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "as partes secretas da chave primaria non están dispoñibles.\n"
 
-#: g10/keygen.c:5857 g10/keygen.c:6027
+#: g10/keygen.c:5888 g10/keygen.c:6058
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "¿Crear realmente? "
@@ -6015,19 +6028,19 @@ msgstr "     Pegada dactilar ="
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1467
+#: g10/keyring.c:1477
 #, fuzzy, c-format
 msgid "caching keyring '%s'\n"
 msgstr "comprobando o chaveiro `%s'\n"
 
-#: g10/keyring.c:1541
+#: g10/keyring.c:1551
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signature)\n"
 msgid_plural "%lu keys cached so far (%lu signatures)\n"
 msgstr[0] "%lu chaves comprobadas (%lu sinaturas)\n"
 msgstr[1] "%lu chaves comprobadas (%lu sinaturas)\n"
 
-#: g10/keyring.c:1557
+#: g10/keyring.c:1567
 #, fuzzy, c-format
 #| msgid "\t%lu keys updated\n"
 msgid "%lu key cached"
@@ -6035,7 +6048,7 @@ msgid_plural "%lu keys cached"
 msgstr[0] "\t%lu chaves actualizadas\n"
 msgstr[1] "\t%lu chaves actualizadas\n"
 
-#: g10/keyring.c:1559
+#: g10/keyring.c:1569
 #, fuzzy, c-format
 #| msgid "1 bad signature\n"
 msgid " (%lu signature)\n"
@@ -6043,7 +6056,7 @@ msgid_plural " (%lu signatures)\n"
 msgstr[0] "1 sinatura errónea\n"
 msgstr[1] "1 sinatura errónea\n"
 
-#: g10/keyring.c:1636
+#: g10/keyring.c:1646
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: chaveiro creado\n"
@@ -6073,80 +6086,75 @@ msgstr ""
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "o URL de normativa de sinaturas dado non é válido\n"
 
-#: g10/keyserver.c:537
+#: g10/keyserver.c:360
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:740
+#: g10/keyserver.c:563
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:846
+#: g10/keyserver.c:669
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "opcións de exportación non válidas\n"
 
-#: g10/keyserver.c:986 g10/keyserver.c:1096
+#: g10/keyserver.c:809 g10/keyserver.c:919
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: non é un ID de chave válido\n"
 
-#: g10/keyserver.c:1420 g10/keyserver.c:1453
+#: g10/keyserver.c:1217 g10/keyserver.c:1250
 #, 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:1427
+#: g10/keyserver.c:1224
 #, 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:1531
+#: g10/keyserver.c:1316
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1319
 #, fuzzy, c-format
 msgid "key not found on keyserver\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: g10/keyserver.c:1722
-#, fuzzy, c-format
-msgid "requesting key %s from %s server %s\n"
-msgstr "solicitando a chave %08lX de %s\n"
-
-#: g10/keyserver.c:1726
+#: g10/keyserver.c:1481
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "solicitando a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1841 g10/keyserver.c:2020
+#: g10/keyserver.c:1600 g10/keyserver.c:1793
 #, fuzzy, c-format
 msgid "no keyserver known\n"
 msgstr "opcións de exportación non válidas\n"
 
-#: g10/keyserver.c:1856 g10/skclist.c:213 g10/skclist.c:241
+#: g10/keyserver.c:1615 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:1860
+#: g10/keyserver.c:1619
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "asinado coa súa chave %08lX no %s\n"
 
-#: g10/keyserver.c:1901
+#: g10/keyserver.c:1662
 #, fuzzy, c-format
 msgid "requesting key from '%s'\n"
 msgstr "solicitando a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1917
+#: g10/keyserver.c:1680
 #, 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"
@@ -6173,252 +6181,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:472
+#: g10/mainproc.c:473
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "a chave pública é %08lX\n"
 
-#: g10/mainproc.c:524
+#: g10/mainproc.c:525
 #, 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:528 g10/pkclist.c:231
+#: g10/mainproc.c:529 g10/pkclist.c:231
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "               alias \""
 
-#: g10/mainproc.c:532
+#: g10/mainproc.c:533
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrado cunha chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:552 g10/mainproc.c:935
+#: g10/mainproc.c:553 g10/mainproc.c:937
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:560
+#: g10/mainproc.c:561
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "cifrado con %lu contrasinais\n"
 
-#: g10/mainproc.c:562
+#: g10/mainproc.c:563
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "cifrado con 1 contrasinal\n"
 
-#: g10/mainproc.c:577 g10/mainproc.c:602
+#: g10/mainproc.c:578 g10/mainproc.c:603
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "fallou o descifrado de chave pública: %s\n"
 
-#: g10/mainproc.c:613
+#: g10/mainproc.c:614
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "datos cifrados coa chave pública: DEK correcto\n"
 
-#: g10/mainproc.c:642 g10/mainproc.c:663
+#: g10/mainproc.c:643 g10/mainproc.c:664
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "supoñendo datos cifrados con %s\n"
 
-#: g10/mainproc.c:649
+#: g10/mainproc.c:650
 #, 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:742 g10/mainproc.c:780
+#: g10/mainproc.c:744 g10/mainproc.c:782
 #, 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:753
+#: g10/mainproc.c:755
 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:756
+#: g10/mainproc.c:758
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:761
+#: g10/mainproc.c:763
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "o descifrado fallou: %s\n"
 
-#: g10/mainproc.c:773
+#: g10/mainproc.c:775
 #, c-format
 msgid "decryption okay\n"
 msgstr "descifrado correcto\n"
 
-#: g10/mainproc.c:786
+#: g10/mainproc.c:788
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVISO: ¡a mensaxe cifrada foi manipulada!\n"
 
-#: g10/mainproc.c:804
+#: g10/mainproc.c:806
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "o descifrado fallou: %s\n"
 
-#: g10/mainproc.c:851
+#: g10/mainproc.c:853
 #, 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:858
+#: g10/mainproc.c:860
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome do ficheiro orixinal='%.*s'\n"
 
-#: g10/mainproc.c:1135
+#: g10/mainproc.c:1137
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocación independente - empregue \"gpg --import\" para aplicar\n"
 
-#: g10/mainproc.c:1440 g10/mainproc.c:1483
+#: g10/mainproc.c:1442 g10/mainproc.c:1485
 #, fuzzy, c-format
 msgid "no signature found\n"
 msgstr "Sinatura correcta de \""
 
-#: g10/mainproc.c:1763
+#: g10/mainproc.c:1765
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Sinatura INCORRECTA de\""
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1767
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Sinatura caducada de \""
 
-#: g10/mainproc.c:1767
+#: g10/mainproc.c:1769
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Sinatura correcta de \""
 
-#: g10/mainproc.c:1789
+#: g10/mainproc.c:1791
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "verificación de sinatura suprimida\n"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1905
 #, 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:1919 g10/mainproc.c:1926
+#: g10/mainproc.c:1921 g10/mainproc.c:1928
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "A sinatura caducou o %s\n"
 
-#: g10/mainproc.c:1920 g10/mainproc.c:1927 sm/verify.c:480
+#: g10/mainproc.c:1922 g10/mainproc.c:1929 sm/verify.c:480
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "               alias \""
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1933
 #, 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:1937
+#: g10/mainproc.c:1939
 #, fuzzy, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "               alias \""
 
-#: g10/mainproc.c:1992
+#: g10/mainproc.c:1994
 #, c-format
 msgid "Key available at: "
 msgstr "Chave dispoñible en: "
 
-#: g10/mainproc.c:2034
+#: g10/mainproc.c:2036
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2234
+#: g10/mainproc.c:2236
 msgid "[uncertain]"
 msgstr "[incerto]"
 
-#: g10/mainproc.c:2272
+#: g10/mainproc.c:2274
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "               alias \""
 
-#: g10/mainproc.c:2347
+#: g10/mainproc.c:2349
 #, 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:2363
+#: g10/mainproc.c:2365
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "A sinatura caducou o %s\n"
 
-#: g10/mainproc.c:2368
+#: g10/mainproc.c:2370
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "A sinatura caduca o %s\n"
 
-#: g10/mainproc.c:2379
+#: g10/mainproc.c:2381
 #, 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:2380
+#: g10/mainproc.c:2382
 msgid "binary"
 msgstr "binario"
 
-#: g10/mainproc.c:2381
+#: g10/mainproc.c:2383
 msgid "textmode"
 msgstr "modo texto"
 
-#: g10/mainproc.c:2381 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2383 g10/trust.c:112 dirmngr/ocsp.c:793
 msgid "unknown"
 msgstr "descoñecido"
 
-#: g10/mainproc.c:2383
+#: g10/mainproc.c:2385
 #, fuzzy
 #| msgid "unknown pubkey algorithm"
 msgid ", key algorithm "
 msgstr "algoritmo de chave pública descoñecido"
 
-#: g10/mainproc.c:2418
+#: g10/mainproc.c:2420
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2457
+#: g10/mainproc.c:2459
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Non foi posible verifica-la sinatura: %s\n"
 
-#: g10/mainproc.c:2553 g10/mainproc.c:2572 g10/mainproc.c:2696
+#: g10/mainproc.c:2555 g10/mainproc.c:2574 g10/mainproc.c:2698
 #, c-format
 msgid "not a detached signature\n"
 msgstr "non é unha sinatura separada\n"
 
-#: g10/mainproc.c:2606
+#: g10/mainproc.c:2608
 #, 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:2615
+#: g10/mainproc.c:2617
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "sinatura independiente de clase 0x%02x\n"
 
-#: g10/mainproc.c:2700
+#: g10/mainproc.c:2702
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Sinatura ó vello estilo (PGP 2.x)\n"
@@ -6608,51 +6616,56 @@ msgstr "Notación de sinaturas críticas: "
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "un subpaquete de tipo %d ten o bit crítico posto\n"
 
-#: g10/passphrase.c:208
+#: g10/passphrase.c:201 sm/decrypt.c:669
+#, fuzzy
+msgid "Please enter the passphrase for decryption."
+msgstr "cambia-lo contrasinal"
+
+#: g10/passphrase.c:203
 msgid "Enter passphrase\n"
 msgstr "Introduza o contrasinal\n"
 
-#: g10/passphrase.c:219
+#: g10/passphrase.c:227
 #, c-format
 msgid "cancelled by user\n"
 msgstr "cancelado polo usuario\n"
 
-#: g10/passphrase.c:460
+#: g10/passphrase.c:472
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID principal da chave %08lX)"
 
-#: g10/passphrase.c:467
+#: g10/passphrase.c:479
 #, fuzzy
 msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 msgstr "Por favor, introduza o contrasinal; esta é unha frase secreta \n"
 
-#: g10/passphrase.c:471
+#: g10/passphrase.c:483
 #, fuzzy
 msgid "Please enter the passphrase to import the OpenPGP secret key:"
 msgstr "Por favor, introduza o contrasinal; esta é unha frase secreta \n"
 
-#: g10/passphrase.c:476
+#: g10/passphrase.c:488
 #, fuzzy
 msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 msgstr "Por favor, introduza o contrasinal; esta é unha frase secreta \n"
 
-#: g10/passphrase.c:479
+#: g10/passphrase.c:491
 #, fuzzy
 msgid "Please enter the passphrase to export the OpenPGP secret key:"
 msgstr "Por favor, introduza o contrasinal; esta é unha frase secreta \n"
 
-#: g10/passphrase.c:484
+#: g10/passphrase.c:496
 #, fuzzy
 msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 msgstr "¿Seguro de que quere borra-las chaves seleccionadas? "
 
-#: g10/passphrase.c:487
+#: g10/passphrase.c:499
 #, fuzzy
 msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgstr "¿Seguro de que quere borra-las chaves seleccionadas? "
 
-#: g10/passphrase.c:496
+#: g10/passphrase.c:508
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -6825,7 +6838,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:313 g10/revoke.c:803
+#: g10/pkclist.c:313 g10/revoke.c:804
 msgid "Your decision? "
 msgstr "¿A súa decisión? "
 
@@ -7130,7 +7143,7 @@ msgstr "non foi posible abri-los datos asinados `%s'\n"
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "non foi posible abri-los datos asinados `%s'\n"
 
-#: g10/pubkey-enc.c:99 sm/decrypt.c:879
+#: g10/pubkey-enc.c:99 sm/decrypt.c:1329
 #, fuzzy, c-format
 msgid "key %s is not suitable for decryption in %s mode\n"
 msgstr "chave %08lX: non hai ID de usuario\n"
@@ -7177,7 +7190,7 @@ msgid "Note: key has been revoked"
 msgstr "NOTA: a chave está revocada"
 
 #: g10/revoke.c:100 g10/revoke.c:126 g10/revoke.c:172 g10/revoke.c:184
-#: g10/revoke.c:502
+#: g10/revoke.c:503
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "a chamada a build_packet fallou: %s\n"
@@ -7206,11 +7219,11 @@ msgstr "A chave secreta está disponible.\n"
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "¿Crear un certificado de revocación para esta sinatura? "
 
-#: g10/revoke.c:334 g10/revoke.c:744
+#: g10/revoke.c:334 g10/revoke.c:745
 msgid "ASCII armored output forced.\n"
 msgstr "Forzouse unha saída con armadura ASCII.\n"
 
-#: g10/revoke.c:350 g10/revoke.c:481
+#: g10/revoke.c:350 g10/revoke.c:482
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "a chamada a make_keysig_packet fallou: %s\n"
@@ -7224,19 +7237,19 @@ msgstr "Creouse o certificado de revocación.\n"
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "non se atoparon chaves de revocación para `%s'\n"
 
-#: g10/revoke.c:567
+#: g10/revoke.c:568
 #, fuzzy
 msgid "This is a revocation certificate for the OpenPGP key:"
 msgstr "¿Crear un certificado de revocación para esta sinatura? "
 
-#: g10/revoke.c:583
+#: g10/revoke.c:584
 msgid ""
 "A revocation certificate is a kind of \"kill switch\" to publicly\n"
 "declare that a key shall not anymore be used.  It is not possible\n"
 "to retract such a revocation certificate once it has been published."
 msgstr ""
 
-#: g10/revoke.c:586
+#: g10/revoke.c:587
 msgid ""
 "Use it to revoke this key in case of a compromise or loss of\n"
 "the secret key.  However, if the secret key is still accessible,\n"
@@ -7245,20 +7258,20 @@ msgid ""
 "of the gpg command \"--generate-revocation\" in the GnuPG manual."
 msgstr ""
 
-#: g10/revoke.c:592
+#: g10/revoke.c:593
 msgid ""
 "To avoid an accidental use of this file, a colon has been inserted\n"
 "before the 5 dashes below.  Remove this colon with a text editor\n"
 "before importing and publishing this revocation certificate."
 msgstr ""
 
-#: g10/revoke.c:611
+#: g10/revoke.c:612
 #, fuzzy, c-format
 #| msgid "Revocation certificate created.\n"
 msgid "revocation certificate stored as '%s.rev'\n"
 msgstr "Creouse o certificado de revocación.\n"
 
-#: g10/revoke.c:655
+#: g10/revoke.c:656
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found\n"
 msgstr "non se atopou a chave secreta `%s': %s\n"
@@ -7266,23 +7279,23 @@ msgstr "non se atopou a chave secreta `%s': %s\n"
 #. TRANSLATORS: The %s prints a key specification which
 #. for example has been given at the command line.  Several lines
 #. lines with secret key infos are printed after this message.
-#: g10/revoke.c:680
+#: g10/revoke.c:681
 #, c-format
 msgid "'%s' matches multiple secret keys:\n"
 msgstr ""
 
-#: g10/revoke.c:705
+#: g10/revoke.c:706
 #, fuzzy, c-format
 #| msgid "error creating keyring `%s': %s\n"
 msgid "error searching the keyring: %s\n"
 msgstr "erro ao crea-lo chaveiro `%s': %s\n"
 
-#: g10/revoke.c:728
+#: g10/revoke.c:729
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "¿Crear un certificado de revocación para esta sinatura? "
 
-#: g10/revoke.c:752
+#: g10/revoke.c:753
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -7300,33 +7313,33 @@ msgstr ""
 "se volve ilexible. Pero teña coidado: o sistema de impresión da súa\n"
 "máquina podería armacena-los datos e deixárllelos dispoñibles a outros.\n"
 
-#: g10/revoke.c:786
+#: g10/revoke.c:787
 msgid "Please select the reason for the revocation:\n"
 msgstr "Por favor, escolla o motivo da revocación:\n"
 
-#: g10/revoke.c:796
+#: g10/revoke.c:797
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: g10/revoke.c:798
+#: g10/revoke.c:799
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(probablemente queira seleccionar %d aquí)\n"
 
-#: g10/revoke.c:839
+#: g10/revoke.c:843
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Introduza unha descrición opcional; remátea cunha liña en branco:\n"
 
-#: g10/revoke.c:867
+#: g10/revoke.c:871
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Motivo para a revocación: %s\n"
 
-#: g10/revoke.c:869
+#: g10/revoke.c:873
 msgid "(No description given)\n"
 msgstr "(Non se deu unha descrición)\n"
 
-#: g10/revoke.c:874
+#: g10/revoke.c:878
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "¿É correcto? "
@@ -7504,24 +7517,24 @@ msgstr "asinando:"
 msgid "%s.%s encryption will be used\n"
 msgstr "hase empregar cifrado %s\n"
 
-#: g10/skclist.c:172 g10/skclist.c:253
+#: g10/skclist.c:173 g10/skclist.c:254
 #, c-format
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "a chave non está marcada coma insegura - non se pode empregar co xerador de "
 "números aleatorios falso\n"
 
-#: g10/skclist.c:204
+#: g10/skclist.c:205
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "omítese `%s': duplicada\n"
 
-#: g10/skclist.c:223
+#: g10/skclist.c:224
 #, c-format
 msgid "skipped: secret key already present\n"
 msgstr "omítese: a chave secreta xa está presente\n"
 
-#: g10/skclist.c:242
+#: g10/skclist.c:243
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
@@ -7751,10 +7764,10 @@ msgstr ""
 msgid "TOFU DB error"
 msgstr ""
 
-#: g10/tofu.c:687 g10/tofu.c:2073 g10/tofu.c:2354 g10/tofu.c:2373
-#: g10/tofu.c:2386 g10/tofu.c:2398 g10/tofu.c:2413 g10/tofu.c:2425
-#: g10/tofu.c:3021 g10/tofu.c:3038 g10/tofu.c:3075 g10/tofu.c:3092
-#: g10/tofu.c:3404
+#: g10/tofu.c:687 g10/tofu.c:2077 g10/tofu.c:2358 g10/tofu.c:2377
+#: g10/tofu.c:2390 g10/tofu.c:2402 g10/tofu.c:2417 g10/tofu.c:2429
+#: g10/tofu.c:3025 g10/tofu.c:3042 g10/tofu.c:3079 g10/tofu.c:3096
+#: g10/tofu.c:3408
 #, fuzzy, c-format
 msgid "error reading TOFU database: %s\n"
 msgstr "erro ao enviar a `%s': %s\n"
@@ -7776,7 +7789,7 @@ msgstr "%s: erro ao escribi-lo rexistro de directorios: %s\n"
 msgid "error opening TOFU database '%s': %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: g10/tofu.c:1148 g10/tofu.c:3458 g10/tofu.c:3604
+#: g10/tofu.c:1148 g10/tofu.c:3462 g10/tofu.c:3608
 #, fuzzy, c-format
 msgid "error updating TOFU database: %s\n"
 msgstr "erro ao enviar a `%s': %s\n"
@@ -7816,43 +7829,43 @@ msgstr "erro ao crea-lo contrasinal: %s\n"
 msgid "This key's user IDs:\n"
 msgstr "listar chave e IDs de usuario"
 
-#: g10/tofu.c:1634 g10/tofu.c:1799
+#: g10/tofu.c:1634 g10/tofu.c:1801
 #, fuzzy, c-format
 #| msgid "Policy: "
 msgid "policy: %s"
 msgstr "Normativa: "
 
-#: g10/tofu.c:1725
+#: g10/tofu.c:1727
 #, fuzzy, c-format
 msgid "error gathering signature stats: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: g10/tofu.c:1729
+#: g10/tofu.c:1731
 #, c-format
 msgid "The email address \"%s\" is associated with %d key:\n"
 msgid_plural "The email address \"%s\" is associated with %d keys:\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1747
+#: g10/tofu.c:1749
 #, c-format
 msgid "Statistics for keys with the email address \"%s\":\n"
 msgstr ""
 
-#: g10/tofu.c:1797
+#: g10/tofu.c:1799
 #, fuzzy
 #| msgid "list keys"
 msgid "this key"
 msgstr "ve-la lista de chaves"
 
-#: g10/tofu.c:1823
+#: g10/tofu.c:1825
 #, fuzzy, c-format
 msgid "Verified %d message."
 msgid_plural "Verified %d messages."
 msgstr[0] "|algo [ficheiros]|visualizar resumos de mensaxes"
 msgstr[1] "|algo [ficheiros]|visualizar resumos de mensaxes"
 
-#: g10/tofu.c:1827
+#: g10/tofu.c:1829
 #, fuzzy, c-format
 #| msgid "encrypted with %lu passphrases\n"
 msgid "Encrypted %d message."
@@ -7860,68 +7873,68 @@ msgid_plural "Encrypted %d messages."
 msgstr[0] "cifrado con %lu contrasinais\n"
 msgstr[1] "cifrado con %lu contrasinais\n"
 
-#: g10/tofu.c:1834
+#: g10/tofu.c:1836
 #, fuzzy, c-format
 msgid "Verified %d message in the future."
 msgid_plural "Verified %d messages in the future."
 msgstr[0] "|algo [ficheiros]|visualizar resumos de mensaxes"
 msgstr[1] "|algo [ficheiros]|visualizar resumos de mensaxes"
 
-#: g10/tofu.c:1838
+#: g10/tofu.c:1840
 #, fuzzy, c-format
 msgid "Encrypted %d message in the future."
 msgid_plural "Encrypted %d messages in the future."
 msgstr[0] "|algo [ficheiros]|visualizar resumos de mensaxes"
 msgstr[1] "|algo [ficheiros]|visualizar resumos de mensaxes"
 
-#: g10/tofu.c:1852
+#: g10/tofu.c:1854
 #, c-format
 msgid "Messages verified over the past %d day: %d."
 msgid_plural "Messages verified over the past %d days: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1858
+#: g10/tofu.c:1860
 #, c-format
 msgid "Messages encrypted over the past %d day: %d."
 msgid_plural "Messages encrypted over the past %d days: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1868
+#: g10/tofu.c:1870
 #, c-format
 msgid "Messages verified over the past %d month: %d."
 msgid_plural "Messages verified over the past %d months: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1874
+#: g10/tofu.c:1876
 #, c-format
 msgid "Messages encrypted over the past %d month: %d."
 msgid_plural "Messages encrypted over the past %d months: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1884
+#: g10/tofu.c:1886
 #, c-format
 msgid "Messages verified over the past %d year: %d."
 msgid_plural "Messages verified over the past %d years: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1890
+#: g10/tofu.c:1892
 #, c-format
 msgid "Messages encrypted over the past %d year: %d."
 msgid_plural "Messages encrypted over the past %d years: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1898
+#: g10/tofu.c:1900
 #, c-format
 msgid "Messages verified in the past: %d."
 msgstr ""
 
-#: g10/tofu.c:1902
+#: g10/tofu.c:1904
 #, fuzzy, c-format
 msgid "Messages encrypted in the past: %d."
 msgstr "|algo [ficheiros]|visualizar resumos de mensaxes"
@@ -7929,130 +7942,130 @@ msgstr "|algo [ficheiros]|visualizar resumos de mensaxes"
 #. TRANSLATORS: Please translate the text found in the source
 #. * file below.  We don't directly internationalize that text so
 #. * that we can tweak it without breaking translations.
-#: g10/tofu.c:1919
+#: g10/tofu.c:1921
 msgid "TOFU detected a binding conflict"
 msgstr ""
 
 #. TRANSLATORS: Two letters (normally the lower and upper case
 #. * version of the hotkey) for each of the five choices.  If
 #. * there is only one choice in your language, repeat it.
-#: g10/tofu.c:1961
+#: g10/tofu.c:1963
 msgid "gGaAuUrRbB"
 msgstr ""
 
-#: g10/tofu.c:1967
+#: g10/tofu.c:1969
 msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 
-#: g10/tofu.c:1975
+#: g10/tofu.c:1978
 msgid "Defaulting to unknown.\n"
 msgstr ""
 
-#: g10/tofu.c:2093 g10/tofu.c:2228
+#: g10/tofu.c:2097 g10/tofu.c:2232
 #, c-format
 msgid "TOFU db corruption detected.\n"
 msgstr ""
 
-#: g10/tofu.c:2829
+#: g10/tofu.c:2833
 #, fuzzy, c-format
 msgid "error changing TOFU policy: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: g10/tofu.c:2880
+#: g10/tofu.c:2884
 #, c-format
 msgid "%lld~year"
 msgid_plural "%lld~years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2885
+#: g10/tofu.c:2889
 #, c-format
 msgid "%lld~month"
 msgid_plural "%lld~months"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2890
+#: g10/tofu.c:2894
 #, c-format
 msgid "%lld~week"
 msgid_plural "%lld~weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2895
+#: g10/tofu.c:2899
 #, c-format
 msgid "%lld~day"
 msgid_plural "%lld~days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2900
+#: g10/tofu.c:2904
 #, c-format
 msgid "%lld~hour"
 msgid_plural "%lld~hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2905
+#: g10/tofu.c:2909
 #, c-format
 msgid "%lld~minute"
 msgid_plural "%lld~minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2907
+#: g10/tofu.c:2911
 #, c-format
 msgid "%lld~second"
 msgid_plural "%lld~seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:3145
+#: g10/tofu.c:3149
 #, c-format
 msgid "%s: Verified 0~signatures and encrypted 0~messages."
 msgstr ""
 
-#: g10/tofu.c:3151
+#: g10/tofu.c:3155
 #, fuzzy, c-format
 #| msgid "Deleted %d signatures.\n"
 msgid "%s: Verified 0 signatures."
 msgstr "Borradas %d sinaturas.\n"
 
-#: g10/tofu.c:3165
+#: g10/tofu.c:3169
 #, fuzzy
 #| msgid "encrypted with %lu passphrases\n"
 msgid "Encrypted 0 messages."
 msgstr "cifrado con %lu contrasinais\n"
 
-#: g10/tofu.c:3181
+#: g10/tofu.c:3185
 #, fuzzy, c-format
 #| msgid "Policy: "
 msgid "(policy: %s)"
 msgstr "Normativa: "
 
-#: g10/tofu.c:3215
+#: g10/tofu.c:3219
 #, c-format
 msgid ""
 "Warning: we have yet to see a message signed using this key and user id!\n"
 msgstr ""
 
-#: g10/tofu.c:3218
+#: g10/tofu.c:3222
 #, c-format
 msgid ""
 "Warning: we've only seen one message signed using this key and user id!\n"
 msgstr ""
 
-#: g10/tofu.c:3222
+#: g10/tofu.c:3226
 #, c-format
 msgid "Warning: you have yet to encrypt a message to this key!\n"
 msgstr ""
 
-#: g10/tofu.c:3225
+#: g10/tofu.c:3229
 #, c-format
 msgid "Warning: you have only encrypted one message to this key!\n"
 msgstr ""
 
-#: g10/tofu.c:3254
+#: g10/tofu.c:3258
 #, c-format
 msgid ""
 "Warning: if you think you've seen more signatures by this key and user id, "
@@ -8069,13 +8082,13 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:3339 g10/tofu.c:3502 g10/tofu.c:3708 g10/tofu.c:3761
-#: g10/tofu.c:3902 g10/tofu.c:3979 g10/tofu.c:4017
+#: g10/tofu.c:3343 g10/tofu.c:3506 g10/tofu.c:3712 g10/tofu.c:3765
+#: g10/tofu.c:3906 g10/tofu.c:3983 g10/tofu.c:4021
 #, fuzzy, c-format
 msgid "error opening TOFU database: %s\n"
 msgstr "erro ao enviar a `%s': %s\n"
 
-#: g10/tofu.c:3535
+#: g10/tofu.c:3539
 #, c-format
 msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
 msgstr ""
@@ -8142,7 +8155,7 @@ msgstr ""
 msgid "no need for a trustdb check\n"
 msgstr "non se precisa comproba-la base de datos de confianza\n"
 
-#: g10/trustdb.c:601 g10/trustdb.c:2272
+#: g10/trustdb.c:601 g10/trustdb.c:2273
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "hase comproba-la base de datos de confianza o %s\n"
@@ -8172,14 +8185,14 @@ msgstr "por favor, execute con --check-trustdb\n"
 msgid "checking the trustdb\n"
 msgstr "comprobando a base de datos de confianza\n"
 
-#: g10/trustdb.c:1993
+#: g10/trustdb.c:1994
 #, fuzzy, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr[0] "%lu chaves procesadas hasta polo momento\n"
 msgstr[1] "%lu chaves procesadas hasta polo momento\n"
 
-#: g10/trustdb.c:1996
+#: g10/trustdb.c:1997
 #, fuzzy, c-format
 #| msgid "%d keys processed (%d validity counts cleared)\n"
 msgid " (%d validity count cleared)\n"
@@ -8187,45 +8200,45 @@ msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] "procesáronse %d chaves (marcáronse %d contas de validez)\n"
 msgstr[1] "procesáronse %d chaves (marcáronse %d contas de validez)\n"
 
-#: g10/trustdb.c:2066
+#: g10/trustdb.c:2067
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "non se atoparon chaves de confianza absoluta\n"
 
-#: g10/trustdb.c:2080
+#: g10/trustdb.c:2081
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "non se atopou a chave pública da clave de confianza absoluta %08lX\n"
 
-#: g10/trustdb.c:2198
+#: g10/trustdb.c:2199
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2279
+#: g10/trustdb.c:2280
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "rexistro de confianza %lu, tipo %d: fallou a escritura: %s\n"
 
-#: g10/trust.c:125
+#: g10/trust.c:114
 msgid "undefined"
 msgstr ""
 
-#: g10/trust.c:126
+#: g10/trust.c:115
 #, fuzzy
 msgid "never"
 msgstr "nunca     "
 
-#: g10/trust.c:127
+#: g10/trust.c:116
 msgid "marginal"
 msgstr ""
 
-#: g10/trust.c:128
+#: g10/trust.c:117
 msgid "full"
 msgstr ""
 
-#: g10/trust.c:129
+#: g10/trust.c:118
 msgid "ultimate"
 msgstr ""
 
@@ -8237,43 +8250,43 @@ msgstr ""
 #. It gets passed to atoi() so everything after the number is
 #. essentially a comment and need not be translated.  Either key and
 #. uid are both NULL, or neither are NULL.
-#: g10/trust.c:166
+#: g10/trust.c:155
 msgid "10 translator see trust.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trust.c:169
+#: g10/trust.c:158
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[revocada] "
 
-#: g10/trust.c:171 g10/trust.c:177
+#: g10/trust.c:160 g10/trust.c:166
 #, fuzzy
 msgid "[ expired]"
 msgstr "[caducada ]"
 
-#: g10/trust.c:176
+#: g10/trust.c:165
 #, fuzzy
 msgid "[ unknown]"
 msgstr "descoñecido"
 
-#: g10/trust.c:178
+#: g10/trust.c:167
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trust.c:179
+#: g10/trust.c:168
 #, fuzzy
 msgid "[  never ]"
 msgstr "nunca     "
 
-#: g10/trust.c:180
+#: g10/trust.c:169
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trust.c:181
+#: g10/trust.c:170
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trust.c:182
+#: g10/trust.c:171
 msgid "[ultimate]"
 msgstr ""
 
@@ -8333,16 +8346,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:4937 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2386
+#: scd/app-piv.c:1770 scd/app-p15.c:5035 scd/app-nks.c:1530
+#: scd/app-openpgp.c:2387
 #, 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:4956 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2402
+#: scd/app-piv.c:1787 scd/app-p15.c:5054 scd/app-nks.c:1549
+#: scd/app-openpgp.c:2403
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
@@ -8377,10 +8390,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:2669
-#: scd/app-openpgp.c:2693 scd/app-openpgp.c:2871 scd/app-openpgp.c:2893
-#: scd/app-openpgp.c:3074 scd/app-openpgp.c:3361 scd/app-openpgp.c:3408
-#: scd/app-openpgp.c:3545 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2670
+#: scd/app-openpgp.c:2694 scd/app-openpgp.c:2872 scd/app-openpgp.c:2894
+#: scd/app-openpgp.c:3075 scd/app-openpgp.c:3362 scd/app-openpgp.c:3409
+#: scd/app-openpgp.c:3547 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -8400,96 +8413,96 @@ msgstr ""
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr ""
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3616
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3618
 #, fuzzy, c-format
 msgid "key already exists\n"
 msgstr "`%s' xa está comprimido\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3620
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3622
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3622
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3624
 #, fuzzy, c-format
 msgid "generating new key\n"
 msgstr "xerar un novo par de chaves"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3624
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3626
 #, fuzzy, c-format
 msgid "writing new key\n"
 msgstr "xerar un novo par de chaves"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4484 scd/app-openpgp.c:4767
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4486 scd/app-openpgp.c:4761
 #, 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:1615
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1616
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1622
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1623
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1732
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1733
 #, 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:4943
+#: scd/app-piv.c:3279 scd/app-openpgp.c:4937
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4951
+#: scd/app-piv.c:3294 scd/app-openpgp.c:4945
 #, 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:4957
+#: scd/app-piv.c:3300 scd/app-openpgp.c:4951
 #, 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:1842 scd/app-openpgp.c:4966
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1843 scd/app-openpgp.c:4960
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-p15.c:5035 scd/app-nks.c:2038
+#: scd/app-p15.c:5133 scd/app-nks.c:2038
 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:5038 scd/app-openpgp.c:2818
+#: scd/app-p15.c:5136 scd/app-openpgp.c:2819
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "cambia-lo contrasinal"
 
-#: scd/app-p15.c:5040 scd/app-nks.c:2028
+#: scd/app-p15.c:5138 scd/app-nks.c:2028
 #, 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:5043 scd/app-nks.c:2019
+#: scd/app-p15.c:5141 scd/app-nks.c:2019
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "cambia-lo contrasinal"
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4321
+#: scd/app-nks.c:1468 scd/app-openpgp.c:4323
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1476 scd/app-openpgp.c:4333
+#: scd/app-nks.c:1476 scd/app-openpgp.c:4335
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
@@ -8531,27 +8544,27 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3442 scd/app-dinsig.c:534
+#: scd/app-nks.c:2221 scd/app-openpgp.c:3443 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:943
+#: scd/app-openpgp.c:944
 #, 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:956
+#: scd/app-openpgp.c:957
 #, 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:1427 scd/app-openpgp.c:3389 scd/app-openpgp.c:5715
+#: scd/app-openpgp.c:1428 scd/app-openpgp.c:3390 scd/app-openpgp.c:5709
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1949
+#: scd/app-openpgp.c:1950
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
@@ -8559,43 +8572,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:2373
+#: scd/app-openpgp.c:2374
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2621
+#: scd/app-openpgp.c:2622
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2628
+#: scd/app-openpgp.c:2629
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2641
+#: scd/app-openpgp.c:2642
 #, fuzzy
 msgid "||Please unlock the card"
 msgstr "cambia-lo contrasinal"
 
-#: scd/app-openpgp.c:2700 scd/app-openpgp.c:2900 scd/app-openpgp.c:3368
+#: scd/app-openpgp.c:2701 scd/app-openpgp.c:2901 scd/app-openpgp.c:3369
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2717 scd/app-openpgp.c:2760 scd/app-openpgp.c:2917
-#: scd/app-openpgp.c:5325
+#: scd/app-openpgp.c:2718 scd/app-openpgp.c:2761 scd/app-openpgp.c:2918
+#: scd/app-openpgp.c:5319
 #, 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:2804 scd/app-openpgp.c:5724
+#: scd/app-openpgp.c:2805 scd/app-openpgp.c:5718
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2808
+#: scd/app-openpgp.c:2809
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8603,22 +8616,22 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: scd/app-openpgp.c:2841
+#: scd/app-openpgp.c:2842
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3355
+#: scd/app-openpgp.c:3356
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "cambia-lo contrasinal"
 
-#: scd/app-openpgp.c:3404
+#: scd/app-openpgp.c:3405
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Por favor, escolla o motivo da revocación:\n"
 
-#: scd/app-openpgp.c:3414 scd/app-openpgp.c:3481
+#: scd/app-openpgp.c:3415 scd/app-openpgp.c:3484
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
@@ -8626,81 +8639,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:3437
+#: scd/app-openpgp.c:3438
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3439
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3439
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3541
+#: scd/app-openpgp.c:3543
 #, fuzzy
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "cambia-lo contrasinal"
 
-#: scd/app-openpgp.c:3542
+#: scd/app-openpgp.c:3544
 #, fuzzy
 msgid "||Please enter the PIN and New PIN"
 msgstr "cambia-lo contrasinal"
 
-#: scd/app-openpgp.c:3600 scd/app-openpgp.c:5026
+#: scd/app-openpgp.c:3602 scd/app-openpgp.c:5020
 #, fuzzy, c-format
 msgid "error reading application data\n"
 msgstr "erro ao le-lo bloque de chaves: %s\n"
 
-#: scd/app-openpgp.c:3606 scd/app-openpgp.c:5033
+#: scd/app-openpgp.c:3608 scd/app-openpgp.c:5027
 #, fuzzy, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "%s: erro ao ler un rexistro libre: %s\n"
 
-#: scd/app-openpgp.c:4302 scd/app-openpgp.c:4657
+#: scd/app-openpgp.c:4304 scd/app-openpgp.c:4653
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4343 scd/app-openpgp.c:4351
+#: scd/app-openpgp.c:4345 scd/app-openpgp.c:4353
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4651
+#: scd/app-openpgp.c:4647
 #, fuzzy, c-format
 #| msgid "unsupported URI"
 msgid "unsupported curve\n"
 msgstr "URI non soportado"
 
-#: scd/app-openpgp.c:4991
+#: scd/app-openpgp.c:4985
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5041
+#: scd/app-openpgp.c:5035
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5240
+#: scd/app-openpgp.c:5234
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "Sinatura %s, algoritmo de resumo %s\n"
 
-#: scd/app-openpgp.c:5298
+#: scd/app-openpgp.c:5292
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5729
+#: scd/app-openpgp.c:5723
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:6241 scd/app-openpgp.c:6252
+#: scd/app-openpgp.c:6250 scd/app-openpgp.c:6261
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "non se atoparon datos OpenPGP válidos.\n"
@@ -8722,7 +8735,7 @@ msgstr "Introduza o ID de usuario: "
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:274 dirmngr/dirmngr.c:198
+#: scd/scdaemon.c:136 sm/gpgsm.c:274 dirmngr/dirmngr.c:199
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
@@ -8787,12 +8800,12 @@ msgstr ""
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2104
+#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2143
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2112
+#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2151
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -8802,11 +8815,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:199 sm/certchain.c:2172
+#: sm/certchain.c:199 sm/certchain.c:2174
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:200 sm/certchain.c:2172
+#: sm/certchain.c:200 sm/certchain.c:2174
 #, fuzzy
 msgid "shell"
 msgstr "axuda"
@@ -8840,238 +8853,238 @@ msgstr "gravando a chave secreta en `%s'\n"
 msgid "certificate policy not allowed"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: sm/certchain.c:595 sm/keydb.c:1891 sm/keydb.c:1980
+#: sm/certchain.c:596 sm/keydb.c:1913 sm/keydb.c:2002
 #, fuzzy, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: sm/certchain.c:624
+#: sm/certchain.c:625
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:644
+#: sm/certchain.c:645
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#: sm/certchain.c:724 dirmngr/ocsp.c:683
 #, fuzzy, c-format
 #| msgid "%s: can't access: %s\n"
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "%s: non é posible acceder: %s\n"
 
-#: sm/certchain.c:791
+#: sm/certchain.c:792
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr ""
 
-#: sm/certchain.c:816
+#: sm/certchain.c:817
 #, fuzzy, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: sm/certchain.c:819
+#: sm/certchain.c:820
 #, fuzzy, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: sm/certchain.c:1046 sm/certchain.c:1561 sm/certchain.c:2200 sm/decrypt.c:643
-#: sm/encrypt.c:620 sm/import.c:414 sm/keydb.c:1898 sm/keydb.c:1987
-#: sm/sign.c:428 sm/verify.c:117
+#: sm/certchain.c:1047 sm/certchain.c:1562 sm/certchain.c:2202
+#: sm/decrypt.c:1084 sm/encrypt.c:621 sm/import.c:414 sm/keydb.c:1920
+#: sm/keydb.c:2009 sm/sign.c:428 sm/verify.c:117
 #, fuzzy, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: sm/certchain.c:1232
+#: sm/certchain.c:1233
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "NOTA: a chave está revocada"
 
-#: sm/certchain.c:1247
+#: sm/certchain.c:1248
 msgid "the status of the certificate is unknown"
 msgstr ""
 
-#: sm/certchain.c:1254
+#: sm/certchain.c:1255
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:1260
+#: sm/certchain.c:1261
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "fallou a comprobación da sinatura creada: %s\n"
 
-#: sm/certchain.c:1289 sm/certchain.c:1357 dirmngr/validate.c:497
+#: sm/certchain.c:1290 sm/certchain.c:1358 dirmngr/validate.c:497
 #, fuzzy, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "problema de lectura do certificado: %s\n"
 
-#: sm/certchain.c:1304 sm/certchain.c:1389 dirmngr/validate.c:515
+#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:515
 #, fuzzy, c-format
 msgid "certificate not yet valid"
 msgstr "Revocación de certificado válida"
 
-#: sm/certchain.c:1305 sm/certchain.c:1390
+#: sm/certchain.c:1306 sm/certchain.c:1391
 #, fuzzy
 msgid "root certificate not yet valid"
 msgstr "Revocación de certificado válida"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1307 sm/certchain.c:1392
 #, fuzzy
 msgid "intermediate certificate not yet valid"
 msgstr "Revocación de certificado válida"
 
-#: sm/certchain.c:1319 dirmngr/validate.c:526
+#: sm/certchain.c:1320 dirmngr/validate.c:526
 #, fuzzy, c-format
 msgid "certificate has expired"
 msgstr "problema de lectura do certificado: %s\n"
 
-#: sm/certchain.c:1320
+#: sm/certchain.c:1321
 #, fuzzy
 msgid "root certificate has expired"
 msgstr "problema de lectura do certificado: %s\n"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1322
 #, fuzzy
 msgid "intermediate certificate has expired"
 msgstr "problema de lectura do certificado: %s\n"
 
-#: sm/certchain.c:1363
+#: sm/certchain.c:1364
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:1372
+#: sm/certchain.c:1373
 #, fuzzy
 msgid "certificate with invalid validity"
 msgstr "problema de lectura do certificado: %s\n"
 
-#: sm/certchain.c:1409
+#: sm/certchain.c:1410
 msgid "signature not created during lifetime of certificate"
 msgstr ""
 
-#: sm/certchain.c:1411
+#: sm/certchain.c:1412
 msgid "certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1413
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1416
+#: sm/certchain.c:1417
 #, fuzzy, c-format
 msgid "  (  signature created at "
 msgstr "         novas sinaturas: %lu\n"
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1418
 #, fuzzy, c-format
 msgid "  (certificate created at "
 msgstr "Creouse o certificado de revocación.\n"
 
-#: sm/certchain.c:1420
+#: sm/certchain.c:1421
 #, fuzzy, c-format
 msgid "  (certificate valid from "
 msgstr "Revocación de certificado válida"
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1422
 #, c-format
 msgid "  (     issuer valid from "
 msgstr ""
 
-#: sm/certchain.c:1451 dirmngr/validate.c:577
+#: sm/certchain.c:1452 dirmngr/validate.c:577
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "Pegada dactilar:"
 
-#: sm/certchain.c:1460
+#: sm/certchain.c:1461
 #, fuzzy, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 "Non se atoparon certificados con confianza non definida.\n"
 "\n"
 
-#: sm/certchain.c:1473
+#: sm/certchain.c:1474
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1479
+#: sm/certchain.c:1480
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1538
+#: sm/certchain.c:1539
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 
-#: sm/certchain.c:1602
+#: sm/certchain.c:1603
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "Certificado correcto"
 
-#: sm/certchain.c:1680
+#: sm/certchain.c:1681
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1749 dirmngr/validate.c:575
+#: sm/certchain.c:1750 dirmngr/validate.c:575
 #, fuzzy, c-format
 msgid "root certificate is not marked trusted"
 msgstr ""
 "Non se atoparon certificados con confianza non definida.\n"
 "\n"
 
-#: sm/certchain.c:1765
+#: sm/certchain.c:1766
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "fallou a comprobación da sinatura creada: %s\n"
 
-#: sm/certchain.c:1796 sm/import.c:175 dirmngr/validate.c:630
+#: sm/certchain.c:1797 sm/import.c:175 dirmngr/validate.c:630
 #, fuzzy, c-format
 msgid "certificate chain too long\n"
 msgstr "Revocación de certificado válida"
 
-#: sm/certchain.c:1808 dirmngr/validate.c:642
+#: sm/certchain.c:1809 dirmngr/validate.c:642
 #, fuzzy, c-format
 msgid "issuer certificate not found"
 msgstr "Revocación de certificado válida"
 
-#: sm/certchain.c:1842 dirmngr/validate.c:668
+#: sm/certchain.c:1844 dirmngr/validate.c:668
 #, fuzzy, c-format
 msgid "certificate has a BAD signature"
 msgstr "verificar unha sinatura"
 
-#: sm/certchain.c:1874 dirmngr/validate.c:692
+#: sm/certchain.c:1876 dirmngr/validate.c:692
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1933 dirmngr/validate.c:717
+#: sm/certchain.c:1935 dirmngr/validate.c:717
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1975 sm/certchain.c:2275 dirmngr/validate.c:747
+#: sm/certchain.c:1977 sm/certchain.c:2278 dirmngr/validate.c:747
 #, fuzzy, c-format
 msgid "certificate is good\n"
 msgstr "Revocación de certificado válida"
 
-#: sm/certchain.c:1976
+#: sm/certchain.c:1978
 #, fuzzy, c-format
 msgid "intermediate certificate is good\n"
 msgstr "certificado duplicado - borrado"
 
-#: sm/certchain.c:1977
+#: sm/certchain.c:1979
 #, fuzzy, c-format
 msgid "root certificate is good\n"
 msgstr ""
 "Non se atoparon certificados con confianza non definida.\n"
 "\n"
 
-#: sm/certchain.c:2159
+#: sm/certchain.c:2161
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:2168
+#: sm/certchain.c:2170
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -9082,18 +9095,18 @@ 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:1372 dirmngr/validate.c:903
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1411 dirmngr/validate.c:903
 #: dirmngr/validate.c:927
 #, fuzzy, c-format
 msgid "out of core\n"
 msgstr "non procesado"
 
-#: sm/certcheck.c:389 sm/verify.c:212
+#: sm/certcheck.c:388 sm/verify.c:212
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:793
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:794
 #, fuzzy
 msgid "none"
 msgstr "non|nom"
@@ -9392,17 +9405,17 @@ msgstr ""
 msgid "resource problem: out of core\n"
 msgstr ""
 
-#: sm/decrypt.c:719
+#: sm/decrypt.c:1159
 #, c-format
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
 
-#: sm/decrypt.c:721
+#: sm/decrypt.c:1161
 #, c-format
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr ""
 
-#: sm/decrypt.c:868
+#: sm/decrypt.c:1318
 #, fuzzy, c-format
 msgid "encrypted to %s key %s\n"
 msgstr "cifrado cunha chave %s, ID %08lX\n"
@@ -9412,7 +9425,7 @@ msgstr "cifrado cunha chave %s, ID %08lX\n"
 msgid "certificate '%s' not found: %s\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: sm/delete.c:120 sm/keydb.c:1999 sm/keydb.c:2098
+#: sm/delete.c:120 sm/keydb.c:2021 sm/keydb.c:2120
 #, fuzzy, c-format
 msgid "error locking keybox: %s\n"
 msgstr "erro ao le-lo bloque de chaves: %s\n"
@@ -9432,7 +9445,7 @@ msgstr "certificado duplicado - borrado"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: sm/encrypt.c:606
+#: sm/encrypt.c:607
 #, fuzzy, c-format
 msgid "no valid recipients given\n"
 msgstr "(Non se deu unha descrición)\n"
@@ -9508,68 +9521,68 @@ msgstr "|NOME|empregar NOME coma chave secreta por defecto"
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "engadir este chaveiro á lista de chaveiros"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:352 dirmngr/dirmngr.c:265
 #, fuzzy
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|HOST|empregar este servidor de chaves para buscar chaves"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:363
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:364
+#: sm/gpgsm.c:365
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NOME|emprega-lo algoritmo de cifrado NOME para os contrasinais"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:386
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:389
+#: sm/gpgsm.c:390
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: sm/gpgsm.c:393
+#: sm/gpgsm.c:394
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:396
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:398
+#: sm/gpgsm.c:399
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|emprega-lo algoritmo de cifrado NOME"
 
-#: sm/gpgsm.c:400
+#: sm/gpgsm.c:401
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|emprega-lo algoritmo de resumos de mensaxes NOME"
 
-#: sm/gpgsm.c:410
+#: sm/gpgsm.c:411
 msgid "batch mode: never ask"
 msgstr "modo por lotes: non preguntar nunca"
 
-#: sm/gpgsm.c:412
+#: sm/gpgsm.c:413
 msgid "assume yes on most questions"
 msgstr "asumir `si' na maioría das preguntas"
 
-#: sm/gpgsm.c:413
+#: sm/gpgsm.c:414
 msgid "assume no on most questions"
 msgstr "asumir `non' na maioría das preguntas"
 
-#: sm/gpgsm.c:430
+#: sm/gpgsm.c:431
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FICHEIRO|carga-lo módulo de extensión FICHEIRO"
 
-#: sm/gpgsm.c:615
+#: sm/gpgsm.c:616
 #, 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:618
+#: sm/gpgsm.c:619
 #, fuzzy
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
@@ -9580,52 +9593,27 @@ msgstr ""
 "asinar, verificar, cifrar ou descifrar\n"
 "a operación por defecto depende dos datos de entrada\n"
 
-#: sm/gpgsm.c:826
+#: sm/gpgsm.c:827
 #, 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:837
+#: sm/gpgsm.c:838
 #, fuzzy, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "destinatario por defecto `%s' descoñecido\n"
 
-#: sm/gpgsm.c:896 dirmngr/ldapserver.c:89
-#, fuzzy, c-format
-msgid "%s:%u: no hostname given\n"
-msgstr "(Non se deu unha descrición)\n"
-
-#: sm/gpgsm.c:915 dirmngr/ldapserver.c:108
-#, c-format
-msgid "%s:%u: password given without user\n"
-msgstr ""
-
-#: sm/gpgsm.c:946 dirmngr/ldapserver.c:139
-#, c-format
-msgid "%s:%u: ignoring unknown flag '%s'\n"
-msgstr ""
-
-#: sm/gpgsm.c:962 dirmngr/ldapserver.c:155
-#, fuzzy, c-format
-msgid "%s:%u: skipping this line\n"
-msgstr " o = omitir esta chave\n"
-
-#: sm/gpgsm.c:1550
-#, fuzzy, c-format
-msgid "could not parse keyserver\n"
-msgstr "non se puido analisa-lo URI do servidor de chaves\n"
-
-#: sm/gpgsm.c:1858
+#: sm/gpgsm.c:1711
 #, fuzzy, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "escribindo a `%s'\n"
 
-#: sm/gpgsm.c:1904
+#: sm/gpgsm.c:1757
 #, fuzzy, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "non se pode pechar `%s': %s\n"
 
-#: sm/gpgsm.c:2273
+#: sm/gpgsm.c:2129
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
@@ -9645,52 +9633,52 @@ msgstr "Certificado correcto"
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:471 sm/keydb.c:2018 sm/keydb.c:2111
+#: sm/import.c:472 sm/keydb.c:2040 sm/keydb.c:2133
 #, fuzzy, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: sm/import.c:530 sm/import.c:562
+#: sm/import.c:531 sm/import.c:563
 #, fuzzy, c-format
 msgid "error importing certificate: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: sm/import.c:751 tools/gpg-connect-agent.c:1475
+#: sm/import.c:752 tools/gpg-connect-agent.c:1475
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: sm/keydb.c:503
+#: sm/keydb.c:508
 #, fuzzy, c-format
 msgid "no keyboxd running in this session\n"
 msgstr "gpg-agent non está dispoñible nesta sesión\n"
 
-#: sm/keydb.c:595
+#: sm/keydb.c:600
 #, fuzzy, c-format
 msgid "error opening key DB: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: sm/keydb.c:1936
+#: sm/keydb.c:1958
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1948
+#: sm/keydb.c:1970
 #, fuzzy, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: sm/keydb.c:1956
+#: sm/keydb.c:1978
 #, fuzzy, c-format
 msgid "error storing certificate: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: sm/keydb.c:2009
+#: sm/keydb.c:2031
 #, fuzzy, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "rev? problema ao comproba-la revocación: %s\n"
 
-#: sm/keydb.c:2030 sm/keydb.c:2122
+#: sm/keydb.c:2052 sm/keydb.c:2144
 #, fuzzy, c-format
 msgid "error storing flags: %s\n"
 msgstr "erro lendo `%s': %s\n"
@@ -9862,57 +9850,57 @@ msgstr ""
 msgid "error loading certificate '%s': %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: dirmngr/certcache.c:819
+#: dirmngr/certcache.c:820
 #, fuzzy, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "Certificado non válido"
 
-#: dirmngr/certcache.c:821
+#: dirmngr/certcache.c:822
 #, fuzzy, c-format
 msgid "    runtime cached certificates: %u\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: dirmngr/certcache.c:823
+#: dirmngr/certcache.c:824
 #, fuzzy, c-format
 msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: dirmngr/certcache.c:851 dirmngr/dirmngr-client.c:392
+#: dirmngr/certcache.c:852 dirmngr/dirmngr-client.c:392
 #, fuzzy, c-format
 msgid "certificate already cached\n"
 msgstr "Creouse o certificado de revocación.\n"
 
-#: dirmngr/certcache.c:853
+#: dirmngr/certcache.c:854
 #, fuzzy, c-format
 msgid "certificate cached\n"
 msgstr "Revocación de certificado válida"
 
-#: dirmngr/certcache.c:855 dirmngr/certcache.c:875 dirmngr/dirmngr-client.c:396
+#: dirmngr/certcache.c:856 dirmngr/certcache.c:876 dirmngr/dirmngr-client.c:396
 #, fuzzy, c-format
 msgid "error caching certificate: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: dirmngr/certcache.c:938
+#: dirmngr/certcache.c:939
 #, fuzzy, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "erro: pegada dactilar non válida\n"
 
-#: dirmngr/certcache.c:1384 dirmngr/certcache.c:1393
+#: dirmngr/certcache.c:1385 dirmngr/certcache.c:1394
 #, fuzzy, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: dirmngr/certcache.c:1579 dirmngr/certcache.c:1588
+#: dirmngr/certcache.c:1580 dirmngr/certcache.c:1589
 #, fuzzy, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: dirmngr/certcache.c:1694 dirmngr/validate.c:483
+#: dirmngr/certcache.c:1695 dirmngr/validate.c:483
 #, fuzzy, c-format
 msgid "no issuer found in certificate\n"
 msgstr "Certificado correcto"
 
-#: dirmngr/certcache.c:1704
+#: dirmngr/certcache.c:1705
 #, fuzzy, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
@@ -9949,7 +9937,7 @@ msgstr "fallou o borrado do bloque de chaves: %s\n"
 msgid "not removing file '%s'\n"
 msgstr "non se puido poñe-la armadura: %s\n"
 
-#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2380
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2383
 #, fuzzy, c-format
 msgid "error closing cache file: %s\n"
 msgstr "erro lendo `%s': %s\n"
@@ -10183,14 +10171,14 @@ msgid "error getting data from cache file: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
 #: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1672 dirmngr/crlcache.c:1697
-#: dirmngr/crlcache.c:1763
+#: dirmngr/crlcache.c:1766
 #, fuzzy, c-format
 #| msgid "invalid response from agent\n"
 msgid "got an invalid S-expression from libksba\n"
 msgstr "resposta do axente non válida\n"
 
 #: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1679 dirmngr/crlcache.c:1705
-#: dirmngr/crlcache.c:1770 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1773 dirmngr/misc.c:176
 #, fuzzy, c-format
 #| msgid "changing permission of  `%s' failed: %s\n"
 msgid "converting S-expression failed: %s\n"
@@ -10207,203 +10195,203 @@ msgstr "algoritmo de hash non válido `%s'\n"
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1797 dirmngr/ocsp.c:478
+#: dirmngr/crlcache.c:1800 dirmngr/ocsp.c:478
 #, fuzzy, c-format
 #| msgid "changing permission of  `%s' failed: %s\n"
 msgid "creating S-expression failed: %s\n"
 msgstr "o cambio de permisos de `%s' fallou: %s\n"
 
-#: dirmngr/crlcache.c:1871
+#: dirmngr/crlcache.c:1874
 #, fuzzy, c-format
 #| msgid "build_packet failed: %s\n"
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "a chamada a build_packet fallou: %s\n"
 
-#: dirmngr/crlcache.c:1886
+#: dirmngr/crlcache.c:1889
 #, fuzzy, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: dirmngr/crlcache.c:1893
+#: dirmngr/crlcache.c:1896
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1897
+#: dirmngr/crlcache.c:1900
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1917
+#: dirmngr/crlcache.c:1920
 #, fuzzy, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: dirmngr/crlcache.c:1932
+#: dirmngr/crlcache.c:1935
 #, fuzzy, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "escribindo a `%s'\n"
 
-#: dirmngr/crlcache.c:1959
+#: dirmngr/crlcache.c:1962
 #, fuzzy, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "Certificado correcto"
 
-#: dirmngr/crlcache.c:1974
+#: dirmngr/crlcache.c:1977
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2020
+#: dirmngr/crlcache.c:2023
 #, fuzzy, c-format
 #| msgid "signature verification suppressed\n"
 msgid "CRL signature verification failed: %s\n"
 msgstr "verificación de sinatura suprimida\n"
 
-#: dirmngr/crlcache.c:2032
+#: dirmngr/crlcache.c:2035
 #, fuzzy, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "fallou a comprobación da sinatura creada: %s\n"
 
-#: dirmngr/crlcache.c:2174
+#: dirmngr/crlcache.c:2177
 #, fuzzy, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: dirmngr/crlcache.c:2181
+#: dirmngr/crlcache.c:2184
 #, fuzzy, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "a actualización fallou: %s\n"
 
-#: dirmngr/crlcache.c:2215
+#: dirmngr/crlcache.c:2218
 #, fuzzy, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "non se pode crea-lo directorio `%s': %s\n"
 
-#: dirmngr/crlcache.c:2219
+#: dirmngr/crlcache.c:2222
 #, fuzzy, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "non se pode crea-lo directorio `%s': %s\n"
 
-#: dirmngr/crlcache.c:2229
+#: dirmngr/crlcache.c:2232
 #, fuzzy, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: dirmngr/crlcache.c:2239
+#: dirmngr/crlcache.c:2242
 #, fuzzy, c-format
 #| msgid "lid ?: insert failed: %s\n"
 msgid "crl_parse_insert failed: %s\n"
 msgstr "lid ?: a inserción fallou: %s\n"
 
-#: dirmngr/crlcache.c:2249
+#: dirmngr/crlcache.c:2252
 #, fuzzy, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "escribindo a `%s'\n"
 
-#: dirmngr/crlcache.c:2256
+#: dirmngr/crlcache.c:2259
 #, fuzzy, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: dirmngr/crlcache.c:2281
+#: dirmngr/crlcache.c:2284
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2285
+#: dirmngr/crlcache.c:2288
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2301
+#: dirmngr/crlcache.c:2304
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2311
+#: dirmngr/crlcache.c:2314
 #, fuzzy, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2365
 #, fuzzy, c-format
 msgid "creating cache file '%s'\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: dirmngr/crlcache.c:2394
+#: dirmngr/crlcache.c:2397
 #, fuzzy, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "non se puido poñe-la armadura: %s\n"
 
-#: dirmngr/crlcache.c:2408
+#: dirmngr/crlcache.c:2411
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
 "program start\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2448
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2468
+#: dirmngr/crlcache.c:2471
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2471
+#: dirmngr/crlcache.c:2474
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2474
+#: dirmngr/crlcache.c:2477
 msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2481
+#: dirmngr/crlcache.c:2484
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2499
+#: dirmngr/crlcache.c:2502
 #, fuzzy, c-format
 #| msgid "WARNING: invalid size of random_seed file - not used\n"
 msgid " WARNING: invalid cache record length\n"
 msgstr "AVISO: tamaño do ficheiro random_seed non válido - non se emprega\n"
 
-#: dirmngr/crlcache.c:2506
+#: dirmngr/crlcache.c:2509
 #, fuzzy, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "%s: erro ao ler un rexistro libre: %s\n"
 
-#: dirmngr/crlcache.c:2517
+#: dirmngr/crlcache.c:2520
 #, fuzzy, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "rev? problema ao comproba-la revocación: %s\n"
 
-#: dirmngr/crlcache.c:2548
+#: dirmngr/crlcache.c:2551
 #, fuzzy, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: dirmngr/crlcache.c:2551
+#: dirmngr/crlcache.c:2554
 msgid "End CRL dump\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2672
+#: dirmngr/crlcache.c:2675
 #, fuzzy, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "a actualización fallou: %s\n"
 
-#: dirmngr/crlcache.c:2683
+#: dirmngr/crlcache.c:2686
 #, fuzzy, c-format
 #| msgid "lid ?: insert failed: %s\n"
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "lid ?: a inserción fallou: %s\n"
 
-#: dirmngr/crlcache.c:2743
+#: dirmngr/crlcache.c:2746
 #, fuzzy, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
@@ -10424,7 +10412,7 @@ msgstr ""
 msgid "error retrieving '%s': %s\n"
 msgstr "erro ao crear `%s': %s\n"
 
-#: dirmngr/crlfetch.c:218 dirmngr/ldap-wrapper.c:881 dirmngr/misc.c:573
+#: dirmngr/crlfetch.c:218 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
 #, fuzzy, c-format
 #| msgid "%s: error writing dir record: %s\n"
 msgid "error initializing reader object: %s\n"
@@ -10594,135 +10582,135 @@ msgstr ""
 msgid "looking up '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:175
+#: dirmngr/dirmngr.c:176
 msgid "list the contents of the CRL cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:176
+#: dirmngr/dirmngr.c:177
 #, fuzzy
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|FICHEIRO|carga-lo módulo de extensión FICHEIRO"
 
-#: dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr.c:178
 msgid "|URL|fetch a CRL from URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:178
+#: dirmngr/dirmngr.c:179
 msgid "shutdown the dirmngr"
 msgstr ""
 
-#: dirmngr/dirmngr.c:179
+#: dirmngr/dirmngr.c:180
 msgid "flush the cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:213
 msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:215
+#: dirmngr/dirmngr.c:216
 msgid "|N|do not return more than N items in one query"
 msgstr ""
 
-#: dirmngr/dirmngr.c:221
+#: dirmngr/dirmngr.c:222
 msgid "Network related options"
 msgstr ""
 
-#: dirmngr/dirmngr.c:223
+#: dirmngr/dirmngr.c:224
 msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:235
+#: dirmngr/dirmngr.c:236
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:238
+#: dirmngr/dirmngr.c:239
 #, fuzzy
 msgid "|URL|use keyserver at URL"
 msgstr "non se puido analisa-lo URI do servidor de chaves\n"
 
-#: dirmngr/dirmngr.c:240
+#: dirmngr/dirmngr.c:241
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-#: dirmngr/dirmngr.c:242
+#: dirmngr/dirmngr.c:243
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:244
+#: dirmngr/dirmngr.c:245
 msgid "inhibit the use of HTTP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:246
+#: dirmngr/dirmngr.c:247
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:248
+#: dirmngr/dirmngr.c:249
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:250
+#: dirmngr/dirmngr.c:251
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: dirmngr/dirmngr.c:254
+#: dirmngr/dirmngr.c:255
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: dirmngr/dirmngr.c:256
+#: dirmngr/dirmngr.c:257
 msgid "inhibit the use of LDAP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:258
+#: dirmngr/dirmngr.c:259
 msgid "ignore LDAP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:260
+#: dirmngr/dirmngr.c:261
 msgid "|HOST|use HOST for LDAP queries"
 msgstr ""
 
-#: dirmngr/dirmngr.c:262
+#: dirmngr/dirmngr.c:263
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr ""
 
-#: dirmngr/dirmngr.c:264
+#: dirmngr/dirmngr.c:267
 #, fuzzy
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FICHEIRO|carga-lo módulo de extensión FICHEIRO"
 
-#: dirmngr/dirmngr.c:266
+#: dirmngr/dirmngr.c:269
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 
-#: dirmngr/dirmngr.c:269 dirmngr/dirmngr_ldap.c:104
+#: dirmngr/dirmngr.c:272
 msgid "|N|set LDAP timeout to N seconds"
 msgstr ""
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:275
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:274
+#: dirmngr/dirmngr.c:277
 msgid "allow sending OCSP requests"
 msgstr ""
 
-#: dirmngr/dirmngr.c:276
+#: dirmngr/dirmngr.c:279
 msgid "ignore certificate contained OCSP service URLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:278
+#: dirmngr/dirmngr.c:281
 #, fuzzy
 msgid "|URL|use OCSP responder at URL"
 msgstr "non se puido analisa-lo URI do servidor de chaves\n"
 
-#: dirmngr/dirmngr.c:280
+#: dirmngr/dirmngr.c:283
 msgid "|FPR|OCSP response signed by FPR"
 msgstr ""
 
-#: dirmngr/dirmngr.c:288
+#: dirmngr/dirmngr.c:291
 msgid "force loading of outdated CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:299
+#: dirmngr/dirmngr.c:302
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -10735,304 +10723,115 @@ msgstr ""
 "@\n"
 "(Vexa a páxina man para un listado completo de comandos e opcións)\n"
 
-#: dirmngr/dirmngr.c:441
+#: dirmngr/dirmngr.c:449
 #, fuzzy
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
 
-#: dirmngr/dirmngr.c:443
+#: dirmngr/dirmngr.c:451
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:523
+#: dirmngr/dirmngr.c:531
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:609 tools/gpgconf.c:667 tools/gpgconf.c:702
-#: tools/gpgconf.c:802
+#: dirmngr/dirmngr.c:617 tools/gpgconf.c:701 tools/gpgconf.c:736
+#: tools/gpgconf.c:836
 #, fuzzy, c-format
 msgid "usage: %s [options] "
 msgstr "uso: gpg [opcións] "
 
-#: dirmngr/dirmngr.c:1260
+#: dirmngr/dirmngr.c:1299
 #, 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:1495 dirmngr/server.c:1824
+#: dirmngr/dirmngr.c:1534 dirmngr/server.c:1878
 #, fuzzy, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "non se puido poñe-la armadura: %s\n"
 
-#: dirmngr/dirmngr.c:1501 dirmngr/server.c:1830
+#: dirmngr/dirmngr.c:1540 dirmngr/server.c:1884
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "non se puido poñe-la armadura: %s\n"
 
-#: dirmngr/dirmngr.c:1643
+#: dirmngr/dirmngr.c:1682
 #, fuzzy, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "liña longa de máis\n"
 
-#: dirmngr/dirmngr.c:1698 dirmngr/dirmngr.c:1782
+#: dirmngr/dirmngr.c:1737 dirmngr/dirmngr.c:1821
 #, fuzzy, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "erro: pegada dactilar non válida\n"
 
-#: dirmngr/dirmngr.c:1734 dirmngr/dirmngr.c:1760 tools/gpgconf-comp.c:3539
+#: dirmngr/dirmngr.c:1773 dirmngr/dirmngr.c:1799 tools/gpgconf-comp.c:3549
 #, fuzzy, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "erro de lectura: %s\n"
 
-#: dirmngr/dirmngr.c:1789
+#: dirmngr/dirmngr.c:1828
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1876
+#: dirmngr/dirmngr.c:1915
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1917
+#: dirmngr/dirmngr.c:1956
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1922
+#: dirmngr/dirmngr.c:1961
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1924
+#: dirmngr/dirmngr.c:1963
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1929
+#: dirmngr/dirmngr.c:1968
 #, fuzzy, c-format
 msgid "shutdown forced\n"
 msgstr "non procesado"
 
-#: dirmngr/dirmngr.c:1937
+#: dirmngr/dirmngr.c:1976
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1944
+#: dirmngr/dirmngr.c:1983
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:105
-msgid "return all values in a record oriented format"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:108
-msgid "|NAME|ignore host part and connect through NAME"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:109
-msgid "force a TLS connection"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:110
-#, fuzzy
-#| msgid "|NAME|set terminal charset to NAME"
-msgid "|NAME|connect to host NAME"
-msgstr "|NAME|axusta-lo xogo de caracteres do terminal a NOME"
-
-#: dirmngr/dirmngr_ldap.c:111
-msgid "|N|connect to port N"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:112
-#, fuzzy
-#| msgid "|NAME|use NAME as default recipient"
-msgid "|NAME|use user NAME for authentication"
-msgstr "|NOME|empregar NOME como valor por defecto do destinatario"
-
-#: dirmngr/dirmngr_ldap.c:113
-msgid "|PASS|use password PASS for authentication"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:115
-msgid "take password from $DIRMNGR_LDAP_PASS"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:116
-msgid "|STRING|query DN STRING"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:117
-msgid "|STRING|use STRING as filter expression"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:118
-msgid "|STRING|return the attribute STRING"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:179
-#, fuzzy
-#| msgid "Usage: gpg [options] [files] (-h for help)"
-msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
-msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
-
-#: dirmngr/dirmngr_ldap.c:182
-msgid ""
-"Syntax: dirmngr_ldap [options] [URL]\n"
-"Internal LDAP helper for Dirmngr\n"
-"Interface and options may change without notice\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:291
-#, fuzzy, c-format
-#| msgid "invalid import options\n"
-msgid "invalid port number %d\n"
-msgstr "opcións de importación non válidas\n"
-
-#: dirmngr/dirmngr_ldap.c:400
-#, c-format
-msgid "scanning result for attribute '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:407 dirmngr/dirmngr_ldap.c:490
-#: dirmngr/dirmngr_ldap.c:514 dirmngr/dirmngr_ldap.c:526
-#: dirmngr/dirmngr_ldap.c:722
-#, fuzzy, c-format
-msgid "error writing to stdout: %s\n"
-msgstr "erro escribindo no chaveiro `%s': %s\n"
-
-#: dirmngr/dirmngr_ldap.c:424
-#, c-format
-msgid "          available attribute '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:462
-#, fuzzy, c-format
-msgid "attribute '%s' not found\n"
-msgstr "non se atopou a chave `%s': %s\n"
-
-#: dirmngr/dirmngr_ldap.c:469
-#, c-format
-msgid "found attribute '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:581
-#, fuzzy, c-format
-#| msgid "reading from `%s'\n"
-msgid "processing url '%s'\n"
-msgstr "lendo de `%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:588
-#, fuzzy, c-format
-#| msgid "          w/o user IDs: %lu\n"
-msgid "          user '%s'\n"
-msgstr "   sin IDs de usuario: %lu\n"
-
-#: dirmngr/dirmngr_ldap.c:590
-#, fuzzy, c-format
-msgid "          pass '%s'\n"
-msgstr "               alias \""
-
-#: dirmngr/dirmngr_ldap.c:592
-#, fuzzy, c-format
-msgid "          host '%s'\n"
-msgstr "               alias \""
-
-#: dirmngr/dirmngr_ldap.c:593
-#, fuzzy, c-format
-#| msgid "          not imported: %lu\n"
-msgid "          port %d\n"
-msgstr "       non importadas: %lu\n"
-
-#: dirmngr/dirmngr_ldap.c:595
-#, fuzzy, c-format
-msgid "            DN '%s'\n"
-msgstr "               alias \""
-
-#: dirmngr/dirmngr_ldap.c:597
-#, c-format
-msgid "        filter '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:602 dirmngr/dirmngr_ldap.c:605
-#, fuzzy, c-format
-msgid "          attr '%s'\n"
-msgstr "               alias \""
-
-#: dirmngr/dirmngr_ldap.c:611
-#, fuzzy, c-format
-msgid "no host name in '%s'\n"
-msgstr "(Non se deu unha descrición)\n"
-
-#: dirmngr/dirmngr_ldap.c:616
-#, c-format
-msgid "no attribute given for query '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:622
-#, fuzzy, c-format
-#| msgid "WARNING: using insecure memory!\n"
-msgid "WARNING: using first attribute only\n"
-msgstr "AVISO: ¡úsase memoria insegura!\n"
-
-#: dirmngr/dirmngr_ldap.c:637 dirmngr/dirmngr_ldap.c:678
-#, fuzzy, c-format
-msgid "LDAP init to '%s:%d' failed: %s\n"
-msgstr "non se puido poñe-la armadura: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:659
-#, fuzzy, c-format
-msgid "LDAP init to '%s' failed: %s\n"
-msgstr "non se puido poñe-la armadura: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:665
-#, fuzzy, c-format
-msgid "LDAP init to '%s' done\n"
-msgstr "non se puido poñe-la armadura: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:704
-#, fuzzy, c-format
-msgid "binding to '%s:%d' failed: %s\n"
-msgstr "non se puido poñe-la armadura: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:728
-#, fuzzy, c-format
-#| msgid "dearmoring failed: %s\n"
-msgid "searching '%s' failed: %s\n"
-msgstr "non se puido quita-la armadura: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:759
-#, fuzzy, c-format
-msgid "'%s' is not an LDAP URL\n"
-msgstr "\"%s\" non é un ficheiro JPEG\n"
-
-#: dirmngr/dirmngr_ldap.c:765
-#, c-format
-msgid "'%s' is an invalid LDAP URL\n"
-msgstr ""
-
-#: dirmngr/http.c:1989 dirmngr/ocsp.c:255
+#: dirmngr/http.c:1998 dirmngr/ocsp.c:255
 #, fuzzy, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: dirmngr/http.c:3630 dirmngr/ocsp.c:229
+#: dirmngr/http.c:3652 dirmngr/ocsp.c:229
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr ""
 
-#: dirmngr/http.c:3636 dirmngr/ocsp.c:246
+#: dirmngr/http.c:3658 dirmngr/ocsp.c:246
 #, fuzzy, c-format
 msgid "too many redirections\n"
 msgstr "demasiadas preferencias `%c'\n"
 
-#: dirmngr/http.c:3748
+#: dirmngr/http.c:3768
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "redirection changed to '%s'\n"
@@ -11073,31 +10872,51 @@ msgstr "a actualización fallou: %s\n"
 msgid "ldap wrapper %d stalled - killing\n"
 msgstr ""
 
-#: dirmngr/ldap.c:91
+#: dirmngr/ldap.c:92
 #, c-format
 msgid "invalid char 0x%02x in host name - not added\n"
 msgstr ""
 
-#: dirmngr/ldap.c:95
+#: dirmngr/ldap.c:96
 #, fuzzy, c-format
 msgid "adding '%s:%d' to the ldap server list\n"
 msgstr "buscando \"%s\" no servidor HKP %s\n"
 
-#: dirmngr/ldap.c:98 dirmngr/misc.c:512
+#: dirmngr/ldap.c:99 dirmngr/misc.c:512
 #, fuzzy, c-format
 msgid "malloc failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: dirmngr/ldap.c:634
+#: dirmngr/ldap.c:221
+#, fuzzy, c-format
+msgid "'%s' is not an LDAP URL\n"
+msgstr "\"%s\" non é un ficheiro JPEG\n"
+
+#: dirmngr/ldap.c:227 dirmngr/ldap.c:233
 #, c-format
-msgid "start_cert_fetch: invalid pattern '%s'\n"
+msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
-#: dirmngr/ldap.c:846
+#: dirmngr/ldap.c:968
 #, c-format
 msgid "ldap_search hit the size limit of the server\n"
 msgstr ""
 
+#: dirmngr/ldapserver.c:119
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr ""
+
+#: dirmngr/ldapserver.c:181
+#, c-format
+msgid "%s:%u: ignoring unknown flag '%s'\n"
+msgstr ""
+
+#: dirmngr/ldapserver.c:203
+#, fuzzy, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr " o = omitir esta chave\n"
+
 #: dirmngr/misc.c:172
 #, fuzzy, c-format
 #| msgid "%s: invalid file version %d\n"
@@ -11191,87 +11010,87 @@ msgstr ""
 msgid "allocating list item failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: dirmngr/ocsp.c:537 dirmngr/ocsp.c:724
+#: dirmngr/ocsp.c:538 dirmngr/ocsp.c:725
 #, fuzzy, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: dirmngr/ocsp.c:584
+#: dirmngr/ocsp.c:585
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:623 dirmngr/validate.c:648
+#: dirmngr/ocsp.c:624 dirmngr/validate.c:648
 #, fuzzy, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "Revocación de certificado válida"
 
-#: dirmngr/ocsp.c:633
+#: dirmngr/ocsp.c:634
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:640
+#: dirmngr/ocsp.c:641
 #, fuzzy, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "Certificado correcto"
 
-#: dirmngr/ocsp.c:650
+#: dirmngr/ocsp.c:651
 #, fuzzy, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: dirmngr/ocsp.c:689
+#: dirmngr/ocsp.c:690
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:696
 #, fuzzy, c-format
 #| msgid "no default secret keyring: %s\n"
 msgid "no default OCSP signer defined\n"
 msgstr "non hai un chaveiro privado por defecto: %s\n"
 
-#: dirmngr/ocsp.c:702
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:707
+#: dirmngr/ocsp.c:708
 #, fuzzy, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "fallou a sinatura: %s\n"
 
-#: dirmngr/ocsp.c:764
+#: dirmngr/ocsp.c:765
 #, fuzzy, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: dirmngr/ocsp.c:789
+#: dirmngr/ocsp.c:790
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:790
+#: dirmngr/ocsp.c:791
 msgid "good"
 msgstr ""
 
-#: dirmngr/ocsp.c:796
+#: dirmngr/ocsp.c:797
 #, fuzzy, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "NOTA: a chave está revocada"
 
-#: dirmngr/ocsp.c:831
+#: dirmngr/ocsp.c:832
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:843
+#: dirmngr/ocsp.c:844
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:858
+#: dirmngr/ocsp.c:859
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr ""
@@ -11281,72 +11100,68 @@ msgstr ""
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "fallou a sinatura: %s\n"
 
-#: dirmngr/server.c:1158
-msgid "ldapserver missing"
-msgstr ""
-
-#: dirmngr/server.c:1224
+#: dirmngr/server.c:1277
 msgid "serialno missing in cert ID"
 msgstr ""
 
-#: dirmngr/server.c:1387 dirmngr/server.c:1473 dirmngr/server.c:1909
-#: dirmngr/server.c:1980 dirmngr/server.c:2556 dirmngr/server.c:2571
+#: dirmngr/server.c:1440 dirmngr/server.c:1526 dirmngr/server.c:1963
+#: dirmngr/server.c:2034 dirmngr/server.c:2662 dirmngr/server.c:2677
 #, fuzzy, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "fallou a sinatura: %s\n"
 
-#: dirmngr/server.c:1516
+#: dirmngr/server.c:1569
 #, fuzzy, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: dirmngr/server.c:1528 dirmngr/server.c:1559 dirmngr/server.c:1718
+#: dirmngr/server.c:1581 dirmngr/server.c:1612 dirmngr/server.c:1772
 #, fuzzy, c-format
 msgid "error sending data: %s\n"
 msgstr "erro ao enviar a `%s': %s\n"
 
-#: dirmngr/server.c:1666
+#: dirmngr/server.c:1720
 #, fuzzy, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: dirmngr/server.c:1699
+#: dirmngr/server.c:1753
 #, fuzzy, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: dirmngr/server.c:1726
+#: dirmngr/server.c:1780
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:2860
+#: dirmngr/server.c:2966
 #, fuzzy, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "non se pode crear `%s': %s\n"
 
-#: dirmngr/server.c:2871
+#: dirmngr/server.c:2977
 #, fuzzy, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "%s: fallo ao crear unha táboa hash: %s\n"
 
-#: dirmngr/server.c:2892
+#: dirmngr/server.c:2998
 #, fuzzy, c-format
 #| msgid "failed to initialize the TrustDB: %s\n"
 msgid "failed to initialize the server: %s\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: dirmngr/server.c:2900
+#: dirmngr/server.c:3006
 #, fuzzy, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "fallo ao reconstruí-la caché de chaveiros: %s\n"
 
-#: dirmngr/server.c:2933
+#: dirmngr/server.c:3039
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:2952
+#: dirmngr/server.c:3058
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -11495,73 +11310,73 @@ msgstr "gpg-agent non está dispoñible nesta sesión\n"
 msgid "error sending standard options: %s\n"
 msgstr "erro ao enviar a `%s': %s\n"
 
-#: tools/gpgconf-comp.c:649
+#: tools/gpgconf-comp.c:655
 msgid "OpenPGP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:653
+#: tools/gpgconf-comp.c:659
 msgid "S/MIME"
 msgstr ""
 
-#: tools/gpgconf-comp.c:657
+#: tools/gpgconf-comp.c:663
 #, fuzzy
 msgid "Public Keys"
 msgstr "a chave pública é %08lX\n"
 
-#: tools/gpgconf-comp.c:661
+#: tools/gpgconf-comp.c:667
 msgid "Private Keys"
 msgstr ""
 
-#: tools/gpgconf-comp.c:665
+#: tools/gpgconf-comp.c:671
 msgid "Smartcards"
 msgstr ""
 
-#: tools/gpgconf-comp.c:669
+#: tools/gpgconf-comp.c:676
 msgid "TPM"
 msgstr ""
 
-#: tools/gpgconf-comp.c:673
+#: tools/gpgconf-comp.c:681
 #, fuzzy
 #| msgid "network error"
 msgid "Network"
 msgstr "erro de rede"
 
-#: tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:685
 #, fuzzy
 msgid "Passphrase Entry"
 msgstr "contrasinal erróneo"
 
-#: tools/gpgconf-comp.c:941
+#: tools/gpgconf-comp.c:951
 #, fuzzy
 msgid "Component not suitable for launching"
 msgstr "non se atopou a chave pública"
 
-#: tools/gpgconf-comp.c:947
+#: tools/gpgconf-comp.c:957
 #, c-format
 msgid "Configuration file of component %s is broken\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:950
+#: tools/gpgconf-comp.c:960
 #, fuzzy, c-format
 #| msgid "Please use the command \"toggle\" first.\n"
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr "Por favor, empregue o comando \"toggle\" antes.\n"
 
-#: tools/gpgconf-comp.c:2816
+#: tools/gpgconf-comp.c:2826
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2946
+#: tools/gpgconf-comp.c:2956
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3543
+#: tools/gpgconf-comp.c:3553
 #, fuzzy, c-format
 msgid "error closing '%s'\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: tools/gpgconf-comp.c:3545
+#: tools/gpgconf-comp.c:3555
 #, fuzzy, c-format
 msgid "error parsing '%s'\n"
 msgstr "erro lendo `%s': %s\n"
@@ -11645,16 +11460,16 @@ msgid ""
 "Manage configuration options for tools of the @GNUPG@ system\n"
 msgstr ""
 
-#: tools/gpgconf.c:669 tools/gpgconf.c:704
+#: tools/gpgconf.c:703 tools/gpgconf.c:738
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:678 tools/gpgconf.c:728 tools/gpgconf.c:778
+#: tools/gpgconf.c:712 tools/gpgconf.c:762 tools/gpgconf.c:812
 #, fuzzy
 msgid "Component not found"
 msgstr "non se atopou a chave pública"
 
-#: tools/gpgconf.c:804
+#: tools/gpgconf.c:838
 #, fuzzy
 msgid "No argument allowed"
 msgstr "gravando a chave secreta en `%s'\n"
@@ -11670,88 +11485,189 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
-#: tools/gpg-card.c:2390
+#: tools/gpg-card.c:2407
 #, fuzzy, c-format
 msgid "Note: key %s is already stored on the card!\n"
 msgstr "omítese: a chave secreta xa está presente\n"
 
-#: tools/gpg-card.c:2393
+#: tools/gpg-card.c:2410
 #, fuzzy, c-format
 msgid "Note: Keys are already stored on the card!\n"
 msgstr "omítese: a chave secreta xa está presente\n"
 
-#: tools/gpg-card.c:2396
+#: tools/gpg-card.c:2413
 #, c-format
 msgid "Replace existing key %s ? (y/N) "
 msgstr ""
 
-#: tools/gpg-card.c:2549 tools/gpg-card.c:2712 tools/gpg-card.c:2935
-#: tools/gpg-card.c:3044
+#: tools/gpg-card.c:2566 tools/gpg-card.c:2729 tools/gpg-card.c:2952
+#: tools/gpg-card.c:3061
 #, c-format
 msgid "%s card no. %s detected\n"
 msgstr ""
 
-#: tools/gpg-card.c:3396
+#: tools/gpg-card.c:3413
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3406 tools/gpg-card.c:3420
+#: tools/gpg-card.c:3423 tools/gpg-card.c:3437
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
 "         can only be reverted using a factory reset!\n"
 msgstr ""
 
-#: tools/gpg-card.c:3423
+#: tools/gpg-card.c:3440
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3669
+#: tools/gpg-card.c:3686
 #, fuzzy
 msgid "authenticate to the card"
 msgstr "Creouse o certificado de revocación.\n"
 
-#: tools/gpg-card.c:3671
+#: tools/gpg-card.c:3688
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3673
+#: tools/gpg-card.c:3690
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication"
 msgstr "|NOME|empregar NOME como valor por defecto do destinatario"
 
-#: tools/gpg-card.c:3675
+#: tools/gpg-card.c:3692
 #, fuzzy
 #| msgid "change the expire date"
 msgid "change a private data object"
 msgstr "cambia-la fecha de expiración"
 
-#: tools/gpg-card.c:3676
+#: tools/gpg-card.c:3693
 #, fuzzy
 msgid "read a certificate from a data object"
 msgstr "Creouse o certificado de revocación.\n"
 
-#: tools/gpg-card.c:3677
+#: tools/gpg-card.c:3694
 #, fuzzy
 msgid "store a certificate to a data object"
 msgstr "Creouse o certificado de revocación.\n"
 
-#: tools/gpg-card.c:3678
+#: tools/gpg-card.c:3695
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3679
+#: tools/gpg-card.c:3696
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3681
+#: tools/gpg-card.c:3698
 msgid "manage the command history"
 msgstr ""
 
 #, fuzzy
+#~ msgid "requesting key %s from %s server %s\n"
+#~ msgstr "solicitando a chave %08lX de %s\n"
+
+#, fuzzy
+#~ msgid "%s:%u: no hostname given\n"
+#~ msgstr "(Non se deu unha descrición)\n"
+
+#, fuzzy
+#~ msgid "could not parse keyserver\n"
+#~ msgstr "non se puido analisa-lo URI do servidor de chaves\n"
+
+#, fuzzy
+#~| msgid "|NAME|set terminal charset to NAME"
+#~ msgid "|NAME|connect to host NAME"
+#~ msgstr "|NAME|axusta-lo xogo de caracteres do terminal a NOME"
+
+#, fuzzy
+#~| msgid "|NAME|use NAME as default recipient"
+#~ msgid "|NAME|use user NAME for authentication"
+#~ msgstr "|NOME|empregar NOME como valor por defecto do destinatario"
+
+#, fuzzy
+#~| msgid "Usage: gpg [options] [files] (-h for help)"
+#~ msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
+#~ msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
+
+#, fuzzy
+#~| msgid "invalid import options\n"
+#~ msgid "invalid port number %d\n"
+#~ msgstr "opcións de importación non válidas\n"
+
+#, fuzzy
+#~ msgid "error writing to stdout: %s\n"
+#~ msgstr "erro escribindo no chaveiro `%s': %s\n"
+
+#, fuzzy
+#~ msgid "attribute '%s' not found\n"
+#~ msgstr "non se atopou a chave `%s': %s\n"
+
+#, fuzzy
+#~| msgid "reading from `%s'\n"
+#~ msgid "processing url '%s'\n"
+#~ msgstr "lendo de `%s'\n"
+
+#, fuzzy
+#~| msgid "          w/o user IDs: %lu\n"
+#~ msgid "          user '%s'\n"
+#~ msgstr "   sin IDs de usuario: %lu\n"
+
+#, fuzzy
+#~ msgid "          pass '%s'\n"
+#~ msgstr "               alias \""
+
+#, fuzzy
+#~ msgid "          host '%s'\n"
+#~ msgstr "               alias \""
+
+#, fuzzy
+#~| msgid "          not imported: %lu\n"
+#~ msgid "          port %d\n"
+#~ msgstr "       non importadas: %lu\n"
+
+#, fuzzy
+#~ msgid "            DN '%s'\n"
+#~ msgstr "               alias \""
+
+#, fuzzy
+#~ msgid "          attr '%s'\n"
+#~ msgstr "               alias \""
+
+#, fuzzy
+#~ msgid "no host name in '%s'\n"
+#~ msgstr "(Non se deu unha descrición)\n"
+
+#, fuzzy
+#~| msgid "WARNING: using insecure memory!\n"
+#~ msgid "WARNING: using first attribute only\n"
+#~ msgstr "AVISO: ¡úsase memoria insegura!\n"
+
+#, fuzzy
+#~ msgid "LDAP init to '%s:%d' failed: %s\n"
+#~ msgstr "non se puido poñe-la armadura: %s\n"
+
+#, fuzzy
+#~ msgid "LDAP init to '%s' failed: %s\n"
+#~ msgstr "non se puido poñe-la armadura: %s\n"
+
+#, fuzzy
+#~ msgid "LDAP init to '%s' done\n"
+#~ msgstr "non se puido poñe-la armadura: %s\n"
+
+#, fuzzy
+#~ msgid "binding to '%s:%d' failed: %s\n"
+#~ msgstr "non se puido poñe-la armadura: %s\n"
+
+#, fuzzy
+#~| msgid "dearmoring failed: %s\n"
+#~ msgid "searching '%s' failed: %s\n"
+#~ msgstr "non se puido quita-la armadura: %s\n"
+
+#, fuzzy
 #~ msgid "Suggest a random passphrase."
 #~ msgstr "cambia-lo contrasinal"
 
diff --git a/po/gnupg2.pot b/po/gnupg2.pot
index 4639554..5044f0b 100644
--- a/po/gnupg2.pot
+++ b/po/gnupg2.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gnupg 2.3.1\n"
+"Project-Id-Version: GNU gnupg 2.3.2\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2021-04-20 12:38+0200\n"
+"POT-Creation-Date: 2021-08-24 18:50+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:328
+#: agent/call-pinentry.c:338
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr ""
@@ -29,45 +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:546
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_OK"
 msgstr ""
 
-#: agent/call-pinentry.c:547
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
-#: agent/call-pinentry.c:548
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|_Yes"
 msgstr ""
 
-#: agent/call-pinentry.c:549
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_No"
 msgstr ""
 
-#: agent/call-pinentry.c:550
+#: agent/call-pinentry.c:560
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:551
+#: agent/call-pinentry.c:561
 msgid "|pinentry-label|_Save in password manager"
 msgstr ""
 
-#: agent/call-pinentry.c:552
+#: agent/call-pinentry.c:562
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr ""
 
-#: agent/call-pinentry.c:554
+#: agent/call-pinentry.c:564
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:555
+#: agent/call-pinentry.c:565
 msgid "|pinentry-tt|Hide passphrase"
 msgstr ""
 
+#: agent/call-pinentry.c:566
+msgid "Caps Lock is on"
+msgstr ""
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:944
+#: agent/call-pinentry.c:1022
 msgid "Suggest"
 msgstr ""
 
@@ -78,13 +82,24 @@ 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:966
+#: agent/call-pinentry.c:1044
 msgid "pinentry.genpin.tooltip"
 msgstr ""
 
+#: agent/call-pinentry.c:1072
+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
+msgid "Passphrase Not Allowed"
+msgstr ""
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:998
+#: agent/call-pinentry.c:1198
 msgid "Quality:"
 msgstr ""
 
@@ -94,99 +109,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:1019
+#: agent/call-pinentry.c:1219
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:1263
+#: agent/call-pinentry.c:1477
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:1266
+#: agent/call-pinentry.c:1480
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr ""
 
-#: agent/call-pinentry.c:1303 agent/call-pinentry.c:1506
+#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1303 agent/call-pinentry.c:1506
-#: agent/protect-tool.c:728
+#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/protect-tool.c:729
 msgid "Passphrase:"
 msgstr ""
 
-#: agent/call-pinentry.c:1330 agent/call-pinentry.c:1580 agent/command.c:1799
-#: agent/command.c:1852 agent/command-ssh.c:3046 agent/genkey.c:398
+#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
+#: agent/command.c:1988 agent/command-ssh.c:3046 agent/genkey.c:442
 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:1351 agent/call-pinentry.c:1603
+#: agent/call-pinentry.c:1566 agent/call-pinentry.c:1830
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:1362 agent/call-pinentry.c:1614
+#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
 msgid "Repeat:"
 msgstr ""
 
-#: agent/call-pinentry.c:1372 agent/call-pinentry.c:1384
-#: agent/call-pinentry.c:1624 agent/call-pinentry.c:1636
+#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
+#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
 msgid "PIN too long"
 msgstr ""
 
-#: agent/call-pinentry.c:1373 agent/call-pinentry.c:1625
+#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
 msgid "Passphrase too long"
 msgstr ""
 
-#: agent/call-pinentry.c:1381 agent/call-pinentry.c:1633
+#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
 msgid "Invalid characters in PIN"
 msgstr ""
 
-#: agent/call-pinentry.c:1386 agent/call-pinentry.c:1638
+#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:1405 agent/call-pinentry.c:1656
+#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
 msgid "Bad PIN"
 msgstr ""
 
-#: agent/call-pinentry.c:1405 agent/call-pinentry.c:1656
+#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
 msgid "Bad Passphrase"
 msgstr ""
 
-#: agent/command.c:697
+#: agent/command.c:823
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:698
+#: agent/command.c:824
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1106 g10/card-util.c:708 g10/card-util.c:729
+#: agent/command.c:1235 g10/card-util.c:713 g10/card-util.c:734
 #, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr ""
 
-#: agent/command.c:1634 agent/command.c:1791 agent/command-ssh.c:2974
-#: agent/genkey.c:333
+#: agent/command.c:1756 agent/command.c:1921 agent/command-ssh.c:2974
+#: agent/genkey.c:377
 msgid "Please re-enter this passphrase"
 msgstr ""
 
-#: agent/command.c:2567
+#: agent/command.c:2703
 #, c-format
 msgid ""
 "Please enter the passphrase to protect the imported object within the %s "
 "system."
 msgstr ""
 
-#: agent/command.c:2697
+#: agent/command.c:2833
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -197,25 +212,25 @@ msgstr ""
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr ""
 
-#: agent/command-ssh.c:872 common/dotlock.c:852 g10/card-util.c:953
-#: g10/export.c:1329 g10/gpg.c:1431 g10/keygen.c:5347 g10/keyring.c:1319
-#: g10/keyring.c:1632 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
+#: agent/command-ssh.c:872 common/dotlock.c:852 g10/card-util.c:963
+#: g10/export.c:1329 g10/gpg.c:1431 g10/keygen.c:5377 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
 #: g10/sign.c:1106 g10/sign.c:1443 g10/tdbio.c:753 tools/gpg-card.c:479
 #, c-format
 msgid "can't create '%s': %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:884 common/helpfile.c:57 g10/card-util.c:910
+#: agent/command-ssh.c:884 common/helpfile.c:57 g10/card-util.c:920
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
 #: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:721 g10/gpg.c:1432
-#: g10/import.c:371 g10/import.c:558 g10/import.c:793 g10/keygen.c:4322
-#: g10/keyring.c:1658 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
+#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4326
+#: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
 #: g10/plaintext.c:610 g10/sign.c:1086 g10/sign.c:1311 g10/sign.c:1424
 #: g10/sign.c:1596 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2380
-#: sm/gpgsm.c:2410 sm/gpgsm.c:2448 sm/keylist.c:1737 sm/qualified.c:65
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2236
+#: sm/gpgsm.c:2266 sm/gpgsm.c:2304 sm/keylist.c:1775 sm/qualified.c:65
 #: dirmngr/certcache.c:396 dirmngr/certcache.c:476 dirmngr/certcache.c:478
-#: dirmngr/crlcache.c:2588 dirmngr/dirmngr.c:1720 tools/gpg-card.c:408
+#: dirmngr/crlcache.c:2591 dirmngr/dirmngr.c:1759 tools/gpg-card.c:408
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr ""
@@ -317,45 +332,45 @@ msgstr ""
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:109 sm/certreqgen-ui.c:433
+#: agent/genkey.c:142 sm/certreqgen-ui.c:433
 #, c-format
 msgid "error creating temporary file: %s\n"
 msgstr ""
 
-#: agent/genkey.c:116
+#: agent/genkey.c:150
 #, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr ""
 
-#: agent/genkey.c:154
+#: agent/genkey.c:191
 msgid "Enter new passphrase"
 msgstr ""
 
-#: agent/genkey.c:184
+#: agent/genkey.c:227
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:186
+#: agent/genkey.c:229
 #, 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:198
+#: agent/genkey.c:241
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:215
+#: agent/genkey.c:258
 #, 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:234
+#: agent/genkey.c:277
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -363,362 +378,361 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:260
+#: agent/genkey.c:304
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:275
+#: agent/genkey.c:319
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
-#: agent/genkey.c:296
+#: agent/genkey.c:340
 msgid "Take this one anyway"
 msgstr ""
 
-#: agent/genkey.c:464
+#: agent/genkey.c:508
 #, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr ""
 
-#: agent/genkey.c:590
+#: agent/genkey.c:637
 msgid "Please enter the new passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:162 scd/scdaemon.c:115 dirmngr/dirmngr.c:182
+#: agent/gpg-agent.c:164 scd/scdaemon.c:115 dirmngr/dirmngr.c:183
 msgid "Options used for startup"
 msgstr ""
 
-#: agent/gpg-agent.c:164 scd/scdaemon.c:120 dirmngr/dirmngr.c:171
+#: agent/gpg-agent.c:166 scd/scdaemon.c:120 dirmngr/dirmngr.c:172
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:117 dirmngr/dirmngr.c:170
+#: agent/gpg-agent.c:167 scd/scdaemon.c:117 dirmngr/dirmngr.c:171
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:167 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:169 dirmngr/dirmngr.c:174
 msgid "run in supervised mode"
 msgstr ""
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:121 dirmngr/dirmngr.c:184
+#: agent/gpg-agent.c:171 scd/scdaemon.c:121 dirmngr/dirmngr.c:185
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:170 scd/scdaemon.c:122 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:172 scd/scdaemon.c:122 dirmngr/dirmngr.c:186
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:171 scd/scdaemon.c:123 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:173 scd/scdaemon.c:123 dirmngr/dirmngr.c:187
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:179 g10/gpg.c:589 scd/scdaemon.c:125 sm/gpgsm.c:422
-#: dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:181 g10/gpg.c:589 scd/scdaemon.c:125 sm/gpgsm.c:423
+#: dirmngr/dirmngr.c:189
 msgid "|FILE|read options from FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:183 g10/gpg.c:574 scd/scdaemon.c:129 sm/gpgsm.c:265
-#: dirmngr/dirmngr.c:192
+#: agent/gpg-agent.c:185 g10/gpg.c:574 scd/scdaemon.c:129 sm/gpgsm.c:265
+#: dirmngr/dirmngr.c:193
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: agent/gpg-agent.c:185 g10/gpg.c:576 g10/gpgv.c:78 kbx/kbxutil.c:89
+#: agent/gpg-agent.c:187 g10/gpg.c:576 g10/gpgv.c:78 kbx/kbxutil.c:89
 #: scd/scdaemon.c:131 sm/gpgsm.c:267 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:194 dirmngr/dirmngr_ldap.c:102
-#: tools/gpg-connect-agent.c:85 tools/gpgconf.c:111
+#: dirmngr/dirmngr.c:195 tools/gpg-connect-agent.c:85 tools/gpgconf.c:111
 msgid "verbose"
 msgstr ""
 
-#: agent/gpg-agent.c:186 g10/gpg.c:578 g10/gpgv.c:79 kbx/kbxutil.c:90
+#: agent/gpg-agent.c:188 g10/gpg.c:578 g10/gpgv.c:79 kbx/kbxutil.c:90
 #: scd/scdaemon.c:132 sm/gpgsm.c:269 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:195 dirmngr/dirmngr_ldap.c:103
+#: dirmngr/dirmngr.c:196
 msgid "be somewhat more quiet"
 msgstr ""
 
-#: agent/gpg-agent.c:194 g10/gpg.c:593 sm/gpgsm.c:283 dirmngr/dirmngr.c:205
+#: agent/gpg-agent.c:196 g10/gpg.c:593 sm/gpgsm.c:283 dirmngr/dirmngr.c:206
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 scd/scdaemon.c:146 sm/gpgsm.c:290
-#: dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:599 scd/scdaemon.c:146 sm/gpgsm.c:290
+#: dirmngr/dirmngr.c:210
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: agent/gpg-agent.c:201
+#: agent/gpg-agent.c:203
 msgid "do not use the SCdaemon"
 msgstr ""
 
-#: agent/gpg-agent.c:203
+#: agent/gpg-agent.c:205
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 msgid "|NAME|accept some commands via NAME"
 msgstr ""
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:215
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:216
+#: agent/gpg-agent.c:218
 msgid "enable ssh support"
 msgstr ""
 
-#: agent/gpg-agent.c:218
+#: agent/gpg-agent.c:220
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:221
+#: agent/gpg-agent.c:223
 msgid "enable putty support"
 msgstr ""
 
-#: agent/gpg-agent.c:233 g10/gpg.c:844 scd/scdaemon.c:176 sm/gpgsm.c:382
+#: agent/gpg-agent.c:235 g10/gpg.c:844 scd/scdaemon.c:176 sm/gpgsm.c:383
 msgid "Options controlling the security"
 msgstr ""
 
-#: agent/gpg-agent.c:236
+#: agent/gpg-agent.c:238
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:238
+#: agent/gpg-agent.c:240
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:242
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:244
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:246
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:248
 msgid "disallow the use of an external password cache"
 msgstr ""
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:250
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:253
 msgid "allow presetting passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:256
+#: agent/gpg-agent.c:258
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:261
 msgid "do not allow bypassing the passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:261
+#: agent/gpg-agent.c:263
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:265
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:266
+#: agent/gpg-agent.c:268
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:268
+#: agent/gpg-agent.c:272
 msgid "|N|expire the passphrase after N days"
 msgstr ""
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:274
 msgid "do not allow the reuse of old passphrases"
 msgstr ""
 
-#: agent/gpg-agent.c:273
+#: agent/gpg-agent.c:277
 msgid "Options controlling the PIN-Entry"
 msgstr ""
 
-#: agent/gpg-agent.c:275
+#: agent/gpg-agent.c:279
 msgid "never use the PIN-entry"
 msgstr ""
 
-#: agent/gpg-agent.c:277
+#: agent/gpg-agent.c:281
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:283
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:282
+#: agent/gpg-agent.c:286
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:286
+#: agent/gpg-agent.c:290
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:294
 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:551 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: agent/gpg-agent.c:557 agent/preset-passphrase.c:99 agent/protect-tool.c:154
 #: g10/gpg.c:1132 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:612 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:438
-#: dirmngr/dirmngr_ldap.c:175 tools/gpg-connect-agent.c:220 tools/gpgconf.c:151
+#: sm/gpgsm.c:613 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:446
+#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:151
 #: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr ""
 
-#: agent/gpg-agent.c:560
+#: agent/gpg-agent.c:566
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr ""
 
-#: agent/gpg-agent.c:562
+#: agent/gpg-agent.c:568
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:607 g10/gpg.c:1337 scd/scdaemon.c:384 sm/gpgsm.c:760
-#: dirmngr/dirmngr.c:522
+#: agent/gpg-agent.c:613 g10/gpg.c:1337 scd/scdaemon.c:384 sm/gpgsm.c:761
+#: dirmngr/dirmngr.c:530
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:972 g10/gpg.c:3910 g10/gpg.c:3934 sm/gpgsm.c:1769
-#: sm/gpgsm.c:1775
+#: agent/gpg-agent.c:986 g10/gpg.c:3907 g10/gpg.c:3931 sm/gpgsm.c:1622
+#: sm/gpgsm.c:1628
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1196 agent/gpg-agent.c:2019 common/comopt.c:93
-#: g10/gpg.c:2591 scd/scdaemon.c:549 sm/gpgsm.c:1155 dirmngr/dirmngr.c:989
-#: dirmngr/dirmngr.c:1840
+#: agent/gpg-agent.c:1210 agent/gpg-agent.c:2035 common/comopt.c:93
+#: g10/gpg.c:2594 scd/scdaemon.c:549 sm/gpgsm.c:1028 dirmngr/dirmngr.c:1029
+#: dirmngr/dirmngr.c:1879
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1335 g10/gpg.c:3861 scd/scdaemon.c:687 sm/gpgsm.c:1709
-#: dirmngr/dirmngr.c:1108 tools/gpg-connect-agent.c:1270 tools/gpgconf.c:634
+#: agent/gpg-agent.c:1349 g10/gpg.c:3858 scd/scdaemon.c:687 sm/gpgsm.c:1562
+#: dirmngr/dirmngr.c:1145 tools/gpg-connect-agent.c:1270 tools/gpgconf.c:668
 #, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2172 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1267
+#: agent/gpg-agent.c:2188 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1306
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2189 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1280
+#: agent/gpg-agent.c:2205 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1319
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2228
+#: agent/gpg-agent.c:2244
 #, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2239 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1312
+#: agent/gpg-agent.c:2255 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1351
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2244 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1315
+#: agent/gpg-agent.c:2260 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1354
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2255 agent/gpg-agent.c:2295 agent/gpg-agent.c:2304
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1324
+#: agent/gpg-agent.c:2271 agent/gpg-agent.c:2311 agent/gpg-agent.c:2320
+#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1363
 #, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2269 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1336
+#: agent/gpg-agent.c:2285 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1375
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2289 agent/gpg-agent.c:2342 common/homedir.c:517
+#: agent/gpg-agent.c:2305 agent/gpg-agent.c:2358 common/homedir.c:537
 #: g10/openfile.c:399 g10/photoid.c:379
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2292 agent/gpg-agent.c:2347 common/homedir.c:520
+#: agent/gpg-agent.c:2308 agent/gpg-agent.c:2363 common/homedir.c:540
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2353
+#: agent/gpg-agent.c:2369
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2357
+#: agent/gpg-agent.c:2373
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2512 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2069
+#: agent/gpg-agent.c:2528 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2108
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2719
+#: agent/gpg-agent.c:2735
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2724
+#: agent/gpg-agent.c:2740
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2799
+#: agent/gpg-agent.c:2815
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2804
+#: agent/gpg-agent.c:2820
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3026 scd/scdaemon.c:1374 dirmngr/dirmngr.c:2283
+#: agent/gpg-agent.c:3042 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2322
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3114 scd/scdaemon.c:1439
+#: agent/gpg-agent.c:3130 scd/scdaemon.c:1441
 #, c-format
 msgid "%s %s stopped\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3252 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3271 common/simple-pwquery.c:247 g10/call-agent.c:260
 #: sm/call-agent.c:131 tools/gpg-connect-agent.c:2319 tools/card-call-scd.c:311
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr ""
 
-#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:70
+#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:66
 msgid ""
 "@Options:\n"
 " "
@@ -735,7 +749,7 @@ msgid ""
 msgstr ""
 
 #: agent/protect-tool.c:107 g10/gpg.c:448 kbx/kbxutil.c:72 sm/gpgsm.c:215
-#: dirmngr/dirmngr.c:168 tools/gpgconf.c:81
+#: dirmngr/dirmngr.c:169 tools/gpgconf.c:81
 msgid ""
 "@Commands:\n"
 " "
@@ -759,37 +773,37 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:707
+#: agent/protect-tool.c:708 sm/import.c:775
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr ""
 
-#: agent/protect-tool.c:712
+#: agent/protect-tool.c:713 sm/export.c:727
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr ""
 
-#: agent/protect-tool.c:718
+#: agent/protect-tool.c:719
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:723
+#: agent/protect-tool.c:724
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr ""
 
-#: agent/protect-tool.c:734
+#: agent/protect-tool.c:735
 #, c-format
 msgid "cancelled\n"
 msgstr ""
 
-#: agent/protect-tool.c:736
+#: agent/protect-tool.c:737
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr ""
 
-#: agent/trustlist.c:153 agent/trustlist.c:363 tools/gpgconf.c:424
+#: agent/trustlist.c:153 agent/trustlist.c:363 tools/gpgconf.c:458
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr ""
@@ -941,7 +955,7 @@ msgstr ""
 msgid "secret key parts are not available\n"
 msgstr ""
 
-#: agent/cvt-openpgp.c:343 g10/card-util.c:1562
+#: agent/cvt-openpgp.c:343 g10/card-util.c:1575
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr ""
@@ -970,7 +984,7 @@ msgid "error creating a stream for a pipe: %s\n"
 msgstr ""
 
 #: common/exechelp-posix.c:505 common/exechelp-posix.c:580
-#: common/exechelp-posix.c:866 dirmngr/dirmngr.c:1354
+#: common/exechelp-posix.c:866 dirmngr/dirmngr.c:1393
 #, c-format
 msgid "error forking process: %s\n"
 msgstr ""
@@ -1042,7 +1056,7 @@ msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3082
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3099
 msgid "yes"
 msgstr ""
 
@@ -1096,7 +1110,7 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:115 g10/card-util.c:917 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:927 tools/no-libgcrypt.c:30
 #: tools/gpg-card.c:416
 #, c-format
 msgid "error allocating enough memory: %s\n"
@@ -1167,7 +1181,7 @@ msgstr ""
 msgid "server '%s' is older than us (%s < %s)"
 msgstr ""
 
-#: common/asshelp.c:737 g10/call-dirmngr.c:408
+#: common/asshelp.c:737 g10/call-dirmngr.c:407
 #, c-format
 msgid "WARNING: %s\n"
 msgstr ""
@@ -1250,7 +1264,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:4212
+#: scd/app-openpgp.c:4214
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
@@ -1325,11 +1339,11 @@ msgstr ""
 msgid "Root certificate trustworthy"
 msgstr ""
 
-#: common/audit.c:1112 sm/certchain.c:1242
+#: common/audit.c:1112 sm/certchain.c:1243
 msgid "no CRL found for certificate"
 msgstr ""
 
-#: common/audit.c:1115 sm/certchain.c:1252
+#: common/audit.c:1115 sm/certchain.c:1253
 msgid "the available CRL is too old"
 msgstr ""
 
@@ -1375,22 +1389,22 @@ msgstr ""
 msgid "invalid radix64 character %02x skipped\n"
 msgstr ""
 
-#: common/ttyio.c:433
+#: common/ttyio.c:447
 #, c-format
 msgid "Sorry, we are in batchmode - can't get input\n"
 msgstr ""
 
-#: common/ttyio.c:439
+#: common/ttyio.c:453
 #, c-format
 msgid "Sorry, no terminal at all requested - can't get input\n"
 msgstr ""
 
-#: common/ttyio.c:474 common/ttyio.c:484
+#: common/ttyio.c:488 common/ttyio.c:498
 #, c-format
 msgid "too many errors; giving up\n"
 msgstr ""
 
-#: common/ttyio.c:536
+#: common/ttyio.c:550
 #, c-format
 msgid "Control-D detected\n"
 msgstr ""
@@ -1444,8 +1458,7 @@ msgstr ""
 msgid "waiting for lock %s...\n"
 msgstr ""
 
-#: common/init.c:191 sm/gpgsm.c:1036 dirmngr/dirmngr.c:895
-#: dirmngr/dirmngr.c:904
+#: common/init.c:191 sm/gpgsm.c:909 dirmngr/dirmngr.c:935 dirmngr/dirmngr.c:944
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
@@ -1593,7 +1606,7 @@ msgid "Enter passphrase: "
 msgstr ""
 
 #: g10/call-agent.c:318 g10/encrypt.c:282 g10/encrypt.c:818 g10/sign.c:473
-#: sm/call-agent.c:180 sm/encrypt.c:701 sm/sign.c:436
+#: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
 #, c-format
 msgid "%s is not compliant with %s mode\n"
 msgstr ""
@@ -1603,212 +1616,212 @@ msgstr ""
 msgid "error from TPM: %s\n"
 msgstr ""
 
-#: g10/call-agent.c:2123 g10/passphrase.c:225 g10/passphrase.c:258
-#: tools/card-call-scd.c:1751
+#: g10/call-agent.c:2135 g10/passphrase.c:233 g10/passphrase.c:266
+#: tools/card-call-scd.c:1755
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr ""
 
-#: g10/call-dirmngr.c:179 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2316
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2316
 #, c-format
 msgid "no dirmngr running in this session\n"
 msgstr ""
 
-#: g10/call-dirmngr.c:213
+#: g10/call-dirmngr.c:212
 #, c-format
 msgid "keyserver option \"honor-keyserver-url\" may not be used in Tor mode\n"
 msgstr ""
 
-#: g10/call-dirmngr.c:386
+#: g10/call-dirmngr.c:385
 msgid "WKD uses a cached result"
 msgstr ""
 
-#: g10/call-dirmngr.c:389
+#: g10/call-dirmngr.c:388
 msgid "Tor is not running"
 msgstr ""
 
-#: g10/call-dirmngr.c:391
+#: g10/call-dirmngr.c:390
 msgid "Tor is not properly configured"
 msgstr ""
 
-#: g10/call-dirmngr.c:393
+#: g10/call-dirmngr.c:392
 msgid "DNS is not properly configured"
 msgstr ""
 
-#: g10/call-dirmngr.c:395
+#: g10/call-dirmngr.c:394
 msgid "unacceptable HTTP redirect from server"
 msgstr ""
 
-#: g10/call-dirmngr.c:397
+#: g10/call-dirmngr.c:396
 msgid "unacceptable HTTP redirect from server was cleaned up"
 msgstr ""
 
-#: g10/call-dirmngr.c:399
+#: g10/call-dirmngr.c:398
 msgid "server uses an invalid certificate"
 msgstr ""
 
-#: g10/call-dirmngr.c:406 g10/gpg.c:4599
+#: g10/call-dirmngr.c:405 g10/gpg.c:4596
 #, c-format
 msgid "Note: %s\n"
 msgstr ""
 
-#: g10/card-util.c:86 g10/card-util.c:369 g10/card-util.c:1924
-#: tools/gpg-card.c:3039
+#: g10/card-util.c:86 g10/card-util.c:374 g10/card-util.c:1937
+#: tools/gpg-card.c:3056
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr ""
 
-#: g10/card-util.c:91 g10/card-util.c:1930
+#: g10/card-util.c:91 g10/card-util.c:1943
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:97 g10/card-util.c:2309 g10/delkey.c:164 g10/keyedit.c:1428
-#: g10/keygen.c:4791 g10/revoke.c:214 g10/revoke.c:638
+#: g10/card-util.c:97 g10/card-util.c:2322 g10/delkey.c:164 g10/keyedit.c:1428
+#: g10/keygen.c:4795 g10/revoke.c:214 g10/revoke.c:639
 #, c-format
 msgid "can't do this in batch mode\n"
 msgstr ""
 
-#: g10/card-util.c:105 tools/gpg-card.c:2943
+#: g10/card-util.c:105 tools/gpg-card.c:2960
 #, c-format
 msgid "This command is only available for version 2 cards\n"
 msgstr ""
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3398 tools/gpg-card.c:2948
+#: g10/card-util.c:107 scd/app-openpgp.c:3399 tools/gpg-card.c:2965
 #, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr ""
 
-#: g10/card-util.c:140 g10/card-util.c:1448 g10/card-util.c:1710
-#: g10/card-util.c:1802 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1991 g10/keygen.c:2165 g10/keygen.c:2385 g10/keygen.c:2685
+#: g10/card-util.c:140 g10/card-util.c:1458 g10/card-util.c:1723
+#: g10/card-util.c:1815 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/keygen.c:1992 g10/keygen.c:2166 g10/keygen.c:2386 g10/keygen.c:2686
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
 #: tools/gpg-card.c:510
 msgid "Your selection? "
 msgstr ""
 
-#: g10/card-util.c:262 g10/card-util.c:313 tools/gpg-card.c:596
+#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:596
 #: tools/gpg-card.c:636
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:558 tools/gpg-card.c:903
+#: g10/card-util.c:563 tools/gpg-card.c:905
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:559 tools/gpg-card.c:904
+#: g10/card-util.c:564 tools/gpg-card.c:906
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:586 tools/gpg-card.c:931
+#: g10/card-util.c:591 tools/gpg-card.c:933
 msgid "not forced"
 msgstr ""
 
-#: g10/card-util.c:586 tools/gpg-card.c:931
+#: g10/card-util.c:591 tools/gpg-card.c:933
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:768 tools/gpg-card.c:1468
+#: g10/card-util.c:773 tools/gpg-card.c:1484
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:770 tools/gpg-card.c:1470
+#: g10/card-util.c:775 tools/gpg-card.c:1486
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:772 tools/gpg-card.c:1472
+#: g10/card-util.c:777 tools/gpg-card.c:1488
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:789 tools/gpg-card.c:1505
+#: g10/card-util.c:795 tools/gpg-card.c:1521
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:791 tools/gpg-card.c:1506
+#: g10/card-util.c:797 tools/gpg-card.c:1522
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:809 tools/gpg-card.c:1523
+#: g10/card-util.c:816 tools/gpg-card.c:1539
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:830 tools/gpg-card.c:1561
+#: g10/card-util.c:840 tools/gpg-card.c:1577
 msgid "URL to retrieve public key: "
 msgstr ""
 
-#: g10/card-util.c:926 g10/decrypt-data.c:495 g10/import.c:406 g10/import.c:756
-#: g10/import.c:815 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1666
-#: tools/gpgconf.c:437 tools/gpgconf.c:483 tools/gpg-card.c:426
+#: g10/card-util.c:936 g10/decrypt-data.c:495 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:1705
+#: tools/gpgconf.c:471 tools/gpgconf.c:517 tools/gpg-card.c:426
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr ""
 
-#: g10/card-util.c:959 g10/decrypt-data.c:498 g10/export.c:2496
+#: g10/card-util.c:969 g10/decrypt-data.c:498 g10/export.c:2496
 #: dirmngr/crlcache.c:925 tools/gpg-card.c:486 tools/gpg-card.c:493
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr ""
 
-#: g10/card-util.c:986 tools/gpg-card.c:1650
+#: g10/card-util.c:996 tools/gpg-card.c:1666
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:1024 tools/gpg-card.c:1945
+#: g10/card-util.c:1034 tools/gpg-card.c:1962
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:1109 tools/gpg-card.c:1699
+#: g10/card-util.c:1119 tools/gpg-card.c:1715
 msgid "Language preferences: "
 msgstr ""
 
-#: g10/card-util.c:1117 tools/gpg-card.c:1710
+#: g10/card-util.c:1127 tools/gpg-card.c:1726
 #, c-format
 msgid "Error: invalid length of preference string.\n"
 msgstr ""
 
-#: g10/card-util.c:1126 tools/gpg-card.c:1719
+#: g10/card-util.c:1136 tools/gpg-card.c:1735
 #, c-format
 msgid "Error: invalid characters in preference string.\n"
 msgstr ""
 
-#: g10/card-util.c:1148 tools/gpg-card.c:1753
+#: g10/card-util.c:1158 tools/gpg-card.c:1769
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1162 tools/gpg-card.c:1770
+#: g10/card-util.c:1172 tools/gpg-card.c:1786
 msgid "Error: invalid response.\n"
 msgstr ""
 
-#: g10/card-util.c:1185 tools/gpg-card.c:1835
+#: g10/card-util.c:1195 tools/gpg-card.c:1852
 msgid "CA fingerprint: "
 msgstr ""
 
-#: g10/card-util.c:1209 tools/gpg-card.c:1861
+#: g10/card-util.c:1219 tools/gpg-card.c:1878
 #, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr ""
 
-#: g10/card-util.c:1259
+#: g10/card-util.c:1269
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1260
+#: g10/card-util.c:1270
 msgid "not an OpenPGP card"
 msgstr ""
 
-#: g10/card-util.c:1273 g10/keygen.c:4811 g10/keygen.c:5972
+#: g10/card-util.c:1283 g10/keygen.c:4815 g10/keygen.c:6003
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1358
+#: g10/card-util.c:1368
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1375 tools/gpg-card.c:3328
+#: g10/card-util.c:1385 tools/gpg-card.c:3345
 msgid ""
 "Note: There is no guarantee that the card supports the requested\n"
 "      key type or size.  If the key generation does not succeed,\n"
@@ -1816,99 +1829,99 @@ msgid ""
 "      key types and sizes are supported.\n"
 msgstr ""
 
-#: g10/card-util.c:1396 g10/keygen.c:2570 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1406 g10/keygen.c:2571 sm/certreqgen-ui.c:180
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr ""
 
-#: g10/card-util.c:1406 g10/keygen.c:2493 g10/keygen.c:2525
+#: g10/card-util.c:1416 g10/keygen.c:2494 g10/keygen.c:2526
 #: sm/certreqgen-ui.c:195
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr ""
 
-#: g10/card-util.c:1414 g10/keygen.c:2578 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1424 g10/keygen.c:2579 sm/certreqgen-ui.c:185
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/card-util.c:1433
+#: g10/card-util.c:1443
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1435
+#: g10/card-util.c:1445
 msgid "Signature key\n"
 msgstr ""
 
-#: g10/card-util.c:1437
+#: g10/card-util.c:1447
 msgid "Encryption key\n"
 msgstr ""
 
-#: g10/card-util.c:1439
+#: g10/card-util.c:1449
 msgid "Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1441 g10/keygen.c:2112 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1451 g10/keygen.c:2113 sm/certreqgen-ui.c:158
 msgid "Please select what kind of key you want:\n"
 msgstr ""
 
-#: g10/card-util.c:1442 sm/certreqgen-ui.c:159
+#: g10/card-util.c:1452 sm/certreqgen-ui.c:159
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr ""
 
-#: g10/card-util.c:1443
+#: g10/card-util.c:1453
 #, c-format
 msgid "   (%d) ECC\n"
 msgstr ""
 
-#: g10/card-util.c:1455 g10/card-util.c:1722 g10/card-util.c:1822
-#: g10/keyedit.c:900 g10/keygen.c:2017 g10/keygen.c:2045 g10/keygen.c:2172
-#: g10/keygen.c:2425 g10/keygen.c:2713 g10/revoke.c:836
+#: g10/card-util.c:1468 g10/card-util.c:1735 g10/card-util.c:1835
+#: g10/keyedit.c:900 g10/keygen.c:2018 g10/keygen.c:2046 g10/keygen.c:2173
+#: g10/keygen.c:2426 g10/keygen.c:2714 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr ""
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1541
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 
-#: g10/card-util.c:1533
+#: g10/card-util.c:1546
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1582
 #, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1585 g10/card-util.c:2106 g10/card-util.c:2162
+#: g10/card-util.c:1598 g10/card-util.c:2119 g10/card-util.c:2175
 #, c-format
 msgid "error getting card info: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1591 g10/card-util.c:1936 g10/card-util.c:2112
-#: g10/card-util.c:2171 tools/gpg-card.c:3057 tools/gpg-card.c:3296
-#: tools/gpg-card.c:3354
+#: g10/card-util.c:1604 g10/card-util.c:1949 g10/card-util.c:2125
+#: g10/card-util.c:2184 tools/gpg-card.c:3074 tools/gpg-card.c:3313
+#: tools/gpg-card.c:3371
 #, c-format
 msgid "This command is not supported by this card\n"
 msgstr ""
 
-#: g10/card-util.c:1637 tools/gpg-card.c:2426
+#: g10/card-util.c:1650 tools/gpg-card.c:2443
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1651
+#: g10/card-util.c:1664
 #, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr ""
 
-#: g10/card-util.c:1654 tools/gpg-card.c:2398
+#: g10/card-util.c:1667 tools/gpg-card.c:2415
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1666 tools/gpg-card.c:2457
+#: g10/card-util.c:1679 tools/gpg-card.c:2474
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1916,152 +1929,152 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1701
+#: g10/card-util.c:1714
 msgid "Please select the type of key to generate:\n"
 msgstr ""
 
-#: g10/card-util.c:1703 g10/card-util.c:1793
+#: g10/card-util.c:1716 g10/card-util.c:1806
 msgid "   (1) Signature key\n"
 msgstr ""
 
-#: g10/card-util.c:1704 g10/card-util.c:1795
+#: g10/card-util.c:1717 g10/card-util.c:1808
 msgid "   (2) Encryption key\n"
 msgstr ""
 
-#: g10/card-util.c:1705 g10/card-util.c:1797
+#: g10/card-util.c:1718 g10/card-util.c:1810
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1790
+#: g10/card-util.c:1803
 msgid "Please select where to store the key:\n"
 msgstr ""
 
-#: g10/card-util.c:1836
+#: g10/card-util.c:1849
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1941 tools/gpg-card.c:3065
+#: g10/card-util.c:1954 tools/gpg-card.c:3082
 #, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr ""
 
-#: g10/card-util.c:1944 tools/gpg-card.c:3068 tools/gpg-card.c:3409
+#: g10/card-util.c:1957 tools/gpg-card.c:3085 tools/gpg-card.c:3426
 msgid "Continue? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1949 tools/gpg-card.c:3079
+#: g10/card-util.c:1962 tools/gpg-card.c:3096
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2142
+#: g10/card-util.c:2155
 #, c-format
 msgid "error for setup KDF: %s\n"
 msgstr ""
 
-#: g10/card-util.c:2188
+#: g10/card-util.c:2201
 #, c-format
 msgid "error for setup UIF: %s\n"
 msgstr ""
 
-#: g10/card-util.c:2212 g10/keyedit.c:1263 tools/gpg-card.c:3649
+#: g10/card-util.c:2225 g10/keyedit.c:1263 tools/gpg-card.c:3666
 msgid "quit this menu"
 msgstr ""
 
-#: g10/card-util.c:2214
+#: g10/card-util.c:2227
 msgid "show admin commands"
 msgstr ""
 
-#: g10/card-util.c:2215 g10/keyedit.c:1266 tools/gpg-card.c:3652
+#: g10/card-util.c:2228 g10/keyedit.c:1266 tools/gpg-card.c:3669
 msgid "show this help"
 msgstr ""
 
-#: g10/card-util.c:2217 tools/gpg-card.c:3654
+#: g10/card-util.c:2230 tools/gpg-card.c:3671
 msgid "list all available data"
 msgstr ""
 
-#: g10/card-util.c:2220 tools/gpg-card.c:3656
+#: g10/card-util.c:2233 tools/gpg-card.c:3673
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:2221 tools/gpg-card.c:3657
+#: g10/card-util.c:2234 tools/gpg-card.c:3674
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:2222 tools/gpg-card.c:3658
+#: g10/card-util.c:2235 tools/gpg-card.c:3675
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:2223 tools/gpg-card.c:3659
+#: g10/card-util.c:2236 tools/gpg-card.c:3676
 msgid "change the login name"
 msgstr ""
 
-#: g10/card-util.c:2224 tools/gpg-card.c:3660
+#: g10/card-util.c:2237 tools/gpg-card.c:3677
 msgid "change the language preferences"
 msgstr ""
 
-#: g10/card-util.c:2225 tools/gpg-card.c:3661
+#: g10/card-util.c:2238 tools/gpg-card.c:3678
 msgid "change card holder's salutation"
 msgstr ""
 
-#: g10/card-util.c:2227 tools/gpg-card.c:3663
+#: g10/card-util.c:2240 tools/gpg-card.c:3680
 msgid "change a CA fingerprint"
 msgstr ""
 
-#: g10/card-util.c:2228 tools/gpg-card.c:3664
+#: g10/card-util.c:2241 tools/gpg-card.c:3681
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:2229 tools/gpg-card.c:3665
+#: g10/card-util.c:2242 tools/gpg-card.c:3682
 msgid "generate new keys"
 msgstr ""
 
-#: g10/card-util.c:2230 tools/gpg-card.c:3666
+#: g10/card-util.c:2243 tools/gpg-card.c:3683
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:2231 tools/gpg-card.c:3667
+#: g10/card-util.c:2244 tools/gpg-card.c:3684
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:2232 tools/gpg-card.c:3668
+#: g10/card-util.c:2245 tools/gpg-card.c:3685
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:2233 tools/gpg-card.c:3672
+#: g10/card-util.c:2246 tools/gpg-card.c:3689
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2235
+#: g10/card-util.c:2248
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr ""
 
-#: g10/card-util.c:2236
+#: g10/card-util.c:2249
 msgid "change the key attribute"
 msgstr ""
 
-#: g10/card-util.c:2237 tools/gpg-card.c:3674
+#: g10/card-util.c:2250 tools/gpg-card.c:3691
 msgid "change the User Interaction Flag"
 msgstr ""
 
-#: g10/card-util.c:2361 tools/gpg-card.c:3924
+#: g10/card-util.c:2374 tools/gpg-card.c:3941
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2402
+#: g10/card-util.c:2415
 msgid "Admin-only command\n"
 msgstr ""
 
-#: g10/card-util.c:2433
+#: g10/card-util.c:2446
 msgid "Admin commands are allowed\n"
 msgstr ""
 
-#: g10/card-util.c:2435
+#: g10/card-util.c:2448
 msgid "Admin commands are not allowed\n"
 msgstr ""
 
-#: g10/card-util.c:2546 g10/keyedit.c:2275 tools/gpg-card.c:3814
-#: tools/gpg-card.c:4072
+#: g10/card-util.c:2559 g10/keyedit.c:2275 tools/gpg-card.c:3831
+#: tools/gpg-card.c:4089
 #, c-format
 msgid "Invalid command  (try \"help\")\n"
 msgstr ""
@@ -2071,22 +2084,22 @@ msgstr ""
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/decrypt.c:247 g10/gpg.c:5293 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5292 g10/keyring.c:399 g10/keyring.c:750
 #, c-format
 msgid "can't open '%s'\n"
 msgstr ""
 
 #: g10/delkey.c:81 g10/export.c:1934 g10/export.c:2342 g10/export.c:2463
-#: g10/getkey.c:1907 g10/gpg.c:5238 g10/keyedit.c:1450 g10/keyedit.c:2382
-#: g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:703 g10/keyserver.c:1240
-#: g10/revoke.c:230 g10/tofu.c:2168
+#: g10/getkey.c:2032 g10/gpg.c:5237 g10/keyedit.c:1450 g10/keyedit.c:2382
+#: g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:703 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:2002 g10/getkey.c:1915 g10/getkey.c:4330
-#: g10/gpg.c:5247 g10/keyedit.c:2354 g10/keyserver.c:1258 g10/revoke.c:236
-#: g10/revoke.c:665 g10/tofu.c:2176
+#: g10/delkey.c:90 g10/export.c:2002 g10/getkey.c:2040 g10/getkey.c:4455
+#: g10/gpg.c:5246 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"
 msgstr ""
@@ -2205,14 +2218,14 @@ msgstr ""
 msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:555 g10/encrypt.c:808 g10/decrypt-data.c:261 g10/gpg.c:4083
-#: g10/gpg.c:4130 sm/decrypt.c:742 sm/encrypt.c:691 sm/gpgsm.c:1793
+#: g10/encrypt.c:555 g10/encrypt.c:808 g10/decrypt-data.c:261 g10/gpg.c:4080
+#: g10/gpg.c:4127 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1646
 #, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr ""
 
-#: g10/encrypt.c:564 g10/gpg.c:4095 g10/gpg.c:4142 g10/sig-check.c:155
-#: g10/sign.c:452 sm/gpgsm.c:1803 sm/gpgsm.c:1813 sm/sign.c:596 sm/verify.c:510
+#: g10/encrypt.c:564 g10/gpg.c:4092 g10/gpg.c:4139 g10/sig-check.c:155
+#: g10/sign.c:452 sm/gpgsm.c:1656 sm/gpgsm.c:1666 sm/sign.c:596 sm/verify.c:510
 #, c-format
 msgid "digest algorithm '%s' may not be used in %s mode\n"
 msgstr ""
@@ -2228,7 +2241,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encrypt.c:838 sm/encrypt.c:766
+#: g10/encrypt.c:838 sm/encrypt.c:767
 #, c-format
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr ""
@@ -2255,7 +2268,7 @@ msgstr ""
 msgid "option '%s' may not be used in %s mode\n"
 msgstr ""
 
-#: g10/decrypt-data.c:239 g10/mainproc.c:380 sm/decrypt.c:494
+#: g10/decrypt-data.c:239 g10/mainproc.c:380 sm/decrypt.c:892
 #, c-format
 msgid "%s.%s encrypted data\n"
 msgstr ""
@@ -2265,7 +2278,7 @@ msgstr ""
 msgid "encrypted with unknown algorithm %d\n"
 msgstr ""
 
-#: g10/decrypt-data.c:361 g10/decrypt-data.c:414 sm/decrypt.c:508
+#: g10/decrypt-data.c:361 g10/decrypt-data.c:414 sm/decrypt.c:906
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2304,7 +2317,7 @@ msgstr ""
 msgid " - skipped"
 msgstr ""
 
-#: g10/export.c:1333 g10/import.c:2124 g10/openfile.c:202 g10/openfile.c:296
+#: g10/export.c:1333 g10/import.c:2132 g10/openfile.c:202 g10/openfile.c:296
 #: g10/sign.c:1110 g10/sign.c:1447
 #, c-format
 msgid "writing to '%s'\n"
@@ -2340,61 +2353,61 @@ msgstr ""
 msgid "[User ID not found]"
 msgstr ""
 
-#: g10/getkey.c:1199
+#: g10/getkey.c:1324
 #, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1205
+#: g10/getkey.c:1330
 #, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr ""
 
-#: g10/getkey.c:1207
+#: g10/getkey.c:1332
 msgid "No fingerprint"
 msgstr ""
 
-#: g10/getkey.c:1449
+#: g10/getkey.c:1574
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1884 g10/revoke.c:657 g10/revoke.c:718
+#: g10/getkey.c:2009 g10/revoke.c:658 g10/revoke.c:719
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr ""
 
-#: g10/getkey.c:1887 g10/pkclist.c:1012
+#: g10/getkey.c:2012 g10/pkclist.c:1012
 #, c-format
 msgid "(check argument of option '%s')\n"
 msgstr ""
 
-#: g10/getkey.c:1965
+#: g10/getkey.c:2090
 #, c-format
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr ""
 
-#: g10/getkey.c:1973
+#: g10/getkey.c:2098
 #, c-format
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr ""
 
-#: g10/getkey.c:1980
+#: g10/getkey.c:2105
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr ""
 
-#: g10/getkey.c:2837
+#: g10/getkey.c:2962
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:3703
+#: g10/getkey.c:3828
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr ""
 
-#: g10/getkey.c:4259 g10/gpg.c:2167
+#: g10/getkey.c:4384 g10/gpg.c:2168
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr ""
@@ -2579,7 +2592,7 @@ msgstr ""
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:651 kbx/kbxutil.c:91 sm/gpgsm.c:424 tools/gpgconf.c:113
+#: g10/gpg.c:651 kbx/kbxutil.c:91 sm/gpgsm.c:425 tools/gpgconf.c:113
 msgid "do not make any changes"
 msgstr ""
 
@@ -2611,7 +2624,7 @@ msgstr ""
 msgid "|N|set compress level to N (0 disables)"
 msgstr ""
 
-#: g10/gpg.c:762 sm/gpgsm.c:357
+#: g10/gpg.c:762 sm/gpgsm.c:358
 msgid "Options controlling key import and export"
 msgstr ""
 
@@ -2627,11 +2640,11 @@ msgstr ""
 msgid "include the public key in signatures"
 msgstr ""
 
-#: g10/gpg.c:776 sm/gpgsm.c:360
+#: g10/gpg.c:776 sm/gpgsm.c:361
 msgid "disable all access to the dirmngr"
 msgstr ""
 
-#: g10/gpg.c:788 sm/gpgsm.c:367
+#: g10/gpg.c:788 sm/gpgsm.c:368
 msgid "Options controlling key listings"
 msgstr ""
 
@@ -2647,15 +2660,15 @@ msgstr ""
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr ""
 
-#: g10/gpg.c:876 sm/gpgsm.c:408
+#: g10/gpg.c:876 sm/gpgsm.c:409
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:895 sm/gpgsm.c:420 dirmngr/dirmngr.c:286
+#: g10/gpg.c:895 sm/gpgsm.c:421 dirmngr/dirmngr.c:289
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:966 sm/gpgsm.c:453
+#: g10/gpg.c:966 sm/gpgsm.c:454
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2684,7 +2697,7 @@ msgid ""
 "Default operation depends on the input data\n"
 msgstr ""
 
-#: g10/gpg.c:1168 sm/gpgsm.c:636
+#: g10/gpg.c:1168 sm/gpgsm.c:637
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2706,12 +2719,12 @@ msgstr ""
 msgid "Compression: "
 msgstr ""
 
-#: g10/gpg.c:1274 sm/gpgsm.c:710
+#: g10/gpg.c:1274 sm/gpgsm.c:711
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr ""
 
-#: g10/gpg.c:1467 sm/gpgsm.c:803
+#: g10/gpg.c:1467 sm/gpgsm.c:804
 #, c-format
 msgid "conflicting commands\n"
 msgstr ""
@@ -2721,518 +2734,518 @@ msgstr ""
 msgid "no = sign found in group definition '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1683
+#: g10/gpg.c:1684
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1686
+#: g10/gpg.c:1687
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1689
+#: g10/gpg.c:1690
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1695
+#: g10/gpg.c:1696
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1698
+#: g10/gpg.c:1699
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1701
+#: g10/gpg.c:1702
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1708
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1711
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1714
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1720
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1723
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1726
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1941
+#: g10/gpg.c:1942
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:2037
+#: g10/gpg.c:2038
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:2039
+#: g10/gpg.c:2040
 msgid "show key usage information during key listings"
 msgstr ""
 
-#: g10/gpg.c:2041
+#: g10/gpg.c:2042
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2043
+#: g10/gpg.c:2044
 msgid "show all notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2045
+#: g10/gpg.c:2046
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2049
+#: g10/gpg.c:2050
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2051
+#: g10/gpg.c:2052
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2053
+#: g10/gpg.c:2054
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:2055
+#: g10/gpg.c:2056
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:2057
+#: g10/gpg.c:2058
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:2059
+#: g10/gpg.c:2060
 msgid "show the keyring name in key listings"
 msgstr ""
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2062
 msgid "show expiration dates during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2178
+#: g10/gpg.c:2179
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:2180
+#: g10/gpg.c:2181
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2975 g10/gpg.c:3828 g10/gpg.c:3840
+#: g10/gpg.c:2978 g10/gpg.c:3825 g10/gpg.c:3837
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr ""
 
-#: g10/gpg.c:3151 g10/gpg.c:3163
+#: g10/gpg.c:3154 g10/gpg.c:3166
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr ""
 
-#: g10/gpg.c:3185
+#: g10/gpg.c:3188
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr ""
 
-#: g10/gpg.c:3217 sm/gpgsm.c:1270
+#: g10/gpg.c:3220 sm/gpgsm.c:1143
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:3223 sm/gpgsm.c:1276
+#: g10/gpg.c:3226 sm/gpgsm.c:1149
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:3280
+#: g10/gpg.c:3283
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr ""
 
-#: g10/gpg.c:3302 g10/gpg.c:3511 g10/keyedit.c:5319
+#: g10/gpg.c:3305 g10/gpg.c:3514 g10/keyedit.c:5322
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr ""
 
-#: g10/gpg.c:3320
+#: g10/gpg.c:3323
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr ""
 
-#: g10/gpg.c:3323
+#: g10/gpg.c:3326
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr ""
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3333
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr ""
 
-#: g10/gpg.c:3333
+#: g10/gpg.c:3336
 #, c-format
 msgid "invalid import options\n"
 msgstr ""
 
-#: g10/gpg.c:3339 g10/gpg.c:3354
+#: g10/gpg.c:3342 g10/gpg.c:3357
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3345
+#: g10/gpg.c:3348
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr ""
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3351
 #, c-format
 msgid "invalid export options\n"
 msgstr ""
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3363
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr ""
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3366
 #, c-format
 msgid "invalid list options\n"
 msgstr ""
 
-#: g10/gpg.c:3371
+#: g10/gpg.c:3374
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3373
+#: g10/gpg.c:3376
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3378
 msgid "show all notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3377
+#: g10/gpg.c:3380
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3384
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3386
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3385
+#: g10/gpg.c:3388
 msgid "show user ID validity during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3387
+#: g10/gpg.c:3390
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3389
+#: g10/gpg.c:3392
 msgid "show only the primary user ID in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3396
+#: g10/gpg.c:3399
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr ""
 
-#: g10/gpg.c:3399
+#: g10/gpg.c:3402
 #, c-format
 msgid "invalid verify options\n"
 msgstr ""
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3409
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:3613
+#: g10/gpg.c:3616
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3616
+#: g10/gpg.c:3619
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3625
+#: g10/gpg.c:3628
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr ""
 
-#: g10/gpg.c:3807 sm/gpgsm.c:1675
+#: g10/gpg.c:3804 sm/gpgsm.c:1528
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/gpg.c:3821
+#: g10/gpg.c:3818
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/gpg.c:3830
+#: g10/gpg.c:3827
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr ""
 
-#: g10/gpg.c:3833
+#: g10/gpg.c:3830
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr ""
 
-#: g10/gpg.c:3848 sm/gpgsm.c:1696 dirmngr/dirmngr.c:1123
+#: g10/gpg.c:3845 sm/gpgsm.c:1549 dirmngr/dirmngr.c:1160
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3869
+#: g10/gpg.c:3866
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr ""
 
-#: g10/gpg.c:3897 g10/gpg.c:3928 sm/gpgsm.c:1763
+#: g10/gpg.c:3894 g10/gpg.c:3925 sm/gpgsm.c:1616
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3901
 #, c-format
 msgid "selected AEAD algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3916
+#: g10/gpg.c:3913
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3922
+#: g10/gpg.c:3919
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3937
+#: g10/gpg.c:3934
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/gpg.c:3939
+#: g10/gpg.c:3936
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/gpg.c:3941
+#: g10/gpg.c:3938
 #, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr ""
 
-#: g10/gpg.c:3943
+#: g10/gpg.c:3940
 #, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 
-#: g10/gpg.c:3945
+#: g10/gpg.c:3942
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 
-#: g10/gpg.c:3949
+#: g10/gpg.c:3946
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr ""
 
-#: g10/gpg.c:3953
+#: g10/gpg.c:3950
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr ""
 
-#: g10/gpg.c:3960
+#: g10/gpg.c:3957
 #, c-format
 msgid "invalid default preferences\n"
 msgstr ""
 
-#: g10/gpg.c:3964
+#: g10/gpg.c:3961
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr ""
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3964
 #, c-format
 msgid "invalid personal AEAD preferences\n"
 msgstr ""
 
-#: g10/gpg.c:3971
+#: g10/gpg.c:3968
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr ""
 
-#: g10/gpg.c:3975
+#: g10/gpg.c:3972
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr ""
 
-#: g10/gpg.c:3984 g10/gpg.c:3989
+#: g10/gpg.c:3981 g10/gpg.c:3986
 #, c-format
 msgid "chunk size invalid - using %d\n"
 msgstr ""
 
-#: g10/gpg.c:4026
+#: g10/gpg.c:4023
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr ""
 
-#: g10/gpg.c:4089
+#: g10/gpg.c:4086
 #, c-format
 msgid "AEAD algorithm '%s' may not be used in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:4101
+#: g10/gpg.c:4098
 #, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:4256
+#: g10/gpg.c:4253
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr ""
 
-#: g10/gpg.c:4268
+#: g10/gpg.c:4265
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:4340
+#: g10/gpg.c:4337
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:4369
+#: g10/gpg.c:4366
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4372
+#: g10/gpg.c:4369
 #, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:4430
+#: g10/gpg.c:4427
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4433
+#: g10/gpg.c:4430
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:4821 g10/keyserver.c:1870
+#: g10/gpg.c:4818 g10/keyserver.c:1629
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:4826
+#: g10/gpg.c:4823
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:4832
+#: g10/gpg.c:4829
 #, c-format
 msgid "key export failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:4845
+#: g10/gpg.c:4842
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:4857
+#: g10/gpg.c:4854
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:4870
+#: g10/gpg.c:4867
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:4937
+#: g10/gpg.c:4936
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:4948
+#: g10/gpg.c:4947
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:5053
+#: g10/gpg.c:5052
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:5205 g10/tofu.c:2156
+#: g10/gpg.c:5204 g10/tofu.c:2160
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr ""
 
-#: g10/gpg.c:5216
+#: g10/gpg.c:5215
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5272
+#: g10/gpg.c:5271
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5283
+#: g10/gpg.c:5282
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr ""
 
-#: g10/gpg.c:5630
+#: g10/gpg.c:5629
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:5632
+#: g10/gpg.c:5631
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:5665
+#: g10/gpg.c:5664
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr ""
@@ -3245,7 +3258,7 @@ msgstr ""
 msgid "make timestamp conflicts only a warning"
 msgstr ""
 
-#: g10/gpgv.c:86 sm/gpgsm.c:414 tools/gpgconf.c:116 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:415 tools/gpgconf.c:116 tools/gpg-card.c:95
 msgid "|FD|write status info to this FD"
 msgstr ""
 
@@ -3328,268 +3341,268 @@ msgstr ""
 msgid "repair keys on import"
 msgstr ""
 
-#: g10/import.c:399 g10/import.c:721
+#: g10/import.c:407 g10/import.c:729
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr ""
 
-#: g10/import.c:738
+#: g10/import.c:746
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr ""
 
-#: g10/import.c:831
+#: g10/import.c:839
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr ""
 
-#: g10/import.c:834
+#: g10/import.c:842
 #, c-format
 msgid "    skipped PGP-2 keys: %lu\n"
 msgstr ""
 
-#: g10/import.c:836
+#: g10/import.c:844
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr ""
 
-#: g10/import.c:839
+#: g10/import.c:847
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr ""
 
-#: g10/import.c:842 sm/import.c:129
+#: g10/import.c:850 sm/import.c:129
 #, c-format
 msgid "              imported: %lu"
 msgstr ""
 
-#: g10/import.c:846 sm/import.c:133
+#: g10/import.c:854 sm/import.c:133
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr ""
 
-#: g10/import.c:848
+#: g10/import.c:856
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr ""
 
-#: g10/import.c:850
+#: g10/import.c:858
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr ""
 
-#: g10/import.c:852
+#: g10/import.c:860
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr ""
 
-#: g10/import.c:854
+#: g10/import.c:862
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr ""
 
-#: g10/import.c:856 sm/import.c:135
+#: g10/import.c:864 sm/import.c:135
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr ""
 
-#: g10/import.c:858 sm/import.c:137
+#: g10/import.c:866 sm/import.c:137
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr ""
 
-#: g10/import.c:860 sm/import.c:139
+#: g10/import.c:868 sm/import.c:139
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr ""
 
-#: g10/import.c:862 sm/import.c:141
+#: g10/import.c:870 sm/import.c:141
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr ""
 
-#: g10/import.c:864
+#: g10/import.c:872
 #, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr ""
 
-#: g10/import.c:866
+#: g10/import.c:874
 #, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr ""
 
-#: g10/import.c:1291
+#: g10/import.c:1299
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:1333
+#: g10/import.c:1341
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:1351
+#: g10/import.c:1359
 #, c-format
 msgid "         \"%s\": preference for AEAD algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:1366
+#: g10/import.c:1374
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:1378
+#: g10/import.c:1386
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:1391
+#: g10/import.c:1399
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:1393
+#: g10/import.c:1401
 #, c-format
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:1418
+#: g10/import.c:1426
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:1932 g10/import.c:3053
+#: g10/import.c:1940 g10/import.c:3061
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr ""
 
-#: g10/import.c:1938
+#: g10/import.c:1946
 #, c-format
 msgid "key %s: %s\n"
 msgstr ""
 
-#: g10/import.c:1939 g10/import.c:3025
+#: g10/import.c:1947 g10/import.c:3033
 msgid "rejected by import screener"
 msgstr ""
 
-#: g10/import.c:1988
+#: g10/import.c:1996
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr ""
 
-#: g10/import.c:2009
+#: g10/import.c:2017
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr ""
 
-#: g10/import.c:2020 g10/import.c:2051
+#: g10/import.c:2028 g10/import.c:2059
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr ""
 
-#: g10/import.c:2022
+#: g10/import.c:2030
 #, c-format
 msgid "this may be caused by a missing self-signature\n"
 msgstr ""
 
-#: g10/import.c:2101 g10/import.c:3439
+#: g10/import.c:2109 g10/import.c:3447
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr ""
 
-#: g10/import.c:2107
+#: g10/import.c:2115
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr ""
 
-#: g10/import.c:2119
+#: g10/import.c:2127
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr ""
 
-#: g10/import.c:2151 g10/import.c:2253 g10/import.c:3514
+#: g10/import.c:2159 g10/import.c:2261 g10/import.c:3522
 #, c-format
 msgid "error writing keyring '%s': %s\n"
 msgstr ""
 
-#: g10/import.c:2174
+#: g10/import.c:2182
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr ""
 
-#: g10/import.c:2201
+#: g10/import.c:2209
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr ""
 
-#: g10/import.c:2269
+#: g10/import.c:2277
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr ""
 
-#: g10/import.c:2272
+#: g10/import.c:2280
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr ""
 
-#: g10/import.c:2275
+#: g10/import.c:2283
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr ""
 
-#: g10/import.c:2278
+#: g10/import.c:2286
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr ""
 
-#: g10/import.c:2281
+#: g10/import.c:2289
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr ""
 
-#: g10/import.c:2284
+#: g10/import.c:2292
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr ""
 
-#: g10/import.c:2287
+#: g10/import.c:2295
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr ""
 
-#: g10/import.c:2290
+#: g10/import.c:2298
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr ""
 
-#: g10/import.c:2293
+#: g10/import.c:2301
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr ""
 
-#: g10/import.c:2296
+#: g10/import.c:2304
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr ""
 
-#: g10/import.c:2332
+#: g10/import.c:2340
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr ""
 
-#: g10/import.c:2692 g10/import.c:2887
+#: g10/import.c:2700 g10/import.c:2895
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr ""
 
-#: g10/import.c:2700
+#: g10/import.c:2708
 #, c-format
 msgid "key %s: secret key already exists\n"
 msgstr ""
 
-#: g10/import.c:2708
+#: g10/import.c:2716
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr ""
@@ -3602,203 +3615,202 @@ msgstr ""
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2877
+#: g10/import.c:2885
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:3024
+#: g10/import.c:3032
 #, c-format
 msgid "secret key %s: %s\n"
 msgstr ""
 
-#: g10/import.c:3045 g10/import.c:3084
+#: g10/import.c:3053 g10/import.c:3092
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr ""
 
-#: g10/import.c:3072
+#: g10/import.c:3080
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr ""
 
-#: g10/import.c:3234 g10/pkclist.c:75 g10/revoke.c:774
+#: g10/import.c:3242 g10/pkclist.c:75 g10/revoke.c:775
 msgid "No reason specified"
 msgstr ""
 
-#: g10/import.c:3235 g10/pkclist.c:77 g10/revoke.c:776
+#: g10/import.c:3243 g10/pkclist.c:77 g10/revoke.c:777
 msgid "Key is superseded"
 msgstr ""
 
-#: g10/import.c:3236 g10/pkclist.c:79 g10/revoke.c:775
+#: g10/import.c:3244 g10/pkclist.c:79 g10/revoke.c:776
 msgid "Key has been compromised"
 msgstr ""
 
-#: g10/import.c:3237 g10/pkclist.c:81 g10/revoke.c:777
+#: g10/import.c:3245 g10/pkclist.c:81 g10/revoke.c:778
 msgid "Key is no longer used"
 msgstr ""
 
-#: g10/import.c:3238 g10/pkclist.c:83 g10/revoke.c:778
+#: g10/import.c:3246 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr ""
 
-#: g10/import.c:3363 g10/keylist.c:1105 g10/pkclist.c:87
+#: g10/import.c:3371 g10/keylist.c:1105 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr ""
 
-#: g10/import.c:3382 g10/keylist.c:1124 g10/pkclist.c:103
+#: g10/import.c:3390 g10/keylist.c:1124 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr ""
 
-#: g10/import.c:3432
+#: g10/import.c:3440
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 
-#: g10/import.c:3461
+#: g10/import.c:3469
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr ""
 
-#: g10/import.c:3468
+#: g10/import.c:3476
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr ""
 
-#: g10/import.c:3488
+#: g10/import.c:3496
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 
-#: g10/import.c:3523
+#: g10/import.c:3531
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr ""
 
-#: g10/import.c:3609
+#: g10/import.c:3617
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr ""
 
-#: g10/import.c:3626
+#: g10/import.c:3634
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 
-#: g10/import.c:3628
+#: g10/import.c:3636
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr ""
 
-#: g10/import.c:3645 g10/import.c:3673 g10/import.c:3729
+#: g10/import.c:3653 g10/import.c:3681 g10/import.c:3737
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr ""
 
-#: g10/import.c:3646
+#: g10/import.c:3654
 #, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr ""
 
-#: g10/import.c:3660
+#: g10/import.c:3668
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr ""
 
-#: g10/import.c:3675
+#: g10/import.c:3683
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr ""
 
-#: g10/import.c:3694
+#: g10/import.c:3702
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr ""
 
-#: g10/import.c:3718
+#: g10/import.c:3726
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr ""
 
-#: g10/import.c:3731
+#: g10/import.c:3739
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr ""
 
-#: g10/import.c:3746
+#: g10/import.c:3754
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr ""
 
-#: g10/import.c:3790
+#: g10/import.c:3798
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr ""
 
-#: g10/import.c:3817
+#: g10/import.c:3825
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr ""
 
-#: g10/import.c:3849
+#: g10/import.c:3857
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr ""
 
-#: g10/import.c:3860
+#: g10/import.c:3868
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
 
-#: g10/import.c:3878
+#: g10/import.c:3886
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr ""
 
-#: g10/import.c:3892
+#: g10/import.c:3900
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr ""
 
-#: g10/import.c:3900
+#: g10/import.c:3908
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr ""
 
-#: g10/import.c:4073
+#: g10/import.c:4081
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr ""
 
-#: g10/import.c:4180
+#: g10/import.c:4188
 #, c-format
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr ""
 
-#: g10/import.c:4245
+#: g10/import.c:4253
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 
-#: g10/import.c:4261
+#: g10/import.c:4269
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 
-#: g10/import.c:4327
+#: g10/import.c:4335
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr ""
 
-#: g10/import.c:4365
+#: g10/import.c:4373
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr ""
 
-#: g10/key-check.c:133 dirmngr/dirmngr_ldap.c:650 dirmngr/ldap-wrapper.c:835
-#: dirmngr/ldap-wrapper.c:852
+#: g10/key-check.c:133 dirmngr/ldap-wrapper.c:835 dirmngr/ldap-wrapper.c:852
 #, c-format
 msgid "error allocating memory: %s\n"
 msgstr ""
@@ -3858,7 +3870,7 @@ msgid ""
 "all signatures.\n"
 msgstr ""
 
-#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:284 sm/keydb.c:297
+#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:289 sm/keydb.c:302
 #, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr ""
@@ -3868,7 +3880,7 @@ msgstr ""
 msgid "error creating keyring '%s': %s\n"
 msgstr ""
 
-#: g10/keydb.c:388 sm/keydb.c:303
+#: g10/keydb.c:388 sm/keydb.c:308
 #, c-format
 msgid "keybox '%s' created\n"
 msgstr ""
@@ -4103,8 +4115,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6192 g10/keyedit.c:6275 g10/keyedit.c:6404
-#: g10/keyedit.c:6466 g10/sign.c:528
+#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
+#: g10/keyedit.c:6474 g10/sign.c:528
 #, c-format
 msgid "signing failed: %s\n"
 msgstr ""
@@ -4464,7 +4476,7 @@ msgstr ""
 msgid "Nothing to sign.\n"
 msgstr ""
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6057
+#: g10/keyedit.c:2973 g10/keyedit.c:6065
 #, c-format
 msgid "Not signed by you.\n"
 msgstr ""
@@ -4531,7 +4543,7 @@ msgstr ""
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:525
+#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr ""
@@ -4547,7 +4559,7 @@ msgid "expired: %s"
 msgstr ""
 
 #: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2262
-#: g10/keyserver.c:531
+#: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr ""
@@ -4581,13 +4593,13 @@ msgid ""
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:535
-#: g10/mainproc.c:2280 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
+#: g10/mainproc.c:2282 g10/tofu.c:1789 g10/trust.c:426 dirmngr/ocsp.c:792
 msgid "revoked"
 msgstr ""
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:539
-#: g10/mainproc.c:2282 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
+#: g10/mainproc.c:2284 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr ""
 
@@ -4623,7 +4635,7 @@ msgstr ""
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:4273 g10/keygen.c:3107
+#: g10/keyedit.c:4273 g10/keygen.c:3111
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
@@ -4760,7 +4772,7 @@ msgstr ""
 msgid "Please select exactly one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5357 g10/keyedit.c:5495
+#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr ""
@@ -4769,127 +4781,127 @@ msgstr ""
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5380
+#: g10/keyedit.c:5383
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:5381
+#: g10/keyedit.c:5384
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:5441
+#: g10/keyedit.c:5449
 msgid "Enter the notation: "
 msgstr ""
 
-#: g10/keyedit.c:5588
+#: g10/keyedit.c:5596
 msgid "Proceed? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:5658
+#: g10/keyedit.c:5666
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:5720
+#: g10/keyedit.c:5728
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr ""
 
-#: g10/keyedit.c:5821
+#: g10/keyedit.c:5829
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr ""
 
-#: g10/keyedit.c:5843
+#: g10/keyedit.c:5851
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:5984
+#: g10/keyedit.c:5992
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr ""
 
-#: g10/keyedit.c:5987 g10/keyedit.c:6089 g10/keyedit.c:6137
+#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
+#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:5993
+#: g10/keyedit.c:6001
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr ""
 
-#: g10/keyedit.c:5998
+#: g10/keyedit.c:6006
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:6003
+#: g10/keyedit.c:6011
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:6063
+#: g10/keyedit.c:6071
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr ""
 
-#: g10/keyedit.c:6092
+#: g10/keyedit.c:6100
 msgid " (non-revocable)"
 msgstr ""
 
-#: g10/keyedit.c:6099
+#: g10/keyedit.c:6107
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6124
+#: g10/keyedit.c:6132
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:6147
+#: g10/keyedit.c:6155
 msgid "Really create the revocation certificates? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:6180
+#: g10/keyedit.c:6188
 #, c-format
 msgid "no secret key\n"
 msgstr ""
 
-#: g10/keyedit.c:6228
+#: g10/keyedit.c:6236
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6238
+#: g10/keyedit.c:6246
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr ""
 
-#: g10/keyedit.c:6255
+#: g10/keyedit.c:6263
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:6351
+#: g10/keyedit.c:6359
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:6389
+#: g10/keyedit.c:6397
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr ""
 
-#: g10/keyedit.c:6451
+#: g10/keyedit.c:6459
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr ""
 
-#: g10/keyedit.c:6548
+#: g10/keyedit.c:6556
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4899,81 +4911,81 @@ msgstr ""
 msgid "invalid value for option '%s'\n"
 msgstr ""
 
-#: g10/keygen.c:338
+#: g10/keygen.c:339
 #, c-format
 msgid "preference '%s' duplicated\n"
 msgstr ""
 
-#: g10/keygen.c:345
+#: g10/keygen.c:346
 #, c-format
 msgid "too many cipher preferences\n"
 msgstr ""
 
-#: g10/keygen.c:347
+#: g10/keygen.c:348
 #, c-format
 msgid "too many digest preferences\n"
 msgstr ""
 
-#: g10/keygen.c:349
+#: g10/keygen.c:350
 #, c-format
 msgid "too many compression preferences\n"
 msgstr ""
 
-#: g10/keygen.c:351
+#: g10/keygen.c:352
 #, c-format
 msgid "too many AEAD preferences\n"
 msgstr ""
 
-#: g10/keygen.c:521
+#: g10/keygen.c:522
 #, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr ""
 
-#: g10/keygen.c:1130
+#: g10/keygen.c:1131
 #, c-format
 msgid "writing direct signature\n"
 msgstr ""
 
-#: g10/keygen.c:1176
+#: g10/keygen.c:1177
 #, c-format
 msgid "writing self signature\n"
 msgstr ""
 
-#: g10/keygen.c:1233
+#: g10/keygen.c:1234
 #, c-format
 msgid "writing key binding signature\n"
 msgstr ""
 
-#: g10/keygen.c:1598 g10/keygen.c:1603 g10/keygen.c:1655 g10/keygen.c:1660
-#: g10/keygen.c:1832 g10/keygen.c:1837
+#: g10/keygen.c:1599 g10/keygen.c:1604 g10/keygen.c:1656 g10/keygen.c:1661
+#: g10/keygen.c:1833 g10/keygen.c:1838
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:1609 g10/keygen.c:1666 g10/keygen.c:1674 g10/keygen.c:1843
+#: g10/keygen.c:1610 g10/keygen.c:1667 g10/keygen.c:1675 g10/keygen.c:1844
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1701
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1899
+#: g10/keygen.c:1900
 msgid "Sign"
 msgstr ""
 
-#: g10/keygen.c:1902
+#: g10/keygen.c:1903
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1906
 msgid "Encrypt"
 msgstr ""
 
-#: g10/keygen.c:1908
+#: g10/keygen.c:1909
 msgid "Authenticate"
 msgstr ""
 
@@ -4987,166 +4999,166 @@ msgstr ""
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1929
+#: g10/keygen.c:1930
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1967
 #, c-format
 msgid "Possible actions for this %s key: "
 msgstr ""
 
-#: g10/keygen.c:1973
+#: g10/keygen.c:1974
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1979
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1981
+#: g10/keygen.c:1982
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr ""
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1985
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1987
+#: g10/keygen.c:1988
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:2116
+#: g10/keygen.c:2117
 #, c-format
 msgid "   (%d) RSA and RSA%s\n"
 msgstr ""
 
-#: g10/keygen.c:2120
+#: g10/keygen.c:2121
 #, c-format
 msgid "   (%d) DSA and Elgamal%s\n"
 msgstr ""
 
-#: g10/keygen.c:2123
+#: g10/keygen.c:2124
 #, c-format
 msgid "   (%d) DSA (sign only)%s\n"
 msgstr ""
 
-#: g10/keygen.c:2125
+#: g10/keygen.c:2126
 #, c-format
 msgid "   (%d) RSA (sign only)%s\n"
 msgstr ""
 
-#: g10/keygen.c:2131
+#: g10/keygen.c:2132
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)%s\n"
 msgstr ""
 
-#: g10/keygen.c:2133
+#: g10/keygen.c:2134
 #, c-format
 msgid "   (%d) RSA (encrypt only)%s\n"
 msgstr ""
 
-#: g10/keygen.c:2139
+#: g10/keygen.c:2140
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)%s\n"
 msgstr ""
 
-#: g10/keygen.c:2141
+#: g10/keygen.c:2142
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)%s\n"
 msgstr ""
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2148
 #, c-format
 msgid "   (%d) ECC (sign and encrypt)%s\n"
 msgstr ""
 
-#: g10/keygen.c:2147 g10/keygen.c:2678
+#: g10/keygen.c:2148 g10/keygen.c:2679
 msgid " *default*"
 msgstr ""
 
-#: g10/keygen.c:2148
+#: g10/keygen.c:2149
 #, c-format
 msgid "  (%d) ECC (sign only)\n"
 msgstr ""
 
-#: g10/keygen.c:2150
+#: g10/keygen.c:2151
 #, c-format
 msgid "  (%d) ECC (set your own capabilities)%s\n"
 msgstr ""
 
-#: g10/keygen.c:2152
+#: g10/keygen.c:2153
 #, c-format
 msgid "  (%d) ECC (encrypt only)%s\n"
 msgstr ""
 
-#: g10/keygen.c:2156
+#: g10/keygen.c:2157
 #, c-format
 msgid "  (%d) Existing key%s\n"
 msgstr ""
 
-#: g10/keygen.c:2158
+#: g10/keygen.c:2159
 #, c-format
 msgid "  (%d) Existing key from card%s\n"
 msgstr ""
 
-#: g10/keygen.c:2254 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2255 sm/certreqgen-ui.c:203
 msgid "Enter the keygrip: "
 msgstr ""
 
-#: g10/keygen.c:2267 sm/certreqgen-ui.c:211 tools/gpg-card.c:2280
+#: g10/keygen.c:2268 sm/certreqgen-ui.c:211 tools/gpg-card.c:2297
 #, c-format
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr ""
 
-#: g10/keygen.c:2269 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2270 sm/certreqgen-ui.c:213
 msgid "No key with this keygrip\n"
 msgstr ""
 
-#: g10/keygen.c:2288 g10/keygen.c:2298 g10/keygen.c:3440 g10/keygen.c:3451
+#: g10/keygen.c:2289 g10/keygen.c:2299 g10/keygen.c:3444 g10/keygen.c:3455
 #: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
 #, c-format
 msgid "error reading the card: %s\n"
 msgstr ""
 
-#: g10/keygen.c:2292 g10/keygen.c:3444 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2293 g10/keygen.c:3448 sm/certreqgen-ui.c:234
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr ""
 
-#: g10/keygen.c:2311 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2312 sm/certreqgen-ui.c:246
 msgid "Available keys:\n"
 msgstr ""
 
-#: g10/keygen.c:2504 g10/keygen.c:2518
+#: g10/keygen.c:2505 g10/keygen.c:2519
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:2559
+#: g10/keygen.c:2560
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:2567
+#: g10/keygen.c:2568
 #, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr ""
 
-#: g10/keygen.c:2584 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2585 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:2630
+#: g10/keygen.c:2631
 msgid "Please select which elliptic curve you want:\n"
 msgstr ""
 
-#: g10/keygen.c:2819
+#: g10/keygen.c:2820
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5156,7 +5168,7 @@ msgid ""
 "      <n>y = key expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:2830
+#: g10/keygen.c:2831
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5166,48 +5178,48 @@ msgid ""
 "      <n>y = signature expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:2853
+#: g10/keygen.c:2854
 msgid "Key is valid for? (0) "
 msgstr ""
 
-#: g10/keygen.c:2858
+#: g10/keygen.c:2859
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr ""
 
-#: g10/keygen.c:2871 g10/keygen.c:2896
+#: g10/keygen.c:2875 g10/keygen.c:2900
 msgid "invalid value\n"
 msgstr ""
 
-#: g10/keygen.c:2878
+#: g10/keygen.c:2882
 msgid "Key does not expire at all\n"
 msgstr ""
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2883
 msgid "Signature does not expire at all\n"
 msgstr ""
 
-#: g10/keygen.c:2884
+#: g10/keygen.c:2888
 #, c-format
 msgid "Key expires at %s\n"
 msgstr ""
 
-#: g10/keygen.c:2885
+#: g10/keygen.c:2889
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr ""
 
-#: g10/keygen.c:2889
+#: g10/keygen.c:2893
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 
-#: g10/keygen.c:2902
+#: g10/keygen.c:2906
 msgid "Is this correct? (y/N) "
 msgstr ""
 
-#: g10/keygen.c:2970
+#: g10/keygen.c:2974
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5218,7 +5230,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2985
+#: g10/keygen.c:2989
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5228,49 +5240,49 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:3004
+#: g10/keygen.c:3008
 msgid "Real name: "
 msgstr ""
 
-#: g10/keygen.c:3013
+#: g10/keygen.c:3017
 msgid "Invalid character in name\n"
 msgstr ""
 
-#: g10/keygen.c:3014
+#: g10/keygen.c:3018
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:3018
+#: g10/keygen.c:3022
 msgid "Name may not start with a digit\n"
 msgstr ""
 
-#: g10/keygen.c:3021
+#: g10/keygen.c:3025
 msgid "Name must be at least 5 characters long\n"
 msgstr ""
 
-#: g10/keygen.c:3031
+#: g10/keygen.c:3035
 msgid "Email address: "
 msgstr ""
 
-#: g10/keygen.c:3037
+#: g10/keygen.c:3041
 msgid "Not a valid email address\n"
 msgstr ""
 
-#: g10/keygen.c:3046
+#: g10/keygen.c:3050
 msgid "Comment: "
 msgstr ""
 
-#: g10/keygen.c:3052
+#: g10/keygen.c:3056
 msgid "Invalid character in comment\n"
 msgstr ""
 
-#: g10/keygen.c:3088
+#: g10/keygen.c:3092
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr ""
 
-#: g10/keygen.c:3094
+#: g10/keygen.c:3098
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5278,7 +5290,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:3099
+#: g10/keygen.c:3103
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
@@ -5293,31 +5305,31 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3124
+#: g10/keygen.c:3128
 msgid "NnCcEeOoQq"
 msgstr ""
 
-#: g10/keygen.c:3134
+#: g10/keygen.c:3138
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr ""
 
-#: g10/keygen.c:3135
+#: g10/keygen.c:3139
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 
-#: g10/keygen.c:3140
+#: g10/keygen.c:3144
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr ""
 
-#: g10/keygen.c:3141
+#: g10/keygen.c:3145
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr ""
 
-#: g10/keygen.c:3160
+#: g10/keygen.c:3164
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:3206
+#: g10/keygen.c:3210
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -5325,18 +5337,18 @@ msgid ""
 "generator a better chance to gain enough entropy.\n"
 msgstr ""
 
-#: g10/keygen.c:3591
+#: g10/keygen.c:3595
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4590 g10/keygen.c:4663 g10/keygen.c:4681 g10/keygen.c:4710
-#: g10/keygen.c:5086 g10/keygen.c:5632 g10/keygen.c:5943 g10/keygen.c:6050
+#: g10/keygen.c:4594 g10/keygen.c:4667 g10/keygen.c:4685 g10/keygen.c:4714
+#: g10/keygen.c:5113 g10/keygen.c:5663 g10/keygen.c:5974 g10/keygen.c:6081
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr ""
 
-#: g10/keygen.c:4599
+#: g10/keygen.c:4603
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5344,97 +5356,97 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:4601
+#: g10/keygen.c:4605
 msgid "Continue? (Y/n) "
 msgstr ""
 
-#: g10/keygen.c:4622
+#: g10/keygen.c:4626
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr ""
 
-#: g10/keygen.c:4627
+#: g10/keygen.c:4631
 msgid "Create anyway? (y/N) "
 msgstr ""
 
-#: g10/keygen.c:4633
+#: g10/keygen.c:4637
 #, c-format
 msgid "creating anyway\n"
 msgstr ""
 
-#: g10/keygen.c:5069
+#: g10/keygen.c:5096
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 
-#: g10/keygen.c:5118
+#: g10/keygen.c:5145
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr ""
 
-#: g10/keygen.c:5178
+#: g10/keygen.c:5205
 #, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr ""
 
-#: g10/keygen.c:5198
+#: g10/keygen.c:5225
 #, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr ""
 
-#: g10/keygen.c:5359 g10/keygen.c:5561
+#: g10/keygen.c:5389 g10/keygen.c:5591
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr ""
 
-#: g10/keygen.c:5555
+#: g10/keygen.c:5585
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr ""
 
-#: g10/keygen.c:5569
+#: g10/keygen.c:5599
 #, c-format
 msgid "error writing public keyring '%s': %s\n"
 msgstr ""
 
-#: g10/keygen.c:5603
+#: g10/keygen.c:5634
 msgid "public and secret key created and signed.\n"
 msgstr ""
 
-#: g10/keygen.c:5619
+#: g10/keygen.c:5650
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
 msgstr ""
 
-#: g10/keygen.c:5801 g10/keygen.c:6000
+#: g10/keygen.c:5832 g10/keygen.c:6031
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:5803 g10/keygen.c:6002
+#: g10/keygen.c:5834 g10/keygen.c:6033
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:5814 g10/keygen.c:6013
+#: g10/keygen.c:5845 g10/keygen.c:6044
 #, c-format
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:5826 g10/keygen.c:5828
+#: g10/keygen.c:5857 g10/keygen.c:5859
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr ""
 
-#: g10/keygen.c:5835 g10/keygen.c:5837
+#: g10/keygen.c:5866 g10/keygen.c:5868
 #, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr ""
 
-#: g10/keygen.c:5857 g10/keygen.c:6027
+#: g10/keygen.c:5888 g10/keygen.c:6058
 msgid "Really create? (y/N) "
 msgstr ""
 
@@ -5513,33 +5525,33 @@ msgstr ""
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1467
+#: g10/keyring.c:1477
 #, c-format
 msgid "caching keyring '%s'\n"
 msgstr ""
 
-#: g10/keyring.c:1541
+#: g10/keyring.c:1551
 #, c-format
 msgid "%lu keys cached so far (%lu signature)\n"
 msgid_plural "%lu keys cached so far (%lu signatures)\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/keyring.c:1557
+#: g10/keyring.c:1567
 #, c-format
 msgid "%lu key cached"
 msgid_plural "%lu keys cached"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/keyring.c:1559
+#: g10/keyring.c:1569
 #, c-format
 msgid " (%lu signature)\n"
 msgid_plural " (%lu signatures)\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/keyring.c:1636
+#: g10/keyring.c:1646
 #, c-format
 msgid "%s: keyring created\n"
 msgstr ""
@@ -5568,77 +5580,72 @@ msgstr ""
 msgid "honor the preferred keyserver URL set on the key"
 msgstr ""
 
-#: g10/keyserver.c:537
+#: g10/keyserver.c:360
 msgid "disabled"
 msgstr ""
 
-#: g10/keyserver.c:740
+#: g10/keyserver.c:563
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:846
+#: g10/keyserver.c:669
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr ""
 
-#: g10/keyserver.c:986 g10/keyserver.c:1096
+#: g10/keyserver.c:809 g10/keyserver.c:919
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1420 g10/keyserver.c:1453
+#: g10/keyserver.c:1217 g10/keyserver.c:1250
 #, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/keyserver.c:1427
+#: g10/keyserver.c:1224
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1316
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr ""
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1319
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr ""
 
-#: g10/keyserver.c:1722
-#, c-format
-msgid "requesting key %s from %s server %s\n"
-msgstr ""
-
-#: g10/keyserver.c:1726
+#: g10/keyserver.c:1481
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1841 g10/keyserver.c:2020
+#: g10/keyserver.c:1600 g10/keyserver.c:1793
 #, c-format
 msgid "no keyserver known\n"
 msgstr ""
 
-#: g10/keyserver.c:1856 g10/skclist.c:213 g10/skclist.c:241
+#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1860
+#: g10/keyserver.c:1619
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1901
+#: g10/keyserver.c:1662
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1917
+#: g10/keyserver.c:1680
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr ""
@@ -5663,245 +5670,245 @@ msgstr ""
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr ""
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:473
 #, c-format
 msgid "public key is %s\n"
 msgstr ""
 
-#: g10/mainproc.c:524
+#: g10/mainproc.c:525
 #, c-format
 msgid "encrypted with %s key, ID %s, created %s\n"
 msgstr ""
 
-#: g10/mainproc.c:528 g10/pkclist.c:231
+#: g10/mainproc.c:529 g10/pkclist.c:231
 #, c-format
 msgid "      \"%s\"\n"
 msgstr ""
 
-#: g10/mainproc.c:532
+#: g10/mainproc.c:533
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr ""
 
-#: g10/mainproc.c:552 g10/mainproc.c:935
+#: g10/mainproc.c:553 g10/mainproc.c:937
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:560
+#: g10/mainproc.c:561
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr ""
 
-#: g10/mainproc.c:562
+#: g10/mainproc.c:563
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr ""
 
-#: g10/mainproc.c:577 g10/mainproc.c:602
+#: g10/mainproc.c:578 g10/mainproc.c:603
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:613
+#: g10/mainproc.c:614
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr ""
 
-#: g10/mainproc.c:642 g10/mainproc.c:663
+#: g10/mainproc.c:643 g10/mainproc.c:664
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr ""
 
-#: g10/mainproc.c:649
+#: g10/mainproc.c:650
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 
-#: g10/mainproc.c:742 g10/mainproc.c:780
+#: g10/mainproc.c:744 g10/mainproc.c:782
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr ""
 
-#: g10/mainproc.c:753
+#: g10/mainproc.c:755
 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:756
+#: g10/mainproc.c:758
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:761
+#: g10/mainproc.c:763
 #, c-format
 msgid "decryption forced to fail!\n"
 msgstr ""
 
-#: g10/mainproc.c:773
+#: g10/mainproc.c:775
 #, c-format
 msgid "decryption okay\n"
 msgstr ""
 
-#: g10/mainproc.c:786
+#: g10/mainproc.c:788
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr ""
 
-#: g10/mainproc.c:804
+#: g10/mainproc.c:806
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:851
+#: g10/mainproc.c:853
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 
-#: g10/mainproc.c:858
+#: g10/mainproc.c:860
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr ""
 
-#: g10/mainproc.c:1135
+#: g10/mainproc.c:1137
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:1440 g10/mainproc.c:1483
+#: g10/mainproc.c:1442 g10/mainproc.c:1485
 #, c-format
 msgid "no signature found\n"
 msgstr ""
 
-#: g10/mainproc.c:1763
+#: g10/mainproc.c:1765
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr ""
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1767
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr ""
 
-#: g10/mainproc.c:1767
+#: g10/mainproc.c:1769
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr ""
 
-#: g10/mainproc.c:1789
+#: g10/mainproc.c:1791
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1905
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr ""
 
-#: g10/mainproc.c:1919 g10/mainproc.c:1926
+#: g10/mainproc.c:1921 g10/mainproc.c:1928
 #, c-format
 msgid "Signature made %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1920 g10/mainproc.c:1927 sm/verify.c:480
+#: g10/mainproc.c:1922 g10/mainproc.c:1929 sm/verify.c:480
 #, c-format
 msgid "               using %s key %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1933
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1937
+#: g10/mainproc.c:1939
 #, c-format
 msgid "               issuer \"%s\"\n"
 msgstr ""
 
-#: g10/mainproc.c:1992
+#: g10/mainproc.c:1994
 #, c-format
 msgid "Key available at: "
 msgstr ""
 
-#: g10/mainproc.c:2034
+#: g10/mainproc.c:2036
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2234
+#: g10/mainproc.c:2236
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:2272
+#: g10/mainproc.c:2274
 #, c-format
 msgid "                aka \"%s\""
 msgstr ""
 
-#: g10/mainproc.c:2347
+#: g10/mainproc.c:2349
 #, c-format
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr ""
 
-#: g10/mainproc.c:2363
+#: g10/mainproc.c:2365
 #, c-format
 msgid "Signature expired %s\n"
 msgstr ""
 
-#: g10/mainproc.c:2368
+#: g10/mainproc.c:2370
 #, c-format
 msgid "Signature expires %s\n"
 msgstr ""
 
-#: g10/mainproc.c:2379
+#: g10/mainproc.c:2381
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr ""
 
-#: g10/mainproc.c:2380
+#: g10/mainproc.c:2382
 msgid "binary"
 msgstr ""
 
-#: g10/mainproc.c:2381
+#: g10/mainproc.c:2383
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:2381 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2383 g10/trust.c:112 dirmngr/ocsp.c:793
 msgid "unknown"
 msgstr ""
 
-#: g10/mainproc.c:2383
+#: g10/mainproc.c:2385
 msgid ", key algorithm "
 msgstr ""
 
-#: g10/mainproc.c:2418
+#: g10/mainproc.c:2420
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2457
+#: g10/mainproc.c:2459
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:2553 g10/mainproc.c:2572 g10/mainproc.c:2696
+#: g10/mainproc.c:2555 g10/mainproc.c:2574 g10/mainproc.c:2698
 #, c-format
 msgid "not a detached signature\n"
 msgstr ""
 
-#: g10/mainproc.c:2606
+#: g10/mainproc.c:2608
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:2615
+#: g10/mainproc.c:2617
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr ""
 
-#: g10/mainproc.c:2700
+#: g10/mainproc.c:2702
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr ""
@@ -6079,45 +6086,49 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
 
-#: g10/passphrase.c:208
+#: g10/passphrase.c:201 sm/decrypt.c:669
+msgid "Please enter the passphrase for decryption."
+msgstr ""
+
+#: g10/passphrase.c:203
 msgid "Enter passphrase\n"
 msgstr ""
 
-#: g10/passphrase.c:219
+#: g10/passphrase.c:227
 #, c-format
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:460
+#: g10/passphrase.c:472
 #, c-format
 msgid " (main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:467
+#: g10/passphrase.c:479
 msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 msgstr ""
 
-#: g10/passphrase.c:471
+#: g10/passphrase.c:483
 msgid "Please enter the passphrase to import the OpenPGP secret key:"
 msgstr ""
 
-#: g10/passphrase.c:476
+#: g10/passphrase.c:488
 msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 msgstr ""
 
-#: g10/passphrase.c:479
+#: g10/passphrase.c:491
 msgid "Please enter the passphrase to export the OpenPGP secret key:"
 msgstr ""
 
-#: g10/passphrase.c:484
+#: g10/passphrase.c:496
 msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 msgstr ""
 
-#: g10/passphrase.c:487
+#: g10/passphrase.c:499
 msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgstr ""
 
-#: g10/passphrase.c:496
+#: g10/passphrase.c:508
 #, c-format
 msgid ""
 "%s\n"
@@ -6271,7 +6282,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:313 g10/revoke.c:803
+#: g10/pkclist.c:313 g10/revoke.c:804
 msgid "Your decision? "
 msgstr ""
 
@@ -6545,7 +6556,7 @@ msgstr ""
 msgid "can't open signed data fd=%d: %s\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:99 sm/decrypt.c:879
+#: g10/pubkey-enc.c:99 sm/decrypt.c:1329
 #, c-format
 msgid "key %s is not suitable for decryption in %s mode\n"
 msgstr ""
@@ -6591,7 +6602,7 @@ msgid "Note: key has been revoked"
 msgstr ""
 
 #: g10/revoke.c:100 g10/revoke.c:126 g10/revoke.c:172 g10/revoke.c:184
-#: g10/revoke.c:502
+#: g10/revoke.c:503
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr ""
@@ -6617,11 +6628,11 @@ msgstr ""
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr ""
 
-#: g10/revoke.c:334 g10/revoke.c:744
+#: g10/revoke.c:334 g10/revoke.c:745
 msgid "ASCII armored output forced.\n"
 msgstr ""
 
-#: g10/revoke.c:350 g10/revoke.c:481
+#: g10/revoke.c:350 g10/revoke.c:482
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr ""
@@ -6635,18 +6646,18 @@ msgstr ""
 msgid "no revocation keys found for \"%s\"\n"
 msgstr ""
 
-#: g10/revoke.c:567
+#: g10/revoke.c:568
 msgid "This is a revocation certificate for the OpenPGP key:"
 msgstr ""
 
-#: g10/revoke.c:583
+#: g10/revoke.c:584
 msgid ""
 "A revocation certificate is a kind of \"kill switch\" to publicly\n"
 "declare that a key shall not anymore be used.  It is not possible\n"
 "to retract such a revocation certificate once it has been published."
 msgstr ""
 
-#: g10/revoke.c:586
+#: g10/revoke.c:587
 msgid ""
 "Use it to revoke this key in case of a compromise or loss of\n"
 "the secret key.  However, if the secret key is still accessible,\n"
@@ -6655,19 +6666,19 @@ msgid ""
 "of the gpg command \"--generate-revocation\" in the GnuPG manual."
 msgstr ""
 
-#: g10/revoke.c:592
+#: g10/revoke.c:593
 msgid ""
 "To avoid an accidental use of this file, a colon has been inserted\n"
 "before the 5 dashes below.  Remove this colon with a text editor\n"
 "before importing and publishing this revocation certificate."
 msgstr ""
 
-#: g10/revoke.c:611
+#: g10/revoke.c:612
 #, c-format
 msgid "revocation certificate stored as '%s.rev'\n"
 msgstr ""
 
-#: g10/revoke.c:655
+#: g10/revoke.c:656
 #, c-format
 msgid "secret key \"%s\" not found\n"
 msgstr ""
@@ -6675,21 +6686,21 @@ msgstr ""
 #. TRANSLATORS: The %s prints a key specification which
 #. for example has been given at the command line.  Several lines
 #. lines with secret key infos are printed after this message.
-#: g10/revoke.c:680
+#: g10/revoke.c:681
 #, c-format
 msgid "'%s' matches multiple secret keys:\n"
 msgstr ""
 
-#: g10/revoke.c:705
+#: g10/revoke.c:706
 #, c-format
 msgid "error searching the keyring: %s\n"
 msgstr ""
 
-#: g10/revoke.c:728
+#: g10/revoke.c:729
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr ""
 
-#: g10/revoke.c:752
+#: g10/revoke.c:753
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -6700,33 +6711,33 @@ msgid ""
 "your machine might store the data and make it available to others!\n"
 msgstr ""
 
-#: g10/revoke.c:786
+#: g10/revoke.c:787
 msgid "Please select the reason for the revocation:\n"
 msgstr ""
 
-#: g10/revoke.c:796
+#: g10/revoke.c:797
 msgid "Cancel"
 msgstr ""
 
-#: g10/revoke.c:798
+#: g10/revoke.c:799
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr ""
 
-#: g10/revoke.c:839
+#: g10/revoke.c:843
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 
-#: g10/revoke.c:867
+#: g10/revoke.c:871
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr ""
 
-#: g10/revoke.c:869
+#: g10/revoke.c:873
 msgid "(No description given)\n"
 msgstr ""
 
-#: g10/revoke.c:874
+#: g10/revoke.c:878
 msgid "Is this okay? (y/N) "
 msgstr ""
 
@@ -6880,22 +6891,22 @@ msgstr ""
 msgid "%s.%s encryption will be used\n"
 msgstr ""
 
-#: g10/skclist.c:172 g10/skclist.c:253
+#: g10/skclist.c:173 g10/skclist.c:254
 #, c-format
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 
-#: g10/skclist.c:204
+#: g10/skclist.c:205
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr ""
 
-#: g10/skclist.c:223
+#: g10/skclist.c:224
 #, c-format
 msgid "skipped: secret key already present\n"
 msgstr ""
 
-#: g10/skclist.c:242
+#: g10/skclist.c:243
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 
@@ -7113,10 +7124,10 @@ msgstr ""
 msgid "TOFU DB error"
 msgstr ""
 
-#: g10/tofu.c:687 g10/tofu.c:2073 g10/tofu.c:2354 g10/tofu.c:2373
-#: g10/tofu.c:2386 g10/tofu.c:2398 g10/tofu.c:2413 g10/tofu.c:2425
-#: g10/tofu.c:3021 g10/tofu.c:3038 g10/tofu.c:3075 g10/tofu.c:3092
-#: g10/tofu.c:3404
+#: g10/tofu.c:687 g10/tofu.c:2077 g10/tofu.c:2358 g10/tofu.c:2377
+#: g10/tofu.c:2390 g10/tofu.c:2402 g10/tofu.c:2417 g10/tofu.c:2429
+#: g10/tofu.c:3025 g10/tofu.c:3042 g10/tofu.c:3079 g10/tofu.c:3096
+#: g10/tofu.c:3408
 #, c-format
 msgid "error reading TOFU database: %s\n"
 msgstr ""
@@ -7136,7 +7147,7 @@ msgstr ""
 msgid "error opening TOFU database '%s': %s\n"
 msgstr ""
 
-#: g10/tofu.c:1148 g10/tofu.c:3458 g10/tofu.c:3604
+#: g10/tofu.c:1148 g10/tofu.c:3462 g10/tofu.c:3608
 #, c-format
 msgid "error updating TOFU database: %s\n"
 msgstr ""
@@ -7174,108 +7185,108 @@ msgstr ""
 msgid "This key's user IDs:\n"
 msgstr ""
 
-#: g10/tofu.c:1634 g10/tofu.c:1799
+#: g10/tofu.c:1634 g10/tofu.c:1801
 #, c-format
 msgid "policy: %s"
 msgstr ""
 
-#: g10/tofu.c:1725
+#: g10/tofu.c:1727
 #, c-format
 msgid "error gathering signature stats: %s\n"
 msgstr ""
 
-#: g10/tofu.c:1729
+#: g10/tofu.c:1731
 #, c-format
 msgid "The email address \"%s\" is associated with %d key:\n"
 msgid_plural "The email address \"%s\" is associated with %d keys:\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1747
+#: g10/tofu.c:1749
 #, c-format
 msgid "Statistics for keys with the email address \"%s\":\n"
 msgstr ""
 
-#: g10/tofu.c:1797
+#: g10/tofu.c:1799
 msgid "this key"
 msgstr ""
 
-#: g10/tofu.c:1823
+#: g10/tofu.c:1825
 #, c-format
 msgid "Verified %d message."
 msgid_plural "Verified %d messages."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1827
+#: g10/tofu.c:1829
 #, c-format
 msgid "Encrypted %d message."
 msgid_plural "Encrypted %d messages."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1834
+#: g10/tofu.c:1836
 #, c-format
 msgid "Verified %d message in the future."
 msgid_plural "Verified %d messages in the future."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1838
+#: g10/tofu.c:1840
 #, c-format
 msgid "Encrypted %d message in the future."
 msgid_plural "Encrypted %d messages in the future."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1852
+#: g10/tofu.c:1854
 #, c-format
 msgid "Messages verified over the past %d day: %d."
 msgid_plural "Messages verified over the past %d days: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1858
+#: g10/tofu.c:1860
 #, c-format
 msgid "Messages encrypted over the past %d day: %d."
 msgid_plural "Messages encrypted over the past %d days: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1868
+#: g10/tofu.c:1870
 #, c-format
 msgid "Messages verified over the past %d month: %d."
 msgid_plural "Messages verified over the past %d months: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1874
+#: g10/tofu.c:1876
 #, c-format
 msgid "Messages encrypted over the past %d month: %d."
 msgid_plural "Messages encrypted over the past %d months: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1884
+#: g10/tofu.c:1886
 #, c-format
 msgid "Messages verified over the past %d year: %d."
 msgid_plural "Messages verified over the past %d years: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1890
+#: g10/tofu.c:1892
 #, c-format
 msgid "Messages encrypted over the past %d year: %d."
 msgid_plural "Messages encrypted over the past %d years: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1898
+#: g10/tofu.c:1900
 #, c-format
 msgid "Messages verified in the past: %d."
 msgstr ""
 
-#: g10/tofu.c:1902
+#: g10/tofu.c:1904
 #, c-format
 msgid "Messages encrypted in the past: %d."
 msgstr ""
@@ -7283,126 +7294,126 @@ msgstr ""
 #. TRANSLATORS: Please translate the text found in the source
 #. * file below.  We don't directly internationalize that text so
 #. * that we can tweak it without breaking translations.
-#: g10/tofu.c:1919
+#: g10/tofu.c:1921
 msgid "TOFU detected a binding conflict"
 msgstr ""
 
 #. TRANSLATORS: Two letters (normally the lower and upper case
 #. * version of the hotkey) for each of the five choices.  If
 #. * there is only one choice in your language, repeat it.
-#: g10/tofu.c:1961
+#: g10/tofu.c:1963
 msgid "gGaAuUrRbB"
 msgstr ""
 
-#: g10/tofu.c:1967
+#: g10/tofu.c:1969
 msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 
-#: g10/tofu.c:1975
+#: g10/tofu.c:1978
 msgid "Defaulting to unknown.\n"
 msgstr ""
 
-#: g10/tofu.c:2093 g10/tofu.c:2228
+#: g10/tofu.c:2097 g10/tofu.c:2232
 #, c-format
 msgid "TOFU db corruption detected.\n"
 msgstr ""
 
-#: g10/tofu.c:2829
+#: g10/tofu.c:2833
 #, c-format
 msgid "error changing TOFU policy: %s\n"
 msgstr ""
 
-#: g10/tofu.c:2880
+#: g10/tofu.c:2884
 #, c-format
 msgid "%lld~year"
 msgid_plural "%lld~years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2885
+#: g10/tofu.c:2889
 #, c-format
 msgid "%lld~month"
 msgid_plural "%lld~months"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2890
+#: g10/tofu.c:2894
 #, c-format
 msgid "%lld~week"
 msgid_plural "%lld~weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2895
+#: g10/tofu.c:2899
 #, c-format
 msgid "%lld~day"
 msgid_plural "%lld~days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2900
+#: g10/tofu.c:2904
 #, c-format
 msgid "%lld~hour"
 msgid_plural "%lld~hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2905
+#: g10/tofu.c:2909
 #, c-format
 msgid "%lld~minute"
 msgid_plural "%lld~minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2907
+#: g10/tofu.c:2911
 #, c-format
 msgid "%lld~second"
 msgid_plural "%lld~seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:3145
+#: g10/tofu.c:3149
 #, c-format
 msgid "%s: Verified 0~signatures and encrypted 0~messages."
 msgstr ""
 
-#: g10/tofu.c:3151
+#: g10/tofu.c:3155
 #, c-format
 msgid "%s: Verified 0 signatures."
 msgstr ""
 
-#: g10/tofu.c:3165
+#: g10/tofu.c:3169
 msgid "Encrypted 0 messages."
 msgstr ""
 
-#: g10/tofu.c:3181
+#: g10/tofu.c:3185
 #, c-format
 msgid "(policy: %s)"
 msgstr ""
 
-#: g10/tofu.c:3215
+#: g10/tofu.c:3219
 #, c-format
 msgid ""
 "Warning: we have yet to see a message signed using this key and user id!\n"
 msgstr ""
 
-#: g10/tofu.c:3218
+#: g10/tofu.c:3222
 #, c-format
 msgid ""
 "Warning: we've only seen one message signed using this key and user id!\n"
 msgstr ""
 
-#: g10/tofu.c:3222
+#: g10/tofu.c:3226
 #, c-format
 msgid "Warning: you have yet to encrypt a message to this key!\n"
 msgstr ""
 
-#: g10/tofu.c:3225
+#: g10/tofu.c:3229
 #, c-format
 msgid "Warning: you have only encrypted one message to this key!\n"
 msgstr ""
 
-#: g10/tofu.c:3254
+#: g10/tofu.c:3258
 #, c-format
 msgid ""
 "Warning: if you think you've seen more signatures by this key and user id, "
@@ -7419,13 +7430,13 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:3339 g10/tofu.c:3502 g10/tofu.c:3708 g10/tofu.c:3761
-#: g10/tofu.c:3902 g10/tofu.c:3979 g10/tofu.c:4017
+#: g10/tofu.c:3343 g10/tofu.c:3506 g10/tofu.c:3712 g10/tofu.c:3765
+#: g10/tofu.c:3906 g10/tofu.c:3983 g10/tofu.c:4021
 #, c-format
 msgid "error opening TOFU database: %s\n"
 msgstr ""
 
-#: g10/tofu.c:3535
+#: g10/tofu.c:3539
 #, c-format
 msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
 msgstr ""
@@ -7490,7 +7501,7 @@ msgstr ""
 msgid "no need for a trustdb check\n"
 msgstr ""
 
-#: g10/trustdb.c:601 g10/trustdb.c:2272
+#: g10/trustdb.c:601 g10/trustdb.c:2273
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr ""
@@ -7520,58 +7531,58 @@ msgstr ""
 msgid "checking the trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1993
+#: g10/trustdb.c:1994
 #, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/trustdb.c:1996
+#: g10/trustdb.c:1997
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/trustdb.c:2066
+#: g10/trustdb.c:2067
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr ""
 
-#: g10/trustdb.c:2080
+#: g10/trustdb.c:2081
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 
-#: g10/trustdb.c:2198
+#: g10/trustdb.c:2199
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2279
+#: g10/trustdb.c:2280
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
 
-#: g10/trust.c:125
+#: g10/trust.c:114
 msgid "undefined"
 msgstr ""
 
-#: g10/trust.c:126
+#: g10/trust.c:115
 msgid "never"
 msgstr ""
 
-#: g10/trust.c:127
+#: g10/trust.c:116
 msgid "marginal"
 msgstr ""
 
-#: g10/trust.c:128
+#: g10/trust.c:117
 msgid "full"
 msgstr ""
 
-#: g10/trust.c:129
+#: g10/trust.c:118
 msgid "ultimate"
 msgstr ""
 
@@ -7583,39 +7594,39 @@ msgstr ""
 #. It gets passed to atoi() so everything after the number is
 #. essentially a comment and need not be translated.  Either key and
 #. uid are both NULL, or neither are NULL.
-#: g10/trust.c:166
+#: g10/trust.c:155
 msgid "10 translator see trust.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trust.c:169
+#: g10/trust.c:158
 msgid "[ revoked]"
 msgstr ""
 
-#: g10/trust.c:171 g10/trust.c:177
+#: g10/trust.c:160 g10/trust.c:166
 msgid "[ expired]"
 msgstr ""
 
-#: g10/trust.c:176
+#: g10/trust.c:165
 msgid "[ unknown]"
 msgstr ""
 
-#: g10/trust.c:178
+#: g10/trust.c:167
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trust.c:179
+#: g10/trust.c:168
 msgid "[  never ]"
 msgstr ""
 
-#: g10/trust.c:180
+#: g10/trust.c:169
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trust.c:181
+#: g10/trust.c:170
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trust.c:182
+#: g10/trust.c:171
 msgid "[ultimate]"
 msgstr ""
 
@@ -7668,16 +7679,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:4937 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2386
+#: scd/app-piv.c:1770 scd/app-p15.c:5035 scd/app-nks.c:1530
+#: scd/app-openpgp.c:2387
 #, 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:4956 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2402
+#: scd/app-piv.c:1787 scd/app-p15.c:5054 scd/app-nks.c:1549
+#: scd/app-openpgp.c:2403
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
@@ -7706,10 +7717,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:2669
-#: scd/app-openpgp.c:2693 scd/app-openpgp.c:2871 scd/app-openpgp.c:2893
-#: scd/app-openpgp.c:3074 scd/app-openpgp.c:3361 scd/app-openpgp.c:3408
-#: scd/app-openpgp.c:3545 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2670
+#: scd/app-openpgp.c:2694 scd/app-openpgp.c:2872 scd/app-openpgp.c:2894
+#: scd/app-openpgp.c:3075 scd/app-openpgp.c:3362 scd/app-openpgp.c:3409
+#: scd/app-openpgp.c:3547 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -7729,92 +7740,92 @@ msgstr ""
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr ""
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3616
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3618
 #, c-format
 msgid "key already exists\n"
 msgstr ""
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3620
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3622
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3622
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3624
 #, c-format
 msgid "generating new key\n"
 msgstr ""
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3624
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3626
 #, c-format
 msgid "writing new key\n"
 msgstr ""
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4484 scd/app-openpgp.c:4767
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4486 scd/app-openpgp.c:4761
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr ""
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1615
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1616
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1622
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1623
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1732
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1733
 #, c-format
 msgid "response does not contain the EC public key\n"
 msgstr ""
 
-#: scd/app-piv.c:3279 scd/app-openpgp.c:4943
+#: scd/app-piv.c:3279 scd/app-openpgp.c:4937
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4951
+#: scd/app-piv.c:3294 scd/app-openpgp.c:4945
 #, c-format
 msgid "generating key failed\n"
 msgstr ""
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4957
+#: scd/app-piv.c:3300 scd/app-openpgp.c:4951
 #, 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:1842 scd/app-openpgp.c:4966
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1843 scd/app-openpgp.c:4960
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-p15.c:5035 scd/app-nks.c:2038
+#: scd/app-p15.c:5133 scd/app-nks.c:2038
 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:5038 scd/app-openpgp.c:2818
+#: scd/app-p15.c:5136 scd/app-openpgp.c:2819
 msgid "|A|Please enter the Admin PIN"
 msgstr ""
 
-#: scd/app-p15.c:5040 scd/app-nks.c:2028
+#: scd/app-p15.c:5138 scd/app-nks.c:2028
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr ""
 
-#: scd/app-p15.c:5043 scd/app-nks.c:2019
+#: scd/app-p15.c:5141 scd/app-nks.c:2019
 msgid "||Please enter the PIN for the standard keys."
 msgstr ""
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4321
+#: scd/app-nks.c:1468 scd/app-openpgp.c:4323
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1476 scd/app-openpgp.c:4333
+#: scd/app-nks.c:1476 scd/app-openpgp.c:4335
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
@@ -7852,27 +7863,27 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3442 scd/app-dinsig.c:534
+#: scd/app-nks.c:2221 scd/app-openpgp.c:3443 scd/app-dinsig.c:534
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:943
+#: scd/app-openpgp.c:944
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:956
+#: scd/app-openpgp.c:957
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1427 scd/app-openpgp.c:3389 scd/app-openpgp.c:5715
+#: scd/app-openpgp.c:1428 scd/app-openpgp.c:3390 scd/app-openpgp.c:5709
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1949
+#: scd/app-openpgp.c:1950
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr ""
@@ -7880,42 +7891,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:2373
+#: scd/app-openpgp.c:2374
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2621
+#: scd/app-openpgp.c:2622
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2628
+#: scd/app-openpgp.c:2629
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2641
+#: scd/app-openpgp.c:2642
 msgid "||Please unlock the card"
 msgstr ""
 
-#: scd/app-openpgp.c:2700 scd/app-openpgp.c:2900 scd/app-openpgp.c:3368
+#: scd/app-openpgp.c:2701 scd/app-openpgp.c:2901 scd/app-openpgp.c:3369
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2717 scd/app-openpgp.c:2760 scd/app-openpgp.c:2917
-#: scd/app-openpgp.c:5325
+#: scd/app-openpgp.c:2718 scd/app-openpgp.c:2761 scd/app-openpgp.c:2918
+#: scd/app-openpgp.c:5319
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2804 scd/app-openpgp.c:5724
+#: scd/app-openpgp.c:2805 scd/app-openpgp.c:5718
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2808
+#: scd/app-openpgp.c:2809
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -7923,20 +7934,20 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: scd/app-openpgp.c:2841
+#: scd/app-openpgp.c:2842
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3355
+#: scd/app-openpgp.c:3356
 msgid "||Please enter the PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3404
+#: scd/app-openpgp.c:3405
 msgid "||Please enter the Reset Code for the card"
 msgstr ""
 
-#: scd/app-openpgp.c:3414 scd/app-openpgp.c:3481
+#: scd/app-openpgp.c:3415 scd/app-openpgp.c:3484
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
@@ -7944,78 +7955,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:3437
+#: scd/app-openpgp.c:3438
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3439
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3439
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3541
+#: scd/app-openpgp.c:3543
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3542
+#: scd/app-openpgp.c:3544
 msgid "||Please enter the PIN and New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3600 scd/app-openpgp.c:5026
+#: scd/app-openpgp.c:3602 scd/app-openpgp.c:5020
 #, c-format
 msgid "error reading application data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3606 scd/app-openpgp.c:5033
+#: scd/app-openpgp.c:3608 scd/app-openpgp.c:5027
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4302 scd/app-openpgp.c:4657
+#: scd/app-openpgp.c:4304 scd/app-openpgp.c:4653
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4343 scd/app-openpgp.c:4351
+#: scd/app-openpgp.c:4345 scd/app-openpgp.c:4353
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4651
+#: scd/app-openpgp.c:4647
 #, c-format
 msgid "unsupported curve\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4991
+#: scd/app-openpgp.c:4985
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5041
+#: scd/app-openpgp.c:5035
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5240
+#: scd/app-openpgp.c:5234
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5298
+#: scd/app-openpgp.c:5292
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5729
+#: scd/app-openpgp.c:5723
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:6241 scd/app-openpgp.c:6252
+#: scd/app-openpgp.c:6250 scd/app-openpgp.c:6261
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr ""
@@ -8035,7 +8046,7 @@ msgstr ""
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:274 dirmngr/dirmngr.c:198
+#: scd/scdaemon.c:136 sm/gpgsm.c:274 dirmngr/dirmngr.c:199
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
@@ -8094,12 +8105,12 @@ msgstr ""
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2104
+#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2143
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2112
+#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2151
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -8109,11 +8120,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:199 sm/certchain.c:2172
+#: sm/certchain.c:199 sm/certchain.c:2174
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:200 sm/certchain.c:2172
+#: sm/certchain.c:200 sm/certchain.c:2174
 msgid "shell"
 msgstr ""
 
@@ -8146,224 +8157,224 @@ msgstr ""
 msgid "certificate policy not allowed"
 msgstr ""
 
-#: sm/certchain.c:595 sm/keydb.c:1891 sm/keydb.c:1980
+#: sm/certchain.c:596 sm/keydb.c:1913 sm/keydb.c:2002
 #, c-format
 msgid "failed to get the fingerprint\n"
 msgstr ""
 
-#: sm/certchain.c:624
+#: sm/certchain.c:625
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:644
+#: sm/certchain.c:645
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#: sm/certchain.c:724 dirmngr/ocsp.c:683
 #, c-format
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr ""
 
-#: sm/certchain.c:791
+#: sm/certchain.c:792
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr ""
 
-#: sm/certchain.c:816
+#: sm/certchain.c:817
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr ""
 
-#: sm/certchain.c:819
+#: sm/certchain.c:820
 #, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr ""
 
-#: sm/certchain.c:1046 sm/certchain.c:1561 sm/certchain.c:2200 sm/decrypt.c:643
-#: sm/encrypt.c:620 sm/import.c:414 sm/keydb.c:1898 sm/keydb.c:1987
-#: sm/sign.c:428 sm/verify.c:117
+#: sm/certchain.c:1047 sm/certchain.c:1562 sm/certchain.c:2202
+#: sm/decrypt.c:1084 sm/encrypt.c:621 sm/import.c:414 sm/keydb.c:1920
+#: sm/keydb.c:2009 sm/sign.c:428 sm/verify.c:117
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr ""
 
-#: sm/certchain.c:1232
+#: sm/certchain.c:1233
 msgid "certificate has been revoked"
 msgstr ""
 
-#: sm/certchain.c:1247
+#: sm/certchain.c:1248
 msgid "the status of the certificate is unknown"
 msgstr ""
 
-#: sm/certchain.c:1254
+#: sm/certchain.c:1255
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:1260
+#: sm/certchain.c:1261
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr ""
 
-#: sm/certchain.c:1289 sm/certchain.c:1357 dirmngr/validate.c:497
+#: sm/certchain.c:1290 sm/certchain.c:1358 dirmngr/validate.c:497
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:1304 sm/certchain.c:1389 dirmngr/validate.c:515
+#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:515
 #, c-format
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1305 sm/certchain.c:1390
+#: sm/certchain.c:1306 sm/certchain.c:1391
 msgid "root certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1307 sm/certchain.c:1392
 msgid "intermediate certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1319 dirmngr/validate.c:526
+#: sm/certchain.c:1320 dirmngr/validate.c:526
 #, c-format
 msgid "certificate has expired"
 msgstr ""
 
-#: sm/certchain.c:1320
+#: sm/certchain.c:1321
 msgid "root certificate has expired"
 msgstr ""
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1322
 msgid "intermediate certificate has expired"
 msgstr ""
 
-#: sm/certchain.c:1363
+#: sm/certchain.c:1364
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:1372
+#: sm/certchain.c:1373
 msgid "certificate with invalid validity"
 msgstr ""
 
-#: sm/certchain.c:1409
+#: sm/certchain.c:1410
 msgid "signature not created during lifetime of certificate"
 msgstr ""
 
-#: sm/certchain.c:1411
+#: sm/certchain.c:1412
 msgid "certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1413
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1416
+#: sm/certchain.c:1417
 #, c-format
 msgid "  (  signature created at "
 msgstr ""
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1418
 #, c-format
 msgid "  (certificate created at "
 msgstr ""
 
-#: sm/certchain.c:1420
+#: sm/certchain.c:1421
 #, c-format
 msgid "  (certificate valid from "
 msgstr ""
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1422
 #, c-format
 msgid "  (     issuer valid from "
 msgstr ""
 
-#: sm/certchain.c:1451 dirmngr/validate.c:577
+#: sm/certchain.c:1452 dirmngr/validate.c:577
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr ""
 
-#: sm/certchain.c:1460
+#: sm/certchain.c:1461
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:1473
+#: sm/certchain.c:1474
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1479
+#: sm/certchain.c:1480
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1538
+#: sm/certchain.c:1539
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 
-#: sm/certchain.c:1602
+#: sm/certchain.c:1603
 msgid "no issuer found in certificate"
 msgstr ""
 
-#: sm/certchain.c:1680
+#: sm/certchain.c:1681
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1749 dirmngr/validate.c:575
+#: sm/certchain.c:1750 dirmngr/validate.c:575
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:1765
+#: sm/certchain.c:1766
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr ""
 
-#: sm/certchain.c:1796 sm/import.c:175 dirmngr/validate.c:630
+#: sm/certchain.c:1797 sm/import.c:175 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1808 dirmngr/validate.c:642
+#: sm/certchain.c:1809 dirmngr/validate.c:642
 #, c-format
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1842 dirmngr/validate.c:668
+#: sm/certchain.c:1844 dirmngr/validate.c:668
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1874 dirmngr/validate.c:692
+#: sm/certchain.c:1876 dirmngr/validate.c:692
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1933 dirmngr/validate.c:717
+#: sm/certchain.c:1935 dirmngr/validate.c:717
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1975 sm/certchain.c:2275 dirmngr/validate.c:747
+#: sm/certchain.c:1977 sm/certchain.c:2278 dirmngr/validate.c:747
 #, c-format
 msgid "certificate is good\n"
 msgstr ""
 
-#: sm/certchain.c:1976
+#: sm/certchain.c:1978
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr ""
 
-#: sm/certchain.c:1977
+#: sm/certchain.c:1979
 #, c-format
 msgid "root certificate is good\n"
 msgstr ""
 
-#: sm/certchain.c:2159
+#: sm/certchain.c:2161
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:2168
+#: sm/certchain.c:2170
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -8374,18 +8385,18 @@ 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:1372 dirmngr/validate.c:903
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1411 dirmngr/validate.c:903
 #: dirmngr/validate.c:927
 #, c-format
 msgid "out of core\n"
 msgstr ""
 
-#: sm/certcheck.c:389 sm/verify.c:212
+#: sm/certcheck.c:388 sm/verify.c:212
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:793
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:794
 msgid "none"
 msgstr ""
 
@@ -8666,17 +8677,17 @@ msgstr ""
 msgid "resource problem: out of core\n"
 msgstr ""
 
-#: sm/decrypt.c:719
+#: sm/decrypt.c:1159
 #, c-format
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
 
-#: sm/decrypt.c:721
+#: sm/decrypt.c:1161
 #, c-format
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr ""
 
-#: sm/decrypt.c:868
+#: sm/decrypt.c:1318
 #, c-format
 msgid "encrypted to %s key %s\n"
 msgstr ""
@@ -8686,7 +8697,7 @@ msgstr ""
 msgid "certificate '%s' not found: %s\n"
 msgstr ""
 
-#: sm/delete.c:120 sm/keydb.c:1999 sm/keydb.c:2098
+#: sm/delete.c:120 sm/keydb.c:2021 sm/keydb.c:2120
 #, c-format
 msgid "error locking keybox: %s\n"
 msgstr ""
@@ -8706,7 +8717,7 @@ msgstr ""
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr ""
 
-#: sm/encrypt.c:606
+#: sm/encrypt.c:607
 #, c-format
 msgid "no valid recipients given\n"
 msgstr ""
@@ -8775,115 +8786,90 @@ msgstr ""
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr ""
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:352 dirmngr/dirmngr.c:265
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr ""
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:363
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:364
+#: sm/gpgsm.c:365
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:386
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:389
+#: sm/gpgsm.c:390
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: sm/gpgsm.c:393
+#: sm/gpgsm.c:394
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:396
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:398
+#: sm/gpgsm.c:399
 msgid "|NAME|use cipher algorithm NAME"
 msgstr ""
 
-#: sm/gpgsm.c:400
+#: sm/gpgsm.c:401
 msgid "|NAME|use message digest algorithm NAME"
 msgstr ""
 
-#: sm/gpgsm.c:410
+#: sm/gpgsm.c:411
 msgid "batch mode: never ask"
 msgstr ""
 
-#: sm/gpgsm.c:412
+#: sm/gpgsm.c:413
 msgid "assume yes on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:413
+#: sm/gpgsm.c:414
 msgid "assume no on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:430
+#: sm/gpgsm.c:431
 msgid "|FILE|write an audit log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:615
+#: sm/gpgsm.c:616
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr ""
 
-#: sm/gpgsm.c:618
+#: sm/gpgsm.c:619
 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:826
+#: sm/gpgsm.c:827
 #, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr ""
 
-#: sm/gpgsm.c:837
+#: sm/gpgsm.c:838
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:896 dirmngr/ldapserver.c:89
-#, c-format
-msgid "%s:%u: no hostname given\n"
-msgstr ""
-
-#: sm/gpgsm.c:915 dirmngr/ldapserver.c:108
-#, c-format
-msgid "%s:%u: password given without user\n"
-msgstr ""
-
-#: sm/gpgsm.c:946 dirmngr/ldapserver.c:139
-#, c-format
-msgid "%s:%u: ignoring unknown flag '%s'\n"
-msgstr ""
-
-#: sm/gpgsm.c:962 dirmngr/ldapserver.c:155
-#, c-format
-msgid "%s:%u: skipping this line\n"
-msgstr ""
-
-#: sm/gpgsm.c:1550
-#, c-format
-msgid "could not parse keyserver\n"
-msgstr ""
-
-#: sm/gpgsm.c:1858
+#: sm/gpgsm.c:1711
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1904
+#: sm/gpgsm.c:1757
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr ""
 
-#: sm/gpgsm.c:2273
+#: sm/gpgsm.c:2129
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
@@ -8903,52 +8889,52 @@ msgstr ""
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:471 sm/keydb.c:2018 sm/keydb.c:2111
+#: sm/import.c:472 sm/keydb.c:2040 sm/keydb.c:2133
 #, c-format
 msgid "error getting stored flags: %s\n"
 msgstr ""
 
-#: sm/import.c:530 sm/import.c:562
+#: sm/import.c:531 sm/import.c:563
 #, c-format
 msgid "error importing certificate: %s\n"
 msgstr ""
 
-#: sm/import.c:751 tools/gpg-connect-agent.c:1475
+#: sm/import.c:752 tools/gpg-connect-agent.c:1475
 #, c-format
 msgid "error reading input: %s\n"
 msgstr ""
 
-#: sm/keydb.c:503
+#: sm/keydb.c:508
 #, c-format
 msgid "no keyboxd running in this session\n"
 msgstr ""
 
-#: sm/keydb.c:595
+#: sm/keydb.c:600
 #, c-format
 msgid "error opening key DB: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1936
+#: sm/keydb.c:1958
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1948
+#: sm/keydb.c:1970
 #, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1956
+#: sm/keydb.c:1978
 #, c-format
 msgid "error storing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:2009
+#: sm/keydb.c:2031
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:2030 sm/keydb.c:2122
+#: sm/keydb.c:2052 sm/keydb.c:2144
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr ""
@@ -9117,57 +9103,57 @@ msgstr ""
 msgid "error loading certificate '%s': %s\n"
 msgstr ""
 
-#: dirmngr/certcache.c:819
+#: dirmngr/certcache.c:820
 #, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr ""
 
-#: dirmngr/certcache.c:821
+#: dirmngr/certcache.c:822
 #, c-format
 msgid "    runtime cached certificates: %u\n"
 msgstr ""
 
-#: dirmngr/certcache.c:823
+#: dirmngr/certcache.c:824
 #, c-format
 msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr ""
 
-#: dirmngr/certcache.c:851 dirmngr/dirmngr-client.c:392
+#: dirmngr/certcache.c:852 dirmngr/dirmngr-client.c:392
 #, c-format
 msgid "certificate already cached\n"
 msgstr ""
 
-#: dirmngr/certcache.c:853
+#: dirmngr/certcache.c:854
 #, c-format
 msgid "certificate cached\n"
 msgstr ""
 
-#: dirmngr/certcache.c:855 dirmngr/certcache.c:875 dirmngr/dirmngr-client.c:396
+#: dirmngr/certcache.c:856 dirmngr/certcache.c:876 dirmngr/dirmngr-client.c:396
 #, c-format
 msgid "error caching certificate: %s\n"
 msgstr ""
 
-#: dirmngr/certcache.c:938
+#: dirmngr/certcache.c:939
 #, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr ""
 
-#: dirmngr/certcache.c:1384 dirmngr/certcache.c:1393
+#: dirmngr/certcache.c:1385 dirmngr/certcache.c:1394
 #, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr ""
 
-#: dirmngr/certcache.c:1579 dirmngr/certcache.c:1588
+#: dirmngr/certcache.c:1580 dirmngr/certcache.c:1589
 #, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr ""
 
-#: dirmngr/certcache.c:1694 dirmngr/validate.c:483
+#: dirmngr/certcache.c:1695 dirmngr/validate.c:483
 #, c-format
 msgid "no issuer found in certificate\n"
 msgstr ""
 
-#: dirmngr/certcache.c:1704
+#: dirmngr/certcache.c:1705
 #, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr ""
@@ -9202,7 +9188,7 @@ msgstr ""
 msgid "not removing file '%s'\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2380
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2383
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr ""
@@ -9430,13 +9416,13 @@ msgid "error getting data from cache file: %s\n"
 msgstr ""
 
 #: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1672 dirmngr/crlcache.c:1697
-#: dirmngr/crlcache.c:1763
+#: dirmngr/crlcache.c:1766
 #, c-format
 msgid "got an invalid S-expression from libksba\n"
 msgstr ""
 
 #: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1679 dirmngr/crlcache.c:1705
-#: dirmngr/crlcache.c:1770 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1773 dirmngr/misc.c:176
 #, c-format
 msgid "converting S-expression failed: %s\n"
 msgstr ""
@@ -9451,197 +9437,197 @@ msgstr ""
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1797 dirmngr/ocsp.c:478
+#: dirmngr/crlcache.c:1800 dirmngr/ocsp.c:478
 #, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1871
+#: dirmngr/crlcache.c:1874
 #, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1886
+#: dirmngr/crlcache.c:1889
 #, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1893
+#: dirmngr/crlcache.c:1896
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1897
+#: dirmngr/crlcache.c:1900
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1917
+#: dirmngr/crlcache.c:1920
 #, c-format
 msgid "error getting CRL item: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1932
+#: dirmngr/crlcache.c:1935
 #, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1959
+#: dirmngr/crlcache.c:1962
 #, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1974
+#: dirmngr/crlcache.c:1977
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2020
+#: dirmngr/crlcache.c:2023
 #, c-format
 msgid "CRL signature verification failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2032
+#: dirmngr/crlcache.c:2035
 #, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2174
+#: dirmngr/crlcache.c:2177
 #, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2181
+#: dirmngr/crlcache.c:2184
 #, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2215
+#: dirmngr/crlcache.c:2218
 #, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2219
+#: dirmngr/crlcache.c:2222
 #, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2229
+#: dirmngr/crlcache.c:2232
 #, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2239
+#: dirmngr/crlcache.c:2242
 #, c-format
 msgid "crl_parse_insert failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2249
+#: dirmngr/crlcache.c:2252
 #, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2256
+#: dirmngr/crlcache.c:2259
 #, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2281
+#: dirmngr/crlcache.c:2284
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2285
+#: dirmngr/crlcache.c:2288
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2301
+#: dirmngr/crlcache.c:2304
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2311
+#: dirmngr/crlcache.c:2314
 #, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2365
 #, c-format
 msgid "creating cache file '%s'\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2394
+#: dirmngr/crlcache.c:2397
 #, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2408
+#: dirmngr/crlcache.c:2411
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
 "program start\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2448
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2468
+#: dirmngr/crlcache.c:2471
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2471
+#: dirmngr/crlcache.c:2474
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2474
+#: dirmngr/crlcache.c:2477
 msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2481
+#: dirmngr/crlcache.c:2484
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2499
+#: dirmngr/crlcache.c:2502
 #, c-format
 msgid " WARNING: invalid cache record length\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2506
+#: dirmngr/crlcache.c:2509
 #, c-format
 msgid "problem reading cache record: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2517
+#: dirmngr/crlcache.c:2520
 #, c-format
 msgid "problem reading cache key: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2548
+#: dirmngr/crlcache.c:2551
 #, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2551
+#: dirmngr/crlcache.c:2554
 msgid "End CRL dump\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2672
+#: dirmngr/crlcache.c:2675
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2683
+#: dirmngr/crlcache.c:2686
 #, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2743
+#: dirmngr/crlcache.c:2746
 #, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr ""
@@ -9662,7 +9648,7 @@ msgstr ""
 msgid "error retrieving '%s': %s\n"
 msgstr ""
 
-#: dirmngr/crlfetch.c:218 dirmngr/ldap-wrapper.c:881 dirmngr/misc.c:573
+#: dirmngr/crlfetch.c:218 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
 #, c-format
 msgid "error initializing reader object: %s\n"
 msgstr ""
@@ -9814,421 +9800,244 @@ msgstr ""
 msgid "looking up '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:175
+#: dirmngr/dirmngr.c:176
 msgid "list the contents of the CRL cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:176
+#: dirmngr/dirmngr.c:177
 msgid "|FILE|load CRL from FILE into cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr.c:178
 msgid "|URL|fetch a CRL from URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:178
+#: dirmngr/dirmngr.c:179
 msgid "shutdown the dirmngr"
 msgstr ""
 
-#: dirmngr/dirmngr.c:179
+#: dirmngr/dirmngr.c:180
 msgid "flush the cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:213
 msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:215
+#: dirmngr/dirmngr.c:216
 msgid "|N|do not return more than N items in one query"
 msgstr ""
 
-#: dirmngr/dirmngr.c:221
+#: dirmngr/dirmngr.c:222
 msgid "Network related options"
 msgstr ""
 
-#: dirmngr/dirmngr.c:223
+#: dirmngr/dirmngr.c:224
 msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:235
+#: dirmngr/dirmngr.c:236
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:238
+#: dirmngr/dirmngr.c:239
 msgid "|URL|use keyserver at URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:240
+#: dirmngr/dirmngr.c:241
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-#: dirmngr/dirmngr.c:242
+#: dirmngr/dirmngr.c:243
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:244
+#: dirmngr/dirmngr.c:245
 msgid "inhibit the use of HTTP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:246
+#: dirmngr/dirmngr.c:247
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:248
+#: dirmngr/dirmngr.c:249
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:250
+#: dirmngr/dirmngr.c:251
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: dirmngr/dirmngr.c:254
+#: dirmngr/dirmngr.c:255
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: dirmngr/dirmngr.c:256
+#: dirmngr/dirmngr.c:257
 msgid "inhibit the use of LDAP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:258
+#: dirmngr/dirmngr.c:259
 msgid "ignore LDAP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:260
+#: dirmngr/dirmngr.c:261
 msgid "|HOST|use HOST for LDAP queries"
 msgstr ""
 
-#: dirmngr/dirmngr.c:262
+#: dirmngr/dirmngr.c:263
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr ""
 
-#: dirmngr/dirmngr.c:264
+#: dirmngr/dirmngr.c:267
 msgid "|FILE|read LDAP server list from FILE"
 msgstr ""
 
-#: dirmngr/dirmngr.c:266
+#: dirmngr/dirmngr.c:269
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 
-#: dirmngr/dirmngr.c:269 dirmngr/dirmngr_ldap.c:104
+#: dirmngr/dirmngr.c:272
 msgid "|N|set LDAP timeout to N seconds"
 msgstr ""
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:275
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:274
+#: dirmngr/dirmngr.c:277
 msgid "allow sending OCSP requests"
 msgstr ""
 
-#: dirmngr/dirmngr.c:276
+#: dirmngr/dirmngr.c:279
 msgid "ignore certificate contained OCSP service URLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:278
+#: dirmngr/dirmngr.c:281
 msgid "|URL|use OCSP responder at URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:280
+#: dirmngr/dirmngr.c:283
 msgid "|FPR|OCSP response signed by FPR"
 msgstr ""
 
-#: dirmngr/dirmngr.c:288
+#: dirmngr/dirmngr.c:291
 msgid "force loading of outdated CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:299
+#: dirmngr/dirmngr.c:302
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
 "options)\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:441
+#: dirmngr/dirmngr.c:449
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr ""
 
-#: dirmngr/dirmngr.c:443
+#: dirmngr/dirmngr.c:451
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:523
+#: dirmngr/dirmngr.c:531
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:609 tools/gpgconf.c:667 tools/gpgconf.c:702
-#: tools/gpgconf.c:802
+#: dirmngr/dirmngr.c:617 tools/gpgconf.c:701 tools/gpgconf.c:736
+#: tools/gpgconf.c:836
 #, c-format
 msgid "usage: %s [options] "
 msgstr ""
 
-#: dirmngr/dirmngr.c:1260
+#: dirmngr/dirmngr.c:1299
 #, c-format
 msgid "colons are not allowed in the socket name\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1495 dirmngr/server.c:1824
+#: dirmngr/dirmngr.c:1534 dirmngr/server.c:1878
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1501 dirmngr/server.c:1830
+#: dirmngr/dirmngr.c:1540 dirmngr/server.c:1884
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1643
+#: dirmngr/dirmngr.c:1682
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1698 dirmngr/dirmngr.c:1782
+#: dirmngr/dirmngr.c:1737 dirmngr/dirmngr.c:1821
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1734 dirmngr/dirmngr.c:1760 tools/gpgconf-comp.c:3539
+#: dirmngr/dirmngr.c:1773 dirmngr/dirmngr.c:1799 tools/gpgconf-comp.c:3549
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1789
+#: dirmngr/dirmngr.c:1828
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1876
+#: dirmngr/dirmngr.c:1915
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1917
+#: dirmngr/dirmngr.c:1956
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1922
+#: dirmngr/dirmngr.c:1961
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1924
+#: dirmngr/dirmngr.c:1963
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1929
+#: dirmngr/dirmngr.c:1968
 #, c-format
 msgid "shutdown forced\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1937
+#: dirmngr/dirmngr.c:1976
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1944
+#: dirmngr/dirmngr.c:1983
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:105
-msgid "return all values in a record oriented format"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:108
-msgid "|NAME|ignore host part and connect through NAME"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:109
-msgid "force a TLS connection"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:110
-msgid "|NAME|connect to host NAME"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:111
-msgid "|N|connect to port N"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:112
-msgid "|NAME|use user NAME for authentication"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:113
-msgid "|PASS|use password PASS for authentication"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:115
-msgid "take password from $DIRMNGR_LDAP_PASS"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:116
-msgid "|STRING|query DN STRING"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:117
-msgid "|STRING|use STRING as filter expression"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:118
-msgid "|STRING|return the attribute STRING"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:179
-msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:182
-msgid ""
-"Syntax: dirmngr_ldap [options] [URL]\n"
-"Internal LDAP helper for Dirmngr\n"
-"Interface and options may change without notice\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:291
-#, c-format
-msgid "invalid port number %d\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:400
-#, c-format
-msgid "scanning result for attribute '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:407 dirmngr/dirmngr_ldap.c:490
-#: dirmngr/dirmngr_ldap.c:514 dirmngr/dirmngr_ldap.c:526
-#: dirmngr/dirmngr_ldap.c:722
-#, c-format
-msgid "error writing to stdout: %s\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:424
-#, c-format
-msgid "          available attribute '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:462
-#, c-format
-msgid "attribute '%s' not found\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:469
-#, c-format
-msgid "found attribute '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:581
-#, c-format
-msgid "processing url '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:588
-#, c-format
-msgid "          user '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:590
-#, c-format
-msgid "          pass '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:592
-#, c-format
-msgid "          host '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:593
-#, c-format
-msgid "          port %d\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:595
-#, c-format
-msgid "            DN '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:597
-#, c-format
-msgid "        filter '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:602 dirmngr/dirmngr_ldap.c:605
-#, c-format
-msgid "          attr '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:611
-#, c-format
-msgid "no host name in '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:616
-#, c-format
-msgid "no attribute given for query '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:622
-#, c-format
-msgid "WARNING: using first attribute only\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:637 dirmngr/dirmngr_ldap.c:678
-#, c-format
-msgid "LDAP init to '%s:%d' failed: %s\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:659
-#, c-format
-msgid "LDAP init to '%s' failed: %s\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:665
-#, c-format
-msgid "LDAP init to '%s' done\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:704
-#, c-format
-msgid "binding to '%s:%d' failed: %s\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:728
-#, c-format
-msgid "searching '%s' failed: %s\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:759
-#, c-format
-msgid "'%s' is not an LDAP URL\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:765
-#, c-format
-msgid "'%s' is an invalid LDAP URL\n"
-msgstr ""
-
-#: dirmngr/http.c:1989 dirmngr/ocsp.c:255
+#: dirmngr/http.c:1998 dirmngr/ocsp.c:255
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr ""
 
-#: dirmngr/http.c:3630 dirmngr/ocsp.c:229
+#: dirmngr/http.c:3652 dirmngr/ocsp.c:229
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr ""
 
-#: dirmngr/http.c:3636 dirmngr/ocsp.c:246
+#: dirmngr/http.c:3658 dirmngr/ocsp.c:246
 #, c-format
 msgid "too many redirections\n"
 msgstr ""
 
-#: dirmngr/http.c:3748
+#: dirmngr/http.c:3768
 #, c-format
 msgid "redirection changed to '%s'\n"
 msgstr ""
@@ -10268,31 +10077,51 @@ msgstr ""
 msgid "ldap wrapper %d stalled - killing\n"
 msgstr ""
 
-#: dirmngr/ldap.c:91
+#: dirmngr/ldap.c:92
 #, c-format
 msgid "invalid char 0x%02x in host name - not added\n"
 msgstr ""
 
-#: dirmngr/ldap.c:95
+#: dirmngr/ldap.c:96
 #, c-format
 msgid "adding '%s:%d' to the ldap server list\n"
 msgstr ""
 
-#: dirmngr/ldap.c:98 dirmngr/misc.c:512
+#: dirmngr/ldap.c:99 dirmngr/misc.c:512
 #, c-format
 msgid "malloc failed: %s\n"
 msgstr ""
 
-#: dirmngr/ldap.c:634
+#: dirmngr/ldap.c:221
+#, c-format
+msgid "'%s' is not an LDAP URL\n"
+msgstr ""
+
+#: dirmngr/ldap.c:227 dirmngr/ldap.c:233
 #, c-format
-msgid "start_cert_fetch: invalid pattern '%s'\n"
+msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
-#: dirmngr/ldap.c:846
+#: dirmngr/ldap.c:968
 #, c-format
 msgid "ldap_search hit the size limit of the server\n"
 msgstr ""
 
+#: dirmngr/ldapserver.c:119
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr ""
+
+#: dirmngr/ldapserver.c:181
+#, c-format
+msgid "%s:%u: ignoring unknown flag '%s'\n"
+msgstr ""
+
+#: dirmngr/ldapserver.c:203
+#, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr ""
+
 #: dirmngr/misc.c:172
 #, c-format
 msgid "invalid canonical S-expression found\n"
@@ -10383,86 +10212,86 @@ msgstr ""
 msgid "allocating list item failed: %s\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:537 dirmngr/ocsp.c:724
+#: dirmngr/ocsp.c:538 dirmngr/ocsp.c:725
 #, c-format
 msgid "error getting responder ID: %s\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:584
+#: dirmngr/ocsp.c:585
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:623 dirmngr/validate.c:648
+#: dirmngr/ocsp.c:624 dirmngr/validate.c:648
 #, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:633
+#: dirmngr/ocsp.c:634
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:640
+#: dirmngr/ocsp.c:641
 #, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:650
+#: dirmngr/ocsp.c:651
 #, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:689
+#: dirmngr/ocsp.c:690
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:696
 #, c-format
 msgid "no default OCSP signer defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:702
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:707
+#: dirmngr/ocsp.c:708
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:764
+#: dirmngr/ocsp.c:765
 #, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:789
+#: dirmngr/ocsp.c:790
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:790
+#: dirmngr/ocsp.c:791
 msgid "good"
 msgstr ""
 
-#: dirmngr/ocsp.c:796
+#: dirmngr/ocsp.c:797
 #, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:831
+#: dirmngr/ocsp.c:832
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:843
+#: dirmngr/ocsp.c:844
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:858
+#: dirmngr/ocsp.c:859
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr ""
@@ -10472,71 +10301,67 @@ msgstr ""
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:1158
-msgid "ldapserver missing"
-msgstr ""
-
-#: dirmngr/server.c:1224
+#: dirmngr/server.c:1277
 msgid "serialno missing in cert ID"
 msgstr ""
 
-#: dirmngr/server.c:1387 dirmngr/server.c:1473 dirmngr/server.c:1909
-#: dirmngr/server.c:1980 dirmngr/server.c:2556 dirmngr/server.c:2571
+#: dirmngr/server.c:1440 dirmngr/server.c:1526 dirmngr/server.c:1963
+#: dirmngr/server.c:2034 dirmngr/server.c:2662 dirmngr/server.c:2677
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:1516
+#: dirmngr/server.c:1569
 #, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:1528 dirmngr/server.c:1559 dirmngr/server.c:1718
+#: dirmngr/server.c:1581 dirmngr/server.c:1612 dirmngr/server.c:1772
 #, c-format
 msgid "error sending data: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:1666
+#: dirmngr/server.c:1720
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:1699
+#: dirmngr/server.c:1753
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:1726
+#: dirmngr/server.c:1780
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:2860
+#: dirmngr/server.c:2966
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:2871
+#: dirmngr/server.c:2977
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:2892
+#: dirmngr/server.c:2998
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:2900
+#: dirmngr/server.c:3006
 #, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:2933
+#: dirmngr/server.c:3039
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:2952
+#: dirmngr/server.c:3058
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr ""
@@ -10679,67 +10504,67 @@ msgstr ""
 msgid "error sending standard options: %s\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:649
+#: tools/gpgconf-comp.c:655
 msgid "OpenPGP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:653
+#: tools/gpgconf-comp.c:659
 msgid "S/MIME"
 msgstr ""
 
-#: tools/gpgconf-comp.c:657
+#: tools/gpgconf-comp.c:663
 msgid "Public Keys"
 msgstr ""
 
-#: tools/gpgconf-comp.c:661
+#: tools/gpgconf-comp.c:667
 msgid "Private Keys"
 msgstr ""
 
-#: tools/gpgconf-comp.c:665
+#: tools/gpgconf-comp.c:671
 msgid "Smartcards"
 msgstr ""
 
-#: tools/gpgconf-comp.c:669
+#: tools/gpgconf-comp.c:676
 msgid "TPM"
 msgstr ""
 
-#: tools/gpgconf-comp.c:673
+#: tools/gpgconf-comp.c:681
 msgid "Network"
 msgstr ""
 
-#: tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:685
 msgid "Passphrase Entry"
 msgstr ""
 
-#: tools/gpgconf-comp.c:941
+#: tools/gpgconf-comp.c:951
 msgid "Component not suitable for launching"
 msgstr ""
 
-#: tools/gpgconf-comp.c:947
+#: tools/gpgconf-comp.c:957
 #, c-format
 msgid "Configuration file of component %s is broken\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:950
+#: tools/gpgconf-comp.c:960
 #, c-format
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2816
+#: tools/gpgconf-comp.c:2826
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2946
+#: tools/gpgconf-comp.c:2956
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3543
+#: tools/gpgconf-comp.c:3553
 #, c-format
 msgid "error closing '%s'\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3545
+#: tools/gpgconf-comp.c:3555
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr ""
@@ -10818,15 +10643,15 @@ msgid ""
 "Manage configuration options for tools of the @GNUPG@ system\n"
 msgstr ""
 
-#: tools/gpgconf.c:669 tools/gpgconf.c:704
+#: tools/gpgconf.c:703 tools/gpgconf.c:738
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:678 tools/gpgconf.c:728 tools/gpgconf.c:778
+#: tools/gpgconf.c:712 tools/gpgconf.c:762 tools/gpgconf.c:812
 msgid "Component not found"
 msgstr ""
 
-#: tools/gpgconf.c:804
+#: tools/gpgconf.c:838
 msgid "No argument allowed"
 msgstr ""
 
@@ -10840,76 +10665,76 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
-#: tools/gpg-card.c:2390
+#: tools/gpg-card.c:2407
 #, c-format
 msgid "Note: key %s is already stored on the card!\n"
 msgstr ""
 
-#: tools/gpg-card.c:2393
+#: tools/gpg-card.c:2410
 #, c-format
 msgid "Note: Keys are already stored on the card!\n"
 msgstr ""
 
-#: tools/gpg-card.c:2396
+#: tools/gpg-card.c:2413
 #, c-format
 msgid "Replace existing key %s ? (y/N) "
 msgstr ""
 
-#: tools/gpg-card.c:2549 tools/gpg-card.c:2712 tools/gpg-card.c:2935
-#: tools/gpg-card.c:3044
+#: tools/gpg-card.c:2566 tools/gpg-card.c:2729 tools/gpg-card.c:2952
+#: tools/gpg-card.c:3061
 #, c-format
 msgid "%s card no. %s detected\n"
 msgstr ""
 
-#: tools/gpg-card.c:3396
+#: tools/gpg-card.c:3413
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3406 tools/gpg-card.c:3420
+#: tools/gpg-card.c:3423 tools/gpg-card.c:3437
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
 "         can only be reverted using a factory reset!\n"
 msgstr ""
 
-#: tools/gpg-card.c:3423
+#: tools/gpg-card.c:3440
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3669
+#: tools/gpg-card.c:3686
 msgid "authenticate to the card"
 msgstr ""
 
-#: tools/gpg-card.c:3671
+#: tools/gpg-card.c:3688
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3673
+#: tools/gpg-card.c:3690
 msgid "setup KDF for PIN authentication"
 msgstr ""
 
-#: tools/gpg-card.c:3675
+#: tools/gpg-card.c:3692
 msgid "change a private data object"
 msgstr ""
 
-#: tools/gpg-card.c:3676
+#: tools/gpg-card.c:3693
 msgid "read a certificate from a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3677
+#: tools/gpg-card.c:3694
 msgid "store a certificate to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3678
+#: tools/gpg-card.c:3695
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3679
+#: tools/gpg-card.c:3696
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3681
+#: tools/gpg-card.c:3698
 msgid "manage the command history"
 msgstr ""
diff --git a/po/hu.po b/po/hu.po
index 6c7039f..da18b2b 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: 2021-04-20 12:38+0200\n"
+"POT-Creation-Date: 2021-08-24 18:50+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:328
+#: agent/call-pinentry.c:338
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
@@ -26,48 +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:546
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_OK"
 msgstr ""
 
-#: agent/call-pinentry.c:547
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
-#: agent/call-pinentry.c:548
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|_Yes"
 msgstr ""
 
-#: agent/call-pinentry.c:549
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_No"
 msgstr ""
 
-#: agent/call-pinentry.c:550
+#: agent/call-pinentry.c:560
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:551
+#: agent/call-pinentry.c:561
 msgid "|pinentry-label|_Save in password manager"
 msgstr ""
 
-#: agent/call-pinentry.c:552
+#: agent/call-pinentry.c:562
 #, 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:554
+#: agent/call-pinentry.c:564
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:555
+#: agent/call-pinentry.c:565
 #, fuzzy
 #| msgid "invalid passphrase"
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "érvénytelen jelszó"
 
+#: agent/call-pinentry.c:566
+msgid "Caps Lock is on"
+msgstr ""
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:944
+#: agent/call-pinentry.c:1022
 msgid "Suggest"
 msgstr ""
 
@@ -78,13 +82,25 @@ 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:966
+#: agent/call-pinentry.c:1044
 msgid "pinentry.genpin.tooltip"
 msgstr ""
 
+#: agent/call-pinentry.c:1072
+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
+#, 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:998
+#: agent/call-pinentry.c:1198
 msgid "Quality:"
 msgstr ""
 
@@ -94,107 +110,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:1019
+#: agent/call-pinentry.c:1219
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:1263
+#: agent/call-pinentry.c:1477
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:1266
+#: agent/call-pinentry.c:1480
 #, 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:1303 agent/call-pinentry.c:1506
+#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1303 agent/call-pinentry.c:1506
-#: agent/protect-tool.c:728
+#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/protect-tool.c:729
 #, fuzzy
 msgid "Passphrase:"
 msgstr "rossz jelszó"
 
-#: agent/call-pinentry.c:1330 agent/call-pinentry.c:1580 agent/command.c:1799
-#: agent/command.c:1852 agent/command-ssh.c:3046 agent/genkey.c:398
+#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
+#: agent/command.c:1988 agent/command-ssh.c:3046 agent/genkey.c:442
 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:1351 agent/call-pinentry.c:1603
+#: agent/call-pinentry.c:1566 agent/call-pinentry.c:1830
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:1362 agent/call-pinentry.c:1614
+#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
 msgid "Repeat:"
 msgstr ""
 
-#: agent/call-pinentry.c:1372 agent/call-pinentry.c:1384
-#: agent/call-pinentry.c:1624 agent/call-pinentry.c:1636
+#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
+#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
 #, fuzzy
 msgid "PIN too long"
 msgstr "A sor túl hosszú!\n"
 
-#: agent/call-pinentry.c:1373 agent/call-pinentry.c:1625
+#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "A jelszó túl hosszú!\n"
 
-#: agent/call-pinentry.c:1381 agent/call-pinentry.c:1633
+#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Érvénytelen karakter a névben!\n"
 
-#: agent/call-pinentry.c:1386 agent/call-pinentry.c:1638
+#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:1405 agent/call-pinentry.c:1656
+#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
 #, fuzzy
 msgid "Bad PIN"
 msgstr "hibás MPI"
 
-#: agent/call-pinentry.c:1405 agent/call-pinentry.c:1656
+#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "rossz jelszó"
 
-#: agent/command.c:697
+#: agent/command.c:823
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:698
+#: agent/command.c:824
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1106 g10/card-util.c:708 g10/card-util.c:729
+#: agent/command.c:1235 g10/card-util.c:713 g10/card-util.c:734
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: agent/command.c:1634 agent/command.c:1791 agent/command-ssh.c:2974
-#: agent/genkey.c:333
+#: agent/command.c:1756 agent/command.c:1921 agent/command-ssh.c:2974
+#: agent/genkey.c:377
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "jelszóváltoztatás"
 
-#: agent/command.c:2567
+#: agent/command.c:2703
 #, 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:2697
+#: agent/command.c:2833
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -205,26 +221,26 @@ msgstr ""
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "%d%s védő algoritmus nem támogatott.\n"
 
-#: agent/command-ssh.c:872 common/dotlock.c:852 g10/card-util.c:953
-#: g10/export.c:1329 g10/gpg.c:1431 g10/keygen.c:5347 g10/keyring.c:1319
-#: g10/keyring.c:1632 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
+#: agent/command-ssh.c:872 common/dotlock.c:852 g10/card-util.c:963
+#: g10/export.c:1329 g10/gpg.c:1431 g10/keygen.c:5377 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
 #: g10/sign.c:1106 g10/sign.c:1443 g10/tdbio.c:753 tools/gpg-card.c:479
 #, fuzzy, c-format
 #| msgid "can't create `%s': %s\n"
 msgid "can't create '%s': %s\n"
 msgstr "Nem tudom létrehozni a(z) \"%s\" állományt: %s.\n"
 
-#: agent/command-ssh.c:884 common/helpfile.c:57 g10/card-util.c:910
+#: agent/command-ssh.c:884 common/helpfile.c:57 g10/card-util.c:920
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
 #: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:721 g10/gpg.c:1432
-#: g10/import.c:371 g10/import.c:558 g10/import.c:793 g10/keygen.c:4322
-#: g10/keyring.c:1658 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
+#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4326
+#: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
 #: g10/plaintext.c:610 g10/sign.c:1086 g10/sign.c:1311 g10/sign.c:1424
 #: g10/sign.c:1596 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2380
-#: sm/gpgsm.c:2410 sm/gpgsm.c:2448 sm/keylist.c:1737 sm/qualified.c:65
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2236
+#: sm/gpgsm.c:2266 sm/gpgsm.c:2304 sm/keylist.c:1775 sm/qualified.c:65
 #: dirmngr/certcache.c:396 dirmngr/certcache.c:476 dirmngr/certcache.c:478
-#: dirmngr/crlcache.c:2588 dirmngr/dirmngr.c:1720 tools/gpg-card.c:408
+#: dirmngr/crlcache.c:2591 dirmngr/dirmngr.c:1759 tools/gpg-card.c:408
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
@@ -333,39 +349,39 @@ msgstr "Nem ismételte meg helyesen a jelszót! Próbálja újra!"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:109 sm/certreqgen-ui.c:433
+#: 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:116
+#: agent/genkey.c:150
 #, fuzzy, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "�rok a \"%s\" állományba.\n"
 
-#: agent/genkey.c:154
+#: agent/genkey.c:191
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "�rja be a jelszót!\n"
 
-#: agent/genkey.c:184
+#: agent/genkey.c:227
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:186
+#: agent/genkey.c:229
 #, 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:198
+#: agent/genkey.c:241
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:215
+#: agent/genkey.c:258
 #, fuzzy, c-format
 #| msgid "Name must be at least 5 characters long\n"
 msgid "A passphrase should be at least %u character long."
@@ -373,7 +389,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:234
+#: agent/genkey.c:277
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -381,387 +397,386 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:260
+#: agent/genkey.c:304
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:275
+#: agent/genkey.c:319
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
-#: agent/genkey.c:296
+#: agent/genkey.c:340
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "Mégis használjuk ezt a kulcsot? "
 
-#: agent/genkey.c:464
+#: agent/genkey.c:508
 #, 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:590
+#: agent/genkey.c:637
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "jelszóváltoztatás"
 
-#: agent/gpg-agent.c:162 scd/scdaemon.c:115 dirmngr/dirmngr.c:182
+#: agent/gpg-agent.c:164 scd/scdaemon.c:115 dirmngr/dirmngr.c:183
 msgid "Options used for startup"
 msgstr ""
 
-#: agent/gpg-agent.c:164 scd/scdaemon.c:120 dirmngr/dirmngr.c:171
+#: agent/gpg-agent.c:166 scd/scdaemon.c:120 dirmngr/dirmngr.c:172
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:117 dirmngr/dirmngr.c:170
+#: agent/gpg-agent.c:167 scd/scdaemon.c:117 dirmngr/dirmngr.c:171
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:167 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:169 dirmngr/dirmngr.c:174
 #, fuzzy
 #| msgid "Key is superseded"
 msgid "run in supervised mode"
 msgstr "A kulcsot lecserélték."
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:121 dirmngr/dirmngr.c:184
+#: agent/gpg-agent.c:171 scd/scdaemon.c:121 dirmngr/dirmngr.c:185
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:170 scd/scdaemon.c:122 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:172 scd/scdaemon.c:122 dirmngr/dirmngr.c:186
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:171 scd/scdaemon.c:123 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:173 scd/scdaemon.c:123 dirmngr/dirmngr.c:187
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:179 g10/gpg.c:589 scd/scdaemon.c:125 sm/gpgsm.c:422
-#: dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:181 g10/gpg.c:589 scd/scdaemon.c:125 sm/gpgsm.c:423
+#: dirmngr/dirmngr.c:189
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|fájl|bővítő modul betöltése"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:574 scd/scdaemon.c:129 sm/gpgsm.c:265
-#: dirmngr/dirmngr.c:192
+#: agent/gpg-agent.c:185 g10/gpg.c:574 scd/scdaemon.c:129 sm/gpgsm.c:265
+#: dirmngr/dirmngr.c:193
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: agent/gpg-agent.c:185 g10/gpg.c:576 g10/gpgv.c:78 kbx/kbxutil.c:89
+#: agent/gpg-agent.c:187 g10/gpg.c:576 g10/gpgv.c:78 kbx/kbxutil.c:89
 #: scd/scdaemon.c:131 sm/gpgsm.c:267 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:194 dirmngr/dirmngr_ldap.c:102
-#: tools/gpg-connect-agent.c:85 tools/gpgconf.c:111
+#: dirmngr/dirmngr.c:195 tools/gpg-connect-agent.c:85 tools/gpgconf.c:111
 msgid "verbose"
 msgstr "bőbeszédű mód"
 
-#: agent/gpg-agent.c:186 g10/gpg.c:578 g10/gpgv.c:79 kbx/kbxutil.c:90
+#: agent/gpg-agent.c:188 g10/gpg.c:578 g10/gpgv.c:79 kbx/kbxutil.c:90
 #: scd/scdaemon.c:132 sm/gpgsm.c:269 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:195 dirmngr/dirmngr_ldap.c:103
+#: dirmngr/dirmngr.c:196
 msgid "be somewhat more quiet"
 msgstr "még szűkszavúbb mód"
 
-#: agent/gpg-agent.c:194 g10/gpg.c:593 sm/gpgsm.c:283 dirmngr/dirmngr.c:205
+#: agent/gpg-agent.c:196 g10/gpg.c:593 sm/gpgsm.c:283 dirmngr/dirmngr.c:206
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 scd/scdaemon.c:146 sm/gpgsm.c:290
-#: dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:599 scd/scdaemon.c:146 sm/gpgsm.c:290
+#: dirmngr/dirmngr.c:210
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: agent/gpg-agent.c:201
+#: agent/gpg-agent.c:203
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "bizalmi adatbázis frissítése"
 
-#: agent/gpg-agent.c:203
+#: agent/gpg-agent.c:205
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 #, 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:213
+#: agent/gpg-agent.c:215
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:215
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:216
+#: agent/gpg-agent.c:218
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
 msgstr "nem támogatott"
 
-#: agent/gpg-agent.c:218
+#: agent/gpg-agent.c:220
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:221
+#: agent/gpg-agent.c:223
 #, fuzzy
 #| msgid "not supported"
 msgid "enable putty support"
 msgstr "nem támogatott"
 
-#: agent/gpg-agent.c:233 g10/gpg.c:844 scd/scdaemon.c:176 sm/gpgsm.c:382
+#: agent/gpg-agent.c:235 g10/gpg.c:844 scd/scdaemon.c:176 sm/gpgsm.c:383
 msgid "Options controlling the security"
 msgstr ""
 
-#: agent/gpg-agent.c:236
+#: agent/gpg-agent.c:238
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:238
+#: agent/gpg-agent.c:240
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:242
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:244
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:246
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:248
 #, fuzzy
 msgid "disallow the use of an external password cache"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:250
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:253
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: agent/gpg-agent.c:256
+#: agent/gpg-agent.c:258
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:261
 msgid "do not allow bypassing the passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:261
+#: agent/gpg-agent.c:263
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:265
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:266
+#: agent/gpg-agent.c:268
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:268
+#: agent/gpg-agent.c:272
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|N. sorszámú jelszómód használata"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:274
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: agent/gpg-agent.c:273
+#: agent/gpg-agent.c:277
 msgid "Options controlling the PIN-Entry"
 msgstr ""
 
-#: agent/gpg-agent.c:275
+#: agent/gpg-agent.c:279
 #, fuzzy
 #| msgid "use the gpg-agent"
 msgid "never use the PIN-entry"
 msgstr "gpg ügynök használata"
 
-#: agent/gpg-agent.c:277
+#: agent/gpg-agent.c:281
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:283
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:282
+#: agent/gpg-agent.c:286
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:286
+#: agent/gpg-agent.c:290
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:294
 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:551 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: agent/gpg-agent.c:557 agent/preset-passphrase.c:99 agent/protect-tool.c:154
 #: g10/gpg.c:1132 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:612 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:438
-#: dirmngr/dirmngr_ldap.c:175 tools/gpg-connect-agent.c:220 tools/gpgconf.c:151
+#: sm/gpgsm.c:613 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:446
+#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:151
 #: 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:560
+#: agent/gpg-agent.c:566
 #, 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:562
+#: agent/gpg-agent.c:568
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:607 g10/gpg.c:1337 scd/scdaemon.c:384 sm/gpgsm.c:760
-#: dirmngr/dirmngr.c:522
+#: agent/gpg-agent.c:613 g10/gpg.c:1337 scd/scdaemon.c:384 sm/gpgsm.c:761
+#: dirmngr/dirmngr.c:530
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:972 g10/gpg.c:3910 g10/gpg.c:3934 sm/gpgsm.c:1769
-#: sm/gpgsm.c:1775
+#: agent/gpg-agent.c:986 g10/gpg.c:3907 g10/gpg.c:3931 sm/gpgsm.c:1622
+#: sm/gpgsm.c:1628
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "A kiválasztott kivonatoló algoritmus érvénytelen!\n"
 
-#: agent/gpg-agent.c:1196 agent/gpg-agent.c:2019 common/comopt.c:93
-#: g10/gpg.c:2591 scd/scdaemon.c:549 sm/gpgsm.c:1155 dirmngr/dirmngr.c:989
-#: dirmngr/dirmngr.c:1840
+#: agent/gpg-agent.c:1210 agent/gpg-agent.c:2035 common/comopt.c:93
+#: g10/gpg.c:2594 scd/scdaemon.c:549 sm/gpgsm.c:1028 dirmngr/dirmngr.c:1029
+#: dirmngr/dirmngr.c:1879
 #, 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:1335 g10/gpg.c:3861 scd/scdaemon.c:687 sm/gpgsm.c:1709
-#: dirmngr/dirmngr.c:1108 tools/gpg-connect-agent.c:1270 tools/gpgconf.c:634
+#: agent/gpg-agent.c:1349 g10/gpg.c:3858 scd/scdaemon.c:687 sm/gpgsm.c:1562
+#: dirmngr/dirmngr.c:1145 tools/gpg-connect-agent.c:1270 tools/gpgconf.c:668
 #, 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:2172 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1267
+#: agent/gpg-agent.c:2188 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1306
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s nem hozható létre: %s\n"
 
-#: agent/gpg-agent.c:2189 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1280
+#: agent/gpg-agent.c:2205 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1319
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2228
+#: agent/gpg-agent.c:2244
 #, 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:2239 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1312
+#: agent/gpg-agent.c:2255 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1351
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: agent/gpg-agent.c:2244 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1315
+#: agent/gpg-agent.c:2260 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1354
 #, 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:2255 agent/gpg-agent.c:2295 agent/gpg-agent.c:2304
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1324
+#: agent/gpg-agent.c:2271 agent/gpg-agent.c:2311 agent/gpg-agent.c:2320
+#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1363
 #, 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:2269 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1336
+#: agent/gpg-agent.c:2285 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1375
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "�rom a titkos kulcsot a %s állományba.\n"
 
-#: agent/gpg-agent.c:2289 agent/gpg-agent.c:2342 common/homedir.c:517
+#: agent/gpg-agent.c:2305 agent/gpg-agent.c:2358 common/homedir.c:537
 #: 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:2292 agent/gpg-agent.c:2347 common/homedir.c:520
+#: agent/gpg-agent.c:2308 agent/gpg-agent.c:2363 common/homedir.c:540
 #: g10/openfile.c:402
 #, fuzzy, c-format
 msgid "directory '%s' created\n"
 msgstr "%s: Könyvtárat létrehoztam.\n"
 
-#: agent/gpg-agent.c:2353
+#: agent/gpg-agent.c:2369
 #, 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:2357
+#: agent/gpg-agent.c:2373
 #, 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:2512 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2069
+#: agent/gpg-agent.c:2528 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2108
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: agent/gpg-agent.c:2719
+#: agent/gpg-agent.c:2735
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2724
+#: agent/gpg-agent.c:2740
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2799
+#: agent/gpg-agent.c:2815
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2804
+#: agent/gpg-agent.c:2820
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3026 scd/scdaemon.c:1374 dirmngr/dirmngr.c:2283
+#: agent/gpg-agent.c:3042 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2322
 #, fuzzy, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "Titkoskulcs-blokk frissítése sikertelen: %s\n"
 
-#: agent/gpg-agent.c:3114 scd/scdaemon.c:1439
+#: agent/gpg-agent.c:3130 scd/scdaemon.c:1441
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: kihagyva: %s\n"
 
-#: agent/gpg-agent.c:3252 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3271 common/simple-pwquery.c:247 g10/call-agent.c:260
 #: sm/call-agent.c:131 tools/gpg-connect-agent.c:2319 tools/card-call-scd.c:311
 #, fuzzy, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "GPG ügynök nem elérhető ebben a munkafolyamatban.\n"
 
-#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:70
+#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:66
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -783,7 +798,7 @@ msgid ""
 msgstr ""
 
 #: agent/protect-tool.c:107 g10/gpg.c:448 kbx/kbxutil.c:72 sm/gpgsm.c:215
-#: dirmngr/dirmngr.c:168 tools/gpgconf.c:81
+#: dirmngr/dirmngr.c:169 tools/gpgconf.c:81
 msgid ""
 "@Commands:\n"
 " "
@@ -813,40 +828,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:707
+#: agent/protect-tool.c:708 sm/import.c:775
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Kérem, adja meg a jelszót! Ezt egy titkos mondat. \n"
 
-#: agent/protect-tool.c:712
+#: agent/protect-tool.c:713 sm/export.c:727
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Kérem, adja meg a jelszót! Ezt egy titkos mondat. \n"
 
-#: agent/protect-tool.c:718
+#: agent/protect-tool.c:719
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:723
+#: agent/protect-tool.c:724
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Kérem, adja meg a jelszót! Ezt egy titkos mondat. \n"
 
-#: agent/protect-tool.c:734
+#: agent/protect-tool.c:735
 #, fuzzy, c-format
 msgid "cancelled\n"
 msgstr "Mégsem"
 
-#: agent/protect-tool.c:736
+#: agent/protect-tool.c:737
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: agent/trustlist.c:153 agent/trustlist.c:363 tools/gpgconf.c:424
+#: agent/trustlist.c:153 agent/trustlist.c:363 tools/gpgconf.c:458
 #, fuzzy, c-format
 msgid "error opening '%s': %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
@@ -1001,7 +1016,7 @@ msgstr "A létrehozott aláírás ellenőrzése sikertelen: %s.\n"
 msgid "secret key parts are not available\n"
 msgstr "Titkos kulcsrészek nem állnak rendelkezésre.\n"
 
-#: agent/cvt-openpgp.c:343 g10/card-util.c:1562
+#: agent/cvt-openpgp.c:343 g10/card-util.c:1575
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -1033,7 +1048,7 @@ msgid "error creating a stream for a pipe: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
 #: common/exechelp-posix.c:505 common/exechelp-posix.c:580
-#: common/exechelp-posix.c:866 dirmngr/dirmngr.c:1354
+#: common/exechelp-posix.c:866 dirmngr/dirmngr.c:1393
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
@@ -1106,7 +1121,7 @@ msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "Páncélozás nem sikerült: %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3082
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3099
 msgid "yes"
 msgstr "igen"
 
@@ -1161,7 +1176,7 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:115 g10/card-util.c:917 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:927 tools/no-libgcrypt.c:30
 #: tools/gpg-card.c:416
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
@@ -1233,7 +1248,7 @@ msgstr "Hiba a(z) \"%s\" kulcskarika létrehozásakor: %s\n"
 msgid "server '%s' is older than us (%s < %s)"
 msgstr ""
 
-#: common/asshelp.c:737 g10/call-dirmngr.c:408
+#: common/asshelp.c:737 g10/call-dirmngr.c:407
 #, fuzzy, c-format
 #| msgid "WARNING: %s overrides %s\n"
 msgid "WARNING: %s\n"
@@ -1328,7 +1343,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:4212
+#: scd/app-openpgp.c:4214
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
@@ -1412,12 +1427,12 @@ msgstr "Ez a kulcs lejárt!"
 msgid "Root certificate trustworthy"
 msgstr "rossz igazolás"
 
-#: common/audit.c:1112 sm/certchain.c:1242
+#: common/audit.c:1112 sm/certchain.c:1243
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "rossz igazolás"
 
-#: common/audit.c:1115 sm/certchain.c:1252
+#: common/audit.c:1115 sm/certchain.c:1253
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Kulcs található: "
@@ -1469,22 +1484,22 @@ msgstr "Ismeretlen módú"
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "Kihagytam a %02x kódú érvénytelen radix64 karaktert.\n"
 
-#: common/ttyio.c:433
+#: common/ttyio.c:447
 #, c-format
 msgid "Sorry, we are in batchmode - can't get input\n"
 msgstr ""
 
-#: common/ttyio.c:439
+#: common/ttyio.c:453
 #, c-format
 msgid "Sorry, no terminal at all requested - can't get input\n"
 msgstr ""
 
-#: common/ttyio.c:474 common/ttyio.c:484
+#: common/ttyio.c:488 common/ttyio.c:498
 #, c-format
 msgid "too many errors; giving up\n"
 msgstr ""
 
-#: common/ttyio.c:536
+#: common/ttyio.c:550
 #, c-format
 msgid "Control-D detected\n"
 msgstr ""
@@ -1538,8 +1553,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:1036 dirmngr/dirmngr.c:895
-#: dirmngr/dirmngr.c:904
+#: common/init.c:191 sm/gpgsm.c:909 dirmngr/dirmngr.c:935 dirmngr/dirmngr.c:944
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
@@ -1696,7 +1710,7 @@ msgid "Enter passphrase: "
 msgstr "�rja be a jelszót: "
 
 #: g10/call-agent.c:318 g10/encrypt.c:282 g10/encrypt.c:818 g10/sign.c:473
-#: sm/call-agent.c:180 sm/encrypt.c:701 sm/sign.c:436
+#: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
 #, fuzzy, c-format
 #| msgid "%s does not yet work with %s\n"
 msgid "%s is not compliant with %s mode\n"
@@ -1707,225 +1721,225 @@ msgstr "%s és %s egyelőre nem használható együtt!\n"
 msgid "error from TPM: %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: g10/call-agent.c:2123 g10/passphrase.c:225 g10/passphrase.c:258
-#: tools/card-call-scd.c:1751
+#: g10/call-agent.c:2135 g10/passphrase.c:233 g10/passphrase.c:266
+#: tools/card-call-scd.c:1755
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "Probléma az ügynökkel: ügynök válasza: 0x%lx\n"
 
-#: g10/call-dirmngr.c:179 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2316
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2316
 #, fuzzy, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "GPG ügynök nem elérhető ebben a munkafolyamatban.\n"
 
-#: g10/call-dirmngr.c:213
+#: g10/call-dirmngr.c:212
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "keyserver option \"honor-keyserver-url\" may not be used in Tor mode\n"
 msgstr "Lehet, hogy nem használhatja %s-t %s módban!\n"
 
-#: g10/call-dirmngr.c:386
+#: g10/call-dirmngr.c:385
 msgid "WKD uses a cached result"
 msgstr ""
 
-#: g10/call-dirmngr.c:389
+#: g10/call-dirmngr.c:388
 msgid "Tor is not running"
 msgstr ""
 
-#: g10/call-dirmngr.c:391
+#: g10/call-dirmngr.c:390
 #, fuzzy
 msgid "Tor is not properly configured"
 msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
 
-#: g10/call-dirmngr.c:393
+#: g10/call-dirmngr.c:392
 #, fuzzy
 msgid "DNS is not properly configured"
 msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
 
-#: g10/call-dirmngr.c:395
+#: g10/call-dirmngr.c:394
 msgid "unacceptable HTTP redirect from server"
 msgstr ""
 
-#: g10/call-dirmngr.c:397
+#: g10/call-dirmngr.c:396
 msgid "unacceptable HTTP redirect from server was cleaned up"
 msgstr ""
 
-#: g10/call-dirmngr.c:399
+#: g10/call-dirmngr.c:398
 #, fuzzy
 #| msgid "generate a revocation certificate"
 msgid "server uses an invalid certificate"
 msgstr "visszavonási igazolás készítése"
 
-#: g10/call-dirmngr.c:406 g10/gpg.c:4599
+#: g10/call-dirmngr.c:405 g10/gpg.c:4596
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "Páncél: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:369 g10/card-util.c:1924
-#: tools/gpg-card.c:3039
+#: g10/card-util.c:86 g10/card-util.c:374 g10/card-util.c:1937
+#: tools/gpg-card.c:3056
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "titkos kulcs nem áll rendelkezésre"
 
-#: g10/card-util.c:91 g10/card-util.c:1930
+#: g10/card-util.c:91 g10/card-util.c:1943
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:97 g10/card-util.c:2309 g10/delkey.c:164 g10/keyedit.c:1428
-#: g10/keygen.c:4791 g10/revoke.c:214 g10/revoke.c:638
+#: g10/card-util.c:97 g10/card-util.c:2322 g10/delkey.c:164 g10/keyedit.c:1428
+#: g10/keygen.c:4795 g10/revoke.c:214 g10/revoke.c:639
 #, fuzzy, c-format
 msgid "can't do this in batch mode\n"
 msgstr "Nem tudom ezt megcsinálni kötegelt módban!\n"
 
-#: g10/card-util.c:105 tools/gpg-card.c:2943
+#: g10/card-util.c:105 tools/gpg-card.c:2960
 #, fuzzy, c-format
 msgid "This command is only available for version 2 cards\n"
 msgstr "Ez a parancs %s módban nem engedélyezett.\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3398 tools/gpg-card.c:2948
+#: g10/card-util.c:107 scd/app-openpgp.c:3399 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"
 
-#: g10/card-util.c:140 g10/card-util.c:1448 g10/card-util.c:1710
-#: g10/card-util.c:1802 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1991 g10/keygen.c:2165 g10/keygen.c:2385 g10/keygen.c:2685
+#: g10/card-util.c:140 g10/card-util.c:1458 g10/card-util.c:1723
+#: g10/card-util.c:1815 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/keygen.c:1992 g10/keygen.c:2166 g10/keygen.c:2386 g10/keygen.c:2686
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
 #: tools/gpg-card.c:510
 msgid "Your selection? "
 msgstr "Mit választ? "
 
-#: g10/card-util.c:262 g10/card-util.c:313 tools/gpg-card.c:596
+#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:596
 #: tools/gpg-card.c:636
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:558 tools/gpg-card.c:903
+#: g10/card-util.c:563 tools/gpg-card.c:905
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:559 tools/gpg-card.c:904
+#: g10/card-util.c:564 tools/gpg-card.c:906
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:586 tools/gpg-card.c:931
+#: g10/card-util.c:591 tools/gpg-card.c:933
 #, fuzzy
 msgid "not forced"
 msgstr "nem feldolgozott"
 
-#: g10/card-util.c:586 tools/gpg-card.c:931
+#: g10/card-util.c:591 tools/gpg-card.c:933
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:768 tools/gpg-card.c:1468
+#: g10/card-util.c:773 tools/gpg-card.c:1484
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:770 tools/gpg-card.c:1470
+#: g10/card-util.c:775 tools/gpg-card.c:1486
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:772 tools/gpg-card.c:1472
+#: g10/card-util.c:777 tools/gpg-card.c:1488
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:789 tools/gpg-card.c:1505
+#: g10/card-util.c:795 tools/gpg-card.c:1521
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:791 tools/gpg-card.c:1506
+#: g10/card-util.c:797 tools/gpg-card.c:1522
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:809 tools/gpg-card.c:1523
+#: g10/card-util.c:816 tools/gpg-card.c:1539
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:830 tools/gpg-card.c:1561
+#: g10/card-util.c:840 tools/gpg-card.c:1577
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "Nincs hozzá tartozó nyilvános kulcs: %s\n"
 
-#: g10/card-util.c:926 g10/decrypt-data.c:495 g10/import.c:406 g10/import.c:756
-#: g10/import.c:815 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1666
-#: tools/gpgconf.c:437 tools/gpgconf.c:483 tools/gpg-card.c:426
+#: g10/card-util.c:936 g10/decrypt-data.c:495 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:1705
+#: tools/gpgconf.c:471 tools/gpgconf.c:517 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:959 g10/decrypt-data.c:498 g10/export.c:2496
+#: g10/card-util.c:969 g10/decrypt-data.c:498 g10/export.c:2496
 #: dirmngr/crlcache.c:925 tools/gpg-card.c:486 tools/gpg-card.c:493
 #, fuzzy, c-format
 msgid "error writing '%s': %s\n"
 msgstr "Hiba a \"%s\" kulcskarika írásakor: %s\n"
 
-#: g10/card-util.c:986 tools/gpg-card.c:1650
+#: g10/card-util.c:996 tools/gpg-card.c:1666
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:1024 tools/gpg-card.c:1945
+#: g10/card-util.c:1034 tools/gpg-card.c:1962
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:1109 tools/gpg-card.c:1699
+#: g10/card-util.c:1119 tools/gpg-card.c:1715
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferenciák frissítése"
 
-#: g10/card-util.c:1117 tools/gpg-card.c:1710
+#: g10/card-util.c:1127 tools/gpg-card.c:1726
 #, fuzzy, c-format
 msgid "Error: invalid length of preference string.\n"
 msgstr "Érvénytelen karakter a preferenciák között!\n"
 
-#: g10/card-util.c:1126 tools/gpg-card.c:1719
+#: g10/card-util.c:1136 tools/gpg-card.c:1735
 #, fuzzy, c-format
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Érvénytelen karakter a preferenciák között!\n"
 
-#: g10/card-util.c:1148 tools/gpg-card.c:1753
+#: g10/card-util.c:1158 tools/gpg-card.c:1769
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1162 tools/gpg-card.c:1770
+#: g10/card-util.c:1172 tools/gpg-card.c:1786
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
 
-#: g10/card-util.c:1185 tools/gpg-card.c:1835
+#: g10/card-util.c:1195 tools/gpg-card.c:1852
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "megmutatja az ujjlenyomatot"
 
-#: g10/card-util.c:1209 tools/gpg-card.c:1861
+#: g10/card-util.c:1219 tools/gpg-card.c:1878
 #, fuzzy, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
 
-#: g10/card-util.c:1259
+#: g10/card-util.c:1269
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Kulcsgenerálás sikertelen: %s\n"
 
-#: g10/card-util.c:1260
+#: g10/card-util.c:1270
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "Nem találtam érvényes OpenPGP adatot.\n"
 
-#: g10/card-util.c:1273 g10/keygen.c:4811 g10/keygen.c:5972
+#: g10/card-util.c:1283 g10/keygen.c:4815 g10/keygen.c:6003
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "Hiba a(z) \"%s\" titkoskulcs-karika írásakor: %s.\n"
 
-#: g10/card-util.c:1358
+#: g10/card-util.c:1368
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1375 tools/gpg-card.c:3328
+#: g10/card-util.c:1385 tools/gpg-card.c:3345
 msgid ""
 "Note: There is no guarantee that the card supports the requested\n"
 "      key type or size.  If the key generation does not succeed,\n"
@@ -1933,102 +1947,102 @@ msgid ""
 "      key types and sizes are supported.\n"
 msgstr ""
 
-#: g10/card-util.c:1396 g10/keygen.c:2570 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1406 g10/keygen.c:2571 sm/certreqgen-ui.c:180
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Milyen kulcsméretet szeretne? (1024) "
 
-#: g10/card-util.c:1406 g10/keygen.c:2493 g10/keygen.c:2525
+#: g10/card-util.c:1416 g10/keygen.c:2494 g10/keygen.c:2526
 #: sm/certreqgen-ui.c:195
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "Felkerekítve %u bitre.\n"
 
-#: g10/card-util.c:1414 g10/keygen.c:2578 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1424 g10/keygen.c:2579 sm/certreqgen-ui.c:185
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/card-util.c:1433
+#: g10/card-util.c:1443
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1435
+#: g10/card-util.c:1445
 #, fuzzy
 msgid "Signature key\n"
 msgstr "Az aláírás lejárt: %s.\n"
 
-#: g10/card-util.c:1437
+#: g10/card-util.c:1447
 #, fuzzy
 msgid "Encryption key\n"
 msgstr "   (%d) RSA (csak titkosítás)\n"
 
-#: g10/card-util.c:1439
+#: g10/card-util.c:1449
 msgid "Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1441 g10/keygen.c:2112 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1451 g10/keygen.c:2113 sm/certreqgen-ui.c:158
 msgid "Please select what kind of key you want:\n"
 msgstr "Kérem, adja meg, milyen kulcsot kíván:\n"
 
-#: g10/card-util.c:1442 sm/certreqgen-ui.c:159
+#: g10/card-util.c:1452 sm/certreqgen-ui.c:159
 #, fuzzy, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA (csak aláírás)\n"
 
-#: g10/card-util.c:1443
+#: g10/card-util.c:1453
 #, fuzzy, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) DSA és ElGamal (alapértelmezés)\n"
 
-#: g10/card-util.c:1455 g10/card-util.c:1722 g10/card-util.c:1822
-#: g10/keyedit.c:900 g10/keygen.c:2017 g10/keygen.c:2045 g10/keygen.c:2172
-#: g10/keygen.c:2425 g10/keygen.c:2713 g10/revoke.c:836
+#: g10/card-util.c:1468 g10/card-util.c:1735 g10/card-util.c:1835
+#: g10/keyedit.c:900 g10/keygen.c:2018 g10/keygen.c:2046 g10/keygen.c:2173
+#: g10/keygen.c:2426 g10/keygen.c:2714 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Érvénytelen választás.\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1541
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 
-#: g10/card-util.c:1533
+#: g10/card-util.c:1546
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1582
 #, fuzzy, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "Hiba %s-ra/-re küldéskor: %s\n"
 
-#: g10/card-util.c:1585 g10/card-util.c:2106 g10/card-util.c:2162
+#: g10/card-util.c:1598 g10/card-util.c:2119 g10/card-util.c:2175
 #, fuzzy, c-format
 msgid "error getting card info: %s\n"
 msgstr "Hiba a(z) \"%s\" titkoskulcs-karika írásakor: %s.\n"
 
-#: g10/card-util.c:1591 g10/card-util.c:1936 g10/card-util.c:2112
-#: g10/card-util.c:2171 tools/gpg-card.c:3057 tools/gpg-card.c:3296
-#: tools/gpg-card.c:3354
+#: g10/card-util.c:1604 g10/card-util.c:1949 g10/card-util.c:2125
+#: g10/card-util.c:2184 tools/gpg-card.c:3074 tools/gpg-card.c:3313
+#: tools/gpg-card.c:3371
 #, fuzzy, c-format
 #| msgid "This command is not allowed while in %s mode.\n"
 msgid "This command is not supported by this card\n"
 msgstr "Ez a parancs %s módban nem engedélyezett.\n"
 
-#: g10/card-util.c:1637 tools/gpg-card.c:2426
+#: g10/card-util.c:1650 tools/gpg-card.c:2443
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1651
+#: g10/card-util.c:1664
 #, fuzzy, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "Kihagytam: titkos kulcs már jelen van.\n"
 
-#: g10/card-util.c:1654 tools/gpg-card.c:2398
+#: g10/card-util.c:1667 tools/gpg-card.c:2415
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1666 tools/gpg-card.c:2457
+#: g10/card-util.c:1679 tools/gpg-card.c:2474
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2036,172 +2050,172 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1701
+#: g10/card-util.c:1714
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Kérem, adja meg, milyen kulcsot kíván:\n"
 
-#: g10/card-util.c:1703 g10/card-util.c:1793
+#: g10/card-util.c:1716 g10/card-util.c:1806
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Az aláírás lejárt: %s.\n"
 
-#: g10/card-util.c:1704 g10/card-util.c:1795
+#: g10/card-util.c:1717 g10/card-util.c:1808
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (csak titkosítás)\n"
 
-#: g10/card-util.c:1705 g10/card-util.c:1797
+#: g10/card-util.c:1718 g10/card-util.c:1810
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1790
+#: g10/card-util.c:1803
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Kérem, válassza ki a visszavonás okát:\n"
 
-#: g10/card-util.c:1836
+#: g10/card-util.c:1849
 #, fuzzy, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "Frissítés sikertelen: %s.\n"
 
-#: g10/card-util.c:1941 tools/gpg-card.c:3065
+#: g10/card-util.c:1954 tools/gpg-card.c:3082
 #, fuzzy, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr "Kihagytam: titkos kulcs már jelen van.\n"
 
-#: g10/card-util.c:1944 tools/gpg-card.c:3068 tools/gpg-card.c:3409
+#: g10/card-util.c:1957 tools/gpg-card.c:3085 tools/gpg-card.c:3426
 #, fuzzy
 msgid "Continue? (y/N) "
 msgstr "Valóban aláírja? "
 
-#: g10/card-util.c:1949 tools/gpg-card.c:3079
+#: g10/card-util.c:1962 tools/gpg-card.c:3096
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2142
+#: g10/card-util.c:2155
 #, fuzzy, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: g10/card-util.c:2188
+#: g10/card-util.c:2201
 #, fuzzy, c-format
 msgid "error for setup UIF: %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: g10/card-util.c:2212 g10/keyedit.c:1263 tools/gpg-card.c:3649
+#: g10/card-util.c:2225 g10/keyedit.c:1263 tools/gpg-card.c:3666
 msgid "quit this menu"
 msgstr "kilépés ebből a menüből"
 
-#: g10/card-util.c:2214
+#: g10/card-util.c:2227
 #, fuzzy
 msgid "show admin commands"
 msgstr "Egymásnak ellentmondó parancsok!\n"
 
-#: g10/card-util.c:2215 g10/keyedit.c:1266 tools/gpg-card.c:3652
+#: g10/card-util.c:2228 g10/keyedit.c:1266 tools/gpg-card.c:3669
 msgid "show this help"
 msgstr "megmutatja ezt a súgót"
 
-#: g10/card-util.c:2217 tools/gpg-card.c:3654
+#: g10/card-util.c:2230 tools/gpg-card.c:3671
 #, fuzzy
 msgid "list all available data"
 msgstr "Kulcs található: "
 
-#: g10/card-util.c:2220 tools/gpg-card.c:3656
+#: g10/card-util.c:2233 tools/gpg-card.c:3673
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:2221 tools/gpg-card.c:3657
+#: g10/card-util.c:2234 tools/gpg-card.c:3674
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:2222 tools/gpg-card.c:3658
+#: g10/card-util.c:2235 tools/gpg-card.c:3675
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:2223 tools/gpg-card.c:3659
+#: g10/card-util.c:2236 tools/gpg-card.c:3676
 #, fuzzy
 msgid "change the login name"
 msgstr "lejárat megváltoztatása"
 
-#: g10/card-util.c:2224 tools/gpg-card.c:3660
+#: g10/card-util.c:2237 tools/gpg-card.c:3677
 #, fuzzy
 msgid "change the language preferences"
 msgstr "kulcstulajdonos megbízhatóságának beállítása"
 
-#: g10/card-util.c:2225 tools/gpg-card.c:3661
+#: g10/card-util.c:2238 tools/gpg-card.c:3678
 msgid "change card holder's salutation"
 msgstr ""
 
-#: g10/card-util.c:2227 tools/gpg-card.c:3663
+#: g10/card-util.c:2240 tools/gpg-card.c:3680
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "megmutatja az ujjlenyomatot"
 
-#: g10/card-util.c:2228 tools/gpg-card.c:3664
+#: g10/card-util.c:2241 tools/gpg-card.c:3681
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:2229 tools/gpg-card.c:3665
+#: g10/card-util.c:2242 tools/gpg-card.c:3682
 #, fuzzy
 msgid "generate new keys"
 msgstr "új kulcspár létrehozása"
 
-#: g10/card-util.c:2230 tools/gpg-card.c:3666
+#: g10/card-util.c:2243 tools/gpg-card.c:3683
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:2231 tools/gpg-card.c:3667
+#: g10/card-util.c:2244 tools/gpg-card.c:3684
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:2232 tools/gpg-card.c:3668
+#: g10/card-util.c:2245 tools/gpg-card.c:3685
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:2233 tools/gpg-card.c:3672
+#: g10/card-util.c:2246 tools/gpg-card.c:3689
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2235
+#: g10/card-util.c:2248
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr "|NÉV|NÉV használata alapértelmezett címzettként"
 
-#: g10/card-util.c:2236
+#: g10/card-util.c:2249
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "kulcstulajdonos megbízhatóságának beállítása"
 
-#: g10/card-util.c:2237 tools/gpg-card.c:3674
+#: g10/card-util.c:2250 tools/gpg-card.c:3691
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the User Interaction Flag"
 msgstr "kulcstulajdonos megbízhatóságának beállítása"
 
-#: g10/card-util.c:2361 tools/gpg-card.c:3924
+#: g10/card-util.c:2374 tools/gpg-card.c:3941
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2402
+#: g10/card-util.c:2415
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "Egymásnak ellentmondó parancsok!\n"
 
-#: g10/card-util.c:2433
+#: g10/card-util.c:2446
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "Egymásnak ellentmondó parancsok!\n"
 
-#: g10/card-util.c:2435
+#: g10/card-util.c:2448
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "�rom a titkos kulcsot a %s állományba.\n"
 
-#: g10/card-util.c:2546 g10/keyedit.c:2275 tools/gpg-card.c:3814
-#: tools/gpg-card.c:4072
+#: g10/card-util.c:2559 g10/keyedit.c:2275 tools/gpg-card.c:3831
+#: tools/gpg-card.c:4089
 #, c-format
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Érvénytelen parancs! (Próbálja a súgót: \"help\".)\n"
@@ -2211,23 +2225,23 @@ msgstr "Érvénytelen parancs! (Próbálja a súgót: \"help\".)\n"
 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:5293 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5292 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:1934 g10/export.c:2342 g10/export.c:2463
-#: g10/getkey.c:1907 g10/gpg.c:5238 g10/keyedit.c:1450 g10/keyedit.c:2382
-#: g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:703 g10/keyserver.c:1240
-#: g10/revoke.c:230 g10/tofu.c:2168
+#: g10/getkey.c:2032 g10/gpg.c:5237 g10/keyedit.c:1450 g10/keyedit.c:2382
+#: g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:703 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:2002 g10/getkey.c:1915 g10/getkey.c:4330
-#: g10/gpg.c:5247 g10/keyedit.c:2354 g10/keyserver.c:1258 g10/revoke.c:236
-#: g10/revoke.c:665 g10/tofu.c:2176
+#: g10/delkey.c:90 g10/export.c:2002 g10/getkey.c:2040 g10/getkey.c:4455
+#: g10/gpg.c:5246 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"
 msgstr "Hiba a kulcsblokk olvasásakor: %s\n"
@@ -2354,15 +2368,15 @@ msgstr ""
 msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:555 g10/encrypt.c:808 g10/decrypt-data.c:261 g10/gpg.c:4083
-#: g10/gpg.c:4130 sm/decrypt.c:742 sm/encrypt.c:691 sm/gpgsm.c:1793
+#: g10/encrypt.c:555 g10/encrypt.c:808 g10/decrypt-data.c:261 g10/gpg.c:4080
+#: g10/gpg.c:4127 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1646
 #, 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:564 g10/gpg.c:4095 g10/gpg.c:4142 g10/sig-check.c:155
-#: g10/sign.c:452 sm/gpgsm.c:1803 sm/gpgsm.c:1813 sm/sign.c:596 sm/verify.c:510
+#: g10/encrypt.c:564 g10/gpg.c:4092 g10/gpg.c:4139 g10/sig-check.c:155
+#: g10/sign.c:452 sm/gpgsm.c:1656 sm/gpgsm.c:1666 sm/sign.c:596 sm/verify.c:510
 #, fuzzy, c-format
 msgid "digest algorithm '%s' may not be used in %s mode\n"
 msgstr ""
@@ -2380,7 +2394,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "A %s (%d) rejtjelező használata sérti a címzett preferenciáit!\n"
 
-#: g10/encrypt.c:838 sm/encrypt.c:766
+#: g10/encrypt.c:838 sm/encrypt.c:767
 #, fuzzy, c-format
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "FIGYELEM: \"%s\" elavult opció!\n"
@@ -2409,7 +2423,7 @@ msgstr "%s/%s titkosítva \"%s\" számára\n"
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "Lehet, hogy nem használhatja %s-t %s módban!\n"
 
-#: g10/decrypt-data.c:239 g10/mainproc.c:380 sm/decrypt.c:494
+#: g10/decrypt-data.c:239 g10/mainproc.c:380 sm/decrypt.c:892
 #, fuzzy, c-format
 #| msgid "%s encrypted data\n"
 msgid "%s.%s encrypted data\n"
@@ -2420,7 +2434,7 @@ msgstr "%s titkosított adat.\n"
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "Ismeretlen algoritmussal (%d) titkosítva.\n"
 
-#: g10/decrypt-data.c:361 g10/decrypt-data.c:414 sm/decrypt.c:508
+#: g10/decrypt-data.c:361 g10/decrypt-data.c:414 sm/decrypt.c:906
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2467,7 +2481,7 @@ msgstr ""
 msgid " - skipped"
 msgstr "%s: kihagyva: %s\n"
 
-#: g10/export.c:1333 g10/import.c:2124 g10/openfile.c:202 g10/openfile.c:296
+#: g10/export.c:1333 g10/import.c:2132 g10/openfile.c:202 g10/openfile.c:296
 #: g10/sign.c:1110 g10/sign.c:1447
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
@@ -2506,66 +2520,66 @@ msgstr "Hiba \"%s\" létrehozásakor: %s\n"
 msgid "[User ID not found]"
 msgstr "[ismeretlen kulcs]"
 
-#: g10/getkey.c:1199
+#: g10/getkey.c:1324
 #, fuzzy, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "Hiba \"%s\" létrehozásakor: %s\n"
 
-#: g10/getkey.c:1205
+#: g10/getkey.c:1330
 #, fuzzy, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "Hiba \"%s\" létrehozásakor: %s\n"
 
-#: g10/getkey.c:1207
+#: g10/getkey.c:1332
 #, fuzzy
 msgid "No fingerprint"
 msgstr "megmutatja az ujjlenyomatot"
 
-#: g10/getkey.c:1449
+#: g10/getkey.c:1574
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1884 g10/revoke.c:657 g10/revoke.c:718
+#: g10/getkey.c:2009 g10/revoke.c:658 g10/revoke.c:719
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "\"%s\" titkos kulcs nem található: %s\n"
 
-#: g10/getkey.c:1887 g10/pkclist.c:1012
+#: g10/getkey.c:2012 g10/pkclist.c:1012
 #, fuzzy, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "Érvénytelen import opciók!\n"
 
-#: g10/getkey.c:1965
+#: g10/getkey.c:2090
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "|NÉV|NÉV használata alapértelmezett titkos kulcsként"
 
-#: g10/getkey.c:1973
+#: g10/getkey.c:2098
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "|NÉV|NÉV használata alapértelmezett titkos kulcsként"
 
-#: g10/getkey.c:1980
+#: g10/getkey.c:2105
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr ""
 
-#: g10/getkey.c:2837
+#: g10/getkey.c:2962
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "%08lX érvénytelen kulcsot érvényesítettük az\n"
 "--allow-non-selfsigned-uid opcióval.\n"
 
-#: g10/getkey.c:3703
+#: g10/getkey.c:3828
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "A %08lX másodlagos kulcsot használjuk a %08lX elsődleges helyett.\n"
 
-#: g10/getkey.c:4259 g10/gpg.c:2167
+#: g10/getkey.c:4384 g10/gpg.c:2168
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "Érvénytelen import opciók!\n"
@@ -2770,7 +2784,7 @@ msgstr ""
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:651 kbx/kbxutil.c:91 sm/gpgsm.c:424 tools/gpgconf.c:113
+#: g10/gpg.c:651 kbx/kbxutil.c:91 sm/gpgsm.c:425 tools/gpgconf.c:113
 msgid "do not make any changes"
 msgstr "ne csináljon semmi változtatást"
 
@@ -2804,7 +2818,7 @@ msgstr "kanonikus szöveges mód használata"
 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:762 sm/gpgsm.c:357
+#: g10/gpg.c:762 sm/gpgsm.c:358
 msgid "Options controlling key import and export"
 msgstr ""
 
@@ -2823,11 +2837,11 @@ msgstr "kulcsok importálása kulcsszerverről"
 msgid "include the public key in signatures"
 msgstr "kulcsaláírások ellenőrzése"
 
-#: g10/gpg.c:776 sm/gpgsm.c:360
+#: g10/gpg.c:776 sm/gpgsm.c:361
 msgid "disable all access to the dirmngr"
 msgstr ""
 
-#: g10/gpg.c:788 sm/gpgsm.c:367
+#: g10/gpg.c:788 sm/gpgsm.c:368
 msgid "Options controlling key listings"
 msgstr ""
 
@@ -2847,15 +2861,15 @@ msgstr "|NÉV|titkosítás NÉV részére"
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "felh. azonosító aláíráshoz és visszafejtéshez"
 
-#: g10/gpg.c:876 sm/gpgsm.c:408
+#: g10/gpg.c:876 sm/gpgsm.c:409
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:895 sm/gpgsm.c:420 dirmngr/dirmngr.c:286
+#: g10/gpg.c:895 sm/gpgsm.c:421 dirmngr/dirmngr.c:289
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:966 sm/gpgsm.c:453
+#: g10/gpg.c:966 sm/gpgsm.c:454
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2914,7 +2928,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:1168 sm/gpgsm.c:636
+#: g10/gpg.c:1168 sm/gpgsm.c:637
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2938,12 +2952,12 @@ msgstr "Kivonatoló (hash): "
 msgid "Compression: "
 msgstr "Tömörítő (compression): "
 
-#: g10/gpg.c:1274 sm/gpgsm.c:710
+#: g10/gpg.c:1274 sm/gpgsm.c:711
 #, fuzzy, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "Használat: gpg [opciók] "
 
-#: g10/gpg.c:1467 sm/gpgsm.c:803
+#: g10/gpg.c:1467 sm/gpgsm.c:804
 #, c-format
 msgid "conflicting commands\n"
 msgstr "Egymásnak ellentmondó parancsok!\n"
@@ -2953,536 +2967,536 @@ msgstr "Egymásnak ellentmondó parancsok!\n"
 msgid "no = sign found in group definition '%s'\n"
 msgstr "Nem találtam = jelet a \"%s\" csoportdefinícióban!\n"
 
-#: g10/gpg.c:1683
+#: g10/gpg.c:1684
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "FIGYELEM: Nem biztonságos tulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1686
+#: g10/gpg.c:1687
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "FIGYELEM: Nem biztonságos tulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1689
+#: g10/gpg.c:1690
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "FIGYELEM: Nem biztonságos tulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1695
+#: g10/gpg.c:1696
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "FIGYELEM: nem biztonságos engedélyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1698
+#: g10/gpg.c:1699
 #, 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:1701
+#: g10/gpg.c:1702
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "FIGYELEM: nem biztonságos engedélyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1708
 #, 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:1710
+#: g10/gpg.c:1711
 #, 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:1713
+#: g10/gpg.c:1714
 #, 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:1719
+#: g10/gpg.c:1720
 #, 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:1722
+#: g10/gpg.c:1723
 #, 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:1725
+#: g10/gpg.c:1726
 #, 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:1941
+#: g10/gpg.c:1942
 #, fuzzy, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "\"%s\": ismeretlen konfigurációs elem.\n"
 
-#: g10/gpg.c:2037
+#: g10/gpg.c:2038
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:2039
+#: g10/gpg.c:2040
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "Nincs megfelelő aláírás a titkoskulcs-karikán.\n"
 
-#: g10/gpg.c:2041
+#: g10/gpg.c:2042
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2043
+#: g10/gpg.c:2044
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nincs megfelelő aláírás a titkoskulcs-karikán.\n"
 
-#: g10/gpg.c:2045
+#: g10/gpg.c:2046
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2049
+#: g10/gpg.c:2050
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2051
+#: g10/gpg.c:2052
 #, 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:2053
+#: g10/gpg.c:2054
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:2055
+#: g10/gpg.c:2056
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:2057
+#: g10/gpg.c:2058
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:2059
+#: g10/gpg.c:2060
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mutatja a kilistázott kulcs kulcskarikáját is"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2062
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nincs megfelelő aláírás a titkoskulcs-karikán.\n"
 
-#: g10/gpg.c:2178
+#: g10/gpg.c:2179
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "Ismeretlen alapértelmezett címzett: \"%s\"\n"
 
-#: g10/gpg.c:2180
+#: g10/gpg.c:2181
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2975 g10/gpg.c:3828 g10/gpg.c:3840
+#: g10/gpg.c:2978 g10/gpg.c:3825 g10/gpg.c:3837
 #, 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:3151 g10/gpg.c:3163
+#: g10/gpg.c:3154 g10/gpg.c:3166
 #, fuzzy, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "%s nem érvényes karakterkiosztás!\n"
 
-#: g10/gpg.c:3185
+#: g10/gpg.c:3188
 #, 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:3217 sm/gpgsm.c:1270
+#: g10/gpg.c:3220 sm/gpgsm.c:1143
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "Érvénytelen kivonatoló algoritmus: %s\n"
 
-#: g10/gpg.c:3223 sm/gpgsm.c:1276
+#: g10/gpg.c:3226 sm/gpgsm.c:1149
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "Érvénytelen import opciók!\n"
 
-#: g10/gpg.c:3280
+#: g10/gpg.c:3283
 #, fuzzy, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "%s nem érvényes karakterkiosztás!\n"
 
-#: g10/gpg.c:3302 g10/gpg.c:3511 g10/keyedit.c:5319
+#: g10/gpg.c:3305 g10/gpg.c:3514 g10/keyedit.c:5322
 #, fuzzy, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "Értelmezhetetlen a kulcsszerver URI-ja!\n"
 
-#: g10/gpg.c:3320
+#: g10/gpg.c:3323
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: Érvénytelen export opciók!\n"
 
-#: g10/gpg.c:3323
+#: g10/gpg.c:3326
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "Érvénytelen export opciók!\n"
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3333
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: Érvénytelen import opciók!\n"
 
-#: g10/gpg.c:3333
+#: g10/gpg.c:3336
 #, c-format
 msgid "invalid import options\n"
 msgstr "Érvénytelen import opciók!\n"
 
-#: g10/gpg.c:3339 g10/gpg.c:3354
+#: g10/gpg.c:3342 g10/gpg.c:3357
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "Érvénytelen import opciók!\n"
 
-#: g10/gpg.c:3345
+#: g10/gpg.c:3348
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: Érvénytelen export opciók!\n"
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3351
 #, c-format
 msgid "invalid export options\n"
 msgstr "Érvénytelen export opciók!\n"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3363
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: Érvénytelen import opciók!\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3366
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "Érvénytelen import opciók!\n"
 
-#: g10/gpg.c:3371
+#: g10/gpg.c:3374
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3373
+#: g10/gpg.c:3376
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3378
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s nem érvényes karakterkiosztás!\n"
 
-#: g10/gpg.c:3377
+#: g10/gpg.c:3380
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3384
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3386
 #, 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:3385
+#: g10/gpg.c:3388
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s nem érvényes karakterkiosztás!\n"
 
-#: g10/gpg.c:3387
+#: g10/gpg.c:3390
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3389
+#: g10/gpg.c:3392
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s nem érvényes karakterkiosztás!\n"
 
-#: g10/gpg.c:3396
+#: g10/gpg.c:3399
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: Érvénytelen export opciók!\n"
 
-#: g10/gpg.c:3399
+#: g10/gpg.c:3402
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "Érvénytelen export opciók!\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3409
 #, 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:3613
+#: g10/gpg.c:3616
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: Érvénytelen export opciók!\n"
 
-#: g10/gpg.c:3616
+#: g10/gpg.c:3619
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3625
+#: g10/gpg.c:3628
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "Érvénytelen import opciók!\n"
 
-#: g10/gpg.c:3807 sm/gpgsm.c:1675
+#: g10/gpg.c:3804 sm/gpgsm.c:1528
 #, 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:3821
+#: g10/gpg.c:3818
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "FIGYELEM: %s hatástalanítja %s-t!\n"
 
-#: g10/gpg.c:3830
+#: g10/gpg.c:3827
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s és %s nem használható együtt!\n"
 
-#: g10/gpg.c:3833
+#: g10/gpg.c:3830
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s értelmetlen %s mellett!\n"
 
-#: g10/gpg.c:3848 sm/gpgsm.c:1696 dirmngr/dirmngr.c:1123
+#: g10/gpg.c:3845 sm/gpgsm.c:1549 dirmngr/dirmngr.c:1160
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3869
+#: g10/gpg.c:3866
 #, 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:3897 g10/gpg.c:3928 sm/gpgsm.c:1763
+#: g10/gpg.c:3894 g10/gpg.c:3925 sm/gpgsm.c:1616
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "A kiválasztott rejtjelező algoritmus érvénytelen!\n"
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3901
 #, 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:3916
+#: g10/gpg.c:3913
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "A kiválasztott rejtjelező algoritmus érvénytelen!\n"
 
-#: g10/gpg.c:3922
+#: g10/gpg.c:3919
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Az igazoláshoz kiválasztott kivonatoló algoritmus érvénytelen!\n"
 
-#: g10/gpg.c:3937
+#: g10/gpg.c:3934
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed nagyobb kell legyen 0-nál!\n"
 
-#: g10/gpg.c:3939
+#: g10/gpg.c:3936
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed nagyobb kell legyen 1-nél!\n"
 
-#: g10/gpg.c:3941
+#: g10/gpg.c:3938
 #, 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:3943
+#: g10/gpg.c:3940
 #, 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:3945
+#: g10/gpg.c:3942
 #, 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:3949
+#: g10/gpg.c:3946
 #, 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:3953
+#: g10/gpg.c:3950
 #, 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:3960
+#: g10/gpg.c:3957
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "Érvénytelen alapértelmezett preferenciák!\n"
 
-#: g10/gpg.c:3964
+#: g10/gpg.c:3961
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "Érvénytelen személyes rejtjelező-preferenciák!\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3964
 #, 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:3971
+#: g10/gpg.c:3968
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "Érvénytelen személyes kivonatolópreferenciák!\n"
 
-#: g10/gpg.c:3975
+#: g10/gpg.c:3972
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "Érvénytelen személyes tömörítőpreferenciák!\n"
 
-#: g10/gpg.c:3984 g10/gpg.c:3989
+#: g10/gpg.c:3981 g10/gpg.c:3986
 #, 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:4026
+#: g10/gpg.c:4023
 #, 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:4089
+#: g10/gpg.c:4086
 #, 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:4101
+#: g10/gpg.c:4098
 #, 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:4256
+#: g10/gpg.c:4253
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
 
-#: g10/gpg.c:4268
+#: g10/gpg.c:4265
 #, 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:4340
+#: g10/gpg.c:4337
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "Visszafejtés sikertelen: %s.\n"
 
-#: g10/gpg.c:4369
+#: g10/gpg.c:4366
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4372
+#: g10/gpg.c:4369
 #, 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:4430
+#: g10/gpg.c:4427
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4433
+#: g10/gpg.c:4430
 #, 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:4821 g10/keyserver.c:1870
+#: g10/gpg.c:4818 g10/keyserver.c:1629
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Küldés a kulcsszerverre sikertelen: %s\n"
 
-#: g10/gpg.c:4826
+#: g10/gpg.c:4823
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Vétel a kulcsszerverről sikertelen: %s\n"
 
-#: g10/gpg.c:4832
+#: g10/gpg.c:4829
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Kulcsexportálás sikertelen: %s\n"
 
-#: g10/gpg.c:4845
+#: g10/gpg.c:4842
 #, 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:4857
+#: g10/gpg.c:4854
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Keresés a kulcsszerveren sikertelen: %s\n"
 
-#: g10/gpg.c:4870
+#: g10/gpg.c:4867
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Frissítés a kulcsszerverről sikertelen: %s\n"
 
-#: g10/gpg.c:4937
+#: g10/gpg.c:4936
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Páncél eltávolítása nem sikerült: %s\n"
 
-#: g10/gpg.c:4948
+#: g10/gpg.c:4947
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Páncélozás nem sikerült: %s\n"
 
-#: g10/gpg.c:5053
+#: g10/gpg.c:5052
 #, 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:5205 g10/tofu.c:2156
+#: g10/gpg.c:5204 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:5216
+#: g10/gpg.c:5215
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5272
+#: g10/gpg.c:5271
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5283
+#: g10/gpg.c:5282
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Kezdheti gépelni az üzenetet...\n"
 
-#: g10/gpg.c:5630
+#: g10/gpg.c:5629
 #, 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:5632
+#: g10/gpg.c:5631
 #, 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:5665
+#: g10/gpg.c:5664
 #, 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"
@@ -3496,7 +3510,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:414 tools/gpgconf.c:116 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:415 tools/gpgconf.c:116 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"
 
@@ -3591,271 +3605,271 @@ msgstr ""
 msgid "repair keys on import"
 msgstr "megmutatja az ujjlenyomatot"
 
-#: g10/import.c:399 g10/import.c:721
+#: g10/import.c:407 g10/import.c:729
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "%d típusú blokkot kihagyom.\n"
 
-#: g10/import.c:738
+#: g10/import.c:746
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "Eddig %lu kulcsot dolgoztam fel.\n"
 
-#: g10/import.c:831
+#: g10/import.c:839
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "     Összesen feldolgoztam: %lu\n"
 
-#: g10/import.c:834
+#: g10/import.c:842
 #, fuzzy, c-format
 #| msgid "      skipped new keys: %lu\n"
 msgid "    skipped PGP-2 keys: %lu\n"
 msgstr "       új kulcsok kihagyva: %lu\n"
 
-#: g10/import.c:836
+#: g10/import.c:844
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "       új kulcsok kihagyva: %lu\n"
 
-#: g10/import.c:839
+#: g10/import.c:847
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "    felh. azonosító nélkül: %lu\n"
 
-#: g10/import.c:842 sm/import.c:129
+#: g10/import.c:850 sm/import.c:129
 #, c-format
 msgid "              imported: %lu"
 msgstr "                importálva: %lu"
 
-#: g10/import.c:846 sm/import.c:133
+#: g10/import.c:854 sm/import.c:133
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "               változatlan: %lu\n"
 
-#: g10/import.c:848
+#: g10/import.c:856
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "       új felh. azonosítók: %lu\n"
 
-#: g10/import.c:850
+#: g10/import.c:858
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "              új alkulcsok: %lu\n"
 
-#: g10/import.c:852
+#: g10/import.c:860
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "              új aláírások: %lu\n"
 
-#: g10/import.c:854
+#: g10/import.c:862
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "     új kulcsvisszavonások: %lu\n"
 
-#: g10/import.c:856 sm/import.c:135
+#: g10/import.c:864 sm/import.c:135
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "   olvasott titkos kulcsok: %lu\n"
 
-#: g10/import.c:858 sm/import.c:137
+#: g10/import.c:866 sm/import.c:137
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  importált titkos kulcsok: %lu\n"
 
-#: g10/import.c:860 sm/import.c:139
+#: g10/import.c:868 sm/import.c:139
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "változatlan titkos kulcsok: %lu\n"
 
-#: g10/import.c:862 sm/import.c:141
+#: g10/import.c:870 sm/import.c:141
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "             nem importált: %lu\n"
 
-#: g10/import.c:864
+#: g10/import.c:872
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "              új aláírások: %lu\n"
 
-#: g10/import.c:866
+#: g10/import.c:874
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "   olvasott titkos kulcsok: %lu\n"
 
-#: g10/import.c:1291
+#: g10/import.c:1299
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:1333
+#: g10/import.c:1341
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:1351
+#: g10/import.c:1359
 #, fuzzy, c-format
 msgid "         \"%s\": preference for AEAD algorithm %s\n"
 msgstr "%s aláírás, %s kivonatoló algoritmus.\n"
 
-#: g10/import.c:1366
+#: g10/import.c:1374
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s aláírás, %s kivonatoló algoritmus.\n"
 
-#: g10/import.c:1378
+#: g10/import.c:1386
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:1391
+#: g10/import.c:1399
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:1393
+#: g10/import.c:1401
 #, c-format
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:1418
+#: g10/import.c:1426
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:1932 g10/import.c:3053
+#: g10/import.c:1940 g10/import.c:3061
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "%08lX kulcs: Nincs felhasználói azonosító.\n"
 
-#: g10/import.c:1938
+#: g10/import.c:1946
 #, fuzzy, c-format
 msgid "key %s: %s\n"
 msgstr "Kihagytam \"%s\"-t: %s.\n"
 
-#: g10/import.c:1939 g10/import.c:3025
+#: g10/import.c:1947 g10/import.c:3033
 msgid "rejected by import screener"
 msgstr ""
 
-#: g10/import.c:1988
+#: g10/import.c:1996
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "%08lX kulcs: HKP alkulcssérülés kijavítva.\n"
 
-#: g10/import.c:2009
+#: g10/import.c:2017
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "%08lX kulcs: Nem önaláírt felh. azonosító (\"%s\") elfogadva.\n"
 
-#: g10/import.c:2020 g10/import.c:2051
+#: g10/import.c:2028 g10/import.c:2059
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "%08lX kulcs: Nincs érvényes felhasználói azonosító.\n"
 
-#: g10/import.c:2022
+#: g10/import.c:2030
 #, c-format
 msgid "this may be caused by a missing self-signature\n"
 msgstr "Ezt okozhatja egy hiányzó önaláírás.\n"
 
-#: g10/import.c:2101 g10/import.c:3439
+#: g10/import.c:2109 g10/import.c:3447
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "%08lX kulcs: Nyilvános kulcs nem található: %s\n"
 
-#: g10/import.c:2107
+#: g10/import.c:2115
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "%08lX kulcs: új kulcs - kihagytam.\n"
 
-#: g10/import.c:2119
+#: g10/import.c:2127
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "Nem írható kulcskarikát találtam: %s\n"
 
-#: g10/import.c:2151 g10/import.c:2253 g10/import.c:3514
+#: g10/import.c:2159 g10/import.c:2261 g10/import.c:3522
 #, fuzzy, c-format
 #| msgid "error writing keyring `%s': %s\n"
 msgid "error writing keyring '%s': %s\n"
 msgstr "Hiba a \"%s\" kulcskarika írásakor: %s\n"
 
-#: g10/import.c:2174
+#: g10/import.c:2182
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "%08lX kulcs: \"%s\" nyilvános kulcs importálva.\n"
 
-#: g10/import.c:2201
+#: g10/import.c:2209
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "%08lX kulcs: Nem egyezik a mi másolatunkkal!\n"
 
-#: g10/import.c:2269
+#: g10/import.c:2277
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "%08lX kulcs: \"%s\" 1 új felhasználói azonosító.\n"
 
-#: g10/import.c:2272
+#: g10/import.c:2280
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "%08lX kulcs: \"%s\" %d új felhasználói azonosító.\n"
 
-#: g10/import.c:2275
+#: g10/import.c:2283
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "%08lX kulcs: \"%s\" 1 új aláírás.\n"
 
-#: g10/import.c:2278
+#: g10/import.c:2286
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "%08lX kulcs: \"%s\" %d új aláírás.\n"
 
-#: g10/import.c:2281
+#: g10/import.c:2289
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "%08lX kulcs: \"%s\" 1 új alkulcs.\n"
 
-#: g10/import.c:2284
+#: g10/import.c:2292
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "%08lX kulcs: \"%s\" %d új alkulcs.\n"
 
-#: g10/import.c:2287
+#: g10/import.c:2295
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "%08lX kulcs: \"%s\" %d új aláírás.\n"
 
-#: g10/import.c:2290
+#: g10/import.c:2298
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "%08lX kulcs: \"%s\" %d új aláírás.\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2301
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "%08lX kulcs: \"%s\" %d új felhasználói azonosító.\n"
 
-#: g10/import.c:2296
+#: g10/import.c:2304
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "%08lX kulcs: \"%s\" %d új felhasználói azonosító.\n"
 
-#: g10/import.c:2332
+#: g10/import.c:2340
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "%08lX kulcs: \"%s\" nem változott.\n"
 
-#: g10/import.c:2692 g10/import.c:2887
+#: g10/import.c:2700 g10/import.c:2895
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "%08lX kulcs: Titkos kulcs importálva.\n"
 
-#: g10/import.c:2700
+#: g10/import.c:2708
 #, fuzzy, c-format
 #| msgid "skipped: secret key already present\n"
 msgid "key %s: secret key already exists\n"
 msgstr "Kihagytam: titkos kulcs már jelen van.\n"
 
-#: g10/import.c:2708
+#: g10/import.c:2716
 #, fuzzy, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "Hiba %s-ra/-re küldéskor: %s\n"
@@ -3868,210 +3882,209 @@ msgstr "Hiba %s-ra/-re küldéskor: %s\n"
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2877
+#: g10/import.c:2885
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:3024
+#: g10/import.c:3032
 #, fuzzy, c-format
 msgid "secret key %s: %s\n"
 msgstr "\"%s\" titkos kulcs nem található: %s\n"
 
-#: g10/import.c:3045 g10/import.c:3084
+#: g10/import.c:3053 g10/import.c:3092
 #, fuzzy, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "�rom a titkos kulcsot a %s állományba.\n"
 
-#: g10/import.c:3072
+#: g10/import.c:3080
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr ""
 "%08lX kulcs: Titkos kulcs érvénytelen (%d) rejtjelezővel - kihagytam.\n"
 
-#: g10/import.c:3234 g10/pkclist.c:75 g10/revoke.c:774
+#: g10/import.c:3242 g10/pkclist.c:75 g10/revoke.c:775
 msgid "No reason specified"
 msgstr "Nincs megadva ok."
 
-#: g10/import.c:3235 g10/pkclist.c:77 g10/revoke.c:776
+#: g10/import.c:3243 g10/pkclist.c:77 g10/revoke.c:777
 msgid "Key is superseded"
 msgstr "A kulcsot lecserélték."
 
-#: g10/import.c:3236 g10/pkclist.c:79 g10/revoke.c:775
+#: g10/import.c:3244 g10/pkclist.c:79 g10/revoke.c:776
 msgid "Key has been compromised"
 msgstr "A kulcs kompromittálódott."
 
-#: g10/import.c:3237 g10/pkclist.c:81 g10/revoke.c:777
+#: g10/import.c:3245 g10/pkclist.c:81 g10/revoke.c:778
 msgid "Key is no longer used"
 msgstr "A kulcs már nem használatos."
 
-#: g10/import.c:3238 g10/pkclist.c:83 g10/revoke.c:778
+#: g10/import.c:3246 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "A felhasználói azonosító már nem érvényes."
 
-#: g10/import.c:3363 g10/keylist.c:1105 g10/pkclist.c:87
+#: g10/import.c:3371 g10/keylist.c:1105 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "Visszavonás oka: "
 
-#: g10/import.c:3382 g10/keylist.c:1124 g10/pkclist.c:103
+#: g10/import.c:3390 g10/keylist.c:1124 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "Megjegyzés a visszavonáshoz: "
 
-#: g10/import.c:3432
+#: g10/import.c:3440
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "%08lX kulcs: Nincs nyilvános kulcs - nem tudok visszavonni.\n"
 
-#: g10/import.c:3461
+#: g10/import.c:3469
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "%08lX kulcs: Nem találom az eredeti kulcsblokkot: %s\n"
 
-#: g10/import.c:3468
+#: g10/import.c:3476
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "%08lX kulcs: Nem tudom beolvasni az eredeti kulcsblokkot: %s\n"
 
-#: g10/import.c:3488
+#: g10/import.c:3496
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "%08lX kulcs: Érvénytelen visszavonó igazolás: %s - visszautasítva.\n"
 
-#: g10/import.c:3523
+#: g10/import.c:3531
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "%08lX kulcs: \"%s\" visszavonó igazolást importáltam.\n"
 
-#: g10/import.c:3609
+#: g10/import.c:3617
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "%08lX kulcs: Nincs felhasználói azonosító ehhez az aláíráshoz!\n"
 
-#: g10/import.c:3626
+#: g10/import.c:3634
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "%08lX kulcs: Nem támogatott nyilvános kulcsú alg. a \"%s\" felh. "
 "azonosítón!\n"
 
-#: g10/import.c:3628
+#: g10/import.c:3636
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "%08lX kulcs: Érvénytelen önaláírás a \"%s\" felh. azonosítón!\n"
 
-#: g10/import.c:3645 g10/import.c:3673 g10/import.c:3729
+#: g10/import.c:3653 g10/import.c:3681 g10/import.c:3737
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "%08lX kulcs: Nem támogatott nyilvános kulcsú algoritmus!\n"
 
-#: g10/import.c:3646
+#: g10/import.c:3654
 #, fuzzy, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "%08lX kulcs: Kulcsaláírást hozzáadtam.\n"
 
-#: g10/import.c:3660
+#: g10/import.c:3668
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "%08lX kulcs: Nincs alkulcs a kulcskötéshez!\n"
 
-#: g10/import.c:3675
+#: g10/import.c:3683
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "%08lX kulcs: Érvénytelen alkulcskötés!\n"
 
-#: g10/import.c:3694
+#: g10/import.c:3702
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "%08lX kulcs: Eltávolítottam a többszörös alkulcskötést.\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3726
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "%08lX kulcs: Nincs alkulcs a kulcsvisszavonáshoz.\n"
 
-#: g10/import.c:3731
+#: g10/import.c:3739
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "%08lX kulcs: Érvénytelen alkulcsvisszavonás.\n"
 
-#: g10/import.c:3746
+#: g10/import.c:3754
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "%08lX kulcs: Eltávolítottam a többszörös alkulcsvisszavonást.\n"
 
-#: g10/import.c:3790
+#: g10/import.c:3798
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "%08lX kulcs: Kihagytam a felh. azonosítót: '"
 
-#: g10/import.c:3817
+#: g10/import.c:3825
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "%08lX kulcs: Alkulcsot kihagytam.\n"
 
-#: g10/import.c:3849
+#: g10/import.c:3857
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "%08lX kulcs: Nem exportálható aláírás (%02x. osztály) - kihagytam.\n"
 
-#: g10/import.c:3860
+#: g10/import.c:3868
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "%08lX kulcs: Visszavonó igazolás rossz helyen - kihagytam.\n"
 
-#: g10/import.c:3878
+#: g10/import.c:3886
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "%08lX kulcs: Érvénytelen visszavonó igazolás: %s - kihagytam.\n"
 
-#: g10/import.c:3892
+#: g10/import.c:3900
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "%08lX kulcs: Alkulcsaláírás rossz helyen - kihagytam.\n"
 
-#: g10/import.c:3900
+#: g10/import.c:3908
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "%08lX kulcs: Váratlan aláírásosztály (0x%02X) - kihagytam.\n"
 
-#: g10/import.c:4073
+#: g10/import.c:4081
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "%08lX kulcs: Duplázott felh. azonosítót találtam - összefűztem.\n"
 
-#: g10/import.c:4180
+#: g10/import.c:4188
 #, fuzzy, c-format
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr "%08lX kulcs: Duplázott felh. azonosítót találtam - összefűztem.\n"
 
-#: g10/import.c:4245
+#: g10/import.c:4253
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "FIGYELEM: %08lX kulcsot visszavonhatták:\n"
 "lehívom a %08lX visszavonó kulcsot.\n"
 
-#: g10/import.c:4261
+#: g10/import.c:4269
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "FIGYELEM: %08lX kulcsot visszavonhatták:\n"
 "visszavonó kulcs (%08lX) nincs jelen.\n"
 
-#: g10/import.c:4327
+#: g10/import.c:4335
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "%08lX kulcs: \"%s\" visszavonó igazolást hozzáadtam.\n"
 
-#: g10/import.c:4365
+#: g10/import.c:4373
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "%08lX kulcs: Kulcsaláírást hozzáadtam.\n"
 
-#: g10/key-check.c:133 dirmngr/dirmngr_ldap.c:650 dirmngr/ldap-wrapper.c:835
-#: dirmngr/ldap-wrapper.c:852
+#: g10/key-check.c:133 dirmngr/ldap-wrapper.c:835 dirmngr/ldap-wrapper.c:852
 #, fuzzy, c-format
 msgid "error allocating memory: %s\n"
 msgstr "Hiba a(z) \"%s\" kulcskarika létrehozásakor: %s\n"
@@ -4134,7 +4147,7 @@ msgid ""
 "all signatures.\n"
 msgstr ""
 
-#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:284 sm/keydb.c:297
+#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:289 sm/keydb.c:302
 #, fuzzy, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "Hiba a(z) \"%s\" kulcskarika létrehozásakor: %s\n"
@@ -4145,7 +4158,7 @@ msgstr "Hiba a(z) \"%s\" kulcskarika létrehozásakor: %s\n"
 msgid "error creating keyring '%s': %s\n"
 msgstr "Hiba a(z) \"%s\" kulcskarika létrehozásakor: %s\n"
 
-#: g10/keydb.c:388 sm/keydb.c:303
+#: g10/keydb.c:388 sm/keydb.c:308
 #, fuzzy, c-format
 msgid "keybox '%s' created\n"
 msgstr "\"%s\" kulcskarikát létrehoztam.\n"
@@ -4423,8 +4436,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Valóban aláírja? "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6192 g10/keyedit.c:6275 g10/keyedit.c:6404
-#: g10/keyedit.c:6466 g10/sign.c:528
+#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
+#: g10/keyedit.c:6474 g10/sign.c:528
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Aláírás sikertelen: %s\n"
@@ -4831,7 +4844,7 @@ msgstr "Nincs ilyen felhasználói azonosító.\n"
 msgid "Nothing to sign.\n"
 msgstr "Nincs mit aláírni a %08lX kulccsal!\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6057
+#: g10/keyedit.c:2973 g10/keyedit.c:6065
 #, fuzzy, c-format
 msgid "Not signed by you.\n"
 msgstr "   aláírva %08lX által %s%s időpontban.\n"
@@ -4901,7 +4914,7 @@ msgstr "Ezt a kulcsot a következő %s kulcs visszavonhatja: "
 msgid "(sensitive)"
 msgstr " (érzékeny)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:525
+#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s nem hozható létre: %s\n"
@@ -4917,7 +4930,7 @@ msgid "expired: %s"
 msgstr " [lejár: %s]"
 
 #: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2262
-#: g10/keyserver.c:531
+#: g10/keyserver.c:354
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [lejár: %s]"
@@ -4953,14 +4966,14 @@ 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:535
-#: g10/mainproc.c:2280 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
+#: g10/mainproc.c:2282 g10/tofu.c:1789 g10/trust.c:426 dirmngr/ocsp.c:792
 #, fuzzy
 msgid "revoked"
 msgstr "[visszavont] "
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:539
-#: g10/mainproc.c:2282 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
+#: g10/mainproc.c:2284 g10/tofu.c:1794 g10/trust.c:113
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -5003,7 +5016,7 @@ msgstr "Továbbra is hozzá akarja adni? (i/N) "
 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:3107
+#: g10/keyedit.c:4273 g10/keygen.c:3111
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
@@ -5153,7 +5166,7 @@ msgstr ""
 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:5357 g10/keyedit.c:5495
+#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
 #, 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"
@@ -5162,134 +5175,134 @@ msgstr "Kihagyom a v3 önaláírást a \"%s\" felhasználóazonosítón.\n"
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5380
+#: g10/keyedit.c:5383
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Biztos abban, hogy használni akarja (i/N)? "
 
-#: g10/keyedit.c:5381
+#: g10/keyedit.c:5384
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Biztos abban, hogy használni akarja (i/N)? "
 
-#: g10/keyedit.c:5441
+#: g10/keyedit.c:5449
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Aláírás-jelölés: "
 
-#: g10/keyedit.c:5588
+#: g10/keyedit.c:5596
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Felülírjam (i/N)? "
 
-#: g10/keyedit.c:5658
+#: g10/keyedit.c:5666
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nincs %d indexű felhasználóazonosító!\n"
 
-#: g10/keyedit.c:5720
+#: g10/keyedit.c:5728
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nincs %d indexű felhasználóazonosító!\n"
 
-#: g10/keyedit.c:5821
+#: g10/keyedit.c:5829
 #, fuzzy, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Nincs %d indexű felhasználóazonosító!\n"
 
-#: g10/keyedit.c:5843
+#: g10/keyedit.c:5851
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nincs %d indexű felhasználóazonosító!\n"
 
-#: g10/keyedit.c:5984
+#: g10/keyedit.c:5992
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Felhasználóazonosító: \""
 
-#: g10/keyedit.c:5987 g10/keyedit.c:6089 g10/keyedit.c:6137
+#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
 #, 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:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
+#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
 msgid " (non-exportable)"
 msgstr " (nem exportálható)"
 
-#: g10/keyedit.c:5993
+#: g10/keyedit.c:6001
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Ez az aláírás lejárt %s időpontban.\n"
 
-#: g10/keyedit.c:5998
+#: g10/keyedit.c:6006
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Biztos benne, hogy mégis visszavonja? (i/N) "
 
-#: g10/keyedit.c:6003
+#: g10/keyedit.c:6011
 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:6063
+#: g10/keyedit.c:6071
 #, 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:6092
+#: g10/keyedit.c:6100
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (nem exportálható)"
 
-#: g10/keyedit.c:6099
+#: g10/keyedit.c:6107
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   visszavonva %08lX által %s időpontban.\n"
 
-#: g10/keyedit.c:6124
+#: g10/keyedit.c:6132
 msgid "You are about to revoke these signatures:\n"
 msgstr "A következő aláírásokat fogja visszavonni:\n"
 
-#: g10/keyedit.c:6147
+#: g10/keyedit.c:6155
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Valóban létrehozzam a visszavonó igazolást? (i/N) "
 
-#: g10/keyedit.c:6180
+#: g10/keyedit.c:6188
 #, c-format
 msgid "no secret key\n"
 msgstr "Nincs titkos kulcs.\n"
 
-#: g10/keyedit.c:6228
+#: g10/keyedit.c:6236
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6238
+#: g10/keyedit.c:6246
 #, 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:6255
+#: g10/keyedit.c:6263
 #, 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:6351
+#: g10/keyedit.c:6359
 #, 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:6389
+#: g10/keyedit.c:6397
 #, 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:6451
+#: g10/keyedit.c:6459
 #, 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:6548
+#: g10/keyedit.c:6556
 #, 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"
@@ -5299,83 +5312,83 @@ msgstr "%s fotóazonosító (méret: %ld, kulcs: 0x%08lX, felh: %d) mutatása.\n
 msgid "invalid value for option '%s'\n"
 msgstr "Érvénytelen import opciók!\n"
 
-#: g10/keygen.c:338
+#: g10/keygen.c:339
 #, fuzzy, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "%c%lu preferencia kétszer szerepel!\n"
 
-#: g10/keygen.c:345
+#: g10/keygen.c:346
 #, fuzzy, c-format
 msgid "too many cipher preferences\n"
 msgstr "Túl sok \"%c\" preferencia.\n"
 
-#: g10/keygen.c:347
+#: g10/keygen.c:348
 #, fuzzy, c-format
 msgid "too many digest preferences\n"
 msgstr "Túl sok \"%c\" preferencia.\n"
 
-#: g10/keygen.c:349
+#: g10/keygen.c:350
 #, fuzzy, c-format
 msgid "too many compression preferences\n"
 msgstr "Túl sok \"%c\" preferencia.\n"
 
-#: g10/keygen.c:351
+#: g10/keygen.c:352
 #, fuzzy, c-format
 msgid "too many AEAD preferences\n"
 msgstr "Túl sok \"%c\" preferencia.\n"
 
-#: g10/keygen.c:521
+#: g10/keygen.c:522
 #, fuzzy, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "Érvénytelen karakter a preferenciák között!\n"
 
-#: g10/keygen.c:1130
+#: g10/keygen.c:1131
 #, c-format
 msgid "writing direct signature\n"
 msgstr "Sima aláírást írok.\n"
 
-#: g10/keygen.c:1176
+#: g10/keygen.c:1177
 #, c-format
 msgid "writing self signature\n"
 msgstr "Önaláírást írok.\n"
 
-#: g10/keygen.c:1233
+#: g10/keygen.c:1234
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "Összefűző aláírást írok.\n"
 
-#: g10/keygen.c:1598 g10/keygen.c:1603 g10/keygen.c:1655 g10/keygen.c:1660
-#: g10/keygen.c:1832 g10/keygen.c:1837
+#: g10/keygen.c:1599 g10/keygen.c:1604 g10/keygen.c:1656 g10/keygen.c:1661
+#: g10/keygen.c:1833 g10/keygen.c:1838
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Kulcsméret érvénytelen; %u bitet használok.\n"
 
-#: g10/keygen.c:1609 g10/keygen.c:1666 g10/keygen.c:1674 g10/keygen.c:1843
+#: g10/keygen.c:1610 g10/keygen.c:1667 g10/keygen.c:1675 g10/keygen.c:1844
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "Kulcsméretet felkerekítettem %u bitre.\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1701
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1899
+#: g10/keygen.c:1900
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1902
+#: g10/keygen.c:1903
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1906
 #, fuzzy
 msgid "Encrypt"
 msgstr "adat titkosítása"
 
-#: g10/keygen.c:1908
+#: g10/keygen.c:1909
 msgid "Authenticate"
 msgstr ""
 
@@ -5389,180 +5402,180 @@ msgstr ""
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1929
+#: g10/keygen.c:1930
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1967
 #, c-format
 msgid "Possible actions for this %s key: "
 msgstr ""
 
-#: g10/keygen.c:1973
+#: g10/keygen.c:1974
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1979
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1981
+#: g10/keygen.c:1982
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (csak titkosítás)\n"
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1985
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1987
+#: g10/keygen.c:1988
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:2116
+#: g10/keygen.c:2117
 #, fuzzy, c-format
 msgid "   (%d) RSA and RSA%s\n"
 msgstr "   (%d) DSA és ElGamal (alapértelmezés)\n"
 
-#: g10/keygen.c:2120
+#: g10/keygen.c:2121
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal%s\n"
 msgstr "   (%d) DSA és ElGamal (alapértelmezés)\n"
 
-#: g10/keygen.c:2123
+#: g10/keygen.c:2124
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "   (%d) DSA (sign only)%s\n"
 msgstr "   (%d) DSA (csak aláírás)\n"
 
-#: g10/keygen.c:2125
+#: g10/keygen.c:2126
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (sign only)\n"
 msgid "   (%d) RSA (sign only)%s\n"
 msgstr "   (%d) RSA (csak aláírás)\n"
 
-#: g10/keygen.c:2131
+#: g10/keygen.c:2132
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)%s\n"
 msgstr "   (%d) ElGamal (csak titkosítás)\n"
 
-#: g10/keygen.c:2133
+#: g10/keygen.c:2134
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (encrypt only)\n"
 msgid "   (%d) RSA (encrypt only)%s\n"
 msgstr "   (%d) RSA (csak titkosítás)\n"
 
-#: g10/keygen.c:2139
+#: g10/keygen.c:2140
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (csak titkosítás)\n"
 
-#: g10/keygen.c:2141
+#: g10/keygen.c:2142
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (csak titkosítás)\n"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2148
 #, fuzzy, c-format
 #| msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgid "   (%d) ECC (sign and encrypt)%s\n"
 msgstr "   (%d) ElGamal (aláírás és titkosítás)\n"
 
-#: g10/keygen.c:2147 g10/keygen.c:2678
+#: g10/keygen.c:2148 g10/keygen.c:2679
 #, fuzzy
 #| msgid " (default)"
 msgid " *default*"
 msgstr " (alapértelmezés)"
 
-#: g10/keygen.c:2148
+#: g10/keygen.c:2149
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "  (%d) ECC (sign only)\n"
 msgstr "   (%d) DSA (csak aláírás)\n"
 
-#: g10/keygen.c:2150
+#: g10/keygen.c:2151
 #, fuzzy, c-format
 msgid "  (%d) ECC (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (csak titkosítás)\n"
 
-#: g10/keygen.c:2152
+#: g10/keygen.c:2153
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (encrypt only)\n"
 msgid "  (%d) ECC (encrypt only)%s\n"
 msgstr "   (%d) RSA (csak titkosítás)\n"
 
-#: g10/keygen.c:2156
+#: g10/keygen.c:2157
 #, fuzzy, c-format
 msgid "  (%d) Existing key%s\n"
 msgstr "   (%d) RSA (csak titkosítás)\n"
 
-#: g10/keygen.c:2158
+#: g10/keygen.c:2159
 #, fuzzy, c-format
 msgid "  (%d) Existing key from card%s\n"
 msgstr "   (%d) RSA (csak titkosítás)\n"
 
-#: g10/keygen.c:2254 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2255 sm/certreqgen-ui.c:203
 #, fuzzy
 msgid "Enter the keygrip: "
 msgstr "Aláírás-jelölés: "
 
-#: g10/keygen.c:2267 sm/certreqgen-ui.c:211 tools/gpg-card.c:2280
+#: g10/keygen.c:2268 sm/certreqgen-ui.c:211 tools/gpg-card.c:2297
 #, c-format
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr ""
 
-#: g10/keygen.c:2269 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2270 sm/certreqgen-ui.c:213
 #, fuzzy
 msgid "No key with this keygrip\n"
 msgstr "Nincs %d indexű felhasználóazonosító!\n"
 
-#: g10/keygen.c:2288 g10/keygen.c:2298 g10/keygen.c:3440 g10/keygen.c:3451
+#: g10/keygen.c:2289 g10/keygen.c:2299 g10/keygen.c:3444 g10/keygen.c:3455
 #: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
 #, fuzzy, c-format
 msgid "error reading the card: %s\n"
 msgstr "%s: Hiba szabad rekord olvasásakor: %s.\n"
 
-#: g10/keygen.c:2292 g10/keygen.c:3444 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2293 g10/keygen.c:3448 sm/certreqgen-ui.c:234
 #, fuzzy, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: g10/keygen.c:2311 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2312 sm/certreqgen-ui.c:246
 #, fuzzy
 msgid "Available keys:\n"
 msgstr "kulcs tiltása"
 
-#: g10/keygen.c:2504 g10/keygen.c:2518
+#: g10/keygen.c:2505 g10/keygen.c:2519
 #, fuzzy, c-format
 #| msgid "rounded up to %u bits\n"
 msgid "rounded to %u bits\n"
 msgstr "Felkerekítve %u bitre.\n"
 
-#: g10/keygen.c:2559
+#: g10/keygen.c:2560
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:2567
+#: g10/keygen.c:2568
 #, fuzzy, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Milyen kulcsméretet szeretne? (1024) "
 
-#: g10/keygen.c:2584 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2585 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "A kívánt kulcsméret %u bit.\n"
 
-#: g10/keygen.c:2630
+#: g10/keygen.c:2631
 #, fuzzy
 #| msgid "Please select what kind of key you want:\n"
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Kérem, adja meg, milyen kulcsot kíván:\n"
 
-#: g10/keygen.c:2819
+#: g10/keygen.c:2820
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5578,7 +5591,7 @@ msgstr ""
 "      <n>m = a kulcs n hónapig érvényes\n"
 "      <n>y = a kulcs n évig érvényes\n"
 
-#: g10/keygen.c:2830
+#: g10/keygen.c:2831
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5594,40 +5607,40 @@ msgstr ""
 "      <n>m = az aláírás n hónapig érvényes\n"
 "      <n>y = az aláírás n évig érvényes\n"
 
-#: g10/keygen.c:2853
+#: g10/keygen.c:2854
 msgid "Key is valid for? (0) "
 msgstr "Meddig érvényes a kulcs? (0) "
 
-#: g10/keygen.c:2858
+#: g10/keygen.c:2859
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Meddig érvényes az aláírás? (0) "
 
-#: g10/keygen.c:2871 g10/keygen.c:2896
+#: g10/keygen.c:2875 g10/keygen.c:2900
 msgid "invalid value\n"
 msgstr "Érvénytelen érték!\n"
 
-#: g10/keygen.c:2878
+#: g10/keygen.c:2882
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s soha nem jár le.\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2883
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s soha nem jár le.\n"
 
-#: g10/keygen.c:2884
+#: g10/keygen.c:2888
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s lejár: %s\n"
 
-#: g10/keygen.c:2885
+#: g10/keygen.c:2889
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Az aláírás lejár: %s.\n"
 
-#: g10/keygen.c:2889
+#: g10/keygen.c:2893
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5635,12 +5648,12 @@ msgstr ""
 "Az Ön rendszere nem tud megjeleníteni 2038 utáni dátumokat.\n"
 "Azonban kezelni helyesen tudja őket egészen 2106-ig.\n"
 
-#: g10/keygen.c:2902
+#: g10/keygen.c:2906
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Ez így helyes (i/n)? "
 
-#: g10/keygen.c:2970
+#: g10/keygen.c:2974
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5651,7 +5664,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2985
+#: g10/keygen.c:2989
 #, fuzzy
 msgid ""
 "\n"
@@ -5668,50 +5681,50 @@ msgstr ""
 "    \"Heinrich Heine (a költő) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:3004
+#: g10/keygen.c:3008
 msgid "Real name: "
 msgstr "Teljes név: "
 
-#: g10/keygen.c:3013
+#: g10/keygen.c:3017
 msgid "Invalid character in name\n"
 msgstr "Érvénytelen karakter a névben!\n"
 
-#: g10/keygen.c:3014
+#: g10/keygen.c:3018
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:3018
+#: g10/keygen.c:3022
 msgid "Name may not start with a digit\n"
 msgstr "A név lehet, hogy nem kezdődhet számmal!\n"
 
-#: g10/keygen.c:3021
+#: g10/keygen.c:3025
 msgid "Name must be at least 5 characters long\n"
 msgstr "A név legalább 5 karakter kell legyen!\n"
 
-#: g10/keygen.c:3031
+#: g10/keygen.c:3035
 msgid "Email address: "
 msgstr "E-mail cím: "
 
-#: g10/keygen.c:3037
+#: g10/keygen.c:3041
 msgid "Not a valid email address\n"
 msgstr "Ez nem érvényes e-mail cím.\n"
 
-#: g10/keygen.c:3046
+#: g10/keygen.c:3050
 msgid "Comment: "
 msgstr "Megjegyzés: "
 
-#: g10/keygen.c:3052
+#: g10/keygen.c:3056
 msgid "Invalid character in comment\n"
 msgstr "Érvénytelen karakter a megjegyzésben!\n"
 
-#: g10/keygen.c:3088
+#: g10/keygen.c:3092
 #, fuzzy, c-format
 #| msgid "You are using the `%s' character set.\n"
 msgid "You are using the '%s' character set.\n"
 msgstr "Ön a(z) %s karakterkódolást használja.\n"
 
-#: g10/keygen.c:3094
+#: g10/keygen.c:3098
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5722,7 +5735,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3099
+#: g10/keygen.c:3103
 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"
 
@@ -5737,32 +5750,32 @@ msgstr "Kérem, ne rakja az e-mail címet a teljes névbe vagy a megjegyzésbe!\
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3124
+#: g10/keygen.c:3128
 msgid "NnCcEeOoQq"
 msgstr "NnMmEeRrKk"
 
-#: g10/keygen.c:3134
+#: g10/keygen.c:3138
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "(N)év, (M)egjegyzés, (E)-mail megváltoztatása vagy (K)ilépés? "
 
-#: g10/keygen.c:3135
+#: g10/keygen.c:3139
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "(N)év, (M)egjegyzés, (E)-mail megváltoztatása vagy (R)endben/(K)ilépés? "
 
-#: g10/keygen.c:3140
+#: g10/keygen.c:3144
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "(N)év, (E)-mail megváltoztatása vagy (K)ilépés? "
 
-#: g10/keygen.c:3141
+#: g10/keygen.c:3145
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "(N)év, (E)-mail megváltoztatása vagy (R)endben/(K)ilépés? "
 
-#: g10/keygen.c:3160
+#: g10/keygen.c:3164
 msgid "Please correct the error first\n"
 msgstr "Kérem, előbb javítsa ki a hibát!\n"
 
-#: g10/keygen.c:3206
+#: g10/keygen.c:3210
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -5774,18 +5787,18 @@ msgstr ""
 "a lemezeket) a prímszám generálása alatt. Ez segíti a véletlenszám-\n"
 "generátort, hogy entrópiát tudjon gyűjteni.\n"
 
-#: g10/keygen.c:3591
+#: g10/keygen.c:3595
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4590 g10/keygen.c:4663 g10/keygen.c:4681 g10/keygen.c:4710
-#: g10/keygen.c:5086 g10/keygen.c:5632 g10/keygen.c:5943 g10/keygen.c:6050
+#: g10/keygen.c:4594 g10/keygen.c:4667 g10/keygen.c:4685 g10/keygen.c:4714
+#: g10/keygen.c:5113 g10/keygen.c:5663 g10/keygen.c:5974 g10/keygen.c:6081
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Kulcsgenerálás sikertelen: %s\n"
 
-#: g10/keygen.c:4599
+#: g10/keygen.c:4603
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5793,69 +5806,69 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:4601
+#: g10/keygen.c:4605
 msgid "Continue? (Y/n) "
 msgstr ""
 
-#: g10/keygen.c:4622
+#: g10/keygen.c:4626
 #, fuzzy, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "\"%s\" már tömörített.\n"
 
-#: g10/keygen.c:4627
+#: g10/keygen.c:4631
 #, fuzzy
 #| msgid "Create anyway? "
 msgid "Create anyway? (y/N) "
 msgstr "Mégis létrehozzam? "
 
-#: g10/keygen.c:4633
+#: g10/keygen.c:4637
 #, fuzzy, c-format
 #| msgid "Create anyway? "
 msgid "creating anyway\n"
 msgstr "Mégis létrehozzam? "
 
-#: g10/keygen.c:5069
+#: g10/keygen.c:5096
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 
-#: g10/keygen.c:5118
+#: g10/keygen.c:5145
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Kulcs létrehozása megszakítva.\n"
 
-#: g10/keygen.c:5178
+#: g10/keygen.c:5205
 #, fuzzy, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "Nem tudom létrehozni a(z) \"%s\" állományt: %s.\n"
 
-#: g10/keygen.c:5198
+#: g10/keygen.c:5225
 #, fuzzy, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "MEGJEGYZÉS: %08lX titkos kulcs %s-kor lejárt.\n"
 
-#: g10/keygen.c:5359 g10/keygen.c:5561
+#: g10/keygen.c:5389 g10/keygen.c:5591
 #, fuzzy, c-format
 #| msgid "writing public key to `%s'\n"
 msgid "writing public key to '%s'\n"
 msgstr "�rom a kulcsot a %s állományba.\n"
 
-#: g10/keygen.c:5555
+#: g10/keygen.c:5585
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "Nem írható nyilvánoskulcs-karikát találtam: %s\n"
 
-#: g10/keygen.c:5569
+#: g10/keygen.c:5599
 #, fuzzy, c-format
 #| msgid "error writing public keyring `%s': %s\n"
 msgid "error writing public keyring '%s': %s\n"
 msgstr "Hiba a(z) \"%s\" nyilvánoskulcs-karika írásakor: %s.\n"
 
-#: g10/keygen.c:5603
+#: g10/keygen.c:5634
 msgid "public and secret key created and signed.\n"
 msgstr "A nyilvános és titkos kulcsokat létrehoztam és aláírtam.\n"
 
-#: g10/keygen.c:5619
+#: g10/keygen.c:5650
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -5865,38 +5878,38 @@ msgstr ""
 "kíván ilyen célra létrehozni, azt az \"--edit-key\" parancs segítségével\n"
 "teheti meg.\n"
 
-#: g10/keygen.c:5801 g10/keygen.c:6000
+#: g10/keygen.c:5832 g10/keygen.c:6031
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "A kulcs %lu másodperccel a jövőben készült. (Időugrás vagy óraprobléma.)\n"
 
-#: g10/keygen.c:5803 g10/keygen.c:6002
+#: g10/keygen.c:5834 g10/keygen.c:6033
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 "A kulcs %lu másodperccel a jövőben készült. (Időugrás vagy óraprobléma.)\n"
 
-#: g10/keygen.c:5814 g10/keygen.c:6013
+#: g10/keygen.c:5845 g10/keygen.c:6044
 #, fuzzy, c-format
 #| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "MEGJEGYZÉS: Alkulcsok létrehozása v3 kulcsokhoz nem OpenPGP-megfelelő.\n"
 
-#: g10/keygen.c:5826 g10/keygen.c:5828
+#: g10/keygen.c:5857 g10/keygen.c:5859
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Az elsődleges kulcs titkos részei nem elérhetők.\n"
 
-#: g10/keygen.c:5835 g10/keygen.c:5837
+#: g10/keygen.c:5866 g10/keygen.c:5868
 #, fuzzy, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Az elsődleges kulcs titkos részei nem elérhetők.\n"
 
-#: g10/keygen.c:5857 g10/keygen.c:6027
+#: g10/keygen.c:5888 g10/keygen.c:6058
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Valóban létrehozzam? "
@@ -5979,26 +5992,26 @@ msgstr " Kulcs ujjlenyomata ="
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1467
+#: g10/keyring.c:1477
 #, fuzzy, c-format
 msgid "caching keyring '%s'\n"
 msgstr "Ellenőrzöm a(z) \"%s\" kulcskarikát.\n"
 
-#: g10/keyring.c:1541
+#: g10/keyring.c:1551
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signature)\n"
 msgid_plural "%lu keys cached so far (%lu signatures)\n"
 msgstr[0] "%lu kulcsot ellenőriztem (%lu aláírással).\n"
 msgstr[1] "%lu kulcsot ellenőriztem (%lu aláírással).\n"
 
-#: g10/keyring.c:1557
+#: g10/keyring.c:1567
 #, c-format
 msgid "%lu key cached"
 msgid_plural "%lu keys cached"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/keyring.c:1559
+#: g10/keyring.c:1569
 #, fuzzy, c-format
 #| msgid "1 bad signature\n"
 msgid " (%lu signature)\n"
@@ -6006,7 +6019,7 @@ msgid_plural " (%lu signatures)\n"
 msgstr[0] "1 rossz aláírás.\n"
 msgstr[1] "1 rossz aláírás.\n"
 
-#: g10/keyring.c:1636
+#: g10/keyring.c:1646
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: Kulcskarikát létrehoztam.\n"
@@ -6036,81 +6049,76 @@ msgstr ""
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "A megadott aláírási eljárásmód URL-je érvénytelen!\n"
 
-#: g10/keyserver.c:537
+#: g10/keyserver.c:360
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:740
+#: g10/keyserver.c:563
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:846
+#: g10/keyserver.c:669
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "Érvénytelen export opciók!\n"
 
-#: g10/keyserver.c:986 g10/keyserver.c:1096
+#: g10/keyserver.c:809 g10/keyserver.c:919
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1420 g10/keyserver.c:1453
+#: g10/keyserver.c:1217 g10/keyserver.c:1250
 #, 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:1427
+#: g10/keyserver.c:1224
 #, 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:1531
+#: g10/keyserver.c:1316
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "\"%s\" kulcs nem található: %s\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1319
 #, fuzzy, c-format
 msgid "key not found on keyserver\n"
 msgstr "\"%s\" kulcs nem található: %s\n"
 
-#: g10/keyserver.c:1722
-#, fuzzy, c-format
-msgid "requesting key %s from %s server %s\n"
-msgstr "Lekérem a %08lX kulcsot a %s kulcsszerverről.\n"
-
-#: g10/keyserver.c:1726
+#: g10/keyserver.c:1481
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "Lekérem a %08lX kulcsot a %s kulcsszerverről.\n"
 
-#: g10/keyserver.c:1841 g10/keyserver.c:2020
+#: g10/keyserver.c:1600 g10/keyserver.c:1793
 #, fuzzy, c-format
 msgid "no keyserver known\n"
 msgstr "Érvénytelen export opciók!\n"
 
-#: g10/keyserver.c:1856 g10/skclist.c:213 g10/skclist.c:241
+#: g10/keyserver.c:1615 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:1860
+#: g10/keyserver.c:1619
 #, 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:1901
+#: g10/keyserver.c:1662
 #, fuzzy, c-format
 msgid "requesting key from '%s'\n"
 msgstr "Lekérem a %08lX kulcsot a %s kulcsszerverről.\n"
 
-#: g10/keyserver.c:1917
+#: g10/keyserver.c:1680
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr ""
@@ -6138,254 +6146,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:472
+#: g10/mainproc.c:473
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "Nyilvános kulcs: %08lX\n"
 
-#: g10/mainproc.c:524
+#: g10/mainproc.c:525
 #, 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:528 g10/pkclist.c:231
+#: g10/mainproc.c:529 g10/pkclist.c:231
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "               azaz \""
 
-#: g10/mainproc.c:532
+#: g10/mainproc.c:533
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "Titkosítva %s kulccsal, azonosító: %08lX\n"
 
-#: g10/mainproc.c:552 g10/mainproc.c:935
+#: g10/mainproc.c:553 g10/mainproc.c:937
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:560
+#: g10/mainproc.c:561
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "%lu jelszóval rejtjelezve\n"
 
-#: g10/mainproc.c:562
+#: g10/mainproc.c:563
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "1 jelszóval rejtjelezve\n"
 
-#: g10/mainproc.c:577 g10/mainproc.c:602
+#: g10/mainproc.c:578 g10/mainproc.c:603
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "Nyilvános kulcsú visszafejtés sikertelen: %s\n"
 
-#: g10/mainproc.c:613
+#: g10/mainproc.c:614
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "Nyilvános kulccsal titkosított adat: jó DEK.\n"
 
-#: g10/mainproc.c:642 g10/mainproc.c:663
+#: g10/mainproc.c:643 g10/mainproc.c:664
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "%s titkosított adatot feltételezek.\n"
 
-#: g10/mainproc.c:649
+#: g10/mainproc.c:650
 #, 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:742 g10/mainproc.c:780
+#: g10/mainproc.c:744 g10/mainproc.c:782
 #, 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:753
+#: g10/mainproc.c:755
 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:756
+#: g10/mainproc.c:758
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:761
+#: g10/mainproc.c:763
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "Visszafejtés sikertelen: %s.\n"
 
-#: g10/mainproc.c:773
+#: g10/mainproc.c:775
 #, c-format
 msgid "decryption okay\n"
 msgstr "Visszafejtés rendben.\n"
 
-#: g10/mainproc.c:786
+#: g10/mainproc.c:788
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "FIGYELEM: A titkosított üzenetet manipulálták!\n"
 
-#: g10/mainproc.c:804
+#: g10/mainproc.c:806
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "Visszafejtés sikertelen: %s.\n"
 
-#: g10/mainproc.c:851
+#: g10/mainproc.c:853
 #, 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:858
+#: g10/mainproc.c:860
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "Eredeti fájlnév: '%.*s'.\n"
 
-#: g10/mainproc.c:1135
+#: g10/mainproc.c:1137
 #, 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:1440 g10/mainproc.c:1483
+#: g10/mainproc.c:1442 g10/mainproc.c:1485
 #, fuzzy, c-format
 msgid "no signature found\n"
 msgstr "Jó aláírás a következőtől: \""
 
-#: g10/mainproc.c:1763
+#: g10/mainproc.c:1765
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ROSSZ aláírás a következőtől: \""
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1767
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Lejárt aláírás a következőtől: \""
 
-#: g10/mainproc.c:1767
+#: g10/mainproc.c:1769
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Jó aláírás a következőtől: \""
 
-#: g10/mainproc.c:1789
+#: g10/mainproc.c:1791
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "Aláírás-ellenőrzés elnyomva.\n"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1905
 #, 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:1919 g10/mainproc.c:1926
+#: g10/mainproc.c:1921 g10/mainproc.c:1928
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Az aláírás lejárt: %s.\n"
 
-#: g10/mainproc.c:1920 g10/mainproc.c:1927 sm/verify.c:480
+#: g10/mainproc.c:1922 g10/mainproc.c:1929 sm/verify.c:480
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "               azaz \""
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1933
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Aláírva: %.*s; kulcs: %s, %08lX.\n"
 
-#: g10/mainproc.c:1937
+#: g10/mainproc.c:1939
 #, fuzzy, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "               azaz \""
 
-#: g10/mainproc.c:1992
+#: g10/mainproc.c:1994
 #, c-format
 msgid "Key available at: "
 msgstr "Kulcs található: "
 
-#: g10/mainproc.c:2034
+#: g10/mainproc.c:2036
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2234
+#: g10/mainproc.c:2236
 msgid "[uncertain]"
 msgstr "[bizonytalan]"
 
-#: g10/mainproc.c:2272
+#: g10/mainproc.c:2274
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "               azaz \""
 
-#: g10/mainproc.c:2347
+#: g10/mainproc.c:2349
 #, 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:2363
+#: g10/mainproc.c:2365
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Az aláírás lejárt: %s.\n"
 
-#: g10/mainproc.c:2368
+#: g10/mainproc.c:2370
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Az aláírás lejár: %s.\n"
 
-#: g10/mainproc.c:2379
+#: g10/mainproc.c:2381
 #, 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:2380
+#: g10/mainproc.c:2382
 msgid "binary"
 msgstr "Bináris"
 
-#: g10/mainproc.c:2381
+#: g10/mainproc.c:2383
 msgid "textmode"
 msgstr "Szövegmódú"
 
-#: g10/mainproc.c:2381 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2383 g10/trust.c:112 dirmngr/ocsp.c:793
 msgid "unknown"
 msgstr "Ismeretlen módú"
 
-#: g10/mainproc.c:2383
+#: g10/mainproc.c:2385
 #, fuzzy
 #| msgid "unknown pubkey algorithm"
 msgid ", key algorithm "
 msgstr "ismeretlen nyilvános kulcsú algoritmus"
 
-#: g10/mainproc.c:2418
+#: g10/mainproc.c:2420
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2457
+#: g10/mainproc.c:2459
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nem tudom ellenőrizni az aláírást: %s.\n"
 
-#: g10/mainproc.c:2553 g10/mainproc.c:2572 g10/mainproc.c:2696
+#: g10/mainproc.c:2555 g10/mainproc.c:2574 g10/mainproc.c:2698
 #, c-format
 msgid "not a detached signature\n"
 msgstr "Nem különálló aláírás.\n"
 
-#: g10/mainproc.c:2606
+#: g10/mainproc.c:2608
 #, 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:2615
+#: g10/mainproc.c:2617
 #, 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:2700
+#: g10/mainproc.c:2702
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Régi stílusú (PGP 2.x) aláírás.\n"
@@ -6575,53 +6583,58 @@ msgstr "Kritikus aláírás-jelölés: "
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "A %d típusú alcsomag kritikus bitje beállított.\n"
 
-#: g10/passphrase.c:208
+#: g10/passphrase.c:201 sm/decrypt.c:669
+#, fuzzy
+msgid "Please enter the passphrase for decryption."
+msgstr "jelszóváltoztatás"
+
+#: g10/passphrase.c:203
 msgid "Enter passphrase\n"
 msgstr "�rja be a jelszót!\n"
 
-#: g10/passphrase.c:219
+#: g10/passphrase.c:227
 #, c-format
 msgid "cancelled by user\n"
 msgstr "A felhasználó megszakította a műveletet.\n"
 
-#: g10/passphrase.c:460
+#: g10/passphrase.c:472
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr ""
 " \n"
 "  (fő kulcsazonosító: %08lX)"
 
-#: g10/passphrase.c:467
+#: g10/passphrase.c:479
 #, fuzzy
 msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 msgstr "Kérem, adja meg a jelszót! Ezt egy titkos mondat. \n"
 
-#: g10/passphrase.c:471
+#: g10/passphrase.c:483
 #, fuzzy
 msgid "Please enter the passphrase to import the OpenPGP secret key:"
 msgstr "Kérem, adja meg a jelszót! Ezt egy titkos mondat. \n"
 
-#: g10/passphrase.c:476
+#: g10/passphrase.c:488
 #, fuzzy
 msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 msgstr "Kérem, adja meg a jelszót! Ezt egy titkos mondat. \n"
 
-#: g10/passphrase.c:479
+#: g10/passphrase.c:491
 #, fuzzy
 msgid "Please enter the passphrase to export the OpenPGP secret key:"
 msgstr "Kérem, adja meg a jelszót! Ezt egy titkos mondat. \n"
 
-#: g10/passphrase.c:484
+#: g10/passphrase.c:496
 #, fuzzy
 msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 msgstr "Valóban törli a kiválasztott kulcsokat? "
 
-#: g10/passphrase.c:487
+#: g10/passphrase.c:499
 #, fuzzy
 msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgstr "Valóban törli a kiválasztott kulcsokat? "
 
-#: g10/passphrase.c:496
+#: g10/passphrase.c:508
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -6794,7 +6807,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:313 g10/revoke.c:803
+#: g10/pkclist.c:313 g10/revoke.c:804
 msgid "Your decision? "
 msgstr "Mit választ? "
 
@@ -7095,7 +7108,7 @@ msgstr "Nem tudom megnyitni a(z) \"%s\" aláírt adatot!\n"
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "Nem tudom megnyitni a(z) \"%s\" aláírt adatot!\n"
 
-#: g10/pubkey-enc.c:99 sm/decrypt.c:879
+#: g10/pubkey-enc.c:99 sm/decrypt.c:1329
 #, fuzzy, c-format
 msgid "key %s is not suitable for decryption in %s mode\n"
 msgstr "%08lX kulcs: Nincs felhasználói azonosító.\n"
@@ -7142,7 +7155,7 @@ msgid "Note: key has been revoked"
 msgstr "MEGJEGYZÉS: A kulcsot visszavonták."
 
 #: g10/revoke.c:100 g10/revoke.c:126 g10/revoke.c:172 g10/revoke.c:184
-#: g10/revoke.c:502
+#: g10/revoke.c:503
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet sikertelen: %s.\n"
@@ -7171,11 +7184,11 @@ msgstr "Titkos kulcs rendelkezésre áll.\n"
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Csináljunk egy visszavonó igazolást ehhez a kulcshoz? "
 
-#: g10/revoke.c:334 g10/revoke.c:744
+#: g10/revoke.c:334 g10/revoke.c:745
 msgid "ASCII armored output forced.\n"
 msgstr "ASCII-páncélozott kimenet kiválasztva.\n"
 
-#: g10/revoke.c:350 g10/revoke.c:481
+#: g10/revoke.c:350 g10/revoke.c:482
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet sikertelen: %s\n"
@@ -7189,19 +7202,19 @@ msgstr "Visszavonó igazolás létrehozva.\n"
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "Nem találtam visszavonó kulcsot a következőhöz: \"%s\".\n"
 
-#: g10/revoke.c:567
+#: g10/revoke.c:568
 #, fuzzy
 msgid "This is a revocation certificate for the OpenPGP key:"
 msgstr "Csináljunk egy visszavonó igazolást ehhez a kulcshoz? "
 
-#: g10/revoke.c:583
+#: g10/revoke.c:584
 msgid ""
 "A revocation certificate is a kind of \"kill switch\" to publicly\n"
 "declare that a key shall not anymore be used.  It is not possible\n"
 "to retract such a revocation certificate once it has been published."
 msgstr ""
 
-#: g10/revoke.c:586
+#: g10/revoke.c:587
 msgid ""
 "Use it to revoke this key in case of a compromise or loss of\n"
 "the secret key.  However, if the secret key is still accessible,\n"
@@ -7210,20 +7223,20 @@ msgid ""
 "of the gpg command \"--generate-revocation\" in the GnuPG manual."
 msgstr ""
 
-#: g10/revoke.c:592
+#: g10/revoke.c:593
 msgid ""
 "To avoid an accidental use of this file, a colon has been inserted\n"
 "before the 5 dashes below.  Remove this colon with a text editor\n"
 "before importing and publishing this revocation certificate."
 msgstr ""
 
-#: g10/revoke.c:611
+#: g10/revoke.c:612
 #, fuzzy, c-format
 #| msgid "Revocation certificate created.\n"
 msgid "revocation certificate stored as '%s.rev'\n"
 msgstr "Visszavonó igazolás létrehozva.\n"
 
-#: g10/revoke.c:655
+#: g10/revoke.c:656
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found\n"
 msgstr "\"%s\" titkos kulcs nem található: %s\n"
@@ -7231,23 +7244,23 @@ msgstr "\"%s\" titkos kulcs nem található: %s\n"
 #. TRANSLATORS: The %s prints a key specification which
 #. for example has been given at the command line.  Several lines
 #. lines with secret key infos are printed after this message.
-#: g10/revoke.c:680
+#: g10/revoke.c:681
 #, c-format
 msgid "'%s' matches multiple secret keys:\n"
 msgstr ""
 
-#: g10/revoke.c:705
+#: g10/revoke.c:706
 #, fuzzy, c-format
 #| msgid "error creating keyring `%s': %s\n"
 msgid "error searching the keyring: %s\n"
 msgstr "Hiba a(z) \"%s\" kulcskarika létrehozásakor: %s\n"
 
-#: g10/revoke.c:728
+#: g10/revoke.c:729
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Csináljunk egy visszavonó igazolást ehhez a kulcshoz? "
 
-#: g10/revoke.c:752
+#: g10/revoke.c:753
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -7265,33 +7278,33 @@ msgstr ""
 "adathordozó olvashatatlanná válik. De vigyázat: az Ön gépének nyomtatási\n"
 "rendszere is tárolhatja az adatot, és mások esetleg hozzáférhetnek ehhez!\n"
 
-#: g10/revoke.c:786
+#: g10/revoke.c:787
 msgid "Please select the reason for the revocation:\n"
 msgstr "Kérem, válassza ki a visszavonás okát:\n"
 
-#: g10/revoke.c:796
+#: g10/revoke.c:797
 msgid "Cancel"
 msgstr "Mégsem"
 
-#: g10/revoke.c:798
+#: g10/revoke.c:799
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Valószínűleg a(z) %d. lehetőséget akarja választani.)\n"
 
-#: g10/revoke.c:839
+#: g10/revoke.c:843
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Adjon meg egy nem kötelező leírást! Üres sorral fejezze be:\n"
 
-#: g10/revoke.c:867
+#: g10/revoke.c:871
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Visszavonás oka: %s\n"
 
-#: g10/revoke.c:869
+#: g10/revoke.c:873
 msgid "(No description given)\n"
 msgstr "(Nincs leírás.)\n"
 
-#: g10/revoke.c:874
+#: g10/revoke.c:878
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Ez így rendben van? "
@@ -7468,24 +7481,24 @@ msgstr "Aláírom:"
 msgid "%s.%s encryption will be used\n"
 msgstr "%s titkosítást fogok használni.\n"
 
-#: g10/skclist.c:172 g10/skclist.c:253
+#: g10/skclist.c:173 g10/skclist.c:254
 #, c-format
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "A kulcs nincs \"nem biztonságosnak\" jelölve,\n"
 "nem tudom a pótló véletlenszám-generátorral használni!\n"
 
-#: g10/skclist.c:204
+#: g10/skclist.c:205
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "\"%s\"-t kihagytam: másodpéldány.\n"
 
-#: g10/skclist.c:223
+#: g10/skclist.c:224
 #, c-format
 msgid "skipped: secret key already present\n"
 msgstr "Kihagytam: titkos kulcs már jelen van.\n"
 
-#: g10/skclist.c:242
+#: g10/skclist.c:243
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
@@ -7714,10 +7727,10 @@ msgstr ""
 msgid "TOFU DB error"
 msgstr ""
 
-#: g10/tofu.c:687 g10/tofu.c:2073 g10/tofu.c:2354 g10/tofu.c:2373
-#: g10/tofu.c:2386 g10/tofu.c:2398 g10/tofu.c:2413 g10/tofu.c:2425
-#: g10/tofu.c:3021 g10/tofu.c:3038 g10/tofu.c:3075 g10/tofu.c:3092
-#: g10/tofu.c:3404
+#: g10/tofu.c:687 g10/tofu.c:2077 g10/tofu.c:2358 g10/tofu.c:2377
+#: g10/tofu.c:2390 g10/tofu.c:2402 g10/tofu.c:2417 g10/tofu.c:2429
+#: g10/tofu.c:3025 g10/tofu.c:3042 g10/tofu.c:3079 g10/tofu.c:3096
+#: g10/tofu.c:3408
 #, fuzzy, c-format
 msgid "error reading TOFU database: %s\n"
 msgstr "Hiba %s-ra/-re küldéskor: %s\n"
@@ -7739,7 +7752,7 @@ msgstr "%s: Hiba könyvtárrekord írásakor: %s.\n"
 msgid "error opening TOFU database '%s': %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: g10/tofu.c:1148 g10/tofu.c:3458 g10/tofu.c:3604
+#: g10/tofu.c:1148 g10/tofu.c:3462 g10/tofu.c:3608
 #, fuzzy, c-format
 msgid "error updating TOFU database: %s\n"
 msgstr "Hiba %s-ra/-re küldéskor: %s\n"
@@ -7779,43 +7792,43 @@ msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 msgid "This key's user IDs:\n"
 msgstr "kilistázza a kulcs- és felhasználóazonosítókat"
 
-#: g10/tofu.c:1634 g10/tofu.c:1799
+#: g10/tofu.c:1634 g10/tofu.c:1801
 #, fuzzy, c-format
 #| msgid "Policy: "
 msgid "policy: %s"
 msgstr "Eljárásmód: "
 
-#: g10/tofu.c:1725
+#: g10/tofu.c:1727
 #, fuzzy, c-format
 msgid "error gathering signature stats: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: g10/tofu.c:1729
+#: g10/tofu.c:1731
 #, c-format
 msgid "The email address \"%s\" is associated with %d key:\n"
 msgid_plural "The email address \"%s\" is associated with %d keys:\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1747
+#: g10/tofu.c:1749
 #, c-format
 msgid "Statistics for keys with the email address \"%s\":\n"
 msgstr ""
 
-#: g10/tofu.c:1797
+#: g10/tofu.c:1799
 #, fuzzy
 #| msgid "list keys"
 msgid "this key"
 msgstr "kulcsok listázása"
 
-#: g10/tofu.c:1823
+#: g10/tofu.c:1825
 #, fuzzy, c-format
 msgid "Verified %d message."
 msgid_plural "Verified %d messages."
 msgstr[0] "|algo [fájlok]|üzenet kivonatának kiírása"
 msgstr[1] "|algo [fájlok]|üzenet kivonatának kiírása"
 
-#: g10/tofu.c:1827
+#: g10/tofu.c:1829
 #, fuzzy, c-format
 #| msgid "encrypted with %lu passphrases\n"
 msgid "Encrypted %d message."
@@ -7823,68 +7836,68 @@ msgid_plural "Encrypted %d messages."
 msgstr[0] "%lu jelszóval rejtjelezve\n"
 msgstr[1] "%lu jelszóval rejtjelezve\n"
 
-#: g10/tofu.c:1834
+#: g10/tofu.c:1836
 #, fuzzy, c-format
 msgid "Verified %d message in the future."
 msgid_plural "Verified %d messages in the future."
 msgstr[0] "|algo [fájlok]|üzenet kivonatának kiírása"
 msgstr[1] "|algo [fájlok]|üzenet kivonatának kiírása"
 
-#: g10/tofu.c:1838
+#: g10/tofu.c:1840
 #, fuzzy, c-format
 msgid "Encrypted %d message in the future."
 msgid_plural "Encrypted %d messages in the future."
 msgstr[0] "|algo [fájlok]|üzenet kivonatának kiírása"
 msgstr[1] "|algo [fájlok]|üzenet kivonatának kiírása"
 
-#: g10/tofu.c:1852
+#: g10/tofu.c:1854
 #, c-format
 msgid "Messages verified over the past %d day: %d."
 msgid_plural "Messages verified over the past %d days: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1858
+#: g10/tofu.c:1860
 #, c-format
 msgid "Messages encrypted over the past %d day: %d."
 msgid_plural "Messages encrypted over the past %d days: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1868
+#: g10/tofu.c:1870
 #, c-format
 msgid "Messages verified over the past %d month: %d."
 msgid_plural "Messages verified over the past %d months: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1874
+#: g10/tofu.c:1876
 #, c-format
 msgid "Messages encrypted over the past %d month: %d."
 msgid_plural "Messages encrypted over the past %d months: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1884
+#: g10/tofu.c:1886
 #, c-format
 msgid "Messages verified over the past %d year: %d."
 msgid_plural "Messages verified over the past %d years: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1890
+#: g10/tofu.c:1892
 #, c-format
 msgid "Messages encrypted over the past %d year: %d."
 msgid_plural "Messages encrypted over the past %d years: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1898
+#: g10/tofu.c:1900
 #, c-format
 msgid "Messages verified in the past: %d."
 msgstr ""
 
-#: g10/tofu.c:1902
+#: g10/tofu.c:1904
 #, fuzzy, c-format
 msgid "Messages encrypted in the past: %d."
 msgstr "|algo [fájlok]|üzenet kivonatának kiírása"
@@ -7892,130 +7905,130 @@ msgstr "|algo [fájlok]|üzenet kivonatának kiírása"
 #. TRANSLATORS: Please translate the text found in the source
 #. * file below.  We don't directly internationalize that text so
 #. * that we can tweak it without breaking translations.
-#: g10/tofu.c:1919
+#: g10/tofu.c:1921
 msgid "TOFU detected a binding conflict"
 msgstr ""
 
 #. TRANSLATORS: Two letters (normally the lower and upper case
 #. * version of the hotkey) for each of the five choices.  If
 #. * there is only one choice in your language, repeat it.
-#: g10/tofu.c:1961
+#: g10/tofu.c:1963
 msgid "gGaAuUrRbB"
 msgstr ""
 
-#: g10/tofu.c:1967
+#: g10/tofu.c:1969
 msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 
-#: g10/tofu.c:1975
+#: g10/tofu.c:1978
 msgid "Defaulting to unknown.\n"
 msgstr ""
 
-#: g10/tofu.c:2093 g10/tofu.c:2228
+#: g10/tofu.c:2097 g10/tofu.c:2232
 #, c-format
 msgid "TOFU db corruption detected.\n"
 msgstr ""
 
-#: g10/tofu.c:2829
+#: g10/tofu.c:2833
 #, fuzzy, c-format
 msgid "error changing TOFU policy: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: g10/tofu.c:2880
+#: g10/tofu.c:2884
 #, c-format
 msgid "%lld~year"
 msgid_plural "%lld~years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2885
+#: g10/tofu.c:2889
 #, c-format
 msgid "%lld~month"
 msgid_plural "%lld~months"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2890
+#: g10/tofu.c:2894
 #, c-format
 msgid "%lld~week"
 msgid_plural "%lld~weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2895
+#: g10/tofu.c:2899
 #, c-format
 msgid "%lld~day"
 msgid_plural "%lld~days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2900
+#: g10/tofu.c:2904
 #, c-format
 msgid "%lld~hour"
 msgid_plural "%lld~hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2905
+#: g10/tofu.c:2909
 #, c-format
 msgid "%lld~minute"
 msgid_plural "%lld~minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2907
+#: g10/tofu.c:2911
 #, c-format
 msgid "%lld~second"
 msgid_plural "%lld~seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:3145
+#: g10/tofu.c:3149
 #, c-format
 msgid "%s: Verified 0~signatures and encrypted 0~messages."
 msgstr ""
 
-#: g10/tofu.c:3151
+#: g10/tofu.c:3155
 #, fuzzy, c-format
 #| msgid "Deleted %d signatures.\n"
 msgid "%s: Verified 0 signatures."
 msgstr "Töröltem %d aláírást.\n"
 
-#: g10/tofu.c:3165
+#: g10/tofu.c:3169
 #, fuzzy
 #| msgid "encrypted with %lu passphrases\n"
 msgid "Encrypted 0 messages."
 msgstr "%lu jelszóval rejtjelezve\n"
 
-#: g10/tofu.c:3181
+#: g10/tofu.c:3185
 #, fuzzy, c-format
 #| msgid "Policy: "
 msgid "(policy: %s)"
 msgstr "Eljárásmód: "
 
-#: g10/tofu.c:3215
+#: g10/tofu.c:3219
 #, c-format
 msgid ""
 "Warning: we have yet to see a message signed using this key and user id!\n"
 msgstr ""
 
-#: g10/tofu.c:3218
+#: g10/tofu.c:3222
 #, c-format
 msgid ""
 "Warning: we've only seen one message signed using this key and user id!\n"
 msgstr ""
 
-#: g10/tofu.c:3222
+#: g10/tofu.c:3226
 #, c-format
 msgid "Warning: you have yet to encrypt a message to this key!\n"
 msgstr ""
 
-#: g10/tofu.c:3225
+#: g10/tofu.c:3229
 #, c-format
 msgid "Warning: you have only encrypted one message to this key!\n"
 msgstr ""
 
-#: g10/tofu.c:3254
+#: g10/tofu.c:3258
 #, c-format
 msgid ""
 "Warning: if you think you've seen more signatures by this key and user id, "
@@ -8032,13 +8045,13 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:3339 g10/tofu.c:3502 g10/tofu.c:3708 g10/tofu.c:3761
-#: g10/tofu.c:3902 g10/tofu.c:3979 g10/tofu.c:4017
+#: g10/tofu.c:3343 g10/tofu.c:3506 g10/tofu.c:3712 g10/tofu.c:3765
+#: g10/tofu.c:3906 g10/tofu.c:3983 g10/tofu.c:4021
 #, fuzzy, c-format
 msgid "error opening TOFU database: %s\n"
 msgstr "Hiba %s-ra/-re küldéskor: %s\n"
 
-#: g10/tofu.c:3535
+#: g10/tofu.c:3539
 #, c-format
 msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
 msgstr ""
@@ -8105,7 +8118,7 @@ msgstr ""
 msgid "no need for a trustdb check\n"
 msgstr "Nincs szükség a bizalmi adatbázis ellenőrzésére.\n"
 
-#: g10/trustdb.c:601 g10/trustdb.c:2272
+#: g10/trustdb.c:601 g10/trustdb.c:2273
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "A bizalmi adatbázis következő ellenőrzése: %s.\n"
@@ -8135,14 +8148,14 @@ msgstr "Kérem, hajtson végre egy --check-trustdb parancsot!\n"
 msgid "checking the trustdb\n"
 msgstr "Ellenőrzöm a bizalmi adatbázist.\n"
 
-#: g10/trustdb.c:1993
+#: g10/trustdb.c:1994
 #, fuzzy, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr[0] "Eddig %lu kulcsot dolgoztam fel.\n"
 msgstr[1] "Eddig %lu kulcsot dolgoztam fel.\n"
 
-#: g10/trustdb.c:1996
+#: g10/trustdb.c:1997
 #, fuzzy, c-format
 #| msgid "%d keys processed (%d validity counts cleared)\n"
 msgid " (%d validity count cleared)\n"
@@ -8150,45 +8163,45 @@ msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] "%d kulcsot feldolgoztam (%d érvényességszámlálót töröltem)\n"
 msgstr[1] "%d kulcsot feldolgoztam (%d érvényességszámlálót töröltem)\n"
 
-#: g10/trustdb.c:2066
+#: g10/trustdb.c:2067
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "Nem találtam alapvetően megbízható kulcsot.\n"
 
-#: g10/trustdb.c:2080
+#: g10/trustdb.c:2081
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "Nem találom az alapvetően megbízható %08lX kulcs nyilvános kulcsát!\n"
 
-#: g10/trustdb.c:2198
+#: g10/trustdb.c:2199
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2279
+#: g10/trustdb.c:2280
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "%lu bizalmi rekord, %d típus: írás sikertelen: %s.\n"
 
-#: g10/trust.c:125
+#: g10/trust.c:114
 msgid "undefined"
 msgstr ""
 
-#: g10/trust.c:126
+#: g10/trust.c:115
 #, fuzzy
 msgid "never"
 msgstr "soha      "
 
-#: g10/trust.c:127
+#: g10/trust.c:116
 msgid "marginal"
 msgstr ""
 
-#: g10/trust.c:128
+#: g10/trust.c:117
 msgid "full"
 msgstr ""
 
-#: g10/trust.c:129
+#: g10/trust.c:118
 msgid "ultimate"
 msgstr ""
 
@@ -8200,43 +8213,43 @@ msgstr ""
 #. It gets passed to atoi() so everything after the number is
 #. essentially a comment and need not be translated.  Either key and
 #. uid are both NULL, or neither are NULL.
-#: g10/trust.c:166
+#: g10/trust.c:155
 msgid "10 translator see trust.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trust.c:169
+#: g10/trust.c:158
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[visszavont] "
 
-#: g10/trust.c:171 g10/trust.c:177
+#: g10/trust.c:160 g10/trust.c:166
 #, fuzzy
 msgid "[ expired]"
 msgstr "[lejárt]     "
 
-#: g10/trust.c:176
+#: g10/trust.c:165
 #, fuzzy
 msgid "[ unknown]"
 msgstr "Ismeretlen módú"
 
-#: g10/trust.c:178
+#: g10/trust.c:167
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trust.c:179
+#: g10/trust.c:168
 #, fuzzy
 msgid "[  never ]"
 msgstr "soha      "
 
-#: g10/trust.c:180
+#: g10/trust.c:169
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trust.c:181
+#: g10/trust.c:170
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trust.c:182
+#: g10/trust.c:171
 msgid "[ultimate]"
 msgstr ""
 
@@ -8295,16 +8308,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:4937 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2386
+#: scd/app-piv.c:1770 scd/app-p15.c:5035 scd/app-nks.c:1530
+#: scd/app-openpgp.c:2387
 #, 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:4956 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2402
+#: scd/app-piv.c:1787 scd/app-p15.c:5054 scd/app-nks.c:1549
+#: scd/app-openpgp.c:2403
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
@@ -8339,10 +8352,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:2669
-#: scd/app-openpgp.c:2693 scd/app-openpgp.c:2871 scd/app-openpgp.c:2893
-#: scd/app-openpgp.c:3074 scd/app-openpgp.c:3361 scd/app-openpgp.c:3408
-#: scd/app-openpgp.c:3545 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2670
+#: scd/app-openpgp.c:2694 scd/app-openpgp.c:2872 scd/app-openpgp.c:2894
+#: scd/app-openpgp.c:3075 scd/app-openpgp.c:3362 scd/app-openpgp.c:3409
+#: scd/app-openpgp.c:3547 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -8362,96 +8375,96 @@ msgstr ""
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr ""
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3616
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3618
 #, 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:3620
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3622
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3622
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3624
 #, fuzzy, c-format
 msgid "generating new key\n"
 msgstr "új kulcspár létrehozása"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3624
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3626
 #, fuzzy, c-format
 msgid "writing new key\n"
 msgstr "új kulcspár létrehozása"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4484 scd/app-openpgp.c:4767
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4486 scd/app-openpgp.c:4761
 #, 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:1615
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1616
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1622
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1623
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1732
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1733
 #, 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:4943
+#: scd/app-piv.c:3279 scd/app-openpgp.c:4937
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4951
+#: scd/app-piv.c:3294 scd/app-openpgp.c:4945
 #, 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:4957
+#: scd/app-piv.c:3300 scd/app-openpgp.c:4951
 #, 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:1842 scd/app-openpgp.c:4966
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1843 scd/app-openpgp.c:4960
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-p15.c:5035 scd/app-nks.c:2038
+#: scd/app-p15.c:5133 scd/app-nks.c:2038
 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:5038 scd/app-openpgp.c:2818
+#: scd/app-p15.c:5136 scd/app-openpgp.c:2819
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "jelszóváltoztatás"
 
-#: scd/app-p15.c:5040 scd/app-nks.c:2028
+#: scd/app-p15.c:5138 scd/app-nks.c:2028
 #, 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:5043 scd/app-nks.c:2019
+#: scd/app-p15.c:5141 scd/app-nks.c:2019
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "jelszóváltoztatás"
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4321
+#: scd/app-nks.c:1468 scd/app-openpgp.c:4323
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1476 scd/app-openpgp.c:4333
+#: scd/app-nks.c:1476 scd/app-openpgp.c:4335
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
@@ -8493,27 +8506,27 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3442 scd/app-dinsig.c:534
+#: scd/app-nks.c:2221 scd/app-openpgp.c:3443 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:943
+#: scd/app-openpgp.c:944
 #, 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:956
+#: scd/app-openpgp.c:957
 #, 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:1427 scd/app-openpgp.c:3389 scd/app-openpgp.c:5715
+#: scd/app-openpgp.c:1428 scd/app-openpgp.c:3390 scd/app-openpgp.c:5709
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1949
+#: scd/app-openpgp.c:1950
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "A kulcsblokk törlése sikertelen: %s.\n"
@@ -8521,43 +8534,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:2373
+#: scd/app-openpgp.c:2374
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2621
+#: scd/app-openpgp.c:2622
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2628
+#: scd/app-openpgp.c:2629
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2641
+#: scd/app-openpgp.c:2642
 #, fuzzy
 msgid "||Please unlock the card"
 msgstr "jelszóváltoztatás"
 
-#: scd/app-openpgp.c:2700 scd/app-openpgp.c:2900 scd/app-openpgp.c:3368
+#: scd/app-openpgp.c:2701 scd/app-openpgp.c:2901 scd/app-openpgp.c:3369
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2717 scd/app-openpgp.c:2760 scd/app-openpgp.c:2917
-#: scd/app-openpgp.c:5325
+#: scd/app-openpgp.c:2718 scd/app-openpgp.c:2761 scd/app-openpgp.c:2918
+#: scd/app-openpgp.c:5319
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "Küldés a kulcsszerverre sikertelen: %s\n"
 
-#: scd/app-openpgp.c:2804 scd/app-openpgp.c:5724
+#: scd/app-openpgp.c:2805 scd/app-openpgp.c:5718
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2808
+#: scd/app-openpgp.c:2809
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8565,22 +8578,22 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: scd/app-openpgp.c:2841
+#: scd/app-openpgp.c:2842
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3355
+#: scd/app-openpgp.c:3356
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "jelszóváltoztatás"
 
-#: scd/app-openpgp.c:3404
+#: scd/app-openpgp.c:3405
 #, 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:3414 scd/app-openpgp.c:3481
+#: scd/app-openpgp.c:3415 scd/app-openpgp.c:3484
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
@@ -8588,81 +8601,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:3437
+#: scd/app-openpgp.c:3438
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3439
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3439
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3541
+#: scd/app-openpgp.c:3543
 #, fuzzy
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "jelszóváltoztatás"
 
-#: scd/app-openpgp.c:3542
+#: scd/app-openpgp.c:3544
 #, fuzzy
 msgid "||Please enter the PIN and New PIN"
 msgstr "jelszóváltoztatás"
 
-#: scd/app-openpgp.c:3600 scd/app-openpgp.c:5026
+#: scd/app-openpgp.c:3602 scd/app-openpgp.c:5020
 #, fuzzy, c-format
 msgid "error reading application data\n"
 msgstr "Hiba a kulcsblokk olvasásakor: %s\n"
 
-#: scd/app-openpgp.c:3606 scd/app-openpgp.c:5033
+#: scd/app-openpgp.c:3608 scd/app-openpgp.c:5027
 #, fuzzy, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "%s: Hiba szabad rekord olvasásakor: %s.\n"
 
-#: scd/app-openpgp.c:4302 scd/app-openpgp.c:4657
+#: scd/app-openpgp.c:4304 scd/app-openpgp.c:4653
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4343 scd/app-openpgp.c:4351
+#: scd/app-openpgp.c:4345 scd/app-openpgp.c:4353
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4651
+#: scd/app-openpgp.c:4647
 #, fuzzy, c-format
 #| msgid "unsupported URI"
 msgid "unsupported curve\n"
 msgstr "nem támogatott URI"
 
-#: scd/app-openpgp.c:4991
+#: scd/app-openpgp.c:4985
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5041
+#: scd/app-openpgp.c:5035
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5240
+#: scd/app-openpgp.c:5234
 #, 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:5298
+#: scd/app-openpgp.c:5292
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5729
+#: scd/app-openpgp.c:5723
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:6241 scd/app-openpgp.c:6252
+#: scd/app-openpgp.c:6250 scd/app-openpgp.c:6261
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Nem találtam érvényes OpenPGP adatot.\n"
@@ -8683,7 +8696,7 @@ msgstr ""
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:274 dirmngr/dirmngr.c:198
+#: scd/scdaemon.c:136 sm/gpgsm.c:274 dirmngr/dirmngr.c:199
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
@@ -8748,12 +8761,12 @@ msgstr ""
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2104
+#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2143
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2112
+#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2151
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -8763,11 +8776,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:199 sm/certchain.c:2172
+#: sm/certchain.c:199 sm/certchain.c:2174
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:200 sm/certchain.c:2172
+#: sm/certchain.c:200 sm/certchain.c:2174
 #, fuzzy
 msgid "shell"
 msgstr "help"
@@ -8801,231 +8814,231 @@ msgstr "�rom a titkos kulcsot a %s állományba.\n"
 msgid "certificate policy not allowed"
 msgstr "�rom a titkos kulcsot a %s állományba.\n"
 
-#: sm/certchain.c:595 sm/keydb.c:1891 sm/keydb.c:1980
+#: sm/certchain.c:596 sm/keydb.c:1913 sm/keydb.c:2002
 #, fuzzy, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
 
-#: sm/certchain.c:624
+#: sm/certchain.c:625
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:644
+#: sm/certchain.c:645
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#: sm/certchain.c:724 dirmngr/ocsp.c:683
 #, fuzzy, c-format
 #| msgid "%s: can't access: %s\n"
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "%s: Nem tudom elérni: %s.\n"
 
-#: sm/certchain.c:791
+#: sm/certchain.c:792
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr ""
 
-#: sm/certchain.c:816
+#: sm/certchain.c:817
 #, fuzzy, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: sm/certchain.c:819
+#: sm/certchain.c:820
 #, fuzzy, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "A kulcsblokk törlése sikertelen: %s.\n"
 
-#: sm/certchain.c:1046 sm/certchain.c:1561 sm/certchain.c:2200 sm/decrypt.c:643
-#: sm/encrypt.c:620 sm/import.c:414 sm/keydb.c:1898 sm/keydb.c:1987
-#: sm/sign.c:428 sm/verify.c:117
+#: sm/certchain.c:1047 sm/certchain.c:1562 sm/certchain.c:2202
+#: sm/decrypt.c:1084 sm/encrypt.c:621 sm/import.c:414 sm/keydb.c:1920
+#: sm/keydb.c:2009 sm/sign.c:428 sm/verify.c:117
 #, fuzzy, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
 
-#: sm/certchain.c:1232
+#: sm/certchain.c:1233
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "MEGJEGYZÉS: A kulcsot visszavonták."
 
-#: sm/certchain.c:1247
+#: sm/certchain.c:1248
 msgid "the status of the certificate is unknown"
 msgstr ""
 
-#: sm/certchain.c:1254
+#: sm/certchain.c:1255
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:1260
+#: sm/certchain.c:1261
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "A létrehozott aláírás ellenőrzése sikertelen: %s.\n"
 
-#: sm/certchain.c:1289 sm/certchain.c:1357 dirmngr/validate.c:497
+#: sm/certchain.c:1290 sm/certchain.c:1358 dirmngr/validate.c:497
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:1304 sm/certchain.c:1389 dirmngr/validate.c:515
+#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:515
 #, c-format
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1305 sm/certchain.c:1390
+#: sm/certchain.c:1306 sm/certchain.c:1391
 #, fuzzy
 msgid "root certificate not yet valid"
 msgstr "�rom a titkos kulcsot a %s állományba.\n"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1307 sm/certchain.c:1392
 msgid "intermediate certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1319 dirmngr/validate.c:526
+#: sm/certchain.c:1320 dirmngr/validate.c:526
 #, fuzzy, c-format
 msgid "certificate has expired"
 msgstr "Ez a kulcs lejárt!"
 
-#: sm/certchain.c:1320
+#: sm/certchain.c:1321
 #, fuzzy
 msgid "root certificate has expired"
 msgstr "Ez a kulcs lejárt!"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1322
 #, fuzzy
 msgid "intermediate certificate has expired"
 msgstr "Ez a kulcs lejárt!"
 
-#: sm/certchain.c:1363
+#: sm/certchain.c:1364
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:1372
+#: sm/certchain.c:1373
 #, fuzzy
 msgid "certificate with invalid validity"
 msgstr "Ez a kulcs lejárt!"
 
-#: sm/certchain.c:1409
+#: sm/certchain.c:1410
 msgid "signature not created during lifetime of certificate"
 msgstr ""
 
-#: sm/certchain.c:1411
+#: sm/certchain.c:1412
 msgid "certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1413
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1416
+#: sm/certchain.c:1417
 #, fuzzy, c-format
 msgid "  (  signature created at "
 msgstr "              új aláírások: %lu\n"
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1418
 #, fuzzy, c-format
 msgid "  (certificate created at "
 msgstr "Visszavonó igazolás létrehozva.\n"
 
-#: sm/certchain.c:1420
+#: sm/certchain.c:1421
 #, fuzzy, c-format
 msgid "  (certificate valid from "
 msgstr "rossz igazolás"
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1422
 #, c-format
 msgid "  (     issuer valid from "
 msgstr ""
 
-#: sm/certchain.c:1451 dirmngr/validate.c:577
+#: sm/certchain.c:1452 dirmngr/validate.c:577
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "megmutatja az ujjlenyomatot"
 
-#: sm/certchain.c:1460
+#: sm/certchain.c:1461
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:1473
+#: sm/certchain.c:1474
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1479
+#: sm/certchain.c:1480
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1538
+#: sm/certchain.c:1539
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 
-#: sm/certchain.c:1602
+#: sm/certchain.c:1603
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "visszavonási igazolás készítése"
 
-#: sm/certchain.c:1680
+#: sm/certchain.c:1681
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1749 dirmngr/validate.c:575
+#: sm/certchain.c:1750 dirmngr/validate.c:575
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:1765
+#: sm/certchain.c:1766
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "A létrehozott aláírás ellenőrzése sikertelen: %s.\n"
 
-#: sm/certchain.c:1796 sm/import.c:175 dirmngr/validate.c:630
+#: sm/certchain.c:1797 sm/import.c:175 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1808 dirmngr/validate.c:642
+#: sm/certchain.c:1809 dirmngr/validate.c:642
 #, c-format
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1842 dirmngr/validate.c:668
+#: sm/certchain.c:1844 dirmngr/validate.c:668
 #, fuzzy, c-format
 msgid "certificate has a BAD signature"
 msgstr "aláírás ellenőrzése"
 
-#: sm/certchain.c:1874 dirmngr/validate.c:692
+#: sm/certchain.c:1876 dirmngr/validate.c:692
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1933 dirmngr/validate.c:717
+#: sm/certchain.c:1935 dirmngr/validate.c:717
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1975 sm/certchain.c:2275 dirmngr/validate.c:747
+#: sm/certchain.c:1977 sm/certchain.c:2278 dirmngr/validate.c:747
 #, fuzzy, c-format
 msgid "certificate is good\n"
 msgstr "%c%lu preferencia kétszer szerepel!\n"
 
-#: sm/certchain.c:1976
+#: sm/certchain.c:1978
 #, fuzzy, c-format
 msgid "intermediate certificate is good\n"
 msgstr "Visszavonó igazolás létrehozva.\n"
 
-#: sm/certchain.c:1977
+#: sm/certchain.c:1979
 #, fuzzy, c-format
 msgid "root certificate is good\n"
 msgstr "rossz igazolás"
 
-#: sm/certchain.c:2159
+#: sm/certchain.c:2161
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:2168
+#: sm/certchain.c:2170
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -9036,18 +9049,18 @@ 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:1372 dirmngr/validate.c:903
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1411 dirmngr/validate.c:903
 #: dirmngr/validate.c:927
 #, fuzzy, c-format
 msgid "out of core\n"
 msgstr "nem feldolgozott"
 
-#: sm/certcheck.c:389 sm/verify.c:212
+#: sm/certcheck.c:388 sm/verify.c:212
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:793
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:794
 #, fuzzy
 msgid "none"
 msgstr "nem"
@@ -9345,17 +9358,17 @@ msgstr ""
 msgid "resource problem: out of core\n"
 msgstr ""
 
-#: sm/decrypt.c:719
+#: sm/decrypt.c:1159
 #, c-format
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
 
-#: sm/decrypt.c:721
+#: sm/decrypt.c:1161
 #, c-format
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr ""
 
-#: sm/decrypt.c:868
+#: sm/decrypt.c:1318
 #, fuzzy, c-format
 msgid "encrypted to %s key %s\n"
 msgstr "Titkosítva %s kulccsal, azonosító: %08lX\n"
@@ -9365,7 +9378,7 @@ msgstr "Titkosítva %s kulccsal, azonosító: %08lX\n"
 msgid "certificate '%s' not found: %s\n"
 msgstr "\"%s\" kulcs nem található: %s\n"
 
-#: sm/delete.c:120 sm/keydb.c:1999 sm/keydb.c:2098
+#: sm/delete.c:120 sm/keydb.c:2021 sm/keydb.c:2120
 #, fuzzy, c-format
 msgid "error locking keybox: %s\n"
 msgstr "Hiba a kulcsblokk olvasásakor: %s\n"
@@ -9385,7 +9398,7 @@ msgstr "%c%lu preferencia kétszer szerepel!\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "A kulcsblokk törlése sikertelen: %s.\n"
 
-#: sm/encrypt.c:606
+#: sm/encrypt.c:607
 #, fuzzy, c-format
 msgid "no valid recipients given\n"
 msgstr "(Nincs leírás.)\n"
@@ -9461,68 +9474,68 @@ msgstr "|NÉV|NÉV használata alapértelmezett titkos kulcsként"
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "kulcskarika hozzáadása a kulcskarikalistához"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:352 dirmngr/dirmngr.c:265
 #, fuzzy
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|GÉPNÉV|kulcsszerver beállítása kulcsok kereséséhez"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:363
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:364
+#: sm/gpgsm.c:365
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NÉV|NÉV rejtjelező algoritmus haszn. jelszavakhoz"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:386
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:389
+#: sm/gpgsm.c:390
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: sm/gpgsm.c:393
+#: sm/gpgsm.c:394
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:396
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:398
+#: sm/gpgsm.c:399
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NÉV|NÉV rejtjelező algoritmus használata"
 
-#: sm/gpgsm.c:400
+#: sm/gpgsm.c:401
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NÉV|NÉV kivonatoló algoritmus használata"
 
-#: sm/gpgsm.c:410
+#: sm/gpgsm.c:411
 msgid "batch mode: never ask"
 msgstr "kötegelt mód: soha nem kérdez"
 
-#: sm/gpgsm.c:412
+#: sm/gpgsm.c:413
 msgid "assume yes on most questions"
 msgstr "igen válasz feltételezése a legtöbb kérdésre"
 
-#: sm/gpgsm.c:413
+#: sm/gpgsm.c:414
 msgid "assume no on most questions"
 msgstr "nem válasz feltételezése a legtöbb kérdésre"
 
-#: sm/gpgsm.c:430
+#: sm/gpgsm.c:431
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|fájl|bővítő modul betöltése"
 
-#: sm/gpgsm.c:615
+#: sm/gpgsm.c:616
 #, 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:618
+#: sm/gpgsm.c:619
 #, fuzzy
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
@@ -9533,52 +9546,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:826
+#: sm/gpgsm.c:827
 #, 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:837
+#: sm/gpgsm.c:838
 #, fuzzy, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "Ismeretlen alapértelmezett címzett: \"%s\"\n"
 
-#: sm/gpgsm.c:896 dirmngr/ldapserver.c:89
-#, fuzzy, c-format
-msgid "%s:%u: no hostname given\n"
-msgstr "(Nincs leírás.)\n"
-
-#: sm/gpgsm.c:915 dirmngr/ldapserver.c:108
-#, c-format
-msgid "%s:%u: password given without user\n"
-msgstr ""
-
-#: sm/gpgsm.c:946 dirmngr/ldapserver.c:139
-#, c-format
-msgid "%s:%u: ignoring unknown flag '%s'\n"
-msgstr ""
-
-#: sm/gpgsm.c:962 dirmngr/ldapserver.c:155
-#, fuzzy, c-format
-msgid "%s:%u: skipping this line\n"
-msgstr " h = kulcs kihagyása\n"
-
-#: sm/gpgsm.c:1550
-#, fuzzy, c-format
-msgid "could not parse keyserver\n"
-msgstr "Értelmezhetetlen a kulcsszerver URI-ja!\n"
-
-#: sm/gpgsm.c:1858
+#: sm/gpgsm.c:1711
 #, fuzzy, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "�rok a \"%s\" állományba.\n"
 
-#: sm/gpgsm.c:1904
+#: sm/gpgsm.c:1757
 #, 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:2273
+#: sm/gpgsm.c:2129
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
@@ -9598,52 +9586,52 @@ msgstr "visszavonási igazolás készítése"
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:471 sm/keydb.c:2018 sm/keydb.c:2111
+#: sm/import.c:472 sm/keydb.c:2040 sm/keydb.c:2133
 #, fuzzy, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: sm/import.c:530 sm/import.c:562
+#: sm/import.c:531 sm/import.c:563
 #, fuzzy, c-format
 msgid "error importing certificate: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: sm/import.c:751 tools/gpg-connect-agent.c:1475
+#: sm/import.c:752 tools/gpg-connect-agent.c:1475
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: sm/keydb.c:503
+#: sm/keydb.c:508
 #, fuzzy, c-format
 msgid "no keyboxd running in this session\n"
 msgstr "GPG ügynök nem elérhető ebben a munkafolyamatban.\n"
 
-#: sm/keydb.c:595
+#: sm/keydb.c:600
 #, fuzzy, c-format
 msgid "error opening key DB: %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: sm/keydb.c:1936
+#: sm/keydb.c:1958
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1948
+#: sm/keydb.c:1970
 #, fuzzy, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: sm/keydb.c:1956
+#: sm/keydb.c:1978
 #, fuzzy, c-format
 msgid "error storing certificate: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: sm/keydb.c:2009
+#: sm/keydb.c:2031
 #, fuzzy, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "rev? Nem tudom ellenőrizni a visszavonást: %s.\n"
 
-#: sm/keydb.c:2030 sm/keydb.c:2122
+#: sm/keydb.c:2052 sm/keydb.c:2144
 #, fuzzy, c-format
 msgid "error storing flags: %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
@@ -9815,57 +9803,57 @@ msgstr ""
 msgid "error loading certificate '%s': %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: dirmngr/certcache.c:819
+#: dirmngr/certcache.c:820
 #, fuzzy, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "rossz igazolás"
 
-#: dirmngr/certcache.c:821
+#: dirmngr/certcache.c:822
 #, fuzzy, c-format
 msgid "    runtime cached certificates: %u\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: dirmngr/certcache.c:823
+#: dirmngr/certcache.c:824
 #, fuzzy, c-format
 msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: dirmngr/certcache.c:851 dirmngr/dirmngr-client.c:392
+#: dirmngr/certcache.c:852 dirmngr/dirmngr-client.c:392
 #, fuzzy, c-format
 msgid "certificate already cached\n"
 msgstr "Visszavonó igazolás létrehozva.\n"
 
-#: dirmngr/certcache.c:853
+#: dirmngr/certcache.c:854
 #, fuzzy, c-format
 msgid "certificate cached\n"
 msgstr "%c%lu preferencia kétszer szerepel!\n"
 
-#: dirmngr/certcache.c:855 dirmngr/certcache.c:875 dirmngr/dirmngr-client.c:396
+#: dirmngr/certcache.c:856 dirmngr/certcache.c:876 dirmngr/dirmngr-client.c:396
 #, fuzzy, c-format
 msgid "error caching certificate: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: dirmngr/certcache.c:938
+#: dirmngr/certcache.c:939
 #, fuzzy, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
 
-#: dirmngr/certcache.c:1384 dirmngr/certcache.c:1393
+#: dirmngr/certcache.c:1385 dirmngr/certcache.c:1394
 #, fuzzy, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: dirmngr/certcache.c:1579 dirmngr/certcache.c:1588
+#: dirmngr/certcache.c:1580 dirmngr/certcache.c:1589
 #, fuzzy, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: dirmngr/certcache.c:1694 dirmngr/validate.c:483
+#: dirmngr/certcache.c:1695 dirmngr/validate.c:483
 #, fuzzy, c-format
 msgid "no issuer found in certificate\n"
 msgstr "visszavonási igazolás készítése"
 
-#: dirmngr/certcache.c:1704
+#: dirmngr/certcache.c:1705
 #, fuzzy, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
@@ -9902,7 +9890,7 @@ msgstr "A kulcsblokk törlése sikertelen: %s.\n"
 msgid "not removing file '%s'\n"
 msgstr "Páncélozás nem sikerült: %s\n"
 
-#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2380
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2383
 #, fuzzy, c-format
 msgid "error closing cache file: %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
@@ -10135,14 +10123,14 @@ msgid "error getting data from cache file: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
 #: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1672 dirmngr/crlcache.c:1697
-#: dirmngr/crlcache.c:1763
+#: dirmngr/crlcache.c:1766
 #, fuzzy, c-format
 #| msgid "invalid response from agent\n"
 msgid "got an invalid S-expression from libksba\n"
 msgstr "Érvénytelen válasz az ügynöktől!\n"
 
 #: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1679 dirmngr/crlcache.c:1705
-#: dirmngr/crlcache.c:1770 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1773 dirmngr/misc.c:176
 #, fuzzy, c-format
 msgid "converting S-expression failed: %s\n"
 msgstr "Nem tudom megnyitni az állományt: %s.\n"
@@ -10158,201 +10146,201 @@ msgstr "Érvénytelen kivonatoló algoritmus: %s\n"
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1797 dirmngr/ocsp.c:478
+#: dirmngr/crlcache.c:1800 dirmngr/ocsp.c:478
 #, fuzzy, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "A kulcsblokk törlése sikertelen: %s.\n"
 
-#: dirmngr/crlcache.c:1871
+#: dirmngr/crlcache.c:1874
 #, fuzzy, c-format
 #| msgid "build_packet failed: %s\n"
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "build_packet sikertelen: %s.\n"
 
-#: dirmngr/crlcache.c:1886
+#: dirmngr/crlcache.c:1889
 #, fuzzy, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: dirmngr/crlcache.c:1893
+#: dirmngr/crlcache.c:1896
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1897
+#: dirmngr/crlcache.c:1900
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1917
+#: dirmngr/crlcache.c:1920
 #, fuzzy, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: dirmngr/crlcache.c:1932
+#: dirmngr/crlcache.c:1935
 #, fuzzy, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "�rok a \"%s\" állományba.\n"
 
-#: dirmngr/crlcache.c:1959
+#: dirmngr/crlcache.c:1962
 #, fuzzy, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "visszavonási igazolás készítése"
 
-#: dirmngr/crlcache.c:1974
+#: dirmngr/crlcache.c:1977
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2020
+#: dirmngr/crlcache.c:2023
 #, fuzzy, c-format
 #| msgid "signature verification suppressed\n"
 msgid "CRL signature verification failed: %s\n"
 msgstr "Aláírás-ellenőrzés elnyomva.\n"
 
-#: dirmngr/crlcache.c:2032
+#: dirmngr/crlcache.c:2035
 #, fuzzy, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "A létrehozott aláírás ellenőrzése sikertelen: %s.\n"
 
-#: dirmngr/crlcache.c:2174
+#: dirmngr/crlcache.c:2177
 #, fuzzy, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "A kulcsblokk törlése sikertelen: %s.\n"
 
-#: dirmngr/crlcache.c:2181
+#: dirmngr/crlcache.c:2184
 #, fuzzy, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "Frissítés sikertelen: %s.\n"
 
-#: dirmngr/crlcache.c:2215
+#: dirmngr/crlcache.c:2218
 #, fuzzy, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "Nem tudom a \"%s\" könyvtárat létrehozni: %s.\n"
 
-#: dirmngr/crlcache.c:2219
+#: dirmngr/crlcache.c:2222
 #, fuzzy, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "Nem tudom a \"%s\" könyvtárat létrehozni: %s.\n"
 
-#: dirmngr/crlcache.c:2229
+#: dirmngr/crlcache.c:2232
 #, fuzzy, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: dirmngr/crlcache.c:2239
+#: dirmngr/crlcache.c:2242
 #, fuzzy, c-format
 #| msgid "update secret failed: %s\n"
 msgid "crl_parse_insert failed: %s\n"
 msgstr "Titkoskulcs-blokk frissítése sikertelen: %s\n"
 
-#: dirmngr/crlcache.c:2249
+#: dirmngr/crlcache.c:2252
 #, fuzzy, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "�rok a \"%s\" állományba.\n"
 
-#: dirmngr/crlcache.c:2256
+#: dirmngr/crlcache.c:2259
 #, fuzzy, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: dirmngr/crlcache.c:2281
+#: dirmngr/crlcache.c:2284
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2285
+#: dirmngr/crlcache.c:2288
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2301
+#: dirmngr/crlcache.c:2304
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2311
+#: dirmngr/crlcache.c:2314
 #, fuzzy, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2365
 #, fuzzy, c-format
 msgid "creating cache file '%s'\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: dirmngr/crlcache.c:2394
+#: dirmngr/crlcache.c:2397
 #, fuzzy, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "Páncélozás nem sikerült: %s\n"
 
-#: dirmngr/crlcache.c:2408
+#: dirmngr/crlcache.c:2411
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
 "program start\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2448
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2468
+#: dirmngr/crlcache.c:2471
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2471
+#: dirmngr/crlcache.c:2474
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2474
+#: dirmngr/crlcache.c:2477
 msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2481
+#: dirmngr/crlcache.c:2484
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2499
+#: dirmngr/crlcache.c:2502
 #, fuzzy, c-format
 #| msgid "WARNING: invalid size of random_seed file - not used\n"
 msgid " WARNING: invalid cache record length\n"
 msgstr "FIGYELEM: Érvénytelen méretű random_seed állomány. Nem használom.\n"
 
-#: dirmngr/crlcache.c:2506
+#: dirmngr/crlcache.c:2509
 #, fuzzy, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "%s: Hiba szabad rekord olvasásakor: %s.\n"
 
-#: dirmngr/crlcache.c:2517
+#: dirmngr/crlcache.c:2520
 #, fuzzy, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "rev? Nem tudom ellenőrizni a visszavonást: %s.\n"
 
-#: dirmngr/crlcache.c:2548
+#: dirmngr/crlcache.c:2551
 #, fuzzy, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: dirmngr/crlcache.c:2551
+#: dirmngr/crlcache.c:2554
 msgid "End CRL dump\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2672
+#: dirmngr/crlcache.c:2675
 #, fuzzy, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "Frissítés sikertelen: %s.\n"
 
-#: dirmngr/crlcache.c:2683
+#: dirmngr/crlcache.c:2686
 #, fuzzy, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "A létrehozott aláírás ellenőrzése sikertelen: %s.\n"
 
-#: dirmngr/crlcache.c:2743
+#: dirmngr/crlcache.c:2746
 #, fuzzy, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "A kulcsblokk törlése sikertelen: %s.\n"
@@ -10373,7 +10361,7 @@ msgstr ""
 msgid "error retrieving '%s': %s\n"
 msgstr "Hiba \"%s\" létrehozásakor: %s\n"
 
-#: dirmngr/crlfetch.c:218 dirmngr/ldap-wrapper.c:881 dirmngr/misc.c:573
+#: dirmngr/crlfetch.c:218 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
 #, fuzzy, c-format
 #| msgid "%s: error writing dir record: %s\n"
 msgid "error initializing reader object: %s\n"
@@ -10541,135 +10529,135 @@ msgstr ""
 msgid "looking up '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:175
+#: dirmngr/dirmngr.c:176
 msgid "list the contents of the CRL cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:176
+#: dirmngr/dirmngr.c:177
 #, fuzzy
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|fájl|bővítő modul betöltése"
 
-#: dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr.c:178
 msgid "|URL|fetch a CRL from URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:178
+#: dirmngr/dirmngr.c:179
 msgid "shutdown the dirmngr"
 msgstr ""
 
-#: dirmngr/dirmngr.c:179
+#: dirmngr/dirmngr.c:180
 msgid "flush the cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:213
 msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:215
+#: dirmngr/dirmngr.c:216
 msgid "|N|do not return more than N items in one query"
 msgstr ""
 
-#: dirmngr/dirmngr.c:221
+#: dirmngr/dirmngr.c:222
 msgid "Network related options"
 msgstr ""
 
-#: dirmngr/dirmngr.c:223
+#: dirmngr/dirmngr.c:224
 msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:235
+#: dirmngr/dirmngr.c:236
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:238
+#: dirmngr/dirmngr.c:239
 #, fuzzy
 msgid "|URL|use keyserver at URL"
 msgstr "Értelmezhetetlen a kulcsszerver URI-ja!\n"
 
-#: dirmngr/dirmngr.c:240
+#: dirmngr/dirmngr.c:241
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-#: dirmngr/dirmngr.c:242
+#: dirmngr/dirmngr.c:243
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:244
+#: dirmngr/dirmngr.c:245
 msgid "inhibit the use of HTTP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:246
+#: dirmngr/dirmngr.c:247
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:248
+#: dirmngr/dirmngr.c:249
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:250
+#: dirmngr/dirmngr.c:251
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: dirmngr/dirmngr.c:254
+#: dirmngr/dirmngr.c:255
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: dirmngr/dirmngr.c:256
+#: dirmngr/dirmngr.c:257
 msgid "inhibit the use of LDAP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:258
+#: dirmngr/dirmngr.c:259
 msgid "ignore LDAP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:260
+#: dirmngr/dirmngr.c:261
 msgid "|HOST|use HOST for LDAP queries"
 msgstr ""
 
-#: dirmngr/dirmngr.c:262
+#: dirmngr/dirmngr.c:263
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr ""
 
-#: dirmngr/dirmngr.c:264
+#: dirmngr/dirmngr.c:267
 #, fuzzy
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|fájl|bővítő modul betöltése"
 
-#: dirmngr/dirmngr.c:266
+#: dirmngr/dirmngr.c:269
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 
-#: dirmngr/dirmngr.c:269 dirmngr/dirmngr_ldap.c:104
+#: dirmngr/dirmngr.c:272
 msgid "|N|set LDAP timeout to N seconds"
 msgstr ""
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:275
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:274
+#: dirmngr/dirmngr.c:277
 msgid "allow sending OCSP requests"
 msgstr ""
 
-#: dirmngr/dirmngr.c:276
+#: dirmngr/dirmngr.c:279
 msgid "ignore certificate contained OCSP service URLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:278
+#: dirmngr/dirmngr.c:281
 #, fuzzy
 msgid "|URL|use OCSP responder at URL"
 msgstr "Értelmezhetetlen a kulcsszerver URI-ja!\n"
 
-#: dirmngr/dirmngr.c:280
+#: dirmngr/dirmngr.c:283
 msgid "|FPR|OCSP response signed by FPR"
 msgstr ""
 
-#: dirmngr/dirmngr.c:288
+#: dirmngr/dirmngr.c:291
 msgid "force loading of outdated CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:299
+#: dirmngr/dirmngr.c:302
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -10682,304 +10670,115 @@ msgstr ""
 "@\n"
 "(A parancsok és opciók teljes listáját a man oldalon tekintheti meg.)\n"
 
-#: dirmngr/dirmngr.c:441
+#: dirmngr/dirmngr.c:449
 #, fuzzy
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
 
-#: dirmngr/dirmngr.c:443
+#: dirmngr/dirmngr.c:451
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:523
+#: dirmngr/dirmngr.c:531
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:609 tools/gpgconf.c:667 tools/gpgconf.c:702
-#: tools/gpgconf.c:802
+#: dirmngr/dirmngr.c:617 tools/gpgconf.c:701 tools/gpgconf.c:736
+#: tools/gpgconf.c:836
 #, fuzzy, c-format
 msgid "usage: %s [options] "
 msgstr "Használat: gpg [opciók] "
 
-#: dirmngr/dirmngr.c:1260
+#: dirmngr/dirmngr.c:1299
 #, 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:1495 dirmngr/server.c:1824
+#: dirmngr/dirmngr.c:1534 dirmngr/server.c:1878
 #, fuzzy, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "Páncélozás nem sikerült: %s\n"
 
-#: dirmngr/dirmngr.c:1501 dirmngr/server.c:1830
+#: dirmngr/dirmngr.c:1540 dirmngr/server.c:1884
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "Páncélozás nem sikerült: %s\n"
 
-#: dirmngr/dirmngr.c:1643
+#: dirmngr/dirmngr.c:1682
 #, fuzzy, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "A sor túl hosszú!\n"
 
-#: dirmngr/dirmngr.c:1698 dirmngr/dirmngr.c:1782
+#: dirmngr/dirmngr.c:1737 dirmngr/dirmngr.c:1821
 #, fuzzy, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
 
-#: dirmngr/dirmngr.c:1734 dirmngr/dirmngr.c:1760 tools/gpgconf-comp.c:3539
+#: dirmngr/dirmngr.c:1773 dirmngr/dirmngr.c:1799 tools/gpgconf-comp.c:3549
 #, fuzzy, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "Olvasási hiba: %s.\n"
 
-#: dirmngr/dirmngr.c:1789
+#: dirmngr/dirmngr.c:1828
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1876
+#: dirmngr/dirmngr.c:1915
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1917
+#: dirmngr/dirmngr.c:1956
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1922
+#: dirmngr/dirmngr.c:1961
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1924
+#: dirmngr/dirmngr.c:1963
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1929
+#: dirmngr/dirmngr.c:1968
 #, fuzzy, c-format
 msgid "shutdown forced\n"
 msgstr "nem feldolgozott"
 
-#: dirmngr/dirmngr.c:1937
+#: dirmngr/dirmngr.c:1976
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1944
+#: dirmngr/dirmngr.c:1983
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:105
-msgid "return all values in a record oriented format"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:108
-msgid "|NAME|ignore host part and connect through NAME"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:109
-msgid "force a TLS connection"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:110
-#, fuzzy
-#| msgid "|NAME|set terminal charset to NAME"
-msgid "|NAME|connect to host NAME"
-msgstr "|NÉV|terminál karakterkódolásának megadása"
-
-#: dirmngr/dirmngr_ldap.c:111
-msgid "|N|connect to port N"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:112
-#, fuzzy
-#| msgid "|NAME|use NAME as default recipient"
-msgid "|NAME|use user NAME for authentication"
-msgstr "|NÉV|NÉV használata alapértelmezett címzettként"
-
-#: dirmngr/dirmngr_ldap.c:113
-msgid "|PASS|use password PASS for authentication"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:115
-msgid "take password from $DIRMNGR_LDAP_PASS"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:116
-msgid "|STRING|query DN STRING"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:117
-msgid "|STRING|use STRING as filter expression"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:118
-msgid "|STRING|return the attribute STRING"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:179
-#, fuzzy
-#| msgid "Usage: gpg [options] [files] (-h for help)"
-msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
-msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
-
-#: dirmngr/dirmngr_ldap.c:182
-msgid ""
-"Syntax: dirmngr_ldap [options] [URL]\n"
-"Internal LDAP helper for Dirmngr\n"
-"Interface and options may change without notice\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:291
-#, fuzzy, c-format
-#| msgid "invalid import options\n"
-msgid "invalid port number %d\n"
-msgstr "Érvénytelen import opciók!\n"
-
-#: dirmngr/dirmngr_ldap.c:400
-#, c-format
-msgid "scanning result for attribute '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:407 dirmngr/dirmngr_ldap.c:490
-#: dirmngr/dirmngr_ldap.c:514 dirmngr/dirmngr_ldap.c:526
-#: dirmngr/dirmngr_ldap.c:722
-#, fuzzy, c-format
-msgid "error writing to stdout: %s\n"
-msgstr "Hiba a \"%s\" kulcskarika írásakor: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:424
-#, c-format
-msgid "          available attribute '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:462
-#, fuzzy, c-format
-msgid "attribute '%s' not found\n"
-msgstr "\"%s\" kulcs nem található: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:469
-#, c-format
-msgid "found attribute '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:581
-#, fuzzy, c-format
-#| msgid "reading from `%s'\n"
-msgid "processing url '%s'\n"
-msgstr "Olvasok a \"%s\" állományból.\n"
-
-#: dirmngr/dirmngr_ldap.c:588
-#, fuzzy, c-format
-#| msgid "          w/o user IDs: %lu\n"
-msgid "          user '%s'\n"
-msgstr "    felh. azonosító nélkül: %lu\n"
-
-#: dirmngr/dirmngr_ldap.c:590
-#, fuzzy, c-format
-msgid "          pass '%s'\n"
-msgstr "               azaz \""
-
-#: dirmngr/dirmngr_ldap.c:592
-#, fuzzy, c-format
-msgid "          host '%s'\n"
-msgstr "               azaz \""
-
-#: dirmngr/dirmngr_ldap.c:593
-#, fuzzy, c-format
-#| msgid "          not imported: %lu\n"
-msgid "          port %d\n"
-msgstr "             nem importált: %lu\n"
-
-#: dirmngr/dirmngr_ldap.c:595
-#, fuzzy, c-format
-msgid "            DN '%s'\n"
-msgstr "               azaz \""
-
-#: dirmngr/dirmngr_ldap.c:597
-#, c-format
-msgid "        filter '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:602 dirmngr/dirmngr_ldap.c:605
-#, fuzzy, c-format
-msgid "          attr '%s'\n"
-msgstr "               azaz \""
-
-#: dirmngr/dirmngr_ldap.c:611
-#, fuzzy, c-format
-msgid "no host name in '%s'\n"
-msgstr "(Nincs leírás.)\n"
-
-#: dirmngr/dirmngr_ldap.c:616
-#, c-format
-msgid "no attribute given for query '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:622
-#, fuzzy, c-format
-#| msgid "WARNING: using insecure memory!\n"
-msgid "WARNING: using first attribute only\n"
-msgstr "FIGYELEM: Nem biztonságos memóriát használunk!\n"
-
-#: dirmngr/dirmngr_ldap.c:637 dirmngr/dirmngr_ldap.c:678
-#, fuzzy, c-format
-msgid "LDAP init to '%s:%d' failed: %s\n"
-msgstr "Páncélozás nem sikerült: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:659
-#, fuzzy, c-format
-msgid "LDAP init to '%s' failed: %s\n"
-msgstr "Páncélozás nem sikerült: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:665
-#, fuzzy, c-format
-msgid "LDAP init to '%s' done\n"
-msgstr "Páncélozás nem sikerült: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:704
-#, fuzzy, c-format
-msgid "binding to '%s:%d' failed: %s\n"
-msgstr "Páncélozás nem sikerült: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:728
-#, fuzzy, c-format
-#| msgid "dearmoring failed: %s\n"
-msgid "searching '%s' failed: %s\n"
-msgstr "Páncél eltávolítása nem sikerült: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:759
-#, fuzzy, c-format
-msgid "'%s' is not an LDAP URL\n"
-msgstr "\"%s\" nem JPEG állomány.\n"
-
-#: dirmngr/dirmngr_ldap.c:765
-#, c-format
-msgid "'%s' is an invalid LDAP URL\n"
-msgstr ""
-
-#: dirmngr/http.c:1989 dirmngr/ocsp.c:255
+#: dirmngr/http.c:1998 dirmngr/ocsp.c:255
 #, fuzzy, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: dirmngr/http.c:3630 dirmngr/ocsp.c:229
+#: dirmngr/http.c:3652 dirmngr/ocsp.c:229
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr ""
 
-#: dirmngr/http.c:3636 dirmngr/ocsp.c:246
+#: dirmngr/http.c:3658 dirmngr/ocsp.c:246
 #, fuzzy, c-format
 msgid "too many redirections\n"
 msgstr "Túl sok \"%c\" preferencia.\n"
 
-#: dirmngr/http.c:3748
+#: dirmngr/http.c:3768
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "redirection changed to '%s'\n"
@@ -11020,31 +10819,51 @@ msgstr "Frissítés sikertelen: %s.\n"
 msgid "ldap wrapper %d stalled - killing\n"
 msgstr ""
 
-#: dirmngr/ldap.c:91
+#: dirmngr/ldap.c:92
 #, c-format
 msgid "invalid char 0x%02x in host name - not added\n"
 msgstr ""
 
-#: dirmngr/ldap.c:95
+#: dirmngr/ldap.c:96
 #, fuzzy, c-format
 msgid "adding '%s:%d' to the ldap server list\n"
 msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
 
-#: dirmngr/ldap.c:98 dirmngr/misc.c:512
+#: dirmngr/ldap.c:99 dirmngr/misc.c:512
 #, fuzzy, c-format
 msgid "malloc failed: %s\n"
 msgstr "A kulcsblokk törlése sikertelen: %s.\n"
 
-#: dirmngr/ldap.c:634
+#: dirmngr/ldap.c:221
+#, fuzzy, c-format
+msgid "'%s' is not an LDAP URL\n"
+msgstr "\"%s\" nem JPEG állomány.\n"
+
+#: dirmngr/ldap.c:227 dirmngr/ldap.c:233
 #, c-format
-msgid "start_cert_fetch: invalid pattern '%s'\n"
+msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
-#: dirmngr/ldap.c:846
+#: dirmngr/ldap.c:968
 #, c-format
 msgid "ldap_search hit the size limit of the server\n"
 msgstr ""
 
+#: dirmngr/ldapserver.c:119
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr ""
+
+#: dirmngr/ldapserver.c:181
+#, c-format
+msgid "%s:%u: ignoring unknown flag '%s'\n"
+msgstr ""
+
+#: dirmngr/ldapserver.c:203
+#, fuzzy, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr " h = kulcs kihagyása\n"
+
 #: dirmngr/misc.c:172
 #, fuzzy, c-format
 #| msgid "%s: invalid file version %d\n"
@@ -11137,88 +10956,88 @@ msgstr ""
 msgid "allocating list item failed: %s\n"
 msgstr "A kulcsblokk törlése sikertelen: %s.\n"
 
-#: dirmngr/ocsp.c:537 dirmngr/ocsp.c:724
+#: dirmngr/ocsp.c:538 dirmngr/ocsp.c:725
 #, fuzzy, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: dirmngr/ocsp.c:584
+#: dirmngr/ocsp.c:585
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:623 dirmngr/validate.c:648
+#: dirmngr/ocsp.c:624 dirmngr/validate.c:648
 #, fuzzy, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "\"%s\" kulcs nem található: %s\n"
 
-#: dirmngr/ocsp.c:633
+#: dirmngr/ocsp.c:634
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:640
+#: dirmngr/ocsp.c:641
 #, fuzzy, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "visszavonási igazolás készítése"
 
-#: dirmngr/ocsp.c:650
+#: dirmngr/ocsp.c:651
 #, fuzzy, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
 
-#: dirmngr/ocsp.c:689
+#: dirmngr/ocsp.c:690
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:696
 #, fuzzy, c-format
 #| msgid "no default secret keyring: %s\n"
 msgid "no default OCSP signer defined\n"
 msgstr "Nincs alapértelmezett titkoskulcs-karika: %s\n"
 
-#: dirmngr/ocsp.c:702
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:707
+#: dirmngr/ocsp.c:708
 #, fuzzy, c-format
 #| msgid "using cipher %s\n"
 msgid "using OCSP responder '%s'\n"
 msgstr "%s rejtjelezést használok.\n"
 
-#: dirmngr/ocsp.c:764
+#: dirmngr/ocsp.c:765
 #, fuzzy, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: dirmngr/ocsp.c:789
+#: dirmngr/ocsp.c:790
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:790
+#: dirmngr/ocsp.c:791
 msgid "good"
 msgstr ""
 
-#: dirmngr/ocsp.c:796
+#: dirmngr/ocsp.c:797
 #, fuzzy, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "MEGJEGYZÉS: A kulcsot visszavonták."
 
-#: dirmngr/ocsp.c:831
+#: dirmngr/ocsp.c:832
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:843
+#: dirmngr/ocsp.c:844
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:858
+#: dirmngr/ocsp.c:859
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr ""
@@ -11228,72 +11047,68 @@ msgstr ""
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "Aláírás sikertelen: %s\n"
 
-#: dirmngr/server.c:1158
-msgid "ldapserver missing"
-msgstr ""
-
-#: dirmngr/server.c:1224
+#: dirmngr/server.c:1277
 msgid "serialno missing in cert ID"
 msgstr ""
 
-#: dirmngr/server.c:1387 dirmngr/server.c:1473 dirmngr/server.c:1909
-#: dirmngr/server.c:1980 dirmngr/server.c:2556 dirmngr/server.c:2571
+#: dirmngr/server.c:1440 dirmngr/server.c:1526 dirmngr/server.c:1963
+#: dirmngr/server.c:2034 dirmngr/server.c:2662 dirmngr/server.c:2677
 #, fuzzy, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "Aláírás sikertelen: %s\n"
 
-#: dirmngr/server.c:1516
+#: dirmngr/server.c:1569
 #, fuzzy, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "A kulcsblokk törlése sikertelen: %s.\n"
 
-#: dirmngr/server.c:1528 dirmngr/server.c:1559 dirmngr/server.c:1718
+#: dirmngr/server.c:1581 dirmngr/server.c:1612 dirmngr/server.c:1772
 #, fuzzy, c-format
 msgid "error sending data: %s\n"
 msgstr "Hiba %s-ra/-re küldéskor: %s\n"
 
-#: dirmngr/server.c:1666
+#: dirmngr/server.c:1720
 #, fuzzy, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "A kulcsblokk törlése sikertelen: %s.\n"
 
-#: dirmngr/server.c:1699
+#: dirmngr/server.c:1753
 #, fuzzy, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "A kulcsblokk törlése sikertelen: %s.\n"
 
-#: dirmngr/server.c:1726
+#: dirmngr/server.c:1780
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:2860
+#: dirmngr/server.c:2966
 #, fuzzy, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "Nem tudom létrehozni a(z) \"%s\" állományt: %s.\n"
 
-#: dirmngr/server.c:2871
+#: dirmngr/server.c:2977
 #, fuzzy, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "%s: Hashtábla létrehozása sikertelen: %s.\n"
 
-#: dirmngr/server.c:2892
+#: dirmngr/server.c:2998
 #, fuzzy, c-format
 #| msgid "failed to initialize the TrustDB: %s\n"
 msgid "failed to initialize the server: %s\n"
 msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
 
-#: dirmngr/server.c:2900
+#: dirmngr/server.c:3006
 #, fuzzy, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "Nem tudtam újraépíteni a kulcskarika cache-ét: %s\n"
 
-#: dirmngr/server.c:2933
+#: dirmngr/server.c:3039
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:2952
+#: dirmngr/server.c:3058
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -11442,73 +11257,73 @@ msgstr "GPG ügynök nem elérhető ebben a munkafolyamatban.\n"
 msgid "error sending standard options: %s\n"
 msgstr "Hiba %s-ra/-re küldéskor: %s\n"
 
-#: tools/gpgconf-comp.c:649
+#: tools/gpgconf-comp.c:655
 msgid "OpenPGP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:653
+#: tools/gpgconf-comp.c:659
 msgid "S/MIME"
 msgstr ""
 
-#: tools/gpgconf-comp.c:657
+#: tools/gpgconf-comp.c:663
 #, fuzzy
 msgid "Public Keys"
 msgstr "Nyilvános kulcs: %08lX\n"
 
-#: tools/gpgconf-comp.c:661
+#: tools/gpgconf-comp.c:667
 msgid "Private Keys"
 msgstr ""
 
-#: tools/gpgconf-comp.c:665
+#: tools/gpgconf-comp.c:671
 msgid "Smartcards"
 msgstr ""
 
-#: tools/gpgconf-comp.c:669
+#: tools/gpgconf-comp.c:676
 msgid "TPM"
 msgstr ""
 
-#: tools/gpgconf-comp.c:673
+#: tools/gpgconf-comp.c:681
 #, fuzzy
 #| msgid "network error"
 msgid "Network"
 msgstr "hálózati hiba"
 
-#: tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:685
 #, fuzzy
 msgid "Passphrase Entry"
 msgstr "rossz jelszó"
 
-#: tools/gpgconf-comp.c:941
+#: tools/gpgconf-comp.c:951
 #, fuzzy
 msgid "Component not suitable for launching"
 msgstr "nyilvános kulcs nem található"
 
-#: tools/gpgconf-comp.c:947
+#: tools/gpgconf-comp.c:957
 #, c-format
 msgid "Configuration file of component %s is broken\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:950
+#: tools/gpgconf-comp.c:960
 #, fuzzy, c-format
 #| msgid "Please use the command \"toggle\" first.\n"
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr "Kérem, használja előbb a \"toggle\" parancsot!\n"
 
-#: tools/gpgconf-comp.c:2816
+#: tools/gpgconf-comp.c:2826
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2946
+#: tools/gpgconf-comp.c:2956
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3543
+#: tools/gpgconf-comp.c:3553
 #, fuzzy, c-format
 msgid "error closing '%s'\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: tools/gpgconf-comp.c:3545
+#: tools/gpgconf-comp.c:3555
 #, fuzzy, c-format
 msgid "error parsing '%s'\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
@@ -11592,16 +11407,16 @@ msgid ""
 "Manage configuration options for tools of the @GNUPG@ system\n"
 msgstr ""
 
-#: tools/gpgconf.c:669 tools/gpgconf.c:704
+#: tools/gpgconf.c:703 tools/gpgconf.c:738
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:678 tools/gpgconf.c:728 tools/gpgconf.c:778
+#: tools/gpgconf.c:712 tools/gpgconf.c:762 tools/gpgconf.c:812
 #, fuzzy
 msgid "Component not found"
 msgstr "nyilvános kulcs nem található"
 
-#: tools/gpgconf.c:804
+#: tools/gpgconf.c:838
 #, fuzzy
 msgid "No argument allowed"
 msgstr "�rom a titkos kulcsot a %s állományba.\n"
@@ -11617,88 +11432,189 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
-#: tools/gpg-card.c:2390
+#: tools/gpg-card.c:2407
 #, fuzzy, c-format
 msgid "Note: key %s is already stored on the card!\n"
 msgstr "Kihagytam: titkos kulcs már jelen van.\n"
 
-#: tools/gpg-card.c:2393
+#: tools/gpg-card.c:2410
 #, fuzzy, c-format
 msgid "Note: Keys are already stored on the card!\n"
 msgstr "Kihagytam: titkos kulcs már jelen van.\n"
 
-#: tools/gpg-card.c:2396
+#: tools/gpg-card.c:2413
 #, c-format
 msgid "Replace existing key %s ? (y/N) "
 msgstr ""
 
-#: tools/gpg-card.c:2549 tools/gpg-card.c:2712 tools/gpg-card.c:2935
-#: tools/gpg-card.c:3044
+#: tools/gpg-card.c:2566 tools/gpg-card.c:2729 tools/gpg-card.c:2952
+#: tools/gpg-card.c:3061
 #, c-format
 msgid "%s card no. %s detected\n"
 msgstr ""
 
-#: tools/gpg-card.c:3396
+#: tools/gpg-card.c:3413
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3406 tools/gpg-card.c:3420
+#: tools/gpg-card.c:3423 tools/gpg-card.c:3437
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
 "         can only be reverted using a factory reset!\n"
 msgstr ""
 
-#: tools/gpg-card.c:3423
+#: tools/gpg-card.c:3440
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3669
+#: tools/gpg-card.c:3686
 #, fuzzy
 msgid "authenticate to the card"
 msgstr "Visszavonó igazolás létrehozva.\n"
 
-#: tools/gpg-card.c:3671
+#: tools/gpg-card.c:3688
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3673
+#: tools/gpg-card.c:3690
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication"
 msgstr "|NÉV|NÉV használata alapértelmezett címzettként"
 
-#: tools/gpg-card.c:3675
+#: tools/gpg-card.c:3692
 #, fuzzy
 #| msgid "change the expire date"
 msgid "change a private data object"
 msgstr "lejárat megváltoztatása"
 
-#: tools/gpg-card.c:3676
+#: tools/gpg-card.c:3693
 #, fuzzy
 msgid "read a certificate from a data object"
 msgstr "Visszavonó igazolás létrehozva.\n"
 
-#: tools/gpg-card.c:3677
+#: tools/gpg-card.c:3694
 #, fuzzy
 msgid "store a certificate to a data object"
 msgstr "Visszavonó igazolás létrehozva.\n"
 
-#: tools/gpg-card.c:3678
+#: tools/gpg-card.c:3695
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3679
+#: tools/gpg-card.c:3696
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3681
+#: tools/gpg-card.c:3698
 msgid "manage the command history"
 msgstr ""
 
 #, fuzzy
+#~ msgid "requesting key %s from %s server %s\n"
+#~ msgstr "Lekérem a %08lX kulcsot a %s kulcsszerverről.\n"
+
+#, fuzzy
+#~ msgid "%s:%u: no hostname given\n"
+#~ msgstr "(Nincs leírás.)\n"
+
+#, fuzzy
+#~ msgid "could not parse keyserver\n"
+#~ msgstr "Értelmezhetetlen a kulcsszerver URI-ja!\n"
+
+#, fuzzy
+#~| msgid "|NAME|set terminal charset to NAME"
+#~ msgid "|NAME|connect to host NAME"
+#~ msgstr "|NÉV|terminál karakterkódolásának megadása"
+
+#, fuzzy
+#~| msgid "|NAME|use NAME as default recipient"
+#~ msgid "|NAME|use user NAME for authentication"
+#~ msgstr "|NÉV|NÉV használata alapértelmezett címzettként"
+
+#, fuzzy
+#~| msgid "Usage: gpg [options] [files] (-h for help)"
+#~ msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
+#~ msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
+
+#, fuzzy
+#~| msgid "invalid import options\n"
+#~ msgid "invalid port number %d\n"
+#~ msgstr "Érvénytelen import opciók!\n"
+
+#, fuzzy
+#~ msgid "error writing to stdout: %s\n"
+#~ msgstr "Hiba a \"%s\" kulcskarika írásakor: %s\n"
+
+#, fuzzy
+#~ msgid "attribute '%s' not found\n"
+#~ msgstr "\"%s\" kulcs nem található: %s\n"
+
+#, fuzzy
+#~| msgid "reading from `%s'\n"
+#~ msgid "processing url '%s'\n"
+#~ msgstr "Olvasok a \"%s\" állományból.\n"
+
+#, fuzzy
+#~| msgid "          w/o user IDs: %lu\n"
+#~ msgid "          user '%s'\n"
+#~ msgstr "    felh. azonosító nélkül: %lu\n"
+
+#, fuzzy
+#~ msgid "          pass '%s'\n"
+#~ msgstr "               azaz \""
+
+#, fuzzy
+#~ msgid "          host '%s'\n"
+#~ msgstr "               azaz \""
+
+#, fuzzy
+#~| msgid "          not imported: %lu\n"
+#~ msgid "          port %d\n"
+#~ msgstr "             nem importált: %lu\n"
+
+#, fuzzy
+#~ msgid "            DN '%s'\n"
+#~ msgstr "               azaz \""
+
+#, fuzzy
+#~ msgid "          attr '%s'\n"
+#~ msgstr "               azaz \""
+
+#, fuzzy
+#~ msgid "no host name in '%s'\n"
+#~ msgstr "(Nincs leírás.)\n"
+
+#, fuzzy
+#~| msgid "WARNING: using insecure memory!\n"
+#~ msgid "WARNING: using first attribute only\n"
+#~ msgstr "FIGYELEM: Nem biztonságos memóriát használunk!\n"
+
+#, fuzzy
+#~ msgid "LDAP init to '%s:%d' failed: %s\n"
+#~ msgstr "Páncélozás nem sikerült: %s\n"
+
+#, fuzzy
+#~ msgid "LDAP init to '%s' failed: %s\n"
+#~ msgstr "Páncélozás nem sikerült: %s\n"
+
+#, fuzzy
+#~ msgid "LDAP init to '%s' done\n"
+#~ msgstr "Páncélozás nem sikerült: %s\n"
+
+#, fuzzy
+#~ msgid "binding to '%s:%d' failed: %s\n"
+#~ msgstr "Páncélozás nem sikerült: %s\n"
+
+#, fuzzy
+#~| msgid "dearmoring failed: %s\n"
+#~ msgid "searching '%s' failed: %s\n"
+#~ msgstr "Páncél eltávolítása nem sikerült: %s\n"
+
+#, fuzzy
 #~ msgid "Suggest a random passphrase."
 #~ msgstr "jelszóváltoztatás"
 
diff --git a/po/id.po b/po/id.po
index 8947dae..f405fca 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: 2021-04-20 12:38+0200\n"
+"POT-Creation-Date: 2021-08-24 18:50+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:328
+#: agent/call-pinentry.c:338
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
@@ -31,48 +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:546
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_OK"
 msgstr ""
 
-#: agent/call-pinentry.c:547
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
-#: agent/call-pinentry.c:548
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|_Yes"
 msgstr ""
 
-#: agent/call-pinentry.c:549
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_No"
 msgstr ""
 
-#: agent/call-pinentry.c:550
+#: agent/call-pinentry.c:560
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:551
+#: agent/call-pinentry.c:561
 msgid "|pinentry-label|_Save in password manager"
 msgstr ""
 
-#: agent/call-pinentry.c:552
+#: agent/call-pinentry.c:562
 #, 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:554
+#: agent/call-pinentry.c:564
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:555
+#: agent/call-pinentry.c:565
 #, fuzzy
 #| msgid "invalid passphrase"
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "passphrase tidak valid"
 
+#: agent/call-pinentry.c:566
+msgid "Caps Lock is on"
+msgstr ""
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:944
+#: agent/call-pinentry.c:1022
 msgid "Suggest"
 msgstr ""
 
@@ -83,13 +87,25 @@ 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:966
+#: agent/call-pinentry.c:1044
 msgid "pinentry.genpin.tooltip"
 msgstr ""
 
+#: agent/call-pinentry.c:1072
+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
+#, 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:998
+#: agent/call-pinentry.c:1198
 msgid "Quality:"
 msgstr ""
 
@@ -99,107 +115,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:1019
+#: agent/call-pinentry.c:1219
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:1263
+#: agent/call-pinentry.c:1477
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:1266
+#: agent/call-pinentry.c:1480
 #, 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:1303 agent/call-pinentry.c:1506
+#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1303 agent/call-pinentry.c:1506
-#: agent/protect-tool.c:728
+#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/protect-tool.c:729
 #, fuzzy
 msgid "Passphrase:"
 msgstr "passphrase yang buruk"
 
-#: agent/call-pinentry.c:1330 agent/call-pinentry.c:1580 agent/command.c:1799
-#: agent/command.c:1852 agent/command-ssh.c:3046 agent/genkey.c:398
+#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
+#: agent/command.c:1988 agent/command-ssh.c:3046 agent/genkey.c:442
 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:1351 agent/call-pinentry.c:1603
+#: agent/call-pinentry.c:1566 agent/call-pinentry.c:1830
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:1362 agent/call-pinentry.c:1614
+#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
 msgid "Repeat:"
 msgstr ""
 
-#: agent/call-pinentry.c:1372 agent/call-pinentry.c:1384
-#: agent/call-pinentry.c:1624 agent/call-pinentry.c:1636
+#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
+#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
 #, fuzzy
 msgid "PIN too long"
 msgstr "baris terlalu panjang\n"
 
-#: agent/call-pinentry.c:1373 agent/call-pinentry.c:1625
+#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "passphrase terlalu panjang\n"
 
-#: agent/call-pinentry.c:1381 agent/call-pinentry.c:1633
+#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Karakter tidak valid dalam nama\n"
 
-#: agent/call-pinentry.c:1386 agent/call-pinentry.c:1638
+#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:1405 agent/call-pinentry.c:1656
+#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI yang buruk"
 
-#: agent/call-pinentry.c:1405 agent/call-pinentry.c:1656
+#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "passphrase yang buruk"
 
-#: agent/command.c:697
+#: agent/command.c:823
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:698
+#: agent/command.c:824
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1106 g10/card-util.c:708 g10/card-util.c:729
+#: agent/command.c:1235 g10/card-util.c:713 g10/card-util.c:734
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: agent/command.c:1634 agent/command.c:1791 agent/command-ssh.c:2974
-#: agent/genkey.c:333
+#: agent/command.c:1756 agent/command.c:1921 agent/command-ssh.c:2974
+#: agent/genkey.c:377
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "ubah passphrase"
 
-#: agent/command.c:2567
+#: agent/command.c:2703
 #, 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:2697
+#: agent/command.c:2833
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -210,26 +226,26 @@ msgstr ""
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "algoritma proteksi %d%s tidak didukung\n"
 
-#: agent/command-ssh.c:872 common/dotlock.c:852 g10/card-util.c:953
-#: g10/export.c:1329 g10/gpg.c:1431 g10/keygen.c:5347 g10/keyring.c:1319
-#: g10/keyring.c:1632 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
+#: agent/command-ssh.c:872 common/dotlock.c:852 g10/card-util.c:963
+#: g10/export.c:1329 g10/gpg.c:1431 g10/keygen.c:5377 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
 #: g10/sign.c:1106 g10/sign.c:1443 g10/tdbio.c:753 tools/gpg-card.c:479
 #, fuzzy, c-format
 #| msgid "can't create `%s': %s\n"
 msgid "can't create '%s': %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: agent/command-ssh.c:884 common/helpfile.c:57 g10/card-util.c:910
+#: agent/command-ssh.c:884 common/helpfile.c:57 g10/card-util.c:920
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
 #: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:721 g10/gpg.c:1432
-#: g10/import.c:371 g10/import.c:558 g10/import.c:793 g10/keygen.c:4322
-#: g10/keyring.c:1658 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
+#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4326
+#: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
 #: g10/plaintext.c:610 g10/sign.c:1086 g10/sign.c:1311 g10/sign.c:1424
 #: g10/sign.c:1596 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2380
-#: sm/gpgsm.c:2410 sm/gpgsm.c:2448 sm/keylist.c:1737 sm/qualified.c:65
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2236
+#: sm/gpgsm.c:2266 sm/gpgsm.c:2304 sm/keylist.c:1775 sm/qualified.c:65
 #: dirmngr/certcache.c:396 dirmngr/certcache.c:476 dirmngr/certcache.c:478
-#: dirmngr/crlcache.c:2588 dirmngr/dirmngr.c:1720 tools/gpg-card.c:408
+#: dirmngr/crlcache.c:2591 dirmngr/dirmngr.c:1759 tools/gpg-card.c:408
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
@@ -338,39 +354,39 @@ msgstr "passphrase tidak diulang dengan benar; coba lagi"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:109 sm/certreqgen-ui.c:433
+#: 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:116
+#: agent/genkey.c:150
 #, fuzzy, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "menulis ke `%s'\n"
 
-#: agent/genkey.c:154
+#: agent/genkey.c:191
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Masukkan passphrase\n"
 
-#: agent/genkey.c:184
+#: agent/genkey.c:227
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:186
+#: agent/genkey.c:229
 #, 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:198
+#: agent/genkey.c:241
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:215
+#: agent/genkey.c:258
 #, fuzzy, c-format
 #| msgid "Name must be at least 5 characters long\n"
 msgid "A passphrase should be at least %u character long."
@@ -378,7 +394,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:234
+#: agent/genkey.c:277
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -386,387 +402,386 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:260
+#: agent/genkey.c:304
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:275
+#: agent/genkey.c:319
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
-#: agent/genkey.c:296
+#: agent/genkey.c:340
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "Tetap gunakan kunci ini? "
 
-#: agent/genkey.c:464
+#: agent/genkey.c:508
 #, 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:590
+#: agent/genkey.c:637
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "ubah passphrase"
 
-#: agent/gpg-agent.c:162 scd/scdaemon.c:115 dirmngr/dirmngr.c:182
+#: agent/gpg-agent.c:164 scd/scdaemon.c:115 dirmngr/dirmngr.c:183
 msgid "Options used for startup"
 msgstr ""
 
-#: agent/gpg-agent.c:164 scd/scdaemon.c:120 dirmngr/dirmngr.c:171
+#: agent/gpg-agent.c:166 scd/scdaemon.c:120 dirmngr/dirmngr.c:172
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:117 dirmngr/dirmngr.c:170
+#: agent/gpg-agent.c:167 scd/scdaemon.c:117 dirmngr/dirmngr.c:171
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:167 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:169 dirmngr/dirmngr.c:174
 #, fuzzy
 #| msgid "Key is superseded"
 msgid "run in supervised mode"
 msgstr "Kunci dilampaui"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:121 dirmngr/dirmngr.c:184
+#: agent/gpg-agent.c:171 scd/scdaemon.c:121 dirmngr/dirmngr.c:185
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:170 scd/scdaemon.c:122 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:172 scd/scdaemon.c:122 dirmngr/dirmngr.c:186
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:171 scd/scdaemon.c:123 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:173 scd/scdaemon.c:123 dirmngr/dirmngr.c:187
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:179 g10/gpg.c:589 scd/scdaemon.c:125 sm/gpgsm.c:422
-#: dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:181 g10/gpg.c:589 scd/scdaemon.c:125 sm/gpgsm.c:423
+#: dirmngr/dirmngr.c:189
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:574 scd/scdaemon.c:129 sm/gpgsm.c:265
-#: dirmngr/dirmngr.c:192
+#: agent/gpg-agent.c:185 g10/gpg.c:574 scd/scdaemon.c:129 sm/gpgsm.c:265
+#: dirmngr/dirmngr.c:193
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: agent/gpg-agent.c:185 g10/gpg.c:576 g10/gpgv.c:78 kbx/kbxutil.c:89
+#: agent/gpg-agent.c:187 g10/gpg.c:576 g10/gpgv.c:78 kbx/kbxutil.c:89
 #: scd/scdaemon.c:131 sm/gpgsm.c:267 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:194 dirmngr/dirmngr_ldap.c:102
-#: tools/gpg-connect-agent.c:85 tools/gpgconf.c:111
+#: dirmngr/dirmngr.c:195 tools/gpg-connect-agent.c:85 tools/gpgconf.c:111
 msgid "verbose"
 msgstr "detil"
 
-#: agent/gpg-agent.c:186 g10/gpg.c:578 g10/gpgv.c:79 kbx/kbxutil.c:90
+#: agent/gpg-agent.c:188 g10/gpg.c:578 g10/gpgv.c:79 kbx/kbxutil.c:90
 #: scd/scdaemon.c:132 sm/gpgsm.c:269 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:195 dirmngr/dirmngr_ldap.c:103
+#: dirmngr/dirmngr.c:196
 msgid "be somewhat more quiet"
 msgstr "lebih diam"
 
-#: agent/gpg-agent.c:194 g10/gpg.c:593 sm/gpgsm.c:283 dirmngr/dirmngr.c:205
+#: agent/gpg-agent.c:196 g10/gpg.c:593 sm/gpgsm.c:283 dirmngr/dirmngr.c:206
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 scd/scdaemon.c:146 sm/gpgsm.c:290
-#: dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:599 scd/scdaemon.c:146 sm/gpgsm.c:290
+#: dirmngr/dirmngr.c:210
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: agent/gpg-agent.c:201
+#: agent/gpg-agent.c:203
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "perbarui database trust"
 
-#: agent/gpg-agent.c:203
+#: agent/gpg-agent.c:205
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 #, 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:213
+#: agent/gpg-agent.c:215
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:215
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:216
+#: agent/gpg-agent.c:218
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
 msgstr "tidak didukung"
 
-#: agent/gpg-agent.c:218
+#: agent/gpg-agent.c:220
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:221
+#: agent/gpg-agent.c:223
 #, fuzzy
 #| msgid "not supported"
 msgid "enable putty support"
 msgstr "tidak didukung"
 
-#: agent/gpg-agent.c:233 g10/gpg.c:844 scd/scdaemon.c:176 sm/gpgsm.c:382
+#: agent/gpg-agent.c:235 g10/gpg.c:844 scd/scdaemon.c:176 sm/gpgsm.c:383
 msgid "Options controlling the security"
 msgstr ""
 
-#: agent/gpg-agent.c:236
+#: agent/gpg-agent.c:238
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:238
+#: agent/gpg-agent.c:240
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:242
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:244
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:246
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:248
 #, fuzzy
 msgid "disallow the use of an external password cache"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:250
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:253
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: agent/gpg-agent.c:256
+#: agent/gpg-agent.c:258
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:261
 msgid "do not allow bypassing the passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:261
+#: agent/gpg-agent.c:263
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:265
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:266
+#: agent/gpg-agent.c:268
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:268
+#: agent/gpg-agent.c:272
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|gunakan passphrase mode N"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:274
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: agent/gpg-agent.c:273
+#: agent/gpg-agent.c:277
 msgid "Options controlling the PIN-Entry"
 msgstr ""
 
-#: agent/gpg-agent.c:275
+#: agent/gpg-agent.c:279
 #, fuzzy
 #| msgid "use the gpg-agent"
 msgid "never use the PIN-entry"
 msgstr "gunakan gpg-agent"
 
-#: agent/gpg-agent.c:277
+#: agent/gpg-agent.c:281
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:283
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:282
+#: agent/gpg-agent.c:286
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:286
+#: agent/gpg-agent.c:290
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:294
 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:551 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: agent/gpg-agent.c:557 agent/preset-passphrase.c:99 agent/protect-tool.c:154
 #: g10/gpg.c:1132 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:612 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:438
-#: dirmngr/dirmngr_ldap.c:175 tools/gpg-connect-agent.c:220 tools/gpgconf.c:151
+#: sm/gpgsm.c:613 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:446
+#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:151
 #: 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:560
+#: agent/gpg-agent.c:566
 #, fuzzy
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: agent/gpg-agent.c:562
+#: agent/gpg-agent.c:568
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:607 g10/gpg.c:1337 scd/scdaemon.c:384 sm/gpgsm.c:760
-#: dirmngr/dirmngr.c:522
+#: agent/gpg-agent.c:613 g10/gpg.c:1337 scd/scdaemon.c:384 sm/gpgsm.c:761
+#: dirmngr/dirmngr.c:530
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:972 g10/gpg.c:3910 g10/gpg.c:3934 sm/gpgsm.c:1769
-#: sm/gpgsm.c:1775
+#: agent/gpg-agent.c:986 g10/gpg.c:3907 g10/gpg.c:3931 sm/gpgsm.c:1622
+#: sm/gpgsm.c:1628
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritma digest yang dipilih tidak valid\n"
 
-#: agent/gpg-agent.c:1196 agent/gpg-agent.c:2019 common/comopt.c:93
-#: g10/gpg.c:2591 scd/scdaemon.c:549 sm/gpgsm.c:1155 dirmngr/dirmngr.c:989
-#: dirmngr/dirmngr.c:1840
+#: agent/gpg-agent.c:1210 agent/gpg-agent.c:2035 common/comopt.c:93
+#: g10/gpg.c:2594 scd/scdaemon.c:549 sm/gpgsm.c:1028 dirmngr/dirmngr.c:1029
+#: dirmngr/dirmngr.c:1879
 #, 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:1335 g10/gpg.c:3861 scd/scdaemon.c:687 sm/gpgsm.c:1709
-#: dirmngr/dirmngr.c:1108 tools/gpg-connect-agent.c:1270 tools/gpgconf.c:634
+#: agent/gpg-agent.c:1349 g10/gpg.c:3858 scd/scdaemon.c:687 sm/gpgsm.c:1562
+#: dirmngr/dirmngr.c:1145 tools/gpg-connect-agent.c:1270 tools/gpgconf.c:668
 #, 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:2172 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1267
+#: agent/gpg-agent.c:2188 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1306
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: agent/gpg-agent.c:2189 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1280
+#: agent/gpg-agent.c:2205 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1319
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2228
+#: agent/gpg-agent.c:2244
 #, 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:2239 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1312
+#: agent/gpg-agent.c:2255 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1351
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: agent/gpg-agent.c:2244 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1315
+#: agent/gpg-agent.c:2260 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1354
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "kesalahan mengirim ke `%s': %s\n"
 
-#: agent/gpg-agent.c:2255 agent/gpg-agent.c:2295 agent/gpg-agent.c:2304
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1324
+#: agent/gpg-agent.c:2271 agent/gpg-agent.c:2311 agent/gpg-agent.c:2320
+#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1363
 #, 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:2269 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1336
+#: agent/gpg-agent.c:2285 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1375
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: agent/gpg-agent.c:2289 agent/gpg-agent.c:2342 common/homedir.c:517
+#: agent/gpg-agent.c:2305 agent/gpg-agent.c:2358 common/homedir.c:537
 #: 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:2292 agent/gpg-agent.c:2347 common/homedir.c:520
+#: agent/gpg-agent.c:2308 agent/gpg-agent.c:2363 common/homedir.c:540
 #: g10/openfile.c:402
 #, fuzzy, c-format
 msgid "directory '%s' created\n"
 msgstr "%s: direktori tercipta\n"
 
-#: agent/gpg-agent.c:2353
+#: agent/gpg-agent.c:2369
 #, fuzzy, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: agent/gpg-agent.c:2357
+#: agent/gpg-agent.c:2373
 #, fuzzy, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "%s: tidak dapat membuat direktori: %s\n"
 
-#: agent/gpg-agent.c:2512 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2069
+#: agent/gpg-agent.c:2528 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2108
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: agent/gpg-agent.c:2719
+#: agent/gpg-agent.c:2735
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2724
+#: agent/gpg-agent.c:2740
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2799
+#: agent/gpg-agent.c:2815
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2804
+#: agent/gpg-agent.c:2820
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3026 scd/scdaemon.c:1374 dirmngr/dirmngr.c:2283
+#: agent/gpg-agent.c:3042 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2322
 #, fuzzy, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "gagal perbarui rahasia: %s\n"
 
-#: agent/gpg-agent.c:3114 scd/scdaemon.c:1439
+#: agent/gpg-agent.c:3130 scd/scdaemon.c:1441
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: dilewati: %s\n"
 
-#: agent/gpg-agent.c:3252 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3271 common/simple-pwquery.c:247 g10/call-agent.c:260
 #: sm/call-agent.c:131 tools/gpg-connect-agent.c:2319 tools/card-call-scd.c:311
 #, fuzzy, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
 
-#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:70
+#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:66
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -788,7 +803,7 @@ msgid ""
 msgstr ""
 
 #: agent/protect-tool.c:107 g10/gpg.c:448 kbx/kbxutil.c:72 sm/gpgsm.c:215
-#: dirmngr/dirmngr.c:168 tools/gpgconf.c:81
+#: dirmngr/dirmngr.c:169 tools/gpgconf.c:81
 msgid ""
 "@Commands:\n"
 " "
@@ -818,40 +833,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:707
+#: agent/protect-tool.c:708 sm/import.c:775
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: agent/protect-tool.c:712
+#: agent/protect-tool.c:713 sm/export.c:727
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: agent/protect-tool.c:718
+#: agent/protect-tool.c:719
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:723
+#: agent/protect-tool.c:724
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: agent/protect-tool.c:734
+#: agent/protect-tool.c:735
 #, fuzzy, c-format
 msgid "cancelled\n"
 msgstr "Batal"
 
-#: agent/protect-tool.c:736
+#: agent/protect-tool.c:737
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: agent/trustlist.c:153 agent/trustlist.c:363 tools/gpgconf.c:424
+#: agent/trustlist.c:153 agent/trustlist.c:363 tools/gpgconf.c:458
 #, fuzzy, c-format
 msgid "error opening '%s': %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
@@ -1006,7 +1021,7 @@ msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 msgid "secret key parts are not available\n"
 msgstr "bagian kunci rahasia tidak tersedia\n"
 
-#: agent/cvt-openpgp.c:343 g10/card-util.c:1562
+#: agent/cvt-openpgp.c:343 g10/card-util.c:1575
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -1038,7 +1053,7 @@ msgid "error creating a stream for a pipe: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
 #: common/exechelp-posix.c:505 common/exechelp-posix.c:580
-#: common/exechelp-posix.c:866 dirmngr/dirmngr.c:1354
+#: common/exechelp-posix.c:866 dirmngr/dirmngr.c:1393
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
@@ -1111,7 +1126,7 @@ msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3082
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3099
 msgid "yes"
 msgstr "y|ya"
 
@@ -1166,7 +1181,7 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:115 g10/card-util.c:917 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:927 tools/no-libgcrypt.c:30
 #: tools/gpg-card.c:416
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
@@ -1238,7 +1253,7 @@ msgstr "kesalahan menulis keyring `%s': %s\n"
 msgid "server '%s' is older than us (%s < %s)"
 msgstr ""
 
-#: common/asshelp.c:737 g10/call-dirmngr.c:408
+#: common/asshelp.c:737 g10/call-dirmngr.c:407
 #, fuzzy, c-format
 #| msgid "WARNING: %s overrides %s\n"
 msgid "WARNING: %s\n"
@@ -1333,7 +1348,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:4212
+#: scd/app-openpgp.c:4214
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
@@ -1417,12 +1432,12 @@ msgstr "Kunci ini telah berakhir!"
 msgid "Root certificate trustworthy"
 msgstr "sertifikat yang buruk"
 
-#: common/audit.c:1112 sm/certchain.c:1242
+#: common/audit.c:1112 sm/certchain.c:1243
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "sertifikat yang buruk"
 
-#: common/audit.c:1115 sm/certchain.c:1252
+#: common/audit.c:1115 sm/certchain.c:1253
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Kunci tersedia di:"
@@ -1474,22 +1489,22 @@ msgstr "tidak dikenal"
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "karakter radix64 tidak valid %02x dilewati\n"
 
-#: common/ttyio.c:433
+#: common/ttyio.c:447
 #, c-format
 msgid "Sorry, we are in batchmode - can't get input\n"
 msgstr ""
 
-#: common/ttyio.c:439
+#: common/ttyio.c:453
 #, c-format
 msgid "Sorry, no terminal at all requested - can't get input\n"
 msgstr ""
 
-#: common/ttyio.c:474 common/ttyio.c:484
+#: common/ttyio.c:488 common/ttyio.c:498
 #, c-format
 msgid "too many errors; giving up\n"
 msgstr ""
 
-#: common/ttyio.c:536
+#: common/ttyio.c:550
 #, c-format
 msgid "Control-D detected\n"
 msgstr ""
@@ -1543,8 +1558,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:1036 dirmngr/dirmngr.c:895
-#: dirmngr/dirmngr.c:904
+#: common/init.c:191 sm/gpgsm.c:909 dirmngr/dirmngr.c:935 dirmngr/dirmngr.c:944
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
@@ -1702,7 +1716,7 @@ msgid "Enter passphrase: "
 msgstr "Masukkan passphrase: "
 
 #: g10/call-agent.c:318 g10/encrypt.c:282 g10/encrypt.c:818 g10/sign.c:473
-#: sm/call-agent.c:180 sm/encrypt.c:701 sm/sign.c:436
+#: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
 #, fuzzy, c-format
 #| msgid "%s does not yet work with %s\n"
 msgid "%s is not compliant with %s mode\n"
@@ -1713,225 +1727,225 @@ msgstr "%s belum dapat dipakai dengan %s\n"
 msgid "error from TPM: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: g10/call-agent.c:2123 g10/passphrase.c:225 g10/passphrase.c:258
-#: tools/card-call-scd.c:1751
+#: g10/call-agent.c:2135 g10/passphrase.c:233 g10/passphrase.c:266
+#: tools/card-call-scd.c:1755
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "masalah dengan agen: agen mengembalikan 0x%lx\n"
 
-#: g10/call-dirmngr.c:179 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2316
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2316
 #, fuzzy, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
 
-#: g10/call-dirmngr.c:213
+#: g10/call-dirmngr.c:212
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "keyserver option \"honor-keyserver-url\" may not be used in Tor mode\n"
 msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
 
-#: g10/call-dirmngr.c:386
+#: g10/call-dirmngr.c:385
 msgid "WKD uses a cached result"
 msgstr ""
 
-#: g10/call-dirmngr.c:389
+#: g10/call-dirmngr.c:388
 msgid "Tor is not running"
 msgstr ""
 
-#: g10/call-dirmngr.c:391
+#: g10/call-dirmngr.c:390
 #, fuzzy
 msgid "Tor is not properly configured"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: g10/call-dirmngr.c:393
+#: g10/call-dirmngr.c:392
 #, fuzzy
 msgid "DNS is not properly configured"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: g10/call-dirmngr.c:395
+#: g10/call-dirmngr.c:394
 msgid "unacceptable HTTP redirect from server"
 msgstr ""
 
-#: g10/call-dirmngr.c:397
+#: g10/call-dirmngr.c:396
 msgid "unacceptable HTTP redirect from server was cleaned up"
 msgstr ""
 
-#: g10/call-dirmngr.c:399
+#: g10/call-dirmngr.c:398
 #, fuzzy
 #| msgid "generate a revocation certificate"
 msgid "server uses an invalid certificate"
 msgstr "buat sertifikat revokasi"
 
-#: g10/call-dirmngr.c:406 g10/gpg.c:4599
+#: g10/call-dirmngr.c:405 g10/gpg.c:4596
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "armor: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:369 g10/card-util.c:1924
-#: tools/gpg-card.c:3039
+#: g10/card-util.c:86 g10/card-util.c:374 g10/card-util.c:1937
+#: tools/gpg-card.c:3056
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "kunci rahasia tidak tersedia"
 
-#: g10/card-util.c:91 g10/card-util.c:1930
+#: g10/card-util.c:91 g10/card-util.c:1943
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:97 g10/card-util.c:2309 g10/delkey.c:164 g10/keyedit.c:1428
-#: g10/keygen.c:4791 g10/revoke.c:214 g10/revoke.c:638
+#: g10/card-util.c:97 g10/card-util.c:2322 g10/delkey.c:164 g10/keyedit.c:1428
+#: g10/keygen.c:4795 g10/revoke.c:214 g10/revoke.c:639
 #, fuzzy, c-format
 msgid "can't do this in batch mode\n"
 msgstr "tidak dapat melakukan hal itu dalam mode batch\n"
 
-#: g10/card-util.c:105 tools/gpg-card.c:2943
+#: g10/card-util.c:105 tools/gpg-card.c:2960
 #, fuzzy, c-format
 msgid "This command is only available for version 2 cards\n"
 msgstr "Perintah ini tidak dibolehkan saat dalam mode %s.\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3398 tools/gpg-card.c:2948
+#: g10/card-util.c:107 scd/app-openpgp.c:3399 tools/gpg-card.c:2965
 #, fuzzy, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "bagian kunci rahasia tidak tersedia\n"
 
-#: g10/card-util.c:140 g10/card-util.c:1448 g10/card-util.c:1710
-#: g10/card-util.c:1802 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1991 g10/keygen.c:2165 g10/keygen.c:2385 g10/keygen.c:2685
+#: g10/card-util.c:140 g10/card-util.c:1458 g10/card-util.c:1723
+#: g10/card-util.c:1815 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/keygen.c:1992 g10/keygen.c:2166 g10/keygen.c:2386 g10/keygen.c:2686
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
 #: tools/gpg-card.c:510
 msgid "Your selection? "
 msgstr "Pilihan anda? "
 
-#: g10/card-util.c:262 g10/card-util.c:313 tools/gpg-card.c:596
+#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:596
 #: tools/gpg-card.c:636
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:558 tools/gpg-card.c:903
+#: g10/card-util.c:563 tools/gpg-card.c:905
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:559 tools/gpg-card.c:904
+#: g10/card-util.c:564 tools/gpg-card.c:906
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:586 tools/gpg-card.c:931
+#: g10/card-util.c:591 tools/gpg-card.c:933
 #, fuzzy
 msgid "not forced"
 msgstr "tidak diproses"
 
-#: g10/card-util.c:586 tools/gpg-card.c:931
+#: g10/card-util.c:591 tools/gpg-card.c:933
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:768 tools/gpg-card.c:1468
+#: g10/card-util.c:773 tools/gpg-card.c:1484
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:770 tools/gpg-card.c:1470
+#: g10/card-util.c:775 tools/gpg-card.c:1486
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:772 tools/gpg-card.c:1472
+#: g10/card-util.c:777 tools/gpg-card.c:1488
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:789 tools/gpg-card.c:1505
+#: g10/card-util.c:795 tools/gpg-card.c:1521
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:791 tools/gpg-card.c:1506
+#: g10/card-util.c:797 tools/gpg-card.c:1522
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:809 tools/gpg-card.c:1523
+#: g10/card-util.c:816 tools/gpg-card.c:1539
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:830 tools/gpg-card.c:1561
+#: g10/card-util.c:840 tools/gpg-card.c:1577
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "tidak ada kunci publik yang sesuai: %s\n"
 
-#: g10/card-util.c:926 g10/decrypt-data.c:495 g10/import.c:406 g10/import.c:756
-#: g10/import.c:815 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1666
-#: tools/gpgconf.c:437 tools/gpgconf.c:483 tools/gpg-card.c:426
+#: g10/card-util.c:936 g10/decrypt-data.c:495 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:1705
+#: tools/gpgconf.c:471 tools/gpgconf.c:517 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:959 g10/decrypt-data.c:498 g10/export.c:2496
+#: g10/card-util.c:969 g10/decrypt-data.c:498 g10/export.c:2496
 #: dirmngr/crlcache.c:925 tools/gpg-card.c:486 tools/gpg-card.c:493
 #, fuzzy, c-format
 msgid "error writing '%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: g10/card-util.c:986 tools/gpg-card.c:1650
+#: g10/card-util.c:996 tools/gpg-card.c:1666
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:1024 tools/gpg-card.c:1945
+#: g10/card-util.c:1034 tools/gpg-card.c:1962
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:1109 tools/gpg-card.c:1699
+#: g10/card-util.c:1119 tools/gpg-card.c:1715
 #, fuzzy
 msgid "Language preferences: "
 msgstr "perbarui preferensi"
 
-#: g10/card-util.c:1117 tools/gpg-card.c:1710
+#: g10/card-util.c:1127 tools/gpg-card.c:1726
 #, fuzzy, c-format
 msgid "Error: invalid length of preference string.\n"
 msgstr "Karakter tidak valid dalam string preferensi\n"
 
-#: g10/card-util.c:1126 tools/gpg-card.c:1719
+#: g10/card-util.c:1136 tools/gpg-card.c:1735
 #, fuzzy, c-format
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Karakter tidak valid dalam string preferensi\n"
 
-#: g10/card-util.c:1148 tools/gpg-card.c:1753
+#: g10/card-util.c:1158 tools/gpg-card.c:1769
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1162 tools/gpg-card.c:1770
+#: g10/card-util.c:1172 tools/gpg-card.c:1786
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: g10/card-util.c:1185 tools/gpg-card.c:1835
+#: g10/card-util.c:1195 tools/gpg-card.c:1852
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "tampilkan fingerprint"
 
-#: g10/card-util.c:1209 tools/gpg-card.c:1861
+#: g10/card-util.c:1219 tools/gpg-card.c:1878
 #, fuzzy, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: g10/card-util.c:1259
+#: g10/card-util.c:1269
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: g10/card-util.c:1260
+#: g10/card-util.c:1270
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "tidak ditemukan data OpenPGP yang valid.\n"
 
-#: g10/card-util.c:1273 g10/keygen.c:4811 g10/keygen.c:5972
+#: g10/card-util.c:1283 g10/keygen.c:4815 g10/keygen.c:6003
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
 
-#: g10/card-util.c:1358
+#: g10/card-util.c:1368
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1375 tools/gpg-card.c:3328
+#: g10/card-util.c:1385 tools/gpg-card.c:3345
 msgid ""
 "Note: There is no guarantee that the card supports the requested\n"
 "      key type or size.  If the key generation does not succeed,\n"
@@ -1939,102 +1953,102 @@ msgid ""
 "      key types and sizes are supported.\n"
 msgstr ""
 
-#: g10/card-util.c:1396 g10/keygen.c:2570 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1406 g10/keygen.c:2571 sm/certreqgen-ui.c:180
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Keysize yang anda inginkan? (1024) "
 
-#: g10/card-util.c:1406 g10/keygen.c:2493 g10/keygen.c:2525
+#: g10/card-util.c:1416 g10/keygen.c:2494 g10/keygen.c:2526
 #: sm/certreqgen-ui.c:195
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "dibulatkan hingga %u bit\n"
 
-#: g10/card-util.c:1414 g10/keygen.c:2578 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1424 g10/keygen.c:2579 sm/certreqgen-ui.c:185
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/card-util.c:1433
+#: g10/card-util.c:1443
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1435
+#: g10/card-util.c:1445
 #, fuzzy
 msgid "Signature key\n"
 msgstr "Signature kadaluwarsa %s\n"
 
-#: g10/card-util.c:1437
+#: g10/card-util.c:1447
 #, fuzzy
 msgid "Encryption key\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/card-util.c:1439
+#: g10/card-util.c:1449
 msgid "Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1441 g10/keygen.c:2112 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1451 g10/keygen.c:2113 sm/certreqgen-ui.c:158
 msgid "Please select what kind of key you want:\n"
 msgstr "Silakan pilih kunci yang anda inginkan:\n"
 
-#: g10/card-util.c:1442 sm/certreqgen-ui.c:159
+#: g10/card-util.c:1452 sm/certreqgen-ui.c:159
 #, fuzzy, c-format
 msgid "   (%d) RSA\n"
 msgstr "  (%d) RSA (hanya menandai)\n"
 
-#: g10/card-util.c:1443
+#: g10/card-util.c:1453
 #, fuzzy, c-format
 msgid "   (%d) ECC\n"
 msgstr "  (%d) DSA dan ElGamal (baku)\n"
 
-#: g10/card-util.c:1455 g10/card-util.c:1722 g10/card-util.c:1822
-#: g10/keyedit.c:900 g10/keygen.c:2017 g10/keygen.c:2045 g10/keygen.c:2172
-#: g10/keygen.c:2425 g10/keygen.c:2713 g10/revoke.c:836
+#: g10/card-util.c:1468 g10/card-util.c:1735 g10/card-util.c:1835
+#: g10/keyedit.c:900 g10/keygen.c:2018 g10/keygen.c:2046 g10/keygen.c:2173
+#: g10/keygen.c:2426 g10/keygen.c:2714 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Pilihan tidak valid.\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1541
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 
-#: g10/card-util.c:1533
+#: g10/card-util.c:1546
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1582
 #, fuzzy, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "kesalahan mengirim ke `%s': %s\n"
 
-#: g10/card-util.c:1585 g10/card-util.c:2106 g10/card-util.c:2162
+#: g10/card-util.c:1598 g10/card-util.c:2119 g10/card-util.c:2175
 #, fuzzy, c-format
 msgid "error getting card info: %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
 
-#: g10/card-util.c:1591 g10/card-util.c:1936 g10/card-util.c:2112
-#: g10/card-util.c:2171 tools/gpg-card.c:3057 tools/gpg-card.c:3296
-#: tools/gpg-card.c:3354
+#: g10/card-util.c:1604 g10/card-util.c:1949 g10/card-util.c:2125
+#: g10/card-util.c:2184 tools/gpg-card.c:3074 tools/gpg-card.c:3313
+#: tools/gpg-card.c:3371
 #, fuzzy, c-format
 #| msgid "This command is not allowed while in %s mode.\n"
 msgid "This command is not supported by this card\n"
 msgstr "Perintah ini tidak dibolehkan saat dalam mode %s.\n"
 
-#: g10/card-util.c:1637 tools/gpg-card.c:2426
+#: g10/card-util.c:1650 tools/gpg-card.c:2443
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1651
+#: g10/card-util.c:1664
 #, fuzzy, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
 
-#: g10/card-util.c:1654 tools/gpg-card.c:2398
+#: g10/card-util.c:1667 tools/gpg-card.c:2415
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1666 tools/gpg-card.c:2457
+#: g10/card-util.c:1679 tools/gpg-card.c:2474
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2042,172 +2056,172 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1701
+#: g10/card-util.c:1714
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Silakan pilih kunci yang anda inginkan:\n"
 
-#: g10/card-util.c:1703 g10/card-util.c:1793
+#: g10/card-util.c:1716 g10/card-util.c:1806
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Signature kadaluwarsa %s\n"
 
-#: g10/card-util.c:1704 g10/card-util.c:1795
+#: g10/card-util.c:1717 g10/card-util.c:1808
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/card-util.c:1705 g10/card-util.c:1797
+#: g10/card-util.c:1718 g10/card-util.c:1810
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1790
+#: g10/card-util.c:1803
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Silakan pilih alasan untuk pembatalan:\n"
 
-#: g10/card-util.c:1836
+#: g10/card-util.c:1849
 #, fuzzy, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: g10/card-util.c:1941 tools/gpg-card.c:3065
+#: g10/card-util.c:1954 tools/gpg-card.c:3082
 #, fuzzy, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
 
-#: g10/card-util.c:1944 tools/gpg-card.c:3068 tools/gpg-card.c:3409
+#: g10/card-util.c:1957 tools/gpg-card.c:3085 tools/gpg-card.c:3426
 #, fuzzy
 msgid "Continue? (y/N) "
 msgstr "Ditandai? "
 
-#: g10/card-util.c:1949 tools/gpg-card.c:3079
+#: g10/card-util.c:1962 tools/gpg-card.c:3096
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2142
+#: g10/card-util.c:2155
 #, fuzzy, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: g10/card-util.c:2188
+#: g10/card-util.c:2201
 #, fuzzy, c-format
 msgid "error for setup UIF: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: g10/card-util.c:2212 g10/keyedit.c:1263 tools/gpg-card.c:3649
+#: g10/card-util.c:2225 g10/keyedit.c:1263 tools/gpg-card.c:3666
 msgid "quit this menu"
 msgstr "berhenti dari menu ini"
 
-#: g10/card-util.c:2214
+#: g10/card-util.c:2227
 #, fuzzy
 msgid "show admin commands"
 msgstr "perintah saling konflik\n"
 
-#: g10/card-util.c:2215 g10/keyedit.c:1266 tools/gpg-card.c:3652
+#: g10/card-util.c:2228 g10/keyedit.c:1266 tools/gpg-card.c:3669
 msgid "show this help"
 msgstr "tampilkan bantuan"
 
-#: g10/card-util.c:2217 tools/gpg-card.c:3654
+#: g10/card-util.c:2230 tools/gpg-card.c:3671
 #, fuzzy
 msgid "list all available data"
 msgstr "Kunci tersedia di:"
 
-#: g10/card-util.c:2220 tools/gpg-card.c:3656
+#: g10/card-util.c:2233 tools/gpg-card.c:3673
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:2221 tools/gpg-card.c:3657
+#: g10/card-util.c:2234 tools/gpg-card.c:3674
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:2222 tools/gpg-card.c:3658
+#: g10/card-util.c:2235 tools/gpg-card.c:3675
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:2223 tools/gpg-card.c:3659
+#: g10/card-util.c:2236 tools/gpg-card.c:3676
 #, fuzzy
 msgid "change the login name"
 msgstr "ubah tanggal kadaluarsa"
 
-#: g10/card-util.c:2224 tools/gpg-card.c:3660
+#: g10/card-util.c:2237 tools/gpg-card.c:3677
 #, fuzzy
 msgid "change the language preferences"
 msgstr "ubah ownertrust"
 
-#: g10/card-util.c:2225 tools/gpg-card.c:3661
+#: g10/card-util.c:2238 tools/gpg-card.c:3678
 msgid "change card holder's salutation"
 msgstr ""
 
-#: g10/card-util.c:2227 tools/gpg-card.c:3663
+#: g10/card-util.c:2240 tools/gpg-card.c:3680
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "tampilkan fingerprint"
 
-#: g10/card-util.c:2228 tools/gpg-card.c:3664
+#: g10/card-util.c:2241 tools/gpg-card.c:3681
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:2229 tools/gpg-card.c:3665
+#: g10/card-util.c:2242 tools/gpg-card.c:3682
 #, fuzzy
 msgid "generate new keys"
 msgstr "buat sepasang kunci baru"
 
-#: g10/card-util.c:2230 tools/gpg-card.c:3666
+#: g10/card-util.c:2243 tools/gpg-card.c:3683
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:2231 tools/gpg-card.c:3667
+#: g10/card-util.c:2244 tools/gpg-card.c:3684
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:2232 tools/gpg-card.c:3668
+#: g10/card-util.c:2245 tools/gpg-card.c:3685
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:2233 tools/gpg-card.c:3672
+#: g10/card-util.c:2246 tools/gpg-card.c:3689
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2235
+#: g10/card-util.c:2248
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr "|NAMA|gunakan NAMA sebagai penerima baku"
 
-#: g10/card-util.c:2236
+#: g10/card-util.c:2249
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "ubah ownertrust"
 
-#: g10/card-util.c:2237 tools/gpg-card.c:3674
+#: g10/card-util.c:2250 tools/gpg-card.c:3691
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the User Interaction Flag"
 msgstr "ubah ownertrust"
 
-#: g10/card-util.c:2361 tools/gpg-card.c:3924
+#: g10/card-util.c:2374 tools/gpg-card.c:3941
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2402
+#: g10/card-util.c:2415
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/card-util.c:2433
+#: g10/card-util.c:2446
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/card-util.c:2435
+#: g10/card-util.c:2448
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/card-util.c:2546 g10/keyedit.c:2275 tools/gpg-card.c:3814
-#: tools/gpg-card.c:4072
+#: g10/card-util.c:2559 g10/keyedit.c:2275 tools/gpg-card.c:3831
+#: tools/gpg-card.c:4089
 #, c-format
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Perintah tidak valid (coba \"help\")\n"
@@ -2217,23 +2231,23 @@ msgstr "Perintah tidak valid (coba \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output tidak berfungsi untuk perintah ini\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5293 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5292 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:1934 g10/export.c:2342 g10/export.c:2463
-#: g10/getkey.c:1907 g10/gpg.c:5238 g10/keyedit.c:1450 g10/keyedit.c:2382
-#: g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:703 g10/keyserver.c:1240
-#: g10/revoke.c:230 g10/tofu.c:2168
+#: g10/getkey.c:2032 g10/gpg.c:5237 g10/keyedit.c:1450 g10/keyedit.c:2382
+#: g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:703 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:2002 g10/getkey.c:1915 g10/getkey.c:4330
-#: g10/gpg.c:5247 g10/keyedit.c:2354 g10/keyserver.c:1258 g10/revoke.c:236
-#: g10/revoke.c:665 g10/tofu.c:2176
+#: g10/delkey.c:90 g10/export.c:2002 g10/getkey.c:2040 g10/getkey.c:4455
+#: g10/gpg.c:5246 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"
 msgstr "gagal membaca keyblock: %s\n"
@@ -2360,15 +2374,15 @@ msgstr ""
 msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:555 g10/encrypt.c:808 g10/decrypt-data.c:261 g10/gpg.c:4083
-#: g10/gpg.c:4130 sm/decrypt.c:742 sm/encrypt.c:691 sm/gpgsm.c:1793
+#: g10/encrypt.c:555 g10/encrypt.c:808 g10/decrypt-data.c:261 g10/gpg.c:4080
+#: g10/gpg.c:4127 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1646
 #, 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:564 g10/gpg.c:4095 g10/gpg.c:4142 g10/sig-check.c:155
-#: g10/sign.c:452 sm/gpgsm.c:1803 sm/gpgsm.c:1813 sm/sign.c:596 sm/verify.c:510
+#: g10/encrypt.c:564 g10/gpg.c:4092 g10/gpg.c:4139 g10/sig-check.c:155
+#: g10/sign.c:452 sm/gpgsm.c:1656 sm/gpgsm.c:1666 sm/sign.c:596 sm/verify.c:510
 #, fuzzy, c-format
 msgid "digest algorithm '%s' may not be used in %s mode\n"
 msgstr ""
@@ -2386,7 +2400,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "memaksa cipher simetrik %s (%d) melanggar preferensi penerima\n"
 
-#: g10/encrypt.c:838 sm/encrypt.c:766
+#: g10/encrypt.c:838 sm/encrypt.c:767
 #, fuzzy, c-format
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
@@ -2415,7 +2429,7 @@ msgstr "%s/%s dienkripsi untuk: %s\n"
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
 
-#: g10/decrypt-data.c:239 g10/mainproc.c:380 sm/decrypt.c:494
+#: g10/decrypt-data.c:239 g10/mainproc.c:380 sm/decrypt.c:892
 #, fuzzy, c-format
 #| msgid "%s encrypted data\n"
 msgid "%s.%s encrypted data\n"
@@ -2426,7 +2440,7 @@ msgstr "%s data terenkripsi\n"
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "dienkripsi dengan algoritma tidak dikenal %d\n"
 
-#: g10/decrypt-data.c:361 g10/decrypt-data.c:414 sm/decrypt.c:508
+#: g10/decrypt-data.c:361 g10/decrypt-data.c:414 sm/decrypt.c:906
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2473,7 +2487,7 @@ msgstr ""
 msgid " - skipped"
 msgstr "%s: dilewati: %s\n"
 
-#: g10/export.c:1333 g10/import.c:2124 g10/openfile.c:202 g10/openfile.c:296
+#: g10/export.c:1333 g10/import.c:2132 g10/openfile.c:202 g10/openfile.c:296
 #: g10/sign.c:1110 g10/sign.c:1447
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
@@ -2512,64 +2526,64 @@ msgstr "kesalahan penciptaan : `%s': %s\n"
 msgid "[User ID not found]"
 msgstr "[User id tidak ditemukan]"
 
-#: g10/getkey.c:1199
+#: g10/getkey.c:1324
 #, fuzzy, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "kesalahan penciptaan : `%s': %s\n"
 
-#: g10/getkey.c:1205
+#: g10/getkey.c:1330
 #, fuzzy, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "kesalahan penciptaan : `%s': %s\n"
 
-#: g10/getkey.c:1207
+#: g10/getkey.c:1332
 #, fuzzy
 msgid "No fingerprint"
 msgstr "tampilkan fingerprint"
 
-#: g10/getkey.c:1449
+#: g10/getkey.c:1574
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1884 g10/revoke.c:657 g10/revoke.c:718
+#: g10/getkey.c:2009 g10/revoke.c:658 g10/revoke.c:719
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "kunci rahasia `%s' tidak ditemukan: %s\n"
 
-#: g10/getkey.c:1887 g10/pkclist.c:1012
+#: g10/getkey.c:2012 g10/pkclist.c:1012
 #, fuzzy, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/getkey.c:1965
+#: g10/getkey.c:2090
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
 
-#: g10/getkey.c:1973
+#: g10/getkey.c:2098
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
 
-#: g10/getkey.c:1980
+#: g10/getkey.c:2105
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr ""
 
-#: g10/getkey.c:2837
+#: g10/getkey.c:2962
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "kunci tidak valid %08lX dibuat valid oleh --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:3703
+#: g10/getkey.c:3828
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "menggunakan kunci sekunder %08lX bukannya kunci primer %08lX\n"
 
-#: g10/getkey.c:4259 g10/gpg.c:2167
+#: g10/getkey.c:4384 g10/gpg.c:2168
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "opsi impor tidak valid\n"
@@ -2774,7 +2788,7 @@ msgstr ""
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:651 kbx/kbxutil.c:91 sm/gpgsm.c:424 tools/gpgconf.c:113
+#: g10/gpg.c:651 kbx/kbxutil.c:91 sm/gpgsm.c:425 tools/gpgconf.c:113
 msgid "do not make any changes"
 msgstr "jangan buat perubahan"
 
@@ -2808,7 +2822,7 @@ msgstr "gunakan mode teks kanonikal"
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|set tingkat kompresi N (0 tidak ada)"
 
-#: g10/gpg.c:762 sm/gpgsm.c:357
+#: g10/gpg.c:762 sm/gpgsm.c:358
 msgid "Options controlling key import and export"
 msgstr ""
 
@@ -2827,11 +2841,11 @@ msgstr "impor kunci dari keyserver"
 msgid "include the public key in signatures"
 msgstr "periksa signature kunci"
 
-#: g10/gpg.c:776 sm/gpgsm.c:360
+#: g10/gpg.c:776 sm/gpgsm.c:361
 msgid "disable all access to the dirmngr"
 msgstr ""
 
-#: g10/gpg.c:788 sm/gpgsm.c:367
+#: g10/gpg.c:788 sm/gpgsm.c:368
 msgid "Options controlling key listings"
 msgstr ""
 
@@ -2851,15 +2865,15 @@ msgstr "|NAMA|enkripsi untuk NAMA"
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "gunakan id-user ini untuk menandai/dekripsi"
 
-#: g10/gpg.c:876 sm/gpgsm.c:408
+#: g10/gpg.c:876 sm/gpgsm.c:409
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:895 sm/gpgsm.c:420 dirmngr/dirmngr.c:286
+#: g10/gpg.c:895 sm/gpgsm.c:421 dirmngr/dirmngr.c:289
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:966 sm/gpgsm.c:453
+#: g10/gpg.c:966 sm/gpgsm.c:454
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2918,7 +2932,7 @@ msgstr ""
 "tandai, cek, enkripsi atau dekripsi\n"
 "operasi baku tergantung pada data input\n"
 
-#: g10/gpg.c:1168 sm/gpgsm.c:636
+#: g10/gpg.c:1168 sm/gpgsm.c:637
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2942,12 +2956,12 @@ msgstr "Hash: "
 msgid "Compression: "
 msgstr "Kompresi: "
 
-#: g10/gpg.c:1274 sm/gpgsm.c:710
+#: g10/gpg.c:1274 sm/gpgsm.c:711
 #, fuzzy, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "pemakaian: gpg [pilihan] "
 
-#: g10/gpg.c:1467 sm/gpgsm.c:803
+#: g10/gpg.c:1467 sm/gpgsm.c:804
 #, c-format
 msgid "conflicting commands\n"
 msgstr "perintah saling konflik\n"
@@ -2957,538 +2971,538 @@ msgstr "perintah saling konflik\n"
 msgid "no = sign found in group definition '%s'\n"
 msgstr "tanda = tidak ditemukan dalam definisi grup \"%s\"\n"
 
-#: g10/gpg.c:1683
+#: g10/gpg.c:1684
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1686
+#: g10/gpg.c:1687
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1689
+#: g10/gpg.c:1690
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1695
+#: g10/gpg.c:1696
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1698
+#: g10/gpg.c:1699
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1701
+#: g10/gpg.c:1702
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1708
 #, 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:1710
+#: g10/gpg.c:1711
 #, 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:1713
+#: g10/gpg.c:1714
 #, 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:1719
+#: g10/gpg.c:1720
 #, 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:1722
+#: g10/gpg.c:1723
 #, 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:1725
+#: g10/gpg.c:1726
 #, 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:1941
+#: g10/gpg.c:1942
 #, fuzzy, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
 
-#: g10/gpg.c:2037
+#: g10/gpg.c:2038
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:2039
+#: g10/gpg.c:2040
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/gpg.c:2041
+#: g10/gpg.c:2042
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2043
+#: g10/gpg.c:2044
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/gpg.c:2045
+#: g10/gpg.c:2046
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2049
+#: g10/gpg.c:2050
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2051
+#: g10/gpg.c:2052
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:2053
+#: g10/gpg.c:2054
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:2055
+#: g10/gpg.c:2056
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:2057
+#: g10/gpg.c:2058
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:2059
+#: g10/gpg.c:2060
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "tampilkan keyring tempat kunci yang dipilih berada"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2062
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/gpg.c:2178
+#: g10/gpg.c:2179
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
 
-#: g10/gpg.c:2180
+#: g10/gpg.c:2181
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2975 g10/gpg.c:3828 g10/gpg.c:3840
+#: g10/gpg.c:2978 g10/gpg.c:3825 g10/gpg.c:3837
 #, 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:3151 g10/gpg.c:3163
+#: g10/gpg.c:3154 g10/gpg.c:3166
 #, fuzzy, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:3185
+#: g10/gpg.c:3188
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "Bukan alamat email yang valid\n"
 
-#: g10/gpg.c:3217 sm/gpgsm.c:1270
+#: g10/gpg.c:3220 sm/gpgsm.c:1143
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: g10/gpg.c:3223 sm/gpgsm.c:1276
+#: g10/gpg.c:3226 sm/gpgsm.c:1149
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:3280
+#: g10/gpg.c:3283
 #, fuzzy, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:3302 g10/gpg.c:3511 g10/keyedit.c:5319
+#: g10/gpg.c:3305 g10/gpg.c:3514 g10/keyedit.c:5322
 #, fuzzy, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: g10/gpg.c:3320
+#: g10/gpg.c:3323
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:3323
+#: g10/gpg.c:3326
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3333
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/gpg.c:3333
+#: g10/gpg.c:3336
 #, c-format
 msgid "invalid import options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:3339 g10/gpg.c:3354
+#: g10/gpg.c:3342 g10/gpg.c:3357
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:3345
+#: g10/gpg.c:3348
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3351
 #, c-format
 msgid "invalid export options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3363
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3366
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:3371
+#: g10/gpg.c:3374
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3373
+#: g10/gpg.c:3376
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3378
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:3377
+#: g10/gpg.c:3380
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3384
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3386
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:3385
+#: g10/gpg.c:3388
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:3387
+#: g10/gpg.c:3390
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3389
+#: g10/gpg.c:3392
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:3396
+#: g10/gpg.c:3399
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:3399
+#: g10/gpg.c:3402
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3409
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "tidak dapat menset path exec ke %s\n"
 
-#: g10/gpg.c:3613
+#: g10/gpg.c:3616
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:3616
+#: g10/gpg.c:3619
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3625
+#: g10/gpg.c:3628
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:3807 sm/gpgsm.c:1675
+#: g10/gpg.c:3804 sm/gpgsm.c:1528
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "PERINGATAN: program mungkin membuat file core!\n"
 
-#: g10/gpg.c:3821
+#: g10/gpg.c:3818
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "PERINGATAN: %s menimpa %s\n"
 
-#: g10/gpg.c:3830
+#: g10/gpg.c:3827
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s tidak dibolehkan dengan %s!\n"
 
-#: g10/gpg.c:3833
+#: g10/gpg.c:3830
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s tidak masuk akal dengan %s!\n"
 
-#: g10/gpg.c:3848 sm/gpgsm.c:1696 dirmngr/dirmngr.c:1123
+#: g10/gpg.c:3845 sm/gpgsm.c:1549 dirmngr/dirmngr.c:1160
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3869
+#: g10/gpg.c:3866
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/gpg.c:3897 g10/gpg.c:3928 sm/gpgsm.c:1763
+#: g10/gpg.c:3894 g10/gpg.c:3925 sm/gpgsm.c:1616
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3901
 #, 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:3916
+#: g10/gpg.c:3913
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3922
+#: g10/gpg.c:3919
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritma sertifikasi digest yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3937
+#: g10/gpg.c:3934
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed harus lebih dari 0\n"
 
-#: g10/gpg.c:3939
+#: g10/gpg.c:3936
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed harus lebih dari 1\n"
 
-#: g10/gpg.c:3941
+#: g10/gpg.c:3938
 #, 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:3943
+#: g10/gpg.c:3940
 #, 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:3945
+#: g10/gpg.c:3942
 #, 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:3949
+#: g10/gpg.c:3946
 #, 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:3953
+#: g10/gpg.c:3950
 #, 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:3960
+#: g10/gpg.c:3957
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "preferensi baku tidak valid\n"
 
-#: g10/gpg.c:3964
+#: g10/gpg.c:3961
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "preferensi cipher personal tidak valid\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3964
 #, 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:3971
+#: g10/gpg.c:3968
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "preferensi digest personal tidak valid\n"
 
-#: g10/gpg.c:3975
+#: g10/gpg.c:3972
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "preferensi kompresi personal tidak valid\n"
 
-#: g10/gpg.c:3984 g10/gpg.c:3989
+#: g10/gpg.c:3981 g10/gpg.c:3986
 #, 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:4026
+#: g10/gpg.c:4023
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s belum dapat dipakai dengan %s\n"
 
-#: g10/gpg.c:4089
+#: g10/gpg.c:4086
 #, 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:4101
+#: g10/gpg.c:4098
 #, 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:4256
+#: g10/gpg.c:4253
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/gpg.c:4268
+#: g10/gpg.c:4265
 #, 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:4340
+#: g10/gpg.c:4337
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "dekripsi gagal: %s\n"
 
-#: g10/gpg.c:4369
+#: g10/gpg.c:4366
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4372
+#: g10/gpg.c:4369
 #, 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:4430
+#: g10/gpg.c:4427
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4433
+#: g10/gpg.c:4430
 #, 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:4821 g10/keyserver.c:1870
+#: g10/gpg.c:4818 g10/keyserver.c:1629
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Pengiriman keyserver gagal: %s\n"
 
-#: g10/gpg.c:4826
+#: g10/gpg.c:4823
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Penerimaan keyserver gagal: %s\n"
 
-#: g10/gpg.c:4832
+#: g10/gpg.c:4829
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Ekspor kunci gagal: %s\n"
 
-#: g10/gpg.c:4845
+#: g10/gpg.c:4842
 #, 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:4857
+#: g10/gpg.c:4854
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Pencarian keyserver gagal: %s\n"
 
-#: g10/gpg.c:4870
+#: g10/gpg.c:4867
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh keyserver gagal: %s\n"
 
-#: g10/gpg.c:4937
+#: g10/gpg.c:4936
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "gagal dearmoring: %s\n"
 
-#: g10/gpg.c:4948
+#: g10/gpg.c:4947
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: g10/gpg.c:5053
+#: g10/gpg.c:5052
 #, 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:5205 g10/tofu.c:2156
+#: g10/gpg.c:5204 g10/tofu.c:2160
 #, fuzzy, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: g10/gpg.c:5216
+#: g10/gpg.c:5215
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5272
+#: g10/gpg.c:5271
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5283
+#: g10/gpg.c:5282
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Teruskan dan ketikkan pesan anda ....\n"
 
-#: g10/gpg.c:5630
+#: g10/gpg.c:5629
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL sertifikasi kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:5632
+#: g10/gpg.c:5631
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:5665
+#: g10/gpg.c:5664
 #, fuzzy, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
@@ -3502,7 +3516,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:414 tools/gpgconf.c:116 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:415 tools/gpgconf.c:116 tools/gpg-card.c:95
 msgid "|FD|write status info to this FD"
 msgstr "|FD|tulis info status ke FD ini"
 
@@ -3597,271 +3611,271 @@ msgstr ""
 msgid "repair keys on import"
 msgstr "tampilkan fingerprint"
 
-#: g10/import.c:399 g10/import.c:721
+#: g10/import.c:407 g10/import.c:729
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "melewati blok tipe %d\n"
 
-#: g10/import.c:738
+#: g10/import.c:746
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu kunci telah diproses\n"
 
-#: g10/import.c:831
+#: g10/import.c:839
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Jumlah yang telah diproses: %lu\n"
 
-#: g10/import.c:834
+#: g10/import.c:842
 #, fuzzy, c-format
 #| msgid "      skipped new keys: %lu\n"
 msgid "    skipped PGP-2 keys: %lu\n"
 msgstr "        lewati kunci baru: %lu\n"
 
-#: g10/import.c:836
+#: g10/import.c:844
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "        lewati kunci baru: %lu\n"
 
-#: g10/import.c:839
+#: g10/import.c:847
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         tanpa ID user: %lu\n"
 
-#: g10/import.c:842 sm/import.c:129
+#: g10/import.c:850 sm/import.c:129
 #, c-format
 msgid "              imported: %lu"
 msgstr "             diimpor: %lu"
 
-#: g10/import.c:846 sm/import.c:133
+#: g10/import.c:854 sm/import.c:133
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "            tidak berubah: %lu\n"
 
-#: g10/import.c:848
+#: g10/import.c:856
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "         ID user baru: %lu\n"
 
-#: g10/import.c:850
+#: g10/import.c:858
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "          subkey baru: %lu\n"
 
-#: g10/import.c:852
+#: g10/import.c:860
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "       signature baru: %lu\n"
 
-#: g10/import.c:854
+#: g10/import.c:862
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "  pembatalan kunci baru: %lu\n"
 
-#: g10/import.c:856 sm/import.c:135
+#: g10/import.c:864 sm/import.c:135
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "     kunci rahasia dibaca: %lu\n"
 
-#: g10/import.c:858 sm/import.c:137
+#: g10/import.c:866 sm/import.c:137
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  kunci rahasia diimpor: %lu\n"
 
-#: g10/import.c:860 sm/import.c:139
+#: g10/import.c:868 sm/import.c:139
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " kunci rahasia tidak berubah: %lu\n"
 
-#: g10/import.c:862 sm/import.c:141
+#: g10/import.c:870 sm/import.c:141
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "            tidak diimpor: %lu\n"
 
-#: g10/import.c:864
+#: g10/import.c:872
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "       signature baru: %lu\n"
 
-#: g10/import.c:866
+#: g10/import.c:874
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "     kunci rahasia dibaca: %lu\n"
 
-#: g10/import.c:1291
+#: g10/import.c:1299
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:1333
+#: g10/import.c:1341
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:1351
+#: g10/import.c:1359
 #, fuzzy, c-format
 msgid "         \"%s\": preference for AEAD algorithm %s\n"
 msgstr "%s signature, algoritma digest %s\n"
 
-#: g10/import.c:1366
+#: g10/import.c:1374
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s signature, algoritma digest %s\n"
 
-#: g10/import.c:1378
+#: g10/import.c:1386
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:1391
+#: g10/import.c:1399
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:1393
+#: g10/import.c:1401
 #, c-format
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:1418
+#: g10/import.c:1426
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:1932 g10/import.c:3053
+#: g10/import.c:1940 g10/import.c:3061
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "kunci %08lX: tidak ada ID user\n"
 
-#: g10/import.c:1938
+#: g10/import.c:1946
 #, fuzzy, c-format
 msgid "key %s: %s\n"
 msgstr "melewati `%s': %s\n"
 
-#: g10/import.c:1939 g10/import.c:3025
+#: g10/import.c:1947 g10/import.c:3033
 msgid "rejected by import screener"
 msgstr ""
 
-#: g10/import.c:1988
+#: g10/import.c:1996
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "kunci %08lX: subkey HKP yang rusak diperbaiki\n"
 
-#: g10/import.c:2009
+#: g10/import.c:2017
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "kunci %08lX: menerima ID user '%s' yang tidak self-signed\n"
 
-#: g10/import.c:2020 g10/import.c:2051
+#: g10/import.c:2028 g10/import.c:2059
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "kunci %08lX: tidak ada ID user yang valid\n"
 
-#: g10/import.c:2022
+#: g10/import.c:2030
 #, c-format
 msgid "this may be caused by a missing self-signature\n"
 msgstr "mungkin disebabkan oleh self-signature yang tidak ada\n"
 
-#: g10/import.c:2101 g10/import.c:3439
+#: g10/import.c:2109 g10/import.c:3447
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "kunci %08lX: kunci publik tidak ditemukan: %s\n"
 
-#: g10/import.c:2107
+#: g10/import.c:2115
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "kunci %08lX: kunci baru - dilewati\n"
 
-#: g10/import.c:2119
+#: g10/import.c:2127
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "tidak ditemukan keyring yang dapat ditulisi: %s\n"
 
-#: g10/import.c:2151 g10/import.c:2253 g10/import.c:3514
+#: g10/import.c:2159 g10/import.c:2261 g10/import.c:3522
 #, fuzzy, c-format
 #| msgid "error writing keyring `%s': %s\n"
 msgid "error writing keyring '%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: g10/import.c:2174
+#: g10/import.c:2182
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "kunci %08lX: kunci publik \"%s\" diimpor\n"
 
-#: g10/import.c:2201
+#: g10/import.c:2209
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "kunci %08lX: tidak cocok dengan duplikat kami\n"
 
-#: g10/import.c:2269
+#: g10/import.c:2277
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "kunci %08lX: 1 user ID baru \"%s\"\n"
 
-#: g10/import.c:2272
+#: g10/import.c:2280
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "kunci %08lX: \"%s\" %d user ID baru\n"
 
-#: g10/import.c:2275
+#: g10/import.c:2283
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "kunci %08lX: \"%s\" 1 signature baru\n"
 
-#: g10/import.c:2278
+#: g10/import.c:2286
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "kunci %08lX: \"%s\" %d signature baru\n"
 
-#: g10/import.c:2281
+#: g10/import.c:2289
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "kunci %08lX: \"%s\" 1 subkey baru\n"
 
-#: g10/import.c:2284
+#: g10/import.c:2292
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "kunci %08lX: \"%s\" %d subkey baru\n"
 
-#: g10/import.c:2287
+#: g10/import.c:2295
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "kunci %08lX: \"%s\" %d signature baru\n"
 
-#: g10/import.c:2290
+#: g10/import.c:2298
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "kunci %08lX: \"%s\" %d signature baru\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2301
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "kunci %08lX: \"%s\" %d user ID baru\n"
 
-#: g10/import.c:2296
+#: g10/import.c:2304
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "kunci %08lX: \"%s\" %d user ID baru\n"
 
-#: g10/import.c:2332
+#: g10/import.c:2340
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "kunci %08lX: \"%s\" tidak berubah\n"
 
-#: g10/import.c:2692 g10/import.c:2887
+#: g10/import.c:2700 g10/import.c:2895
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "kunci %08lX: kunci rahasia diimpor\n"
 
-#: g10/import.c:2700
+#: g10/import.c:2708
 #, fuzzy, c-format
 #| msgid "skipped: secret key already present\n"
 msgid "key %s: secret key already exists\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
 
-#: g10/import.c:2708
+#: g10/import.c:2716
 #, fuzzy, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "kesalahan mengirim ke `%s': %s\n"
@@ -3874,207 +3888,206 @@ msgstr "kesalahan mengirim ke `%s': %s\n"
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2877
+#: g10/import.c:2885
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:3024
+#: g10/import.c:3032
 #, fuzzy, c-format
 msgid "secret key %s: %s\n"
 msgstr "kunci rahasia `%s' tidak ditemukan: %s\n"
 
-#: g10/import.c:3045 g10/import.c:3084
+#: g10/import.c:3053 g10/import.c:3092
 #, fuzzy, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/import.c:3072
+#: g10/import.c:3080
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "kunci %08lX: kunci rahasia dengan cipher tidak valid %d - dilewati\n"
 
-#: g10/import.c:3234 g10/pkclist.c:75 g10/revoke.c:774
+#: g10/import.c:3242 g10/pkclist.c:75 g10/revoke.c:775
 msgid "No reason specified"
 msgstr "Tidak ada alasan diberikan"
 
-#: g10/import.c:3235 g10/pkclist.c:77 g10/revoke.c:776
+#: g10/import.c:3243 g10/pkclist.c:77 g10/revoke.c:777
 msgid "Key is superseded"
 msgstr "Kunci dilampaui"
 
-#: g10/import.c:3236 g10/pkclist.c:79 g10/revoke.c:775
+#: g10/import.c:3244 g10/pkclist.c:79 g10/revoke.c:776
 msgid "Key has been compromised"
 msgstr "Kunci ini telah dikompromikan"
 
-#: g10/import.c:3237 g10/pkclist.c:81 g10/revoke.c:777
+#: g10/import.c:3245 g10/pkclist.c:81 g10/revoke.c:778
 msgid "Key is no longer used"
 msgstr "Kunci tidak lagi digunakan"
 
-#: g10/import.c:3238 g10/pkclist.c:83 g10/revoke.c:778
+#: g10/import.c:3246 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "ID User tidak lagi valid"
 
-#: g10/import.c:3363 g10/keylist.c:1105 g10/pkclist.c:87
+#: g10/import.c:3371 g10/keylist.c:1105 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "Alasan pembatalan:"
 
-#: g10/import.c:3382 g10/keylist.c:1124 g10/pkclist.c:103
+#: g10/import.c:3390 g10/keylist.c:1124 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "Komentar pembatalan:"
 
-#: g10/import.c:3432
+#: g10/import.c:3440
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "kunci %08lX: tdk ada kunci publik-tdk dpt mengaplikasikan sertifikat "
 "pembatalan\n"
 
-#: g10/import.c:3461
+#: g10/import.c:3469
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "kunci %08lX: tidak dapat menemukan keyblock orisinal: %s\n"
 
-#: g10/import.c:3468
+#: g10/import.c:3476
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "kunci %08lX: tidak dapat membaca keyblok orisinal: %s\n"
 
-#: g10/import.c:3488
+#: g10/import.c:3496
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "kunci %08lX: sertifikat pembatalan tidak valid: %s - ditolak\n"
 
-#: g10/import.c:3523
+#: g10/import.c:3531
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "kunci %08lX: \"%s\" sertifikat pembatalan diimpor\n"
 
-#: g10/import.c:3609
+#: g10/import.c:3617
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "kunci %08lX: tidak ada ID user untuk signature\n"
 
-#: g10/import.c:3626
+#: g10/import.c:3634
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "kunci %08lX: algoritma publik key tidak didukung pada user id \"%s\"\n"
 
-#: g10/import.c:3628
+#: g10/import.c:3636
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "kunci %08lX: self-signature tidak valid pada user id \"%s\"\n"
 
-#: g10/import.c:3645 g10/import.c:3673 g10/import.c:3729
+#: g10/import.c:3653 g10/import.c:3681 g10/import.c:3737
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "kunci %08lX: algoritma publik key tidak didukung\n"
 
-#: g10/import.c:3646
+#: g10/import.c:3654
 #, fuzzy, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "kunci %08lX: signature kunci langsung ditambahkan\n"
 
-#: g10/import.c:3660
+#: g10/import.c:3668
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "kunci %08lX: tidak ada subkey untuk key binding\n"
 
-#: g10/import.c:3675
+#: g10/import.c:3683
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "kunci %08lX: subkey binding tidak valid\n"
 
-#: g10/import.c:3694
+#: g10/import.c:3702
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "kunci %08lX: hapus subkey binding ganda\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3726
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "kunci %08lX: tidak ada subkey untuk pembatalan kunci\n"
 
-#: g10/import.c:3731
+#: g10/import.c:3739
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "kunci %08lX: pembatalan subkey tidak valid\n"
 
-#: g10/import.c:3746
+#: g10/import.c:3754
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "kunci %08lX: hapus pembatalan subkey ganda\n"
 
-#: g10/import.c:3790
+#: g10/import.c:3798
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "kunci %08lX: melewati ID user "
 
-#: g10/import.c:3817
+#: g10/import.c:3825
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "kunci %08lX: melewati subkey\n"
 
-#: g10/import.c:3849
+#: g10/import.c:3857
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "kunci %08lX: signature tidak dapat diekpor (kelas %02x) - dilewati\n"
 
-#: g10/import.c:3860
+#: g10/import.c:3868
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "kunci %08lX: sertifikat pembatalan di tempat yang salah - dilewati\n"
 
-#: g10/import.c:3878
+#: g10/import.c:3886
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "kunci %08lX: sertifikat pembatalan tidak valid: %s - dilewati\n"
 
-#: g10/import.c:3892
+#: g10/import.c:3900
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "kunci %08lX: signature subkey di tempat yang salah - dilewati\n"
 
-#: g10/import.c:3900
+#: g10/import.c:3908
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "kunci %08lX: klas signature tidak diharapkan (0x%02x) - dilewati\n"
 
-#: g10/import.c:4073
+#: g10/import.c:4081
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "kunci %08lX: terdeteksi ID user duplikat - digabungkan\n"
 
-#: g10/import.c:4180
+#: g10/import.c:4188
 #, fuzzy, c-format
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr "kunci %08lX: terdeteksi ID user duplikat - digabungkan\n"
 
-#: g10/import.c:4245
+#: g10/import.c:4253
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "Peringatan: kunci %08lX dapat dibatalkan: mengambil kunci pembatalan %08lX\n"
 
-#: g10/import.c:4261
+#: g10/import.c:4269
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "Peringatan: kunci %08lX dapat dibatalkan: kunci pembatalan %08lX tidak ada\n"
 
-#: g10/import.c:4327
+#: g10/import.c:4335
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "kunci %08lX: \"%s\" penambahan sertifikat pembatalan\n"
 
-#: g10/import.c:4365
+#: g10/import.c:4373
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "kunci %08lX: signature kunci langsung ditambahkan\n"
 
-#: g10/key-check.c:133 dirmngr/dirmngr_ldap.c:650 dirmngr/ldap-wrapper.c:835
-#: dirmngr/ldap-wrapper.c:852
+#: g10/key-check.c:133 dirmngr/ldap-wrapper.c:835 dirmngr/ldap-wrapper.c:852
 #, fuzzy, c-format
 msgid "error allocating memory: %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
@@ -4137,7 +4150,7 @@ msgid ""
 "all signatures.\n"
 msgstr ""
 
-#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:284 sm/keydb.c:297
+#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:289 sm/keydb.c:302
 #, fuzzy, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
@@ -4148,7 +4161,7 @@ msgstr "kesalahan menulis keyring `%s': %s\n"
 msgid "error creating keyring '%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: g10/keydb.c:388 sm/keydb.c:303
+#: g10/keydb.c:388 sm/keydb.c:308
 #, fuzzy, c-format
 msgid "keybox '%s' created\n"
 msgstr "%s: keyring tercipta\n"
@@ -4429,8 +4442,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Ditandai? "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6192 g10/keyedit.c:6275 g10/keyedit.c:6404
-#: g10/keyedit.c:6466 g10/sign.c:528
+#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
+#: g10/keyedit.c:6474 g10/sign.c:528
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "gagal menandai: %s\n"
@@ -4837,7 +4850,7 @@ msgstr "Tidak ada ID user tersebut.\n"
 msgid "Nothing to sign.\n"
 msgstr "Tidak ada yang ditandai dengan kunci %08lX\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6057
+#: g10/keyedit.c:2973 g10/keyedit.c:6065
 #, fuzzy, c-format
 msgid "Not signed by you.\n"
 msgstr "   ditandai oleh %08lX pada %s%s\n"
@@ -4907,7 +4920,7 @@ msgstr "Kunci ini dapat dibatalkan oleh kunci %s"
 msgid "(sensitive)"
 msgstr " (sensitive)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:525
+#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "tidak dapat membuat %s: %s\n"
@@ -4923,7 +4936,7 @@ msgid "expired: %s"
 msgstr " [berakhir: %s]"
 
 #: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2262
-#: g10/keyserver.c:531
+#: g10/keyserver.c:354
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [berakhir: %s]"
@@ -4959,14 +4972,14 @@ 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:535
-#: g10/mainproc.c:2280 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
+#: g10/mainproc.c:2282 g10/tofu.c:1789 g10/trust.c:426 dirmngr/ocsp.c:792
 #, fuzzy
 msgid "revoked"
 msgstr "[revoked] "
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:539
-#: g10/mainproc.c:2282 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
+#: g10/mainproc.c:2284 g10/tofu.c:1794 g10/trust.c:113
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -5009,7 +5022,7 @@ msgstr "Anda tetap ingin menambahkannya? (y/n) "
 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:3107
+#: g10/keyedit.c:4273 g10/keygen.c:3111
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
@@ -5164,7 +5177,7 @@ msgstr ""
 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:5357 g10/keyedit.c:5495
+#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "melewati self-signature v3 pada user id \"%s\"\n"
@@ -5173,133 +5186,133 @@ msgstr "melewati self-signature v3 pada user id \"%s\"\n"
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5380
+#: g10/keyedit.c:5383
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
 
-#: g10/keyedit.c:5381
+#: g10/keyedit.c:5384
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
 
-#: g10/keyedit.c:5441
+#: g10/keyedit.c:5449
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notasi signature: "
 
-#: g10/keyedit.c:5588
+#: g10/keyedit.c:5596
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Ditimpa (y/T)? "
 
-#: g10/keyedit.c:5658
+#: g10/keyedit.c:5666
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:5720
+#: g10/keyedit.c:5728
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:5821
+#: g10/keyedit.c:5829
 #, fuzzy, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:5843
+#: g10/keyedit.c:5851
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:5984
+#: g10/keyedit.c:5992
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID user: "
 
-#: g10/keyedit.c:5987 g10/keyedit.c:6089 g10/keyedit.c:6137
+#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
 #, 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:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
+#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
 msgid " (non-exportable)"
 msgstr " (tidak dapat diekspor)"
 
-#: g10/keyedit.c:5993
+#: g10/keyedit.c:6001
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Kunci ini akan kadaluarsa pada %s \n"
 
-#: g10/keyedit.c:5998
+#: g10/keyedit.c:6006
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Anda tetap ingin membatalkannya? (y/n) "
 
-#: g10/keyedit.c:6003
+#: g10/keyedit.c:6011
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Membuat sertifikat pembatalan untuk signature ini? (y/N)"
 
-#: g10/keyedit.c:6063
+#: g10/keyedit.c:6071
 #, 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:6092
+#: g10/keyedit.c:6100
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (tidak dapat diekspor)"
 
-#: g10/keyedit.c:6099
+#: g10/keyedit.c:6107
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   dibatalkan oleh %08lX pada %s\n"
 
-#: g10/keyedit.c:6124
+#: g10/keyedit.c:6132
 msgid "You are about to revoke these signatures:\n"
 msgstr "Anda akan membatalkan signature ini:\n"
 
-#: g10/keyedit.c:6147
+#: g10/keyedit.c:6155
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Ingin membuat sertifikat pembatalan? (y/T)"
 
-#: g10/keyedit.c:6180
+#: g10/keyedit.c:6188
 #, c-format
 msgid "no secret key\n"
 msgstr "tidak ada kunci rahasia\n"
 
-#: g10/keyedit.c:6228
+#: g10/keyedit.c:6236
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6238
+#: g10/keyedit.c:6246
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:6255
+#: g10/keyedit.c:6263
 #, 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:6351
+#: g10/keyedit.c:6359
 #, 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:6389
+#: g10/keyedit.c:6397
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:6451
+#: g10/keyedit.c:6459
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:6548
+#: g10/keyedit.c:6556
 #, 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"
@@ -5309,83 +5322,83 @@ msgstr "Menampilkan photo ID %s berukuran %ld untuk kunci 0x%08lX (uid %d)\n"
 msgid "invalid value for option '%s'\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/keygen.c:338
+#: g10/keygen.c:339
 #, fuzzy, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "preferensi %c%lu ganda \n"
 
-#: g10/keygen.c:345
+#: g10/keygen.c:346
 #, fuzzy, c-format
 msgid "too many cipher preferences\n"
 msgstr "terlalu banyak preferensi `%c'\n"
 
-#: g10/keygen.c:347
+#: g10/keygen.c:348
 #, fuzzy, c-format
 msgid "too many digest preferences\n"
 msgstr "terlalu banyak preferensi `%c'\n"
 
-#: g10/keygen.c:349
+#: g10/keygen.c:350
 #, fuzzy, c-format
 msgid "too many compression preferences\n"
 msgstr "terlalu banyak preferensi `%c'\n"
 
-#: g10/keygen.c:351
+#: g10/keygen.c:352
 #, fuzzy, c-format
 msgid "too many AEAD preferences\n"
 msgstr "terlalu banyak preferensi `%c'\n"
 
-#: g10/keygen.c:521
+#: g10/keygen.c:522
 #, fuzzy, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "Karakter tidak valid dalam string preferensi\n"
 
-#: g10/keygen.c:1130
+#: g10/keygen.c:1131
 #, c-format
 msgid "writing direct signature\n"
 msgstr "menulis signature direct\n"
 
-#: g10/keygen.c:1176
+#: g10/keygen.c:1177
 #, c-format
 msgid "writing self signature\n"
 msgstr "menulis self signature\n"
 
-#: g10/keygen.c:1233
+#: g10/keygen.c:1234
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "menulis key binding signature\n"
 
-#: g10/keygen.c:1598 g10/keygen.c:1603 g10/keygen.c:1655 g10/keygen.c:1660
-#: g10/keygen.c:1832 g10/keygen.c:1837
+#: g10/keygen.c:1599 g10/keygen.c:1604 g10/keygen.c:1656 g10/keygen.c:1661
+#: g10/keygen.c:1833 g10/keygen.c:1838
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "keysize tidak valid; menggunakan %u bit\n"
 
-#: g10/keygen.c:1609 g10/keygen.c:1666 g10/keygen.c:1674 g10/keygen.c:1843
+#: g10/keygen.c:1610 g10/keygen.c:1667 g10/keygen.c:1675 g10/keygen.c:1844
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "keysize dibulatkan hingga %u bit\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1701
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1899
+#: g10/keygen.c:1900
 #, fuzzy
 msgid "Sign"
 msgstr "tandai"
 
-#: g10/keygen.c:1902
+#: g10/keygen.c:1903
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1906
 #, fuzzy
 msgid "Encrypt"
 msgstr "enkripsi data"
 
-#: g10/keygen.c:1908
+#: g10/keygen.c:1909
 msgid "Authenticate"
 msgstr ""
 
@@ -5399,180 +5412,180 @@ msgstr ""
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1929
+#: g10/keygen.c:1930
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1967
 #, c-format
 msgid "Possible actions for this %s key: "
 msgstr ""
 
-#: g10/keygen.c:1973
+#: g10/keygen.c:1974
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1979
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1981
+#: g10/keygen.c:1982
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "  (%d) ElGamal (hanya enkripsi)\n"
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1985
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1987
+#: g10/keygen.c:1988
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:2116
+#: g10/keygen.c:2117
 #, fuzzy, c-format
 msgid "   (%d) RSA and RSA%s\n"
 msgstr "  (%d) DSA dan ElGamal (baku)\n"
 
-#: g10/keygen.c:2120
+#: g10/keygen.c:2121
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal%s\n"
 msgstr "  (%d) DSA dan ElGamal (baku)\n"
 
-#: g10/keygen.c:2123
+#: g10/keygen.c:2124
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "   (%d) DSA (sign only)%s\n"
 msgstr "  (%d) DSA (hanya menandai)\n"
 
-#: g10/keygen.c:2125
+#: g10/keygen.c:2126
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (sign only)\n"
 msgid "   (%d) RSA (sign only)%s\n"
 msgstr "  (%d) RSA (hanya menandai)\n"
 
-#: g10/keygen.c:2131
+#: g10/keygen.c:2132
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)%s\n"
 msgstr "  (%d) ElGamal (hanya enkripsi)\n"
 
-#: g10/keygen.c:2133
+#: g10/keygen.c:2134
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (encrypt only)\n"
 msgid "   (%d) RSA (encrypt only)%s\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keygen.c:2139
+#: g10/keygen.c:2140
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)%s\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keygen.c:2141
+#: g10/keygen.c:2142
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)%s\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2148
 #, fuzzy, c-format
 #| msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgid "   (%d) ECC (sign and encrypt)%s\n"
 msgstr "  (%d) ElGamal (tandai dan enkripsi)\n"
 
-#: g10/keygen.c:2147 g10/keygen.c:2678
+#: g10/keygen.c:2148 g10/keygen.c:2679
 #, fuzzy
 #| msgid " (default)"
 msgid " *default*"
 msgstr " (default)"
 
-#: g10/keygen.c:2148
+#: g10/keygen.c:2149
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "  (%d) ECC (sign only)\n"
 msgstr "  (%d) DSA (hanya menandai)\n"
 
-#: g10/keygen.c:2150
+#: g10/keygen.c:2151
 #, fuzzy, c-format
 msgid "  (%d) ECC (set your own capabilities)%s\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keygen.c:2152
+#: g10/keygen.c:2153
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (encrypt only)\n"
 msgid "  (%d) ECC (encrypt only)%s\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keygen.c:2156
+#: g10/keygen.c:2157
 #, fuzzy, c-format
 msgid "  (%d) Existing key%s\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keygen.c:2158
+#: g10/keygen.c:2159
 #, fuzzy, c-format
 msgid "  (%d) Existing key from card%s\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keygen.c:2254 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2255 sm/certreqgen-ui.c:203
 #, fuzzy
 msgid "Enter the keygrip: "
 msgstr "Notasi signature: "
 
-#: g10/keygen.c:2267 sm/certreqgen-ui.c:211 tools/gpg-card.c:2280
+#: g10/keygen.c:2268 sm/certreqgen-ui.c:211 tools/gpg-card.c:2297
 #, c-format
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr ""
 
-#: g10/keygen.c:2269 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2270 sm/certreqgen-ui.c:213
 #, fuzzy
 msgid "No key with this keygrip\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keygen.c:2288 g10/keygen.c:2298 g10/keygen.c:3440 g10/keygen.c:3451
+#: g10/keygen.c:2289 g10/keygen.c:2299 g10/keygen.c:3444 g10/keygen.c:3455
 #: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
 #, fuzzy, c-format
 msgid "error reading the card: %s\n"
 msgstr "%s: kesalahan membaca record bebas: %s\n"
 
-#: g10/keygen.c:2292 g10/keygen.c:3444 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2293 g10/keygen.c:3448 sm/certreqgen-ui.c:234
 #, fuzzy, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: g10/keygen.c:2311 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2312 sm/certreqgen-ui.c:246
 #, fuzzy
 msgid "Available keys:\n"
 msgstr "tiadakan kunci"
 
-#: g10/keygen.c:2504 g10/keygen.c:2518
+#: g10/keygen.c:2505 g10/keygen.c:2519
 #, fuzzy, c-format
 #| msgid "rounded up to %u bits\n"
 msgid "rounded to %u bits\n"
 msgstr "dibulatkan hingga %u bit\n"
 
-#: g10/keygen.c:2559
+#: g10/keygen.c:2560
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:2567
+#: g10/keygen.c:2568
 #, fuzzy, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Keysize yang anda inginkan? (1024) "
 
-#: g10/keygen.c:2584 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2585 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Keysize yang diminta adalah %u bit\n"
 
-#: g10/keygen.c:2630
+#: g10/keygen.c:2631
 #, fuzzy
 #| msgid "Please select what kind of key you want:\n"
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Silakan pilih kunci yang anda inginkan:\n"
 
-#: g10/keygen.c:2819
+#: g10/keygen.c:2820
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5588,7 +5601,7 @@ msgstr ""
 "     <n>m = kunci berakhir dalam n bulan\n"
 "     <n>y = kunci berakhir dalam n tahun\n"
 
-#: g10/keygen.c:2830
+#: g10/keygen.c:2831
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5604,40 +5617,40 @@ msgstr ""
 "     <n>m = signature berakhir dalam n bulan\n"
 "     <n>y = signature berakhir dalam n tahun\n"
 
-#: g10/keygen.c:2853
+#: g10/keygen.c:2854
 msgid "Key is valid for? (0) "
 msgstr "Kunci valid untuk? (0) "
 
-#: g10/keygen.c:2858
+#: g10/keygen.c:2859
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Signature valid untuk? (0) "
 
-#: g10/keygen.c:2871 g10/keygen.c:2896
+#: g10/keygen.c:2875 g10/keygen.c:2900
 msgid "invalid value\n"
 msgstr "nilai yang tidak valid\n"
 
-#: g10/keygen.c:2878
+#: g10/keygen.c:2882
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s tidak pernah berakhir\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2883
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s tidak pernah berakhir\n"
 
-#: g10/keygen.c:2884
+#: g10/keygen.c:2888
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s berakhir pada %s\n"
 
-#: g10/keygen.c:2885
+#: g10/keygen.c:2889
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Signature kadaluarsa pada %s \n"
 
-#: g10/keygen.c:2889
+#: g10/keygen.c:2893
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5645,12 +5658,12 @@ msgstr ""
 "Sistem anda tidak dapat menampilkan tanggal melebihi 2038.\n"
 "Namun, ia dapat menanganinya secara benar hingga 2106.\n"
 
-#: g10/keygen.c:2902
+#: g10/keygen.c:2906
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Benar (y/t)? "
 
-#: g10/keygen.c:2970
+#: g10/keygen.c:2974
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5661,7 +5674,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2985
+#: g10/keygen.c:2989
 #, fuzzy
 msgid ""
 "\n"
@@ -5677,50 +5690,50 @@ msgstr ""
 "user-id dari Nama sebenarnya, Komentar dan Alamat email dalam bentuk:\n"
 "  \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 
-#: g10/keygen.c:3004
+#: g10/keygen.c:3008
 msgid "Real name: "
 msgstr "Nama sebenarnya: "
 
-#: g10/keygen.c:3013
+#: g10/keygen.c:3017
 msgid "Invalid character in name\n"
 msgstr "Karakter tidak valid dalam nama\n"
 
-#: g10/keygen.c:3014
+#: g10/keygen.c:3018
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:3018
+#: g10/keygen.c:3022
 msgid "Name may not start with a digit\n"
 msgstr "Nama tidak boleh dimulai dengan digit\n"
 
-#: g10/keygen.c:3021
+#: g10/keygen.c:3025
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nama harus berukuran minimum 5 karakter\n"
 
-#: g10/keygen.c:3031
+#: g10/keygen.c:3035
 msgid "Email address: "
 msgstr "Alamat email: "
 
-#: g10/keygen.c:3037
+#: g10/keygen.c:3041
 msgid "Not a valid email address\n"
 msgstr "Bukan alamat email yang valid\n"
 
-#: g10/keygen.c:3046
+#: g10/keygen.c:3050
 msgid "Comment: "
 msgstr "Komentar: "
 
-#: g10/keygen.c:3052
+#: g10/keygen.c:3056
 msgid "Invalid character in comment\n"
 msgstr "Karakter tidak valid dalam komentar\n"
 
-#: g10/keygen.c:3088
+#: g10/keygen.c:3092
 #, fuzzy, c-format
 #| msgid "You are using the `%s' character set.\n"
 msgid "You are using the '%s' character set.\n"
 msgstr "Anda menggunakan set karakter `%s'.\n"
 
-#: g10/keygen.c:3094
+#: g10/keygen.c:3098
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5730,7 +5743,7 @@ msgstr ""
 "Anda memilih USER-ID ini:\n"
 "   \"%s\"\n"
 
-#: g10/keygen.c:3099
+#: g10/keygen.c:3103
 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"
 
@@ -5745,35 +5758,35 @@ msgstr "Jangan menaruh alamat email ke dalam nama sebenarnya atau komentar\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3124
+#: g10/keygen.c:3128
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoQq"
 
-#: g10/keygen.c:3134
+#: g10/keygen.c:3138
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (Q)uit? "
 
-#: g10/keygen.c:3135
+#: g10/keygen.c:3139
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (O)ke/(Q)uit? "
 
-#: g10/keygen.c:3140
+#: g10/keygen.c:3144
 #, fuzzy
 #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (Q)uit? "
 
-#: g10/keygen.c:3141
+#: g10/keygen.c:3145
 #, fuzzy
 #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (O)ke/(Q)uit? "
 
-#: g10/keygen.c:3160
+#: g10/keygen.c:3164
 msgid "Please correct the error first\n"
 msgstr "Silakan perbaiki kesalahan ini dulu\n"
 
-#: g10/keygen.c:3206
+#: g10/keygen.c:3210
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -5785,18 +5798,18 @@ msgstr ""
 "selama pembuatan prima; ini akan memberi random number generator kesempatan\n"
 "yang baik untuk memperoleh entropi.\n"
 
-#: g10/keygen.c:3591
+#: g10/keygen.c:3595
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4590 g10/keygen.c:4663 g10/keygen.c:4681 g10/keygen.c:4710
-#: g10/keygen.c:5086 g10/keygen.c:5632 g10/keygen.c:5943 g10/keygen.c:6050
+#: g10/keygen.c:4594 g10/keygen.c:4667 g10/keygen.c:4685 g10/keygen.c:4714
+#: g10/keygen.c:5113 g10/keygen.c:5663 g10/keygen.c:5974 g10/keygen.c:6081
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: g10/keygen.c:4599
+#: g10/keygen.c:4603
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5804,69 +5817,69 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:4601
+#: g10/keygen.c:4605
 msgid "Continue? (Y/n) "
 msgstr ""
 
-#: g10/keygen.c:4622
+#: g10/keygen.c:4626
 #, fuzzy, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "`%s' sudah dikompresi\n"
 
-#: g10/keygen.c:4627
+#: g10/keygen.c:4631
 #, fuzzy
 #| msgid "Create anyway? "
 msgid "Create anyway? (y/N) "
 msgstr "Tetap dibuat? "
 
-#: g10/keygen.c:4633
+#: g10/keygen.c:4637
 #, fuzzy, c-format
 #| msgid "Create anyway? "
 msgid "creating anyway\n"
 msgstr "Tetap dibuat? "
 
-#: g10/keygen.c:5069
+#: g10/keygen.c:5096
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 
-#: g10/keygen.c:5118
+#: g10/keygen.c:5145
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Pembuatan kunci dibatalkan.\n"
 
-#: g10/keygen.c:5178
+#: g10/keygen.c:5205
 #, fuzzy, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: g10/keygen.c:5198
+#: g10/keygen.c:5225
 #, fuzzy, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "CATATAN: kunci pribadi %08lX berakhir pada %s\n"
 
-#: g10/keygen.c:5359 g10/keygen.c:5561
+#: g10/keygen.c:5389 g10/keygen.c:5591
 #, fuzzy, c-format
 #| msgid "writing public key to `%s'\n"
 msgid "writing public key to '%s'\n"
 msgstr "menulis kunci publik ke `%s'\n"
 
-#: g10/keygen.c:5555
+#: g10/keygen.c:5585
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "tidak ditemukan keyring publik yang dapat ditulisi: %s\n"
 
-#: g10/keygen.c:5569
+#: g10/keygen.c:5599
 #, fuzzy, c-format
 #| msgid "error writing public keyring `%s': %s\n"
 msgid "error writing public keyring '%s': %s\n"
 msgstr "kesalahan menulis keyring publik `%s': %s\n"
 
-#: g10/keygen.c:5603
+#: g10/keygen.c:5634
 msgid "public and secret key created and signed.\n"
 msgstr "kunci publik dan rahasia dibuat dan ditandai.\n"
 
-#: g10/keygen.c:5619
+#: g10/keygen.c:5650
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -5876,37 +5889,37 @@ msgstr ""
 "mungkin ingin menggunakan perintah \"--edit-key\" untuk membuat kunci kedua "
 "untuk tujuan ini.\n"
 
-#: g10/keygen.c:5801 g10/keygen.c:6000
+#: g10/keygen.c:5832 g10/keygen.c:6031
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
 
-#: g10/keygen.c:5803 g10/keygen.c:6002
+#: g10/keygen.c:5834 g10/keygen.c:6033
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 "kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
 
-#: g10/keygen.c:5814 g10/keygen.c:6013
+#: g10/keygen.c:5845 g10/keygen.c:6044
 #, fuzzy, c-format
 #| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "CATATAN: membuat subkey bagi kunci-kunci v3 tidak OpenPGP compliant\n"
 
-#: g10/keygen.c:5826 g10/keygen.c:5828
+#: g10/keygen.c:5857 g10/keygen.c:5859
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
 
-#: g10/keygen.c:5835 g10/keygen.c:5837
+#: g10/keygen.c:5866 g10/keygen.c:5868
 #, fuzzy, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
 
-#: g10/keygen.c:5857 g10/keygen.c:6027
+#: g10/keygen.c:5888 g10/keygen.c:6058
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Ingin diciptakan? "
@@ -5989,26 +6002,26 @@ msgstr "     Fingerprint kunci ="
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1467
+#: g10/keyring.c:1477
 #, fuzzy, c-format
 msgid "caching keyring '%s'\n"
 msgstr "memeriksa keyring `%s'\n"
 
-#: g10/keyring.c:1541
+#: g10/keyring.c:1551
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signature)\n"
 msgid_plural "%lu keys cached so far (%lu signatures)\n"
 msgstr[0] "%lu kunci telah diperiksa (%lu signature)\n"
 msgstr[1] "%lu kunci telah diperiksa (%lu signature)\n"
 
-#: g10/keyring.c:1557
+#: g10/keyring.c:1567
 #, c-format
 msgid "%lu key cached"
 msgid_plural "%lu keys cached"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/keyring.c:1559
+#: g10/keyring.c:1569
 #, fuzzy, c-format
 #| msgid "1 bad signature\n"
 msgid " (%lu signature)\n"
@@ -6016,7 +6029,7 @@ msgid_plural " (%lu signatures)\n"
 msgstr[0] "1 signature yang buruk\n"
 msgstr[1] "1 signature yang buruk\n"
 
-#: g10/keyring.c:1636
+#: g10/keyring.c:1646
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: keyring tercipta\n"
@@ -6046,80 +6059,75 @@ msgstr ""
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/keyserver.c:537
+#: g10/keyserver.c:360
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:740
+#: g10/keyserver.c:563
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:846
+#: g10/keyserver.c:669
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/keyserver.c:986 g10/keyserver.c:1096
+#: g10/keyserver.c:809 g10/keyserver.c:919
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1420 g10/keyserver.c:1453
+#: g10/keyserver.c:1217 g10/keyserver.c:1250
 #, 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:1427
+#: g10/keyserver.c:1224
 #, 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:1531
+#: g10/keyserver.c:1316
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1319
 #, fuzzy, c-format
 msgid "key not found on keyserver\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: g10/keyserver.c:1722
-#, fuzzy, c-format
-msgid "requesting key %s from %s server %s\n"
-msgstr "meminta kunci %08lX dari %s\n"
-
-#: g10/keyserver.c:1726
+#: g10/keyserver.c:1481
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "meminta kunci %08lX dari %s\n"
 
-#: g10/keyserver.c:1841 g10/keyserver.c:2020
+#: g10/keyserver.c:1600 g10/keyserver.c:1793
 #, fuzzy, c-format
 msgid "no keyserver known\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/keyserver.c:1856 g10/skclist.c:213 g10/skclist.c:241
+#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "melewati `%s': %s\n"
 
-#: g10/keyserver.c:1860
+#: g10/keyserver.c:1619
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "ditandai dengan kunci anda %08lX pada %s\n"
 
-#: g10/keyserver.c:1901
+#: g10/keyserver.c:1662
 #, fuzzy, c-format
 msgid "requesting key from '%s'\n"
 msgstr "meminta kunci %08lX dari %s\n"
 
-#: g10/keyserver.c:1917
+#: g10/keyserver.c:1680
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n"
@@ -6146,253 +6154,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:472
+#: g10/mainproc.c:473
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "kunci publik adalah %08lX\n"
 
-#: g10/mainproc.c:524
+#: g10/mainproc.c:525
 #, 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:528 g10/pkclist.c:231
+#: g10/mainproc.c:529 g10/pkclist.c:231
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "              alias \""
 
-#: g10/mainproc.c:532
+#: g10/mainproc.c:533
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "dienkripsi dengan kunci %s, ID %08lX\n"
 
-#: g10/mainproc.c:552 g10/mainproc.c:935
+#: g10/mainproc.c:553 g10/mainproc.c:937
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:560
+#: g10/mainproc.c:561
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "dienkripsi dengan passphrase %lu\n"
 
-#: g10/mainproc.c:562
+#: g10/mainproc.c:563
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "dienkripsi dengan 1 passphrase\n"
 
-#: g10/mainproc.c:577 g10/mainproc.c:602
+#: g10/mainproc.c:578 g10/mainproc.c:603
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "gagal dekripsi kunci publik: %s\n"
 
-#: g10/mainproc.c:613
+#: g10/mainproc.c:614
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "data terenkripsi dengan kunci publik: DEK baik\n"
 
-#: g10/mainproc.c:642 g10/mainproc.c:663
+#: g10/mainproc.c:643 g10/mainproc.c:664
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "asumsikan %s data terenkripsi\n"
 
-#: g10/mainproc.c:649
+#: g10/mainproc.c:650
 #, 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:742 g10/mainproc.c:780
+#: g10/mainproc.c:744 g10/mainproc.c:782
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "PERINGATAN: integritas pesan tidak terlindungi\n"
 
-#: g10/mainproc.c:753
+#: g10/mainproc.c:755
 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:756
+#: g10/mainproc.c:758
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:761
+#: g10/mainproc.c:763
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "dekripsi gagal: %s\n"
 
-#: g10/mainproc.c:773
+#: g10/mainproc.c:775
 #, c-format
 msgid "decryption okay\n"
 msgstr "dekripsi lancar\n"
 
-#: g10/mainproc.c:786
+#: g10/mainproc.c:788
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "PERINGATAN: pesan terenkripsi telah dimanipulasi!\n"
 
-#: g10/mainproc.c:804
+#: g10/mainproc.c:806
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekripsi gagal: %s\n"
 
-#: g10/mainproc.c:851
+#: g10/mainproc.c:853
 #, 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:858
+#: g10/mainproc.c:860
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "original file name='%.*s'\n"
 
-#: g10/mainproc.c:1135
+#: g10/mainproc.c:1137
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "pembatalan mandiri - gunakan \"gpg --import\" untuk mengaplikasikan\n"
 
-#: g10/mainproc.c:1440 g10/mainproc.c:1483
+#: g10/mainproc.c:1442 g10/mainproc.c:1485
 #, fuzzy, c-format
 msgid "no signature found\n"
 msgstr "Signature baik dari \""
 
-#: g10/mainproc.c:1763
+#: g10/mainproc.c:1765
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "signature BURUK dari \""
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1767
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Signature kadaluarsa dari \""
 
-#: g10/mainproc.c:1767
+#: g10/mainproc.c:1769
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Signature baik dari \""
 
-#: g10/mainproc.c:1789
+#: g10/mainproc.c:1791
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "verifikasi signature tidak diabaikan\n"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1905
 #, fuzzy, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "tidak dapat menangani banyak signature ini\n"
 
-#: g10/mainproc.c:1919 g10/mainproc.c:1926
+#: g10/mainproc.c:1921 g10/mainproc.c:1928
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Signature kadaluwarsa %s\n"
 
-#: g10/mainproc.c:1920 g10/mainproc.c:1927 sm/verify.c:480
+#: g10/mainproc.c:1922 g10/mainproc.c:1929 sm/verify.c:480
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "              alias \""
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1933
 #, 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:1937
+#: g10/mainproc.c:1939
 #, fuzzy, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "              alias \""
 
-#: g10/mainproc.c:1992
+#: g10/mainproc.c:1994
 #, c-format
 msgid "Key available at: "
 msgstr "Kunci tersedia di:"
 
-#: g10/mainproc.c:2034
+#: g10/mainproc.c:2036
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2234
+#: g10/mainproc.c:2236
 msgid "[uncertain]"
 msgstr "[uncertain]"
 
-#: g10/mainproc.c:2272
+#: g10/mainproc.c:2274
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "              alias \""
 
-#: g10/mainproc.c:2347
+#: g10/mainproc.c:2349
 #, 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:2363
+#: g10/mainproc.c:2365
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Signature kadaluwarsa %s\n"
 
-#: g10/mainproc.c:2368
+#: g10/mainproc.c:2370
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Signature kadaluarsa pada %s \n"
 
-#: g10/mainproc.c:2379
+#: g10/mainproc.c:2381
 #, 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:2380
+#: g10/mainproc.c:2382
 msgid "binary"
 msgstr "biner"
 
-#: g10/mainproc.c:2381
+#: g10/mainproc.c:2383
 msgid "textmode"
 msgstr "modeteks"
 
-#: g10/mainproc.c:2381 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2383 g10/trust.c:112 dirmngr/ocsp.c:793
 msgid "unknown"
 msgstr "tidak dikenal"
 
-#: g10/mainproc.c:2383
+#: g10/mainproc.c:2385
 #, fuzzy
 #| msgid "unknown pubkey algorithm"
 msgid ", key algorithm "
 msgstr "algoritma pubkey tidak dikenal"
 
-#: g10/mainproc.c:2418
+#: g10/mainproc.c:2420
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2457
+#: g10/mainproc.c:2459
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Tidak dapat memeriksa signature: %s\n"
 
-#: g10/mainproc.c:2553 g10/mainproc.c:2572 g10/mainproc.c:2696
+#: g10/mainproc.c:2555 g10/mainproc.c:2574 g10/mainproc.c:2698
 #, c-format
 msgid "not a detached signature\n"
 msgstr "bukan detached signature\n"
 
-#: g10/mainproc.c:2606
+#: g10/mainproc.c:2608
 #, 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:2615
+#: g10/mainproc.c:2617
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "kelas signature mandiri 0x%02x\n"
 
-#: g10/mainproc.c:2700
+#: g10/mainproc.c:2702
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature model lama (PGP 2.X)\n"
@@ -6577,51 +6585,56 @@ msgstr "Notasi signature kritis: "
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaket tipe %d memiliki bit kritis terset\n"
 
-#: g10/passphrase.c:208
+#: g10/passphrase.c:201 sm/decrypt.c:669
+#, fuzzy
+msgid "Please enter the passphrase for decryption."
+msgstr "ubah passphrase"
+
+#: g10/passphrase.c:203
 msgid "Enter passphrase\n"
 msgstr "Masukkan passphrase\n"
 
-#: g10/passphrase.c:219
+#: g10/passphrase.c:227
 #, c-format
 msgid "cancelled by user\n"
 msgstr "dibatalkan oleh user\n"
 
-#: g10/passphrase.c:460
+#: g10/passphrase.c:472
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID kunci utama %08lX)"
 
-#: g10/passphrase.c:467
+#: g10/passphrase.c:479
 #, fuzzy
 msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: g10/passphrase.c:471
+#: g10/passphrase.c:483
 #, fuzzy
 msgid "Please enter the passphrase to import the OpenPGP secret key:"
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: g10/passphrase.c:476
+#: g10/passphrase.c:488
 #, fuzzy
 msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: g10/passphrase.c:479
+#: g10/passphrase.c:491
 #, fuzzy
 msgid "Please enter the passphrase to export the OpenPGP secret key:"
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: g10/passphrase.c:484
+#: g10/passphrase.c:496
 #, fuzzy
 msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 msgstr "Anda ingin menghapus kunci terpilih ini? "
 
-#: g10/passphrase.c:487
+#: g10/passphrase.c:499
 #, fuzzy
 msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgstr "Anda ingin menghapus kunci terpilih ini? "
 
-#: g10/passphrase.c:496
+#: g10/passphrase.c:508
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -6795,7 +6808,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:313 g10/revoke.c:803
+#: g10/pkclist.c:313 g10/revoke.c:804
 msgid "Your decision? "
 msgstr "Keputusan anda? "
 
@@ -7095,7 +7108,7 @@ msgstr "tidak dapat membuka data tertandai `%s'\n"
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "tidak dapat membuka data tertandai `%s'\n"
 
-#: g10/pubkey-enc.c:99 sm/decrypt.c:879
+#: g10/pubkey-enc.c:99 sm/decrypt.c:1329
 #, fuzzy, c-format
 msgid "key %s is not suitable for decryption in %s mode\n"
 msgstr "kunci %08lX: tidak ada ID user\n"
@@ -7142,7 +7155,7 @@ msgid "Note: key has been revoked"
 msgstr "CATATAN: kunci telah dibatalkan"
 
 #: g10/revoke.c:100 g10/revoke.c:126 g10/revoke.c:172 g10/revoke.c:184
-#: g10/revoke.c:502
+#: g10/revoke.c:503
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet gagal: %s\n"
@@ -7171,11 +7184,11 @@ msgstr "Kunci rahasia tersedia.\n"
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Buat sertifikat pembatalan untuk kunci ini?"
 
-#: g10/revoke.c:334 g10/revoke.c:744
+#: g10/revoke.c:334 g10/revoke.c:745
 msgid "ASCII armored output forced.\n"
 msgstr "Pemaksaan output mode ASCII.\n"
 
-#: g10/revoke.c:350 g10/revoke.c:481
+#: g10/revoke.c:350 g10/revoke.c:482
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "gagal make_keysig_packet: %s\n"
@@ -7189,19 +7202,19 @@ msgstr "Sertifikat pembatalan tercipta.\n"
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "tidak ditemukan kunci pembatalan untuk `%s'\n"
 
-#: g10/revoke.c:567
+#: g10/revoke.c:568
 #, fuzzy
 msgid "This is a revocation certificate for the OpenPGP key:"
 msgstr "Buat sertifikat pembatalan untuk kunci ini?"
 
-#: g10/revoke.c:583
+#: g10/revoke.c:584
 msgid ""
 "A revocation certificate is a kind of \"kill switch\" to publicly\n"
 "declare that a key shall not anymore be used.  It is not possible\n"
 "to retract such a revocation certificate once it has been published."
 msgstr ""
 
-#: g10/revoke.c:586
+#: g10/revoke.c:587
 msgid ""
 "Use it to revoke this key in case of a compromise or loss of\n"
 "the secret key.  However, if the secret key is still accessible,\n"
@@ -7210,20 +7223,20 @@ msgid ""
 "of the gpg command \"--generate-revocation\" in the GnuPG manual."
 msgstr ""
 
-#: g10/revoke.c:592
+#: g10/revoke.c:593
 msgid ""
 "To avoid an accidental use of this file, a colon has been inserted\n"
 "before the 5 dashes below.  Remove this colon with a text editor\n"
 "before importing and publishing this revocation certificate."
 msgstr ""
 
-#: g10/revoke.c:611
+#: g10/revoke.c:612
 #, fuzzy, c-format
 #| msgid "Revocation certificate created.\n"
 msgid "revocation certificate stored as '%s.rev'\n"
 msgstr "Sertifikat pembatalan tercipta.\n"
 
-#: g10/revoke.c:655
+#: g10/revoke.c:656
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found\n"
 msgstr "kunci rahasia `%s' tidak ditemukan: %s\n"
@@ -7231,23 +7244,23 @@ msgstr "kunci rahasia `%s' tidak ditemukan: %s\n"
 #. TRANSLATORS: The %s prints a key specification which
 #. for example has been given at the command line.  Several lines
 #. lines with secret key infos are printed after this message.
-#: g10/revoke.c:680
+#: g10/revoke.c:681
 #, c-format
 msgid "'%s' matches multiple secret keys:\n"
 msgstr ""
 
-#: g10/revoke.c:705
+#: g10/revoke.c:706
 #, fuzzy, c-format
 #| msgid "error creating keyring `%s': %s\n"
 msgid "error searching the keyring: %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: g10/revoke.c:728
+#: g10/revoke.c:729
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Buat sertifikat pembatalan untuk kunci ini?"
 
-#: g10/revoke.c:752
+#: g10/revoke.c:753
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -7267,34 +7280,34 @@ msgstr ""
 "pencetakan\n"
 "mesin anda mungkin menyimpan data dan menyediakannya untuk yang lain!\n"
 
-#: g10/revoke.c:786
+#: g10/revoke.c:787
 msgid "Please select the reason for the revocation:\n"
 msgstr "Silakan pilih alasan untuk pembatalan:\n"
 
-#: g10/revoke.c:796
+#: g10/revoke.c:797
 msgid "Cancel"
 msgstr "Batal"
 
-#: g10/revoke.c:798
+#: g10/revoke.c:799
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Mungkin anda ingin memilih %d di sini)\n"
 
-#: g10/revoke.c:839
+#: g10/revoke.c:843
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 "Masukkan sebuah deskripsi opsional; akhiri dengan sebuah baris kosong:\n"
 
-#: g10/revoke.c:867
+#: g10/revoke.c:871
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Alasan pembatalan: %s\n"
 
-#: g10/revoke.c:869
+#: g10/revoke.c:873
 msgid "(No description given)\n"
 msgstr "(Tidak diberikan deskripsi)\n"
 
-#: g10/revoke.c:874
+#: g10/revoke.c:878
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Ini oke? "
@@ -7468,24 +7481,24 @@ msgstr "menandai:"
 msgid "%s.%s encryption will be used\n"
 msgstr "%s enkripsi akan digunakan\n"
 
-#: g10/skclist.c:172 g10/skclist.c:253
+#: g10/skclist.c:173 g10/skclist.c:254
 #, c-format
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "kunci tidak dianggap sebagai tidak aman - tidak dapat digunakan dengan RNG "
 "palsu!\n"
 
-#: g10/skclist.c:204
+#: g10/skclist.c:205
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "lewati `%s': terduplikasi\n"
 
-#: g10/skclist.c:223
+#: g10/skclist.c:224
 #, c-format
 msgid "skipped: secret key already present\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
 
-#: g10/skclist.c:242
+#: g10/skclist.c:243
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
@@ -7714,10 +7727,10 @@ msgstr ""
 msgid "TOFU DB error"
 msgstr ""
 
-#: g10/tofu.c:687 g10/tofu.c:2073 g10/tofu.c:2354 g10/tofu.c:2373
-#: g10/tofu.c:2386 g10/tofu.c:2398 g10/tofu.c:2413 g10/tofu.c:2425
-#: g10/tofu.c:3021 g10/tofu.c:3038 g10/tofu.c:3075 g10/tofu.c:3092
-#: g10/tofu.c:3404
+#: g10/tofu.c:687 g10/tofu.c:2077 g10/tofu.c:2358 g10/tofu.c:2377
+#: g10/tofu.c:2390 g10/tofu.c:2402 g10/tofu.c:2417 g10/tofu.c:2429
+#: g10/tofu.c:3025 g10/tofu.c:3042 g10/tofu.c:3079 g10/tofu.c:3096
+#: g10/tofu.c:3408
 #, fuzzy, c-format
 msgid "error reading TOFU database: %s\n"
 msgstr "kesalahan mengirim ke `%s': %s\n"
@@ -7739,7 +7752,7 @@ msgstr "%s: kesalahan menulis dir record: %s\n"
 msgid "error opening TOFU database '%s': %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: g10/tofu.c:1148 g10/tofu.c:3458 g10/tofu.c:3604
+#: g10/tofu.c:1148 g10/tofu.c:3462 g10/tofu.c:3608
 #, fuzzy, c-format
 msgid "error updating TOFU database: %s\n"
 msgstr "kesalahan mengirim ke `%s': %s\n"
@@ -7779,43 +7792,43 @@ msgstr "kesalahan penciptaan passphrase: %s\n"
 msgid "This key's user IDs:\n"
 msgstr "tampilkan kunci dan ID user"
 
-#: g10/tofu.c:1634 g10/tofu.c:1799
+#: g10/tofu.c:1634 g10/tofu.c:1801
 #, fuzzy, c-format
 #| msgid "Policy: "
 msgid "policy: %s"
 msgstr "Kebijakan: "
 
-#: g10/tofu.c:1725
+#: g10/tofu.c:1727
 #, fuzzy, c-format
 msgid "error gathering signature stats: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: g10/tofu.c:1729
+#: g10/tofu.c:1731
 #, c-format
 msgid "The email address \"%s\" is associated with %d key:\n"
 msgid_plural "The email address \"%s\" is associated with %d keys:\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1747
+#: g10/tofu.c:1749
 #, c-format
 msgid "Statistics for keys with the email address \"%s\":\n"
 msgstr ""
 
-#: g10/tofu.c:1797
+#: g10/tofu.c:1799
 #, fuzzy
 #| msgid "list keys"
 msgid "this key"
 msgstr "tampilkan kunci"
 
-#: g10/tofu.c:1823
+#: g10/tofu.c:1825
 #, fuzzy, c-format
 msgid "Verified %d message."
 msgid_plural "Verified %d messages."
 msgstr[0] "|algo [file]|cetak digest pesan"
 msgstr[1] "|algo [file]|cetak digest pesan"
 
-#: g10/tofu.c:1827
+#: g10/tofu.c:1829
 #, fuzzy, c-format
 #| msgid "encrypted with %lu passphrases\n"
 msgid "Encrypted %d message."
@@ -7823,68 +7836,68 @@ msgid_plural "Encrypted %d messages."
 msgstr[0] "dienkripsi dengan passphrase %lu\n"
 msgstr[1] "dienkripsi dengan passphrase %lu\n"
 
-#: g10/tofu.c:1834
+#: g10/tofu.c:1836
 #, fuzzy, c-format
 msgid "Verified %d message in the future."
 msgid_plural "Verified %d messages in the future."
 msgstr[0] "|algo [file]|cetak digest pesan"
 msgstr[1] "|algo [file]|cetak digest pesan"
 
-#: g10/tofu.c:1838
+#: g10/tofu.c:1840
 #, fuzzy, c-format
 msgid "Encrypted %d message in the future."
 msgid_plural "Encrypted %d messages in the future."
 msgstr[0] "|algo [file]|cetak digest pesan"
 msgstr[1] "|algo [file]|cetak digest pesan"
 
-#: g10/tofu.c:1852
+#: g10/tofu.c:1854
 #, c-format
 msgid "Messages verified over the past %d day: %d."
 msgid_plural "Messages verified over the past %d days: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1858
+#: g10/tofu.c:1860
 #, c-format
 msgid "Messages encrypted over the past %d day: %d."
 msgid_plural "Messages encrypted over the past %d days: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1868
+#: g10/tofu.c:1870
 #, c-format
 msgid "Messages verified over the past %d month: %d."
 msgid_plural "Messages verified over the past %d months: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1874
+#: g10/tofu.c:1876
 #, c-format
 msgid "Messages encrypted over the past %d month: %d."
 msgid_plural "Messages encrypted over the past %d months: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1884
+#: g10/tofu.c:1886
 #, c-format
 msgid "Messages verified over the past %d year: %d."
 msgid_plural "Messages verified over the past %d years: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1890
+#: g10/tofu.c:1892
 #, c-format
 msgid "Messages encrypted over the past %d year: %d."
 msgid_plural "Messages encrypted over the past %d years: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1898
+#: g10/tofu.c:1900
 #, c-format
 msgid "Messages verified in the past: %d."
 msgstr ""
 
-#: g10/tofu.c:1902
+#: g10/tofu.c:1904
 #, fuzzy, c-format
 msgid "Messages encrypted in the past: %d."
 msgstr "|algo [file]|cetak digest pesan"
@@ -7892,130 +7905,130 @@ msgstr "|algo [file]|cetak digest pesan"
 #. TRANSLATORS: Please translate the text found in the source
 #. * file below.  We don't directly internationalize that text so
 #. * that we can tweak it without breaking translations.
-#: g10/tofu.c:1919
+#: g10/tofu.c:1921
 msgid "TOFU detected a binding conflict"
 msgstr ""
 
 #. TRANSLATORS: Two letters (normally the lower and upper case
 #. * version of the hotkey) for each of the five choices.  If
 #. * there is only one choice in your language, repeat it.
-#: g10/tofu.c:1961
+#: g10/tofu.c:1963
 msgid "gGaAuUrRbB"
 msgstr ""
 
-#: g10/tofu.c:1967
+#: g10/tofu.c:1969
 msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 
-#: g10/tofu.c:1975
+#: g10/tofu.c:1978
 msgid "Defaulting to unknown.\n"
 msgstr ""
 
-#: g10/tofu.c:2093 g10/tofu.c:2228
+#: g10/tofu.c:2097 g10/tofu.c:2232
 #, c-format
 msgid "TOFU db corruption detected.\n"
 msgstr ""
 
-#: g10/tofu.c:2829
+#: g10/tofu.c:2833
 #, fuzzy, c-format
 msgid "error changing TOFU policy: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: g10/tofu.c:2880
+#: g10/tofu.c:2884
 #, c-format
 msgid "%lld~year"
 msgid_plural "%lld~years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2885
+#: g10/tofu.c:2889
 #, c-format
 msgid "%lld~month"
 msgid_plural "%lld~months"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2890
+#: g10/tofu.c:2894
 #, c-format
 msgid "%lld~week"
 msgid_plural "%lld~weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2895
+#: g10/tofu.c:2899
 #, c-format
 msgid "%lld~day"
 msgid_plural "%lld~days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2900
+#: g10/tofu.c:2904
 #, c-format
 msgid "%lld~hour"
 msgid_plural "%lld~hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2905
+#: g10/tofu.c:2909
 #, c-format
 msgid "%lld~minute"
 msgid_plural "%lld~minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2907
+#: g10/tofu.c:2911
 #, c-format
 msgid "%lld~second"
 msgid_plural "%lld~seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:3145
+#: g10/tofu.c:3149
 #, c-format
 msgid "%s: Verified 0~signatures and encrypted 0~messages."
 msgstr ""
 
-#: g10/tofu.c:3151
+#: g10/tofu.c:3155
 #, fuzzy, c-format
 #| msgid "Deleted %d signatures.\n"
 msgid "%s: Verified 0 signatures."
 msgstr "Menghapus %d signature.\n"
 
-#: g10/tofu.c:3165
+#: g10/tofu.c:3169
 #, fuzzy
 #| msgid "encrypted with %lu passphrases\n"
 msgid "Encrypted 0 messages."
 msgstr "dienkripsi dengan passphrase %lu\n"
 
-#: g10/tofu.c:3181
+#: g10/tofu.c:3185
 #, fuzzy, c-format
 #| msgid "Policy: "
 msgid "(policy: %s)"
 msgstr "Kebijakan: "
 
-#: g10/tofu.c:3215
+#: g10/tofu.c:3219
 #, c-format
 msgid ""
 "Warning: we have yet to see a message signed using this key and user id!\n"
 msgstr ""
 
-#: g10/tofu.c:3218
+#: g10/tofu.c:3222
 #, c-format
 msgid ""
 "Warning: we've only seen one message signed using this key and user id!\n"
 msgstr ""
 
-#: g10/tofu.c:3222
+#: g10/tofu.c:3226
 #, c-format
 msgid "Warning: you have yet to encrypt a message to this key!\n"
 msgstr ""
 
-#: g10/tofu.c:3225
+#: g10/tofu.c:3229
 #, c-format
 msgid "Warning: you have only encrypted one message to this key!\n"
 msgstr ""
 
-#: g10/tofu.c:3254
+#: g10/tofu.c:3258
 #, c-format
 msgid ""
 "Warning: if you think you've seen more signatures by this key and user id, "
@@ -8032,13 +8045,13 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:3339 g10/tofu.c:3502 g10/tofu.c:3708 g10/tofu.c:3761
-#: g10/tofu.c:3902 g10/tofu.c:3979 g10/tofu.c:4017
+#: g10/tofu.c:3343 g10/tofu.c:3506 g10/tofu.c:3712 g10/tofu.c:3765
+#: g10/tofu.c:3906 g10/tofu.c:3983 g10/tofu.c:4021
 #, fuzzy, c-format
 msgid "error opening TOFU database: %s\n"
 msgstr "kesalahan mengirim ke `%s': %s\n"
 
-#: g10/tofu.c:3535
+#: g10/tofu.c:3539
 #, c-format
 msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
 msgstr ""
@@ -8104,7 +8117,7 @@ msgstr ""
 msgid "no need for a trustdb check\n"
 msgstr "tidak perlu memeriksa trustdb\n"
 
-#: g10/trustdb.c:601 g10/trustdb.c:2272
+#: g10/trustdb.c:601 g10/trustdb.c:2273
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "pemeriksaan trustdb berikutnya pada %s\n"
@@ -8134,14 +8147,14 @@ msgstr "lakukanlah --check-trustdb\n"
 msgid "checking the trustdb\n"
 msgstr "memeriksa trustdb\n"
 
-#: g10/trustdb.c:1993
+#: g10/trustdb.c:1994
 #, fuzzy, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr[0] "%lu kunci telah diproses\n"
 msgstr[1] "%lu kunci telah diproses\n"
 
-#: g10/trustdb.c:1996
+#: g10/trustdb.c:1997
 #, fuzzy, c-format
 #| msgid "%d keys processed (%d validity counts cleared)\n"
 msgid " (%d validity count cleared)\n"
@@ -8149,45 +8162,45 @@ msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] "%d kunci diproses (%d hitungan validitas dihapus)\n"
 msgstr[1] "%d kunci diproses (%d hitungan validitas dihapus)\n"
 
-#: g10/trustdb.c:2066
+#: g10/trustdb.c:2067
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "tidak ditemukan kunci yang benar-benar terpercaya\n"
 
-#: g10/trustdb.c:2080
+#: g10/trustdb.c:2081
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "kunci publik yang sangat terpercaya %08lX tidak ditemukan\n"
 
-#: g10/trustdb.c:2198
+#: g10/trustdb.c:2199
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2279
+#: g10/trustdb.c:2280
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "trust record %lu, tipe %d: gagal menulis: %s\n"
 
-#: g10/trust.c:125
+#: g10/trust.c:114
 msgid "undefined"
 msgstr ""
 
-#: g10/trust.c:126
+#: g10/trust.c:115
 #, fuzzy
 msgid "never"
 msgstr "tidak pernah..."
 
-#: g10/trust.c:127
+#: g10/trust.c:116
 msgid "marginal"
 msgstr ""
 
-#: g10/trust.c:128
+#: g10/trust.c:117
 msgid "full"
 msgstr ""
 
-#: g10/trust.c:129
+#: g10/trust.c:118
 msgid "ultimate"
 msgstr ""
 
@@ -8199,43 +8212,43 @@ msgstr ""
 #. It gets passed to atoi() so everything after the number is
 #. essentially a comment and need not be translated.  Either key and
 #. uid are both NULL, or neither are NULL.
-#: g10/trust.c:166
+#: g10/trust.c:155
 msgid "10 translator see trust.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trust.c:169
+#: g10/trust.c:158
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[revoked] "
 
-#: g10/trust.c:171 g10/trust.c:177
+#: g10/trust.c:160 g10/trust.c:166
 #, fuzzy
 msgid "[ expired]"
 msgstr "[expired] "
 
-#: g10/trust.c:176
+#: g10/trust.c:165
 #, fuzzy
 msgid "[ unknown]"
 msgstr "tidak dikenal"
 
-#: g10/trust.c:178
+#: g10/trust.c:167
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trust.c:179
+#: g10/trust.c:168
 #, fuzzy
 msgid "[  never ]"
 msgstr "tidak pernah..."
 
-#: g10/trust.c:180
+#: g10/trust.c:169
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trust.c:181
+#: g10/trust.c:170
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trust.c:182
+#: g10/trust.c:171
 msgid "[ultimate]"
 msgstr ""
 
@@ -8294,16 +8307,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:4937 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2386
+#: scd/app-piv.c:1770 scd/app-p15.c:5035 scd/app-nks.c:1530
+#: scd/app-openpgp.c:2387
 #, 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:4956 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2402
+#: scd/app-piv.c:1787 scd/app-p15.c:5054 scd/app-nks.c:1549
+#: scd/app-openpgp.c:2403
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
@@ -8338,10 +8351,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:2669
-#: scd/app-openpgp.c:2693 scd/app-openpgp.c:2871 scd/app-openpgp.c:2893
-#: scd/app-openpgp.c:3074 scd/app-openpgp.c:3361 scd/app-openpgp.c:3408
-#: scd/app-openpgp.c:3545 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2670
+#: scd/app-openpgp.c:2694 scd/app-openpgp.c:2872 scd/app-openpgp.c:2894
+#: scd/app-openpgp.c:3075 scd/app-openpgp.c:3362 scd/app-openpgp.c:3409
+#: scd/app-openpgp.c:3547 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -8361,96 +8374,96 @@ msgstr ""
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr ""
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3616
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3618
 #, fuzzy, c-format
 msgid "key already exists\n"
 msgstr "`%s' sudah dikompresi\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3620
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3622
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3622
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3624
 #, fuzzy, c-format
 msgid "generating new key\n"
 msgstr "buat sepasang kunci baru"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3624
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3626
 #, fuzzy, c-format
 msgid "writing new key\n"
 msgstr "buat sepasang kunci baru"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4484 scd/app-openpgp.c:4767
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4486 scd/app-openpgp.c:4761
 #, 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:1615
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1616
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1622
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1623
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1732
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1733
 #, 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:4943
+#: scd/app-piv.c:3279 scd/app-openpgp.c:4937
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4951
+#: scd/app-piv.c:3294 scd/app-openpgp.c:4945
 #, fuzzy, c-format
 msgid "generating key failed\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4957
+#: scd/app-piv.c:3300 scd/app-openpgp.c:4951
 #, 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:1842 scd/app-openpgp.c:4966
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1843 scd/app-openpgp.c:4960
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-p15.c:5035 scd/app-nks.c:2038
+#: scd/app-p15.c:5133 scd/app-nks.c:2038
 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:5038 scd/app-openpgp.c:2818
+#: scd/app-p15.c:5136 scd/app-openpgp.c:2819
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "ubah passphrase"
 
-#: scd/app-p15.c:5040 scd/app-nks.c:2028
+#: scd/app-p15.c:5138 scd/app-nks.c:2028
 #, 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:5043 scd/app-nks.c:2019
+#: scd/app-p15.c:5141 scd/app-nks.c:2019
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "ubah passphrase"
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4321
+#: scd/app-nks.c:1468 scd/app-openpgp.c:4323
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1476 scd/app-openpgp.c:4333
+#: scd/app-nks.c:1476 scd/app-openpgp.c:4335
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
@@ -8492,27 +8505,27 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3442 scd/app-dinsig.c:534
+#: scd/app-nks.c:2221 scd/app-openpgp.c:3443 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:943
+#: scd/app-openpgp.c:944
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: scd/app-openpgp.c:956
+#: scd/app-openpgp.c:957
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "gagal membuat kembali cache keyring: %s\n"
 
-#: scd/app-openpgp.c:1427 scd/app-openpgp.c:3389 scd/app-openpgp.c:5715
+#: scd/app-openpgp.c:1428 scd/app-openpgp.c:3390 scd/app-openpgp.c:5709
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1949
+#: scd/app-openpgp.c:1950
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
@@ -8520,43 +8533,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:2373
+#: scd/app-openpgp.c:2374
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2621
+#: scd/app-openpgp.c:2622
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2628
+#: scd/app-openpgp.c:2629
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2641
+#: scd/app-openpgp.c:2642
 #, fuzzy
 msgid "||Please unlock the card"
 msgstr "ubah passphrase"
 
-#: scd/app-openpgp.c:2700 scd/app-openpgp.c:2900 scd/app-openpgp.c:3368
+#: scd/app-openpgp.c:2701 scd/app-openpgp.c:2901 scd/app-openpgp.c:3369
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2717 scd/app-openpgp.c:2760 scd/app-openpgp.c:2917
-#: scd/app-openpgp.c:5325
+#: scd/app-openpgp.c:2718 scd/app-openpgp.c:2761 scd/app-openpgp.c:2918
+#: scd/app-openpgp.c:5319
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "Pengiriman keyserver gagal: %s\n"
 
-#: scd/app-openpgp.c:2804 scd/app-openpgp.c:5724
+#: scd/app-openpgp.c:2805 scd/app-openpgp.c:5718
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2808
+#: scd/app-openpgp.c:2809
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8564,22 +8577,22 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: scd/app-openpgp.c:2841
+#: scd/app-openpgp.c:2842
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3355
+#: scd/app-openpgp.c:3356
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "ubah passphrase"
 
-#: scd/app-openpgp.c:3404
+#: scd/app-openpgp.c:3405
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Silakan pilih alasan untuk pembatalan:\n"
 
-#: scd/app-openpgp.c:3414 scd/app-openpgp.c:3481
+#: scd/app-openpgp.c:3415 scd/app-openpgp.c:3484
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
@@ -8587,81 +8600,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:3437
+#: scd/app-openpgp.c:3438
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3439
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3439
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3541
+#: scd/app-openpgp.c:3543
 #, fuzzy
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "ubah passphrase"
 
-#: scd/app-openpgp.c:3542
+#: scd/app-openpgp.c:3544
 #, fuzzy
 msgid "||Please enter the PIN and New PIN"
 msgstr "ubah passphrase"
 
-#: scd/app-openpgp.c:3600 scd/app-openpgp.c:5026
+#: scd/app-openpgp.c:3602 scd/app-openpgp.c:5020
 #, fuzzy, c-format
 msgid "error reading application data\n"
 msgstr "gagal membaca keyblock: %s\n"
 
-#: scd/app-openpgp.c:3606 scd/app-openpgp.c:5033
+#: scd/app-openpgp.c:3608 scd/app-openpgp.c:5027
 #, fuzzy, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "%s: kesalahan membaca record bebas: %s\n"
 
-#: scd/app-openpgp.c:4302 scd/app-openpgp.c:4657
+#: scd/app-openpgp.c:4304 scd/app-openpgp.c:4653
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4343 scd/app-openpgp.c:4351
+#: scd/app-openpgp.c:4345 scd/app-openpgp.c:4353
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4651
+#: scd/app-openpgp.c:4647
 #, fuzzy, c-format
 #| msgid "unsupported URI"
 msgid "unsupported curve\n"
 msgstr "URI tidak didukung"
 
-#: scd/app-openpgp.c:4991
+#: scd/app-openpgp.c:4985
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5041
+#: scd/app-openpgp.c:5035
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5240
+#: scd/app-openpgp.c:5234
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s signature, algoritma digest %s\n"
 
-#: scd/app-openpgp.c:5298
+#: scd/app-openpgp.c:5292
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5729
+#: scd/app-openpgp.c:5723
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:6241 scd/app-openpgp.c:6252
+#: scd/app-openpgp.c:6250 scd/app-openpgp.c:6261
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "tidak ditemukan data OpenPGP yang valid.\n"
@@ -8682,7 +8695,7 @@ msgstr ""
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:274 dirmngr/dirmngr.c:198
+#: scd/scdaemon.c:136 sm/gpgsm.c:274 dirmngr/dirmngr.c:199
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
@@ -8747,12 +8760,12 @@ msgstr ""
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2104
+#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2143
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2112
+#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2151
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -8762,11 +8775,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:199 sm/certchain.c:2172
+#: sm/certchain.c:199 sm/certchain.c:2174
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:200 sm/certchain.c:2172
+#: sm/certchain.c:200 sm/certchain.c:2174
 #, fuzzy
 msgid "shell"
 msgstr "bantuan"
@@ -8800,231 +8813,231 @@ msgstr "menulis kunci rahasia ke `%s'\n"
 msgid "certificate policy not allowed"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: sm/certchain.c:595 sm/keydb.c:1891 sm/keydb.c:1980
+#: sm/certchain.c:596 sm/keydb.c:1913 sm/keydb.c:2002
 #, fuzzy, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: sm/certchain.c:624
+#: sm/certchain.c:625
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:644
+#: sm/certchain.c:645
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#: sm/certchain.c:724 dirmngr/ocsp.c:683
 #, fuzzy, c-format
 #| msgid "%s: can't access: %s\n"
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "%s: tidak dapat mengakses: %s\n"
 
-#: sm/certchain.c:791
+#: sm/certchain.c:792
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr ""
 
-#: sm/certchain.c:816
+#: sm/certchain.c:817
 #, fuzzy, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: sm/certchain.c:819
+#: sm/certchain.c:820
 #, fuzzy, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: sm/certchain.c:1046 sm/certchain.c:1561 sm/certchain.c:2200 sm/decrypt.c:643
-#: sm/encrypt.c:620 sm/import.c:414 sm/keydb.c:1898 sm/keydb.c:1987
-#: sm/sign.c:428 sm/verify.c:117
+#: sm/certchain.c:1047 sm/certchain.c:1562 sm/certchain.c:2202
+#: sm/decrypt.c:1084 sm/encrypt.c:621 sm/import.c:414 sm/keydb.c:1920
+#: sm/keydb.c:2009 sm/sign.c:428 sm/verify.c:117
 #, fuzzy, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: sm/certchain.c:1232
+#: sm/certchain.c:1233
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "CATATAN: kunci telah dibatalkan"
 
-#: sm/certchain.c:1247
+#: sm/certchain.c:1248
 msgid "the status of the certificate is unknown"
 msgstr ""
 
-#: sm/certchain.c:1254
+#: sm/certchain.c:1255
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:1260
+#: sm/certchain.c:1261
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 
-#: sm/certchain.c:1289 sm/certchain.c:1357 dirmngr/validate.c:497
+#: sm/certchain.c:1290 sm/certchain.c:1358 dirmngr/validate.c:497
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:1304 sm/certchain.c:1389 dirmngr/validate.c:515
+#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:515
 #, c-format
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1305 sm/certchain.c:1390
+#: sm/certchain.c:1306 sm/certchain.c:1391
 #, fuzzy
 msgid "root certificate not yet valid"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1307 sm/certchain.c:1392
 msgid "intermediate certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1319 dirmngr/validate.c:526
+#: sm/certchain.c:1320 dirmngr/validate.c:526
 #, fuzzy, c-format
 msgid "certificate has expired"
 msgstr "Kunci ini telah berakhir!"
 
-#: sm/certchain.c:1320
+#: sm/certchain.c:1321
 #, fuzzy
 msgid "root certificate has expired"
 msgstr "Kunci ini telah berakhir!"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1322
 #, fuzzy
 msgid "intermediate certificate has expired"
 msgstr "Kunci ini telah berakhir!"
 
-#: sm/certchain.c:1363
+#: sm/certchain.c:1364
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:1372
+#: sm/certchain.c:1373
 #, fuzzy
 msgid "certificate with invalid validity"
 msgstr "Kunci ini telah berakhir!"
 
-#: sm/certchain.c:1409
+#: sm/certchain.c:1410
 msgid "signature not created during lifetime of certificate"
 msgstr ""
 
-#: sm/certchain.c:1411
+#: sm/certchain.c:1412
 msgid "certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1413
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1416
+#: sm/certchain.c:1417
 #, fuzzy, c-format
 msgid "  (  signature created at "
 msgstr "       signature baru: %lu\n"
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1418
 #, fuzzy, c-format
 msgid "  (certificate created at "
 msgstr "Sertifikat pembatalan tercipta.\n"
 
-#: sm/certchain.c:1420
+#: sm/certchain.c:1421
 #, fuzzy, c-format
 msgid "  (certificate valid from "
 msgstr "sertifikat yang buruk"
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1422
 #, c-format
 msgid "  (     issuer valid from "
 msgstr ""
 
-#: sm/certchain.c:1451 dirmngr/validate.c:577
+#: sm/certchain.c:1452 dirmngr/validate.c:577
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "tampilkan fingerprint"
 
-#: sm/certchain.c:1460
+#: sm/certchain.c:1461
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:1473
+#: sm/certchain.c:1474
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1479
+#: sm/certchain.c:1480
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1538
+#: sm/certchain.c:1539
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 
-#: sm/certchain.c:1602
+#: sm/certchain.c:1603
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "buat sertifikat revokasi"
 
-#: sm/certchain.c:1680
+#: sm/certchain.c:1681
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1749 dirmngr/validate.c:575
+#: sm/certchain.c:1750 dirmngr/validate.c:575
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:1765
+#: sm/certchain.c:1766
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 
-#: sm/certchain.c:1796 sm/import.c:175 dirmngr/validate.c:630
+#: sm/certchain.c:1797 sm/import.c:175 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1808 dirmngr/validate.c:642
+#: sm/certchain.c:1809 dirmngr/validate.c:642
 #, c-format
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1842 dirmngr/validate.c:668
+#: sm/certchain.c:1844 dirmngr/validate.c:668
 #, fuzzy, c-format
 msgid "certificate has a BAD signature"
 msgstr "verifikasi signature"
 
-#: sm/certchain.c:1874 dirmngr/validate.c:692
+#: sm/certchain.c:1876 dirmngr/validate.c:692
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1933 dirmngr/validate.c:717
+#: sm/certchain.c:1935 dirmngr/validate.c:717
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1975 sm/certchain.c:2275 dirmngr/validate.c:747
+#: sm/certchain.c:1977 sm/certchain.c:2278 dirmngr/validate.c:747
 #, fuzzy, c-format
 msgid "certificate is good\n"
 msgstr "preferensi %c%lu ganda \n"
 
-#: sm/certchain.c:1976
+#: sm/certchain.c:1978
 #, fuzzy, c-format
 msgid "intermediate certificate is good\n"
 msgstr "Sertifikat pembatalan tercipta.\n"
 
-#: sm/certchain.c:1977
+#: sm/certchain.c:1979
 #, fuzzy, c-format
 msgid "root certificate is good\n"
 msgstr "sertifikat yang buruk"
 
-#: sm/certchain.c:2159
+#: sm/certchain.c:2161
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:2168
+#: sm/certchain.c:2170
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -9035,18 +9048,18 @@ 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:1372 dirmngr/validate.c:903
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1411 dirmngr/validate.c:903
 #: dirmngr/validate.c:927
 #, fuzzy, c-format
 msgid "out of core\n"
 msgstr "tidak diproses"
 
-#: sm/certcheck.c:389 sm/verify.c:212
+#: sm/certcheck.c:388 sm/verify.c:212
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:793
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:794
 #, fuzzy
 msgid "none"
 msgstr "n|t|tidak"
@@ -9344,17 +9357,17 @@ msgstr ""
 msgid "resource problem: out of core\n"
 msgstr ""
 
-#: sm/decrypt.c:719
+#: sm/decrypt.c:1159
 #, c-format
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
 
-#: sm/decrypt.c:721
+#: sm/decrypt.c:1161
 #, c-format
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr ""
 
-#: sm/decrypt.c:868
+#: sm/decrypt.c:1318
 #, fuzzy, c-format
 msgid "encrypted to %s key %s\n"
 msgstr "dienkripsi dengan kunci %s, ID %08lX\n"
@@ -9364,7 +9377,7 @@ msgstr "dienkripsi dengan kunci %s, ID %08lX\n"
 msgid "certificate '%s' not found: %s\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: sm/delete.c:120 sm/keydb.c:1999 sm/keydb.c:2098
+#: sm/delete.c:120 sm/keydb.c:2021 sm/keydb.c:2120
 #, fuzzy, c-format
 msgid "error locking keybox: %s\n"
 msgstr "gagal membaca keyblock: %s\n"
@@ -9384,7 +9397,7 @@ msgstr "preferensi %c%lu ganda \n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: sm/encrypt.c:606
+#: sm/encrypt.c:607
 #, fuzzy, c-format
 msgid "no valid recipients given\n"
 msgstr "(Tidak diberikan deskripsi)\n"
@@ -9460,68 +9473,68 @@ msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "tambah keyring ini ke daftar keyring"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:352 dirmngr/dirmngr.c:265
 #, fuzzy
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|HOST|gunakan keyserver ini utk lihat kunci"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:363
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:364
+#: sm/gpgsm.c:365
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NAMA|gunakan algoritma cipher NAMA untuk passphrase"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:386
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:389
+#: sm/gpgsm.c:390
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: sm/gpgsm.c:393
+#: sm/gpgsm.c:394
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:396
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:398
+#: sm/gpgsm.c:399
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAMA|gunakan algoritma cipher NAMA"
 
-#: sm/gpgsm.c:400
+#: sm/gpgsm.c:401
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAMA|gunakan algoritma digest pesan NAMA"
 
-#: sm/gpgsm.c:410
+#: sm/gpgsm.c:411
 msgid "batch mode: never ask"
 msgstr "mode batch: tanpa tanya"
 
-#: sm/gpgsm.c:412
+#: sm/gpgsm.c:413
 msgid "assume yes on most questions"
 msgstr "asumsikan ya untuk seluruh pertanyaan"
 
-#: sm/gpgsm.c:413
+#: sm/gpgsm.c:414
 msgid "assume no on most questions"
 msgstr "asumsikan tidak untuk seluruh pertanyaan"
 
-#: sm/gpgsm.c:430
+#: sm/gpgsm.c:431
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: sm/gpgsm.c:615
+#: sm/gpgsm.c:616
 #, 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:618
+#: sm/gpgsm.c:619
 #, fuzzy
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
@@ -9532,52 +9545,27 @@ msgstr ""
 "tandai, cek, enkripsi atau dekripsi\n"
 "operasi baku tergantung pada data input\n"
 
-#: sm/gpgsm.c:826
+#: sm/gpgsm.c:827
 #, 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:837
+#: sm/gpgsm.c:838
 #, fuzzy, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
 
-#: sm/gpgsm.c:896 dirmngr/ldapserver.c:89
-#, fuzzy, c-format
-msgid "%s:%u: no hostname given\n"
-msgstr "(Tidak diberikan deskripsi)\n"
-
-#: sm/gpgsm.c:915 dirmngr/ldapserver.c:108
-#, c-format
-msgid "%s:%u: password given without user\n"
-msgstr ""
-
-#: sm/gpgsm.c:946 dirmngr/ldapserver.c:139
-#, c-format
-msgid "%s:%u: ignoring unknown flag '%s'\n"
-msgstr ""
-
-#: sm/gpgsm.c:962 dirmngr/ldapserver.c:155
-#, fuzzy, c-format
-msgid "%s:%u: skipping this line\n"
-msgstr " s = lewati kunci ini\n"
-
-#: sm/gpgsm.c:1550
-#, fuzzy, c-format
-msgid "could not parse keyserver\n"
-msgstr "tidak dapat memparsing URI keyserver\n"
-
-#: sm/gpgsm.c:1858
+#: sm/gpgsm.c:1711
 #, fuzzy, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "menulis ke `%s'\n"
 
-#: sm/gpgsm.c:1904
+#: sm/gpgsm.c:1757
 #, fuzzy, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "tidak dapat menutup `%s': %s\n"
 
-#: sm/gpgsm.c:2273
+#: sm/gpgsm.c:2129
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
@@ -9597,52 +9585,52 @@ msgstr "buat sertifikat revokasi"
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:471 sm/keydb.c:2018 sm/keydb.c:2111
+#: sm/import.c:472 sm/keydb.c:2040 sm/keydb.c:2133
 #, fuzzy, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: sm/import.c:530 sm/import.c:562
+#: sm/import.c:531 sm/import.c:563
 #, fuzzy, c-format
 msgid "error importing certificate: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: sm/import.c:751 tools/gpg-connect-agent.c:1475
+#: sm/import.c:752 tools/gpg-connect-agent.c:1475
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: sm/keydb.c:503
+#: sm/keydb.c:508
 #, fuzzy, c-format
 msgid "no keyboxd running in this session\n"
 msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
 
-#: sm/keydb.c:595
+#: sm/keydb.c:600
 #, fuzzy, c-format
 msgid "error opening key DB: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: sm/keydb.c:1936
+#: sm/keydb.c:1958
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1948
+#: sm/keydb.c:1970
 #, fuzzy, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: sm/keydb.c:1956
+#: sm/keydb.c:1978
 #, fuzzy, c-format
 msgid "error storing certificate: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: sm/keydb.c:2009
+#: sm/keydb.c:2031
 #, fuzzy, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "rev? masalah memeriksa pembatalan: %s\n"
 
-#: sm/keydb.c:2030 sm/keydb.c:2122
+#: sm/keydb.c:2052 sm/keydb.c:2144
 #, fuzzy, c-format
 msgid "error storing flags: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
@@ -9814,57 +9802,57 @@ msgstr ""
 msgid "error loading certificate '%s': %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: dirmngr/certcache.c:819
+#: dirmngr/certcache.c:820
 #, fuzzy, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "sertifikat yang buruk"
 
-#: dirmngr/certcache.c:821
+#: dirmngr/certcache.c:822
 #, fuzzy, c-format
 msgid "    runtime cached certificates: %u\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: dirmngr/certcache.c:823
+#: dirmngr/certcache.c:824
 #, fuzzy, c-format
 msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: dirmngr/certcache.c:851 dirmngr/dirmngr-client.c:392
+#: dirmngr/certcache.c:852 dirmngr/dirmngr-client.c:392
 #, fuzzy, c-format
 msgid "certificate already cached\n"
 msgstr "Sertifikat pembatalan tercipta.\n"
 
-#: dirmngr/certcache.c:853
+#: dirmngr/certcache.c:854
 #, fuzzy, c-format
 msgid "certificate cached\n"
 msgstr "preferensi %c%lu ganda \n"
 
-#: dirmngr/certcache.c:855 dirmngr/certcache.c:875 dirmngr/dirmngr-client.c:396
+#: dirmngr/certcache.c:856 dirmngr/certcache.c:876 dirmngr/dirmngr-client.c:396
 #, fuzzy, c-format
 msgid "error caching certificate: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: dirmngr/certcache.c:938
+#: dirmngr/certcache.c:939
 #, fuzzy, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: dirmngr/certcache.c:1384 dirmngr/certcache.c:1393
+#: dirmngr/certcache.c:1385 dirmngr/certcache.c:1394
 #, fuzzy, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: dirmngr/certcache.c:1579 dirmngr/certcache.c:1588
+#: dirmngr/certcache.c:1580 dirmngr/certcache.c:1589
 #, fuzzy, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: dirmngr/certcache.c:1694 dirmngr/validate.c:483
+#: dirmngr/certcache.c:1695 dirmngr/validate.c:483
 #, fuzzy, c-format
 msgid "no issuer found in certificate\n"
 msgstr "buat sertifikat revokasi"
 
-#: dirmngr/certcache.c:1704
+#: dirmngr/certcache.c:1705
 #, fuzzy, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
@@ -9901,7 +9889,7 @@ msgstr "gagal menghapus keyblok: %s\n"
 msgid "not removing file '%s'\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2380
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2383
 #, fuzzy, c-format
 msgid "error closing cache file: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
@@ -10134,14 +10122,14 @@ msgid "error getting data from cache file: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
 #: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1672 dirmngr/crlcache.c:1697
-#: dirmngr/crlcache.c:1763
+#: dirmngr/crlcache.c:1766
 #, fuzzy, c-format
 #| msgid "invalid response from agent\n"
 msgid "got an invalid S-expression from libksba\n"
 msgstr "respon tidak valid dari agen\n"
 
 #: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1679 dirmngr/crlcache.c:1705
-#: dirmngr/crlcache.c:1770 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1773 dirmngr/misc.c:176
 #, fuzzy, c-format
 msgid "converting S-expression failed: %s\n"
 msgstr "tidak dapat membuka file: %s\n"
@@ -10157,201 +10145,201 @@ msgstr "algoritma hash tidak valid `%s'\n"
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1797 dirmngr/ocsp.c:478
+#: dirmngr/crlcache.c:1800 dirmngr/ocsp.c:478
 #, fuzzy, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: dirmngr/crlcache.c:1871
+#: dirmngr/crlcache.c:1874
 #, fuzzy, c-format
 #| msgid "build_packet failed: %s\n"
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "build_packet gagal: %s\n"
 
-#: dirmngr/crlcache.c:1886
+#: dirmngr/crlcache.c:1889
 #, fuzzy, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: dirmngr/crlcache.c:1893
+#: dirmngr/crlcache.c:1896
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1897
+#: dirmngr/crlcache.c:1900
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1917
+#: dirmngr/crlcache.c:1920
 #, fuzzy, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: dirmngr/crlcache.c:1932
+#: dirmngr/crlcache.c:1935
 #, fuzzy, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "menulis ke `%s'\n"
 
-#: dirmngr/crlcache.c:1959
+#: dirmngr/crlcache.c:1962
 #, fuzzy, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "buat sertifikat revokasi"
 
-#: dirmngr/crlcache.c:1974
+#: dirmngr/crlcache.c:1977
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2020
+#: dirmngr/crlcache.c:2023
 #, fuzzy, c-format
 #| msgid "signature verification suppressed\n"
 msgid "CRL signature verification failed: %s\n"
 msgstr "verifikasi signature tidak diabaikan\n"
 
-#: dirmngr/crlcache.c:2032
+#: dirmngr/crlcache.c:2035
 #, fuzzy, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 
-#: dirmngr/crlcache.c:2174
+#: dirmngr/crlcache.c:2177
 #, fuzzy, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: dirmngr/crlcache.c:2181
+#: dirmngr/crlcache.c:2184
 #, fuzzy, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: dirmngr/crlcache.c:2215
+#: dirmngr/crlcache.c:2218
 #, fuzzy, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "tidak dapat membuat direktori `%s': %s\n"
 
-#: dirmngr/crlcache.c:2219
+#: dirmngr/crlcache.c:2222
 #, fuzzy, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "tidak dapat membuat direktori `%s': %s\n"
 
-#: dirmngr/crlcache.c:2229
+#: dirmngr/crlcache.c:2232
 #, fuzzy, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: dirmngr/crlcache.c:2239
+#: dirmngr/crlcache.c:2242
 #, fuzzy, c-format
 #| msgid "update secret failed: %s\n"
 msgid "crl_parse_insert failed: %s\n"
 msgstr "gagal perbarui rahasia: %s\n"
 
-#: dirmngr/crlcache.c:2249
+#: dirmngr/crlcache.c:2252
 #, fuzzy, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "menulis ke `%s'\n"
 
-#: dirmngr/crlcache.c:2256
+#: dirmngr/crlcache.c:2259
 #, fuzzy, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: dirmngr/crlcache.c:2281
+#: dirmngr/crlcache.c:2284
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2285
+#: dirmngr/crlcache.c:2288
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2301
+#: dirmngr/crlcache.c:2304
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2311
+#: dirmngr/crlcache.c:2314
 #, fuzzy, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2365
 #, fuzzy, c-format
 msgid "creating cache file '%s'\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: dirmngr/crlcache.c:2394
+#: dirmngr/crlcache.c:2397
 #, fuzzy, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: dirmngr/crlcache.c:2408
+#: dirmngr/crlcache.c:2411
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
 "program start\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2448
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2468
+#: dirmngr/crlcache.c:2471
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2471
+#: dirmngr/crlcache.c:2474
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2474
+#: dirmngr/crlcache.c:2477
 msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2481
+#: dirmngr/crlcache.c:2484
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2499
+#: dirmngr/crlcache.c:2502
 #, fuzzy, c-format
 #| msgid "WARNING: invalid size of random_seed file - not used\n"
 msgid " WARNING: invalid cache record length\n"
 msgstr "peringatan: ukuran file random_seed tidak valid - tidak dipakai\n"
 
-#: dirmngr/crlcache.c:2506
+#: dirmngr/crlcache.c:2509
 #, fuzzy, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "%s: kesalahan membaca record bebas: %s\n"
 
-#: dirmngr/crlcache.c:2517
+#: dirmngr/crlcache.c:2520
 #, fuzzy, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "rev? masalah memeriksa pembatalan: %s\n"
 
-#: dirmngr/crlcache.c:2548
+#: dirmngr/crlcache.c:2551
 #, fuzzy, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: dirmngr/crlcache.c:2551
+#: dirmngr/crlcache.c:2554
 msgid "End CRL dump\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2672
+#: dirmngr/crlcache.c:2675
 #, fuzzy, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: dirmngr/crlcache.c:2683
+#: dirmngr/crlcache.c:2686
 #, fuzzy, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 
-#: dirmngr/crlcache.c:2743
+#: dirmngr/crlcache.c:2746
 #, fuzzy, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
@@ -10372,7 +10360,7 @@ msgstr ""
 msgid "error retrieving '%s': %s\n"
 msgstr "kesalahan penciptaan : `%s': %s\n"
 
-#: dirmngr/crlfetch.c:218 dirmngr/ldap-wrapper.c:881 dirmngr/misc.c:573
+#: dirmngr/crlfetch.c:218 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
 #, fuzzy, c-format
 #| msgid "%s: error writing dir record: %s\n"
 msgid "error initializing reader object: %s\n"
@@ -10540,135 +10528,135 @@ msgstr ""
 msgid "looking up '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:175
+#: dirmngr/dirmngr.c:176
 msgid "list the contents of the CRL cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:176
+#: dirmngr/dirmngr.c:177
 #, fuzzy
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr.c:178
 msgid "|URL|fetch a CRL from URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:178
+#: dirmngr/dirmngr.c:179
 msgid "shutdown the dirmngr"
 msgstr ""
 
-#: dirmngr/dirmngr.c:179
+#: dirmngr/dirmngr.c:180
 msgid "flush the cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:213
 msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:215
+#: dirmngr/dirmngr.c:216
 msgid "|N|do not return more than N items in one query"
 msgstr ""
 
-#: dirmngr/dirmngr.c:221
+#: dirmngr/dirmngr.c:222
 msgid "Network related options"
 msgstr ""
 
-#: dirmngr/dirmngr.c:223
+#: dirmngr/dirmngr.c:224
 msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:235
+#: dirmngr/dirmngr.c:236
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:238
+#: dirmngr/dirmngr.c:239
 #, fuzzy
 msgid "|URL|use keyserver at URL"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: dirmngr/dirmngr.c:240
+#: dirmngr/dirmngr.c:241
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-#: dirmngr/dirmngr.c:242
+#: dirmngr/dirmngr.c:243
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:244
+#: dirmngr/dirmngr.c:245
 msgid "inhibit the use of HTTP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:246
+#: dirmngr/dirmngr.c:247
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:248
+#: dirmngr/dirmngr.c:249
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:250
+#: dirmngr/dirmngr.c:251
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: dirmngr/dirmngr.c:254
+#: dirmngr/dirmngr.c:255
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: dirmngr/dirmngr.c:256
+#: dirmngr/dirmngr.c:257
 msgid "inhibit the use of LDAP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:258
+#: dirmngr/dirmngr.c:259
 msgid "ignore LDAP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:260
+#: dirmngr/dirmngr.c:261
 msgid "|HOST|use HOST for LDAP queries"
 msgstr ""
 
-#: dirmngr/dirmngr.c:262
+#: dirmngr/dirmngr.c:263
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr ""
 
-#: dirmngr/dirmngr.c:264
+#: dirmngr/dirmngr.c:267
 #, fuzzy
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: dirmngr/dirmngr.c:266
+#: dirmngr/dirmngr.c:269
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 
-#: dirmngr/dirmngr.c:269 dirmngr/dirmngr_ldap.c:104
+#: dirmngr/dirmngr.c:272
 msgid "|N|set LDAP timeout to N seconds"
 msgstr ""
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:275
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:274
+#: dirmngr/dirmngr.c:277
 msgid "allow sending OCSP requests"
 msgstr ""
 
-#: dirmngr/dirmngr.c:276
+#: dirmngr/dirmngr.c:279
 msgid "ignore certificate contained OCSP service URLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:278
+#: dirmngr/dirmngr.c:281
 #, fuzzy
 msgid "|URL|use OCSP responder at URL"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: dirmngr/dirmngr.c:280
+#: dirmngr/dirmngr.c:283
 msgid "|FPR|OCSP response signed by FPR"
 msgstr ""
 
-#: dirmngr/dirmngr.c:288
+#: dirmngr/dirmngr.c:291
 msgid "force loading of outdated CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:299
+#: dirmngr/dirmngr.c:302
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -10681,304 +10669,115 @@ msgstr ""
 "@\n"
 "(Lihat man page untuk daftar lengkap semua perintah dan option)\n"
 
-#: dirmngr/dirmngr.c:441
+#: dirmngr/dirmngr.c:449
 #, fuzzy
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: dirmngr/dirmngr.c:443
+#: dirmngr/dirmngr.c:451
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:523
+#: dirmngr/dirmngr.c:531
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:609 tools/gpgconf.c:667 tools/gpgconf.c:702
-#: tools/gpgconf.c:802
+#: dirmngr/dirmngr.c:617 tools/gpgconf.c:701 tools/gpgconf.c:736
+#: tools/gpgconf.c:836
 #, fuzzy, c-format
 msgid "usage: %s [options] "
 msgstr "pemakaian: gpg [pilihan] "
 
-#: dirmngr/dirmngr.c:1260
+#: dirmngr/dirmngr.c:1299
 #, 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:1495 dirmngr/server.c:1824
+#: dirmngr/dirmngr.c:1534 dirmngr/server.c:1878
 #, fuzzy, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: dirmngr/dirmngr.c:1501 dirmngr/server.c:1830
+#: dirmngr/dirmngr.c:1540 dirmngr/server.c:1884
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: dirmngr/dirmngr.c:1643
+#: dirmngr/dirmngr.c:1682
 #, fuzzy, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "baris terlalu panjang\n"
 
-#: dirmngr/dirmngr.c:1698 dirmngr/dirmngr.c:1782
+#: dirmngr/dirmngr.c:1737 dirmngr/dirmngr.c:1821
 #, fuzzy, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: dirmngr/dirmngr.c:1734 dirmngr/dirmngr.c:1760 tools/gpgconf-comp.c:3539
+#: dirmngr/dirmngr.c:1773 dirmngr/dirmngr.c:1799 tools/gpgconf-comp.c:3549
 #, fuzzy, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "kesalahan pembacaan: %s\n"
 
-#: dirmngr/dirmngr.c:1789
+#: dirmngr/dirmngr.c:1828
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1876
+#: dirmngr/dirmngr.c:1915
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1917
+#: dirmngr/dirmngr.c:1956
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1922
+#: dirmngr/dirmngr.c:1961
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1924
+#: dirmngr/dirmngr.c:1963
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1929
+#: dirmngr/dirmngr.c:1968
 #, fuzzy, c-format
 msgid "shutdown forced\n"
 msgstr "tidak diproses"
 
-#: dirmngr/dirmngr.c:1937
+#: dirmngr/dirmngr.c:1976
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1944
+#: dirmngr/dirmngr.c:1983
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:105
-msgid "return all values in a record oriented format"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:108
-msgid "|NAME|ignore host part and connect through NAME"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:109
-msgid "force a TLS connection"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:110
-#, fuzzy
-#| msgid "|NAME|set terminal charset to NAME"
-msgid "|NAME|connect to host NAME"
-msgstr "|NAMA|set charset terminal ke NAMA"
-
-#: dirmngr/dirmngr_ldap.c:111
-msgid "|N|connect to port N"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:112
-#, fuzzy
-#| msgid "|NAME|use NAME as default recipient"
-msgid "|NAME|use user NAME for authentication"
-msgstr "|NAMA|gunakan NAMA sebagai penerima baku"
-
-#: dirmngr/dirmngr_ldap.c:113
-msgid "|PASS|use password PASS for authentication"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:115
-msgid "take password from $DIRMNGR_LDAP_PASS"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:116
-msgid "|STRING|query DN STRING"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:117
-msgid "|STRING|use STRING as filter expression"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:118
-msgid "|STRING|return the attribute STRING"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:179
-#, fuzzy
-#| msgid "Usage: gpg [options] [files] (-h for help)"
-msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
-msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
-
-#: dirmngr/dirmngr_ldap.c:182
-msgid ""
-"Syntax: dirmngr_ldap [options] [URL]\n"
-"Internal LDAP helper for Dirmngr\n"
-"Interface and options may change without notice\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:291
-#, fuzzy, c-format
-#| msgid "invalid import options\n"
-msgid "invalid port number %d\n"
-msgstr "opsi impor tidak valid\n"
-
-#: dirmngr/dirmngr_ldap.c:400
-#, c-format
-msgid "scanning result for attribute '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:407 dirmngr/dirmngr_ldap.c:490
-#: dirmngr/dirmngr_ldap.c:514 dirmngr/dirmngr_ldap.c:526
-#: dirmngr/dirmngr_ldap.c:722
-#, fuzzy, c-format
-msgid "error writing to stdout: %s\n"
-msgstr "kesalahan menulis keyring `%s': %s\n"
-
-#: dirmngr/dirmngr_ldap.c:424
-#, c-format
-msgid "          available attribute '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:462
-#, fuzzy, c-format
-msgid "attribute '%s' not found\n"
-msgstr "kunci '%s' tidak ditemukan: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:469
-#, c-format
-msgid "found attribute '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:581
-#, fuzzy, c-format
-#| msgid "reading from `%s'\n"
-msgid "processing url '%s'\n"
-msgstr "Membaca dari `%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:588
-#, fuzzy, c-format
-#| msgid "          w/o user IDs: %lu\n"
-msgid "          user '%s'\n"
-msgstr "         tanpa ID user: %lu\n"
-
-#: dirmngr/dirmngr_ldap.c:590
-#, fuzzy, c-format
-msgid "          pass '%s'\n"
-msgstr "              alias \""
-
-#: dirmngr/dirmngr_ldap.c:592
-#, fuzzy, c-format
-msgid "          host '%s'\n"
-msgstr "              alias \""
-
-#: dirmngr/dirmngr_ldap.c:593
-#, fuzzy, c-format
-#| msgid "          not imported: %lu\n"
-msgid "          port %d\n"
-msgstr "            tidak diimpor: %lu\n"
-
-#: dirmngr/dirmngr_ldap.c:595
-#, fuzzy, c-format
-msgid "            DN '%s'\n"
-msgstr "              alias \""
-
-#: dirmngr/dirmngr_ldap.c:597
-#, c-format
-msgid "        filter '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:602 dirmngr/dirmngr_ldap.c:605
-#, fuzzy, c-format
-msgid "          attr '%s'\n"
-msgstr "              alias \""
-
-#: dirmngr/dirmngr_ldap.c:611
-#, fuzzy, c-format
-msgid "no host name in '%s'\n"
-msgstr "(Tidak diberikan deskripsi)\n"
-
-#: dirmngr/dirmngr_ldap.c:616
-#, c-format
-msgid "no attribute given for query '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:622
-#, fuzzy, c-format
-#| msgid "WARNING: using insecure memory!\n"
-msgid "WARNING: using first attribute only\n"
-msgstr "Peringatan: menggunakan memori yang tidak aman!\n"
-
-#: dirmngr/dirmngr_ldap.c:637 dirmngr/dirmngr_ldap.c:678
-#, fuzzy, c-format
-msgid "LDAP init to '%s:%d' failed: %s\n"
-msgstr "gagal enarmoring: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:659
-#, fuzzy, c-format
-msgid "LDAP init to '%s' failed: %s\n"
-msgstr "gagal enarmoring: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:665
-#, fuzzy, c-format
-msgid "LDAP init to '%s' done\n"
-msgstr "gagal enarmoring: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:704
-#, fuzzy, c-format
-msgid "binding to '%s:%d' failed: %s\n"
-msgstr "gagal enarmoring: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:728
-#, fuzzy, c-format
-#| msgid "dearmoring failed: %s\n"
-msgid "searching '%s' failed: %s\n"
-msgstr "gagal dearmoring: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:759
-#, fuzzy, c-format
-msgid "'%s' is not an LDAP URL\n"
-msgstr "\"%s\" bukan sebuah file JPEG\n"
-
-#: dirmngr/dirmngr_ldap.c:765
-#, c-format
-msgid "'%s' is an invalid LDAP URL\n"
-msgstr ""
-
-#: dirmngr/http.c:1989 dirmngr/ocsp.c:255
+#: dirmngr/http.c:1998 dirmngr/ocsp.c:255
 #, fuzzy, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: dirmngr/http.c:3630 dirmngr/ocsp.c:229
+#: dirmngr/http.c:3652 dirmngr/ocsp.c:229
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr ""
 
-#: dirmngr/http.c:3636 dirmngr/ocsp.c:246
+#: dirmngr/http.c:3658 dirmngr/ocsp.c:246
 #, fuzzy, c-format
 msgid "too many redirections\n"
 msgstr "terlalu banyak preferensi `%c'\n"
 
-#: dirmngr/http.c:3748
+#: dirmngr/http.c:3768
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "redirection changed to '%s'\n"
@@ -11019,31 +10818,51 @@ msgstr "gagal memperbarui: %s\n"
 msgid "ldap wrapper %d stalled - killing\n"
 msgstr ""
 
-#: dirmngr/ldap.c:91
+#: dirmngr/ldap.c:92
 #, c-format
 msgid "invalid char 0x%02x in host name - not added\n"
 msgstr ""
 
-#: dirmngr/ldap.c:95
+#: dirmngr/ldap.c:96
 #, fuzzy, c-format
 msgid "adding '%s:%d' to the ldap server list\n"
 msgstr "mencari \"%s\" dari server HKP %s\n"
 
-#: dirmngr/ldap.c:98 dirmngr/misc.c:512
+#: dirmngr/ldap.c:99 dirmngr/misc.c:512
 #, fuzzy, c-format
 msgid "malloc failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: dirmngr/ldap.c:634
+#: dirmngr/ldap.c:221
+#, fuzzy, c-format
+msgid "'%s' is not an LDAP URL\n"
+msgstr "\"%s\" bukan sebuah file JPEG\n"
+
+#: dirmngr/ldap.c:227 dirmngr/ldap.c:233
 #, c-format
-msgid "start_cert_fetch: invalid pattern '%s'\n"
+msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
-#: dirmngr/ldap.c:846
+#: dirmngr/ldap.c:968
 #, c-format
 msgid "ldap_search hit the size limit of the server\n"
 msgstr ""
 
+#: dirmngr/ldapserver.c:119
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr ""
+
+#: dirmngr/ldapserver.c:181
+#, c-format
+msgid "%s:%u: ignoring unknown flag '%s'\n"
+msgstr ""
+
+#: dirmngr/ldapserver.c:203
+#, fuzzy, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr " s = lewati kunci ini\n"
+
 #: dirmngr/misc.c:172
 #, fuzzy, c-format
 #| msgid "%s: invalid file version %d\n"
@@ -11136,88 +10955,88 @@ msgstr ""
 msgid "allocating list item failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: dirmngr/ocsp.c:537 dirmngr/ocsp.c:724
+#: dirmngr/ocsp.c:538 dirmngr/ocsp.c:725
 #, fuzzy, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: dirmngr/ocsp.c:584
+#: dirmngr/ocsp.c:585
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:623 dirmngr/validate.c:648
+#: dirmngr/ocsp.c:624 dirmngr/validate.c:648
 #, fuzzy, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: dirmngr/ocsp.c:633
+#: dirmngr/ocsp.c:634
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:640
+#: dirmngr/ocsp.c:641
 #, fuzzy, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "buat sertifikat revokasi"
 
-#: dirmngr/ocsp.c:650
+#: dirmngr/ocsp.c:651
 #, fuzzy, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: dirmngr/ocsp.c:689
+#: dirmngr/ocsp.c:690
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:696
 #, fuzzy, c-format
 #| msgid "no default secret keyring: %s\n"
 msgid "no default OCSP signer defined\n"
 msgstr "tidak ada keyring rahasia baku: %s\n"
 
-#: dirmngr/ocsp.c:702
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:707
+#: dirmngr/ocsp.c:708
 #, fuzzy, c-format
 #| msgid "using cipher %s\n"
 msgid "using OCSP responder '%s'\n"
 msgstr "menggunakan cipher %s\n"
 
-#: dirmngr/ocsp.c:764
+#: dirmngr/ocsp.c:765
 #, fuzzy, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: dirmngr/ocsp.c:789
+#: dirmngr/ocsp.c:790
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:790
+#: dirmngr/ocsp.c:791
 msgid "good"
 msgstr ""
 
-#: dirmngr/ocsp.c:796
+#: dirmngr/ocsp.c:797
 #, fuzzy, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "CATATAN: kunci telah dibatalkan"
 
-#: dirmngr/ocsp.c:831
+#: dirmngr/ocsp.c:832
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:843
+#: dirmngr/ocsp.c:844
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:858
+#: dirmngr/ocsp.c:859
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr ""
@@ -11227,72 +11046,68 @@ msgstr ""
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "gagal menandai: %s\n"
 
-#: dirmngr/server.c:1158
-msgid "ldapserver missing"
-msgstr ""
-
-#: dirmngr/server.c:1224
+#: dirmngr/server.c:1277
 msgid "serialno missing in cert ID"
 msgstr ""
 
-#: dirmngr/server.c:1387 dirmngr/server.c:1473 dirmngr/server.c:1909
-#: dirmngr/server.c:1980 dirmngr/server.c:2556 dirmngr/server.c:2571
+#: dirmngr/server.c:1440 dirmngr/server.c:1526 dirmngr/server.c:1963
+#: dirmngr/server.c:2034 dirmngr/server.c:2662 dirmngr/server.c:2677
 #, fuzzy, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "gagal menandai: %s\n"
 
-#: dirmngr/server.c:1516
+#: dirmngr/server.c:1569
 #, fuzzy, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: dirmngr/server.c:1528 dirmngr/server.c:1559 dirmngr/server.c:1718
+#: dirmngr/server.c:1581 dirmngr/server.c:1612 dirmngr/server.c:1772
 #, fuzzy, c-format
 msgid "error sending data: %s\n"
 msgstr "kesalahan mengirim ke `%s': %s\n"
 
-#: dirmngr/server.c:1666
+#: dirmngr/server.c:1720
 #, fuzzy, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: dirmngr/server.c:1699
+#: dirmngr/server.c:1753
 #, fuzzy, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: dirmngr/server.c:1726
+#: dirmngr/server.c:1780
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:2860
+#: dirmngr/server.c:2966
 #, fuzzy, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: dirmngr/server.c:2871
+#: dirmngr/server.c:2977
 #, fuzzy, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "%s: gagal membuat hashtable: %s\n"
 
-#: dirmngr/server.c:2892
+#: dirmngr/server.c:2998
 #, fuzzy, c-format
 #| msgid "failed to initialize the TrustDB: %s\n"
 msgid "failed to initialize the server: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: dirmngr/server.c:2900
+#: dirmngr/server.c:3006
 #, fuzzy, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "gagal membuat kembali cache keyring: %s\n"
 
-#: dirmngr/server.c:2933
+#: dirmngr/server.c:3039
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:2952
+#: dirmngr/server.c:3058
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -11441,73 +11256,73 @@ msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
 msgid "error sending standard options: %s\n"
 msgstr "kesalahan mengirim ke `%s': %s\n"
 
-#: tools/gpgconf-comp.c:649
+#: tools/gpgconf-comp.c:655
 msgid "OpenPGP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:653
+#: tools/gpgconf-comp.c:659
 msgid "S/MIME"
 msgstr ""
 
-#: tools/gpgconf-comp.c:657
+#: tools/gpgconf-comp.c:663
 #, fuzzy
 msgid "Public Keys"
 msgstr "kunci publik adalah %08lX\n"
 
-#: tools/gpgconf-comp.c:661
+#: tools/gpgconf-comp.c:667
 msgid "Private Keys"
 msgstr ""
 
-#: tools/gpgconf-comp.c:665
+#: tools/gpgconf-comp.c:671
 msgid "Smartcards"
 msgstr ""
 
-#: tools/gpgconf-comp.c:669
+#: tools/gpgconf-comp.c:676
 msgid "TPM"
 msgstr ""
 
-#: tools/gpgconf-comp.c:673
+#: tools/gpgconf-comp.c:681
 #, fuzzy
 #| msgid "network error"
 msgid "Network"
 msgstr "kesalahan jaringan"
 
-#: tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:685
 #, fuzzy
 msgid "Passphrase Entry"
 msgstr "passphrase yang buruk"
 
-#: tools/gpgconf-comp.c:941
+#: tools/gpgconf-comp.c:951
 #, fuzzy
 msgid "Component not suitable for launching"
 msgstr "kunci publik tidak ditemukan"
 
-#: tools/gpgconf-comp.c:947
+#: tools/gpgconf-comp.c:957
 #, c-format
 msgid "Configuration file of component %s is broken\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:950
+#: tools/gpgconf-comp.c:960
 #, fuzzy, c-format
 #| msgid "Please use the command \"toggle\" first.\n"
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr "Silakan gunakan dulu perintah \"toogle\".\n"
 
-#: tools/gpgconf-comp.c:2816
+#: tools/gpgconf-comp.c:2826
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2946
+#: tools/gpgconf-comp.c:2956
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3543
+#: tools/gpgconf-comp.c:3553
 #, fuzzy, c-format
 msgid "error closing '%s'\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: tools/gpgconf-comp.c:3545
+#: tools/gpgconf-comp.c:3555
 #, fuzzy, c-format
 msgid "error parsing '%s'\n"
 msgstr "kesalahan membaca `%s': %s\n"
@@ -11591,16 +11406,16 @@ msgid ""
 "Manage configuration options for tools of the @GNUPG@ system\n"
 msgstr ""
 
-#: tools/gpgconf.c:669 tools/gpgconf.c:704
+#: tools/gpgconf.c:703 tools/gpgconf.c:738
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:678 tools/gpgconf.c:728 tools/gpgconf.c:778
+#: tools/gpgconf.c:712 tools/gpgconf.c:762 tools/gpgconf.c:812
 #, fuzzy
 msgid "Component not found"
 msgstr "kunci publik tidak ditemukan"
 
-#: tools/gpgconf.c:804
+#: tools/gpgconf.c:838
 #, fuzzy
 msgid "No argument allowed"
 msgstr "menulis kunci rahasia ke `%s'\n"
@@ -11616,88 +11431,189 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
-#: tools/gpg-card.c:2390
+#: tools/gpg-card.c:2407
 #, fuzzy, c-format
 msgid "Note: key %s is already stored on the card!\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
 
-#: tools/gpg-card.c:2393
+#: tools/gpg-card.c:2410
 #, fuzzy, c-format
 msgid "Note: Keys are already stored on the card!\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
 
-#: tools/gpg-card.c:2396
+#: tools/gpg-card.c:2413
 #, c-format
 msgid "Replace existing key %s ? (y/N) "
 msgstr ""
 
-#: tools/gpg-card.c:2549 tools/gpg-card.c:2712 tools/gpg-card.c:2935
-#: tools/gpg-card.c:3044
+#: tools/gpg-card.c:2566 tools/gpg-card.c:2729 tools/gpg-card.c:2952
+#: tools/gpg-card.c:3061
 #, c-format
 msgid "%s card no. %s detected\n"
 msgstr ""
 
-#: tools/gpg-card.c:3396
+#: tools/gpg-card.c:3413
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3406 tools/gpg-card.c:3420
+#: tools/gpg-card.c:3423 tools/gpg-card.c:3437
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
 "         can only be reverted using a factory reset!\n"
 msgstr ""
 
-#: tools/gpg-card.c:3423
+#: tools/gpg-card.c:3440
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3669
+#: tools/gpg-card.c:3686
 #, fuzzy
 msgid "authenticate to the card"
 msgstr "Sertifikat pembatalan tercipta.\n"
 
-#: tools/gpg-card.c:3671
+#: tools/gpg-card.c:3688
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3673
+#: tools/gpg-card.c:3690
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication"
 msgstr "|NAMA|gunakan NAMA sebagai penerima baku"
 
-#: tools/gpg-card.c:3675
+#: tools/gpg-card.c:3692
 #, fuzzy
 #| msgid "change the expire date"
 msgid "change a private data object"
 msgstr "ubah tanggal kadaluarsa"
 
-#: tools/gpg-card.c:3676
+#: tools/gpg-card.c:3693
 #, fuzzy
 msgid "read a certificate from a data object"
 msgstr "Sertifikat pembatalan tercipta.\n"
 
-#: tools/gpg-card.c:3677
+#: tools/gpg-card.c:3694
 #, fuzzy
 msgid "store a certificate to a data object"
 msgstr "Sertifikat pembatalan tercipta.\n"
 
-#: tools/gpg-card.c:3678
+#: tools/gpg-card.c:3695
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3679
+#: tools/gpg-card.c:3696
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3681
+#: tools/gpg-card.c:3698
 msgid "manage the command history"
 msgstr ""
 
 #, fuzzy
+#~ msgid "requesting key %s from %s server %s\n"
+#~ msgstr "meminta kunci %08lX dari %s\n"
+
+#, fuzzy
+#~ msgid "%s:%u: no hostname given\n"
+#~ msgstr "(Tidak diberikan deskripsi)\n"
+
+#, fuzzy
+#~ msgid "could not parse keyserver\n"
+#~ msgstr "tidak dapat memparsing URI keyserver\n"
+
+#, fuzzy
+#~| msgid "|NAME|set terminal charset to NAME"
+#~ msgid "|NAME|connect to host NAME"
+#~ msgstr "|NAMA|set charset terminal ke NAMA"
+
+#, fuzzy
+#~| msgid "|NAME|use NAME as default recipient"
+#~ msgid "|NAME|use user NAME for authentication"
+#~ msgstr "|NAMA|gunakan NAMA sebagai penerima baku"
+
+#, fuzzy
+#~| msgid "Usage: gpg [options] [files] (-h for help)"
+#~ msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
+#~ msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
+
+#, fuzzy
+#~| msgid "invalid import options\n"
+#~ msgid "invalid port number %d\n"
+#~ msgstr "opsi impor tidak valid\n"
+
+#, fuzzy
+#~ msgid "error writing to stdout: %s\n"
+#~ msgstr "kesalahan menulis keyring `%s': %s\n"
+
+#, fuzzy
+#~ msgid "attribute '%s' not found\n"
+#~ msgstr "kunci '%s' tidak ditemukan: %s\n"
+
+#, fuzzy
+#~| msgid "reading from `%s'\n"
+#~ msgid "processing url '%s'\n"
+#~ msgstr "Membaca dari `%s'\n"
+
+#, fuzzy
+#~| msgid "          w/o user IDs: %lu\n"
+#~ msgid "          user '%s'\n"
+#~ msgstr "         tanpa ID user: %lu\n"
+
+#, fuzzy
+#~ msgid "          pass '%s'\n"
+#~ msgstr "              alias \""
+
+#, fuzzy
+#~ msgid "          host '%s'\n"
+#~ msgstr "              alias \""
+
+#, fuzzy
+#~| msgid "          not imported: %lu\n"
+#~ msgid "          port %d\n"
+#~ msgstr "            tidak diimpor: %lu\n"
+
+#, fuzzy
+#~ msgid "            DN '%s'\n"
+#~ msgstr "              alias \""
+
+#, fuzzy
+#~ msgid "          attr '%s'\n"
+#~ msgstr "              alias \""
+
+#, fuzzy
+#~ msgid "no host name in '%s'\n"
+#~ msgstr "(Tidak diberikan deskripsi)\n"
+
+#, fuzzy
+#~| msgid "WARNING: using insecure memory!\n"
+#~ msgid "WARNING: using first attribute only\n"
+#~ msgstr "Peringatan: menggunakan memori yang tidak aman!\n"
+
+#, fuzzy
+#~ msgid "LDAP init to '%s:%d' failed: %s\n"
+#~ msgstr "gagal enarmoring: %s\n"
+
+#, fuzzy
+#~ msgid "LDAP init to '%s' failed: %s\n"
+#~ msgstr "gagal enarmoring: %s\n"
+
+#, fuzzy
+#~ msgid "LDAP init to '%s' done\n"
+#~ msgstr "gagal enarmoring: %s\n"
+
+#, fuzzy
+#~ msgid "binding to '%s:%d' failed: %s\n"
+#~ msgstr "gagal enarmoring: %s\n"
+
+#, fuzzy
+#~| msgid "dearmoring failed: %s\n"
+#~ msgid "searching '%s' failed: %s\n"
+#~ msgstr "gagal dearmoring: %s\n"
+
+#, fuzzy
 #~ msgid "Suggest a random passphrase."
 #~ msgstr "ubah passphrase"
 
diff --git a/po/it.gmo b/po/it.gmo
index 4c32615..7d65f9c 100644
--- a/po/it.gmo
+++ b/po/it.gmo
diff --git a/po/it.po b/po/it.po
index e38b6bd..d7901d5 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: 2021-04-20 12:38+0200\n"
+"POT-Creation-Date: 2021-08-24 18:50+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:328
+#: agent/call-pinentry.c:338
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "impossibile acquisire il blocco pinentry: %s\n"
@@ -27,45 +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:546
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_OK"
 msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:547
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_Cancel"
 msgstr "|pinentry-label|_Cancel"
 
-#: agent/call-pinentry.c:548
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|_Yes"
 msgstr "|pinentry-label|_Yes"
 
-#: agent/call-pinentry.c:549
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_No"
 msgstr "|pinentry-label|_No"
 
-#: agent/call-pinentry.c:550
+#: agent/call-pinentry.c:560
 msgid "|pinentry-label|PIN:"
 msgstr "|pinentry-label|PIN:"
 
-#: agent/call-pinentry.c:551
+#: agent/call-pinentry.c:561
 msgid "|pinentry-label|_Save in password manager"
 msgstr "|pinentry-label|_Save in gestione password"
 
-#: agent/call-pinentry.c:552
+#: agent/call-pinentry.c:562
 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:554
+#: agent/call-pinentry.c:564
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr "|pinentry-tt|Rendere visibile la passphrase"
 
-#: agent/call-pinentry.c:555
+#: agent/call-pinentry.c:565
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "|pinentry-tt|Nascondi passphrase"
 
+#: agent/call-pinentry.c:566
+msgid "Caps Lock is on"
+msgstr ""
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:944
+#: agent/call-pinentry.c:1022
 msgid "Suggest"
 msgstr "Suggerisci"
 
@@ -76,13 +80,26 @@ 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:966
+#: agent/call-pinentry.c:1044
 msgid "pinentry.genpin.tooltip"
 msgstr "pinentry.genpin.tooltip"
 
+#: agent/call-pinentry.c:1072
+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
+#, fuzzy
+#| msgid "Passphrase too long"
+msgid "Passphrase Not Allowed"
+msgstr "Passphrase troppo lunga"
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:998
+#: agent/call-pinentry.c:1198
 msgid "Quality:"
 msgstr "Qualità:"
 
@@ -92,11 +109,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:1019
+#: agent/call-pinentry.c:1219
 msgid "pinentry.qualitybar.tooltip"
 msgstr "pinentry.qualitybar.tooltip"
 
-#: agent/call-pinentry.c:1263
+#: agent/call-pinentry.c:1477
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
@@ -104,7 +121,7 @@ msgstr ""
 "Inserisci il tuo PIN, in modo che la chiave segreta possa essere sbloccata "
 "per questa sessione"
 
-#: agent/call-pinentry.c:1266
+#: agent/call-pinentry.c:1480
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -112,76 +129,76 @@ msgstr ""
 "Inserisci la tua passphrase, in modo che la chiave segreta possa essere "
 "sbloccata per questa sessione"
 
-#: agent/call-pinentry.c:1303 agent/call-pinentry.c:1506
+#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
 msgid "PIN:"
 msgstr "PIN:"
 
-#: agent/call-pinentry.c:1303 agent/call-pinentry.c:1506
-#: agent/protect-tool.c:728
+#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/protect-tool.c:729
 msgid "Passphrase:"
 msgstr "Passphrase:"
 
-#: agent/call-pinentry.c:1330 agent/call-pinentry.c:1580 agent/command.c:1799
-#: agent/command.c:1852 agent/command-ssh.c:3046 agent/genkey.c:398
+#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
+#: agent/command.c:1988 agent/command-ssh.c:3046 agent/genkey.c:442
 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:1351 agent/call-pinentry.c:1603
+#: agent/call-pinentry.c:1566 agent/call-pinentry.c:1830
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (provare %d di %d)"
 
-#: agent/call-pinentry.c:1362 agent/call-pinentry.c:1614
+#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
 msgid "Repeat:"
 msgstr "Ripeti:"
 
-#: agent/call-pinentry.c:1372 agent/call-pinentry.c:1384
-#: agent/call-pinentry.c:1624 agent/call-pinentry.c:1636
+#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
+#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
 msgid "PIN too long"
 msgstr "PIN troppo lungo"
 
-#: agent/call-pinentry.c:1373 agent/call-pinentry.c:1625
+#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
 msgid "Passphrase too long"
 msgstr "Passphrase troppo lunga"
 
-#: agent/call-pinentry.c:1381 agent/call-pinentry.c:1633
+#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
 msgid "Invalid characters in PIN"
 msgstr "Caratteri non validi nel PIN"
 
-#: agent/call-pinentry.c:1386 agent/call-pinentry.c:1638
+#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
 msgid "PIN too short"
 msgstr "PIN troppo corto"
 
-#: agent/call-pinentry.c:1405 agent/call-pinentry.c:1656
+#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
 msgid "Bad PIN"
 msgstr "PIN non valido"
 
-#: agent/call-pinentry.c:1405 agent/call-pinentry.c:1656
+#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
 msgid "Bad Passphrase"
 msgstr "Passphrase non valido"
 
-#: agent/command.c:697
+#: agent/command.c:823
 msgid "Note: Request from the web browser."
 msgstr "Nota: richiesta dal browser Web."
 
-#: agent/command.c:698
+#: agent/command.c:824
 msgid "Note: Request from a remote site."
 msgstr "Nota: richiesta da un sito remoto."
 
-#: agent/command.c:1106 g10/card-util.c:708 g10/card-util.c:729
+#: agent/command.c:1235 g10/card-util.c:713 g10/card-util.c:734
 #, 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:1634 agent/command.c:1791 agent/command-ssh.c:2974
-#: agent/genkey.c:333
+#: agent/command.c:1756 agent/command.c:1921 agent/command-ssh.c:2974
+#: agent/genkey.c:377
 msgid "Please re-enter this passphrase"
 msgstr "Inserisci di nuovo questa passphrase"
 
-#: agent/command.c:2567
+#: agent/command.c:2703
 #, c-format
 msgid ""
 "Please enter the passphrase to protect the imported object within the %s "
@@ -190,7 +207,7 @@ msgstr ""
 "Immettere la passphrase per proteggere l'oggetto importato all'interno %s "
 "sistema."
 
-#: agent/command.c:2697
+#: agent/command.c:2833
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -203,25 +220,25 @@ msgstr ""
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "le chiavi ssh maggiori di %d bit non sono supportate\n"
 
-#: agent/command-ssh.c:872 common/dotlock.c:852 g10/card-util.c:953
-#: g10/export.c:1329 g10/gpg.c:1431 g10/keygen.c:5347 g10/keyring.c:1319
-#: g10/keyring.c:1632 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
+#: agent/command-ssh.c:872 common/dotlock.c:852 g10/card-util.c:963
+#: g10/export.c:1329 g10/gpg.c:1431 g10/keygen.c:5377 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
 #: g10/sign.c:1106 g10/sign.c:1443 g10/tdbio.c:753 tools/gpg-card.c:479
 #, c-format
 msgid "can't create '%s': %s\n"
 msgstr "impossibile creare '%s': %s\n"
 
-#: agent/command-ssh.c:884 common/helpfile.c:57 g10/card-util.c:910
+#: agent/command-ssh.c:884 common/helpfile.c:57 g10/card-util.c:920
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
 #: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:721 g10/gpg.c:1432
-#: g10/import.c:371 g10/import.c:558 g10/import.c:793 g10/keygen.c:4322
-#: g10/keyring.c:1658 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
+#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4326
+#: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
 #: g10/plaintext.c:610 g10/sign.c:1086 g10/sign.c:1311 g10/sign.c:1424
 #: g10/sign.c:1596 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2380
-#: sm/gpgsm.c:2410 sm/gpgsm.c:2448 sm/keylist.c:1737 sm/qualified.c:65
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2236
+#: sm/gpgsm.c:2266 sm/gpgsm.c:2304 sm/keylist.c:1775 sm/qualified.c:65
 #: dirmngr/certcache.c:396 dirmngr/certcache.c:476 dirmngr/certcache.c:478
-#: dirmngr/crlcache.c:2588 dirmngr/dirmngr.c:1720 tools/gpg-card.c:408
+#: dirmngr/crlcache.c:2591 dirmngr/dirmngr.c:1759 tools/gpg-card.c:408
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "impossibile aprire '%s': %s\n"
@@ -327,28 +344,28 @@ msgstr "PIN non ripetuto correttamente; Riprova"
 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:109 sm/certreqgen-ui.c:433
+#: 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:116
+#: 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
+#: agent/genkey.c:191
 msgid "Enter new passphrase"
 msgstr "Inserisci la nuova passphrase"
 
-#: agent/genkey.c:184
+#: agent/genkey.c:227
 #, 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:186
+#: agent/genkey.c:229
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -358,18 +375,18 @@ msgstr ""
 "prega di confermare che non si desidera disporre di alcuna protezione sulla "
 "chiave."
 
-#: agent/genkey.c:198
+#: agent/genkey.c:241
 msgid "Yes, protection is not needed"
 msgstr "Sì, la protezione non è necessaria"
 
-#: agent/genkey.c:215
+#: agent/genkey.c:258
 #, 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:234
+#: agent/genkey.c:277
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -379,235 +396,234 @@ msgstr[0] ""
 msgstr[1] ""
 "Una passphrase deve contenere almeno %u cifre o%%0Acaratteri speciali."
 
-#: agent/genkey.c:260
+#: agent/genkey.c:304
 #, 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:275
+#: agent/genkey.c:319
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "Avviso: è stata immessa una passphrase non sicura."
 
-#: agent/genkey.c:296
+#: agent/genkey.c:340
 msgid "Take this one anyway"
 msgstr "Prendi questo comunque"
 
-#: agent/genkey.c:464
+#: agent/genkey.c:508
 #, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "Immettere la passphrase a%0Aproteggere la nuova chiave"
 
-#: agent/genkey.c:590
+#: agent/genkey.c:637
 msgid "Please enter the new passphrase"
 msgstr "Inserisci la nuova passphrase"
 
-#: agent/gpg-agent.c:162 scd/scdaemon.c:115 dirmngr/dirmngr.c:182
+#: agent/gpg-agent.c:164 scd/scdaemon.c:115 dirmngr/dirmngr.c:183
 msgid "Options used for startup"
 msgstr "Opzioni utilizzate per l'avvio"
 
-#: agent/gpg-agent.c:164 scd/scdaemon.c:120 dirmngr/dirmngr.c:171
+#: agent/gpg-agent.c:166 scd/scdaemon.c:120 dirmngr/dirmngr.c:172
 msgid "run in daemon mode (background)"
 msgstr "eseguire in modalità daemon (sfondo)"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:117 dirmngr/dirmngr.c:170
+#: agent/gpg-agent.c:167 scd/scdaemon.c:117 dirmngr/dirmngr.c:171
 msgid "run in server mode (foreground)"
 msgstr "eseguire in modalità server (in primo piano)"
 
-#: agent/gpg-agent.c:167 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:169 dirmngr/dirmngr.c:174
 msgid "run in supervised mode"
 msgstr "eseguire in modalità supervisionata"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:121 dirmngr/dirmngr.c:184
+#: agent/gpg-agent.c:171 scd/scdaemon.c:121 dirmngr/dirmngr.c:185
 msgid "do not detach from the console"
 msgstr "non scollegarsi dalla console"
 
-#: agent/gpg-agent.c:170 scd/scdaemon.c:122 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:172 scd/scdaemon.c:122 dirmngr/dirmngr.c:186
 msgid "sh-style command output"
 msgstr "uscita del comando sh-stile"
 
-#: agent/gpg-agent.c:171 scd/scdaemon.c:123 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:173 scd/scdaemon.c:123 dirmngr/dirmngr.c:187
 msgid "csh-style command output"
 msgstr "uscita del comando in csh-stile"
 
-#: agent/gpg-agent.c:179 g10/gpg.c:589 scd/scdaemon.c:125 sm/gpgsm.c:422
-#: dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:181 g10/gpg.c:589 scd/scdaemon.c:125 sm/gpgsm.c:423
+#: dirmngr/dirmngr.c:189
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|opzioni di lettura da FILE"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:574 scd/scdaemon.c:129 sm/gpgsm.c:265
-#: dirmngr/dirmngr.c:192
+#: agent/gpg-agent.c:185 g10/gpg.c:574 scd/scdaemon.c:129 sm/gpgsm.c:265
+#: dirmngr/dirmngr.c:193
 msgid "Options controlling the diagnostic output"
 msgstr "Opzioni che controllano l'output diagnostico"
 
-#: agent/gpg-agent.c:185 g10/gpg.c:576 g10/gpgv.c:78 kbx/kbxutil.c:89
+#: agent/gpg-agent.c:187 g10/gpg.c:576 g10/gpgv.c:78 kbx/kbxutil.c:89
 #: scd/scdaemon.c:131 sm/gpgsm.c:267 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:194 dirmngr/dirmngr_ldap.c:102
-#: tools/gpg-connect-agent.c:85 tools/gpgconf.c:111
+#: dirmngr/dirmngr.c:195 tools/gpg-connect-agent.c:85 tools/gpgconf.c:111
 msgid "verbose"
 msgstr "prolisso"
 
-#: agent/gpg-agent.c:186 g10/gpg.c:578 g10/gpgv.c:79 kbx/kbxutil.c:90
+#: agent/gpg-agent.c:188 g10/gpg.c:578 g10/gpgv.c:79 kbx/kbxutil.c:90
 #: scd/scdaemon.c:132 sm/gpgsm.c:269 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:195 dirmngr/dirmngr_ldap.c:103
+#: dirmngr/dirmngr.c:196
 msgid "be somewhat more quiet"
 msgstr "meno prolisso"
 
-#: agent/gpg-agent.c:194 g10/gpg.c:593 sm/gpgsm.c:283 dirmngr/dirmngr.c:205
+#: agent/gpg-agent.c:196 g10/gpg.c:593 sm/gpgsm.c:283 dirmngr/dirmngr.c:206
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FILE|scrittura dei registri in modalità server in FILE"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 scd/scdaemon.c:146 sm/gpgsm.c:290
-#: dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:599 scd/scdaemon.c:146 sm/gpgsm.c:290
+#: dirmngr/dirmngr.c:210
 msgid "Options controlling the configuration"
 msgstr "Opzioni che controllano la configurazione"
 
-#: agent/gpg-agent.c:201
+#: agent/gpg-agent.c:203
 msgid "do not use the SCdaemon"
 msgstr "non utilizzare il SCdaemon"
 
-#: agent/gpg-agent.c:203
+#: agent/gpg-agent.c:205
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "| PGM| utilizzare PGM come programma SCdaemon"
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr "|PGM|utilizzare PGM come programma tpm2daemon"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|accettare alcuni comandi tramite NAME"
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 msgid "ignore requests to change the TTY"
 msgstr "ignorare le richieste di modifica del TTY"
 
-#: agent/gpg-agent.c:215
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the X display"
 msgstr "ignorare le richieste di modifica della visualizzazione X"
 
-#: agent/gpg-agent.c:216
+#: agent/gpg-agent.c:218
 msgid "enable ssh support"
 msgstr "abilitare il supporto ssh"
 
-#: agent/gpg-agent.c:218
+#: agent/gpg-agent.c:220
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "|ALGO|usa ALGO per mostrare le impronte digitali ssh"
 
-#: agent/gpg-agent.c:221
+#: agent/gpg-agent.c:223
 msgid "enable putty support"
 msgstr "abilitare il supporto putty"
 
-#: agent/gpg-agent.c:233 g10/gpg.c:844 scd/scdaemon.c:176 sm/gpgsm.c:382
+#: agent/gpg-agent.c:235 g10/gpg.c:844 scd/scdaemon.c:176 sm/gpgsm.c:383
 msgid "Options controlling the security"
 msgstr "Opzioni che controllano la sicurezza"
 
-#: agent/gpg-agent.c:236
+#: agent/gpg-agent.c:238
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|scadenza PIN memorizzati nella cache dopo N secondi"
 
-#: agent/gpg-agent.c:238
+#: agent/gpg-agent.c:240
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|Chiavi SSH di N-scadenza dopo N secondi"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:242
 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:242
+#: agent/gpg-agent.c:244
 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:244
+#: agent/gpg-agent.c:246
 msgid "do not use the PIN cache when signing"
 msgstr "non utilizzare la cache PIN durante la firma"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:248
 msgid "disallow the use of an external password cache"
 msgstr "non consentire l'uso di una cache di password esterna"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:250
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 "non consentire ai client di contrassegnare le chiavi come \"attendibili\""
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:253
 msgid "allow presetting passphrase"
 msgstr "consentire la preimpostazione della passphrase"
 
-#: agent/gpg-agent.c:256
+#: agent/gpg-agent.c:258
 msgid "Options enforcing a passphrase policy"
 msgstr "Opzioni che applicano un criterio di passphrase"
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:261
 msgid "do not allow bypassing the passphrase policy"
 msgstr "non consentire l'esclusione dei criteri di passphrase"
 
-#: agent/gpg-agent.c:261
+#: agent/gpg-agent.c:263
 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:263
+#: agent/gpg-agent.c:265
 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:266
+#: agent/gpg-agent.c:268
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr "|FILE||controlla le nuove passphrase rispetto al modello in FILE"
 
-#: agent/gpg-agent.c:268
+#: agent/gpg-agent.c:272
 msgid "|N|expire the passphrase after N days"
 msgstr "| La passphrase dopo N giorni"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:274
 msgid "do not allow the reuse of old passphrases"
 msgstr "non consentono il riutilizzo di vecchie passphrase"
 
-#: agent/gpg-agent.c:273
+#: agent/gpg-agent.c:277
 msgid "Options controlling the PIN-Entry"
 msgstr "Opzioni che controllano la voce PIN"
 
-#: agent/gpg-agent.c:275
+#: agent/gpg-agent.c:279
 msgid "never use the PIN-entry"
 msgstr "non utilizzare mai la voce PIN-Entry"
 
-#: agent/gpg-agent.c:277
+#: agent/gpg-agent.c:281
 msgid "disallow caller to override the pinentry"
 msgstr "non consentire al chiamante di eseguire l'override del pinentry"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:283
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr "lasciare che PIN-Entry prenda la tastiera e mouse"
 
-#: agent/gpg-agent.c:282
+#: agent/gpg-agent.c:286
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "| PGM|utilizzare PGM come programma PIN-Entry"
 
-#: agent/gpg-agent.c:286
+#: agent/gpg-agent.c:290
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|Il timeout di Pinentry è impostato su N secondi"
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:294
 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:551 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: agent/gpg-agent.c:557 agent/preset-passphrase.c:99 agent/protect-tool.c:154
 #: g10/gpg.c:1132 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:612 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:438
-#: dirmngr/dirmngr_ldap.c:175 tools/gpg-connect-agent.c:220 tools/gpgconf.c:151
+#: sm/gpgsm.c:613 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:446
+#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:151
 #: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Segnalare i bug a <@EMAIL@>.\n"
 
-#: agent/gpg-agent.c:560
+#: agent/gpg-agent.c:566
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Utilizzo: @GPG_AGENT@ [opzioni] (-h per assistenza)"
 
-#: agent/gpg-agent.c:562
+#: agent/gpg-agent.c:568
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -615,131 +631,131 @@ msgstr ""
 "Sintassi: @GPG_AGENT@ [opzioni] [comando [args]]\n"
 "Gestione delle chiavi segrete per @GNUPG@\n"
 
-#: agent/gpg-agent.c:607 g10/gpg.c:1337 scd/scdaemon.c:384 sm/gpgsm.c:760
-#: dirmngr/dirmngr.c:522
+#: agent/gpg-agent.c:613 g10/gpg.c:1337 scd/scdaemon.c:384 sm/gpgsm.c:761
+#: dirmngr/dirmngr.c:530
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "'%s' a livello di debug non valido specificato\n"
 
-#: agent/gpg-agent.c:972 g10/gpg.c:3910 g10/gpg.c:3934 sm/gpgsm.c:1769
-#: sm/gpgsm.c:1775
+#: agent/gpg-agent.c:986 g10/gpg.c:3907 g10/gpg.c:3931 sm/gpgsm.c:1622
+#: sm/gpgsm.c:1628
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non è valido\n"
 
-#: agent/gpg-agent.c:1196 agent/gpg-agent.c:2019 common/comopt.c:93
-#: g10/gpg.c:2591 scd/scdaemon.c:549 sm/gpgsm.c:1155 dirmngr/dirmngr.c:989
-#: dirmngr/dirmngr.c:1840
+#: agent/gpg-agent.c:1210 agent/gpg-agent.c:2035 common/comopt.c:93
+#: g10/gpg.c:2594 scd/scdaemon.c:549 sm/gpgsm.c:1028 dirmngr/dirmngr.c:1029
+#: dirmngr/dirmngr.c:1879
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "opzioni di lettura da '%s'\n"
 
-#: agent/gpg-agent.c:1335 g10/gpg.c:3861 scd/scdaemon.c:687 sm/gpgsm.c:1709
-#: dirmngr/dirmngr.c:1108 tools/gpg-connect-agent.c:1270 tools/gpgconf.c:634
+#: agent/gpg-agent.c:1349 g10/gpg.c:3858 scd/scdaemon.c:687 sm/gpgsm.c:1562
+#: dirmngr/dirmngr.c:1145 tools/gpg-connect-agent.c:1270 tools/gpgconf.c:668
 #, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr "Nota: '%s' non è considerato un'opzione\n"
 
-#: agent/gpg-agent.c:2172 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1267
+#: agent/gpg-agent.c:2188 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1306
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "impossibile creare il socket: %s\n"
 
-#: agent/gpg-agent.c:2189 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1280
+#: agent/gpg-agent.c:2205 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1319
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "il nome socket '%s' è troppo lungo\n"
 
-#: agent/gpg-agent.c:2228
+#: agent/gpg-agent.c:2244
 #, 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:2239 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1312
+#: agent/gpg-agent.c:2255 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1351
 #, 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:2244 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1315
+#: agent/gpg-agent.c:2260 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1354
 #, 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:2255 agent/gpg-agent.c:2295 agent/gpg-agent.c:2304
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1324
+#: agent/gpg-agent.c:2271 agent/gpg-agent.c:2311 agent/gpg-agent.c:2320
+#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1363
 #, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "impossibile impostare le autorizzazioni di '%s': %s\n"
 
-#: agent/gpg-agent.c:2269 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1336
+#: agent/gpg-agent.c:2285 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1375
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "ascolto sul socket '%s'\n"
 
-#: agent/gpg-agent.c:2289 agent/gpg-agent.c:2342 common/homedir.c:517
+#: agent/gpg-agent.c:2305 agent/gpg-agent.c:2358 common/homedir.c:537
 #: 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:2292 agent/gpg-agent.c:2347 common/homedir.c:520
+#: agent/gpg-agent.c:2308 agent/gpg-agent.c:2363 common/homedir.c:540
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "directory '%s' creata\n"
 
-#: agent/gpg-agent.c:2353
+#: agent/gpg-agent.c:2369
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "stat() non riuscito per '%s': %s\n"
 
-#: agent/gpg-agent.c:2357
+#: agent/gpg-agent.c:2373
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "impossibile utilizzare '%s' come home directory\n"
 
-#: agent/gpg-agent.c:2512 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2069
+#: agent/gpg-agent.c:2528 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2108
 #, 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:2719
+#: agent/gpg-agent.c:2735
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "gestore 0x%lx per fd %d avviato\n"
 
-#: agent/gpg-agent.c:2724
+#: agent/gpg-agent.c:2740
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "gestore 0x%lx per fd %d terminato\n"
 
-#: agent/gpg-agent.c:2799
+#: agent/gpg-agent.c:2815
 #, 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:2804
+#: agent/gpg-agent.c:2820
 #, 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:3026 scd/scdaemon.c:1374 dirmngr/dirmngr.c:2283
+#: agent/gpg-agent.c:3042 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2322
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "npth_pselect non riuscito: %s - 1s in attesa\n"
 
-#: agent/gpg-agent.c:3114 scd/scdaemon.c:1439
+#: agent/gpg-agent.c:3130 scd/scdaemon.c:1441
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s arrestato\n"
 
-#: agent/gpg-agent.c:3252 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3271 common/simple-pwquery.c:247 g10/call-agent.c:260
 #: sm/call-agent.c:131 tools/gpg-connect-agent.c:2319 tools/card-call-scd.c:311
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "nessun gpg-agent in esecuzione in questa sessione\n"
 
-#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:70
+#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:66
 msgid ""
 "@Options:\n"
 " "
@@ -760,7 +776,7 @@ msgstr ""
 "Manutenzione della cache delle password\n"
 
 #: agent/protect-tool.c:107 g10/gpg.c:448 kbx/kbxutil.c:72 sm/gpgsm.c:215
-#: dirmngr/dirmngr.c:168 tools/gpgconf.c:81
+#: dirmngr/dirmngr.c:169 tools/gpgconf.c:81
 msgid ""
 "@Commands:\n"
 " "
@@ -791,16 +807,16 @@ msgstr ""
 "Sintassi: gpg-protect-tool [opzioni] [args]\n"
 "Strumento di manutenzione della chiave segreta\n"
 
-#: agent/protect-tool.c:707
+#: agent/protect-tool.c:708 sm/import.c:775
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr ""
 "Immettere la passphrase per rimuovere la protezione dell'oggetto PKCS.12."
 
-#: agent/protect-tool.c:712
+#: agent/protect-tool.c:713 sm/export.c:727
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Immettere la passphrase per proteggere il nuovo oggetto PKCS.12."
 
-#: agent/protect-tool.c:718
+#: agent/protect-tool.c:719
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
@@ -808,7 +824,7 @@ msgstr ""
 "Immettere la passphrase per proteggere l'oggetto importato all'interno del "
 "sistema GnuPG."
 
-#: agent/protect-tool.c:723
+#: agent/protect-tool.c:724
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -816,17 +832,17 @@ msgstr ""
 "Inserisci la passphrase o il PIN\n"
 "necessario per completare questa operazione."
 
-#: agent/protect-tool.c:734
+#: agent/protect-tool.c:735
 #, c-format
 msgid "cancelled\n"
 msgstr "annullato\n"
 
-#: agent/protect-tool.c:736
+#: agent/protect-tool.c:737
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "errore durante la richiesta della passphrase: %s\n"
 
-#: agent/trustlist.c:153 agent/trustlist.c:363 tools/gpgconf.c:424
+#: agent/trustlist.c:153 agent/trustlist.c:363 tools/gpgconf.c:458
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "errore durante l'apertura di '%s': %s\n"
@@ -991,7 +1007,7 @@ msgstr "controllo della firma creata fallito: %s\n"
 msgid "secret key parts are not available\n"
 msgstr "parti della chiave segreta non sono disponibili\n"
 
-#: agent/cvt-openpgp.c:343 g10/card-util.c:1562
+#: agent/cvt-openpgp.c:343 g10/card-util.c:1575
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr "l'algoritmo a chiave pubblica %d (%s) non è supportato\n"
@@ -1020,7 +1036,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:505 common/exechelp-posix.c:580
-#: common/exechelp-posix.c:866 dirmngr/dirmngr.c:1354
+#: common/exechelp-posix.c:866 dirmngr/dirmngr.c:1393
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "errore durante il processo di forking: %s\n"
@@ -1092,7 +1108,7 @@ msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "ridenominazione di '%s' in '%s' non riuscita: %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3082
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3099
 msgid "yes"
 msgstr "sì"
 
@@ -1147,7 +1163,7 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr "fuori dal core durante l'allocazione di %lu byte"
 
-#: common/miscellaneous.c:115 g10/card-util.c:917 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:927 tools/no-libgcrypt.c:30
 #: tools/gpg-card.c:416
 #, c-format
 msgid "error allocating enough memory: %s\n"
@@ -1218,7 +1234,7 @@ msgstr "errore durante il recupero della versione da '%s': %s\n"
 msgid "server '%s' is older than us (%s < %s)"
 msgstr "il server '%s' è precedente a noi (%s < %s)"
 
-#: common/asshelp.c:737 g10/call-dirmngr.c:408
+#: common/asshelp.c:737 g10/call-dirmngr.c:407
 #, c-format
 msgid "WARNING: %s\n"
 msgstr "AVVISO: %s\n"
@@ -1303,7 +1319,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:4212
+#: scd/app-openpgp.c:4214
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "algoritmo non supportato: %s"
@@ -1378,11 +1394,11 @@ msgstr "Catena di certificati valida"
 msgid "Root certificate trustworthy"
 msgstr "Certificato radice attendibile"
 
-#: common/audit.c:1112 sm/certchain.c:1242
+#: common/audit.c:1112 sm/certchain.c:1243
 msgid "no CRL found for certificate"
 msgstr "nessun CRL trovato per il certificato"
 
-#: common/audit.c:1115 sm/certchain.c:1252
+#: common/audit.c:1115 sm/certchain.c:1253
 msgid "the available CRL is too old"
 msgstr "il CRL disponibile è troppo vecchio"
 
@@ -1428,24 +1444,24 @@ msgstr "[nessuno]"
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "carattere radix64 non valido %02x ignorato\n"
 
-#: common/ttyio.c:433
+#: common/ttyio.c:447
 #, c-format
 msgid "Sorry, we are in batchmode - can't get input\n"
 msgstr "Siamo in modalità batch- non è possibile ottenere l'input\n"
 
-#: common/ttyio.c:439
+#: common/ttyio.c:453
 #, c-format
 msgid "Sorry, no terminal at all requested - can't get input\n"
 msgstr ""
 "Siamo spiacenti, nessun terminale richiesto - non è possibile ottenere "
 "l'input\n"
 
-#: common/ttyio.c:474 common/ttyio.c:484
+#: common/ttyio.c:488 common/ttyio.c:498
 #, c-format
 msgid "too many errors; giving up\n"
 msgstr "troppi errori; rinunciando\n"
 
-#: common/ttyio.c:536
+#: common/ttyio.c:550
 #, c-format
 msgid "Control-D detected\n"
 msgstr "Controllo-D rilevato\n"
@@ -1499,8 +1515,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:1036 dirmngr/dirmngr.c:895
-#: dirmngr/dirmngr.c:904
+#: common/init.c:191 sm/gpgsm.c:909 dirmngr/dirmngr.c:935 dirmngr/dirmngr.c:944
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s è troppo vecchio (è necessario %s, con %s)\n"
@@ -1653,7 +1668,7 @@ msgid "Enter passphrase: "
 msgstr "Inserisci la passphrase: "
 
 #: g10/call-agent.c:318 g10/encrypt.c:282 g10/encrypt.c:818 g10/sign.c:473
-#: sm/call-agent.c:180 sm/encrypt.c:701 sm/sign.c:436
+#: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
 #, c-format
 msgid "%s is not compliant with %s mode\n"
 msgstr "%s non è conforme alla modalità %s\n"
@@ -1663,215 +1678,215 @@ msgstr "%s non è conforme alla modalità %s\n"
 msgid "error from TPM: %s\n"
 msgstr "errore da TPM: %s\n"
 
-#: g10/call-agent.c:2123 g10/passphrase.c:225 g10/passphrase.c:258
-#: tools/card-call-scd.c:1751
+#: g10/call-agent.c:2135 g10/passphrase.c:233 g10/passphrase.c:266
+#: tools/card-call-scd.c:1755
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problema con l'agente: %s\n"
 
-#: g10/call-dirmngr.c:179 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2316
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2316
 #, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "nessun dirmngr in esecuzione in questa sessione\n"
 
-#: g10/call-dirmngr.c:213
+#: g10/call-dirmngr.c:212
 #, c-format
 msgid "keyserver option \"honor-keyserver-url\" may not be used in Tor mode\n"
 msgstr ""
 "l'opzione keyserver \"honor-keyserver-url\" non può essere utilizzata in "
 "modalità Tor\n"
 
-#: g10/call-dirmngr.c:386
+#: g10/call-dirmngr.c:385
 msgid "WKD uses a cached result"
 msgstr "WKD utilizza un risultato memorizzato nella cache"
 
-#: g10/call-dirmngr.c:389
+#: g10/call-dirmngr.c:388
 msgid "Tor is not running"
 msgstr "Tor non è in esecuzione"
 
-#: g10/call-dirmngr.c:391
+#: g10/call-dirmngr.c:390
 msgid "Tor is not properly configured"
 msgstr "Tor non è configurato correttamente"
 
-#: g10/call-dirmngr.c:393
+#: g10/call-dirmngr.c:392
 msgid "DNS is not properly configured"
 msgstr "DNS non è configurato correttamente"
 
-#: g10/call-dirmngr.c:395
+#: g10/call-dirmngr.c:394
 msgid "unacceptable HTTP redirect from server"
 msgstr "reindirizzamento HTTP inaccettabile dal server"
 
-#: g10/call-dirmngr.c:397
+#: g10/call-dirmngr.c:396
 msgid "unacceptable HTTP redirect from server was cleaned up"
 msgstr "il reindirizzamento HTTP dal server è stato pulito"
 
-#: g10/call-dirmngr.c:399
+#: g10/call-dirmngr.c:398
 msgid "server uses an invalid certificate"
 msgstr "server utilizza un certificato non valido"
 
-#: g10/call-dirmngr.c:406 g10/gpg.c:4599
+#: g10/call-dirmngr.c:405 g10/gpg.c:4596
 #, c-format
 msgid "Note: %s\n"
 msgstr "Nota: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:369 g10/card-util.c:1924
-#: tools/gpg-card.c:3039
+#: g10/card-util.c:86 g10/card-util.c:374 g10/card-util.c:1937
+#: tools/gpg-card.c:3056
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "Scheda OpenPGP non disponibile: %s\n"
 
-#: g10/card-util.c:91 g10/card-util.c:1930
+#: g10/card-util.c:91 g10/card-util.c:1943
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "Scheda OpenPGP n. %s rilevata\n"
 
-#: g10/card-util.c:97 g10/card-util.c:2309 g10/delkey.c:164 g10/keyedit.c:1428
-#: g10/keygen.c:4791 g10/revoke.c:214 g10/revoke.c:638
+#: g10/card-util.c:97 g10/card-util.c:2322 g10/delkey.c:164 g10/keyedit.c:1428
+#: g10/keygen.c:4795 g10/revoke.c:214 g10/revoke.c:639
 #, c-format
 msgid "can't do this in batch mode\n"
 msgstr "impossibile eseguire questa operazione in modalità batch\n"
 
-#: g10/card-util.c:105 tools/gpg-card.c:2943
+#: g10/card-util.c:105 tools/gpg-card.c:2960
 #, c-format
 msgid "This command is only available for version 2 cards\n"
 msgstr "Questo comando è disponibile solo per le schede della versione 2\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3398 tools/gpg-card.c:2948
+#: g10/card-util.c:107 scd/app-openpgp.c:3399 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"
 
-#: g10/card-util.c:140 g10/card-util.c:1448 g10/card-util.c:1710
-#: g10/card-util.c:1802 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1991 g10/keygen.c:2165 g10/keygen.c:2385 g10/keygen.c:2685
+#: g10/card-util.c:140 g10/card-util.c:1458 g10/card-util.c:1723
+#: g10/card-util.c:1815 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/keygen.c:1992 g10/keygen.c:2166 g10/keygen.c:2386 g10/keygen.c:2686
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
 #: tools/gpg-card.c:510
 msgid "Your selection? "
 msgstr "Cosa scegli? "
 
-#: g10/card-util.c:262 g10/card-util.c:313 tools/gpg-card.c:596
+#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:596
 #: tools/gpg-card.c:636
 msgid "[not set]"
 msgstr "[non impostato]"
 
-#: g10/card-util.c:558 tools/gpg-card.c:903
+#: g10/card-util.c:563 tools/gpg-card.c:905
 msgid "Mr."
 msgstr "Sig."
 
-#: g10/card-util.c:559 tools/gpg-card.c:904
+#: g10/card-util.c:564 tools/gpg-card.c:906
 msgid "Ms."
 msgstr "Sig.ra."
 
-#: g10/card-util.c:586 tools/gpg-card.c:931
+#: g10/card-util.c:591 tools/gpg-card.c:933
 msgid "not forced"
 msgstr "non forzato"
 
-#: g10/card-util.c:586 tools/gpg-card.c:931
+#: g10/card-util.c:591 tools/gpg-card.c:933
 msgid "forced"
 msgstr "costretto"
 
-#: g10/card-util.c:768 tools/gpg-card.c:1468
+#: g10/card-util.c:773 tools/gpg-card.c:1484
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Errore: al momento è consentito solo ASCII semplice.\n"
 
-#: g10/card-util.c:770 tools/gpg-card.c:1470
+#: g10/card-util.c:775 tools/gpg-card.c:1486
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Errore: il carattere \"<\" non può essere utilizzato.\n"
 
-#: g10/card-util.c:772 tools/gpg-card.c:1472
+#: g10/card-util.c:777 tools/gpg-card.c:1488
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Errore: gli spazi doppi non sono consentiti.\n"
 
-#: g10/card-util.c:789 tools/gpg-card.c:1505
+#: g10/card-util.c:795 tools/gpg-card.c:1521
 msgid "Cardholder's surname: "
 msgstr "Cognome del titolare della carta: "
 
-#: g10/card-util.c:791 tools/gpg-card.c:1506
+#: g10/card-util.c:797 tools/gpg-card.c:1522
 msgid "Cardholder's given name: "
 msgstr "Nome del titolare della carta: "
 
-#: g10/card-util.c:809 tools/gpg-card.c:1523
+#: g10/card-util.c:816 tools/gpg-card.c:1539
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Errore: nome combinato troppo lungo (limite è di %d caratteri).\n"
 
-#: g10/card-util.c:830 tools/gpg-card.c:1561
+#: g10/card-util.c:840 tools/gpg-card.c:1577
 msgid "URL to retrieve public key: "
 msgstr "URL per recuperare la chiave pubblica: "
 
-#: g10/card-util.c:926 g10/decrypt-data.c:495 g10/import.c:406 g10/import.c:756
-#: g10/import.c:815 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1666
-#: tools/gpgconf.c:437 tools/gpgconf.c:483 tools/gpg-card.c:426
+#: g10/card-util.c:936 g10/decrypt-data.c:495 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:1705
+#: tools/gpgconf.c:471 tools/gpgconf.c:517 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:959 g10/decrypt-data.c:498 g10/export.c:2496
+#: g10/card-util.c:969 g10/decrypt-data.c:498 g10/export.c:2496
 #: dirmngr/crlcache.c:925 tools/gpg-card.c:486 tools/gpg-card.c:493
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr "errore durante la scrittura di '%s': %s\n"
 
-#: g10/card-util.c:986 tools/gpg-card.c:1650
+#: g10/card-util.c:996 tools/gpg-card.c:1666
 msgid "Login data (account name): "
 msgstr "Dati di accesso (nome account): "
 
-#: g10/card-util.c:1024 tools/gpg-card.c:1945
+#: g10/card-util.c:1034 tools/gpg-card.c:1962
 msgid "Private DO data: "
 msgstr "Dati DO privati: "
 
-#: g10/card-util.c:1109 tools/gpg-card.c:1699
+#: g10/card-util.c:1119 tools/gpg-card.c:1715
 msgid "Language preferences: "
 msgstr "Preferenze lingua: "
 
-#: g10/card-util.c:1117 tools/gpg-card.c:1710
+#: g10/card-util.c:1127 tools/gpg-card.c:1726
 #, c-format
 msgid "Error: invalid length of preference string.\n"
 msgstr "Errore: lunghezza della stringa di preferenza non valida.\n"
 
-#: g10/card-util.c:1126 tools/gpg-card.c:1719
+#: g10/card-util.c:1136 tools/gpg-card.c:1735
 #, c-format
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Errore: caratteri non validi nella stringa di preferenza.\n"
 
-#: g10/card-util.c:1148 tools/gpg-card.c:1753
+#: g10/card-util.c:1158 tools/gpg-card.c:1769
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr "Salutazione (M - Mr., F - Ms., o spazio): "
 
-#: g10/card-util.c:1162 tools/gpg-card.c:1770
+#: g10/card-util.c:1172 tools/gpg-card.c:1786
 msgid "Error: invalid response.\n"
 msgstr "|FPR|Risposta OCSP firmata da FPR\n"
 
-#: g10/card-util.c:1185 tools/gpg-card.c:1835
+#: g10/card-util.c:1195 tools/gpg-card.c:1852
 msgid "CA fingerprint: "
 msgstr "Impronta digitale CA: "
 
-#: g10/card-util.c:1209 tools/gpg-card.c:1861
+#: g10/card-util.c:1219 tools/gpg-card.c:1878
 #, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Errore: impronta digitale formattata non valida.\n"
 
-#: g10/card-util.c:1259
+#: g10/card-util.c:1269
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "operazione chiave non possibile: %s\n"
 
-#: g10/card-util.c:1260
+#: g10/card-util.c:1270
 msgid "not an OpenPGP card"
 msgstr "non una scheda OpenPGP"
 
-#: g10/card-util.c:1273 g10/keygen.c:4811 g10/keygen.c:5972
+#: g10/card-util.c:1283 g10/keygen.c:4815 g10/keygen.c:6003
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr ""
 "errore durante il recupero delle informazioni sulla chiave corrente: %s\n"
 
-#: g10/card-util.c:1358
+#: g10/card-util.c:1368
 msgid "Replace existing key? (y/N) "
 msgstr "Sostituire la chiave esistente? (y/N) "
 
-#: g10/card-util.c:1375 tools/gpg-card.c:3328
+#: g10/card-util.c:1385 tools/gpg-card.c:3345
 msgid ""
 "Note: There is no guarantee that the card supports the requested\n"
 "      key type or size.  If the key generation does not succeed,\n"
@@ -1884,104 +1899,104 @@ msgstr ""
 "      Controllare la documentazione della scheda per vedere quale\n"
 "      sono supportati i tipi e le dimensioni chiave.\n"
 
-#: g10/card-util.c:1396 g10/keygen.c:2570 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1406 g10/keygen.c:2571 sm/certreqgen-ui.c:180
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Che chiave vuoi? (%u) "
 
-#: g10/card-util.c:1406 g10/keygen.c:2493 g10/keygen.c:2525
+#: g10/card-util.c:1416 g10/keygen.c:2494 g10/keygen.c:2526
 #: sm/certreqgen-ui.c:195
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrotondate a %u bit\n"
 
-#: g10/card-util.c:1414 g10/keygen.c:2578 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1424 g10/keygen.c:2579 sm/certreqgen-ui.c:185
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s keysizes deve essere compreso nell'intervallo %u-%u\n"
 
-#: g10/card-util.c:1433
+#: g10/card-util.c:1443
 msgid "Changing card key attribute for: "
 msgstr "Modifica dell'attributo chiave della scheda per: "
 
-#: g10/card-util.c:1435
+#: g10/card-util.c:1445
 msgid "Signature key\n"
 msgstr "Chiave di firma\n"
 
-#: g10/card-util.c:1437
+#: g10/card-util.c:1447
 msgid "Encryption key\n"
 msgstr "Chiave di crittografia\n"
 
-#: g10/card-util.c:1439
+#: g10/card-util.c:1449
 msgid "Authentication key\n"
 msgstr "Chiave di autenticazione\n"
 
-#: g10/card-util.c:1441 g10/keygen.c:2112 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1451 g10/keygen.c:2113 sm/certreqgen-ui.c:158
 msgid "Please select what kind of key you want:\n"
 msgstr "Per favore scegli che tipo di chiave vuoi:\n"
 
-#: g10/card-util.c:1442 sm/certreqgen-ui.c:159
+#: g10/card-util.c:1452 sm/certreqgen-ui.c:159
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1443
+#: g10/card-util.c:1453
 #, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) ECC\n"
 
-#: g10/card-util.c:1455 g10/card-util.c:1722 g10/card-util.c:1822
-#: g10/keyedit.c:900 g10/keygen.c:2017 g10/keygen.c:2045 g10/keygen.c:2172
-#: g10/keygen.c:2425 g10/keygen.c:2713 g10/revoke.c:836
+#: g10/card-util.c:1468 g10/card-util.c:1735 g10/card-util.c:1835
+#: g10/keyedit.c:900 g10/keygen.c:2018 g10/keygen.c:2046 g10/keygen.c:2173
+#: g10/keygen.c:2426 g10/keygen.c:2714 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Scelta non valida.\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1541
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 "La scheda verrà ora configurata nuovamente per generare una chiave di %u "
 "bit\n"
 
-#: g10/card-util.c:1533
+#: g10/card-util.c:1546
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr ""
 "La scheda verrà ora configurata nuovamente per generare una chiave di tipo: "
 "%s\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1582
 #, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr ""
 "errore durante la modifica dell'attributo chiave per la chiave %d: %s\n"
 
-#: g10/card-util.c:1585 g10/card-util.c:2106 g10/card-util.c:2162
+#: g10/card-util.c:1598 g10/card-util.c:2119 g10/card-util.c:2175
 #, c-format
 msgid "error getting card info: %s\n"
 msgstr "errore durante il recupero delle informazioni sulla scheda: %s\n"
 
-#: g10/card-util.c:1591 g10/card-util.c:1936 g10/card-util.c:2112
-#: g10/card-util.c:2171 tools/gpg-card.c:3057 tools/gpg-card.c:3296
-#: tools/gpg-card.c:3354
+#: g10/card-util.c:1604 g10/card-util.c:1949 g10/card-util.c:2125
+#: g10/card-util.c:2184 tools/gpg-card.c:3074 tools/gpg-card.c:3313
+#: tools/gpg-card.c:3371
 #, c-format
 msgid "This command is not supported by this card\n"
 msgstr "Questo comando non è supportato da questa scheda\n"
 
-#: g10/card-util.c:1637 tools/gpg-card.c:2426
+#: g10/card-util.c:1650 tools/gpg-card.c:2443
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Eseguire il backup off-card della chiave di crittografia? (Y/n) "
 
-#: g10/card-util.c:1651
+#: g10/card-util.c:1664
 #, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "Nota: le chiavi sono già memorizzate sulla scheda!\n"
 
-#: g10/card-util.c:1654 tools/gpg-card.c:2398
+#: g10/card-util.c:1667 tools/gpg-card.c:2415
 msgid "Replace existing keys? (y/N) "
 msgstr "Sostituire le chiavi esistenti? (y/N) "
 
-#: g10/card-util.c:1666 tools/gpg-card.c:2457
+#: g10/card-util.c:1679 tools/gpg-card.c:2474
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1992,153 +2007,153 @@ msgstr ""
 "   PIN : '%s'     PIN di amministrazione = '%s'\n"
 "È necessario modificarli utilizzando il comando --change-pin\n"
 
-#: g10/card-util.c:1701
+#: g10/card-util.c:1714
 msgid "Please select the type of key to generate:\n"
 msgstr "Selezionare il tipo di chiave da generare:\n"
 
-#: g10/card-util.c:1703 g10/card-util.c:1793
+#: g10/card-util.c:1716 g10/card-util.c:1806
 msgid "   (1) Signature key\n"
 msgstr "   (1) Chiave di firma\n"
 
-#: g10/card-util.c:1704 g10/card-util.c:1795
+#: g10/card-util.c:1717 g10/card-util.c:1808
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Chiave di crittografia\n"
 
-#: g10/card-util.c:1705 g10/card-util.c:1797
+#: g10/card-util.c:1718 g10/card-util.c:1810
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Chiave di autenticazione\n"
 
-#: g10/card-util.c:1790
+#: g10/card-util.c:1803
 msgid "Please select where to store the key:\n"
 msgstr "Si prega di selezionare dove memorizzare la chiave:\n"
 
-#: g10/card-util.c:1836
+#: g10/card-util.c:1849
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "KEYTOCARD non riuscito: %s\n"
 
-#: g10/card-util.c:1941 tools/gpg-card.c:3065
+#: g10/card-util.c:1954 tools/gpg-card.c:3082
 #, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr ""
 "Nota: Questo comando distrugge tutti i tasti memorizzati sulla scheda!\n"
 
-#: g10/card-util.c:1944 tools/gpg-card.c:3068 tools/gpg-card.c:3409
+#: g10/card-util.c:1957 tools/gpg-card.c:3085 tools/gpg-card.c:3426
 msgid "Continue? (y/N) "
 msgstr "Continuare? (Y/n) "
 
-#: g10/card-util.c:1949 tools/gpg-card.c:3079
+#: g10/card-util.c:1962 tools/gpg-card.c:3096
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr "Fare davvero un reset di fabbrica? (immettere \"sì\") "
 
-#: g10/card-util.c:2142
+#: g10/card-util.c:2155
 #, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "errore per l'installazione KDF: %s\n"
 
-#: g10/card-util.c:2188
+#: g10/card-util.c:2201
 #, c-format
 msgid "error for setup UIF: %s\n"
 msgstr "errore per l'installazione UIF: %s\n"
 
-#: g10/card-util.c:2212 g10/keyedit.c:1263 tools/gpg-card.c:3649
+#: g10/card-util.c:2225 g10/keyedit.c:1263 tools/gpg-card.c:3666
 msgid "quit this menu"
 msgstr "abbandona questo menù"
 
-#: g10/card-util.c:2214
+#: g10/card-util.c:2227
 msgid "show admin commands"
 msgstr "mostra comandi di amministrazione"
 
-#: g10/card-util.c:2215 g10/keyedit.c:1266 tools/gpg-card.c:3652
+#: g10/card-util.c:2228 g10/keyedit.c:1266 tools/gpg-card.c:3669
 msgid "show this help"
 msgstr "mostra questo aiuto"
 
-#: g10/card-util.c:2217 tools/gpg-card.c:3654
+#: g10/card-util.c:2230 tools/gpg-card.c:3671
 msgid "list all available data"
 msgstr "elencare tutti i dati disponibili"
 
-#: g10/card-util.c:2220 tools/gpg-card.c:3656
+#: g10/card-util.c:2233 tools/gpg-card.c:3673
 msgid "change card holder's name"
 msgstr "cambiare il nome del titolare della carta"
 
-#: g10/card-util.c:2221 tools/gpg-card.c:3657
+#: g10/card-util.c:2234 tools/gpg-card.c:3674
 msgid "change URL to retrieve key"
 msgstr "modificare l'URL per recuperare la chiave"
 
-#: g10/card-util.c:2222 tools/gpg-card.c:3658
+#: g10/card-util.c:2235 tools/gpg-card.c:3675
 msgid "fetch the key specified in the card URL"
 msgstr "recuperare la chiave specificata nell'URL della scheda"
 
-#: g10/card-util.c:2223 tools/gpg-card.c:3659
+#: g10/card-util.c:2236 tools/gpg-card.c:3676
 msgid "change the login name"
 msgstr "modificare il nome di accesso"
 
-#: g10/card-util.c:2224 tools/gpg-card.c:3660
+#: g10/card-util.c:2237 tools/gpg-card.c:3677
 msgid "change the language preferences"
 msgstr "modificare le preferenze della lingua"
 
-#: g10/card-util.c:2225 tools/gpg-card.c:3661
+#: g10/card-util.c:2238 tools/gpg-card.c:3678
 msgid "change card holder's salutation"
 msgstr "cambiare il saluto del titolare della carta"
 
-#: g10/card-util.c:2227 tools/gpg-card.c:3663
+#: g10/card-util.c:2240 tools/gpg-card.c:3680
 msgid "change a CA fingerprint"
 msgstr "modificare un'impronta digitale CA"
 
-#: g10/card-util.c:2228 tools/gpg-card.c:3664
+#: g10/card-util.c:2241 tools/gpg-card.c:3681
 msgid "toggle the signature force PIN flag"
 msgstr "attivare/disattivare il flag PIN di forza della firma"
 
-#: g10/card-util.c:2229 tools/gpg-card.c:3665
+#: g10/card-util.c:2242 tools/gpg-card.c:3682
 msgid "generate new keys"
 msgstr "genera nuove chiavi"
 
-#: g10/card-util.c:2230 tools/gpg-card.c:3666
+#: g10/card-util.c:2243 tools/gpg-card.c:3683
 msgid "menu to change or unblock the PIN"
 msgstr "per modificare o sbloccare il PIN"
 
-#: g10/card-util.c:2231 tools/gpg-card.c:3667
+#: g10/card-util.c:2244 tools/gpg-card.c:3684
 msgid "verify the PIN and list all data"
 msgstr "verificare il PIN ed elencare tutti i dati"
 
-#: g10/card-util.c:2232 tools/gpg-card.c:3668
+#: g10/card-util.c:2245 tools/gpg-card.c:3685
 msgid "unblock the PIN using a Reset Code"
 msgstr "sbloccare il PIN utilizzando un codice di ripristino"
 
-#: g10/card-util.c:2233 tools/gpg-card.c:3672
+#: g10/card-util.c:2246 tools/gpg-card.c:3689
 msgid "destroy all keys and data"
 msgstr "distruggere tutte le chiavi e i dati"
 
-#: g10/card-util.c:2235
+#: g10/card-util.c:2248
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr "installazione KDF per l'autenticazione PIN (on/single/off)"
 
-#: g10/card-util.c:2236
+#: g10/card-util.c:2249
 msgid "change the key attribute"
 msgstr "modificare l'attributo chiave"
 
-#: g10/card-util.c:2237 tools/gpg-card.c:3674
+#: g10/card-util.c:2250 tools/gpg-card.c:3691
 msgid "change the User Interaction Flag"
 msgstr "modificare il contrassegno interazione utente"
 
-#: g10/card-util.c:2361 tools/gpg-card.c:3924
+#: g10/card-util.c:2374 tools/gpg-card.c:3941
 msgid "gpg/card> "
 msgstr "gpg/card> "
 
-#: g10/card-util.c:2402
+#: g10/card-util.c:2415
 msgid "Admin-only command\n"
 msgstr "Comando solo amministratore\n"
 
-#: g10/card-util.c:2433
+#: g10/card-util.c:2446
 msgid "Admin commands are allowed\n"
 msgstr "I comandi di amministrazione sono consentiti\n"
 
-#: g10/card-util.c:2435
+#: g10/card-util.c:2448
 msgid "Admin commands are not allowed\n"
 msgstr "I comandi di amministrazione non sono consentiti\n"
 
-#: g10/card-util.c:2546 g10/keyedit.c:2275 tools/gpg-card.c:3814
-#: tools/gpg-card.c:4072
+#: g10/card-util.c:2559 g10/keyedit.c:2275 tools/gpg-card.c:3831
+#: tools/gpg-card.c:4089
 #, c-format
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando non valido  (prova \"help\")\n"
@@ -2148,22 +2163,22 @@ msgstr "Comando non valido  (prova \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output non funziona con questo comando\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5293 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5292 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:1934 g10/export.c:2342 g10/export.c:2463
-#: g10/getkey.c:1907 g10/gpg.c:5238 g10/keyedit.c:1450 g10/keyedit.c:2382
-#: g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:703 g10/keyserver.c:1240
-#: g10/revoke.c:230 g10/tofu.c:2168
+#: g10/getkey.c:2032 g10/gpg.c:5237 g10/keyedit.c:1450 g10/keyedit.c:2382
+#: g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:703 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:2002 g10/getkey.c:1915 g10/getkey.c:4330
-#: g10/gpg.c:5247 g10/keyedit.c:2354 g10/keyserver.c:1258 g10/revoke.c:236
-#: g10/revoke.c:665 g10/tofu.c:2176
+#: g10/delkey.c:90 g10/export.c:2002 g10/getkey.c:2040 g10/getkey.c:4455
+#: g10/gpg.c:5246 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"
 msgstr "errore leggendo il keyblock: %s\n"
@@ -2289,15 +2304,15 @@ msgstr ""
 msgid "(use option \"%s\" to override)\n"
 msgstr "(utilizzare l'opzione \"%s\" per ignorare)\n"
 
-#: g10/encrypt.c:555 g10/encrypt.c:808 g10/decrypt-data.c:261 g10/gpg.c:4083
-#: g10/gpg.c:4130 sm/decrypt.c:742 sm/encrypt.c:691 sm/gpgsm.c:1793
+#: g10/encrypt.c:555 g10/encrypt.c:808 g10/decrypt-data.c:261 g10/gpg.c:4080
+#: g10/gpg.c:4127 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1646
 #, 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:564 g10/gpg.c:4095 g10/gpg.c:4142 g10/sig-check.c:155
-#: g10/sign.c:452 sm/gpgsm.c:1803 sm/gpgsm.c:1813 sm/sign.c:596 sm/verify.c:510
+#: g10/encrypt.c:564 g10/gpg.c:4092 g10/gpg.c:4139 g10/sig-check.c:155
+#: g10/sign.c:452 sm/gpgsm.c:1656 sm/gpgsm.c:1666 sm/sign.c:596 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"
@@ -2315,7 +2330,7 @@ msgstr ""
 "AVVISO: l'imposizione della crittografia simmetrica %s (%d) viola le "
 "preferenze del destinatario\n"
 
-#: g10/encrypt.c:838 sm/encrypt.c:766
+#: g10/encrypt.c:838 sm/encrypt.c:767
 #, c-format
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "AVVISO: la chiave %s non è adatta per la crittografia in modalità %s\n"
@@ -2346,7 +2361,7 @@ msgstr "%s/%s.%s è crittografato per: \"%s\"\n"
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "l'opzione '%s' non può essere utilizzata in modalità %s\n"
 
-#: g10/decrypt-data.c:239 g10/mainproc.c:380 sm/decrypt.c:494
+#: g10/decrypt-data.c:239 g10/mainproc.c:380 sm/decrypt.c:892
 #, c-format
 msgid "%s.%s encrypted data\n"
 msgstr "%s.%s dati crittografati della commissione\n"
@@ -2356,7 +2371,7 @@ msgstr "%s.%s dati crittografati della commissione\n"
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrato con l'algoritmo sconosciuto %d\n"
 
-#: g10/decrypt-data.c:361 g10/decrypt-data.c:414 sm/decrypt.c:508
+#: g10/decrypt-data.c:361 g10/decrypt-data.c:414 sm/decrypt.c:906
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2397,7 +2412,7 @@ msgstr "utilizzare il formato di backup della chiave GnuPG"
 msgid " - skipped"
 msgstr " - saltato"
 
-#: g10/export.c:1333 g10/import.c:2124 g10/openfile.c:202 g10/openfile.c:296
+#: g10/export.c:1333 g10/import.c:2132 g10/openfile.c:202 g10/openfile.c:296
 #: g10/sign.c:1110 g10/sign.c:1447
 #, c-format
 msgid "writing to '%s'\n"
@@ -2433,62 +2448,62 @@ msgstr "errore durante la creazione di '%s': %s\n"
 msgid "[User ID not found]"
 msgstr "[ID utente non trovato]"
 
-#: g10/getkey.c:1199
+#: g10/getkey.c:1324
 #, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "recuperato automaticamente '%s' tramite %s\n"
 
-#: g10/getkey.c:1205
+#: g10/getkey.c:1330
 #, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "errore durante il recupero di '%s' tramite %s: %s\n"
 
-#: g10/getkey.c:1207
+#: g10/getkey.c:1332
 msgid "No fingerprint"
 msgstr "Nessuna impronta digitale"
 
-#: g10/getkey.c:1449
+#: g10/getkey.c:1574
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 "verifica della presenza di una nuova copia di una chiave scaduta tramite %s\n"
 
-#: g10/getkey.c:1884 g10/revoke.c:657 g10/revoke.c:718
+#: g10/getkey.c:2009 g10/revoke.c:658 g10/revoke.c:719
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "chiave segreta \"%s\" non trovata: %s\n"
 
-#: g10/getkey.c:1887 g10/pkclist.c:1012
+#: g10/getkey.c:2012 g10/pkclist.c:1012
 #, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "(controllare l'argomento dell'opzione '%s')\n"
 
-#: g10/getkey.c:1965
+#: g10/getkey.c:2090
 #, c-format
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "Avviso: impossibile utilizzare '%s' come chiave predefinita: %s\n"
 
-#: g10/getkey.c:1973
+#: g10/getkey.c:2098
 #, c-format
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "utilizzo di \"%s\" come chiave segreta predefinita per la firma\n"
 
-#: g10/getkey.c:1980
+#: g10/getkey.c:2105
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr "tutti i valori passati a '%s' ignorati\n"
 
-#: g10/getkey.c:2837
+#: g10/getkey.c:2962
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Chiave non valida %s resa valida da --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:3703
+#: g10/getkey.c:3828
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "utilizzando la sottochiave %s anziché la chiave primaria %s\n"
 
-#: g10/getkey.c:4259 g10/gpg.c:2167
+#: g10/getkey.c:4384 g10/gpg.c:2168
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "valori validi per l'opzione '%s':\n"
@@ -2673,7 +2688,7 @@ msgstr "|SPEC|configurare gli alias di posta elettronica"
 msgid "use strict OpenPGP behavior"
 msgstr "utilizzare un comportamento OpenPGP rigoroso"
 
-#: g10/gpg.c:651 kbx/kbxutil.c:91 sm/gpgsm.c:424 tools/gpgconf.c:113
+#: g10/gpg.c:651 kbx/kbxutil.c:91 sm/gpgsm.c:425 tools/gpgconf.c:113
 msgid "do not make any changes"
 msgstr "non fa cambiamenti"
 
@@ -2705,7 +2720,7 @@ msgstr "usa il modo testo canonico"
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|Impostare il livello di compressione su N (0 disabilita)"
 
-#: g10/gpg.c:762 sm/gpgsm.c:357
+#: g10/gpg.c:762 sm/gpgsm.c:358
 msgid "Options controlling key import and export"
 msgstr "Opzioni che controllano l'importazione e l'esportazione delle chiavi"
 
@@ -2723,11 +2738,11 @@ msgstr "importare la chiave mancante da una firma"
 msgid "include the public key in signatures"
 msgstr "includere la chiave pubblica nelle firme"
 
-#: g10/gpg.c:776 sm/gpgsm.c:360
+#: g10/gpg.c:776 sm/gpgsm.c:361
 msgid "disable all access to the dirmngr"
 msgstr "disabilitare tutti gli accessi al dirmngr"
 
-#: g10/gpg.c:788 sm/gpgsm.c:367
+#: g10/gpg.c:788 sm/gpgsm.c:368
 msgid "Options controlling key listings"
 msgstr "Opzioni di controllo delle inserzioni chiave"
 
@@ -2743,15 +2758,15 @@ msgstr "|USER-ID|encrypt per USER-ID"
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|USER-ID|utilizzare USER-ID per firmare o decrittografare"
 
-#: g10/gpg.c:876 sm/gpgsm.c:408
+#: g10/gpg.c:876 sm/gpgsm.c:409
 msgid "Options for unattended use"
 msgstr "Opzioni per l'uso automatico"
 
-#: g10/gpg.c:895 sm/gpgsm.c:420 dirmngr/dirmngr.c:286
+#: g10/gpg.c:895 sm/gpgsm.c:421 dirmngr/dirmngr.c:289
 msgid "Other options"
 msgstr "Altre Opzioni"
 
-#: g10/gpg.c:966 sm/gpgsm.c:453
+#: g10/gpg.c:966 sm/gpgsm.c:454
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2793,7 +2808,7 @@ msgstr ""
 "Firmare, controllare, crittografare o decrittografare\n"
 "Il funzionamento predefinito dipende dai dati di input\n"
 
-#: g10/gpg.c:1168 sm/gpgsm.c:636
+#: g10/gpg.c:1168 sm/gpgsm.c:637
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2817,12 +2832,12 @@ msgstr "Hash: "
 msgid "Compression: "
 msgstr "Compressione: "
 
-#: g10/gpg.c:1274 sm/gpgsm.c:710
+#: g10/gpg.c:1274 sm/gpgsm.c:711
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "utilizzo: %s [opzioni] %s\n"
 
-#: g10/gpg.c:1467 sm/gpgsm.c:803
+#: g10/gpg.c:1467 sm/gpgsm.c:804
 #, c-format
 msgid "conflicting commands\n"
 msgstr "comandi in conflitto\n"
@@ -2832,42 +2847,42 @@ msgstr "comandi in conflitto\n"
 msgid "no = sign found in group definition '%s'\n"
 msgstr "nessun segno = trovato nella definizione di gruppo '%s'\n"
 
-#: g10/gpg.c:1683
+#: g10/gpg.c:1684
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "AVVISO: proprietà non sicura su homedir '%s'\n"
 
-#: g10/gpg.c:1686
+#: g10/gpg.c:1687
 #, 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:1689
+#: g10/gpg.c:1690
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "AVVISO: proprietà non sicura nell'estensione '%s'\n"
 
-#: g10/gpg.c:1695
+#: g10/gpg.c:1696
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "AVVISO: proprietà non sicura su homedir '%s'\n"
 
-#: g10/gpg.c:1698
+#: g10/gpg.c:1699
 #, 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:1701
+#: g10/gpg.c:1702
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "AVVISO: autorizzazioni non sicure per l'estensione '%s'\n"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1708
 #, c-format
 msgid "WARNING: unsafe enclosing directory 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 enclosing directory ownership on configuration file '%s'\n"
@@ -2875,21 +2890,21 @@ msgstr ""
 "AVVISO: proprietà della directory di inclusione non sicura nel file di "
 "configurazione '%s'\n"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1714
 #, 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:1719
+#: g10/gpg.c:1720
 #, 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:1722
+#: g10/gpg.c:1723
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@ -2897,475 +2912,475 @@ msgstr ""
 "AVVISO: autorizzazioni della directory di inclusione non sicure nella "
 "directory homedir '%s'\n"
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1726
 #, 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:1941
+#: g10/gpg.c:1942
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "elemento di configurazione sconosciuto '%s'\n"
 
-#: g10/gpg.c:2037
+#: g10/gpg.c:2038
 msgid "display photo IDs during key listings"
 msgstr "visualizzare gli ID foto durante le elenchi dei tasti"
 
-#: g10/gpg.c:2039
+#: g10/gpg.c:2040
 msgid "show key usage information during key listings"
 msgstr ""
 "mostra le informazioni sull'utilizzo delle chiavi durante le inserzioni "
 "chiave"
 
-#: g10/gpg.c:2041
+#: g10/gpg.c:2042
 msgid "show policy URLs during signature listings"
 msgstr "mostra URL dei criteri durante gli elenchi delle firme"
 
-#: g10/gpg.c:2043
+#: g10/gpg.c:2044
 msgid "show all notations during signature listings"
 msgstr "mostra tutte le notazioni durante gli elenchi delle firme"
 
-#: g10/gpg.c:2045
+#: g10/gpg.c:2046
 msgid "show IETF standard notations during signature listings"
 msgstr "mostra notazioni standard IETF durante gli elenchi delle firme"
 
-#: g10/gpg.c:2049
+#: g10/gpg.c:2050
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 "mostra le notazioni fornite dall'utente durante gli elenchi delle firme"
 
-#: g10/gpg.c:2051
+#: g10/gpg.c:2052
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "mostra gli URL preferiti del keyserver durante gli elenchi delle firme"
 
-#: g10/gpg.c:2053
+#: g10/gpg.c:2054
 msgid "show user ID validity during key listings"
 msgstr "mostra validità ID utente durante le inserzioni chiave"
 
-#: g10/gpg.c:2055
+#: g10/gpg.c:2056
 msgid "show revoked and expired user IDs in key listings"
 msgstr "mostra ID utente revocati e scaduti negli elenchi di chiavi"
 
-#: g10/gpg.c:2057
+#: g10/gpg.c:2058
 msgid "show revoked and expired subkeys in key listings"
 msgstr "mostra sottochiavi revocate e scadute negli elenchi di chiavi"
 
-#: g10/gpg.c:2059
+#: g10/gpg.c:2060
 msgid "show the keyring name in key listings"
 msgstr "mostrare il nome del keyring negli elenchi delle chiavi"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2062
 msgid "show expiration dates during signature listings"
 msgstr "mostra date di scadenza durante le inserzioni delle firme"
 
-#: g10/gpg.c:2178
+#: g10/gpg.c:2179
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "criterio TOFU sconosciuto '%s'\n"
 
-#: g10/gpg.c:2180
+#: g10/gpg.c:2181
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(utilizzare \"help\" per elencare le scelte)\n"
 
-#: g10/gpg.c:2975 g10/gpg.c:3828 g10/gpg.c:3840
+#: g10/gpg.c:2978 g10/gpg.c:3825 g10/gpg.c:3837
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "Nota: %s non è per uso normale!\n"
 
-#: g10/gpg.c:3151 g10/gpg.c:3163
+#: g10/gpg.c:3154 g10/gpg.c:3166
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "'%s' non è una scadenza di firma valida\n"
 
-#: g10/gpg.c:3185
+#: g10/gpg.c:3188
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "\"%s\" non è un indirizzo di posta elettronica corretto\n"
 
-#: g10/gpg.c:3217 sm/gpgsm.c:1270
+#: g10/gpg.c:3220 sm/gpgsm.c:1143
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "modalità pinentry non valida '%s'\n"
 
-#: g10/gpg.c:3223 sm/gpgsm.c:1276
+#: g10/gpg.c:3226 sm/gpgsm.c:1149
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "origine richiesta non valida '%s'\n"
 
-#: g10/gpg.c:3280
+#: g10/gpg.c:3283
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "'%s' non è un set di caratteri valido\n"
 
-#: g10/gpg.c:3302 g10/gpg.c:3511 g10/keyedit.c:5319
+#: g10/gpg.c:3305 g10/gpg.c:3514 g10/keyedit.c:5322
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "impossibile analizzare l'URL del server dei chiavi\n"
 
-#: g10/gpg.c:3320
+#: g10/gpg.c:3323
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opzioni keyserver non valide\n"
 
-#: g10/gpg.c:3323
+#: g10/gpg.c:3326
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "opzioni keyserver non valide\n"
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3333
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opzioni di importazione non valide\n"
 
-#: g10/gpg.c:3333
+#: g10/gpg.c:3336
 #, c-format
 msgid "invalid import options\n"
 msgstr "opzioni di importazione non valide\n"
 
-#: g10/gpg.c:3339 g10/gpg.c:3354
+#: g10/gpg.c:3342 g10/gpg.c:3357
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "opzione di filtro non valida: %s\n"
 
-#: g10/gpg.c:3345
+#: g10/gpg.c:3348
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3351
 #, c-format
 msgid "invalid export options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3363
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opzioni di elenco non valide\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3366
 #, c-format
 msgid "invalid list options\n"
 msgstr "opzioni di elenco non valide\n"
 
-#: g10/gpg.c:3371
+#: g10/gpg.c:3374
 msgid "display photo IDs during signature verification"
 msgstr "visualizzare gli ID foto durante la verifica della firma"
 
-#: g10/gpg.c:3373
+#: g10/gpg.c:3376
 msgid "show policy URLs during signature verification"
 msgstr "mostra URL dei criteri durante la verifica della firma"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3378
 msgid "show all notations during signature verification"
 msgstr "mostra tutte le notazioni durante la verifica della firma"
 
-#: g10/gpg.c:3377
+#: g10/gpg.c:3380
 msgid "show IETF standard notations during signature verification"
 msgstr "mostra notazioni standard IETF durante la verifica della firma"
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3384
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 "mostra le notazioni fornite dall'utente durante la verifica della firma"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3386
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "mostra gli URL preferiti del keyserver durante la verifica della firma"
 
-#: g10/gpg.c:3385
+#: g10/gpg.c:3388
 msgid "show user ID validity during signature verification"
 msgstr "mostra validità DELL'ID utente durante la verifica della firma"
 
-#: g10/gpg.c:3387
+#: g10/gpg.c:3390
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "mostra ID utente revocati e scaduti nella verifica della firma"
 
-#: g10/gpg.c:3389
+#: g10/gpg.c:3392
 msgid "show only the primary user ID in signature verification"
 msgstr "mostra solo l'ID utente primario nella verifica della firma"
 
-#: g10/gpg.c:3396
+#: g10/gpg.c:3399
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opzioni di verifica non valide\n"
 
-#: g10/gpg.c:3399
+#: g10/gpg.c:3402
 #, c-format
 msgid "invalid verify options\n"
 msgstr "opzioni di verifica non valide\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3409
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "impossibile impostare exec-path a %s\n"
 
-#: g10/gpg.c:3613
+#: g10/gpg.c:3616
 #, 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:3616
+#: g10/gpg.c:3619
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "elenco di individuazione automatica delle chiavi non valido\n"
 
-#: g10/gpg.c:3625
+#: g10/gpg.c:3628
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "argomento non valido per l'opzione \"%.50s\"\n"
 
-#: g10/gpg.c:3807 sm/gpgsm.c:1675
+#: g10/gpg.c:3804 sm/gpgsm.c:1528
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
 
-#: g10/gpg.c:3821
+#: g10/gpg.c:3818
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENZIONE: %s ha la precedenza su %s\n"
 
-#: g10/gpg.c:3830
+#: g10/gpg.c:3827
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Non è permesso usare %s con %s!\n"
 
-#: g10/gpg.c:3833
+#: g10/gpg.c:3830
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "Non ha senso usare %s con %s!\n"
 
-#: g10/gpg.c:3848 sm/gpgsm.c:1696 dirmngr/dirmngr.c:1123
+#: g10/gpg.c:3845 sm/gpgsm.c:1549 dirmngr/dirmngr.c:1160
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "AVVISO: in esecuzione con l'ora di sistema falso: "
 
-#: g10/gpg.c:3869
+#: g10/gpg.c:3866
 #, 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:3897 g10/gpg.c:3928 sm/gpgsm.c:1763
+#: g10/gpg.c:3894 g10/gpg.c:3925 sm/gpgsm.c:1616
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non è valido\n"
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3901
 #, c-format
 msgid "selected AEAD algorithm is invalid\n"
 msgstr "l'algoritmo AEAD selezionato non è valido\n"
 
-#: g10/gpg.c:3916
+#: g10/gpg.c:3913
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritmo di compressione selezionato non valido\n"
 
-#: g10/gpg.c:3922
+#: g10/gpg.c:3919
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non è valido\n"
 
-#: g10/gpg.c:3937
+#: g10/gpg.c:3934
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve essere maggiore di 0\n"
 
-#: g10/gpg.c:3939
+#: g10/gpg.c:3936
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve essere maggiore di 1\n"
 
-#: g10/gpg.c:3941
+#: g10/gpg.c:3938
 #, 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:3943
+#: g10/gpg.c:3940
 #, 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:3945
+#: g10/gpg.c:3942
 #, 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:3949
+#: g10/gpg.c:3946
 #, 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:3953
+#: g10/gpg.c:3950
 #, 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:3960
+#: g10/gpg.c:3957
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "preferenze predefinite non valide\n"
 
-#: g10/gpg.c:3964
+#: g10/gpg.c:3961
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "preferenze personali del cifrario non valide\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3964
 #, c-format
 msgid "invalid personal AEAD preferences\n"
 msgstr "preferenze AEAD personali non valide\n"
 
-#: g10/gpg.c:3971
+#: g10/gpg.c:3968
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "preferenze personali del digest non valide\n"
 
-#: g10/gpg.c:3975
+#: g10/gpg.c:3972
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "preferenze personali di compressione non valide\n"
 
-#: g10/gpg.c:3984 g10/gpg.c:3989
+#: g10/gpg.c:3981 g10/gpg.c:3986
 #, c-format
 msgid "chunk size invalid - using %d\n"
 msgstr "dimensione del blocco non valida - utilizzando %d\n"
 
-#: g10/gpg.c:4026
+#: g10/gpg.c:4023
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s non funziona ancora con %s\n"
 
-#: g10/gpg.c:4089
+#: g10/gpg.c:4086
 #, 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:4101
+#: g10/gpg.c:4098
 #, 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:4256
+#: g10/gpg.c:4253
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/gpg.c:4268
+#: g10/gpg.c:4265
 #, 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:4340
+#: g10/gpg.c:4337
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "crittografia simmetrica di '%s' non riuscita: %s\n"
 
-#: g10/gpg.c:4369
+#: g10/gpg.c:4366
 #, 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:4372
+#: g10/gpg.c:4369
 #, 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:4430
+#: g10/gpg.c:4427
 #, 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:4433
+#: g10/gpg.c:4430
 #, 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:4821 g10/keyserver.c:1870
+#: g10/gpg.c:4818 g10/keyserver.c:1629
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "invio al keyserver fallito: %s\n"
 
-#: g10/gpg.c:4826
+#: g10/gpg.c:4823
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "ricezione dal keyserver fallita: %s\n"
 
-#: g10/gpg.c:4832
+#: g10/gpg.c:4829
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "esportazione della chiave fallita: %s\n"
 
-#: g10/gpg.c:4845
+#: g10/gpg.c:4842
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "esportazione come chiave ssh non riuscita: %s\n"
 
-#: g10/gpg.c:4857
+#: g10/gpg.c:4854
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ricerca nel keyserver fallita: %s\n"
 
-#: g10/gpg.c:4870
+#: g10/gpg.c:4867
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aggiornamento del keyserver fallito: %s\n"
 
-#: g10/gpg.c:4937
+#: g10/gpg.c:4936
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "rimozione dell'armatura fallita: %s\n"
 
-#: g10/gpg.c:4948
+#: g10/gpg.c:4947
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/gpg.c:5053
+#: g10/gpg.c:5052
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "algoritmo hash non valido '%s'\n"
 
-#: g10/gpg.c:5205 g10/tofu.c:2156
+#: g10/gpg.c:5204 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:5216
+#: g10/gpg.c:5215
 #, 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:5272
+#: g10/gpg.c:5271
 #, 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:5283
+#: g10/gpg.c:5282
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Vai avanti e scrivi il messaggio...\n"
 
-#: g10/gpg.c:5630
+#: g10/gpg.c:5629
 #, 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:5632
+#: g10/gpg.c:5631
 #, 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:5665
+#: g10/gpg.c:5664
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "l'URL del keyserver preferito specificato non è valido\n"
@@ -3378,7 +3393,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:414 tools/gpgconf.c:116 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:415 tools/gpgconf.c:116 tools/gpg-card.c:95
 msgid "|FD|write status info to this FD"
 msgstr "|FD|scrivi le informazioni di stato sul FD"
 
@@ -3464,97 +3479,97 @@ msgstr "assumere il formato di backup della chiave GnuPG"
 msgid "repair keys on import"
 msgstr "ripristinare le chiavi all'importazione"
 
-#: g10/import.c:399 g10/import.c:721
+#: g10/import.c:407 g10/import.c:729
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "salto un blocco di tipo %d\n"
 
-#: g10/import.c:738
+#: g10/import.c:746
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu chiavi elaborate finora\n"
 
-#: g10/import.c:831
+#: g10/import.c:839
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Numero totale esaminato: %lu\n"
 
-#: g10/import.c:834
+#: g10/import.c:842
 #, c-format
 msgid "    skipped PGP-2 keys: %lu\n"
 msgstr "    Chiavi PGP-2 ignorate: %lu\n"
 
-#: g10/import.c:836
+#: g10/import.c:844
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "  nuove chiavi saltate: %lu\n"
 
-#: g10/import.c:839
+#: g10/import.c:847
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         senza user ID: %lu\n"
 
-#: g10/import.c:842 sm/import.c:129
+#: g10/import.c:850 sm/import.c:129
 #, c-format
 msgid "              imported: %lu"
 msgstr "             importate: %lu"
 
-#: g10/import.c:846 sm/import.c:133
+#: g10/import.c:854 sm/import.c:133
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "        non modificate: %lu\n"
 
-#: g10/import.c:848
+#: g10/import.c:856
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "         nuovi user ID: %lu\n"
 
-#: g10/import.c:850
+#: g10/import.c:858
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "       nuove subchiavi: %lu\n"
 
-#: g10/import.c:852
+#: g10/import.c:860
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "           nuove firme: %lu\n"
 
-#: g10/import.c:854
+#: g10/import.c:862
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "  nuove revoche di chiavi: %lu\n"
 
-#: g10/import.c:856 sm/import.c:135
+#: g10/import.c:864 sm/import.c:135
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "  chiavi segrete lette: %lu\n"
 
-#: g10/import.c:858 sm/import.c:137
+#: g10/import.c:866 sm/import.c:137
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  chiavi segrete importate: %lu\n"
 
-#: g10/import.c:860 sm/import.c:139
+#: g10/import.c:868 sm/import.c:139
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " chiavi segrete non cambiate: %lu\n"
 
-#: g10/import.c:862 sm/import.c:141
+#: g10/import.c:870 sm/import.c:141
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "             importate: %lu\n"
 
-#: g10/import.c:864
+#: g10/import.c:872
 #, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "    firme pulite: %lu\n"
 
-#: g10/import.c:866
+#: g10/import.c:874
 #, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "    ID utente puliti: %lu\n"
 
-#: g10/import.c:1291
+#: g10/import.c:1299
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
@@ -3563,174 +3578,174 @@ msgstr ""
 "AVVISO: la chiave %s contiene le preferenze per\n"
 "algoritmi su questi ID utente:\n"
 
-#: g10/import.c:1333
+#: g10/import.c:1341
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": preferenza per l'algoritmo di crittografia %s\n"
 
-#: g10/import.c:1351
+#: g10/import.c:1359
 #, c-format
 msgid "         \"%s\": preference for AEAD algorithm %s\n"
 msgstr "         \"%s\": preferenza per l'algoritmo AEAD %s\n"
 
-#: g10/import.c:1366
+#: g10/import.c:1374
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "        \"%s\": preferenza per l'algoritmo digest %s\n"
 
-#: g10/import.c:1378
+#: g10/import.c:1386
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "          \"%s\": preferenza per l'algoritmo di compressione %s\n"
 
-#: g10/import.c:1391
+#: g10/import.c:1399
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "si consiglia vivamente di aggiornare le preferenze e\n"
 
-#: g10/import.c:1393
+#: g10/import.c:1401
 #, c-format
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "ri-distribuire questa chiave per evitare potenziali problemi di mancata "
 "corrispondenza dell'algoritmo\n"
 
-#: g10/import.c:1418
+#: g10/import.c:1426
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 "è possibile aggiornare le preferenze con: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:1932 g10/import.c:3053
+#: g10/import.c:1940 g10/import.c:3061
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "chiave %s: nessun ID utente\n"
 
-#: g10/import.c:1938
+#: g10/import.c:1946
 #, c-format
 msgid "key %s: %s\n"
 msgstr "chiave %s: %s\n"
 
-#: g10/import.c:1939 g10/import.c:3025
+#: g10/import.c:1947 g10/import.c:3033
 msgid "rejected by import screener"
 msgstr "rifiutato dallo screener di importazione"
 
-#: g10/import.c:1988
+#: g10/import.c:1996
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "chiave %s: danneggiamento della sottochiave PKS riparato\n"
 
-#: g10/import.c:2009
+#: g10/import.c:2017
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "chiave %s: accettato ID utente non autofirmato \"%s\"\n"
 
-#: g10/import.c:2020 g10/import.c:2051
+#: g10/import.c:2028 g10/import.c:2059
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "chiave %s: nessun ID utente valido\n"
 
-#: g10/import.c:2022
+#: g10/import.c:2030
 #, c-format
 msgid "this may be caused by a missing self-signature\n"
 msgstr "questo può essere causato da una autofirma mancante\n"
 
-#: g10/import.c:2101 g10/import.c:3439
+#: g10/import.c:2109 g10/import.c:3447
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "chiave %s: chiave pubblica non trovata: %s\n"
 
-#: g10/import.c:2107
+#: g10/import.c:2115
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "chiave %s: nuova chiave - ignorata\n"
 
-#: g10/import.c:2119
+#: g10/import.c:2127
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "non è stato trovato un portachiavi scrivibile: %s\n"
 
-#: g10/import.c:2151 g10/import.c:2253 g10/import.c:3514
+#: g10/import.c:2159 g10/import.c:2261 g10/import.c:3522
 #, c-format
 msgid "error writing keyring '%s': %s\n"
 msgstr "errore durante la scrittura della chiave '%s': %s\n"
 
-#: g10/import.c:2174
+#: g10/import.c:2182
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "chiave %s: chiave pubblica \"%s\" importata\n"
 
-#: g10/import.c:2201
+#: g10/import.c:2209
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "chiave %s: non corrisponde alla nostra copia\n"
 
-#: g10/import.c:2269
+#: g10/import.c:2277
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "chiave %s: \"%s\" 1 nuovo ID utente\n"
 
-#: g10/import.c:2272
+#: g10/import.c:2280
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "chiave %s: \"%s\" %d nuovi ID utente\n"
 
-#: g10/import.c:2275
+#: g10/import.c:2283
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "chiave %s: \"%s\" 1 nuova firma\n"
 
-#: g10/import.c:2278
+#: g10/import.c:2286
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "chiave %s: \"%s\" %d nuove firme\n"
 
-#: g10/import.c:2281
+#: g10/import.c:2289
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "chiave %s: \"%s\" 1 nuova sottochiave\n"
 
-#: g10/import.c:2284
+#: g10/import.c:2292
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "chiave %s: \"%s\" %d nuove sottochiavi\n"
 
-#: g10/import.c:2287
+#: g10/import.c:2295
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "chiave %s: \"%s\" %d firma pulita\n"
 
-#: g10/import.c:2290
+#: g10/import.c:2298
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "chiave %s: \"%s\" %d firme pulite\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2301
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "chiave %s: \"%s\" %d ID utente pulito\n"
 
-#: g10/import.c:2296
+#: g10/import.c:2304
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "chiave %s: \"%s\" %d ID utente puliti\n"
 
-#: g10/import.c:2332
+#: g10/import.c:2340
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "chiave %s: \"%s\" non modificata\n"
 
-#: g10/import.c:2692 g10/import.c:2887
+#: g10/import.c:2700 g10/import.c:2895
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "chiave %s: chiave segreta importata\n"
 
-#: g10/import.c:2700
+#: g10/import.c:2708
 #, c-format
 msgid "key %s: secret key already exists\n"
 msgstr "chiave %s: chiave segreta già esistente\n"
 
-#: g10/import.c:2708
+#: g10/import.c:2716
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "chiave %s: errore durante l'invio all'agente: %s\n"
@@ -3743,209 +3758,208 @@ msgstr "chiave %s: errore durante l'invio all'agente: %s\n"
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2877
+#: g10/import.c:2885
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr "Per eseguire la migrazione di '%s', con ogni smart card: %s\n"
 
-#: g10/import.c:3024
+#: g10/import.c:3032
 #, c-format
 msgid "secret key %s: %s\n"
 msgstr "chiave segreta %s: %s\n"
 
-#: g10/import.c:3045 g10/import.c:3084
+#: g10/import.c:3053 g10/import.c:3092
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "importazione di chiavi segrete non consentita\n"
 
-#: g10/import.c:3072
+#: g10/import.c:3080
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "chiave %s: chiave segreta con crittografia non valida %d - ignorata\n"
 
-#: g10/import.c:3234 g10/pkclist.c:75 g10/revoke.c:774
+#: g10/import.c:3242 g10/pkclist.c:75 g10/revoke.c:775
 msgid "No reason specified"
 msgstr "Nessuna ragione specificata"
 
-#: g10/import.c:3235 g10/pkclist.c:77 g10/revoke.c:776
+#: g10/import.c:3243 g10/pkclist.c:77 g10/revoke.c:777
 msgid "Key is superseded"
 msgstr "Questa chiave è stata sostituita"
 
-#: g10/import.c:3236 g10/pkclist.c:79 g10/revoke.c:775
+#: g10/import.c:3244 g10/pkclist.c:79 g10/revoke.c:776
 msgid "Key has been compromised"
 msgstr "Questa chiave è stata compromessa"
 
-#: g10/import.c:3237 g10/pkclist.c:81 g10/revoke.c:777
+#: g10/import.c:3245 g10/pkclist.c:81 g10/revoke.c:778
 msgid "Key is no longer used"
 msgstr "La chiave non è più usata"
 
-#: g10/import.c:3238 g10/pkclist.c:83 g10/revoke.c:778
+#: g10/import.c:3246 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "L'user ID non è più valido"
 
-#: g10/import.c:3363 g10/keylist.c:1105 g10/pkclist.c:87
+#: g10/import.c:3371 g10/keylist.c:1105 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "ragione della revoca: "
 
-#: g10/import.c:3382 g10/keylist.c:1124 g10/pkclist.c:103
+#: g10/import.c:3390 g10/keylist.c:1124 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "commento alla revoca: "
 
-#: g10/import.c:3432
+#: g10/import.c:3440
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "chiave %s: nessuna chiave pubblica - impossibile applicare il certificato di "
 "revoca\n"
 
-#: g10/import.c:3461
+#: g10/import.c:3469
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "chiave %s: impossibile individuare il blocco di chiave originale: %s\n"
 
-#: g10/import.c:3468
+#: g10/import.c:3476
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "chiave %s: impossibile leggere il keyblock originale: %s\n"
 
-#: g10/import.c:3488
+#: g10/import.c:3496
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "chiave %s: certificato di revoca non valido: %s - rifiutato\n"
 
-#: g10/import.c:3523
+#: g10/import.c:3531
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "chiave %s: certificato di revoca \"%s\" importato\n"
 
-#: g10/import.c:3609
+#: g10/import.c:3617
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "chiave %s: nessun ID utente per la firma\n"
 
-#: g10/import.c:3626
+#: g10/import.c:3634
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "chiave %s: algoritmo a chiave pubblica non supportato sull'ID utente \"%s\"\n"
 
-#: g10/import.c:3628
+#: g10/import.c:3636
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "chiave %s: autode firma non valida sull'ID utente \"%s\"\n"
 
-#: g10/import.c:3645 g10/import.c:3673 g10/import.c:3729
+#: g10/import.c:3653 g10/import.c:3681 g10/import.c:3737
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "chiave %s: algoritmo a chiave pubblica non supportato\n"
 
-#: g10/import.c:3646
+#: g10/import.c:3654
 #, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "chiave %s: firma diretta della chiave non valida\n"
 
-#: g10/import.c:3660
+#: g10/import.c:3668
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "chiave %s: nessuna sottochiave per l'associazione della chiave\n"
 
-#: g10/import.c:3675
+#: g10/import.c:3683
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "chiave %s: associazione di sottochiavi non valida\n"
 
-#: g10/import.c:3694
+#: g10/import.c:3702
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "chiave %s: rimossa l'associazione di più sottochiavi\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3726
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "chiave %s: nessuna sottochiave per la revoca della chiave\n"
 
-#: g10/import.c:3731
+#: g10/import.c:3739
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "chiave %s: revoca della sottochiave non valida\n"
 
-#: g10/import.c:3746
+#: g10/import.c:3754
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "chiave %s: rimossa la revoca di più sottochiavi\n"
 
-#: g10/import.c:3790
+#: g10/import.c:3798
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "chiave %s: ID utente ignorato \"%s\"\n"
 
-#: g10/import.c:3817
+#: g10/import.c:3825
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "chiave %s: sottochiave ignorata\n"
 
-#: g10/import.c:3849
+#: g10/import.c:3857
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "chiave %s: firma non esportabile (classe 0x%02X) - ignorata\n"
 
-#: g10/import.c:3860
+#: g10/import.c:3868
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "chiave %s: certificato di revoca nella posizione errata - ignorato\n"
 
-#: g10/import.c:3878
+#: g10/import.c:3886
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "chiave %s: certificato di revoca non valido: %s - ignorato\n"
 
-#: g10/import.c:3892
+#: g10/import.c:3900
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "chiave %s: firma della sottochiave nella posizione errata - ignorata\n"
 
-#: g10/import.c:3900
+#: g10/import.c:3908
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "chiave %s: classe di firma imprevista (0x%02X) - ignorata\n"
 
-#: g10/import.c:4073
+#: g10/import.c:4081
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "chiave %s: rilevato ID utente duplicato - unito\n"
 
-#: g10/import.c:4180
+#: g10/import.c:4188
 #, c-format
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr "chiave %s: rilevate sottochiavi duplicate - unite\n"
 
-#: g10/import.c:4245
+#: g10/import.c:4253
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "AVVISO: la chiave %s può essere revocata: recupero della chiave di revoca "
 "%s\n"
 
-#: g10/import.c:4261
+#: g10/import.c:4269
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVVISO: la chiave %s può essere revocata: chiave di revoca %s non presente.\n"
 
-#: g10/import.c:4327
+#: g10/import.c:4335
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "chiave %s: certificato di revoca \"%s\" aggiunto\n"
 
-#: g10/import.c:4365
+#: g10/import.c:4373
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "chiave %s: aggiunta firma chiave diretta\n"
 
-#: g10/key-check.c:133 dirmngr/dirmngr_ldap.c:650 dirmngr/ldap-wrapper.c:835
-#: dirmngr/ldap-wrapper.c:852
+#: g10/key-check.c:133 dirmngr/ldap-wrapper.c:835 dirmngr/ldap-wrapper.c:852
 #, c-format
 msgid "error allocating memory: %s\n"
 msgstr "errore durante l'allocazione della memoria: %s\n"
@@ -4013,7 +4027,7 @@ msgstr ""
 "Avviso: errori rilevati e controllati solo auto-firme, eseguire '%s' per "
 "controllare tutte le firme.\n"
 
-#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:284 sm/keydb.c:297
+#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:289 sm/keydb.c:302
 #, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "errore durante la creazione della casella della chiave '%s': %s\n"
@@ -4023,7 +4037,7 @@ msgstr "errore durante la creazione della casella della chiave '%s': %s\n"
 msgid "error creating keyring '%s': %s\n"
 msgstr "errore durante la creazione della chiave '%s': %s\n"
 
-#: g10/keydb.c:388 sm/keydb.c:303
+#: g10/keydb.c:388 sm/keydb.c:308
 #, c-format
 msgid "keybox '%s' created\n"
 msgstr "keybox '%s' creato\n"
@@ -4277,8 +4291,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:6192 g10/keyedit.c:6275 g10/keyedit.c:6404
-#: g10/keyedit.c:6466 g10/sign.c:528
+#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
+#: g10/keyedit.c:6474 g10/sign.c:528
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallita: %s\n"
@@ -4656,7 +4670,7 @@ msgstr "Nessun ID utente corrispondente."
 msgid "Nothing to sign.\n"
 msgstr "Niente da firmare.\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6057
+#: g10/keyedit.c:2973 g10/keyedit.c:6065
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "Non firmato da te.\n"
@@ -4723,7 +4737,7 @@ msgstr "Questa chiave può essere revocata dalla chiave %s %s"
 msgid "(sensitive)"
 msgstr "(sensibile)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:525
+#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "creato: %s"
@@ -4739,7 +4753,7 @@ msgid "expired: %s"
 msgstr "scaduto: %s"
 
 #: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2262
-#: g10/keyserver.c:531
+#: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "scadenza: %s"
@@ -4776,13 +4790,13 @@ msgstr ""
 "corretta\n"
 "finchè non eseguirai di nuovo il programma.\n"
 
-#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:535
-#: g10/mainproc.c:2280 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
+#: g10/mainproc.c:2282 g10/tofu.c:1789 g10/trust.c:426 dirmngr/ocsp.c:792
 msgid "revoked"
 msgstr "revocato"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:539
-#: g10/mainproc.c:2282 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
+#: g10/mainproc.c:2284 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "scaduto"
 
@@ -4824,7 +4838,7 @@ 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:3107
+#: g10/keyedit.c:4273 g10/keygen.c:3111
 msgid "Such a user ID already exists on this key!\n"
 msgstr "Tale ID utente esiste già in questa chiave!\n"
 
@@ -4972,7 +4986,7 @@ msgstr "la sottochiave %s non firma e pertanto non deve essere certificata\n"
 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:5357 g10/keyedit.c:5495
+#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "ignorare l'autode firma v3 sull'ID utente \"%s\"\n"
@@ -4981,128 +4995,128 @@ msgstr "ignorare l'autode firma v3 sull'ID utente \"%s\"\n"
 msgid "Enter your preferred keyserver URL: "
 msgstr "Immettere l'URL del server di chiavi preferito: "
 
-#: g10/keyedit.c:5380
+#: g10/keyedit.c:5383
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Sei sicuro di volerlo sostituire? (y/N) "
 
-#: g10/keyedit.c:5381
+#: g10/keyedit.c:5384
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Sei sicuro di volerlo eliminare? (y/N) "
 
-#: g10/keyedit.c:5441
+#: g10/keyedit.c:5449
 msgid "Enter the notation: "
 msgstr "Immettere la notazione: "
 
-#: g10/keyedit.c:5588
+#: g10/keyedit.c:5596
 msgid "Proceed? (y/N) "
 msgstr "Procedere? (y/N) "
 
-#: g10/keyedit.c:5658
+#: g10/keyedit.c:5666
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:5720
+#: g10/keyedit.c:5728
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nessun ID utente con hash %s\n"
 
-#: g10/keyedit.c:5821
+#: g10/keyedit.c:5829
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Nessuna sottochiave con ID di chiave '%s'.\n"
 
-#: g10/keyedit.c:5843
+#: g10/keyedit.c:5851
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nessuna sottochiave con indice %d\n"
 
-#: g10/keyedit.c:5984
+#: g10/keyedit.c:5992
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID utente: \"%s\"\n"
 
-#: g10/keyedit.c:5987 g10/keyedit.c:6089 g10/keyedit.c:6137
+#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
 #, 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:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
+#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
 msgid " (non-exportable)"
 msgstr " (non esportabile)"
 
-#: g10/keyedit.c:5993
+#: g10/keyedit.c:6001
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Questa chiave è scaduta il %s.\n"
 
-#: g10/keyedit.c:5998
+#: g10/keyedit.c:6006
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
 
-#: g10/keyedit.c:6003
+#: g10/keyedit.c:6011
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Creare un certificato di revoca per questa firma? (s/N) "
 
-#: g10/keyedit.c:6063
+#: g10/keyedit.c:6071
 #, 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:6092
+#: g10/keyedit.c:6100
 msgid " (non-revocable)"
 msgstr " (non revocabile)"
 
-#: g10/keyedit.c:6099
+#: g10/keyedit.c:6107
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revocato dalla chiave %s su %s\n"
 
-#: g10/keyedit.c:6124
+#: g10/keyedit.c:6132
 msgid "You are about to revoke these signatures:\n"
 msgstr "Stai per revocare queste firme:\n"
 
-#: g10/keyedit.c:6147
+#: g10/keyedit.c:6155
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Creare davvero i certificati di revoca? (s/N) "
 
-#: g10/keyedit.c:6180
+#: g10/keyedit.c:6188
 #, c-format
 msgid "no secret key\n"
 msgstr "manca la chiave segreta\n"
 
-#: g10/keyedit.c:6228
+#: g10/keyedit.c:6236
 #, 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:6238
+#: g10/keyedit.c:6246
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "l'user ID \"%s\" è già stato revocato\n"
 
-#: g10/keyedit.c:6255
+#: g10/keyedit.c:6263
 #, 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:6351
+#: g10/keyedit.c:6359
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Impossibile revocare l'ultimo ID utente valido.\n"
 
-#: g10/keyedit.c:6389
+#: g10/keyedit.c:6397
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "La chiave %s è già stata revocata.\n"
 
-#: g10/keyedit.c:6451
+#: g10/keyedit.c:6459
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "La sottochiave %s è già stata revocata.\n"
 
-#: g10/keyedit.c:6548
+#: g10/keyedit.c:6556
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -5114,63 +5128,63 @@ msgstr ""
 msgid "invalid value for option '%s'\n"
 msgstr "valore non valido per l'opzione '%s'\n"
 
-#: g10/keygen.c:338
+#: g10/keygen.c:339
 #, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "preferenza '%s' duplicata\n"
 
-#: g10/keygen.c:345
+#: g10/keygen.c:346
 #, c-format
 msgid "too many cipher preferences\n"
 msgstr "troppe preferenze di cifratura\n"
 
-#: g10/keygen.c:347
+#: g10/keygen.c:348
 #, c-format
 msgid "too many digest preferences\n"
 msgstr "troppe preferenze di digest\n"
 
-#: g10/keygen.c:349
+#: g10/keygen.c:350
 #, c-format
 msgid "too many compression preferences\n"
 msgstr "troppe preferenze di compressione\n"
 
-#: g10/keygen.c:351
+#: g10/keygen.c:352
 #, c-format
 msgid "too many AEAD preferences\n"
 msgstr "troppe preferenze AEAD\n"
 
-#: g10/keygen.c:521
+#: g10/keygen.c:522
 #, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "elemento '%s' non valido nella stringa delle preferenze\n"
 
-#: g10/keygen.c:1130
+#: g10/keygen.c:1131
 #, c-format
 msgid "writing direct signature\n"
 msgstr "scrittura della firma diretta\n"
 
-#: g10/keygen.c:1176
+#: g10/keygen.c:1177
 #, c-format
 msgid "writing self signature\n"
 msgstr "scrittura della autofirma\n"
 
-#: g10/keygen.c:1233
+#: g10/keygen.c:1234
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "scrittura della firma di collegamento alla chiave\n"
 
-#: g10/keygen.c:1598 g10/keygen.c:1603 g10/keygen.c:1655 g10/keygen.c:1660
-#: g10/keygen.c:1832 g10/keygen.c:1837
+#: g10/keygen.c:1599 g10/keygen.c:1604 g10/keygen.c:1656 g10/keygen.c:1661
+#: g10/keygen.c:1833 g10/keygen.c:1838
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "dimensione della chiave non valida; uso %u bit\n"
 
-#: g10/keygen.c:1609 g10/keygen.c:1666 g10/keygen.c:1674 g10/keygen.c:1843
+#: g10/keygen.c:1610 g10/keygen.c:1667 g10/keygen.c:1675 g10/keygen.c:1844
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "dimensioni della chiave arrotondate a %u bit\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1701
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
@@ -5178,19 +5192,19 @@ msgstr ""
 "AVVISO: alcuni programmi OpenPGP non sono in grado di gestire una chiave DSA "
 "con questa dimensione del digest\n"
 
-#: g10/keygen.c:1899
+#: g10/keygen.c:1900
 msgid "Sign"
 msgstr "Firma"
 
-#: g10/keygen.c:1902
+#: g10/keygen.c:1903
 msgid "Certify"
 msgstr "Certifica"
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1906
 msgid "Encrypt"
 msgstr "Crittografa"
 
-#: g10/keygen.c:1908
+#: g10/keygen.c:1909
 msgid "Authenticate"
 msgstr "Autentica"
 
@@ -5204,166 +5218,166 @@ msgstr "Autentica"
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1929
+#: g10/keygen.c:1930
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1967
 #, c-format
 msgid "Possible actions for this %s key: "
 msgstr "Azioni possibili per una chiave %s: "
 
-#: g10/keygen.c:1973
+#: g10/keygen.c:1974
 msgid "Current allowed actions: "
 msgstr "Azioni correnti consentite: "
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1979
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Attivare o disattivare la funzionalità di firma\n"
 
-#: g10/keygen.c:1981
+#: g10/keygen.c:1982
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Attivare/disattivare la funzionalità di crittografia\n"
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1985
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Attivare/disattivare la funzionalità di autenticazione\n"
 
-#: g10/keygen.c:1987
+#: g10/keygen.c:1988
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Finito\n"
 
-#: g10/keygen.c:2116
+#: g10/keygen.c:2117
 #, c-format
 msgid "   (%d) RSA and RSA%s\n"
 msgstr "   (%d) RSA e RSA%s\n"
 
-#: g10/keygen.c:2120
+#: g10/keygen.c:2121
 #, c-format
 msgid "   (%d) DSA and Elgamal%s\n"
 msgstr "   (%d) DSA ed Elgamal%s\n"
 
-#: g10/keygen.c:2123
+#: g10/keygen.c:2124
 #, c-format
 msgid "   (%d) DSA (sign only)%s\n"
 msgstr "   (%d) DSA (solo segno)%s\n"
 
-#: g10/keygen.c:2125
+#: g10/keygen.c:2126
 #, c-format
 msgid "   (%d) RSA (sign only)%s\n"
 msgstr "   (%d) RSA (solo segno)%s\n"
 
-#: g10/keygen.c:2131
+#: g10/keygen.c:2132
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)%s\n"
 msgstr "   (%d) Elgamal (solo crittografa)%s\n"
 
-#: g10/keygen.c:2133
+#: g10/keygen.c:2134
 #, c-format
 msgid "   (%d) RSA (encrypt only)%s\n"
 msgstr "   (%d) RSA (solo crittografia)%s\n"
 
-#: g10/keygen.c:2139
+#: g10/keygen.c:2140
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)%s\n"
 msgstr "   (%d) DSA (impostare le proprie funzionalità)%s\n"
 
-#: g10/keygen.c:2141
+#: g10/keygen.c:2142
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (impostare le proprie funzionalità)%s\n"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2148
 #, c-format
 msgid "   (%d) ECC (sign and encrypt)%s\n"
 msgstr "   (%d) ECC (firmare e crittografare)%s\n"
 
-#: g10/keygen.c:2147 g10/keygen.c:2678
+#: g10/keygen.c:2148 g10/keygen.c:2679
 msgid " *default*"
 msgstr " *predefinito*"
 
-#: g10/keygen.c:2148
+#: g10/keygen.c:2149
 #, c-format
 msgid "  (%d) ECC (sign only)\n"
 msgstr "   (%d) DSA (firma solo)\n"
 
-#: g10/keygen.c:2150
+#: g10/keygen.c:2151
 #, c-format
 msgid "  (%d) ECC (set your own capabilities)%s\n"
 msgstr "  (%d) ECC (impostare le proprie funzionalità)%s\n"
 
-#: g10/keygen.c:2152
+#: g10/keygen.c:2153
 #, c-format
 msgid "  (%d) ECC (encrypt only)%s\n"
 msgstr "  (%d) ECC (solo crittografia)%s\n"
 
-#: g10/keygen.c:2156
+#: g10/keygen.c:2157
 #, c-format
 msgid "  (%d) Existing key%s\n"
 msgstr "  (%d) Chiave esistente%s\n"
 
-#: g10/keygen.c:2158
+#: g10/keygen.c:2159
 #, c-format
 msgid "  (%d) Existing key from card%s\n"
 msgstr "  (%d) Chiave esistente dalla carta%s\n"
 
-#: g10/keygen.c:2254 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2255 sm/certreqgen-ui.c:203
 msgid "Enter the keygrip: "
 msgstr "Immettere il keygrip: "
 
-#: g10/keygen.c:2267 sm/certreqgen-ui.c:211 tools/gpg-card.c:2280
+#: g10/keygen.c:2268 sm/certreqgen-ui.c:211 tools/gpg-card.c:2297
 #, c-format
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr "Keygrip non valido (previsto 40 cifre esadecimali)\n"
 
-#: g10/keygen.c:2269 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2270 sm/certreqgen-ui.c:213
 msgid "No key with this keygrip\n"
 msgstr "Nessuna chiave con questa chiave\n"
 
-#: g10/keygen.c:2288 g10/keygen.c:2298 g10/keygen.c:3440 g10/keygen.c:3451
+#: g10/keygen.c:2289 g10/keygen.c:2299 g10/keygen.c:3444 g10/keygen.c:3455
 #: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
 #, c-format
 msgid "error reading the card: %s\n"
 msgstr "errore durante la lettura della scheda: %s\n"
 
-#: g10/keygen.c:2292 g10/keygen.c:3444 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2293 g10/keygen.c:3448 sm/certreqgen-ui.c:234
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "Numero di serie della scheda: %s\n"
 
-#: g10/keygen.c:2311 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2312 sm/certreqgen-ui.c:246
 msgid "Available keys:\n"
 msgstr "Chiavi disponibili:\n"
 
-#: g10/keygen.c:2504 g10/keygen.c:2518
+#: g10/keygen.c:2505 g10/keygen.c:2519
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr "arrotondato a %u bit\n"
 
-#: g10/keygen.c:2559
+#: g10/keygen.c:2560
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "Le chiavi %s possono essere lunghe tra %u e %u bit.\n"
 
-#: g10/keygen.c:2567
+#: g10/keygen.c:2568
 #, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Quale dimensione della chiave si desidera per la sottochiave? (%u) "
 
-#: g10/keygen.c:2584 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2585 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La dimensione richiesta della chiave è %u bit\n"
 
-#: g10/keygen.c:2630
+#: g10/keygen.c:2631
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Selezionare la curva ellittica desiderata:\n"
 
-#: g10/keygen.c:2819
+#: g10/keygen.c:2820
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5379,7 +5393,7 @@ msgstr ""
 "      <n>m = la chiave scadrà dopo n mesi\n"
 "      <n>y = la chiave scadrà dopo n anni\n"
 
-#: g10/keygen.c:2830
+#: g10/keygen.c:2831
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5395,38 +5409,38 @@ msgstr ""
 "      <n>m = la chiave scadrà dopo n mesi\n"
 "      <n>y = la chiave scadrà dopo n anni\n"
 
-#: g10/keygen.c:2853
+#: g10/keygen.c:2854
 msgid "Key is valid for? (0) "
 msgstr "Chiave valida per? (0) "
 
-#: g10/keygen.c:2858
+#: g10/keygen.c:2859
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "La firma è valida per? (%s) "
 
-#: g10/keygen.c:2871 g10/keygen.c:2896
+#: g10/keygen.c:2875 g10/keygen.c:2900
 msgid "invalid value\n"
 msgstr "valore non valido\n"
 
-#: g10/keygen.c:2878
+#: g10/keygen.c:2882
 msgid "Key does not expire at all\n"
 msgstr "La chiave non scade affatto\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2883
 msgid "Signature does not expire at all\n"
 msgstr "La firma non scade affatto\n"
 
-#: g10/keygen.c:2884
+#: g10/keygen.c:2888
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "La chiave scade alle %s\n"
 
-#: g10/keygen.c:2885
+#: g10/keygen.c:2889
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "La firma scade alle %s\n"
 
-#: g10/keygen.c:2889
+#: g10/keygen.c:2893
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5434,11 +5448,11 @@ msgstr ""
 "Il tuo sistema non può mostrare date oltre il 2038.\n"
 "Comunque, sarà gestita correttamente fino al 2106.\n"
 
-#: g10/keygen.c:2902
+#: g10/keygen.c:2906
 msgid "Is this correct? (y/N) "
 msgstr "È corretto? (y/N) "
 
-#: g10/keygen.c:2970
+#: g10/keygen.c:2974
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5452,7 +5466,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2985
+#: g10/keygen.c:2989
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5468,49 +5482,49 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:3004
+#: g10/keygen.c:3008
 msgid "Real name: "
 msgstr "Nome e Cognome: "
 
-#: g10/keygen.c:3013
+#: g10/keygen.c:3017
 msgid "Invalid character in name\n"
 msgstr "Carattere non valido nel nome\n"
 
-#: g10/keygen.c:3014
+#: g10/keygen.c:3018
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr "I caratteri '%s' e '%s' non possono essere visualizzati nel nome\n"
 
-#: g10/keygen.c:3018
+#: g10/keygen.c:3022
 msgid "Name may not start with a digit\n"
 msgstr "Il nome non può iniziare con una cifra\n"
 
-#: g10/keygen.c:3021
+#: g10/keygen.c:3025
 msgid "Name must be at least 5 characters long\n"
 msgstr "Il nome deve essere lungo almeno 5 caratteri\n"
 
-#: g10/keygen.c:3031
+#: g10/keygen.c:3035
 msgid "Email address: "
 msgstr "Indirizzo di Email: "
 
-#: g10/keygen.c:3037
+#: g10/keygen.c:3041
 msgid "Not a valid email address\n"
 msgstr "L'indirizzo di email non è valido\n"
 
-#: g10/keygen.c:3046
+#: g10/keygen.c:3050
 msgid "Comment: "
 msgstr "Commento: "
 
-#: g10/keygen.c:3052
+#: g10/keygen.c:3056
 msgid "Invalid character in comment\n"
 msgstr "Carattere non valido nel commento\n"
 
-#: g10/keygen.c:3088
+#: g10/keygen.c:3092
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr "Si sta utilizzando il set di caratteri '%s'.\n"
 
-#: g10/keygen.c:3094
+#: g10/keygen.c:3098
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5521,7 +5535,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3099
+#: g10/keygen.c:3103
 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"
 
@@ -5536,31 +5550,31 @@ msgstr "Per favore non mettere l'indirizzo di email nel nome o nel commento\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3124
+#: g10/keygen.c:3128
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:3134
+#: g10/keygen.c:3138
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (Q)uit? "
 
-#: g10/keygen.c:3135
+#: g10/keygen.c:3139
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (O)kay/(Q)uit? "
 
-#: g10/keygen.c:3140
+#: g10/keygen.c:3144
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (Q)uit? "
 
-#: g10/keygen.c:3141
+#: g10/keygen.c:3145
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (O)kay/(Q)uit? "
 
-#: g10/keygen.c:3160
+#: g10/keygen.c:3164
 msgid "Please correct the error first\n"
 msgstr "Per favore correggi prima l'errore\n"
 
-#: g10/keygen.c:3206
+#: g10/keygen.c:3210
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -5572,18 +5586,18 @@ msgstr ""
 "dischi) durante la generazione dei numeri primi; questo da al generatore di\n"
 "numeri casuali migliori possibilità di raccogliere abbastanza entropia.\n"
 
-#: g10/keygen.c:3591
+#: g10/keygen.c:3595
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4590 g10/keygen.c:4663 g10/keygen.c:4681 g10/keygen.c:4710
-#: g10/keygen.c:5086 g10/keygen.c:5632 g10/keygen.c:5943 g10/keygen.c:6050
+#: g10/keygen.c:4594 g10/keygen.c:4667 g10/keygen.c:4685 g10/keygen.c:4714
+#: g10/keygen.c:5113 g10/keygen.c:5663 g10/keygen.c:5974 g10/keygen.c:6081
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: g10/keygen.c:4599
+#: g10/keygen.c:4603
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5594,66 +5608,66 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:4601
+#: g10/keygen.c:4605
 msgid "Continue? (Y/n) "
 msgstr "Continuare? (Y/n) "
 
-#: g10/keygen.c:4622
+#: g10/keygen.c:4626
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "Esiste già una chiave per \"%s\"\n"
 
-#: g10/keygen.c:4627
+#: g10/keygen.c:4631
 msgid "Create anyway? (y/N) "
 msgstr "Creare comunque? (y/N) "
 
-#: g10/keygen.c:4633
+#: g10/keygen.c:4637
 #, c-format
 msgid "creating anyway\n"
 msgstr "creazione comunque\n"
 
-#: g10/keygen.c:5069
+#: g10/keygen.c:5096
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 "Nota: utilizzare \"%s %s\" per una finestra di dialogo di generazione di "
 "chiavi in primo piano.\n"
 
-#: g10/keygen.c:5118
+#: g10/keygen.c:5145
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Generazione della chiave annullata.\n"
 
-#: g10/keygen.c:5178
+#: g10/keygen.c:5205
 #, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "impossibile creare il file di backup '%s': %s\n"
 
-#: g10/keygen.c:5198
+#: g10/keygen.c:5225
 #, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "Nota: backup della chiave della scheda salvata in '%s'\n"
 
-#: g10/keygen.c:5359 g10/keygen.c:5561
+#: g10/keygen.c:5389 g10/keygen.c:5591
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr "scrittura di chiave pubblica in '%s'\n"
 
-#: g10/keygen.c:5555
+#: g10/keygen.c:5585
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "non è stato trovato un portachiavi pubblico scrivibile: %s\n"
 
-#: g10/keygen.c:5569
+#: g10/keygen.c:5599
 #, c-format
 msgid "error writing public keyring '%s': %s\n"
 msgstr "errore durante la scrittura della chiave pubblica '%s': %s\n"
 
-#: g10/keygen.c:5603
+#: g10/keygen.c:5634
 msgid "public and secret key created and signed.\n"
 msgstr "chiavi pubbliche e segrete create e firmate.\n"
 
-#: g10/keygen.c:5619
+#: g10/keygen.c:5650
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -5662,7 +5676,7 @@ msgstr ""
 "consiglia di utilizzare\n"
 "il comando \"--edit-key\" per generare una sottochiave a questo scopo.\n"
 
-#: g10/keygen.c:5801 g10/keygen.c:6000
+#: g10/keygen.c:5832 g10/keygen.c:6031
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5670,7 +5684,7 @@ msgstr ""
 "la chiave è stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:5803 g10/keygen.c:6002
+#: g10/keygen.c:5834 g10/keygen.c:6033
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5678,23 +5692,23 @@ msgstr ""
 "la chiave è stata creata %lu secondi nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:5814 g10/keygen.c:6013
+#: g10/keygen.c:5845 g10/keygen.c:6044
 #, c-format
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "Nota: la creazione di sottochiavi per le chiavi v3 non è conforme a OpenPGP\n"
 
-#: g10/keygen.c:5826 g10/keygen.c:5828
+#: g10/keygen.c:5857 g10/keygen.c:5859
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Parti della chiave segreta non sono disponibili.\n"
 
-#: g10/keygen.c:5835 g10/keygen.c:5837
+#: g10/keygen.c:5866 g10/keygen.c:5868
 #, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Le parti segrete della chiave primaria vengono archiviate su scheda.\n"
 
-#: g10/keygen.c:5857 g10/keygen.c:6027
+#: g10/keygen.c:5888 g10/keygen.c:6058
 msgid "Really create? (y/N) "
 msgstr "Davvero creare? (y/N) "
 
@@ -5775,33 +5789,33 @@ msgstr "     Impronta digitale della chiave ="
 msgid "      Card serial no. ="
 msgstr "      Numero seriale della scheda ="
 
-#: g10/keyring.c:1467
+#: g10/keyring.c:1477
 #, c-format
 msgid "caching keyring '%s'\n"
 msgstr "chiave di memorizzazione nella cache '%s'\n"
 
-#: g10/keyring.c:1541
+#: g10/keyring.c:1551
 #, c-format
 msgid "%lu keys cached so far (%lu signature)\n"
 msgid_plural "%lu keys cached so far (%lu signatures)\n"
 msgstr[0] "E' stata controllata %lu chiave (%lu firma)\n"
 msgstr[1] "Sono state controllate %lu chiavi (%lu firme)\n"
 
-#: g10/keyring.c:1557
+#: g10/keyring.c:1567
 #, c-format
 msgid "%lu key cached"
 msgid_plural "%lu keys cached"
 msgstr[0] "Chiave %lu memorizzata nella cache"
 msgstr[1] "Chiavi %lu memorizzata nella cache"
 
-#: g10/keyring.c:1559
+#: g10/keyring.c:1569
 #, c-format
 msgid " (%lu signature)\n"
 msgid_plural " (%lu signatures)\n"
 msgstr[0] " (firma %lu)\n"
 msgstr[1] " (firme %lu)\n"
 
-#: g10/keyring.c:1636
+#: g10/keyring.c:1646
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: portachiavi creato\n"
@@ -5830,25 +5844,25 @@ msgstr "recuperare automaticamente le chiavi durante la verifica delle firme"
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "rispettare l'URL del keyserver preferito impostato sulla chiave"
 
-#: g10/keyserver.c:537
+#: g10/keyserver.c:360
 msgid "disabled"
 msgstr "disabilitato"
 
-#: g10/keyserver.c:740
+#: g10/keyserver.c:563
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Immettere numeri, N)ext o Q)uit > "
 
-#: g10/keyserver.c:846
+#: g10/keyserver.c:669
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "protocollo keyserver non valido (noi %d!=intestazione %d!)\n"
 
-#: g10/keyserver.c:986 g10/keyserver.c:1096
+#: g10/keyserver.c:809 g10/keyserver.c:919
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" non è un ID chiave:\n"
 
-#: g10/keyserver.c:1420 g10/keyserver.c:1453
+#: g10/keyserver.c:1217 g10/keyserver.c:1250
 #, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
@@ -5857,52 +5871,47 @@ msgstr[1] ""
 "aggiornamento della chiavi %d da %s\n"
 "\n"
 
-#: g10/keyserver.c:1427
+#: g10/keyserver.c:1224
 #, 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:1531
+#: g10/keyserver.c:1316
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "chiave \"%s\" non trovata nel keyserver\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1319
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "chiave non trovata nel keyserver\n"
 
-#: g10/keyserver.c:1722
-#, c-format
-msgid "requesting key %s from %s server %s\n"
-msgstr "richiesta della chiave %s dal server %s %s\n"
-
-#: g10/keyserver.c:1726
+#: g10/keyserver.c:1481
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "richiesta della chiave %s da %s\n"
 
-#: g10/keyserver.c:1841 g10/keyserver.c:2020
+#: g10/keyserver.c:1600 g10/keyserver.c:1793
 #, c-format
 msgid "no keyserver known\n"
 msgstr "nessun keyserver noto\n"
 
-#: g10/keyserver.c:1856 g10/skclist.c:213 g10/skclist.c:241
+#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "\"%s\" ignorato: %s\n"
 
-#: g10/keyserver.c:1860
+#: g10/keyserver.c:1619
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "invio della chiave %s a %s\n"
 
-#: g10/keyserver.c:1901
+#: g10/keyserver.c:1662
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr "richiesta di chiave da '%s'\n"
 
-#: g10/keyserver.c:1917
+#: g10/keyserver.c:1680
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVVISO: impossibile recuperare l'URI %s: %s\n"
@@ -5927,69 +5936,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:472
+#: g10/mainproc.c:473
 #, c-format
 msgid "public key is %s\n"
 msgstr "la chiave pubblica è %s\n"
 
-#: g10/mainproc.c:524
+#: g10/mainproc.c:525
 #, 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:528 g10/pkclist.c:231
+#: g10/mainproc.c:529 g10/pkclist.c:231
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:532
+#: g10/mainproc.c:533
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr ""
 "crittografata con chiave %s, ID %s\n"
 "\n"
 
-#: g10/mainproc.c:552 g10/mainproc.c:935
+#: g10/mainproc.c:553 g10/mainproc.c:937
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "AVVISO: più testo in chiaro visti\n"
 
-#: g10/mainproc.c:560
+#: g10/mainproc.c:561
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "cifratto con %lu passphrase\n"
 
-#: g10/mainproc.c:562
+#: g10/mainproc.c:563
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "cifratto con 1 passphrase\n"
 
-#: g10/mainproc.c:577 g10/mainproc.c:602
+#: g10/mainproc.c:578 g10/mainproc.c:603
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decifratura della chiave pubblica fallita: %s\n"
 
-#: g10/mainproc.c:613
+#: g10/mainproc.c:614
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "dati cifrati con la chiave pubblica: DEK corretto\n"
 
-#: g10/mainproc.c:642 g10/mainproc.c:663
+#: g10/mainproc.c:643 g10/mainproc.c:664
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "suppongo che i dati siano cifrati con %s\n"
 
-#: g10/mainproc.c:649
+#: g10/mainproc.c:650
 #, 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:742 g10/mainproc.c:780
+#: g10/mainproc.c:744 g10/mainproc.c:782
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ATTENZIONE: l'integrità del messaggio non era protetta\n"
 
-#: g10/mainproc.c:753
+#: g10/mainproc.c:755
 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"
@@ -5999,179 +6008,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:756
+#: g10/mainproc.c:758
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr "Utilizzare comunque l'opzione '%s' per decrittografare.\n"
 
-#: g10/mainproc.c:761
+#: g10/mainproc.c:763
 #, c-format
 msgid "decryption forced to fail!\n"
 msgstr "decrittazione costretto a fallire!\n"
 
-#: g10/mainproc.c:773
+#: g10/mainproc.c:775
 #, c-format
 msgid "decryption okay\n"
 msgstr "decifratura corretta\n"
 
-#: g10/mainproc.c:786
+#: g10/mainproc.c:788
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATTENZIONE: il messaggio cifrato è stato manipolato!\n"
 
-#: g10/mainproc.c:804
+#: g10/mainproc.c:806
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decifratura fallita: %s\n"
 
-#: g10/mainproc.c:851
+#: g10/mainproc.c:853
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "Nota: mittente richiesto \"solo per i tuoi occhi\"\n"
 
-#: g10/mainproc.c:858
+#: g10/mainproc.c:860
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome del file originale='%.*s'\n"
 
-#: g10/mainproc.c:1135
+#: g10/mainproc.c:1137
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoca solitaria - usa \"gpg --import\" per applicarla\n"
 
-#: g10/mainproc.c:1440 g10/mainproc.c:1483
+#: g10/mainproc.c:1442 g10/mainproc.c:1485
 #, c-format
 msgid "no signature found\n"
 msgstr "nessuna firma trovata\n"
 
-#: g10/mainproc.c:1763
+#: g10/mainproc.c:1765
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Firma BAD da \"%s\""
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1767
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Firma scaduta da \"%s\""
 
-#: g10/mainproc.c:1767
+#: g10/mainproc.c:1769
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Firma valida da \"%s\""
 
-#: g10/mainproc.c:1789
+#: g10/mainproc.c:1791
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "verifica della firma soppressa\n"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1905
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "impossibile gestire questi dati di firma ambigui\n"
 
-#: g10/mainproc.c:1919 g10/mainproc.c:1926
+#: g10/mainproc.c:1921 g10/mainproc.c:1928
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Firma effettuata %s\n"
 
-#: g10/mainproc.c:1920 g10/mainproc.c:1927 sm/verify.c:480
+#: g10/mainproc.c:1922 g10/mainproc.c:1929 sm/verify.c:480
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               utilizzando la chiave %s %s\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1933
 #, 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:1937
+#: g10/mainproc.c:1939
 #, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "               autorità emittente \"%s\"\n"
 
-#: g10/mainproc.c:1992
+#: g10/mainproc.c:1994
 #, c-format
 msgid "Key available at: "
 msgstr "Chiave disponibile presso: "
 
-#: g10/mainproc.c:2034
+#: g10/mainproc.c:2036
 #, 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:2234
+#: g10/mainproc.c:2236
 msgid "[uncertain]"
 msgstr "[incerta]"
 
-#: g10/mainproc.c:2272
+#: g10/mainproc.c:2274
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                 aka \"%s\""
 
-#: g10/mainproc.c:2347
+#: g10/mainproc.c:2349
 #, 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:2363
+#: g10/mainproc.c:2365
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Firma scaduta il %s\n"
 
-#: g10/mainproc.c:2368
+#: g10/mainproc.c:2370
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Questa firma scadrà il %s\n"
 
-#: g10/mainproc.c:2379
+#: g10/mainproc.c:2381
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "Firma %s, algoritmo digest %s%s%s\n"
 
-#: g10/mainproc.c:2380
+#: g10/mainproc.c:2382
 msgid "binary"
 msgstr "binario"
 
-#: g10/mainproc.c:2381
+#: g10/mainproc.c:2383
 msgid "textmode"
 msgstr "modo testo"
 
-#: g10/mainproc.c:2381 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2383 g10/trust.c:112 dirmngr/ocsp.c:793
 msgid "unknown"
 msgstr "sconosciuto"
 
-#: g10/mainproc.c:2383
+#: g10/mainproc.c:2385
 msgid ", key algorithm "
 msgstr ", algoritmo a chiave "
 
-#: g10/mainproc.c:2418
+#: g10/mainproc.c:2420
 #, 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:2457
+#: g10/mainproc.c:2459
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossibile controllare la firma: %s\n"
 
-#: g10/mainproc.c:2553 g10/mainproc.c:2572 g10/mainproc.c:2696
+#: g10/mainproc.c:2555 g10/mainproc.c:2574 g10/mainproc.c:2698
 #, c-format
 msgid "not a detached signature\n"
 msgstr "non è una firma separata\n"
 
-#: g10/mainproc.c:2606
+#: g10/mainproc.c:2608
 #, 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:2615
+#: g10/mainproc.c:2617
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "firma solitaria di classe 0x%02x\n"
 
-#: g10/mainproc.c:2700
+#: g10/mainproc.c:2702
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma vecchio stile (PGP 2.x)\n"
@@ -6356,47 +6365,53 @@ msgstr "Notazione della firma critica sconosciuta: "
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "il sottopacchetto di tipo %d ha un bit critico impostato\n"
 
-#: g10/passphrase.c:208
+#: g10/passphrase.c:201 sm/decrypt.c:669
+#, fuzzy
+#| msgid "Please enter the new passphrase"
+msgid "Please enter the passphrase for decryption."
+msgstr "Inserisci la nuova passphrase"
+
+#: g10/passphrase.c:203
 msgid "Enter passphrase\n"
 msgstr "Inserisci la passphrase\n"
 
-#: g10/passphrase.c:219
+#: g10/passphrase.c:227
 #, c-format
 msgid "cancelled by user\n"
 msgstr "interrotto dall'utente\n"
 
-#: g10/passphrase.c:460
+#: g10/passphrase.c:472
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (ID chiave principale %s)"
 
-#: g10/passphrase.c:467
+#: g10/passphrase.c:479
 msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 msgstr "Immettere la passphrase per sbloccare la chiave segreta OpenPGP:"
 
-#: g10/passphrase.c:471
+#: g10/passphrase.c:483
 msgid "Please enter the passphrase to import the OpenPGP secret key:"
 msgstr "Immettere la passphrase per importare la chiave segreta OpenPGP:"
 
-#: g10/passphrase.c:476
+#: g10/passphrase.c:488
 msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 msgstr "Immettere la passphrase per esportare la sottochiave segreta OpenPGP:"
 
-#: g10/passphrase.c:479
+#: g10/passphrase.c:491
 msgid "Please enter the passphrase to export the OpenPGP secret key:"
 msgstr "Immettere la passphrase per esportare la chiave segreta OpenPGP:"
 
-#: g10/passphrase.c:484
+#: g10/passphrase.c:496
 msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 msgstr ""
 "Si desidera eliminare definitivamente la chiave della sottochiave segreta "
 "OpenPGP:"
 
-#: g10/passphrase.c:487
+#: g10/passphrase.c:499
 msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgstr "Si desidera eliminare definitivamente la chiave segreta OpenPGP:"
 
-#: g10/passphrase.c:496
+#: g10/passphrase.c:508
 #, c-format
 msgid ""
 "%s\n"
@@ -6571,7 +6586,7 @@ msgstr ""
 "Il livello di attendibilità minimo per questa chiave è: %s\n"
 "\n"
 
-#: g10/pkclist.c:313 g10/revoke.c:803
+#: g10/pkclist.c:313 g10/revoke.c:804
 msgid "Your decision? "
 msgstr "Cosa hai deciso? "
 
@@ -6871,7 +6886,7 @@ msgstr "impossibile aprire i dati firmati '%s'\n"
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "impossibile aprire i dati firmati fd=%d: %s\n"
 
-#: g10/pubkey-enc.c:99 sm/decrypt.c:879
+#: g10/pubkey-enc.c:99 sm/decrypt.c:1329
 #, c-format
 msgid "key %s is not suitable for decryption in %s mode\n"
 msgstr "la chiave %s non è adatta per la decrittografia in modalità %s\n"
@@ -6920,7 +6935,7 @@ msgid "Note: key has been revoked"
 msgstr "Nota: la chiave è stata revocata"
 
 #: g10/revoke.c:100 g10/revoke.c:126 g10/revoke.c:172 g10/revoke.c:184
-#: g10/revoke.c:502
+#: g10/revoke.c:503
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet fallito: %s\n"
@@ -6946,11 +6961,11 @@ msgstr "La chiave segreta non è disponibile.\n"
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Creare un certificato di revoca designato per questa chiave? (y/N) "
 
-#: g10/revoke.c:334 g10/revoke.c:744
+#: g10/revoke.c:334 g10/revoke.c:745
 msgid "ASCII armored output forced.\n"
 msgstr "Forzato l'output con armatura ASCII.\n"
 
-#: g10/revoke.c:350 g10/revoke.c:481
+#: g10/revoke.c:350 g10/revoke.c:482
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet fallito: %s\n"
@@ -6964,11 +6979,11 @@ msgstr "Certificato di revoca creato.\n"
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "nessuna chiave di revoca trovata per \"%s\"\n"
 
-#: g10/revoke.c:567
+#: g10/revoke.c:568
 msgid "This is a revocation certificate for the OpenPGP key:"
 msgstr "Questo è un certificato di revoca per la chiave OpenPGP:"
 
-#: g10/revoke.c:583
+#: g10/revoke.c:584
 msgid ""
 "A revocation certificate is a kind of \"kill switch\" to publicly\n"
 "declare that a key shall not anymore be used.  It is not possible\n"
@@ -6979,7 +6994,7 @@ msgstr ""
 "Non è possibile ritirare un certificato di revoca una volta che è stato\n"
 "pubblicato."
 
-#: g10/revoke.c:586
+#: g10/revoke.c:587
 msgid ""
 "Use it to revoke this key in case of a compromise or loss of\n"
 "the secret key.  However, if the secret key is still accessible,\n"
@@ -6994,7 +7009,7 @@ msgstr ""
 "un motivo per la revoca.  Per i dettagli, vedere la descrizione di\n"
 "del comando gpg \"--generate-revocation\" nel manuale GnuPG."
 
-#: g10/revoke.c:592
+#: g10/revoke.c:593
 msgid ""
 "To avoid an accidental use of this file, a colon has been inserted\n"
 "before the 5 dashes below.  Remove this colon with a text editor\n"
@@ -7004,12 +7019,12 @@ msgstr ""
 "punti prima dei 5 trattini in basso. Rimuovere tali due punti con un\n"
 "editor di testo prima di importare e pubblicare il certificato di revoca."
 
-#: g10/revoke.c:611
+#: g10/revoke.c:612
 #, c-format
 msgid "revocation certificate stored as '%s.rev'\n"
 msgstr "certificato di revoca archiviato come '%s.rev'\n"
 
-#: g10/revoke.c:655
+#: g10/revoke.c:656
 #, c-format
 msgid "secret key \"%s\" not found\n"
 msgstr "chiave segreta \"%s\" non trovata\n"
@@ -7017,21 +7032,21 @@ msgstr "chiave segreta \"%s\" non trovata\n"
 #. TRANSLATORS: The %s prints a key specification which
 #. for example has been given at the command line.  Several lines
 #. lines with secret key infos are printed after this message.
-#: g10/revoke.c:680
+#: g10/revoke.c:681
 #, c-format
 msgid "'%s' matches multiple secret keys:\n"
 msgstr "'%s' corrisponde a più chiavi segrete:\n"
 
-#: g10/revoke.c:705
+#: g10/revoke.c:706
 #, c-format
 msgid "error searching the keyring: %s\n"
 msgstr "errore durante la ricerca del portachiave: %s\n"
 
-#: g10/revoke.c:728
+#: g10/revoke.c:729
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Creare un certificato di revoca per questa chiave? (y/N) "
 
-#: g10/revoke.c:752
+#: g10/revoke.c:753
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -7051,33 +7066,33 @@ msgstr ""
 "disponibili\n"
 "ad altri!\n"
 
-#: g10/revoke.c:786
+#: g10/revoke.c:787
 msgid "Please select the reason for the revocation:\n"
 msgstr "Per favore scegli il motivo della revoca:\n"
 
-#: g10/revoke.c:796
+#: g10/revoke.c:797
 msgid "Cancel"
 msgstr "Cancella"
 
-#: g10/revoke.c:798
+#: g10/revoke.c:799
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Probabilmente volevi scegliere %d)\n"
 
-#: g10/revoke.c:839
+#: g10/revoke.c:843
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Inserisci una descrizione opzionale; terminala con una riga vuota:\n"
 
-#: g10/revoke.c:867
+#: g10/revoke.c:871
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Motivo della revoca: %s\n"
 
-#: g10/revoke.c:869
+#: g10/revoke.c:873
 msgid "(No description given)\n"
 msgstr "(Non è stata data una descrizione)\n"
 
-#: g10/revoke.c:874
+#: g10/revoke.c:878
 msgid "Is this okay? (y/N) "
 msgstr "Va bene così? (y/N) "
 
@@ -7256,24 +7271,24 @@ msgstr "firma:"
 msgid "%s.%s encryption will be used\n"
 msgstr "%s.%s verrà utilizzata la crittografia di Questo tipo\n"
 
-#: g10/skclist.c:172 g10/skclist.c:253
+#: g10/skclist.c:173 g10/skclist.c:254
 #, c-format
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "la chiave non è indicata come insicura - impossibile usarla con il RNG "
 "finto!\n"
 
-#: g10/skclist.c:204
+#: g10/skclist.c:205
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "\"%s\" ignorato: duplicato\n"
 
-#: g10/skclist.c:223
+#: g10/skclist.c:224
 #, c-format
 msgid "skipped: secret key already present\n"
 msgstr "saltata: chiave pubblica già presente\n"
 
-#: g10/skclist.c:242
+#: g10/skclist.c:243
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "si tratta di una chiave Elgamal generata da PGP che non è sicura per le "
@@ -7495,10 +7510,10 @@ msgstr "versione del database TOFU non supportata: %s\n"
 msgid "TOFU DB error"
 msgstr "Errore DB TOFU"
 
-#: g10/tofu.c:687 g10/tofu.c:2073 g10/tofu.c:2354 g10/tofu.c:2373
-#: g10/tofu.c:2386 g10/tofu.c:2398 g10/tofu.c:2413 g10/tofu.c:2425
-#: g10/tofu.c:3021 g10/tofu.c:3038 g10/tofu.c:3075 g10/tofu.c:3092
-#: g10/tofu.c:3404
+#: g10/tofu.c:687 g10/tofu.c:2077 g10/tofu.c:2358 g10/tofu.c:2377
+#: g10/tofu.c:2390 g10/tofu.c:2402 g10/tofu.c:2417 g10/tofu.c:2429
+#: g10/tofu.c:3025 g10/tofu.c:3042 g10/tofu.c:3079 g10/tofu.c:3096
+#: g10/tofu.c:3408
 #, c-format
 msgid "error reading TOFU database: %s\n"
 msgstr "errore durante la lettura del database TOFU: %s\n"
@@ -7519,7 +7534,7 @@ msgstr "errore durante l'inizializzazione del database TOFU: %s\n"
 msgid "error opening TOFU database '%s': %s\n"
 msgstr "errore durante l'apertura del database TOFU '%s': %s\n"
 
-#: g10/tofu.c:1148 g10/tofu.c:3458 g10/tofu.c:3604
+#: g10/tofu.c:1148 g10/tofu.c:3462 g10/tofu.c:3608
 #, c-format
 msgid "error updating TOFU database: %s\n"
 msgstr "errore durante l'aggiornamento del database TOFU: %s\n"
@@ -7563,17 +7578,17 @@ msgstr "errore durante la raccolta di altri ID utente: %s\n"
 msgid "This key's user IDs:\n"
 msgstr "ID utente di questa chiave:\n"
 
-#: g10/tofu.c:1634 g10/tofu.c:1799
+#: g10/tofu.c:1634 g10/tofu.c:1801
 #, c-format
 msgid "policy: %s"
 msgstr "criterio: %s"
 
-#: g10/tofu.c:1725
+#: g10/tofu.c:1727
 #, c-format
 msgid "error gathering signature stats: %s\n"
 msgstr "errore durante la raccolta delle statistiche di firma: %s\n"
 
-#: g10/tofu.c:1729
+#: g10/tofu.c:1731
 #, c-format
 msgid "The email address \"%s\" is associated with %d key:\n"
 msgid_plural "The email address \"%s\" is associated with %d keys:\n"
@@ -7582,91 +7597,91 @@ msgstr[0] ""
 msgstr[1] ""
 "L'indirizzo di posta elettronica \"%s\" è associato alle chiavi %d!\n"
 
-#: g10/tofu.c:1747
+#: g10/tofu.c:1749
 #, c-format
 msgid "Statistics for keys with the email address \"%s\":\n"
 msgstr "Statistiche per le chiavi con indirizzo di posta elettronica \"%s\":\n"
 
-#: g10/tofu.c:1797
+#: g10/tofu.c:1799
 msgid "this key"
 msgstr "questa chiave"
 
-#: g10/tofu.c:1823
+#: g10/tofu.c:1825
 #, c-format
 msgid "Verified %d message."
 msgid_plural "Verified %d messages."
 msgstr[0] "Messaggio %d verificato."
 msgstr[1] "Messaggi %d verificati."
 
-#: g10/tofu.c:1827
+#: g10/tofu.c:1829
 #, c-format
 msgid "Encrypted %d message."
 msgid_plural "Encrypted %d messages."
 msgstr[0] "Messaggio %d crittografato."
 msgstr[1] "Messaggi %d crittografati."
 
-#: g10/tofu.c:1834
+#: g10/tofu.c:1836
 #, c-format
 msgid "Verified %d message in the future."
 msgid_plural "Verified %d messages in the future."
 msgstr[0] "Messaggio %d verificato in futuro."
 msgstr[1] "Messaggi %d verificati in futuro."
 
-#: g10/tofu.c:1838
+#: g10/tofu.c:1840
 #, c-format
 msgid "Encrypted %d message in the future."
 msgid_plural "Encrypted %d messages in the future."
 msgstr[0] "Messaggio %d crittografato in futuro."
 msgstr[1] "Messaggi %d crittografati in futuro."
 
-#: g10/tofu.c:1852
+#: g10/tofu.c:1854
 #, c-format
 msgid "Messages verified over the past %d day: %d."
 msgid_plural "Messages verified over the past %d days: %d."
 msgstr[0] "Messaggi verificati nell'ultimo %d giorno: %d."
 msgstr[1] "Messaggi verificati negli ultimi %d giorni: %d."
 
-#: g10/tofu.c:1858
+#: g10/tofu.c:1860
 #, c-format
 msgid "Messages encrypted over the past %d day: %d."
 msgid_plural "Messages encrypted over the past %d days: %d."
 msgstr[0] "Messaggi crittografati nell'ultimo %d giorno: %d."
 msgstr[1] "Messaggi crittografati negli ultimi %d giorni: %d."
 
-#: g10/tofu.c:1868
+#: g10/tofu.c:1870
 #, c-format
 msgid "Messages verified over the past %d month: %d."
 msgid_plural "Messages verified over the past %d months: %d."
 msgstr[0] "Messaggi verificati nell'ultimo %d mese: %d."
 msgstr[1] "Messaggi verificati nell'ultimo %d mesi: %d."
 
-#: g10/tofu.c:1874
+#: g10/tofu.c:1876
 #, c-format
 msgid "Messages encrypted over the past %d month: %d."
 msgid_plural "Messages encrypted over the past %d months: %d."
 msgstr[0] "Messaggi crittografati nell'ultimo %d mese: %d."
 msgstr[1] "Messaggi crittografati negli ultimi %d mesi: %d."
 
-#: g10/tofu.c:1884
+#: g10/tofu.c:1886
 #, c-format
 msgid "Messages verified over the past %d year: %d."
 msgid_plural "Messages verified over the past %d years: %d."
 msgstr[0] "Messaggi verificati nell'ultimo %d anno: %d."
 msgstr[1] "Messaggi verificati negli ultimi %d anni: %d."
 
-#: g10/tofu.c:1890
+#: g10/tofu.c:1892
 #, c-format
 msgid "Messages encrypted over the past %d year: %d."
 msgid_plural "Messages encrypted over the past %d years: %d."
 msgstr[0] "Messaggi crittografati nell'ulltimo %d anno: %d."
 msgstr[1] "Messaggi crittografati negli ultimi %d anni: %d."
 
-#: g10/tofu.c:1898
+#: g10/tofu.c:1900
 #, c-format
 msgid "Messages verified in the past: %d."
 msgstr "Messaggi verificati in passato: %d."
 
-#: g10/tofu.c:1902
+#: g10/tofu.c:1904
 #, c-format
 msgid "Messages encrypted in the past: %d."
 msgstr "Messaggi crittografati in passato: %d."
@@ -7674,104 +7689,104 @@ msgstr "Messaggi crittografati in passato: %d."
 #. TRANSLATORS: Please translate the text found in the source
 #. * file below.  We don't directly internationalize that text so
 #. * that we can tweak it without breaking translations.
-#: g10/tofu.c:1919
+#: g10/tofu.c:1921
 msgid "TOFU detected a binding conflict"
 msgstr "TOFU ha rilevato un conflitto di binding"
 
 #. TRANSLATORS: Two letters (normally the lower and upper case
 #. * version of the hotkey) for each of the five choices.  If
 #. * there is only one choice in your language, repeat it.
-#: g10/tofu.c:1961
+#: g10/tofu.c:1963
 msgid "gGaAuUrRbB"
 msgstr "gGaAuUrRbB"
 
-#: g10/tofu.c:1967
+#: g10/tofu.c:1969
 msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr "(G)ood, (A)ccept una volta, (U)nknown, (R)espellere una volta, (B)ad? "
 
-#: g10/tofu.c:1975
+#: g10/tofu.c:1978
 msgid "Defaulting to unknown.\n"
 msgstr "Impostazione predefinita sconosciuta.\n"
 
-#: g10/tofu.c:2093 g10/tofu.c:2228
+#: g10/tofu.c:2097 g10/tofu.c:2232
 #, c-format
 msgid "TOFU db corruption detected.\n"
 msgstr "Rilevato danneggiamento del database TOFU.\n"
 
-#: g10/tofu.c:2829
+#: g10/tofu.c:2833
 #, c-format
 msgid "error changing TOFU policy: %s\n"
 msgstr "errore durante la modifica del criterio TOFU: %s\n"
 
-#: g10/tofu.c:2880
+#: g10/tofu.c:2884
 #, c-format
 msgid "%lld~year"
 msgid_plural "%lld~years"
 msgstr[0] "%lld~anno"
 msgstr[1] "%lld~anni"
 
-#: g10/tofu.c:2885
+#: g10/tofu.c:2889
 #, c-format
 msgid "%lld~month"
 msgid_plural "%lld~months"
 msgstr[0] "%lld~mese"
 msgstr[1] "%lld‪‪~mesi"
 
-#: g10/tofu.c:2890
+#: g10/tofu.c:2894
 #, c-format
 msgid "%lld~week"
 msgid_plural "%lld~weeks"
 msgstr[0] "%lld~settimana"
 msgstr[1] "%lld‪‪~settimane"
 
-#: g10/tofu.c:2895
+#: g10/tofu.c:2899
 #, c-format
 msgid "%lld~day"
 msgid_plural "%lld~days"
 msgstr[0] "%lld~giorno"
 msgstr[1] "%lld~giorni"
 
-#: g10/tofu.c:2900
+#: g10/tofu.c:2904
 #, c-format
 msgid "%lld~hour"
 msgid_plural "%lld~hours"
 msgstr[0] "%lld~ora"
 msgstr[1] "%lld~ore"
 
-#: g10/tofu.c:2905
+#: g10/tofu.c:2909
 #, c-format
 msgid "%lld~minute"
 msgid_plural "%lld~minutes"
 msgstr[0] "%lld~minuto"
 msgstr[1] "%lld~minuti"
 
-#: g10/tofu.c:2907
+#: g10/tofu.c:2911
 #, c-format
 msgid "%lld~second"
 msgid_plural "%lld~seconds"
 msgstr[0] "%lld~secondo"
 msgstr[1] "%lld~secondi"
 
-#: g10/tofu.c:3145
+#: g10/tofu.c:3149
 #, c-format
 msgid "%s: Verified 0~signatures and encrypted 0~messages."
 msgstr "%s: verificata 0: firme e 0 messaggi crittografati."
 
-#: g10/tofu.c:3151
+#: g10/tofu.c:3155
 #, c-format
 msgid "%s: Verified 0 signatures."
 msgstr "%s: firme 0 verificate."
 
-#: g10/tofu.c:3165
+#: g10/tofu.c:3169
 msgid "Encrypted 0 messages."
 msgstr "Messaggi crittografati 0."
 
-#: g10/tofu.c:3181
+#: g10/tofu.c:3185
 #, c-format
 msgid "(policy: %s)"
 msgstr "(criterio: %s)"
 
-#: g10/tofu.c:3215
+#: g10/tofu.c:3219
 #, c-format
 msgid ""
 "Warning: we have yet to see a message signed using this key and user id!\n"
@@ -7779,7 +7794,7 @@ msgstr ""
 "Attenzione: dobbiamo ancora vedere un messaggio firmato utilizzando questa "
 "chiave e ID utente!\n"
 
-#: g10/tofu.c:3218
+#: g10/tofu.c:3222
 #, c-format
 msgid ""
 "Warning: we've only seen one message signed using this key and user id!\n"
@@ -7787,19 +7802,19 @@ msgstr ""
 "Attenzione: abbiamo visto solo un messaggio firmato utilizzando questa "
 "chiave e ID utente!\n"
 
-#: g10/tofu.c:3222
+#: g10/tofu.c:3226
 #, c-format
 msgid "Warning: you have yet to encrypt a message to this key!\n"
 msgstr ""
 "Attenzione: non è ancora necessario crittografare un messaggio a questa "
 "chiave!\n"
 
-#: g10/tofu.c:3225
+#: g10/tofu.c:3229
 #, c-format
 msgid "Warning: you have only encrypted one message to this key!\n"
 msgstr "Attenzione: hai crittografato solo un messaggio per questa chiave!\n"
 
-#: g10/tofu.c:3254
+#: g10/tofu.c:3258
 #, c-format
 msgid ""
 "Warning: if you think you've seen more signatures by this key and user id, "
@@ -7828,13 +7843,13 @@ msgstr[1] ""
 "  %s\n"
 "per contrassegnarlo come cattivo.\n"
 
-#: g10/tofu.c:3339 g10/tofu.c:3502 g10/tofu.c:3708 g10/tofu.c:3761
-#: g10/tofu.c:3902 g10/tofu.c:3979 g10/tofu.c:4017
+#: g10/tofu.c:3343 g10/tofu.c:3506 g10/tofu.c:3712 g10/tofu.c:3765
+#: g10/tofu.c:3906 g10/tofu.c:3983 g10/tofu.c:4021
 #, c-format
 msgid "error opening TOFU database: %s\n"
 msgstr "errore durante l'apertura del database TOFU: %s\n"
 
-#: g10/tofu.c:3535
+#: g10/tofu.c:3539
 #, c-format
 msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
 msgstr "AVVISO: crittografia a %s, che non dispone di ID utente non revocati\n"
@@ -7903,7 +7918,7 @@ msgstr "utilizzo del modello di trust %s\n"
 msgid "no need for a trustdb check\n"
 msgstr "non è necessario un controllo del trustdb\n"
 
-#: g10/trustdb.c:601 g10/trustdb.c:2272
+#: g10/trustdb.c:601 g10/trustdb.c:2273
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "il prossimo controllo del trustdb sarà fatto il %s\n"
@@ -7934,31 +7949,31 @@ msgstr "per favore usa --check-trustdb\n"
 msgid "checking the trustdb\n"
 msgstr "controllo il trustdb\n"
 
-#: g10/trustdb.c:1993
+#: g10/trustdb.c:1994
 #, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr[0] "Chiave %d elaborata"
 msgstr[1] "Chiavi %d elaborate"
 
-#: g10/trustdb.c:1996
+#: g10/trustdb.c:1997
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] " (%d conteggio di validità cancellato)\n"
 msgstr[1] " (%d conteggi di validità cancellati)\n"
 
-#: g10/trustdb.c:2066
+#: g10/trustdb.c:2067
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "non è stata trovata alcuna chiave definitivamente affidabile\n"
 
-#: g10/trustdb.c:2080
+#: g10/trustdb.c:2081
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "chiave pubblica della chiave attendibile %s non trovata\n"
 
-#: g10/trustdb.c:2198
+#: g10/trustdb.c:2199
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -7966,30 +7981,30 @@ msgstr ""
 "profondità: %d  valido: %3d  firmato: %3d  trust: %d-, %dq, %dn, %dm, %df, "
 "%du\n"
 
-#: g10/trustdb.c:2279
+#: g10/trustdb.c:2280
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
 "impossibile aggiornare il record della versione trustdb: scrittura non "
 "riuscita: %s\n"
 
-#: g10/trust.c:125
+#: g10/trust.c:114
 msgid "undefined"
 msgstr "non definito"
 
-#: g10/trust.c:126
+#: g10/trust.c:115
 msgid "never"
 msgstr "mai"
 
-#: g10/trust.c:127
+#: g10/trust.c:116
 msgid "marginal"
 msgstr "marginale"
 
-#: g10/trust.c:128
+#: g10/trust.c:117
 msgid "full"
 msgstr "intero"
 
-#: g10/trust.c:129
+#: g10/trust.c:118
 msgid "ultimate"
 msgstr "definitivo"
 
@@ -8001,39 +8016,39 @@ msgstr "definitivo"
 #. It gets passed to atoi() so everything after the number is
 #. essentially a comment and need not be translated.  Either key and
 #. uid are both NULL, or neither are NULL.
-#: g10/trust.c:166
+#: g10/trust.c:155
 msgid "10 translator see trust.c:uid_trust_string_fixed"
 msgstr "10 traduttore vedere trust.c:uid_trust_string_fixed"
 
-#: g10/trust.c:169
+#: g10/trust.c:158
 msgid "[ revoked]"
 msgstr "[ revocato]"
 
-#: g10/trust.c:171 g10/trust.c:177
+#: g10/trust.c:160 g10/trust.c:166
 msgid "[ expired]"
 msgstr "[ scaduto]"
 
-#: g10/trust.c:176
+#: g10/trust.c:165
 msgid "[ unknown]"
 msgstr "[ sconosciuto]"
 
-#: g10/trust.c:178
+#: g10/trust.c:167
 msgid "[  undef ]"
 msgstr "[  undef ]"
 
-#: g10/trust.c:179
+#: g10/trust.c:168
 msgid "[  never ]"
 msgstr "[  mai ]"
 
-#: g10/trust.c:180
+#: g10/trust.c:169
 msgid "[marginal]"
 msgstr "[marginale]"
 
-#: g10/trust.c:181
+#: g10/trust.c:170
 msgid "[  full  ]"
 msgstr "[  completo  ]"
 
-#: g10/trust.c:182
+#: g10/trust.c:171
 msgid "[ultimate]"
 msgstr "[ultimo]"
 
@@ -8092,16 +8107,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:4937 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2386
+#: scd/app-piv.c:1770 scd/app-p15.c:5035 scd/app-nks.c:1530
+#: scd/app-openpgp.c:2387
 #, 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:4956 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2402
+#: scd/app-piv.c:1787 scd/app-p15.c:5054 scd/app-nks.c:1549
+#: scd/app-openpgp.c:2403
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr "Tentativi rimanenti: %d"
@@ -8130,10 +8145,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:2669
-#: scd/app-openpgp.c:2693 scd/app-openpgp.c:2871 scd/app-openpgp.c:2893
-#: scd/app-openpgp.c:3074 scd/app-openpgp.c:3361 scd/app-openpgp.c:3408
-#: scd/app-openpgp.c:3545 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2670
+#: scd/app-openpgp.c:2694 scd/app-openpgp.c:2872 scd/app-openpgp.c:2894
+#: scd/app-openpgp.c:3075 scd/app-openpgp.c:3362 scd/app-openpgp.c:3409
+#: scd/app-openpgp.c:3547 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "Errore di richiamata PIN: %s\n"
@@ -8153,57 +8168,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:3616
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3618
 #, c-format
 msgid "key already exists\n"
 msgstr "chiave già esistente\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3620
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3622
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "chiave esistente verrà sostituita\n"
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3622
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3624
 #, c-format
 msgid "generating new key\n"
 msgstr "generazione di una nuova chiave\n"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3624
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3626
 #, c-format
 msgid "writing new key\n"
 msgstr "genera una nuova coppia di chiavi\n"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4484 scd/app-openpgp.c:4767
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4486 scd/app-openpgp.c:4761
 #, 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:1615
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1616
 #, 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:1622
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1623
 #, 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:1732
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1733
 #, 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:4943
+#: scd/app-piv.c:3279 scd/app-openpgp.c:4937
 #, 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:4951
+#: scd/app-piv.c:3294 scd/app-openpgp.c:4945
 #, c-format
 msgid "generating key failed\n"
 msgstr "generazione della chiave non riuscita\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4957
+#: scd/app-piv.c:3300 scd/app-openpgp.c:4951
 #, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
@@ -8213,35 +8228,35 @@ msgstr[1] ""
 "\n"
 "\n"
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1842 scd/app-openpgp.c:4966
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1843 scd/app-openpgp.c:4960
 #, 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:5035 scd/app-nks.c:2038
+#: scd/app-p15.c:5133 scd/app-nks.c:2038
 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:5038 scd/app-openpgp.c:2818
+#: scd/app-p15.c:5136 scd/app-openpgp.c:2819
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Inserisci il PIN di amministratore"
 
-#: scd/app-p15.c:5040 scd/app-nks.c:2028
+#: scd/app-p15.c:5138 scd/app-nks.c:2028
 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:5043 scd/app-nks.c:2019
+#: scd/app-p15.c:5141 scd/app-nks.c:2019
 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:4321
+#: scd/app-nks.c:1468 scd/app-openpgp.c:4323
 #, 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:4333
+#: scd/app-nks.c:1476 scd/app-openpgp.c:4335
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "Esponente pubblico RSA mancante o superiore a %d bit\n"
@@ -8284,27 +8299,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:3442 scd/app-dinsig.c:534
+#: scd/app-nks.c:2221 scd/app-openpgp.c:3443 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:943
+#: scd/app-openpgp.c:944
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "impossibile memorizzare l'impronta digitale: %s\n"
 
-#: scd/app-openpgp.c:956
+#: scd/app-openpgp.c:957
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "impossibile memorizzare la data di creazione: %s\n"
 
-#: scd/app-openpgp.c:1427 scd/app-openpgp.c:3389 scd/app-openpgp.c:5715
+#: scd/app-openpgp.c:1428 scd/app-openpgp.c:3390 scd/app-openpgp.c:5709
 #, 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:1949
+#: scd/app-openpgp.c:1950
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "lettura della chiave pubblica non riuscita: %s\n"
@@ -8312,44 +8327,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:2373
+#: scd/app-openpgp.c:2374
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr "%sNumero: %s%%0AHolder: %s%%0ACounter: %lu%s"
 
-#: scd/app-openpgp.c:2621
+#: scd/app-openpgp.c:2622
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "utilizzando il PIN predefinito come %s\n"
 
-#: scd/app-openpgp.c:2628
+#: scd/app-openpgp.c:2629
 #, 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:2641
+#: scd/app-openpgp.c:2642
 msgid "||Please unlock the card"
 msgstr "||Si prega di sbloccare la carta"
 
-#: scd/app-openpgp.c:2700 scd/app-openpgp.c:2900 scd/app-openpgp.c:3368
+#: scd/app-openpgp.c:2701 scd/app-openpgp.c:2901 scd/app-openpgp.c:3369
 #, 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:2717 scd/app-openpgp.c:2760 scd/app-openpgp.c:2917
-#: scd/app-openpgp.c:5325
+#: scd/app-openpgp.c:2718 scd/app-openpgp.c:2761 scd/app-openpgp.c:2918
+#: scd/app-openpgp.c:5319
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "verifica CHV%d non riuscita: %s\n"
 
-#: scd/app-openpgp.c:2804 scd/app-openpgp.c:5724
+#: scd/app-openpgp.c:2805 scd/app-openpgp.c:5718
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "carta è bloccata in modo permanente!\n"
 
-#: scd/app-openpgp.c:2808
+#: scd/app-openpgp.c:2809
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8361,20 +8376,20 @@ msgstr[1] ""
 "%d tentativi di PIN di amministrazione rimanenti prima che la schede vengano "
 "bloccate in modo permanente\n"
 
-#: scd/app-openpgp.c:2841
+#: scd/app-openpgp.c:2842
 #, 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:3355
+#: scd/app-openpgp.c:3356
 msgid "||Please enter the PIN"
 msgstr "||Inserisci il PIN"
 
-#: scd/app-openpgp.c:3404
+#: scd/app-openpgp.c:3405
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Inserisci il Codice reset per la carta"
 
-#: scd/app-openpgp.c:3414 scd/app-openpgp.c:3481
+#: scd/app-openpgp.c:3415 scd/app-openpgp.c:3484
 #, 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"
@@ -8382,72 +8397,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:3437
+#: scd/app-openpgp.c:3438
 msgid "|RN|New Reset Code"
 msgstr "|RN|Nuovo codice di ripristino"
 
-#: scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3439
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Nuovo PIN di amministrazione"
 
-#: scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3439
 msgid "|N|New PIN"
 msgstr "|N|Nuovo PIN"
 
-#: scd/app-openpgp.c:3541
+#: scd/app-openpgp.c:3543
 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:3542
+#: scd/app-openpgp.c:3544
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Inserisci il PIN e il nuovo PIN"
 
-#: scd/app-openpgp.c:3600 scd/app-openpgp.c:5026
+#: scd/app-openpgp.c:3602 scd/app-openpgp.c:5020
 #, c-format
 msgid "error reading application data\n"
 msgstr "errore durante la lettura dei dati dell'applicazione\n"
 
-#: scd/app-openpgp.c:3606 scd/app-openpgp.c:5033
+#: scd/app-openpgp.c:3608 scd/app-openpgp.c:5027
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "errore durante la lettura dell'impronta digitale DO\n"
 
-#: scd/app-openpgp.c:4302 scd/app-openpgp.c:4657
+#: scd/app-openpgp.c:4304 scd/app-openpgp.c:4653
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "timestamp di creazione mancante\n"
 
-#: scd/app-openpgp.c:4343 scd/app-openpgp.c:4351
+#: scd/app-openpgp.c:4345 scd/app-openpgp.c:4353
 #, 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:4651
+#: scd/app-openpgp.c:4647
 #, c-format
 msgid "unsupported curve\n"
 msgstr "curva non supportata\n"
 
-#: scd/app-openpgp.c:4991
+#: scd/app-openpgp.c:4985
 #, 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:5041
+#: scd/app-openpgp.c:5035
 #, 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:5240
+#: scd/app-openpgp.c:5234
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "scheda non supporta l'algoritmo digest %s\n"
 
-#: scd/app-openpgp.c:5298
+#: scd/app-openpgp.c:5292
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "firme create finora: %lu\n"
 
-#: scd/app-openpgp.c:5729
+#: scd/app-openpgp.c:5723
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
@@ -8455,7 +8470,7 @@ msgstr ""
 "la verifica del PIN di amministrazione è attualmente vietata tramite questo "
 "comando\n"
 
-#: scd/app-openpgp.c:6241 scd/app-openpgp.c:6252
+#: scd/app-openpgp.c:6250 scd/app-openpgp.c:6261
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "impossibile accedere a %s - scheda OpenPGP non valida?\n"
@@ -8475,7 +8490,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:274 dirmngr/dirmngr.c:198
+#: scd/scdaemon.c:136 sm/gpgsm.c:274 dirmngr/dirmngr.c:199
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LEVEL| impostare il livello di debug su LEVEL"
 
@@ -8538,12 +8553,12 @@ msgstr ""
 "si prega di utilizzare l'opzione '--daemon' per eseguire il programma in "
 "background\n"
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2104
+#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2143
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "gestore per fd %d avviato\n"
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2112
+#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2151
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "gestore per fd %d terminato\n"
@@ -8553,11 +8568,11 @@ msgstr "gestore per fd %d terminato\n"
 msgid "validation model requested by certificate: %s"
 msgstr "modello di convalida richiesto dal certificato: %s"
 
-#: sm/certchain.c:199 sm/certchain.c:2172
+#: sm/certchain.c:199 sm/certchain.c:2174
 msgid "chain"
 msgstr "catena"
 
-#: sm/certchain.c:200 sm/certchain.c:2172
+#: sm/certchain.c:200 sm/certchain.c:2174
 msgid "shell"
 msgstr "shell"
 
@@ -8590,227 +8605,227 @@ msgstr "Nota: i criteri di certificato non critici non sono consentiti"
 msgid "certificate policy not allowed"
 msgstr "criteri certificato non consentiti"
 
-#: sm/certchain.c:595 sm/keydb.c:1891 sm/keydb.c:1980
+#: sm/certchain.c:596 sm/keydb.c:1913 sm/keydb.c:2002
 #, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "non è riuscito a ottenere l'impronta digitale\n"
 
-#: sm/certchain.c:624
+#: sm/certchain.c:625
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr "ricerca dell'emittente in una posizione esterna\n"
 
-#: sm/certchain.c:644
+#: sm/certchain.c:645
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "numero di emittenti corrispondenti: %d\n"
 
-#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#: sm/certchain.c:724 dirmngr/ocsp.c:683
 #, c-format
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "impossibile ottenere authorityInfoAccess: %s\n"
 
-#: sm/certchain.c:791
+#: sm/certchain.c:792
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr "ricerca dell'autorità emittente dalla cache di Dirmngr\n"
 
-#: sm/certchain.c:816
+#: sm/certchain.c:817
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "numero di certificati corrispondenti: %d\n"
 
-#: sm/certchain.c:819
+#: sm/certchain.c:820
 #, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "ricerca chiave solo cache dirmngr non riuscita: %s\n"
 
-#: sm/certchain.c:1046 sm/certchain.c:1561 sm/certchain.c:2200 sm/decrypt.c:643
-#: sm/encrypt.c:620 sm/import.c:414 sm/keydb.c:1898 sm/keydb.c:1987
-#: sm/sign.c:428 sm/verify.c:117
+#: sm/certchain.c:1047 sm/certchain.c:1562 sm/certchain.c:2202
+#: sm/decrypt.c:1084 sm/encrypt.c:621 sm/import.c:414 sm/keydb.c:1920
+#: sm/keydb.c:2009 sm/sign.c:428 sm/verify.c:117
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "impossibile allocare l'handle keyDB\n"
 
-#: sm/certchain.c:1232
+#: sm/certchain.c:1233
 msgid "certificate has been revoked"
 msgstr "certificato è stato revocato"
 
-#: sm/certchain.c:1247
+#: sm/certchain.c:1248
 msgid "the status of the certificate is unknown"
 msgstr "lo stato del certificato è sconosciuto"
 
-#: sm/certchain.c:1254
+#: sm/certchain.c:1255
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr "assicurarsi che il \"dirmngr\" sia installato correttamente\n"
 
-#: sm/certchain.c:1260
+#: sm/certchain.c:1261
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "controllo del CRL non riuscito: %s"
 
-#: sm/certchain.c:1289 sm/certchain.c:1357 dirmngr/validate.c:497
+#: sm/certchain.c:1290 sm/certchain.c:1358 dirmngr/validate.c:497
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "certificato con validità non valida: %s"
 
-#: sm/certchain.c:1304 sm/certchain.c:1389 dirmngr/validate.c:515
+#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:515
 #, c-format
 msgid "certificate not yet valid"
 msgstr "certificato non ancora valido"
 
-#: sm/certchain.c:1305 sm/certchain.c:1390
+#: sm/certchain.c:1306 sm/certchain.c:1391
 msgid "root certificate not yet valid"
 msgstr "certificato radice non ancora valido"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1307 sm/certchain.c:1392
 msgid "intermediate certificate not yet valid"
 msgstr "certificato intermedio non ancora valido"
 
-#: sm/certchain.c:1319 dirmngr/validate.c:526
+#: sm/certchain.c:1320 dirmngr/validate.c:526
 #, c-format
 msgid "certificate has expired"
 msgstr "certificato è scaduto"
 
-#: sm/certchain.c:1320
+#: sm/certchain.c:1321
 msgid "root certificate has expired"
 msgstr "certificato radice scaduto"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1322
 msgid "intermediate certificate has expired"
 msgstr "certificato intermedio scaduto"
 
-#: sm/certchain.c:1363
+#: sm/certchain.c:1364
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr "attributi obbligatori del certificato mancanti: %s%s%s"
 
-#: sm/certchain.c:1372
+#: sm/certchain.c:1373
 msgid "certificate with invalid validity"
 msgstr "certificato con validità non valida"
 
-#: sm/certchain.c:1409
+#: sm/certchain.c:1410
 msgid "signature not created during lifetime of certificate"
 msgstr "firma non creata durante la durata del certificato"
 
-#: sm/certchain.c:1411
+#: sm/certchain.c:1412
 msgid "certificate not created during lifetime of issuer"
 msgstr "certificato non creato durante la durata dell'emittente"
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1413
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
 "certificato intermedio non creato durante la durata dell'autorità emittente"
 
-#: sm/certchain.c:1416
+#: sm/certchain.c:1417
 #, c-format
 msgid "  (  signature created at "
 msgstr " (  firma creata alle "
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1418
 #, c-format
 msgid "  (certificate created at "
 msgstr "  (certificato creato alle "
 
-#: sm/certchain.c:1420
+#: sm/certchain.c:1421
 #, c-format
 msgid "  (certificate valid from "
 msgstr "  (certificato valido da "
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1422
 #, c-format
 msgid "  (     issuer valid from "
 msgstr "  (     emittente valido da "
 
-#: sm/certchain.c:1451 dirmngr/validate.c:577
+#: sm/certchain.c:1452 dirmngr/validate.c:577
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "impronta digitale=%s\n"
 
-#: sm/certchain.c:1460
+#: sm/certchain.c:1461
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr "certificato radice è stato contrassegnato come attendibile\n"
 
-#: sm/certchain.c:1473
+#: sm/certchain.c:1474
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr "contrassegno interattivo come attendibile non abilitato in gpg-agent\n"
 
-#: sm/certchain.c:1479
+#: sm/certchain.c:1480
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 "contrassegno interattivo come attendibile disabilitato per questa sessione\n"
 
-#: sm/certchain.c:1538
+#: sm/certchain.c:1539
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 "AVVISO: ora di creazione della firma non nota - presupponendo l'ora corrente"
 
-#: sm/certchain.c:1602
+#: sm/certchain.c:1603
 msgid "no issuer found in certificate"
 msgstr "nessuna autorità emittente trovata nel certificato"
 
-#: sm/certchain.c:1680
+#: sm/certchain.c:1681
 msgid "self-signed certificate has a BAD signature"
 msgstr "certificato autofirmato ha una firma BAD"
 
-#: sm/certchain.c:1749 dirmngr/validate.c:575
+#: sm/certchain.c:1750 dirmngr/validate.c:575
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "certificato radice non contrassegnato come attendibile"
 
-#: sm/certchain.c:1765
+#: sm/certchain.c:1766
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "controllo dell'elenco di attendibilità non riuscito: %s\n"
 
-#: sm/certchain.c:1796 sm/import.c:175 dirmngr/validate.c:630
+#: sm/certchain.c:1797 sm/import.c:175 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "catena di certificati troppo lunga\n"
 
-#: sm/certchain.c:1808 dirmngr/validate.c:642
+#: sm/certchain.c:1809 dirmngr/validate.c:642
 #, c-format
 msgid "issuer certificate not found"
 msgstr "certificato dell'autorità emittente non trovato"
 
-#: sm/certchain.c:1842 dirmngr/validate.c:668
+#: sm/certchain.c:1844 dirmngr/validate.c:668
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr "certificato ha una firma BAD"
 
-#: sm/certchain.c:1874 dirmngr/validate.c:692
+#: sm/certchain.c:1876 dirmngr/validate.c:692
 msgid "found another possible matching CA certificate - trying again"
 msgstr "trovato un altro possibile certificato CA corrispondente - riprovare"
 
-#: sm/certchain.c:1933 dirmngr/validate.c:717
+#: sm/certchain.c:1935 dirmngr/validate.c:717
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "catena di certificati più lunga di quella consentita dalla CA (%d)"
 
-#: sm/certchain.c:1975 sm/certchain.c:2275 dirmngr/validate.c:747
+#: sm/certchain.c:1977 sm/certchain.c:2278 dirmngr/validate.c:747
 #, c-format
 msgid "certificate is good\n"
 msgstr "certificato è buono\n"
 
-#: sm/certchain.c:1976
+#: sm/certchain.c:1978
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "certificato intermedio è buono\n"
 
-#: sm/certchain.c:1977
+#: sm/certchain.c:1979
 #, c-format
 msgid "root certificate is good\n"
 msgstr "certificato radice è buono\n"
 
-#: sm/certchain.c:2159
+#: sm/certchain.c:2161
 msgid "switching to chain model"
 msgstr "passaggio al modello a catena"
 
-#: sm/certchain.c:2168
+#: sm/certchain.c:2170
 #, c-format
 msgid "validation model used: %s"
 msgstr "modello di convalida utilizzato: %s"
@@ -8821,18 +8836,18 @@ 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:1372 dirmngr/validate.c:903
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1411 dirmngr/validate.c:903
 #: dirmngr/validate.c:927
 #, c-format
 msgid "out of core\n"
 msgstr "fuori dal nucleo\n"
 
-#: sm/certcheck.c:389 sm/verify.c:212
+#: sm/certcheck.c:388 sm/verify.c:212
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(questo è l'algoritmo MD2)\n"
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:793
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:794
 msgid "none"
 msgstr "nessuno"
 
@@ -9133,17 +9148,17 @@ msgstr "Pronto.  È ora necessario inviare questa richiesta alla CA.\n"
 msgid "resource problem: out of core\n"
 msgstr "problema delle risorse: fuori dal nucleo\n"
 
-#: sm/decrypt.c:719
+#: sm/decrypt.c:1159
 #, c-format
 msgid "(this is the RC2 algorithm)\n"
 msgstr "(questo è l'algoritmo RC2)\n"
 
-#: sm/decrypt.c:721
+#: sm/decrypt.c:1161
 #, c-format
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr "(questo non sembra essere un messaggio crittografato)\n"
 
-#: sm/decrypt.c:868
+#: sm/decrypt.c:1318
 #, c-format
 msgid "encrypted to %s key %s\n"
 msgstr "crittografato per %s chiave %s\n"
@@ -9153,7 +9168,7 @@ msgstr "crittografato per %s chiave %s\n"
 msgid "certificate '%s' not found: %s\n"
 msgstr "certificato '%s' non trovato: %s\n"
 
-#: sm/delete.c:120 sm/keydb.c:1999 sm/keydb.c:2098
+#: sm/delete.c:120 sm/keydb.c:2021 sm/keydb.c:2120
 #, c-format
 msgid "error locking keybox: %s\n"
 msgstr "errore durante il blocco della keybox: %s\n"
@@ -9173,7 +9188,7 @@ msgstr "certificato '%s' eliminato\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "eliminazione del certificato \"%s\" non riuscita: %s\n"
 
-#: sm/encrypt.c:606
+#: sm/encrypt.c:607
 #, c-format
 msgid "no valid recipients given\n"
 msgstr "nessun destinatario valido dato\n"
@@ -9242,63 +9257,63 @@ msgstr "|USER-ID|utilizzare USER-ID come chiave segreta predefinita"
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|FILE|aggiungere il tasto all'elenco dei keyring"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:352 dirmngr/dirmngr.c:265
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|SPEC|utilizzare questo keyserver per cercare le chiavi"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:363
 msgid "fetch missing issuer certificates"
 msgstr "recupera i certificati degli emittenti mancanti"
 
-#: sm/gpgsm.c:364
+#: sm/gpgsm.c:365
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "Nome: utilizzare il nome di codifica per le passphrase PKCS-12"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:386
 msgid "never consult a CRL"
 msgstr "non consultare mai una CRL"
 
-#: sm/gpgsm.c:389
+#: sm/gpgsm.c:390
 msgid "do not check CRLs for root certificates"
 msgstr "non controllare i certificati radice nei CRL"
 
-#: sm/gpgsm.c:393
+#: sm/gpgsm.c:394
 msgid "check validity using OCSP"
 msgstr "verificare la validità utilizzando OCSP"
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:396
 msgid "do not check certificate policies"
 msgstr "non controllare le politiche dei certificati"
 
-#: sm/gpgsm.c:398
+#: sm/gpgsm.c:399
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|usa l'algoritmo di cifratura NAME"
 
-#: sm/gpgsm.c:400
+#: sm/gpgsm.c:401
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|usa l'algoritmo di message digest NAME"
 
-#: sm/gpgsm.c:410
+#: sm/gpgsm.c:411
 msgid "batch mode: never ask"
 msgstr "modo batch: non fa domande"
 
-#: sm/gpgsm.c:412
+#: sm/gpgsm.c:413
 msgid "assume yes on most questions"
 msgstr "risponde \"sì\" a quasi tutte le domande"
 
-#: sm/gpgsm.c:413
+#: sm/gpgsm.c:414
 msgid "assume no on most questions"
 msgstr "risponde \"no\" a quasi tutte le domande"
 
-#: sm/gpgsm.c:430
+#: sm/gpgsm.c:431
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FILE|scrittura di un registro di controllo in FILE"
 
-#: sm/gpgsm.c:615
+#: sm/gpgsm.c:616
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Utilizzo: @GPGSM@ [opzioni] [file] (-h per assistenza)"
 
-#: sm/gpgsm.c:618
+#: sm/gpgsm.c:619
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -9309,52 +9324,27 @@ msgstr ""
 "protocollo S/MIME\n"
 "Il funzionamento predefinito dipende dai dati di input\n"
 
-#: sm/gpgsm.c:826
+#: sm/gpgsm.c:827
 #, 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:837
+#: sm/gpgsm.c:838
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "modello di convalida sconosciuto '%s'\n"
 
-#: sm/gpgsm.c:896 dirmngr/ldapserver.c:89
-#, c-format
-msgid "%s:%u: no hostname given\n"
-msgstr "%s: %u: nessun nome host specificato\n"
-
-#: sm/gpgsm.c:915 dirmngr/ldapserver.c:108
-#, c-format
-msgid "%s:%u: password given without user\n"
-msgstr "%s:%u: password fornita senza utente\n"
-
-#: sm/gpgsm.c:946 dirmngr/ldapserver.c:139
-#, c-format
-msgid "%s:%u: ignoring unknown flag '%s'\n"
-msgstr "%s:%u: ignorare la bandiera sconosciuta '%s'\n"
-
-#: sm/gpgsm.c:962 dirmngr/ldapserver.c:155
-#, c-format
-msgid "%s:%u: skipping this line\n"
-msgstr "%s:%u: ignorare questa riga\n"
-
-#: sm/gpgsm.c:1550
-#, c-format
-msgid "could not parse keyserver\n"
-msgstr "impossibile analizzare il keyserver\n"
-
-#: sm/gpgsm.c:1858
+#: sm/gpgsm.c:1711
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "importazione di certificati comuni '%s'\n"
 
-#: sm/gpgsm.c:1904
+#: sm/gpgsm.c:1757
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "impossibile firmare utilizzando '%s': %s\n"
 
-#: sm/gpgsm.c:2273
+#: sm/gpgsm.c:2129
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "comando non valido (non esiste alcun comando implicito)\n"
@@ -9374,52 +9364,52 @@ msgstr "errore durante l'archiviazione del certificato\n"
 msgid "basic certificate checks failed - not imported\n"
 msgstr "controlli certificati di base non riusciti - non importati\n"
 
-#: sm/import.c:471 sm/keydb.c:2018 sm/keydb.c:2111
+#: sm/import.c:472 sm/keydb.c:2040 sm/keydb.c:2133
 #, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "errore durante il recupero dei flag memorizzati: %s\n"
 
-#: sm/import.c:530 sm/import.c:562
+#: sm/import.c:531 sm/import.c:563
 #, c-format
 msgid "error importing certificate: %s\n"
 msgstr "errore durante l'importazione del certificato: %s\n"
 
-#: sm/import.c:751 tools/gpg-connect-agent.c:1475
+#: sm/import.c:752 tools/gpg-connect-agent.c:1475
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "errore durante la lettura dell'input: %s\n"
 
-#: sm/keydb.c:503
+#: sm/keydb.c:508
 #, c-format
 msgid "no keyboxd running in this session\n"
 msgstr "nessuna cassetta delle chiavi in esecuzione in questa sessione\n"
 
-#: sm/keydb.c:595
+#: sm/keydb.c:600
 #, c-format
 msgid "error opening key DB: %s\n"
 msgstr "errore durante l'apertura della chiave DB: %s\n"
 
-#: sm/keydb.c:1936
+#: sm/keydb.c:1958
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr "problema durante la ricerca del certificato esistente: %s\n"
 
-#: sm/keydb.c:1948
+#: sm/keydb.c:1970
 #, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "errore durante la ricerca della chiave scrivibile keyDB: %s\n"
 
-#: sm/keydb.c:1956
+#: sm/keydb.c:1978
 #, c-format
 msgid "error storing certificate: %s\n"
 msgstr "errore durante l'archiviazione del certificato: %s\n"
 
-#: sm/keydb.c:2009
+#: sm/keydb.c:2031
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "problema durante la ri-ricerca del certificato: %s\n"
 
-#: sm/keydb.c:2030 sm/keydb.c:2122
+#: sm/keydb.c:2052 sm/keydb.c:2144
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr "errore durante l'archiviazione dei flag: %s\n"
@@ -9605,57 +9595,57 @@ msgstr "  oggetto ="
 msgid "error loading certificate '%s': %s\n"
 msgstr "errore durante il caricamento del certificato '%s': %s\n"
 
-#: dirmngr/certcache.c:819
+#: dirmngr/certcache.c:820
 #, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "certificati caricati in modo permanente: %u\n"
 
-#: dirmngr/certcache.c:821
+#: dirmngr/certcache.c:822
 #, c-format
 msgid "    runtime cached certificates: %u\n"
 msgstr "   certificati runtime memorizzati nella cache: %u\n"
 
-#: dirmngr/certcache.c:823
+#: dirmngr/certcache.c:824
 #, c-format
 msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "           certificati attendibili: %u (%u,%u,%u,%u)\n"
 
-#: dirmngr/certcache.c:851 dirmngr/dirmngr-client.c:392
+#: dirmngr/certcache.c:852 dirmngr/dirmngr-client.c:392
 #, c-format
 msgid "certificate already cached\n"
 msgstr "certificato già memorizzato nella cache\n"
 
-#: dirmngr/certcache.c:853
+#: dirmngr/certcache.c:854
 #, c-format
 msgid "certificate cached\n"
 msgstr "certificato memorizzato nella cache\n"
 
-#: dirmngr/certcache.c:855 dirmngr/certcache.c:875 dirmngr/dirmngr-client.c:396
+#: dirmngr/certcache.c:856 dirmngr/certcache.c:876 dirmngr/dirmngr-client.c:396
 #, c-format
 msgid "error caching certificate: %s\n"
 msgstr "errore durante la memorizzazione nella cache del certificato: %s\n"
 
-#: dirmngr/certcache.c:938
+#: dirmngr/certcache.c:939
 #, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "stringa di impronta digitale SHA1 non valida '%s'\n"
 
-#: dirmngr/certcache.c:1384 dirmngr/certcache.c:1393
+#: dirmngr/certcache.c:1385 dirmngr/certcache.c:1394
 #, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "errore durante il recupero del certificato da parte di S/N: %s\n"
 
-#: dirmngr/certcache.c:1579 dirmngr/certcache.c:1588
+#: dirmngr/certcache.c:1580 dirmngr/certcache.c:1589
 #, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "errore durante il recupero del certificato per oggetto: %s\n"
 
-#: dirmngr/certcache.c:1694 dirmngr/validate.c:483
+#: dirmngr/certcache.c:1695 dirmngr/validate.c:483
 #, c-format
 msgid "no issuer found in certificate\n"
 msgstr "nessuna autorità emittente trovata nel certificato\n"
 
-#: dirmngr/certcache.c:1704
+#: dirmngr/certcache.c:1705
 #, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "errore durante il recupero di authorityKeyIdentifier: %s\n"
@@ -9690,7 +9680,7 @@ msgstr "rimozione del file di cache '%s'\n"
 msgid "not removing file '%s'\n"
 msgstr "non rimuove il file '%s'\n"
 
-#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2380
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2383
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr "errore durante la chiusura del file della cache: %s\n"
@@ -9930,13 +9920,13 @@ msgid "error getting data from cache file: %s\n"
 msgstr "errore durante il recupero dei dati dal file di cache: %s\n"
 
 #: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1672 dirmngr/crlcache.c:1697
-#: dirmngr/crlcache.c:1763
+#: dirmngr/crlcache.c:1766
 #, c-format
 msgid "got an invalid S-expression from libksba\n"
 msgstr "ha ottenuto un'espressione S non valida da libksba\n"
 
 #: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1679 dirmngr/crlcache.c:1705
-#: dirmngr/crlcache.c:1770 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1773 dirmngr/misc.c:176
 #, c-format
 msgid "converting S-expression failed: %s\n"
 msgstr "conversione dell'espressione S non riuscita: %s\n"
@@ -9951,143 +9941,143 @@ msgstr "algoritmo hash sconosciuto '%s'\n"
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr "gcry_md_open per l'algoritmo %d non riuscito: %s\n"
 
-#: dirmngr/crlcache.c:1797 dirmngr/ocsp.c:478
+#: dirmngr/crlcache.c:1800 dirmngr/ocsp.c:478
 #, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "creazione dell'espressione S non riuscita: %s\n"
 
-#: dirmngr/crlcache.c:1871
+#: dirmngr/crlcache.c:1874
 #, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "ksba_crl_parse non riuscito: %s\n"
 
-#: dirmngr/crlcache.c:1886
+#: dirmngr/crlcache.c:1889
 #, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "errore durante l'aggiornamento del CRL: %s\n"
 
-#: dirmngr/crlcache.c:1893
+#: dirmngr/crlcache.c:1896
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr "orari di aggiornamento di questo CRL: this:%s next-%s\n"
 
-#: dirmngr/crlcache.c:1897
+#: dirmngr/crlcache.c:1900
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr ""
 "nextUpdate non specificato; assumendo un periodo di validità di un giorno\n"
 
-#: dirmngr/crlcache.c:1917
+#: dirmngr/crlcache.c:1920
 #, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "errore durante il recupero dell'elemento CRL: %s\n"
 
-#: dirmngr/crlcache.c:1932
+#: dirmngr/crlcache.c:1935
 #, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr ""
 "errore durante l'inserimento dell'elemento nel file di cache temporaneo: %s\n"
 
-#: dirmngr/crlcache.c:1959
+#: dirmngr/crlcache.c:1962
 #, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "nessuna autorità emittente CRL trovata nel CRL: %s\n"
 
-#: dirmngr/crlcache.c:1974
+#: dirmngr/crlcache.c:1977
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 "individuazione del certificato dell'autorità emittente CRL da parte di "
 "authorityKeyIdentifier\n"
 
-#: dirmngr/crlcache.c:2020
+#: dirmngr/crlcache.c:2023
 #, c-format
 msgid "CRL signature verification failed: %s\n"
 msgstr "Verifica della firma CRL non riuscita: %s\n"
 
-#: dirmngr/crlcache.c:2032
+#: dirmngr/crlcache.c:2035
 #, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr ""
 "errore durante il controllo della validità del certificato dell'autorità "
 "emittente CRL: %s\n"
 
-#: dirmngr/crlcache.c:2174
+#: dirmngr/crlcache.c:2177
 #, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "ksba_crl_new non riuscito: %s\n"
 
-#: dirmngr/crlcache.c:2181
+#: dirmngr/crlcache.c:2184
 #, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "ksba_crl_set_reader non riuscito: %s\n"
 
-#: dirmngr/crlcache.c:2215
+#: dirmngr/crlcache.c:2218
 #, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "rimosso il file di cache temporanea non più obsoleto '%s'\n"
 
-#: dirmngr/crlcache.c:2219
+#: dirmngr/crlcache.c:2222
 #, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr ""
 "problema durante la rimozione del file di cache temporanea non più obsoleto "
 "'%s': %s\n"
 
-#: dirmngr/crlcache.c:2229
+#: dirmngr/crlcache.c:2232
 #, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "errore durante la creazione del file di cache temporanea '%s': %s\n"
 
-#: dirmngr/crlcache.c:2239
+#: dirmngr/crlcache.c:2242
 #, c-format
 msgid "crl_parse_insert failed: %s\n"
 msgstr "crl_parse_insert non riuscito: %s\n"
 
-#: dirmngr/crlcache.c:2249
+#: dirmngr/crlcache.c:2252
 #, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr ""
 "errore durante il completamento del file di cache temporanea '%s': %s\n"
 
-#: dirmngr/crlcache.c:2256
+#: dirmngr/crlcache.c:2259
 #, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "errore durante la chiusura del file della cache temporanea '%s': %s\n"
 
-#: dirmngr/crlcache.c:2281
+#: dirmngr/crlcache.c:2284
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 "AVVISO: nuovo CRL ancora troppo vecchio; è scaduto su %s - il caricamento è "
 "stato completato comunque\n"
 
-#: dirmngr/crlcache.c:2285
+#: dirmngr/crlcache.c:2288
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr "nuovo CRL ancora troppo vecchio; è scaduto su %s\n"
 
-#: dirmngr/crlcache.c:2301
+#: dirmngr/crlcache.c:2304
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr "estensione CRL critica sconosciuta %s\n"
 
-#: dirmngr/crlcache.c:2311
+#: dirmngr/crlcache.c:2314
 #, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "errore durante la lettura delle estensioni CRL: %s\n"
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2365
 #, c-format
 msgid "creating cache file '%s'\n"
 msgstr "creazione del file di cache '%s'\n"
 
-#: dirmngr/crlcache.c:2394
+#: dirmngr/crlcache.c:2397
 #, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "problema durante la ridenominazione di '%s' in '%s': %s\n"
 
-#: dirmngr/crlcache.c:2408
+#: dirmngr/crlcache.c:2411
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
@@ -10096,12 +10086,12 @@ msgstr ""
 "aggiornamento del file DIR non riuscito - la voce della cache andrà persa "
 "con il successivo avvio del programma\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2448
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr "Inizio dump CRL (recuperato tramite %s)\n"
 
-#: dirmngr/crlcache.c:2468
+#: dirmngr/crlcache.c:2471
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
@@ -10109,58 +10099,58 @@ msgstr ""
 " ERRORE: il CRL non verrà utilizzato perché era ancora troppo vecchio dopo "
 "un aggiornamento!\n"
 
-#: dirmngr/crlcache.c:2471
+#: dirmngr/crlcache.c:2474
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 " ERRORE: il CRL non verrà utilizzato a causa di un'estensione critica "
 "sconosciuta!\n"
 
-#: dirmngr/crlcache.c:2474
+#: dirmngr/crlcache.c:2477
 msgid " ERROR: The CRL will not be used\n"
 msgstr " ERRORE: il CRL non verrà utilizzato\n"
 
-#: dirmngr/crlcache.c:2481
+#: dirmngr/crlcache.c:2484
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 " ERRORE: questo CRL memorizzato nella cache potrebbe essere stato "
 "manomesso!\n"
 
-#: dirmngr/crlcache.c:2499
+#: dirmngr/crlcache.c:2502
 #, c-format
 msgid " WARNING: invalid cache record length\n"
 msgstr " AVVISO: lunghezza del record della cache non valida\n"
 
-#: dirmngr/crlcache.c:2506
+#: dirmngr/crlcache.c:2509
 #, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "problema durante la lettura del record della cache: %s\n"
 
-#: dirmngr/crlcache.c:2517
+#: dirmngr/crlcache.c:2520
 #, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "problema durante la lettura della chiave della cache: %s\n"
 
-#: dirmngr/crlcache.c:2548
+#: dirmngr/crlcache.c:2551
 #, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "errore durante la lettura della voce della cache dal database: %s\n"
 
-#: dirmngr/crlcache.c:2551
+#: dirmngr/crlcache.c:2554
 msgid "End CRL dump\n"
 msgstr "Fine dump CRL\n"
 
-#: dirmngr/crlcache.c:2672
+#: dirmngr/crlcache.c:2675
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "crl_fetch tramite DP non riuscito: %s\n"
 
-#: dirmngr/crlcache.c:2683
+#: dirmngr/crlcache.c:2686
 #, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "crl_cache_insert tramite DP non riuscito: %s\n"
 
-#: dirmngr/crlcache.c:2743
+#: dirmngr/crlcache.c:2746
 #, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "crl_cache_insert tramite autorità emittente non riuscita: %s\n"
@@ -10181,7 +10171,7 @@ msgstr "Accesso CRL non possibile a causa della disabilitata di %s\n"
 msgid "error retrieving '%s': %s\n"
 msgstr "errore durante il recupero di '%s': %s\n"
 
-#: dirmngr/crlfetch.c:218 dirmngr/ldap-wrapper.c:881 dirmngr/misc.c:573
+#: dirmngr/crlfetch.c:218 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
 #, c-format
 msgid "error initializing reader object: %s\n"
 msgstr "errore durante l'inizializzazione dell'oggetto lettore: %s\n"
@@ -10339,133 +10329,133 @@ msgstr "previsto nome file assoluto\n"
 msgid "looking up '%s'\n"
 msgstr "ricerca di '%s'\n"
 
-#: dirmngr/dirmngr.c:175
+#: dirmngr/dirmngr.c:176
 msgid "list the contents of the CRL cache"
 msgstr "elencare il contenuto della cache CRL"
 
-#: dirmngr/dirmngr.c:176
+#: dirmngr/dirmngr.c:177
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|FILE|carica CRL da FILE nella cache"
 
-#: dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr.c:178
 msgid "|URL|fetch a CRL from URL"
 msgstr "|URL|recupero di un CRL dall'URL"
 
-#: dirmngr/dirmngr.c:178
+#: dirmngr/dirmngr.c:179
 msgid "shutdown the dirmngr"
 msgstr "arrestare il dirmngr"
 
-#: dirmngr/dirmngr.c:179
+#: dirmngr/dirmngr.c:180
 msgid "flush the cache"
 msgstr "svuotare la cache"
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:213
 msgid "allow online software version check"
 msgstr "consentire il controllo della versione del software online"
 
-#: dirmngr/dirmngr.c:215
+#: dirmngr/dirmngr.c:216
 msgid "|N|do not return more than N items in one query"
 msgstr "|N|Non restituire più di N elementi in una query"
 
-#: dirmngr/dirmngr.c:221
+#: dirmngr/dirmngr.c:222
 msgid "Network related options"
 msgstr "Opzioni relative alla rete"
 
-#: dirmngr/dirmngr.c:223
+#: dirmngr/dirmngr.c:224
 msgid "route all network traffic via Tor"
 msgstr "instradare tutto il traffico di rete tramite Tor"
 
-#: dirmngr/dirmngr.c:235
+#: dirmngr/dirmngr.c:236
 msgid "Configuration for Keyservers"
 msgstr "Configurazione per Keyservers"
 
-#: dirmngr/dirmngr.c:238
+#: dirmngr/dirmngr.c:239
 msgid "|URL|use keyserver at URL"
 msgstr "| URL: utilizzare keyserver all'URL"
 
-#: dirmngr/dirmngr.c:240
+#: dirmngr/dirmngr.c:241
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr "|FILE|utilizzare i certificati CA in FILE per HKP su TLS"
 
-#: dirmngr/dirmngr.c:242
+#: dirmngr/dirmngr.c:243
 msgid "Configuration for HTTP servers"
 msgstr "Configurazione per i server HTTP"
 
-#: dirmngr/dirmngr.c:244
+#: dirmngr/dirmngr.c:245
 msgid "inhibit the use of HTTP"
 msgstr "inibire l'uso di HTTP"
 
-#: dirmngr/dirmngr.c:246
+#: dirmngr/dirmngr.c:247
 msgid "ignore HTTP CRL distribution points"
 msgstr "ignorare i punti di distribuzione CRL HTTP"
 
-#: dirmngr/dirmngr.c:248
+#: dirmngr/dirmngr.c:249
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr "|URL|reindirizza tutte le richieste HTTP all'URL"
 
-#: dirmngr/dirmngr.c:250
+#: dirmngr/dirmngr.c:251
 msgid "use system's HTTP proxy setting"
 msgstr "utilizzare l'impostazione proxy HTTP del sistema"
 
-#: dirmngr/dirmngr.c:254
+#: dirmngr/dirmngr.c:255
 msgid "Configuration of LDAP servers to use"
 msgstr "Configurazione dei server LDAP da utilizzare"
 
-#: dirmngr/dirmngr.c:256
+#: dirmngr/dirmngr.c:257
 msgid "inhibit the use of LDAP"
 msgstr "inibire l'uso di LDAP"
 
-#: dirmngr/dirmngr.c:258
+#: dirmngr/dirmngr.c:259
 msgid "ignore LDAP CRL distribution points"
 msgstr "ignorare i punti di distribuzione CRL LDAP"
 
-#: dirmngr/dirmngr.c:260
+#: dirmngr/dirmngr.c:261
 msgid "|HOST|use HOST for LDAP queries"
 msgstr "|HOST|utilizzare HOST per le query LDAP"
 
-#: dirmngr/dirmngr.c:262
+#: dirmngr/dirmngr.c:263
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr "non utilizzare host di fallback con --ldap-proxy"
 
-#: dirmngr/dirmngr.c:264
+#: dirmngr/dirmngr.c:267
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FILE|lettura dell'elenco dei server LDAP da FILE"
 
-#: dirmngr/dirmngr.c:266
+#: dirmngr/dirmngr.c:269
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 "aggiungere nuovi server individuati nei punti di distribuzione CRL "
 "all'elenco dei server"
 
-#: dirmngr/dirmngr.c:269 dirmngr/dirmngr_ldap.c:104
+#: dirmngr/dirmngr.c:272
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|imposta il timeout LDAP su N secondi"
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:275
 msgid "Configuration for OCSP"
 msgstr "Configurazione per OCSP"
 
-#: dirmngr/dirmngr.c:274
+#: dirmngr/dirmngr.c:277
 msgid "allow sending OCSP requests"
 msgstr "consentire l'invio di richieste OCSP"
 
-#: dirmngr/dirmngr.c:276
+#: dirmngr/dirmngr.c:279
 msgid "ignore certificate contained OCSP service URLs"
 msgstr "ignorare gli URL del servizio OCSP contenuti nel certificato"
 
-#: dirmngr/dirmngr.c:278
+#: dirmngr/dirmngr.c:281
 msgid "|URL|use OCSP responder at URL"
 msgstr "|URL|utilizzare risponditore OCSP all'URL"
 
-#: dirmngr/dirmngr.c:280
+#: dirmngr/dirmngr.c:283
 msgid "|FPR|OCSP response signed by FPR"
 msgstr "|FPR|Risposta OCSP firmata da FPR"
 
-#: dirmngr/dirmngr.c:288
+#: dirmngr/dirmngr.c:291
 msgid "force loading of outdated CRLs"
 msgstr "forzare il caricamento di CRL obsoleti"
 
-#: dirmngr/dirmngr.c:299
+#: dirmngr/dirmngr.c:302
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
@@ -10475,11 +10465,11 @@ msgstr ""
 "(Vedere il manuale \"info\" per un elenco completo di tutti i comandi e le "
 "opzioni)\n"
 
-#: dirmngr/dirmngr.c:441
+#: dirmngr/dirmngr.c:449
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Utilizzo: @DIRMNGR@ [opzioni] (-h per assistenza)"
 
-#: dirmngr/dirmngr.c:443
+#: dirmngr/dirmngr.c:451
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@ -10487,284 +10477,104 @@ msgstr ""
 "Sintassi: @DIRMNGR@ [opzioni] [comando [args]]\n"
 "Accesso keyserver, CRL e OCSP per @GNUPG@\n"
 
-#: dirmngr/dirmngr.c:523
+#: dirmngr/dirmngr.c:531
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr "i livelli di debug validi sono: %s\n"
 
-#: dirmngr/dirmngr.c:609 tools/gpgconf.c:667 tools/gpgconf.c:702
-#: tools/gpgconf.c:802
+#: dirmngr/dirmngr.c:617 tools/gpgconf.c:701 tools/gpgconf.c:736
+#: tools/gpgconf.c:836
 #, c-format
 msgid "usage: %s [options] "
 msgstr "utilizzo: %s [opzioni] "
 
-#: dirmngr/dirmngr.c:1260
+#: dirmngr/dirmngr.c:1299
 #, 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:1495 dirmngr/server.c:1824
+#: dirmngr/dirmngr.c:1534 dirmngr/server.c:1878
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "recupero CRL da '%s' non riuscito: %s\n"
 
-#: dirmngr/dirmngr.c:1501 dirmngr/server.c:1830
+#: dirmngr/dirmngr.c:1540 dirmngr/server.c:1884
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "elaborazione CRL da '%s' non riuscita: %s\n"
 
-#: dirmngr/dirmngr.c:1643
+#: dirmngr/dirmngr.c:1682
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: riga troppo lunga - ignorata\n"
 
-#: dirmngr/dirmngr.c:1698 dirmngr/dirmngr.c:1782
+#: dirmngr/dirmngr.c:1737 dirmngr/dirmngr.c:1821
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: rilevata impronta digitale non valida\n"
 
-#: dirmngr/dirmngr.c:1734 dirmngr/dirmngr.c:1760 tools/gpgconf-comp.c:3539
+#: dirmngr/dirmngr.c:1773 dirmngr/dirmngr.c:1799 tools/gpgconf-comp.c:3549
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s: %u: errore di lettura: %s\n"
 
-#: dirmngr/dirmngr.c:1789
+#: dirmngr/dirmngr.c:1828
 #, 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:1876
+#: dirmngr/dirmngr.c:1915
 #, 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:1917
+#: dirmngr/dirmngr.c:1956
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "SIGUSR2 ricevuto - nessuna azione definita\n"
 
-#: dirmngr/dirmngr.c:1922
+#: dirmngr/dirmngr.c:1961
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "SIGTERM ricevuto - arresto …\n"
 
-#: dirmngr/dirmngr.c:1924
+#: dirmngr/dirmngr.c:1963
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "SIGTERM ricevuto - connessioni ancora %d attive\n"
 
-#: dirmngr/dirmngr.c:1929
+#: dirmngr/dirmngr.c:1968
 #, c-format
 msgid "shutdown forced\n"
 msgstr "arresto forzato\n"
 
-#: dirmngr/dirmngr.c:1937
+#: dirmngr/dirmngr.c:1976
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "SIGINT ricevuto - arresto immediato\n"
 
-#: dirmngr/dirmngr.c:1944
+#: dirmngr/dirmngr.c:1983
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "segnale %d ricevuto - nessuna azione definita\n"
 
-#: dirmngr/dirmngr_ldap.c:105
-msgid "return all values in a record oriented format"
-msgstr "restituire tutti i valori in un formato orientato ai record"
-
-#: dirmngr/dirmngr_ldap.c:108
-msgid "|NAME|ignore host part and connect through NAME"
-msgstr "|NOME|Ignorare la parte host e connettersi tramite NOME"
-
-#: dirmngr/dirmngr_ldap.c:109
-msgid "force a TLS connection"
-msgstr "forzare una connessione TLS"
-
-#: dirmngr/dirmngr_ldap.c:110
-msgid "|NAME|connect to host NAME"
-msgstr "Nome:connessione all'host NOME"
-
-#: dirmngr/dirmngr_ldap.c:111
-msgid "|N|connect to port N"
-msgstr "|N|Connessione alla porta N"
-
-#: dirmngr/dirmngr_ldap.c:112
-msgid "|NAME|use user NAME for authentication"
-msgstr "Nome:utilizzare nome utente per l'autenticazione"
-
-#: dirmngr/dirmngr_ldap.c:113
-msgid "|PASS|use password PASS for authentication"
-msgstr "|PASS|utilizzare la password PASS per l'autenticazione"
-
-#: dirmngr/dirmngr_ldap.c:115
-msgid "take password from $DIRMNGR_LDAP_PASS"
-msgstr "prendere la password da $DIRMNGR_LDAP_PASS"
-
-#: dirmngr/dirmngr_ldap.c:116
-msgid "|STRING|query DN STRING"
-msgstr "|STRINGA|stringa DN query"
-
-#: dirmngr/dirmngr_ldap.c:117
-msgid "|STRING|use STRING as filter expression"
-msgstr "| STRINGA: utilizzare STRING come espressione di filtro"
-
-#: dirmngr/dirmngr_ldap.c:118
-msgid "|STRING|return the attribute STRING"
-msgstr "| STRINGA: restituisce l'attributo STRING"
-
-#: dirmngr/dirmngr_ldap.c:179
-msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
-msgstr "Utilizzo: dirmngr_ldap [opzioni] [URL] (-h per assistenza)\n"
-
-#: dirmngr/dirmngr_ldap.c:182
-msgid ""
-"Syntax: dirmngr_ldap [options] [URL]\n"
-"Internal LDAP helper for Dirmngr\n"
-"Interface and options may change without notice\n"
-msgstr ""
-"Sintassi: dirmngr_ldap [opzioni] [URL]\n"
-"Helper LDAP interno per Dirmngr\n"
-"L'interfaccia e le opzioni possono cambiare senza preavviso\n"
-
-#: dirmngr/dirmngr_ldap.c:291
-#, c-format
-msgid "invalid port number %d\n"
-msgstr "numero di porta non valido %d\n"
-
-#: dirmngr/dirmngr_ldap.c:400
-#, c-format
-msgid "scanning result for attribute '%s'\n"
-msgstr "risultato dell'analisi per l'attributo '%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:407 dirmngr/dirmngr_ldap.c:490
-#: dirmngr/dirmngr_ldap.c:514 dirmngr/dirmngr_ldap.c:526
-#: dirmngr/dirmngr_ldap.c:722
-#, c-format
-msgid "error writing to stdout: %s\n"
-msgstr "errore durante la scrittura in stdout: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:424
-#, c-format
-msgid "          available attribute '%s'\n"
-msgstr "           attributo disponibile '%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:462
-#, c-format
-msgid "attribute '%s' not found\n"
-msgstr "attributo '%s' non trovato\n"
-
-#: dirmngr/dirmngr_ldap.c:469
-#, c-format
-msgid "found attribute '%s'\n"
-msgstr "trovato attributo '%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:581
-#, c-format
-msgid "processing url '%s'\n"
-msgstr "elaborazione url '%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:588
-#, c-format
-msgid "          user '%s'\n"
-msgstr "         utente '%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:590
-#, c-format
-msgid "          pass '%s'\n"
-msgstr "         passare '%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:592
-#, c-format
-msgid "          host '%s'\n"
-msgstr "         host '%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:593
-#, c-format
-msgid "          port %d\n"
-msgstr "         porta %d\n"
-
-#: dirmngr/dirmngr_ldap.c:595
-#, c-format
-msgid "            DN '%s'\n"
-msgstr "          DN '%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:597
-#, c-format
-msgid "        filter '%s'\n"
-msgstr "        filtro '%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:602 dirmngr/dirmngr_ldap.c:605
-#, c-format
-msgid "          attr '%s'\n"
-msgstr "          attr '%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:611
-#, c-format
-msgid "no host name in '%s'\n"
-msgstr "nessun nome host in '%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:616
-#, c-format
-msgid "no attribute given for query '%s'\n"
-msgstr "nessun attributo specificato per la query '%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:622
-#, c-format
-msgid "WARNING: using first attribute only\n"
-msgstr "AVVISO: utilizzo solo del primo attributo\n"
-
-#: dirmngr/dirmngr_ldap.c:637 dirmngr/dirmngr_ldap.c:678
-#, c-format
-msgid "LDAP init to '%s:%d' failed: %s\n"
-msgstr "Impossibile eseguire LDAP in '%s:%d': %s\n"
-
-#: dirmngr/dirmngr_ldap.c:659
-#, c-format
-msgid "LDAP init to '%s' failed: %s\n"
-msgstr "Init LDAP a '%s' non riuscito: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:665
-#, c-format
-msgid "LDAP init to '%s' done\n"
-msgstr "Dentro LDAP a '%s' fatto\n"
-
-#: dirmngr/dirmngr_ldap.c:704
-#, c-format
-msgid "binding to '%s:%d' failed: %s\n"
-msgstr "binding a '%s:%d' non riuscito: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:728
-#, c-format
-msgid "searching '%s' failed: %s\n"
-msgstr "ricerca '%s' non riuscita: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:759
-#, c-format
-msgid "'%s' is not an LDAP URL\n"
-msgstr "'%s' non è un URL LDAP\n"
-
-#: dirmngr/dirmngr_ldap.c:765
-#, c-format
-msgid "'%s' is an invalid LDAP URL\n"
-msgstr "'%s' è un URL LDAP non valido\n"
-
-#: dirmngr/http.c:1989 dirmngr/ocsp.c:255
+#: dirmngr/http.c:1998 dirmngr/ocsp.c:255
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "errore durante l'accesso a '%s': stato http %u\n"
 
-#: dirmngr/http.c:3630 dirmngr/ocsp.c:229
+#: dirmngr/http.c:3652 dirmngr/ocsp.c:229
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr "URL '%s' reindirizzato a '%s' (%u)\n"
 
-#: dirmngr/http.c:3636 dirmngr/ocsp.c:246
+#: dirmngr/http.c:3658 dirmngr/ocsp.c:246
 #, c-format
 msgid "too many redirections\n"
 msgstr "troppi reindirizzamenti\n"
 
-#: dirmngr/http.c:3748
+#: dirmngr/http.c:3768
 #, c-format
 msgid "redirection changed to '%s'\n"
 msgstr "reindirizzamento modificato in '%s'\n"
@@ -10804,31 +10614,51 @@ msgstr "in attesa del wrapper ldap %d non riuscito: %s\n"
 msgid "ldap wrapper %d stalled - killing\n"
 msgstr "wrapper ldap %d bloccato - killing\n"
 
-#: dirmngr/ldap.c:91
+#: dirmngr/ldap.c:92
 #, c-format
 msgid "invalid char 0x%02x in host name - not added\n"
 msgstr "char non valido 0x%02x nel nome host - non aggiunto\n"
 
-#: dirmngr/ldap.c:95
+#: dirmngr/ldap.c:96
 #, c-format
 msgid "adding '%s:%d' to the ldap server list\n"
 msgstr "aggiunta di '%s:%d' all'elenco dei server ldap\n"
 
-#: dirmngr/ldap.c:98 dirmngr/misc.c:512
+#: dirmngr/ldap.c:99 dirmngr/misc.c:512
 #, c-format
 msgid "malloc failed: %s\n"
 msgstr "malloc non riuscito: %s\n"
 
-#: dirmngr/ldap.c:634
+#: dirmngr/ldap.c:221
 #, c-format
-msgid "start_cert_fetch: invalid pattern '%s'\n"
-msgstr "start_cert_fetch: modello '%s' non valido\n"
+msgid "'%s' is not an LDAP URL\n"
+msgstr "'%s' non è un URL LDAP\n"
 
-#: dirmngr/ldap.c:846
+#: dirmngr/ldap.c:227 dirmngr/ldap.c:233
+#, c-format
+msgid "'%s' is an invalid LDAP URL\n"
+msgstr "'%s' è un URL LDAP non valido\n"
+
+#: dirmngr/ldap.c:968
 #, c-format
 msgid "ldap_search hit the size limit of the server\n"
 msgstr "ldap_search raggiunto il limite di dimensioni del server\n"
 
+#: dirmngr/ldapserver.c:119
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr "%s:%u: password fornita senza utente\n"
+
+#: dirmngr/ldapserver.c:181
+#, c-format
+msgid "%s:%u: ignoring unknown flag '%s'\n"
+msgstr "%s:%u: ignorare la bandiera sconosciuta '%s'\n"
+
+#: dirmngr/ldapserver.c:203
+#, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr "%s:%u: ignorare questa riga\n"
+
 #: dirmngr/misc.c:172
 #, c-format
 msgid "invalid canonical S-expression found\n"
@@ -10919,90 +10749,90 @@ msgstr "non firmato da un certificato del firmatario OCSP predefinito"
 msgid "allocating list item failed: %s\n"
 msgstr "allocazione della voce di elenco non riuscita: %s\n"
 
-#: dirmngr/ocsp.c:537 dirmngr/ocsp.c:724
+#: dirmngr/ocsp.c:538 dirmngr/ocsp.c:725
 #, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "errore durante il recupero dell'ID risponditore: %s\n"
 
-#: dirmngr/ocsp.c:584
+#: dirmngr/ocsp.c:585
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr ""
 "non è stato trovato alcun certificato adatto per verificare la risposta "
 "OCSP\n"
 
-#: dirmngr/ocsp.c:623 dirmngr/validate.c:648
+#: dirmngr/ocsp.c:624 dirmngr/validate.c:648
 #, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "certificato dell'autorità emittente non trovato: %s\n"
 
-#: dirmngr/ocsp.c:633
+#: dirmngr/ocsp.c:634
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr "chiamante non ha restituito il certificato di destinazione\n"
 
-#: dirmngr/ocsp.c:640
+#: dirmngr/ocsp.c:641
 #, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "chiamante non ha restituito il certificato di emissione\n"
 
-#: dirmngr/ocsp.c:650
+#: dirmngr/ocsp.c:651
 #, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "impossibile allocare il contesto OCSP: %s\n"
 
-#: dirmngr/ocsp.c:689
+#: dirmngr/ocsp.c:690
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr "nessun risponditore OCSP predefinito definito\n"
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:696
 #, c-format
 msgid "no default OCSP signer defined\n"
 msgstr "nessun firmatario OCSP predefinito definito\n"
 
-#: dirmngr/ocsp.c:702
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr "utilizzando il risponditore OCSP predefinito '%s'\n"
 
-#: dirmngr/ocsp.c:707
+#: dirmngr/ocsp.c:708
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "utilizzo del risponditore OCSP '%s'\n"
 
-#: dirmngr/ocsp.c:764
+#: dirmngr/ocsp.c:765
 #, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr ""
 "errore durante il recupero dello stato OCSP per il certificato di "
 "destinazione: %s\n"
 
-#: dirmngr/ocsp.c:789
+#: dirmngr/ocsp.c:790
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr "lo stato del certificato è: %s  (questo: %s  successivo= %s)\n"
 
-#: dirmngr/ocsp.c:790
+#: dirmngr/ocsp.c:791
 msgid "good"
 msgstr "buono"
 
-#: dirmngr/ocsp.c:796
+#: dirmngr/ocsp.c:797
 #, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "il certificato è stato revocato alle: %s a causa di: %s\n"
 
-#: dirmngr/ocsp.c:831
+#: dirmngr/ocsp.c:832
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr "Il risponditore OCSP ha restituito uno stato in futuro\n"
 
-#: dirmngr/ocsp.c:843
+#: dirmngr/ocsp.c:844
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr "Il risponditore OCSP ha restituito uno stato non corrente\n"
 
-#: dirmngr/ocsp.c:858
+#: dirmngr/ocsp.c:859
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr "Il risponditore OCSP ha restituito uno stato troppo vecchio\n"
@@ -11012,71 +10842,67 @@ msgstr "Il risponditore OCSP ha restituito uno stato troppo vecchio\n"
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "assuan_inquire(%s) non riuscito: %s\n"
 
-#: dirmngr/server.c:1158
-msgid "ldapserver missing"
-msgstr "ldapserver mancante"
-
-#: dirmngr/server.c:1224
+#: dirmngr/server.c:1277
 msgid "serialno missing in cert ID"
 msgstr "serialno mancante nell'ID certificato"
 
-#: dirmngr/server.c:1387 dirmngr/server.c:1473 dirmngr/server.c:1909
-#: dirmngr/server.c:1980 dirmngr/server.c:2556 dirmngr/server.c:2571
+#: dirmngr/server.c:1440 dirmngr/server.c:1526 dirmngr/server.c:1963
+#: dirmngr/server.c:2034 dirmngr/server.c:2662 dirmngr/server.c:2677
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "assuan_inquire non riuscito: %s\n"
 
-#: dirmngr/server.c:1516
+#: dirmngr/server.c:1569
 #, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "fetch_cert_by_url non riuscito: %s\n"
 
-#: dirmngr/server.c:1528 dirmngr/server.c:1559 dirmngr/server.c:1718
+#: dirmngr/server.c:1581 dirmngr/server.c:1612 dirmngr/server.c:1772
 #, c-format
 msgid "error sending data: %s\n"
 msgstr "errore durante l'invio dei dati: %s\n"
 
-#: dirmngr/server.c:1666
+#: dirmngr/server.c:1720
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "start_cert_fetch non riuscito: %s\n"
 
-#: dirmngr/server.c:1699
+#: dirmngr/server.c:1753
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "fetch_next_cert non riuscito: %s\n"
 
-#: dirmngr/server.c:1726
+#: dirmngr/server.c:1780
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr "max_replies %d superato\n"
 
-#: dirmngr/server.c:2860
+#: dirmngr/server.c:2966
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "impossibile allocare la struttura di controllo: %s\n"
 
-#: dirmngr/server.c:2871
+#: dirmngr/server.c:2977
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "impossibile allocare il contesto assuan: %s\n"
 
-#: dirmngr/server.c:2892
+#: dirmngr/server.c:2998
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "impossibile inizializzare il server: %s\n"
 
-#: dirmngr/server.c:2900
+#: dirmngr/server.c:3006
 #, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "impossibile eseguire i comandi di registro con Assuan: %s\n"
 
-#: dirmngr/server.c:2933
+#: dirmngr/server.c:3039
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "Problema di accettazione assuan: %s\n"
 
-#: dirmngr/server.c:2952
+#: dirmngr/server.c:3058
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "Elaborazione Assuan non riuscita: %s\n"
@@ -11221,67 +11047,67 @@ msgstr "nessun daemon keybox in esecuzione in questa sessione\n"
 msgid "error sending standard options: %s\n"
 msgstr "errore durante l'invio delle opzioni standard: %s\n"
 
-#: tools/gpgconf-comp.c:649
+#: tools/gpgconf-comp.c:655
 msgid "OpenPGP"
 msgstr "OpenPGP"
 
-#: tools/gpgconf-comp.c:653
+#: tools/gpgconf-comp.c:659
 msgid "S/MIME"
 msgstr "S/MIME"
 
-#: tools/gpgconf-comp.c:657
+#: tools/gpgconf-comp.c:663
 msgid "Public Keys"
 msgstr "Chiavi pubbliche"
 
-#: tools/gpgconf-comp.c:661
+#: tools/gpgconf-comp.c:667
 msgid "Private Keys"
 msgstr "Chiavi private"
 
-#: tools/gpgconf-comp.c:665
+#: tools/gpgconf-comp.c:671
 msgid "Smartcards"
 msgstr "Smartcard"
 
-#: tools/gpgconf-comp.c:669
+#: tools/gpgconf-comp.c:676
 msgid "TPM"
 msgstr "TPM"
 
-#: tools/gpgconf-comp.c:673
+#: tools/gpgconf-comp.c:681
 msgid "Network"
 msgstr "Rete"
 
-#: tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:685
 msgid "Passphrase Entry"
 msgstr "Voce passphrase"
 
-#: tools/gpgconf-comp.c:941
+#: tools/gpgconf-comp.c:951
 msgid "Component not suitable for launching"
 msgstr "Componente non adatto per il lancio"
 
-#: tools/gpgconf-comp.c:947
+#: tools/gpgconf-comp.c:957
 #, c-format
 msgid "Configuration file of component %s is broken\n"
 msgstr "Il file di configurazione del componente %s è interrotto\n"
 
-#: tools/gpgconf-comp.c:950
+#: tools/gpgconf-comp.c:960
 #, c-format
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr "Nota: utilizzare il comando \"%s%s\" per ottenere i dettagli.\n"
 
-#: tools/gpgconf-comp.c:2816
+#: tools/gpgconf-comp.c:2826
 #, c-format
 msgid "External verification of component %s failed"
 msgstr "Verifica esterna del componente %s non riuscita"
 
-#: tools/gpgconf-comp.c:2946
+#: tools/gpgconf-comp.c:2956
 msgid "Note that group specifications are ignored\n"
 msgstr "Si noti che le specifiche del gruppo vengono ignorate\n"
 
-#: tools/gpgconf-comp.c:3543
+#: tools/gpgconf-comp.c:3553
 #, c-format
 msgid "error closing '%s'\n"
 msgstr "errore durante la chiusura di '%s'\n"
 
-#: tools/gpgconf-comp.c:3545
+#: tools/gpgconf-comp.c:3555
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr "errore durante l'analisi di '%s'\n"
@@ -11362,15 +11188,15 @@ msgstr ""
 "Sintassi: @GPGCONF@ [opzioni]\n"
 "Gestire le opzioni di configurazione per gli strumenti del @GNUPG@ sistema\n"
 
-#: tools/gpgconf.c:669 tools/gpgconf.c:704
+#: tools/gpgconf.c:703 tools/gpgconf.c:738
 msgid "Need one component argument"
 msgstr "È necessario un argomento componente"
 
-#: tools/gpgconf.c:678 tools/gpgconf.c:728 tools/gpgconf.c:778
+#: tools/gpgconf.c:712 tools/gpgconf.c:762 tools/gpgconf.c:812
 msgid "Component not found"
 msgstr "Componente non trovato"
 
-#: tools/gpgconf.c:804
+#: tools/gpgconf.c:838
 msgid "No argument allowed"
 msgstr "Nessun argomento consentito"
 
@@ -11387,34 +11213,34 @@ msgstr ""
 "Sintassi: gpg-check-pattern [opzioni] patternfile\n"
 "Controllare una passphrase data su stdin rispetto al patternfile\n"
 
-#: tools/gpg-card.c:2390
+#: tools/gpg-card.c:2407
 #, c-format
 msgid "Note: key %s is already stored on the card!\n"
 msgstr "Nota: il %s chiave è già memorizzato sulla carta!\n"
 
-#: tools/gpg-card.c:2393
+#: tools/gpg-card.c:2410
 #, c-format
 msgid "Note: Keys are already stored on the card!\n"
 msgstr "Nota: le chiavi sono già memorizzate sulla carta!\n"
 
-#: tools/gpg-card.c:2396
+#: tools/gpg-card.c:2413
 #, c-format
 msgid "Replace existing key %s ? (y/N) "
 msgstr "Sostituire le chiavi %s ? (y/N) "
 
-#: tools/gpg-card.c:2549 tools/gpg-card.c:2712 tools/gpg-card.c:2935
-#: tools/gpg-card.c:3044
+#: tools/gpg-card.c:2566 tools/gpg-card.c:2729 tools/gpg-card.c:2952
+#: tools/gpg-card.c:3061
 #, c-format
 msgid "%s card no. %s detected\n"
 msgstr "%s la scheda n. %s rilevata\n"
 
-#: tools/gpg-card.c:3396
+#: tools/gpg-card.c:3413
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 "Il contrassegno interazione utente è impostato su \"%s\" - non può cambiare\n"
 
-#: tools/gpg-card.c:3406 tools/gpg-card.c:3420
+#: tools/gpg-card.c:3423 tools/gpg-card.c:3437
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
@@ -11424,47 +11250,173 @@ msgstr ""
 "         può essere ripristinato solo utilizzando un ripristino delle "
 "impostazioni di fabbrica!\n"
 
-#: tools/gpg-card.c:3423
+#: tools/gpg-card.c:3440
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr "Utilizzare \"uif --yes %d %s\"\n"
 
-#: tools/gpg-card.c:3669
+#: tools/gpg-card.c:3686
 msgid "authenticate to the card"
 msgstr "eseguire l'autenticazione nella scheda"
 
-#: tools/gpg-card.c:3671
+#: tools/gpg-card.c:3688
 msgid "send a reset to the card daemon"
 msgstr "inviare un ripristino al daemon della carta"
 
-#: tools/gpg-card.c:3673
+#: tools/gpg-card.c:3690
 msgid "setup KDF for PIN authentication"
 msgstr "configurazione KDF per l'autenticazione PIN"
 
-#: tools/gpg-card.c:3675
+#: tools/gpg-card.c:3692
 msgid "change a private data object"
 msgstr "modificare un oggetto dati privato"
 
-#: tools/gpg-card.c:3676
+#: tools/gpg-card.c:3693
 msgid "read a certificate from a data object"
 msgstr "leggere un certificato da un oggetto dati"
 
-#: tools/gpg-card.c:3677
+#: tools/gpg-card.c:3694
 msgid "store a certificate to a data object"
 msgstr "archiviare un certificato in un oggetto dati"
 
-#: tools/gpg-card.c:3678
+#: tools/gpg-card.c:3695
 msgid "store a private key to a data object"
 msgstr "archiviare una chiave privata in un oggetto dati"
 
-#: tools/gpg-card.c:3679
+#: tools/gpg-card.c:3696
 msgid "Yubikey management commands"
 msgstr "Comandi di gestione Yubikey"
 
-#: tools/gpg-card.c:3681
+#: tools/gpg-card.c:3698
 msgid "manage the command history"
 msgstr "gestire la cronologia dei comandi"
 
+#~ msgid "requesting key %s from %s server %s\n"
+#~ msgstr "richiesta della chiave %s dal server %s %s\n"
+
+#~ msgid "%s:%u: no hostname given\n"
+#~ msgstr "%s: %u: nessun nome host specificato\n"
+
+#~ msgid "could not parse keyserver\n"
+#~ msgstr "impossibile analizzare il keyserver\n"
+
+#~ msgid "return all values in a record oriented format"
+#~ msgstr "restituire tutti i valori in un formato orientato ai record"
+
+#~ msgid "|NAME|ignore host part and connect through NAME"
+#~ msgstr "|NOME|Ignorare la parte host e connettersi tramite NOME"
+
+#~ msgid "force a TLS connection"
+#~ msgstr "forzare una connessione TLS"
+
+#~ msgid "|NAME|connect to host NAME"
+#~ msgstr "Nome:connessione all'host NOME"
+
+#~ msgid "|N|connect to port N"
+#~ msgstr "|N|Connessione alla porta N"
+
+#~ msgid "|NAME|use user NAME for authentication"
+#~ msgstr "Nome:utilizzare nome utente per l'autenticazione"
+
+#~ msgid "|PASS|use password PASS for authentication"
+#~ msgstr "|PASS|utilizzare la password PASS per l'autenticazione"
+
+#~ msgid "take password from $DIRMNGR_LDAP_PASS"
+#~ msgstr "prendere la password da $DIRMNGR_LDAP_PASS"
+
+#~ msgid "|STRING|query DN STRING"
+#~ msgstr "|STRINGA|stringa DN query"
+
+#~ msgid "|STRING|use STRING as filter expression"
+#~ msgstr "| STRINGA: utilizzare STRING come espressione di filtro"
+
+#~ msgid "|STRING|return the attribute STRING"
+#~ msgstr "| STRINGA: restituisce l'attributo STRING"
+
+#~ msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
+#~ msgstr "Utilizzo: dirmngr_ldap [opzioni] [URL] (-h per assistenza)\n"
+
+#~ msgid ""
+#~ "Syntax: dirmngr_ldap [options] [URL]\n"
+#~ "Internal LDAP helper for Dirmngr\n"
+#~ "Interface and options may change without notice\n"
+#~ msgstr ""
+#~ "Sintassi: dirmngr_ldap [opzioni] [URL]\n"
+#~ "Helper LDAP interno per Dirmngr\n"
+#~ "L'interfaccia e le opzioni possono cambiare senza preavviso\n"
+
+#~ msgid "invalid port number %d\n"
+#~ msgstr "numero di porta non valido %d\n"
+
+#~ msgid "scanning result for attribute '%s'\n"
+#~ msgstr "risultato dell'analisi per l'attributo '%s'\n"
+
+#~ msgid "error writing to stdout: %s\n"
+#~ msgstr "errore durante la scrittura in stdout: %s\n"
+
+#~ msgid "          available attribute '%s'\n"
+#~ msgstr "           attributo disponibile '%s'\n"
+
+#~ msgid "attribute '%s' not found\n"
+#~ msgstr "attributo '%s' non trovato\n"
+
+#~ msgid "found attribute '%s'\n"
+#~ msgstr "trovato attributo '%s'\n"
+
+#~ msgid "processing url '%s'\n"
+#~ msgstr "elaborazione url '%s'\n"
+
+#~ msgid "          user '%s'\n"
+#~ msgstr "         utente '%s'\n"
+
+#~ msgid "          pass '%s'\n"
+#~ msgstr "         passare '%s'\n"
+
+#~ msgid "          host '%s'\n"
+#~ msgstr "         host '%s'\n"
+
+#~ msgid "          port %d\n"
+#~ msgstr "         porta %d\n"
+
+#~ msgid "            DN '%s'\n"
+#~ msgstr "          DN '%s'\n"
+
+#~ msgid "        filter '%s'\n"
+#~ msgstr "        filtro '%s'\n"
+
+#~ msgid "          attr '%s'\n"
+#~ msgstr "          attr '%s'\n"
+
+#~ msgid "no host name in '%s'\n"
+#~ msgstr "nessun nome host in '%s'\n"
+
+#~ msgid "no attribute given for query '%s'\n"
+#~ msgstr "nessun attributo specificato per la query '%s'\n"
+
+#~ msgid "WARNING: using first attribute only\n"
+#~ msgstr "AVVISO: utilizzo solo del primo attributo\n"
+
+#~ msgid "LDAP init to '%s:%d' failed: %s\n"
+#~ msgstr "Impossibile eseguire LDAP in '%s:%d': %s\n"
+
+#~ msgid "LDAP init to '%s' failed: %s\n"
+#~ msgstr "Init LDAP a '%s' non riuscito: %s\n"
+
+#~ msgid "LDAP init to '%s' done\n"
+#~ msgstr "Dentro LDAP a '%s' fatto\n"
+
+#~ msgid "binding to '%s:%d' failed: %s\n"
+#~ msgstr "binding a '%s:%d' non riuscito: %s\n"
+
+#~ msgid "searching '%s' failed: %s\n"
+#~ msgstr "ricerca '%s' non riuscita: %s\n"
+
+#~ msgid "start_cert_fetch: invalid pattern '%s'\n"
+#~ msgstr "start_cert_fetch: modello '%s' non valido\n"
+
+#~ msgid "ldapserver missing"
+#~ msgstr "ldapserver mancante"
+
 #~ msgid "detected card with S/N: %s\n"
 #~ msgstr "scheda rilevata con S/N: %s\n"
 
diff --git a/po/ja.gmo b/po/ja.gmo
index 8de5755..9bb665c 100644
--- a/po/ja.gmo
+++ b/po/ja.gmo
diff --git a/po/ja.po b/po/ja.po
index 0a06ae9..0f70766 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 2.3.0\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2021-04-20 12:38+0200\n"
+"POT-Creation-Date: 2021-08-24 18:50+0200\n"
 "PO-Revision-Date: 2021-04-08 10:15+0900\n"
 "Last-Translator: NIIBE Yutaka <gniibe@fsij.org>\n"
 "Language-Team: none\n"
@@ -21,7 +21,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: agent/call-pinentry.c:328
+#: agent/call-pinentry.c:338
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "pinentry�ロック��得�失敗����: %s\n"
@@ -32,45 +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:546
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_OK"
 msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:547
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_Cancel"
 msgstr "|pinentry-label|キャンセル(_C)"
 
-#: agent/call-pinentry.c:548
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|_Yes"
 msgstr "|pinentry-label|_Yes"
 
-#: agent/call-pinentry.c:549
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_No"
 msgstr "|pinentry-label|_No"
 
-#: agent/call-pinentry.c:550
+#: agent/call-pinentry.c:560
 msgid "|pinentry-label|PIN:"
 msgstr "|pinentry-label|PIN:"
 
-#: agent/call-pinentry.c:551
+#: agent/call-pinentry.c:561
 msgid "|pinentry-label|_Save in password manager"
 msgstr "|pinentry-label|パスワードマ�ージャ��管(_S)"
 
-#: agent/call-pinentry.c:552
+#: agent/call-pinentry.c:562
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "本当�画��パスフレーズを見�るよ������?"
 
-#: agent/call-pinentry.c:554
+#: agent/call-pinentry.c:564
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr "|pinentry-tt|パスフレーズを見�るよ���る"
 
-#: agent/call-pinentry.c:555
+#: agent/call-pinentry.c:565
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "|pinentry-tt|パスフレーズを隠�"
 
+#: agent/call-pinentry.c:566
+msgid "Caps Lock is on"
+msgstr ""
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:944
+#: agent/call-pinentry.c:1022
 msgid "Suggest"
 msgstr "�示�る"
 
@@ -81,13 +85,26 @@ 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:966
+#: agent/call-pinentry.c:1044
 msgid "pinentry.genpin.tooltip"
 msgstr "ランダム�パスフレーズを�示�る"
 
+#: agent/call-pinentry.c:1072
+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
+#, fuzzy
+#| msgid "Passphrase too long"
+msgid "Passphrase Not Allowed"
+msgstr "パスフレーズ�長����"
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:998
+#: agent/call-pinentry.c:1198
 msgid "Quality:"
 msgstr "�質:"
 
@@ -97,11 +114,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:1019
+#: agent/call-pinentry.c:1219
 msgid "pinentry.qualitybar.tooltip"
 msgstr "pinentry.qualitybar.tooltip"
 
-#: agent/call-pinentry.c:1263
+#: agent/call-pinentry.c:1477
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
@@ -109,7 +126,7 @@ msgstr ""
 "����PINを入力������(��セッション�秘密��ロックを解除�る���"
 "使�れ��)"
 
-#: agent/call-pinentry.c:1266
+#: agent/call-pinentry.c:1480
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -117,76 +134,76 @@ msgstr ""
 "����パスフレーズを入力������(��セッション�秘密��ロックを解除�"
 "る���使�れ��)"
 
-#: agent/call-pinentry.c:1303 agent/call-pinentry.c:1506
+#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
 msgid "PIN:"
 msgstr "PIN:"
 
-#: agent/call-pinentry.c:1303 agent/call-pinentry.c:1506
-#: agent/protect-tool.c:728
+#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/protect-tool.c:729
 msgid "Passphrase:"
 msgstr "パスフレーズ:"
 
-#: agent/call-pinentry.c:1330 agent/call-pinentry.c:1580 agent/command.c:1799
-#: agent/command.c:1852 agent/command-ssh.c:3046 agent/genkey.c:398
+#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
+#: agent/command.c:1988 agent/command-ssh.c:3046 agent/genkey.c:442
 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:1351 agent/call-pinentry.c:1603
+#: agent/call-pinentry.c:1566 agent/call-pinentry.c:1830
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (�在 %d / 最大 %d)"
 
-#: agent/call-pinentry.c:1362 agent/call-pinentry.c:1614
+#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
 msgid "Repeat:"
 msgstr "繰り返�:"
 
-#: agent/call-pinentry.c:1372 agent/call-pinentry.c:1384
-#: agent/call-pinentry.c:1624 agent/call-pinentry.c:1636
+#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
+#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
 msgid "PIN too long"
 msgstr "PIN�長����"
 
-#: agent/call-pinentry.c:1373 agent/call-pinentry.c:1625
+#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
 msgid "Passphrase too long"
 msgstr "パスフレーズ�長����"
 
-#: agent/call-pinentry.c:1381 agent/call-pinentry.c:1633
+#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
 msgid "Invalid characters in PIN"
 msgstr "PIN�無効�文字��り��"
 
-#: agent/call-pinentry.c:1386 agent/call-pinentry.c:1638
+#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
 msgid "PIN too short"
 msgstr "PIN�短����"
 
-#: agent/call-pinentry.c:1405 agent/call-pinentry.c:1656
+#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
 msgid "Bad PIN"
 msgstr "�正�PIN��"
 
-#: agent/call-pinentry.c:1405 agent/call-pinentry.c:1656
+#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
 msgid "Bad Passphrase"
 msgstr "パスフレーズ��正��"
 
-#: agent/command.c:697
+#: agent/command.c:823
 msgid "Note: Request from the web browser."
 msgstr "注�: ウェブブラウザ�ら�リクエスト��。"
 
-#: agent/command.c:698
+#: agent/command.c:824
 msgid "Note: Request from a remote site."
 msgstr "注�: リモートサイト�ら�リクエスト��。"
 
-#: agent/command.c:1106 g10/card-util.c:708 g10/card-util.c:729
+#: agent/command.c:1235 g10/card-util.c:713 g10/card-util.c:734
 #, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "カード・シリアル番���得エラー: %s\n"
 
-#: agent/command.c:1634 agent/command.c:1791 agent/command-ssh.c:2974
-#: agent/genkey.c:333
+#: agent/command.c:1756 agent/command.c:1921 agent/command-ssh.c:2974
+#: agent/genkey.c:377
 msgid "Please re-enter this passphrase"
 msgstr "��パスフレーズをも�一度入力������"
 
-#: agent/command.c:2567
+#: agent/command.c:2703
 #, c-format
 msgid ""
 "Please enter the passphrase to protect the imported object within the %s "
@@ -195,7 +212,7 @@ msgstr ""
 "%sシステム�イン�ート�れ�オブジェクトを�護�る���パスフレーズを入力�"
 "�����"
 
-#: agent/command.c:2697
+#: agent/command.c:2833
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -208,25 +225,25 @@ msgstr ""
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ssh��%dビットより大��も��サ�ート�れ��ん\n"
 
-#: agent/command-ssh.c:872 common/dotlock.c:852 g10/card-util.c:953
-#: g10/export.c:1329 g10/gpg.c:1431 g10/keygen.c:5347 g10/keyring.c:1319
-#: g10/keyring.c:1632 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
+#: agent/command-ssh.c:872 common/dotlock.c:852 g10/card-util.c:963
+#: g10/export.c:1329 g10/gpg.c:1431 g10/keygen.c:5377 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
 #: g10/sign.c:1106 g10/sign.c:1443 g10/tdbio.c:753 tools/gpg-card.c:479
 #, c-format
 msgid "can't create '%s': %s\n"
 msgstr "'%s'�作�����ん: %s\n"
 
-#: agent/command-ssh.c:884 common/helpfile.c:57 g10/card-util.c:910
+#: agent/command-ssh.c:884 common/helpfile.c:57 g10/card-util.c:920
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
 #: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:721 g10/gpg.c:1432
-#: g10/import.c:371 g10/import.c:558 g10/import.c:793 g10/keygen.c:4322
-#: g10/keyring.c:1658 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
+#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4326
+#: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
 #: g10/plaintext.c:610 g10/sign.c:1086 g10/sign.c:1311 g10/sign.c:1424
 #: g10/sign.c:1596 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2380
-#: sm/gpgsm.c:2410 sm/gpgsm.c:2448 sm/keylist.c:1737 sm/qualified.c:65
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2236
+#: sm/gpgsm.c:2266 sm/gpgsm.c:2304 sm/keylist.c:1775 sm/qualified.c:65
 #: dirmngr/certcache.c:396 dirmngr/certcache.c:476 dirmngr/certcache.c:478
-#: dirmngr/crlcache.c:2588 dirmngr/dirmngr.c:1720 tools/gpg-card.c:408
+#: dirmngr/crlcache.c:2591 dirmngr/dirmngr.c:1759 tools/gpg-card.c:408
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "'%s'�開���ん: %s\n"
@@ -332,28 +349,28 @@ msgstr "PIN�正��繰り返�れ����ん。も�一度"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "カード�ロックを解除�る���PIN%s%s%sを入力������"
 
-#: agent/genkey.c:109 sm/certreqgen-ui.c:433
+#: agent/genkey.c:142 sm/certreqgen-ui.c:433
 #, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "一時ファイル�作�エラー: %s\n"
 
-#: agent/genkey.c:116
+#: agent/genkey.c:150
 #, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "一時ファイル�書�込�エラー: %s\n"
 
-#: agent/genkey.c:154
+#: agent/genkey.c:191
 msgid "Enter new passphrase"
 msgstr "新��パスフレーズを入力������"
 
-#: agent/genkey.c:184
+#: agent/genkey.c:227
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 "パスフレーズ�入力�れ��ん���!%0A空�パスフレーズ���られ��ん。"
 
-#: agent/genkey.c:186
+#: agent/genkey.c:229
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -362,252 +379,251 @@ msgstr ""
 "パスフレーズ�入力�れ��ん��� - 通常�れ�良���考���!%0A��何��"
 "護も必�������を確�����。"
 
-#: agent/genkey.c:198
+#: agent/genkey.c:241
 msgid "Yes, protection is not needed"
 msgstr "����護�必��り��ん"
 
-#: agent/genkey.c:215
+#: agent/genkey.c:258
 #, 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:234
+#: agent/genkey.c:277
 #, 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:260
+#: agent/genkey.c:304
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 "パスフレーズ���よ�知られ��る用語や特定�パターン�マッ��るも��%%0A"
 "����ょ�。"
 
-#: agent/genkey.c:275
+#: agent/genkey.c:319
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "警告: 安全��言���パスフレーズ�入力�れ���。"
 
-#: agent/genkey.c:296
+#: agent/genkey.c:340
 msgid "Take this one anyway"
 msgstr "�れ�も�れを使���"
 
-#: agent/genkey.c:464
+#: agent/genkey.c:508
 #, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "新���を�護�る����%0Aパスフレーズを入力������。"
 
-#: agent/genkey.c:590
+#: agent/genkey.c:637
 msgid "Please enter the new passphrase"
 msgstr "新��パスフレーズを入力������"
 
-#: agent/gpg-agent.c:162 scd/scdaemon.c:115 dirmngr/dirmngr.c:182
+#: agent/gpg-agent.c:164 scd/scdaemon.c:115 dirmngr/dirmngr.c:183
 msgid "Options used for startup"
 msgstr "起動�使�れるオプション"
 
-#: agent/gpg-agent.c:164 scd/scdaemon.c:120 dirmngr/dirmngr.c:171
+#: agent/gpg-agent.c:166 scd/scdaemon.c:120 dirmngr/dirmngr.c:172
 msgid "run in daemon mode (background)"
 msgstr "デーモン・モード�実行 (�ックグラウンド)"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:117 dirmngr/dirmngr.c:170
+#: agent/gpg-agent.c:167 scd/scdaemon.c:117 dirmngr/dirmngr.c:171
 msgid "run in server mode (foreground)"
 msgstr "サー�・モード�実行 (フォアグラウンド)"
 
-#: agent/gpg-agent.c:167 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:169 dirmngr/dirmngr.c:174
 msgid "run in supervised mode"
 msgstr "スーパー�イズド・モード�実行"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:121 dirmngr/dirmngr.c:184
+#: agent/gpg-agent.c:171 scd/scdaemon.c:121 dirmngr/dirmngr.c:185
 msgid "do not detach from the console"
 msgstr "コンソール�らデタッ����"
 
-#: agent/gpg-agent.c:170 scd/scdaemon.c:122 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:172 scd/scdaemon.c:122 dirmngr/dirmngr.c:186
 msgid "sh-style command output"
 msgstr "sh-形��コマンド出力"
 
-#: agent/gpg-agent.c:171 scd/scdaemon.c:123 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:173 scd/scdaemon.c:123 dirmngr/dirmngr.c:187
 msgid "csh-style command output"
 msgstr "csh-形��コマンド出力"
 
-#: agent/gpg-agent.c:179 g10/gpg.c:589 scd/scdaemon.c:125 sm/gpgsm.c:422
-#: dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:181 g10/gpg.c:589 scd/scdaemon.c:125 sm/gpgsm.c:423
+#: dirmngr/dirmngr.c:189
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|FILE�らオプションを読�込���"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:574 scd/scdaemon.c:129 sm/gpgsm.c:265
-#: dirmngr/dirmngr.c:192
+#: agent/gpg-agent.c:185 g10/gpg.c:574 scd/scdaemon.c:129 sm/gpgsm.c:265
+#: dirmngr/dirmngr.c:193
 msgid "Options controlling the diagnostic output"
 msgstr "診断出力を制御�るオプション"
 
-#: agent/gpg-agent.c:185 g10/gpg.c:576 g10/gpgv.c:78 kbx/kbxutil.c:89
+#: agent/gpg-agent.c:187 g10/gpg.c:576 g10/gpgv.c:78 kbx/kbxutil.c:89
 #: scd/scdaemon.c:131 sm/gpgsm.c:267 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:194 dirmngr/dirmngr_ldap.c:102
-#: tools/gpg-connect-agent.c:85 tools/gpgconf.c:111
+#: dirmngr/dirmngr.c:195 tools/gpg-connect-agent.c:85 tools/gpgconf.c:111
 msgid "verbose"
 msgstr "冗長"
 
-#: agent/gpg-agent.c:186 g10/gpg.c:578 g10/gpgv.c:79 kbx/kbxutil.c:90
+#: agent/gpg-agent.c:188 g10/gpg.c:578 g10/gpgv.c:79 kbx/kbxutil.c:90
 #: scd/scdaemon.c:132 sm/gpgsm.c:269 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:195 dirmngr/dirmngr_ldap.c:103
+#: dirmngr/dirmngr.c:196
 msgid "be somewhat more quiet"
 msgstr "��ら������"
 
-#: agent/gpg-agent.c:194 g10/gpg.c:593 sm/gpgsm.c:283 dirmngr/dirmngr.c:205
+#: agent/gpg-agent.c:196 g10/gpg.c:593 sm/gpgsm.c:283 dirmngr/dirmngr.c:206
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FILE|FILE�サー�・モード�ログを書�出�"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 scd/scdaemon.c:146 sm/gpgsm.c:290
-#: dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:599 scd/scdaemon.c:146 sm/gpgsm.c:290
+#: dirmngr/dirmngr.c:210
 msgid "Options controlling the configuration"
 msgstr "コンフィグレーションを制御�るオプション"
 
-#: agent/gpg-agent.c:201
+#: agent/gpg-agent.c:203
 msgid "do not use the SCdaemon"
 msgstr "SCdaemonを使���"
 
-#: agent/gpg-agent.c:203
+#: agent/gpg-agent.c:205
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|PGMをSCdaemonプログラム���使�"
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr "|PGM|PGMをtpm2daemonプログラム���使�"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|NAME�ら�コマンドを��付�る"
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 msgid "ignore requests to change the TTY"
 msgstr "TTY�変更�求を無視�る"
 
-#: agent/gpg-agent.c:215
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the X display"
 msgstr "Xディスプレイ�変更�求を無視�る"
 
-#: agent/gpg-agent.c:216
+#: agent/gpg-agent.c:218
 msgid "enable ssh support"
 msgstr "sshサ�ートを有功��る"
 
-#: agent/gpg-agent.c:218
+#: agent/gpg-agent.c:220
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "|ALGO|ssh署��表示�ALGOを使�"
 
-#: agent/gpg-agent.c:221
+#: agent/gpg-agent.c:223
 msgid "enable putty support"
 msgstr "puttyサ�ートを有功��る"
 
-#: agent/gpg-agent.c:233 g10/gpg.c:844 scd/scdaemon.c:176 sm/gpgsm.c:382
+#: agent/gpg-agent.c:235 g10/gpg.c:844 scd/scdaemon.c:176 sm/gpgsm.c:383
 msgid "Options controlling the security"
 msgstr "セキュリティを制御�るオプション"
 
-#: agent/gpg-agent.c:236
+#: agent/gpg-agent.c:238
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|N秒後�����PINを無効��る"
 
-#: agent/gpg-agent.c:238
+#: agent/gpg-agent.c:240
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|N秒後�SSH�を無効��る"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:242
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|最大PINキャッシュ存続時間をN秒��る"
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:244
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr "|N|最大SSH�存続時間をN秒��る"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:246
 msgid "do not use the PIN cache when signing"
 msgstr "署��対��PIN���を使���"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:248
 msgid "disallow the use of an external password cache"
 msgstr "外部�パスワードキャッシュ�使用を����"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:250
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "クライアント���\"trusted\"マークを��る��を����"
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:253
 msgid "allow presetting passphrase"
 msgstr "パスフレーズ�事�設定を��る"
 
-#: agent/gpg-agent.c:256
+#: agent/gpg-agent.c:258
 msgid "Options enforcing a passphrase policy"
 msgstr "パスワード・�リシー�強制オプション"
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:261
 msgid "do not allow bypassing the passphrase policy"
 msgstr "パスワード・�リシーを迂回�る��を����"
 
-#: agent/gpg-agent.c:261
+#: agent/gpg-agent.c:263
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr "|N|新��パスフレーズ�必���る最低長をN��る"
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:265
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 "|N|新��パスフレーズ���アルファベット���キャラクタを最低N必���る"
 
-#: agent/gpg-agent.c:266
+#: agent/gpg-agent.c:268
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr "|FILE|新��パスフレーズをFILE�パターン�対���ェック�る"
 
-#: agent/gpg-agent.c:268
+#: agent/gpg-agent.c:272
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|N日後�パスフレーズを期�切れ��る"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:274
 msgid "do not allow the reuse of old passphrases"
 msgstr "��パスフレーズを�使用�る��を����"
 
-#: agent/gpg-agent.c:273
+#: agent/gpg-agent.c:277
 msgid "Options controlling the PIN-Entry"
 msgstr "PIN-Entryを制御�るオプション"
 
-#: agent/gpg-agent.c:275
+#: agent/gpg-agent.c:279
 msgid "never use the PIN-entry"
 msgstr "PIN-Entryを決��使���"
 
-#: agent/gpg-agent.c:277
+#: agent/gpg-agent.c:281
 msgid "disallow caller to override the pinentry"
 msgstr "pinentryより優先��パスフレーズ入力を����"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:283
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr "PIN-Entry�キーボード�マウスを�有��る"
 
-#: agent/gpg-agent.c:282
+#: agent/gpg-agent.c:286
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|PGMをPIN入力プログラム���使�"
 
-#: agent/gpg-agent.c:286
+#: agent/gpg-agent.c:290
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|Pinentry�タイムアウトをN秒��る"
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:294
 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:551 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: agent/gpg-agent.c:557 agent/preset-passphrase.c:99 agent/protect-tool.c:154
 #: g10/gpg.c:1132 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:612 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:438
-#: dirmngr/dirmngr_ldap.c:175 tools/gpg-connect-agent.c:220 tools/gpgconf.c:151
+#: sm/gpgsm.c:613 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:446
+#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:151
 #: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "�グ� <@EMAIL@> ���報告����。\n"
 
-#: agent/gpg-agent.c:560
+#: agent/gpg-agent.c:566
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "使�方: @GPG_AGENT@ [オプション] (ヘルプ� -h)"
 
-#: agent/gpg-agent.c:562
+#: agent/gpg-agent.c:568
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -615,131 +631,131 @@ msgstr ""
 "形�: @GPG_AGENT@ [オプション] [コマンド [引数]]\n"
 "@GnuPG@�秘密��管�\n"
 
-#: agent/gpg-agent.c:607 g10/gpg.c:1337 scd/scdaemon.c:384 sm/gpgsm.c:760
-#: dirmngr/dirmngr.c:522
+#: agent/gpg-agent.c:613 g10/gpg.c:1337 scd/scdaemon.c:384 sm/gpgsm.c:761
+#: dirmngr/dirmngr.c:530
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "無効�debug-level '%s'�与�られ���\n"
 
-#: agent/gpg-agent.c:972 g10/gpg.c:3910 g10/gpg.c:3934 sm/gpgsm.c:1769
-#: sm/gpgsm.c:1775
+#: agent/gpg-agent.c:986 g10/gpg.c:3907 g10/gpg.c:3931 sm/gpgsm.c:1622
+#: sm/gpgsm.c:1628
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "�択�れ�ダイジェスト・アルゴリズム��無効��\n"
 
-#: agent/gpg-agent.c:1196 agent/gpg-agent.c:2019 common/comopt.c:93
-#: g10/gpg.c:2591 scd/scdaemon.c:549 sm/gpgsm.c:1155 dirmngr/dirmngr.c:989
-#: dirmngr/dirmngr.c:1840
+#: agent/gpg-agent.c:1210 agent/gpg-agent.c:2035 common/comopt.c:93
+#: g10/gpg.c:2594 scd/scdaemon.c:549 sm/gpgsm.c:1028 dirmngr/dirmngr.c:1029
+#: dirmngr/dirmngr.c:1879
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "'%s' �らオプションを読�込���\n"
 
-#: agent/gpg-agent.c:1335 g10/gpg.c:3861 scd/scdaemon.c:687 sm/gpgsm.c:1709
-#: dirmngr/dirmngr.c:1108 tools/gpg-connect-agent.c:1270 tools/gpgconf.c:634
+#: agent/gpg-agent.c:1349 g10/gpg.c:3858 scd/scdaemon.c:687 sm/gpgsm.c:1562
+#: dirmngr/dirmngr.c:1145 tools/gpg-connect-agent.c:1270 tools/gpgconf.c:668
 #, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr "注�: '%s'�オプション��考�られ��ん\n"
 
-#: agent/gpg-agent.c:2172 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1267
+#: agent/gpg-agent.c:2188 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1306
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "ソケット�作�����ん: %s\n"
 
-#: agent/gpg-agent.c:2189 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1280
+#: agent/gpg-agent.c:2205 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1319
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "ソケット�'%s'�長����\n"
 
-#: agent/gpg-agent.c:2228
+#: agent/gpg-agent.c:2244
 #, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent�既�実行�れ���� - 新��も�をスタート����ん\n"
 
-#: agent/gpg-agent.c:2239 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1312
+#: agent/gpg-agent.c:2255 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1351
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "ソケット�ナンス�得エラー\n"
 
-#: agent/gpg-agent.c:2244 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1315
+#: agent/gpg-agent.c:2260 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1354
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "'%s'�ソケット��インド�エラー: %s\n"
 
-#: agent/gpg-agent.c:2255 agent/gpg-agent.c:2295 agent/gpg-agent.c:2304
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1324
+#: agent/gpg-agent.c:2271 agent/gpg-agent.c:2311 agent/gpg-agent.c:2320
+#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1363
 #, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "'%s'�許��設定����ん: %s\n"
 
-#: agent/gpg-agent.c:2269 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1336
+#: agent/gpg-agent.c:2285 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1375
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "ソケット'%s'�listen\n"
 
-#: agent/gpg-agent.c:2289 agent/gpg-agent.c:2342 common/homedir.c:517
+#: agent/gpg-agent.c:2305 agent/gpg-agent.c:2358 common/homedir.c:537
 #: 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:2292 agent/gpg-agent.c:2347 common/homedir.c:520
+#: agent/gpg-agent.c:2308 agent/gpg-agent.c:2363 common/homedir.c:540
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "ディレクトリ'%s'�作��れ���\n"
 
-#: agent/gpg-agent.c:2353
+#: agent/gpg-agent.c:2369
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "'%s'�stat()�失敗����: %s\n"
 
-#: agent/gpg-agent.c:2357
+#: agent/gpg-agent.c:2373
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "'%s'をホーム・ディレクトリ�使���ん\n"
 
-#: agent/gpg-agent.c:2512 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2069
+#: agent/gpg-agent.c:2528 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2108
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "fd %d�ナンス�読�込�エラー: %s\n"
 
-#: agent/gpg-agent.c:2719
+#: agent/gpg-agent.c:2735
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "�ンドラ0x%lx (fd %d �対�る)�開始\n"
 
-#: agent/gpg-agent.c:2724
+#: agent/gpg-agent.c:2740
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "�ンドラ0x%lx (fd %d �対�る)�終了\n"
 
-#: agent/gpg-agent.c:2799
+#: agent/gpg-agent.c:2815
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "ssh �ンドラ0x%lx (fd %d �対�る)�開始\n"
 
-#: agent/gpg-agent.c:2804
+#: agent/gpg-agent.c:2820
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "ssh �ンドラ0x%lx (fd %d �対�る)�終了\n"
 
-#: agent/gpg-agent.c:3026 scd/scdaemon.c:1374 dirmngr/dirmngr.c:2283
+#: agent/gpg-agent.c:3042 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2322
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "npth_pselect�失敗����: %s - 一秒待���\n"
 
-#: agent/gpg-agent.c:3114 scd/scdaemon.c:1439
+#: agent/gpg-agent.c:3130 scd/scdaemon.c:1441
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s �止����\n"
 
-#: agent/gpg-agent.c:3252 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3271 common/simple-pwquery.c:247 g10/call-agent.c:260
 #: sm/call-agent.c:131 tools/gpg-connect-agent.c:2319 tools/card-call-scd.c:311
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "��セッション�gpg-agent�実行�れ����ん\n"
 
-#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:70
+#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:66
 msgid ""
 "@Options:\n"
 " "
@@ -760,7 +776,7 @@ msgstr ""
 "パスワードキャッシュ�管�\n"
 
 #: agent/protect-tool.c:107 g10/gpg.c:448 kbx/kbxutil.c:72 sm/gpgsm.c:215
-#: dirmngr/dirmngr.c:168 tools/gpgconf.c:81
+#: dirmngr/dirmngr.c:169 tools/gpgconf.c:81
 msgid ""
 "@Commands:\n"
 " "
@@ -791,16 +807,16 @@ msgstr ""
 "形�: gpg-protect-tool [オプション] [引数]\n"
 "秘密�管�ツール\n"
 
-#: agent/protect-tool.c:707
+#: agent/protect-tool.c:708 sm/import.c:775
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "パスフレーズを入力������。PKCS#12オブジェクトを解除���。"
 
-#: agent/protect-tool.c:712
+#: agent/protect-tool.c:713 sm/export.c:727
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr ""
 "パスフレーズを入力������。新��PKCS#12オブジェクトを解除���。"
 
-#: agent/protect-tool.c:718
+#: agent/protect-tool.c:719
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
@@ -808,7 +824,7 @@ msgstr ""
 "GnuPGシステム�イン�ート�れ�オブジェクトを�護�る���パスフレーズを入力"
 "������"
 
-#: agent/protect-tool.c:723
+#: agent/protect-tool.c:724
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -816,17 +832,17 @@ msgstr ""
 "パスフレーズ���PINを入力������。\n"
 "���作を完了�る��必���。"
 
-#: agent/protect-tool.c:734
+#: agent/protect-tool.c:735
 #, c-format
 msgid "cancelled\n"
 msgstr "キャンセル�れ���\n"
 
-#: agent/protect-tool.c:736
+#: agent/protect-tool.c:737
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "パスフレーズを������る際�エラー: %s\n"
 
-#: agent/trustlist.c:153 agent/trustlist.c:363 tools/gpgconf.c:424
+#: agent/trustlist.c:153 agent/trustlist.c:363 tools/gpgconf.c:458
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "'%s'を開�際�エラー: %s\n"
@@ -984,7 +1000,7 @@ msgstr "作��れ�署��検査�失敗����: %s\n"
 msgid "secret key parts are not available\n"
 msgstr "秘密部分�得られ��ん\n"
 
-#: agent/cvt-openpgp.c:343 g10/card-util.c:1562
+#: agent/cvt-openpgp.c:343 g10/card-util.c:1575
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr "公開�アルゴリズム%d (%s)�サ�ート�れ����ん\n"
@@ -1013,7 +1029,7 @@ msgid "error creating a stream for a pipe: %s\n"
 msgstr "パイプ�ストリーム作�エラー: %s\n"
 
 #: common/exechelp-posix.c:505 common/exechelp-posix.c:580
-#: common/exechelp-posix.c:866 dirmngr/dirmngr.c:1354
+#: common/exechelp-posix.c:866 dirmngr/dirmngr.c:1393
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "プロセスforkエラー: %s\n"
@@ -1085,7 +1101,7 @@ msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "'%s'�ら'%s'���変更�失敗: %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3082
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3099
 msgid "yes"
 msgstr "yes"
 
@@ -1139,7 +1155,7 @@ msgstr "%lu�イト�確�����セキュア・メモリ�足り��
 msgid "out of core while allocating %lu bytes"
 msgstr "%lu�イト�確�����メモリ�足り��ん"
 
-#: common/miscellaneous.c:115 g10/card-util.c:917 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:927 tools/no-libgcrypt.c:30
 #: tools/gpg-card.c:416
 #, c-format
 msgid "error allocating enough memory: %s\n"
@@ -1212,7 +1228,7 @@ msgstr "%s'�ら�ージョン�得エラー: %s\n"
 msgid "server '%s' is older than us (%s < %s)"
 msgstr "サー�'%s'���らより����(%s < %s)"
 
-#: common/asshelp.c:737 g10/call-dirmngr.c:408
+#: common/asshelp.c:737 g10/call-dirmngr.c:407
 #, c-format
 msgid "WARNING: %s\n"
 msgstr "*警告*: %s\n"
@@ -1296,7 +1312,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:4212
+#: scd/app-openpgp.c:4214
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "サ�ート�れ����アルゴリズム: %s"
@@ -1371,11 +1387,11 @@ msgstr "証明書��ェイン�有効"
 msgid "Root certificate trustworthy"
 msgstr "信頼��るルート証明書"
 
-#: common/audit.c:1112 sm/certchain.c:1242
+#: common/audit.c:1112 sm/certchain.c:1243
 msgid "no CRL found for certificate"
 msgstr "証明書�対�るCRL��り��ん"
 
-#: common/audit.c:1115 sm/certchain.c:1252
+#: common/audit.c:1115 sm/certchain.c:1253
 msgid "the available CRL is too old"
 msgstr "利用��るCRL������"
 
@@ -1421,22 +1437,22 @@ msgstr "[未設定]"
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "無効�64進文字%02Xをスキップ����\n"
 
-#: common/ttyio.c:433
+#: common/ttyio.c:447
 #, c-format
 msgid "Sorry, we are in batchmode - can't get input\n"
 msgstr "����ん��ッ�モード�� - 入力を��られ��ん\n"
 
-#: common/ttyio.c:439
+#: common/ttyio.c:453
 #, c-format
 msgid "Sorry, no terminal at all requested - can't get input\n"
 msgstr "����ん�端末����求�れ���� - 入力を��られ��ん\n"
 
-#: common/ttyio.c:474 common/ttyio.c:484
+#: common/ttyio.c:488 common/ttyio.c:498
 #, c-format
 msgid "too many errors; giving up\n"
 msgstr "エラー�多����; ��ら���\n"
 
-#: common/ttyio.c:536
+#: common/ttyio.c:550
 #, c-format
 msgid "Control-D detected\n"
 msgstr "Control-D �検出�れ���\n"
@@ -1490,8 +1506,7 @@ msgstr "lock '%s' �作��れ��ん���: %s\n"
 msgid "waiting for lock %s...\n"
 msgstr "lock %s を待���...\n"
 
-#: common/init.c:191 sm/gpgsm.c:1036 dirmngr/dirmngr.c:895
-#: dirmngr/dirmngr.c:904
+#: common/init.c:191 sm/gpgsm.c:909 dirmngr/dirmngr.c:935 dirmngr/dirmngr.c:944
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s ������ (%s �必���在 %s)\n"
@@ -1642,7 +1657,7 @@ msgid "Enter passphrase: "
 msgstr "パスフレーズを入力: "
 
 #: g10/call-agent.c:318 g10/encrypt.c:282 g10/encrypt.c:818 g10/sign.c:473
-#: sm/call-agent.c:180 sm/encrypt.c:701 sm/sign.c:436
+#: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
 #, c-format
 msgid "%s is not compliant with %s mode\n"
 msgstr "%s�%sモード�準拠���ん\n"
@@ -1652,214 +1667,214 @@ msgstr "%s�%sモード�準拠���ん\n"
 msgid "error from TPM: %s\n"
 msgstr "TPM�ら�エラー: %s\n"
 
-#: g10/call-agent.c:2123 g10/passphrase.c:225 g10/passphrase.c:258
-#: tools/card-call-scd.c:1751
+#: g10/call-agent.c:2135 g10/passphrase.c:233 g10/passphrase.c:266
+#: tools/card-call-scd.c:1755
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "エージェント��題: %s\n"
 
-#: g10/call-dirmngr.c:179 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2316
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2316
 #, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "��セッション�dirmngr�実行�れ����ん\n"
 
-#: g10/call-dirmngr.c:213
+#: g10/call-dirmngr.c:212
 #, c-format
 msgid "keyserver option \"honor-keyserver-url\" may not be used in Tor mode\n"
 msgstr ""
 "�サー��オプション\"honor-keyserver-url\"をTorモード�使��������"
 "ã‚“\n"
 
-#: g10/call-dirmngr.c:386
+#: g10/call-dirmngr.c:385
 msgid "WKD uses a cached result"
 msgstr "WKD�キャッシュ�れ��果を使���"
 
-#: g10/call-dirmngr.c:389
+#: g10/call-dirmngr.c:388
 msgid "Tor is not running"
 msgstr "Tor�動�����ん"
 
-#: g10/call-dirmngr.c:391
+#: g10/call-dirmngr.c:390
 msgid "Tor is not properly configured"
 msgstr "Tor�正��設定�れ����ん"
 
-#: g10/call-dirmngr.c:393
+#: g10/call-dirmngr.c:392
 msgid "DNS is not properly configured"
 msgstr "DNS�正��設定�れ����ん"
 
-#: g10/call-dirmngr.c:395
+#: g10/call-dirmngr.c:394
 msgid "unacceptable HTTP redirect from server"
 msgstr "サー��ら���容れる�������HTTPりダイレクト"
 
-#: g10/call-dirmngr.c:397
+#: g10/call-dirmngr.c:396
 msgid "unacceptable HTTP redirect from server was cleaned up"
 msgstr "サー��ら���容れる�������HTTPりダイレクト�一掃����"
 
-#: g10/call-dirmngr.c:399
+#: g10/call-dirmngr.c:398
 msgid "server uses an invalid certificate"
 msgstr "サー��無効�証明書を使�����"
 
-#: g10/call-dirmngr.c:406 g10/gpg.c:4599
+#: g10/call-dirmngr.c:405 g10/gpg.c:4596
 #, c-format
 msgid "Note: %s\n"
 msgstr "注�: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:369 g10/card-util.c:1924
-#: tools/gpg-card.c:3039
+#: g10/card-util.c:86 g10/card-util.c:374 g10/card-util.c:1937
+#: tools/gpg-card.c:3056
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGPカード�利用����ん: %s\n"
 
-#: g10/card-util.c:91 g10/card-util.c:1930
+#: g10/card-util.c:91 g10/card-util.c:1943
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGPカードno. %sを検出\n"
 
-#: g10/card-util.c:97 g10/card-util.c:2309 g10/delkey.c:164 g10/keyedit.c:1428
-#: g10/keygen.c:4791 g10/revoke.c:214 g10/revoke.c:638
+#: g10/card-util.c:97 g10/card-util.c:2322 g10/delkey.c:164 g10/keyedit.c:1428
+#: g10/keygen.c:4795 g10/revoke.c:214 g10/revoke.c:639
 #, c-format
 msgid "can't do this in batch mode\n"
 msgstr "�れ��ッ�・モード������ん\n"
 
-#: g10/card-util.c:105 tools/gpg-card.c:2943
+#: g10/card-util.c:105 tools/gpg-card.c:2960
 #, c-format
 msgid "This command is only available for version 2 cards\n"
 msgstr "��コマンド�使�る���ージョン2�カード����\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3398 tools/gpg-card.c:2948
+#: g10/card-util.c:107 scd/app-openpgp.c:3399 tools/gpg-card.c:2965
 #, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "リセット・コード�(も�や)利用�能���り��ん\n"
 
-#: g10/card-util.c:140 g10/card-util.c:1448 g10/card-util.c:1710
-#: g10/card-util.c:1802 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1991 g10/keygen.c:2165 g10/keygen.c:2385 g10/keygen.c:2685
+#: g10/card-util.c:140 g10/card-util.c:1458 g10/card-util.c:1723
+#: g10/card-util.c:1815 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/keygen.c:1992 g10/keygen.c:2166 g10/keygen.c:2386 g10/keygen.c:2686
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
 #: tools/gpg-card.c:510
 msgid "Your selection? "
 msgstr "�����択�? "
 
-#: g10/card-util.c:262 g10/card-util.c:313 tools/gpg-card.c:596
+#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:596
 #: tools/gpg-card.c:636
 msgid "[not set]"
 msgstr "[未設定]"
 
-#: g10/card-util.c:558 tools/gpg-card.c:903
+#: g10/card-util.c:563 tools/gpg-card.c:905
 msgid "Mr."
 msgstr "Mr."
 
-#: g10/card-util.c:559 tools/gpg-card.c:904
+#: g10/card-util.c:564 tools/gpg-card.c:906
 msgid "Ms."
 msgstr "Ms."
 
-#: g10/card-util.c:586 tools/gpg-card.c:931
+#: g10/card-util.c:591 tools/gpg-card.c:933
 msgid "not forced"
 msgstr "強制��"
 
-#: g10/card-util.c:586 tools/gpg-card.c:931
+#: g10/card-util.c:591 tools/gpg-card.c:933
 msgid "forced"
 msgstr "強制"
 
-#: g10/card-util.c:768 tools/gpg-card.c:1468
+#: g10/card-util.c:773 tools/gpg-card.c:1484
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "エラー： 普通�ASCII���今�許��れ����。\n"
 
-#: g10/card-util.c:770 tools/gpg-card.c:1470
+#: g10/card-util.c:775 tools/gpg-card.c:1486
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "エラー: \"<\"文字�使���ん。\n"
 
-#: g10/card-util.c:772 tools/gpg-card.c:1472
+#: g10/card-util.c:777 tools/gpg-card.c:1488
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "エラー: 二��空白��止��。\n"
 
-#: g10/card-util.c:789 tools/gpg-card.c:1505
+#: g10/card-util.c:795 tools/gpg-card.c:1521
 msgid "Cardholder's surname: "
 msgstr "カード所有者�姓 (surname): "
 
-#: g10/card-util.c:791 tools/gpg-card.c:1506
+#: g10/card-util.c:797 tools/gpg-card.c:1522
 msgid "Cardholder's given name: "
 msgstr "カード所有者�� (given name): "
 
-#: g10/card-util.c:809 tools/gpg-card.c:1523
+#: g10/card-util.c:816 tools/gpg-card.c:1539
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "エラー: �������長���� (上�%d文字)。\n"
 
-#: g10/card-util.c:830 tools/gpg-card.c:1561
+#: g10/card-util.c:840 tools/gpg-card.c:1577
 msgid "URL to retrieve public key: "
 msgstr "公開�を�得�るURL: "
 
-#: g10/card-util.c:926 g10/decrypt-data.c:495 g10/import.c:406 g10/import.c:756
-#: g10/import.c:815 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1666
-#: tools/gpgconf.c:437 tools/gpgconf.c:483 tools/gpg-card.c:426
+#: g10/card-util.c:936 g10/decrypt-data.c:495 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:1705
+#: tools/gpgconf.c:471 tools/gpgconf.c:517 tools/gpg-card.c:426
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "'%s'�読�込�エラー: %s\n"
 
-#: g10/card-util.c:959 g10/decrypt-data.c:498 g10/export.c:2496
+#: g10/card-util.c:969 g10/decrypt-data.c:498 g10/export.c:2496
 #: dirmngr/crlcache.c:925 tools/gpg-card.c:486 tools/gpg-card.c:493
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr "'%s'�書�込�エラー: %s\n"
 
-#: g10/card-util.c:986 tools/gpg-card.c:1650
+#: g10/card-util.c:996 tools/gpg-card.c:1666
 msgid "Login data (account name): "
 msgstr "ログイン・データ (アカウント�): "
 
-#: g10/card-util.c:1024 tools/gpg-card.c:1945
+#: g10/card-util.c:1034 tools/gpg-card.c:1962
 msgid "Private DO data: "
 msgstr "プライベート DO データ: "
 
-#: g10/card-util.c:1109 tools/gpg-card.c:1699
+#: g10/card-util.c:1119 tools/gpg-card.c:1715
 msgid "Language preferences: "
 msgstr "言語�優先指定: "
 
-#: g10/card-util.c:1117 tools/gpg-card.c:1710
+#: g10/card-util.c:1127 tools/gpg-card.c:1726
 #, c-format
 msgid "Error: invalid length of preference string.\n"
 msgstr "エラー: 優先指定�文字列�長��無効��。\n"
 
-#: g10/card-util.c:1126 tools/gpg-card.c:1719
+#: g10/card-util.c:1136 tools/gpg-card.c:1735
 #, c-format
 msgid "Error: invalid characters in preference string.\n"
 msgstr "エラー: 優先指定�文字列�無効�文字��り��。\n"
 
-#: g10/card-util.c:1148 tools/gpg-card.c:1753
+#: g10/card-util.c:1158 tools/gpg-card.c:1769
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr "敬称 (M = Mr., F = Ms., �る��空白): "
 
-#: g10/card-util.c:1162 tools/gpg-card.c:1770
+#: g10/card-util.c:1172 tools/gpg-card.c:1786
 msgid "Error: invalid response.\n"
 msgstr "エラー: 無効�応答。\n"
 
-#: g10/card-util.c:1185 tools/gpg-card.c:1835
+#: g10/card-util.c:1195 tools/gpg-card.c:1852
 msgid "CA fingerprint: "
 msgstr "CA�フィンガープリント: "
 
-#: g10/card-util.c:1209 tools/gpg-card.c:1861
+#: g10/card-util.c:1219 tools/gpg-card.c:1878
 #, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "エラー: 無効�形��フィンガープリント。\n"
 
-#: g10/card-util.c:1259
+#: g10/card-util.c:1269
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "���作����ん: %s\n"
 
-#: g10/card-util.c:1260
+#: g10/card-util.c:1270
 msgid "not an OpenPGP card"
 msgstr "OpenPGPカード��り��ん"
 
-#: g10/card-util.c:1273 g10/keygen.c:4811 g10/keygen.c:5972
+#: g10/card-util.c:1283 g10/keygen.c:4815 g10/keygen.c:6003
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "�行�情報��得エラー: %s\n"
 
-#: g10/card-util.c:1358
+#: g10/card-util.c:1368
 msgid "Replace existing key? (y/N) "
 msgstr "既存��を置�������? (y/N) "
 
-#: g10/card-util.c:1375 tools/gpg-card.c:3328
+#: g10/card-util.c:1385 tools/gpg-card.c:3345
 msgid ""
 "Note: There is no guarantee that the card supports the requested\n"
 "      key type or size.  If the key generation does not succeed,\n"
@@ -1870,100 +1885,100 @@ msgstr ""
 "      ��ん。�生���功���場������カード�関�る技術文書を\n"
 "      確���サ�ート�れる�タイプや�長����確�����。\n"
 
-#: g10/card-util.c:1396 g10/keygen.c:2570 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1406 g10/keygen.c:2571 sm/certreqgen-ui.c:180
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "�長�? (%u) "
 
-#: g10/card-util.c:1406 g10/keygen.c:2493 g10/keygen.c:2525
+#: g10/card-util.c:1416 g10/keygen.c:2494 g10/keygen.c:2526
 #: sm/certreqgen-ui.c:195
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "%uビット�切り上���\n"
 
-#: g10/card-util.c:1414 g10/keygen.c:2578 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1424 g10/keygen.c:2579 sm/certreqgen-ui.c:185
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s �長� %u-%u �範囲���れ��り��ん\n"
 
-#: g10/card-util.c:1433
+#: g10/card-util.c:1443
 msgid "Changing card key attribute for: "
 msgstr "��ら�カード��属性を変更���: "
 
-#: g10/card-util.c:1435
+#: g10/card-util.c:1445
 msgid "Signature key\n"
 msgstr "署��\n"
 
-#: g10/card-util.c:1437
+#: g10/card-util.c:1447
 msgid "Encryption key\n"
 msgstr "暗�化�\n"
 
-#: g10/card-util.c:1439
+#: g10/card-util.c:1449
 msgid "Authentication key\n"
 msgstr "�証�\n"
 
-#: g10/card-util.c:1441 g10/keygen.c:2112 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1451 g10/keygen.c:2113 sm/certreqgen-ui.c:158
 msgid "Please select what kind of key you want:\n"
 msgstr "�希望���種類を�択������:\n"
 
-#: g10/card-util.c:1442 sm/certreqgen-ui.c:159
+#: g10/card-util.c:1452 sm/certreqgen-ui.c:159
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1443
+#: g10/card-util.c:1453
 #, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) ECC\n"
 
-#: g10/card-util.c:1455 g10/card-util.c:1722 g10/card-util.c:1822
-#: g10/keyedit.c:900 g10/keygen.c:2017 g10/keygen.c:2045 g10/keygen.c:2172
-#: g10/keygen.c:2425 g10/keygen.c:2713 g10/revoke.c:836
+#: g10/card-util.c:1468 g10/card-util.c:1735 g10/card-util.c:1835
+#: g10/keyedit.c:900 g10/keygen.c:2018 g10/keygen.c:2046 g10/keygen.c:2173
+#: g10/keygen.c:2426 g10/keygen.c:2714 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "無効��択��。\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1541
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr "カード��今�%uビット��を生��るよ���コンフィグ�れ��\n"
 
-#: g10/card-util.c:1533
+#: g10/card-util.c:1546
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr ""
 "カード��今���ら�タイプ��を生��るよ���コンフィグ�れ��: %s\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1582
 #, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "�%d�属性を変更�る際�エラー: %s\n"
 
-#: g10/card-util.c:1585 g10/card-util.c:2106 g10/card-util.c:2162
+#: g10/card-util.c:1598 g10/card-util.c:2119 g10/card-util.c:2175
 #, c-format
 msgid "error getting card info: %s\n"
 msgstr "カード情報��得エラー: %s\n"
 
-#: g10/card-util.c:1591 g10/card-util.c:1936 g10/card-util.c:2112
-#: g10/card-util.c:2171 tools/gpg-card.c:3057 tools/gpg-card.c:3296
-#: tools/gpg-card.c:3354
+#: g10/card-util.c:1604 g10/card-util.c:1949 g10/card-util.c:2125
+#: g10/card-util.c:2184 tools/gpg-card.c:3074 tools/gpg-card.c:3313
+#: tools/gpg-card.c:3371
 #, c-format
 msgid "This command is not supported by this card\n"
 msgstr "��カード�����コマンド�サ�ート�れ����ん。\n"
 
-#: g10/card-util.c:1637 tools/gpg-card.c:2426
+#: g10/card-util.c:1650 tools/gpg-card.c:2443
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "暗�化��カード外�ックアップを作�����? (Y/n) "
 
-#: g10/card-util.c:1651
+#: g10/card-util.c:1664
 #, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "注�: 秘密��も�カード��管���り��!\n"
 
-#: g10/card-util.c:1654 tools/gpg-card.c:2398
+#: g10/card-util.c:1667 tools/gpg-card.c:2415
 msgid "Replace existing keys? (y/N) "
 msgstr "既存��を置������? (y/N) "
 
-#: g10/card-util.c:1666 tools/gpg-card.c:2457
+#: g10/card-util.c:1679 tools/gpg-card.c:2474
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1974,152 +1989,152 @@ msgstr ""
 "   PIN = '%s'     管�者PIN = '%s'\n"
 "次�コマンドを使��変更����� --change-pin\n"
 
-#: g10/card-util.c:1701
+#: g10/card-util.c:1714
 msgid "Please select the type of key to generate:\n"
 msgstr "生��る��型を�択������:\n"
 
-#: g10/card-util.c:1703 g10/card-util.c:1793
+#: g10/card-util.c:1716 g10/card-util.c:1806
 msgid "   (1) Signature key\n"
 msgstr "   (1) 署��\n"
 
-#: g10/card-util.c:1704 g10/card-util.c:1795
+#: g10/card-util.c:1717 g10/card-util.c:1808
 msgid "   (2) Encryption key\n"
 msgstr "   (2) 暗�化�\n"
 
-#: g10/card-util.c:1705 g10/card-util.c:1797
+#: g10/card-util.c:1718 g10/card-util.c:1810
 msgid "   (3) Authentication key\n"
 msgstr "   (3) �証�\n"
 
-#: g10/card-util.c:1790
+#: g10/card-util.c:1803
 msgid "Please select where to store the key:\n"
 msgstr "�を�管�る場所を�択������:\n"
 
-#: g10/card-util.c:1836
+#: g10/card-util.c:1849
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "KEYTOCARD�失敗����: %s\n"
 
-#: g10/card-util.c:1941 tools/gpg-card.c:3065
+#: g10/card-util.c:1954 tools/gpg-card.c:3082
 #, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr "注�: ��コマンド�カード��管���る�����を破壊���!\n"
 
-#: g10/card-util.c:1944 tools/gpg-card.c:3068 tools/gpg-card.c:3409
+#: g10/card-util.c:1957 tools/gpg-card.c:3085 tools/gpg-card.c:3426
 msgid "Continue? (y/N) "
 msgstr "続����? (y/N) "
 
-#: g10/card-util.c:1949 tools/gpg-card.c:3079
+#: g10/card-util.c:1962 tools/gpg-card.c:3096
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr "工場出�リセットを行����? (本当�ら \"yes\" �入力) "
 
-#: g10/card-util.c:2142
+#: g10/card-util.c:2155
 #, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "KDF設定�エラー: %s\n"
 
-#: g10/card-util.c:2188
+#: g10/card-util.c:2201
 #, c-format
 msgid "error for setup UIF: %s\n"
 msgstr "UIF設定�エラー: %s\n"
 
-#: g10/card-util.c:2212 g10/keyedit.c:1263 tools/gpg-card.c:3649
+#: g10/card-util.c:2225 g10/keyedit.c:1263 tools/gpg-card.c:3666
 msgid "quit this menu"
 msgstr "��メニューを終了"
 
-#: g10/card-util.c:2214
+#: g10/card-util.c:2227
 msgid "show admin commands"
 msgstr "管�コマンドを表示"
 
-#: g10/card-util.c:2215 g10/keyedit.c:1266 tools/gpg-card.c:3652
+#: g10/card-util.c:2228 g10/keyedit.c:1266 tools/gpg-card.c:3669
 msgid "show this help"
 msgstr "��ヘルプを表示"
 
-#: g10/card-util.c:2217 tools/gpg-card.c:3654
+#: g10/card-util.c:2230 tools/gpg-card.c:3671
 msgid "list all available data"
 msgstr "全有効データを表示"
 
-#: g10/card-util.c:2220 tools/gpg-card.c:3656
+#: g10/card-util.c:2233 tools/gpg-card.c:3673
 msgid "change card holder's name"
 msgstr "カード所有者����変更"
 
-#: g10/card-util.c:2221 tools/gpg-card.c:3657
+#: g10/card-util.c:2234 tools/gpg-card.c:3674
 msgid "change URL to retrieve key"
 msgstr "�を�得�るURL�変更"
 
-#: g10/card-util.c:2222 tools/gpg-card.c:3658
+#: g10/card-util.c:2235 tools/gpg-card.c:3675
 msgid "fetch the key specified in the card URL"
 msgstr "カードURL�指定�れ����得"
 
-#: g10/card-util.c:2223 tools/gpg-card.c:3659
+#: g10/card-util.c:2236 tools/gpg-card.c:3676
 msgid "change the login name"
 msgstr "ログイン��変更"
 
-#: g10/card-util.c:2224 tools/gpg-card.c:3660
+#: g10/card-util.c:2237 tools/gpg-card.c:3677
 msgid "change the language preferences"
 msgstr "言語�優先指定�変更"
 
-#: g10/card-util.c:2225 tools/gpg-card.c:3661
+#: g10/card-util.c:2238 tools/gpg-card.c:3678
 msgid "change card holder's salutation"
 msgstr "カード所有者�敬称�変更"
 
-#: g10/card-util.c:2227 tools/gpg-card.c:3663
+#: g10/card-util.c:2240 tools/gpg-card.c:3680
 msgid "change a CA fingerprint"
 msgstr "CAフィンガープリント�変更"
 
-#: g10/card-util.c:2228 tools/gpg-card.c:3664
+#: g10/card-util.c:2241 tools/gpg-card.c:3681
 msgid "toggle the signature force PIN flag"
 msgstr "署�強制PINフラグを�転"
 
-#: g10/card-util.c:2229 tools/gpg-card.c:3665
+#: g10/card-util.c:2242 tools/gpg-card.c:3682
 msgid "generate new keys"
 msgstr "新���を生�"
 
-#: g10/card-util.c:2230 tools/gpg-card.c:3666
+#: g10/card-util.c:2243 tools/gpg-card.c:3683
 msgid "menu to change or unblock the PIN"
 msgstr "PINブロック�解除や変更�メニュー"
 
-#: g10/card-util.c:2231 tools/gpg-card.c:3667
+#: g10/card-util.c:2244 tools/gpg-card.c:3684
 msgid "verify the PIN and list all data"
 msgstr "PINを確������データを表示�る"
 
-#: g10/card-util.c:2232 tools/gpg-card.c:3668
+#: g10/card-util.c:2245 tools/gpg-card.c:3685
 msgid "unblock the PIN using a Reset Code"
 msgstr "PINをリセット・コード�ブロックを解除�る"
 
-#: g10/card-util.c:2233 tools/gpg-card.c:3672
+#: g10/card-util.c:2246 tools/gpg-card.c:3689
 msgid "destroy all keys and data"
 msgstr "������データを破壊���"
 
-#: g10/card-util.c:2235
+#: g10/card-util.c:2248
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr "PIN�証�KDFを設定�る (on/single/off)"
 
-#: g10/card-util.c:2236
+#: g10/card-util.c:2249
 msgid "change the key attribute"
 msgstr "��属性�変更"
 
-#: g10/card-util.c:2237 tools/gpg-card.c:3674
+#: g10/card-util.c:2250 tools/gpg-card.c:3691
 msgid "change the User Interaction Flag"
 msgstr "ユーザインタラクションフラグ�変更"
 
-#: g10/card-util.c:2361 tools/gpg-card.c:3924
+#: g10/card-util.c:2374 tools/gpg-card.c:3941
 msgid "gpg/card> "
 msgstr "gpg/card> "
 
-#: g10/card-util.c:2402
+#: g10/card-util.c:2415
 msgid "Admin-only command\n"
 msgstr "管�者専用コマンド\n"
 
-#: g10/card-util.c:2433
+#: g10/card-util.c:2446
 msgid "Admin commands are allowed\n"
 msgstr "管�者コマンド�許��れ����\n"
 
-#: g10/card-util.c:2435
+#: g10/card-util.c:2448
 msgid "Admin commands are not allowed\n"
 msgstr "管�者コマンド��止�れ����\n"
 
-#: g10/card-util.c:2546 g10/keyedit.c:2275 tools/gpg-card.c:3814
-#: tools/gpg-card.c:4072
+#: g10/card-util.c:2559 g10/keyedit.c:2275 tools/gpg-card.c:3831
+#: tools/gpg-card.c:4089
 #, c-format
 msgid "Invalid command  (try \"help\")\n"
 msgstr "無効�コマンド (\"help\"を�照)\n"
@@ -2129,22 +2144,22 @@ msgstr "無効�コマンド (\"help\"を�照)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "��コマンド�--output�機能���ん\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5293 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5292 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:1934 g10/export.c:2342 g10/export.c:2463
-#: g10/getkey.c:1907 g10/gpg.c:5238 g10/keyedit.c:1450 g10/keyedit.c:2382
-#: g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:703 g10/keyserver.c:1240
-#: g10/revoke.c:230 g10/tofu.c:2168
+#: g10/getkey.c:2032 g10/gpg.c:5237 g10/keyedit.c:1450 g10/keyedit.c:2382
+#: g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:703 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:2002 g10/getkey.c:1915 g10/getkey.c:4330
-#: g10/gpg.c:5247 g10/keyedit.c:2354 g10/keyserver.c:1258 g10/revoke.c:236
-#: g10/revoke.c:665 g10/tofu.c:2176
+#: g10/delkey.c:90 g10/export.c:2002 g10/getkey.c:2040 g10/getkey.c:4455
+#: g10/gpg.c:5246 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"
 msgstr "�ブロック�読�込�エラー: %s\n"
@@ -2263,14 +2278,14 @@ msgstr "æš—å�·ã‚¢ãƒ«ã‚´ãƒªã‚ºãƒ '%s'ã‚’æš—å�·åŒ–ã�«ä½¿ã�†ã�“ã�¨ã�¯ã�§ã��ã�¾ã�›ã‚
 msgid "(use option \"%s\" to override)\n"
 msgstr "(オー�ーライド�る���オプション\"%s\"を使���)\n"
 
-#: g10/encrypt.c:555 g10/encrypt.c:808 g10/decrypt-data.c:261 g10/gpg.c:4083
-#: g10/gpg.c:4130 sm/decrypt.c:742 sm/encrypt.c:691 sm/gpgsm.c:1793
+#: g10/encrypt.c:555 g10/encrypt.c:808 g10/decrypt-data.c:261 g10/gpg.c:4080
+#: g10/gpg.c:4127 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1646
 #, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "暗�アルゴリズム'%s'を%sモード�使��������ん\n"
 
-#: g10/encrypt.c:564 g10/gpg.c:4095 g10/gpg.c:4142 g10/sig-check.c:155
-#: g10/sign.c:452 sm/gpgsm.c:1803 sm/gpgsm.c:1813 sm/sign.c:596 sm/verify.c:510
+#: g10/encrypt.c:564 g10/gpg.c:4092 g10/gpg.c:4139 g10/sig-check.c:155
+#: g10/sign.c:452 sm/gpgsm.c:1656 sm/gpgsm.c:1666 sm/sign.c:596 sm/verify.c:510
 #, c-format
 msgid "digest algorithm '%s' may not be used in %s mode\n"
 msgstr "ダイジェスト・アルゴリズム'%s'を%sモード�使��������ん\n"
@@ -2287,7 +2302,7 @@ msgid ""
 msgstr ""
 "*警告*: 共通�暗�方� %s (%d) �強制����人�優先指定を�む���\n"
 
-#: g10/encrypt.c:838 sm/encrypt.c:766
+#: g10/encrypt.c:838 sm/encrypt.c:767
 #, c-format
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "*警告*: �%s��%sモード���暗�化�����ん\n"
@@ -2315,7 +2330,7 @@ msgstr "%s/%s.%s 暗�化 �信者:\"%s\"\n"
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "オプション'%s'を%sモード�使��������ん\n"
 
-#: g10/decrypt-data.c:239 g10/mainproc.c:380 sm/decrypt.c:494
+#: g10/decrypt-data.c:239 g10/mainproc.c:380 sm/decrypt.c:892
 #, c-format
 msgid "%s.%s encrypted data\n"
 msgstr "%s.%s暗�化済�データ\n"
@@ -2325,7 +2340,7 @@ msgstr "%s.%s暗�化済�データ\n"
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "�明�アルゴリズム%d�よる暗�化\n"
 
-#: g10/decrypt-data.c:361 g10/decrypt-data.c:414 sm/decrypt.c:508
+#: g10/decrypt-data.c:361 g10/decrypt-data.c:414 sm/decrypt.c:906
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2364,7 +2379,7 @@ msgstr "GnuPG����ックアップフォーマットを使���"
 msgid " - skipped"
 msgstr " - スキップ�れ���"
 
-#: g10/export.c:1333 g10/import.c:2124 g10/openfile.c:202 g10/openfile.c:296
+#: g10/export.c:1333 g10/import.c:2132 g10/openfile.c:202 g10/openfile.c:296
 #: g10/sign.c:1110 g10/sign.c:1447
 #, c-format
 msgid "writing to '%s'\n"
@@ -2400,61 +2415,61 @@ msgstr "'%s'�作�エラー: %s\n"
 msgid "[User ID not found]"
 msgstr "[ユーザID�見��り��ん]"
 
-#: g10/getkey.c:1199
+#: g10/getkey.c:1324
 #, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "'%s'を %s �ら自動�得\n"
 
-#: g10/getkey.c:1205
+#: g10/getkey.c:1330
 #, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "'%s'を %s �ら�得�る際�エラー: %s\n"
 
-#: g10/getkey.c:1207
+#: g10/getkey.c:1332
 msgid "No fingerprint"
 msgstr "フィンガープリント��り��ん"
 
-#: g10/getkey.c:1449
+#: g10/getkey.c:1574
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr "%s �ら失効����新��コピーを確����。\n"
 
-#: g10/getkey.c:1884 g10/revoke.c:657 g10/revoke.c:718
+#: g10/getkey.c:2009 g10/revoke.c:658 g10/revoke.c:719
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "秘密�\"%s\"�見��り��ん: %s\n"
 
-#: g10/getkey.c:1887 g10/pkclist.c:1012
+#: g10/getkey.c:2012 g10/pkclist.c:1012
 #, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "(オプション'%s'�引数を確�����)\n"
 
-#: g10/getkey.c:1965
+#: g10/getkey.c:2090
 #, c-format
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "警告: デフォルト�秘密���� '%s' を用���ん: %s\n"
 
-#: g10/getkey.c:1973
+#: g10/getkey.c:2098
 #, c-format
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "デフォルト�署�用�秘密����\"%s\"を用���\n"
 
-#: g10/getkey.c:1980
+#: g10/getkey.c:2105
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr "'%s'�渡�れ�����値�無視�れ���\n"
 
-#: g10/getkey.c:2837
+#: g10/getkey.c:2962
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "--allow-non-selfsigned-uid�有効��れ�無効��%s��\n"
 
-#: g10/getkey.c:3703
+#: g10/getkey.c:3828
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "副�%s(主�%s����)を用���\n"
 
-#: g10/getkey.c:4259 g10/gpg.c:2167
+#: g10/getkey.c:4384 g10/gpg.c:2168
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "オプション'%s'�有効�値:\n"
@@ -2639,7 +2654,7 @@ msgstr "|SPEC|電�メールエイリアスを設定�る"
 msgid "use strict OpenPGP behavior"
 msgstr "厳密�OpenPGP�振舞を採用"
 
-#: g10/gpg.c:651 kbx/kbxutil.c:91 sm/gpgsm.c:424 tools/gpgconf.c:113
+#: g10/gpg.c:651 kbx/kbxutil.c:91 sm/gpgsm.c:425 tools/gpgconf.c:113
 msgid "do not make any changes"
 msgstr "無変更"
 
@@ -2671,7 +2686,7 @@ msgstr "正準テキスト・モードを使用"
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|圧縮レベルをN�設定 (0��圧縮)"
 
-#: g10/gpg.c:762 sm/gpgsm.c:357
+#: g10/gpg.c:762 sm/gpgsm.c:358
 msgid "Options controlling key import and export"
 msgstr "��イン�ート�エクス�ートを制御�るオプション"
 
@@ -2687,11 +2702,11 @@ msgstr "署��ら手元����をイン�ート�る"
 msgid "include the public key in signatures"
 msgstr "署��公開�を��る"
 
-#: g10/gpg.c:776 sm/gpgsm.c:360
+#: g10/gpg.c:776 sm/gpgsm.c:361
 msgid "disable all access to the dirmngr"
 msgstr "dirmngr������アクセスを無効��る"
 
-#: g10/gpg.c:788 sm/gpgsm.c:367
+#: g10/gpg.c:788 sm/gpgsm.c:368
 msgid "Options controlling key listings"
 msgstr "��リスティングをを制御�るオプション"
 
@@ -2707,15 +2722,15 @@ msgstr "|USER-ID|USER-ID用�暗�化"
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|USER-ID|署�や復����USER-IDを使用"
 
-#: g10/gpg.c:876 sm/gpgsm.c:408
+#: g10/gpg.c:876 sm/gpgsm.c:409
 msgid "Options for unattended use"
 msgstr "無人使用����オプション"
 
-#: g10/gpg.c:895 sm/gpgsm.c:420 dirmngr/dirmngr.c:286
+#: g10/gpg.c:895 sm/gpgsm.c:421 dirmngr/dirmngr.c:289
 msgid "Other options"
 msgstr "�����オプション"
 
-#: g10/gpg.c:966 sm/gpgsm.c:453
+#: g10/gpg.c:966 sm/gpgsm.c:454
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2757,7 +2772,7 @@ msgstr ""
 "署��検査�暗�化���復�\n"
 "デフォルト��作��入力データ��存\n"
 
-#: g10/gpg.c:1168 sm/gpgsm.c:636
+#: g10/gpg.c:1168 sm/gpgsm.c:637
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2781,12 +2796,12 @@ msgstr "�ッシュ: "
 msgid "Compression: "
 msgstr "圧縮: "
 
-#: g10/gpg.c:1274 sm/gpgsm.c:710
+#: g10/gpg.c:1274 sm/gpgsm.c:711
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "使�方: %s [オプション] %s\n"
 
-#: g10/gpg.c:1467 sm/gpgsm.c:803
+#: g10/gpg.c:1467 sm/gpgsm.c:804
 #, c-format
 msgid "conflicting commands\n"
 msgstr "対立�るコマンド\n"
@@ -2796,522 +2811,522 @@ msgstr "対立�るコマンド\n"
 msgid "no = sign found in group definition '%s'\n"
 msgstr "=記���グループ定義'%s'内�見��り��ん\n"
 
-#: g10/gpg.c:1683
+#: g10/gpg.c:1684
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "*警告*: homedir '%s'�安全���所有\n"
 
-#: g10/gpg.c:1686
+#: g10/gpg.c:1687
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "*警告*: コンフィグレーション・ファイル'%s'�安全���所有\n"
 
-#: g10/gpg.c:1689
+#: g10/gpg.c:1690
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "*警告*: 拡張'%s'�安全���所有\n"
 
-#: g10/gpg.c:1695
+#: g10/gpg.c:1696
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "*警告*: homedir '%s'�安全���許�\n"
 
-#: g10/gpg.c:1698
+#: g10/gpg.c:1699
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "*警告*: コンフィグレーション・ファイル'%s'�安全���許�\n"
 
-#: g10/gpg.c:1701
+#: g10/gpg.c:1702
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "*警告*: 拡張'%s'�安全���許�\n"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1708
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "*警告*: homedir '%s'�安全���上�ディレクトリ所有\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1711
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr ""
 "*警告*: コンフィグレーション・ファイル'%s'�安全���上�ディレクトリ所有\n"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1714
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr "*警告*: 拡張'%s'�安全���上�ディレクトリ所有\n"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1720
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr "*警告*: homedir '%s'�安全���上�ディレクトリ許�\n"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1723
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 msgstr ""
 "*警告*: コンフィグレーション・ファイル'%s'�安全���上�ディレクトリ許�\n"
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1726
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr "*警告*: 拡張'%s'�安全���上�ディレクトリ許�\n"
 
-#: g10/gpg.c:1941
+#: g10/gpg.c:1942
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "�明�コンフィグレーション項目'%s'\n"
 
-#: g10/gpg.c:2037
+#: g10/gpg.c:2038
 msgid "display photo IDs during key listings"
 msgstr "��一覧時�フォトIDを表示�る"
 
-#: g10/gpg.c:2039
+#: g10/gpg.c:2040
 msgid "show key usage information during key listings"
 msgstr "��一覧時���使�方�情報を表示�る"
 
-#: g10/gpg.c:2041
+#: g10/gpg.c:2042
 msgid "show policy URLs during signature listings"
 msgstr "署��一覧時��リシーURLを表示�る"
 
-#: g10/gpg.c:2043
+#: g10/gpg.c:2044
 msgid "show all notations during signature listings"
 msgstr "署��一覧時�����注釈を表示�る"
 
-#: g10/gpg.c:2045
+#: g10/gpg.c:2046
 msgid "show IETF standard notations during signature listings"
 msgstr "署��一覧時�IETF標準注釈を表示�る"
 
-#: g10/gpg.c:2049
+#: g10/gpg.c:2050
 msgid "show user-supplied notations during signature listings"
 msgstr "署��一覧時�ユーザ�注釈を表示�る"
 
-#: g10/gpg.c:2051
+#: g10/gpg.c:2052
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "署��一覧時�優先�サー�URLを表示�る"
 
-#: g10/gpg.c:2053
+#: g10/gpg.c:2054
 msgid "show user ID validity during key listings"
 msgstr "��一覧時�ユーザID�有効性を表示�る"
 
-#: g10/gpg.c:2055
+#: g10/gpg.c:2056
 msgid "show revoked and expired user IDs in key listings"
 msgstr "��一覧�失効��ユーザID�期�切れ����ユーザIDを表示�る"
 
-#: g10/gpg.c:2057
+#: g10/gpg.c:2058
 msgid "show revoked and expired subkeys in key listings"
 msgstr "��一覧�失効��副��期�切れ����副�を表示�る"
 
-#: g10/gpg.c:2059
+#: g10/gpg.c:2060
 msgid "show the keyring name in key listings"
 msgstr "��一覧��リング���を表示�る"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2062
 msgid "show expiration dates during signature listings"
 msgstr "署��一覧時�有効期��日付を表示�る"
 
-#: g10/gpg.c:2178
+#: g10/gpg.c:2179
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "�明�TOFU�リシー'%s'\n"
 
-#: g10/gpg.c:2180
+#: g10/gpg.c:2181
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(�択肢�一覧��\"help\"を使������)\n"
 
-#: g10/gpg.c:2975 g10/gpg.c:3828 g10/gpg.c:3840
+#: g10/gpg.c:2978 g10/gpg.c:3825 g10/gpg.c:3837
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "注�: 普通%s�使���ん!\n"
 
-#: g10/gpg.c:3151 g10/gpg.c:3163
+#: g10/gpg.c:3154 g10/gpg.c:3166
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "'%s'��有効�署�表����り��ん\n"
 
-#: g10/gpg.c:3185
+#: g10/gpg.c:3188
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "\"%s\"�正��メール・アドレス���り��ん\n"
 
-#: g10/gpg.c:3217 sm/gpgsm.c:1270
+#: g10/gpg.c:3220 sm/gpgsm.c:1143
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "無効� pinentry mode '%s'��\n"
 
-#: g10/gpg.c:3223 sm/gpgsm.c:1276
+#: g10/gpg.c:3226 sm/gpgsm.c:1149
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "無効��信元�求 '%s' ��\n"
 
-#: g10/gpg.c:3280
+#: g10/gpg.c:3283
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "'%s'��有効�文字集����り��ん\n"
 
-#: g10/gpg.c:3302 g10/gpg.c:3511 g10/keyedit.c:5319
+#: g10/gpg.c:3305 g10/gpg.c:3514 g10/keyedit.c:5322
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "�サー��URLを解��能\n"
 
-#: g10/gpg.c:3320
+#: g10/gpg.c:3323
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: 無効��サー�・オプション��\n"
 
-#: g10/gpg.c:3323
+#: g10/gpg.c:3326
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "無効��サー�・オプション��\n"
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3333
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: 無効�イン�ート・オプション��\n"
 
-#: g10/gpg.c:3333
+#: g10/gpg.c:3336
 #, c-format
 msgid "invalid import options\n"
 msgstr "無効�イン�ート・オプション��\n"
 
-#: g10/gpg.c:3339 g10/gpg.c:3354
+#: g10/gpg.c:3342 g10/gpg.c:3357
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "無効�フィルタ・オプション��: %s\n"
 
-#: g10/gpg.c:3345
+#: g10/gpg.c:3348
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: 無効�エクス�ート・オプション��\n"
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3351
 #, c-format
 msgid "invalid export options\n"
 msgstr "無効�エクス�ート・オプション��\n"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3363
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: 無効�一覧オプション��\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3366
 #, c-format
 msgid "invalid list options\n"
 msgstr "無効�一覧オプション��\n"
 
-#: g10/gpg.c:3371
+#: g10/gpg.c:3374
 msgid "display photo IDs during signature verification"
 msgstr "署��検証時�フォトIDを表示�る"
 
-#: g10/gpg.c:3373
+#: g10/gpg.c:3376
 msgid "show policy URLs during signature verification"
 msgstr "署��検証時��リシーURLを表示�る"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3378
 msgid "show all notations during signature verification"
 msgstr "署��検証時�����注釈を表示�る"
 
-#: g10/gpg.c:3377
+#: g10/gpg.c:3380
 msgid "show IETF standard notations during signature verification"
 msgstr "署��検証時�IETF標準注釈を表示�る"
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3384
 msgid "show user-supplied notations during signature verification"
 msgstr "署��検証時�ユーザ�注釈を表示�る"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3386
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "署��検証時�優先�サー�URLを表示�る"
 
-#: g10/gpg.c:3385
+#: g10/gpg.c:3388
 msgid "show user ID validity during signature verification"
 msgstr "署��検証時�ユーザID�有効性を表示�る"
 
-#: g10/gpg.c:3387
+#: g10/gpg.c:3390
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "署��検証時�失効��ユーザID�期�切れ����ユーザIDを表示�る"
 
-#: g10/gpg.c:3389
+#: g10/gpg.c:3392
 msgid "show only the primary user ID in signature verification"
 msgstr "署��検証時�プライマリ・ユーザID��をを表示�る"
 
-#: g10/gpg.c:3396
+#: g10/gpg.c:3399
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: 無効�検証オプション��\n"
 
-#: g10/gpg.c:3399
+#: g10/gpg.c:3402
 #, c-format
 msgid "invalid verify options\n"
 msgstr "無効�検証オプション��\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3409
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-pathを%s�設定�能\n"
 
-#: g10/gpg.c:3613
+#: g10/gpg.c:3616
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: 無効� auto-key-locate リスト��\n"
 
-#: g10/gpg.c:3616
+#: g10/gpg.c:3619
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "無効� auto-key-locate リスト��\n"
 
-#: g10/gpg.c:3625
+#: g10/gpg.c:3628
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "オプション\"%.50s\"��無効�引数��\n"
 
-#: g10/gpg.c:3807 sm/gpgsm.c:1675
+#: g10/gpg.c:3804 sm/gpgsm.c:1528
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "*警告*: プログラム�coreファイルを作��る����り��!\n"
 
-#: g10/gpg.c:3821
+#: g10/gpg.c:3818
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "*警告*: %s�%sより優先\n"
 
-#: g10/gpg.c:3830
+#: g10/gpg.c:3827
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s�%s��も�使��������ん!\n"
 
-#: g10/gpg.c:3833
+#: g10/gpg.c:3830
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s�%s��も�使��も無�味��!\n"
 
-#: g10/gpg.c:3848 sm/gpgsm.c:1696 dirmngr/dirmngr.c:1123
+#: g10/gpg.c:3845 sm/gpgsm.c:1549 dirmngr/dirmngr.c:1160
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "*警告*: ニセモノ�システム時刻�実行�����: "
 
-#: g10/gpg.c:3869
+#: g10/gpg.c:3866
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "%s ����セキュア���メモリ�実行���ん\n"
 
-#: g10/gpg.c:3897 g10/gpg.c:3928 sm/gpgsm.c:1763
+#: g10/gpg.c:3894 g10/gpg.c:3925 sm/gpgsm.c:1616
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "�択�れ�暗�アルゴリズム�無効��\n"
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3901
 #, c-format
 msgid "selected AEAD algorithm is invalid\n"
 msgstr "�択�れ�AEADアルゴリズム�無効��\n"
 
-#: g10/gpg.c:3916
+#: g10/gpg.c:3913
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "�択�れ�圧縮アルゴリズム�無効��\n"
 
-#: g10/gpg.c:3922
+#: g10/gpg.c:3919
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "�択�れ�証明書ダイジェスト・アルゴリズム�無効��\n"
 
-#: g10/gpg.c:3937
+#: g10/gpg.c:3934
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed�正�値�必���\n"
 
-#: g10/gpg.c:3939
+#: g10/gpg.c:3936
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed�1より大��値�必���\n"
 
-#: g10/gpg.c:3941
+#: g10/gpg.c:3938
 #, 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:3943
+#: g10/gpg.c:3940
 #, 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:3945
+#: g10/gpg.c:3942
 #, 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:3949
+#: g10/gpg.c:3946
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "注�: �純�S2Kモード(0)�使用��強��対���\n"
 
-#: g10/gpg.c:3953
+#: g10/gpg.c:3950
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "無効�S2Kモード。0�1�3���れ��り��ん\n"
 
-#: g10/gpg.c:3960
+#: g10/gpg.c:3957
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "無効�デフォルト�優先指定\n"
 
-#: g10/gpg.c:3964
+#: g10/gpg.c:3961
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "無効�個人用暗�方��優先指定\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3964
 #, c-format
 msgid "invalid personal AEAD preferences\n"
 msgstr "無効�個人用AEAD方��優先指定\n"
 
-#: g10/gpg.c:3971
+#: g10/gpg.c:3968
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "無効�個人用ダイジェスト�優先指定\n"
 
-#: g10/gpg.c:3975
+#: g10/gpg.c:3972
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "無効�個人用圧縮�優先指定\n"
 
-#: g10/gpg.c:3984 g10/gpg.c:3989
+#: g10/gpg.c:3981 g10/gpg.c:3986
 #, c-format
 msgid "chunk size invalid - using %d\n"
 msgstr "無効��ャンク長 - %dビット����\n"
 
-#: g10/gpg.c:4026
+#: g10/gpg.c:4023
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s�%s����機能���ん\n"
 
-#: g10/gpg.c:4089
+#: g10/gpg.c:4086
 #, c-format
 msgid "AEAD algorithm '%s' may not be used in %s mode\n"
 msgstr "AEADアルゴリズム'%s'を%sモード�使��������ん\n"
 
-#: g10/gpg.c:4101
+#: g10/gpg.c:4098
 #, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "圧縮アルゴリズム'%s'を%sモード�使��������ん\n"
 
-#: g10/gpg.c:4256
+#: g10/gpg.c:4253
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "信用データベース��期化�失敗����: %s\n"
 
-#: g10/gpg.c:4268
+#: g10/gpg.c:4265
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "*警告*: 公開�暗�を使������人 (-r) を指定�����\n"
 
-#: g10/gpg.c:4340
+#: g10/gpg.c:4337
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "'%s'�共通�暗��失敗����: %s\n"
 
-#: g10/gpg.c:4369
+#: g10/gpg.c:4366
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --encryptを--s2k-mode 0�使��������ん\n"
 
-#: g10/gpg.c:4372
+#: g10/gpg.c:4369
 #, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "--symmetric --encryptを%sモード�使��������ん\n"
 
-#: g10/gpg.c:4430
+#: g10/gpg.c:4427
 #, 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:4433
+#: g10/gpg.c:4430
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "--symmetric --sign --encryptを%sモード�使��������ん\n"
 
-#: g10/gpg.c:4821 g10/keyserver.c:1870
+#: g10/gpg.c:4818 g10/keyserver.c:1629
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "�サー����信�失敗����: %s\n"
 
-#: g10/gpg.c:4826
+#: g10/gpg.c:4823
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "�サー��ら��信�失敗����: %s\n"
 
-#: g10/gpg.c:4832
+#: g10/gpg.c:4829
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "��エクス�ート�失敗����: %s\n"
 
-#: g10/gpg.c:4845
+#: g10/gpg.c:4842
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "ssh�����エクス�ート�失敗����: %s\n"
 
-#: g10/gpg.c:4857
+#: g10/gpg.c:4854
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "�サー��検索�失敗����: %s\n"
 
-#: g10/gpg.c:4870
+#: g10/gpg.c:4867
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "�サー��更新�失敗����: %s\n"
 
-#: g10/gpg.c:4937
+#: g10/gpg.c:4936
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "外装除去�失敗����: %s\n"
 
-#: g10/gpg.c:4948
+#: g10/gpg.c:4947
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "外装�失敗����: %s\n"
 
-#: g10/gpg.c:5053
+#: g10/gpg.c:5052
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "無効��ッシュ・アルゴリズム'%s'��\n"
 
-#: g10/gpg.c:5205 g10/tofu.c:2156
+#: g10/gpg.c:5204 g10/tofu.c:2160
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "�指定'%s'�構文解�エラー: %s\n"
 
-#: g10/gpg.c:5216
+#: g10/gpg.c:5215
 #, 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:5272
+#: g10/gpg.c:5271
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 "*警告*: コマンド�指定�れ����ん。��を�味���る��当����"
 "� ...\n"
 
-#: g10/gpg.c:5283
+#: g10/gpg.c:5282
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "開始���。メッセージを打������ ...\n"
 
-#: g10/gpg.c:5630
+#: g10/gpg.c:5629
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "���られ�証明書�リシーURL�無効��\n"
 
-#: g10/gpg.c:5632
+#: g10/gpg.c:5631
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "���られ�署��リシーURL�無効��\n"
 
-#: g10/gpg.c:5665
+#: g10/gpg.c:5664
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "指定�れ�優先�サー�URL�無効��\n"
@@ -3324,7 +3339,7 @@ msgstr "|FILE|�リングFILE��を扱���"
 msgid "make timestamp conflicts only a warning"
 msgstr "日時�矛盾を警告������"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:414 tools/gpgconf.c:116 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:415 tools/gpgconf.c:116 tools/gpg-card.c:95
 msgid "|FD|write status info to this FD"
 msgstr "|FD|��FD�ステイタス情報を書�出�"
 
@@ -3409,97 +3424,97 @@ msgstr "GnuPG����ックアップフォーマットを仮定���"
 msgid "repair keys on import"
 msgstr "イン�ート�際��を修復�る"
 
-#: g10/import.c:399 g10/import.c:721
+#: g10/import.c:407 g10/import.c:729
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "型%d�ブロックをスキップ���\n"
 
-#: g10/import.c:738
+#: g10/import.c:746
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "�れ��%lu個��を処�\n"
 
-#: g10/import.c:831
+#: g10/import.c:839
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "          処�数��計: %lu\n"
 
-#: g10/import.c:834
+#: g10/import.c:842
 #, c-format
 msgid "    skipped PGP-2 keys: %lu\n"
 msgstr "   スキップ��PGP-2�: %lu\n"
 
-#: g10/import.c:836
+#: g10/import.c:844
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "  スキップ��新���: %lu\n"
 
-#: g10/import.c:839
+#: g10/import.c:847
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          ユーザID��: %lu\n"
 
-#: g10/import.c:842 sm/import.c:129
+#: g10/import.c:850 sm/import.c:129
 #, c-format
 msgid "              imported: %lu"
 msgstr "            イン�ート: %lu"
 
-#: g10/import.c:846 sm/import.c:133
+#: g10/import.c:854 sm/import.c:133
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "              変更��: %lu\n"
 
-#: g10/import.c:848
+#: g10/import.c:856
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "        新��ユーザID: %lu\n"
 
-#: g10/import.c:850
+#: g10/import.c:858
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "            新��副�: %lu\n"
 
-#: g10/import.c:852
+#: g10/import.c:860
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "            新��署�: %lu\n"
 
-#: g10/import.c:854
+#: g10/import.c:862
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "        新����失効: %lu\n"
 
-#: g10/import.c:856 sm/import.c:135
+#: g10/import.c:864 sm/import.c:135
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      秘密��読�込�: %lu\n"
 
-#: g10/import.c:858 sm/import.c:137
+#: g10/import.c:866 sm/import.c:137
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "    秘密��イン�ート: %lu\n"
 
-#: g10/import.c:860 sm/import.c:139
+#: g10/import.c:868 sm/import.c:139
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "        無変更�秘密�: %lu\n"
 
-#: g10/import.c:862 sm/import.c:141
+#: g10/import.c:870 sm/import.c:141
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "          未イン�ート: %lu\n"
 
-#: g10/import.c:864
+#: g10/import.c:872
 #, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "        掃除�れ�署�: %lu\n"
 
-#: g10/import.c:866
+#: g10/import.c:874
 #, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "    掃除�れ�ユーザID: %lu\n"
 
-#: g10/import.c:1291
+#: g10/import.c:1299
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
@@ -3508,171 +3523,171 @@ msgstr ""
 "*警告*: �%s����れら�ユーザID�対��使用���アルゴリズム�優先指定�"
 "�り��\n"
 
-#: g10/import.c:1333
+#: g10/import.c:1341
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": 暗�アルゴリズム�優先指定 %s\n"
 
-#: g10/import.c:1351
+#: g10/import.c:1359
 #, c-format
 msgid "         \"%s\": preference for AEAD algorithm %s\n"
 msgstr "         \"%s\": AEADアルゴリズム�優先指定 %s\n"
 
-#: g10/import.c:1366
+#: g10/import.c:1374
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": ダイジェスト・アルゴリズム�優先指定 %s\n"
 
-#: g10/import.c:1378
+#: g10/import.c:1386
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": 圧縮アルゴリズム�優先指定 %s\n"
 
-#: g10/import.c:1391
+#: g10/import.c:1399
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "����優先指定を更新�����を��布�る���強�推奨�れ��\n"
 
-#: g10/import.c:1393
+#: g10/import.c:1401
 #, c-format
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr "�れ�よ���潜在的�アルゴリズム�一致��題を��られ��\n"
 
-#: g10/import.c:1418
+#: g10/import.c:1426
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "以下��優先指定を更新����: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:1932 g10/import.c:3053
+#: g10/import.c:1940 g10/import.c:3061
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "�%s: ユーザID��り��ん\n"
 
-#: g10/import.c:1938
+#: g10/import.c:1946
 #, c-format
 msgid "key %s: %s\n"
 msgstr "�  %s: %s\n"
 
-#: g10/import.c:1939 g10/import.c:3025
+#: g10/import.c:1947 g10/import.c:3033
 msgid "rejected by import screener"
 msgstr "イン�ート�検査�拒��れ���"
 
-#: g10/import.c:1988
+#: g10/import.c:1996
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "�%s: PKS�副�変造を修復\n"
 
-#: g10/import.c:2009
+#: g10/import.c:2017
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "�%s: ����未自己署��ユーザID\"%s\"\n"
 
-#: g10/import.c:2020 g10/import.c:2051
+#: g10/import.c:2028 g10/import.c:2059
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "�%s: 有効�ユーザID��り��ん\n"
 
-#: g10/import.c:2022
+#: g10/import.c:2030
 #, c-format
 msgid "this may be caused by a missing self-signature\n"
 msgstr "�れ���ら�自己署��������ょ�\n"
 
-#: g10/import.c:2101 g10/import.c:3439
+#: g10/import.c:2109 g10/import.c:3447
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "�%s: 公開��見��り��ん: %s\n"
 
-#: g10/import.c:2107
+#: g10/import.c:2115
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "�%s: 新����� - スキップ���\n"
 
-#: g10/import.c:2119
+#: g10/import.c:2127
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "書�込��能��リング�見��り��ん: %s\n"
 
-#: g10/import.c:2151 g10/import.c:2253 g10/import.c:3514
+#: g10/import.c:2159 g10/import.c:2261 g10/import.c:3522
 #, c-format
 msgid "error writing keyring '%s': %s\n"
 msgstr "�リング'%s'�書�込�エラー: %s\n"
 
-#: g10/import.c:2174
+#: g10/import.c:2182
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "�%s: 公開�\"%s\"をイン�ート����\n"
 
-#: g10/import.c:2201
+#: g10/import.c:2209
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "�%s: ��ら�複製�����ん\n"
 
-#: g10/import.c:2269
+#: g10/import.c:2277
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "�%s: \"%s\" 新��ユーザIDを1個\n"
 
-#: g10/import.c:2272
+#: g10/import.c:2280
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "�%s: \"%s\" 新��ユーザIDを%d個\n"
 
-#: g10/import.c:2275
+#: g10/import.c:2283
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "�%s: \"%s\" 新��署�を1個\n"
 
-#: g10/import.c:2278
+#: g10/import.c:2286
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "�%s: \"%s\" 新��署�を%d個\n"
 
-#: g10/import.c:2281
+#: g10/import.c:2289
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "�%s: \"%s\" 新��副�を1個\n"
 
-#: g10/import.c:2284
+#: g10/import.c:2292
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "�%s: \"%s\" 新��副�を%d個\n"
 
-#: g10/import.c:2287
+#: g10/import.c:2295
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "�%s: \"%s\" %d個�署�を�れ������\n"
 
-#: g10/import.c:2290
+#: g10/import.c:2298
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "�%s: \"%s\" %d個�署�を�れ������\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2301
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "�%s: \"%s\" %d個�ユーザIDを�れ������\n"
 
-#: g10/import.c:2296
+#: g10/import.c:2304
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "�%s: \"%s\" %d個�ユーザIDを�れ������\n"
 
-#: g10/import.c:2332
+#: g10/import.c:2340
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "�%s:\"%s\"変更��\n"
 
-#: g10/import.c:2692 g10/import.c:2887
+#: g10/import.c:2700 g10/import.c:2895
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "�%s: 秘密�をイン�ート����\n"
 
-#: g10/import.c:2700
+#: g10/import.c:2708
 #, c-format
 msgid "key %s: secret key already exists\n"
 msgstr "� %s: 秘密��も��り��\n"
 
-#: g10/import.c:2708
+#: g10/import.c:2716
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "� %s: エージェント���信エラー: %s\n"
@@ -3685,203 +3700,202 @@ msgstr "� %s: エージェント���信エラー: %s\n"
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2877
+#: g10/import.c:2885
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr "'%s'�移行���スマードカード�れ�れ��以下を実行������: %s\n"
 
-#: g10/import.c:3024
+#: g10/import.c:3032
 #, c-format
 msgid "secret key %s: %s\n"
 msgstr "秘密� %s: %s\n"
 
-#: g10/import.c:3045 g10/import.c:3084
+#: g10/import.c:3053 g10/import.c:3092
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "秘密��イン�ート��止��\n"
 
-#: g10/import.c:3072
+#: g10/import.c:3080
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "�%s: 無効�暗�方�%d�秘密��� - スキップ���\n"
 
-#: g10/import.c:3234 g10/pkclist.c:75 g10/revoke.c:774
+#: g10/import.c:3242 g10/pkclist.c:75 g10/revoke.c:775
 msgid "No reason specified"
 msgstr "�由�指定�れ����ん"
 
-#: g10/import.c:3235 g10/pkclist.c:77 g10/revoke.c:776
+#: g10/import.c:3243 g10/pkclist.c:77 g10/revoke.c:777
 msgid "Key is superseded"
 msgstr "���り�������"
 
-#: g10/import.c:3236 g10/pkclist.c:79 g10/revoke.c:775
+#: g10/import.c:3244 g10/pkclist.c:79 g10/revoke.c:776
 msgid "Key has been compromised"
 msgstr "�(�信頼性)����れ����"
 
-#: g10/import.c:3237 g10/pkclist.c:81 g10/revoke.c:777
+#: g10/import.c:3245 g10/pkclist.c:81 g10/revoke.c:778
 msgid "Key is no longer used"
 msgstr "��も�や使�れ����ん"
 
-#: g10/import.c:3238 g10/pkclist.c:83 g10/revoke.c:778
+#: g10/import.c:3246 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "ユーザID�も�や有効��り��ん"
 
-#: g10/import.c:3363 g10/keylist.c:1105 g10/pkclist.c:87
+#: g10/import.c:3371 g10/keylist.c:1105 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "失効�由: "
 
-#: g10/import.c:3382 g10/keylist.c:1124 g10/pkclist.c:103
+#: g10/import.c:3390 g10/keylist.c:1124 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "失効�コメント: "
 
-#: g10/import.c:3432
+#: g10/import.c:3440
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "�%s: 公開���り��ん - 失効証明書を�用����ん\n"
 
-#: g10/import.c:3461
+#: g10/import.c:3469
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "�%s: 元��ブロック��置������ん: %s\n"
 
-#: g10/import.c:3468
+#: g10/import.c:3476
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "�%s: 元��ブロックを読�込���ん: %s\n"
 
-#: g10/import.c:3488
+#: g10/import.c:3496
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "�%s: 無効�失効証明書: %s - 拒�\n"
 
-#: g10/import.c:3523
+#: g10/import.c:3531
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "�%s:\"%s\"失効証明書をイン�ート����\n"
 
-#: g10/import.c:3609
+#: g10/import.c:3617
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "�%s: 署��対応�るユーザID��り��ん\n"
 
-#: g10/import.c:3626
+#: g10/import.c:3634
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "�%s: ユーザID\"%s\"�サ�ート�����公開�アルゴリズム��\n"
 
-#: g10/import.c:3628
+#: g10/import.c:3636
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "�%s: ユーザID\"%s\"�自己署���無効��\n"
 
-#: g10/import.c:3645 g10/import.c:3673 g10/import.c:3729
+#: g10/import.c:3653 g10/import.c:3681 g10/import.c:3737
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "�%s: サ�ート�����公開�アルゴリズム��\n"
 
-#: g10/import.c:3646
+#: g10/import.c:3654
 #, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "�%s: 無効�直接�署�\n"
 
-#: g10/import.c:3660
+#: g10/import.c:3668
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "�%s: ��対応�る副���り��ん\n"
 
-#: g10/import.c:3675
+#: g10/import.c:3683
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "�%s: 無効�副��対応��\n"
 
-#: g10/import.c:3694
+#: g10/import.c:3702
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "�%s: 多�副��対応を削除���\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3726
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "�%s: �失効�対�る副���り��ん\n"
 
-#: g10/import.c:3731
+#: g10/import.c:3739
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "�%s: 無効�副�失効��\n"
 
-#: g10/import.c:3746
+#: g10/import.c:3754
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "�%s: 無効�副��多�失効を削除���\n"
 
-#: g10/import.c:3790
+#: g10/import.c:3798
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "�%s: スキップ��ユーザID\"%s\"\n"
 
-#: g10/import.c:3817
+#: g10/import.c:3825
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "�%s: スキップ��副�\n"
 
-#: g10/import.c:3849
+#: g10/import.c:3857
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "�%s: エクス�ート���署� (クラス0x%02X) - スキップ���\n"
 
-#: g10/import.c:3860
+#: g10/import.c:3868
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "�%s: 失効証明書�誤��設定�れ���� - スキップ���\n"
 
-#: g10/import.c:3878
+#: g10/import.c:3886
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "�%s: 無効�失効証明書: %s - スキップ���\n"
 
-#: g10/import.c:3892
+#: g10/import.c:3900
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "�%s: 副�署��場所��誤����� - スキップ���\n"
 
-#: g10/import.c:3900
+#: g10/import.c:3908
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "�%s: 予期��署�クラス (0x%02X) - スキップ���\n"
 
-#: g10/import.c:4073
+#: g10/import.c:4081
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "�%s: �複��ユーザID�検出 - マージ\n"
 
-#: g10/import.c:4180
+#: g10/import.c:4188
 #, c-format
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr "�%s: �複��副��検出 - マージ\n"
 
-#: g10/import.c:4245
+#: g10/import.c:4253
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "*警告*: �%s�失効�れ��も�れ��ん: 失効�%sを������\n"
 
-#: g10/import.c:4261
+#: g10/import.c:4269
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "*警告*: �%s�失効�れ��も�れ��ん: 失効�%s�存在���ん。\n"
 
-#: g10/import.c:4327
+#: g10/import.c:4335
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "�%s:\"%s\"失効証明書�追加\n"
 
-#: g10/import.c:4365
+#: g10/import.c:4373
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "�%s: 直接�署�を追加\n"
 
-#: g10/key-check.c:133 dirmngr/dirmngr_ldap.c:650 dirmngr/ldap-wrapper.c:835
-#: dirmngr/ldap-wrapper.c:852
+#: g10/key-check.c:133 dirmngr/ldap-wrapper.c:835 dirmngr/ldap-wrapper.c:852
 #, c-format
 msgid "error allocating memory: %s\n"
 msgstr "メモリ�確��エラー: %s\n"
@@ -3940,7 +3954,7 @@ msgstr ""
 "警告: エラー��り�自己署���確�����。'%s'を実行������署�を確"
 "�����。\n"
 
-#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:284 sm/keydb.c:297
+#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:289 sm/keydb.c:302
 #, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "keybox'%s'�作�エラー: %s\n"
@@ -3950,7 +3964,7 @@ msgstr "keybox'%s'�作�エラー: %s\n"
 msgid "error creating keyring '%s': %s\n"
 msgstr "�リング'%s'�作�エラー: %s\n"
 
-#: g10/keydb.c:388 sm/keydb.c:303
+#: g10/keydb.c:388 sm/keydb.c:308
 #, c-format
 msgid "keybox '%s' created\n"
 msgstr "keybox'%s'�作��れ���\n"
@@ -4200,8 +4214,8 @@ msgstr "�������り注���検査����。\n"
 msgid "Really sign? (y/N) "
 msgstr "本当�署�����? (y/N) "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6192 g10/keyedit.c:6275 g10/keyedit.c:6404
-#: g10/keyedit.c:6466 g10/sign.c:528
+#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
+#: g10/keyedit.c:6474 g10/sign.c:528
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "署��失敗����: %s\n"
@@ -4567,7 +4581,7 @@ msgstr "マッ��るユーザID��り��ん。"
 msgid "Nothing to sign.\n"
 msgstr "署��るも���り��ん。\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6057
+#: g10/keyedit.c:2973 g10/keyedit.c:6065
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "����よ��署��れ����ん。\n"
@@ -4634,7 +4648,7 @@ msgstr "�����%s�%s�よ��失効�能��"
 msgid "(sensitive)"
 msgstr "(機密指定)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:525
+#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "作�: %s"
@@ -4650,7 +4664,7 @@ msgid "expired: %s"
 msgstr "期�切れ: %s"
 
 #: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2262
-#: g10/keyserver.c:531
+#: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "有効期�: %s"
@@ -4686,13 +4700,13 @@ msgstr ""
 "プログラムを�起動�る���表示�れ���有効性�正�����も�れ���\n"
 "�����を念頭��������。\n"
 
-#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:535
-#: g10/mainproc.c:2280 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
+#: g10/mainproc.c:2282 g10/tofu.c:1789 g10/trust.c:426 dirmngr/ocsp.c:792
 msgid "revoked"
 msgstr "失効"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:539
-#: g10/mainproc.c:2282 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
+#: g10/mainproc.c:2284 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "期�切れ"
 
@@ -4733,7 +4747,7 @@ msgstr "�れ�も追加������? (y/N) "
 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:3107
+#: g10/keyedit.c:4273 g10/keygen.c:3111
 msgid "Such a user ID already exists on this key!\n"
 msgstr "�����ユーザID��������存在�����!\n"
 
@@ -4871,7 +4885,7 @@ msgstr "副é�µ %s ã�¯ç½²å��ã‚’ã�—ã�ªã�„ã�®ã�§ã€�相互証明ã�®å¿…è¦�ã�¯ã�‚ã‚Šã�
 msgid "Please select exactly one user ID.\n"
 msgstr "ユーザIDを���り����択������。\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5357 g10/keyedit.c:5495
+#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "ユーザID\"%s\"�v3自己署�をスキップ���\n"
@@ -4880,127 +4894,127 @@ msgstr "ユーザID\"%s\"�v3自己署�をスキップ���\n"
 msgid "Enter your preferred keyserver URL: "
 msgstr "優先�サー�URLを入力������: "
 
-#: g10/keyedit.c:5380
+#: g10/keyedit.c:5383
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "本当�置��������? (y/N) "
 
-#: g10/keyedit.c:5381
+#: g10/keyedit.c:5384
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "本当�削除������? (y/N) "
 
-#: g10/keyedit.c:5441
+#: g10/keyedit.c:5449
 msgid "Enter the notation: "
 msgstr "注釈を入力: "
 
-#: g10/keyedit.c:5588
+#: g10/keyedit.c:5596
 msgid "Proceed? (y/N) "
 msgstr "進����? (y/N) "
 
-#: g10/keyedit.c:5658
+#: g10/keyedit.c:5666
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d番�ユーザID��り��ん\n"
 
-#: g10/keyedit.c:5720
+#: g10/keyedit.c:5728
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "�ッシュ%s�ユーザID��り��ん\n"
 
-#: g10/keyedit.c:5821
+#: g10/keyedit.c:5829
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "�ID'%s'�副���り��ん\n"
 
-#: g10/keyedit.c:5843
+#: g10/keyedit.c:5851
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "%d番�副���り��ん\n"
 
-#: g10/keyedit.c:5984
+#: g10/keyedit.c:5992
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ユーザID:\"%s\"\n"
 
-#: g10/keyedit.c:5987 g10/keyedit.c:6089 g10/keyedit.c:6137
+#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "%s�%s%s%s�署��れ����\n"
 
-#: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
+#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
 msgid " (non-exportable)"
 msgstr " (エクス�ート��)"
 
-#: g10/keyedit.c:5993
+#: g10/keyedit.c:6001
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "��署��%s�期�切れ��。\n"
 
-#: g10/keyedit.c:5998
+#: g10/keyedit.c:6006
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "�れ�も本当�失効������? (y/N) "
 
-#: g10/keyedit.c:6003
+#: g10/keyedit.c:6011
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "��署��対�る失効証明書を作�����? (y/N) "
 
-#: g10/keyedit.c:6063
+#: g10/keyedit.c:6071
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "�れら�ユーザID��%s�署�����:\n"
 
-#: g10/keyedit.c:6092
+#: g10/keyedit.c:6100
 msgid " (non-revocable)"
 msgstr " (失効��)"
 
-#: g10/keyedit.c:6099
+#: g10/keyedit.c:6107
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "�����%s�%s�失効�れ����\n"
 
-#: g10/keyedit.c:6124
+#: g10/keyedit.c:6132
 msgid "You are about to revoke these signatures:\n"
 msgstr "�れら�署�を失効�よ�������:\n"
 
-#: g10/keyedit.c:6147
+#: g10/keyedit.c:6155
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "失効証明書を本当�作�����? (y/N) "
 
-#: g10/keyedit.c:6180
+#: g10/keyedit.c:6188
 #, c-format
 msgid "no secret key\n"
 msgstr "秘密���り��ん\n"
 
-#: g10/keyedit.c:6228
+#: g10/keyedit.c:6236
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr "ユーザID���も�を失効�よ������: %s\n"
 
-#: g10/keyedit.c:6238
+#: g10/keyedit.c:6246
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ユーザID\"%s\"��も�失効�れ����\n"
 
-#: g10/keyedit.c:6255
+#: g10/keyedit.c:6263
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "*警告*: ユーザID署���%d秒未���\n"
 
-#: g10/keyedit.c:6351
+#: g10/keyedit.c:6359
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "最後�有効�ユーザID�失効����ん。\n"
 
-#: g10/keyedit.c:6389
+#: g10/keyedit.c:6397
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "� %s ��も�失効�れ����。\n"
 
-#: g10/keyedit.c:6451
+#: g10/keyedit.c:6459
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "副� %s ��も�失効�れ����。\n"
 
-#: g10/keyedit.c:6548
+#: g10/keyedit.c:6556
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "%s (大��%ld) ��%s (uid %d) �フォトID���表示\n"
@@ -5010,63 +5024,63 @@ msgstr "%s (大��%ld) ��%s (uid %d) �フォトID���表示\n"
 msgid "invalid value for option '%s'\n"
 msgstr "オプション'%s'�無効�値��\n"
 
-#: g10/keygen.c:338
+#: g10/keygen.c:339
 #, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "優先指定'%s'��複\n"
 
-#: g10/keygen.c:345
+#: g10/keygen.c:346
 #, c-format
 msgid "too many cipher preferences\n"
 msgstr "暗�方��優先指定�多����\n"
 
-#: g10/keygen.c:347
+#: g10/keygen.c:348
 #, c-format
 msgid "too many digest preferences\n"
 msgstr "ダイジェスト�優先指定�多����\n"
 
-#: g10/keygen.c:349
+#: g10/keygen.c:350
 #, c-format
 msgid "too many compression preferences\n"
 msgstr "圧縮�優先指定�多����\n"
 
-#: g10/keygen.c:351
+#: g10/keygen.c:352
 #, c-format
 msgid "too many AEAD preferences\n"
 msgstr "AEAD方��優先指定�多����\n"
 
-#: g10/keygen.c:521
+#: g10/keygen.c:522
 #, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "優先指定�文字列�無効�項目'%s'��り��\n"
 
-#: g10/keygen.c:1130
+#: g10/keygen.c:1131
 #, c-format
 msgid "writing direct signature\n"
 msgstr "直接署�を書�込���\n"
 
-#: g10/keygen.c:1176
+#: g10/keygen.c:1177
 #, c-format
 msgid "writing self signature\n"
 msgstr "自己署�を書�込���\n"
 
-#: g10/keygen.c:1233
+#: g10/keygen.c:1234
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "�対応��署�を書�込���\n"
 
-#: g10/keygen.c:1598 g10/keygen.c:1603 g10/keygen.c:1655 g10/keygen.c:1660
-#: g10/keygen.c:1832 g10/keygen.c:1837
+#: g10/keygen.c:1599 g10/keygen.c:1604 g10/keygen.c:1656 g10/keygen.c:1661
+#: g10/keygen.c:1833 g10/keygen.c:1838
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "無効��長。%uビット����\n"
 
-#: g10/keygen.c:1609 g10/keygen.c:1666 g10/keygen.c:1674 g10/keygen.c:1843
+#: g10/keygen.c:1610 g10/keygen.c:1667 g10/keygen.c:1675 g10/keygen.c:1844
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "�長を%uビット�丸���\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1701
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
@@ -5074,19 +5088,19 @@ msgstr ""
 "*警告*: �����OpenPGPプログラム���ダイジェスト長�DSA�を扱�����"
 "���ん\n"
 
-#: g10/keygen.c:1899
+#: g10/keygen.c:1900
 msgid "Sign"
 msgstr "Sign"
 
-#: g10/keygen.c:1902
+#: g10/keygen.c:1903
 msgid "Certify"
 msgstr "Certify"
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1906
 msgid "Encrypt"
 msgstr "Encrypt"
 
-#: g10/keygen.c:1908
+#: g10/keygen.c:1909
 msgid "Authenticate"
 msgstr "Authenticate"
 
@@ -5100,166 +5114,166 @@ msgstr "Authenticate"
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1929
+#: g10/keygen.c:1930
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1967
 #, c-format
 msgid "Possible actions for this %s key: "
 msgstr "��%s���り�る�作: "
 
-#: g10/keygen.c:1973
+#: g10/keygen.c:1974
 msgid "Current allowed actions: "
 msgstr "�在���られ��作: "
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1979
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) 署�機能を�転�る\n"
 
-#: g10/keygen.c:1981
+#: g10/keygen.c:1982
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) 暗�機能を�転�る\n"
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1985
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) �証機能を�転�る\n"
 
-#: g10/keygen.c:1987
+#: g10/keygen.c:1988
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) 完了\n"
 
-#: g10/keygen.c:2116
+#: g10/keygen.c:2117
 #, c-format
 msgid "   (%d) RSA and RSA%s\n"
 msgstr "   (%d) RSA � RSA%s\n"
 
-#: g10/keygen.c:2120
+#: g10/keygen.c:2121
 #, c-format
 msgid "   (%d) DSA and Elgamal%s\n"
 msgstr "   (%d) DSA � Elgamal%s\n"
 
-#: g10/keygen.c:2123
+#: g10/keygen.c:2124
 #, c-format
 msgid "   (%d) DSA (sign only)%s\n"
 msgstr "   (%d) DSA (署���)%s\n"
 
-#: g10/keygen.c:2125
+#: g10/keygen.c:2126
 #, c-format
 msgid "   (%d) RSA (sign only)%s\n"
 msgstr "   (%d) RSA (署���)%s\n"
 
-#: g10/keygen.c:2131
+#: g10/keygen.c:2132
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)%s\n"
 msgstr "   (%d) Elgamal (暗�化��)%s\n"
 
-#: g10/keygen.c:2133
+#: g10/keygen.c:2134
 #, c-format
 msgid "   (%d) RSA (encrypt only)%s\n"
 msgstr "   (%d) RSA (暗�化��)%s\n"
 
-#: g10/keygen.c:2139
+#: g10/keygen.c:2140
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)%s\n"
 msgstr "   (%d) DSA (機能を���自身�設定)%s\n"
 
-#: g10/keygen.c:2141
+#: g10/keygen.c:2142
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (機能を���自身�設定)%s\n"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2148
 #, c-format
 msgid "   (%d) ECC (sign and encrypt)%s\n"
 msgstr "   (%d) ECC (署��暗�化)%s\n"
 
-#: g10/keygen.c:2147 g10/keygen.c:2678
+#: g10/keygen.c:2148 g10/keygen.c:2679
 msgid " *default*"
 msgstr " *デフォルト"
 
-#: g10/keygen.c:2148
+#: g10/keygen.c:2149
 #, c-format
 msgid "  (%d) ECC (sign only)\n"
 msgstr "  (%d) ECC (署���)\n"
 
-#: g10/keygen.c:2150
+#: g10/keygen.c:2151
 #, c-format
 msgid "  (%d) ECC (set your own capabilities)%s\n"
 msgstr "  (%d) ECC (機能を���自身�設定)%s\n"
 
-#: g10/keygen.c:2152
+#: g10/keygen.c:2153
 #, c-format
 msgid "  (%d) ECC (encrypt only)%s\n"
 msgstr "  (%d) ECC (暗�化��)%s\n"
 
-#: g10/keygen.c:2156
+#: g10/keygen.c:2157
 #, c-format
 msgid "  (%d) Existing key%s\n"
 msgstr "  (%d) 既存��%s\n"
 
-#: g10/keygen.c:2158
+#: g10/keygen.c:2159
 #, c-format
 msgid "  (%d) Existing key from card%s\n"
 msgstr "  (%d) カード�存在�る�%s\n"
 
-#: g10/keygen.c:2254 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2255 sm/certreqgen-ui.c:203
 msgid "Enter the keygrip: "
 msgstr "keygripを入力: "
 
-#: g10/keygen.c:2267 sm/certreqgen-ui.c:211 tools/gpg-card.c:2280
+#: g10/keygen.c:2268 sm/certreqgen-ui.c:211 tools/gpg-card.c:2297
 #, c-format
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr "有効�keygrip (40��16進数字)���り��ん\n"
 
-#: g10/keygen.c:2269 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2270 sm/certreqgen-ui.c:213
 msgid "No key with this keygrip\n"
 msgstr "��keygrip����り��ん\n"
 
-#: g10/keygen.c:2288 g10/keygen.c:2298 g10/keygen.c:3440 g10/keygen.c:3451
+#: g10/keygen.c:2289 g10/keygen.c:2299 g10/keygen.c:3444 g10/keygen.c:3455
 #: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
 #, c-format
 msgid "error reading the card: %s\n"
 msgstr "カード�読�込�エラー: %s\n"
 
-#: g10/keygen.c:2292 g10/keygen.c:3444 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2293 g10/keygen.c:3448 sm/certreqgen-ui.c:234
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "カード�シリアル番�: %s\n"
 
-#: g10/keygen.c:2311 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2312 sm/certreqgen-ui.c:246
 msgid "Available keys:\n"
 msgstr "利用�能��:\n"
 
-#: g10/keygen.c:2504 g10/keygen.c:2518
+#: g10/keygen.c:2505 g10/keygen.c:2519
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr "%uビット�切り上���\n"
 
-#: g10/keygen.c:2559
+#: g10/keygen.c:2560
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s �� %u �ら %u ビット�長���能��。\n"
 
-#: g10/keygen.c:2567
+#: g10/keygen.c:2568
 #, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "副���長�? (%u) "
 
-#: g10/keygen.c:2584 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2585 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "�求�れ��長�%uビット\n"
 
-#: g10/keygen.c:2630
+#: g10/keygen.c:2631
 msgid "Please select which elliptic curve you want:\n"
 msgstr "�希望�楕円曲線を�択������:\n"
 
-#: g10/keygen.c:2819
+#: g10/keygen.c:2820
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5275,7 +5289,7 @@ msgstr ""
 "      <n>m = �� n �月間�期�切れ\n"
 "      <n>y = �� n 年間�期�切れ\n"
 
-#: g10/keygen.c:2830
+#: g10/keygen.c:2831
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5291,38 +5305,38 @@ msgstr ""
 "      <n>m = 署�� n �月間�期�切れ\n"
 "      <n>y = 署�� n 年間�期�切れ\n"
 
-#: g10/keygen.c:2853
+#: g10/keygen.c:2854
 msgid "Key is valid for? (0) "
 msgstr "��有効期間�? (0)"
 
-#: g10/keygen.c:2858
+#: g10/keygen.c:2859
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "署��有効期間�? (%s)"
 
-#: g10/keygen.c:2871 g10/keygen.c:2896
+#: g10/keygen.c:2875 g10/keygen.c:2900
 msgid "invalid value\n"
 msgstr "無効�値\n"
 
-#: g10/keygen.c:2878
+#: g10/keygen.c:2882
 msgid "Key does not expire at all\n"
 msgstr "��無期���\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2883
 msgid "Signature does not expire at all\n"
 msgstr "署��無期���\n"
 
-#: g10/keygen.c:2884
+#: g10/keygen.c:2888
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "��%s�期�切れ��り��\n"
 
-#: g10/keygen.c:2885
+#: g10/keygen.c:2889
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "署��%s�期�切れ��り��\n"
 
-#: g10/keygen.c:2889
+#: g10/keygen.c:2893
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5330,11 +5344,11 @@ msgstr ""
 "��システム���2038年以��日付を表示�る�������ん��\n"
 "2106年��正��処��れ��。\n"
 
-#: g10/keygen.c:2902
+#: g10/keygen.c:2906
 msgid "Is this correct? (y/N) "
 msgstr "�れ�正�����? (y/N) "
 
-#: g10/keygen.c:2970
+#: g10/keygen.c:2974
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5348,7 +5362,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2985
+#: g10/keygen.c:2989
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5364,49 +5378,49 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:3004
+#: g10/keygen.c:3008
 msgid "Real name: "
 msgstr "本�: "
 
-#: g10/keygen.c:3013
+#: g10/keygen.c:3017
 msgid "Invalid character in name\n"
 msgstr "���無効�文字��り��\n"
 
-#: g10/keygen.c:3014
+#: g10/keygen.c:3018
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr "キャラクタ'%s'�'%s'����使���ん\n"
 
-#: g10/keygen.c:3018
+#: g10/keygen.c:3022
 msgid "Name may not start with a digit\n"
 msgstr "��を数字�始�������ん\n"
 
-#: g10/keygen.c:3021
+#: g10/keygen.c:3025
 msgid "Name must be at least 5 characters long\n"
 msgstr "���5文字以上���れ��り��ん\n"
 
-#: g10/keygen.c:3031
+#: g10/keygen.c:3035
 msgid "Email address: "
 msgstr "電�メール・アドレス: "
 
-#: g10/keygen.c:3037
+#: g10/keygen.c:3041
 msgid "Not a valid email address\n"
 msgstr "有効�電�メール・アドレス���り��ん\n"
 
-#: g10/keygen.c:3046
+#: g10/keygen.c:3050
 msgid "Comment: "
 msgstr "コメント: "
 
-#: g10/keygen.c:3052
+#: g10/keygen.c:3056
 msgid "Invalid character in comment\n"
 msgstr "コメント�無効�文字��り��\n"
 
-#: g10/keygen.c:3088
+#: g10/keygen.c:3092
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr "����文字集�'%s'を使�����。\n"
 
-#: g10/keygen.c:3094
+#: g10/keygen.c:3098
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5417,7 +5431,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3099
+#: g10/keygen.c:3103
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "電�メール�アドレスを本�やコメント�入れ��よ��\n"
 
@@ -5432,31 +5446,31 @@ msgstr "電�メール�アドレスを本�やコメント�入れ��よ
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3124
+#: g10/keygen.c:3128
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:3134
+#: g10/keygen.c:3138
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "��(N)�コメント(C)�電�メール(E)�変更����終了(Q)? "
 
-#: g10/keygen.c:3135
+#: g10/keygen.c:3139
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "��(N)�コメント(C)�電�メール(E)�変更����OK(O)�終了(Q)? "
 
-#: g10/keygen.c:3140
+#: g10/keygen.c:3144
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "��(N)�電�メール(E)�変更����終了(Q)? "
 
-#: g10/keygen.c:3141
+#: g10/keygen.c:3145
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "��(N)�電�メール(E)�変更����OK(O)�終了(Q)? "
 
-#: g10/keygen.c:3160
+#: g10/keygen.c:3164
 msgid "Please correct the error first\n"
 msgstr "��エラーを修正������\n"
 
-#: g10/keygen.c:3206
+#: g10/keygen.c:3210
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -5467,18 +5481,18 @@ msgstr ""
 "��ディスク�アクセス�る���他��作を素数生��間�行�����乱数生\n"
 "�器��分�エントロピーを供給�る機会を与�る�������。\n"
 
-#: g10/keygen.c:3591
+#: g10/keygen.c:3595
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4590 g10/keygen.c:4663 g10/keygen.c:4681 g10/keygen.c:4710
-#: g10/keygen.c:5086 g10/keygen.c:5632 g10/keygen.c:5943 g10/keygen.c:6050
+#: g10/keygen.c:4594 g10/keygen.c:4667 g10/keygen.c:4685 g10/keygen.c:4714
+#: g10/keygen.c:5113 g10/keygen.c:5663 g10/keygen.c:5974 g10/keygen.c:6081
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "��生��失敗����: %s\n"
 
-#: g10/keygen.c:4599
+#: g10/keygen.c:4603
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5489,64 +5503,64 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:4601
+#: g10/keygen.c:4605
 msgid "Continue? (Y/n) "
 msgstr "続����? (Y/n) "
 
-#: g10/keygen.c:4622
+#: g10/keygen.c:4626
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "\"%s\" ���も��り��\n"
 
-#: g10/keygen.c:4627
+#: g10/keygen.c:4631
 msgid "Create anyway? (y/N) "
 msgstr "�れ�も�を作�����? (y/N) "
 
-#: g10/keygen.c:4633
+#: g10/keygen.c:4637
 #, c-format
 msgid "creating anyway\n"
 msgstr "��れ����を作�\n"
 
-#: g10/keygen.c:5069
+#: g10/keygen.c:5096
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr "注�: 全機能��生��� \"%s %s\" を使���。\n"
 
-#: g10/keygen.c:5118
+#: g10/keygen.c:5145
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "��生���り消�れ���。\n"
 
-#: g10/keygen.c:5178
+#: g10/keygen.c:5205
 #, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "�ックアップ・ファイル'%s'�作�����ん: %s\n"
 
-#: g10/keygen.c:5198
+#: g10/keygen.c:5225
 #, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "注�: カード���ックアップ�'%s'��存�れ��\n"
 
-#: g10/keygen.c:5359 g10/keygen.c:5561
+#: g10/keygen.c:5389 g10/keygen.c:5591
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr "'%s'�公開�を書�込���\n"
 
-#: g10/keygen.c:5555
+#: g10/keygen.c:5585
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "書�込��能�公開�リング�見��り��ん: %s\n"
 
-#: g10/keygen.c:5569
+#: g10/keygen.c:5599
 #, c-format
 msgid "error writing public keyring '%s': %s\n"
 msgstr "公開�リング'%s'�書�込�エラー: %s\n"
 
-#: g10/keygen.c:5603
+#: g10/keygen.c:5634
 msgid "public and secret key created and signed.\n"
 msgstr "公開��秘密�を作���署�����。\n"
 
-#: g10/keygen.c:5619
+#: g10/keygen.c:5650
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -5554,34 +5568,34 @@ msgstr ""
 "����暗�化��使用�������注�������。暗�化を行����\n"
 "\"--edit-key\"コマンドを使��副�を生�������。\n"
 
-#: g10/keygen.c:5801 g10/keygen.c:6000
+#: g10/keygen.c:5832 g10/keygen.c:6031
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "��%lu秒未������� (時間歪曲�時計�障害��ょ�)\n"
 
-#: g10/keygen.c:5803 g10/keygen.c:6002
+#: g10/keygen.c:5834 g10/keygen.c:6033
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "��%lu秒未������� (時間歪曲�時計�障害��ょ�)\n"
 
-#: g10/keygen.c:5814 g10/keygen.c:6013
+#: g10/keygen.c:5845 g10/keygen.c:6044
 #, c-format
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "注�: v3��対�る副��作���OpenPGP������ん\n"
 
-#: g10/keygen.c:5826 g10/keygen.c:5828
+#: g10/keygen.c:5857 g10/keygen.c:5859
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "主��秘密部分�利用����ん。\n"
 
-#: g10/keygen.c:5835 g10/keygen.c:5837
+#: g10/keygen.c:5866 g10/keygen.c:5868
 #, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "主��秘密部分�カード上��存�れ����。\n"
 
-#: g10/keygen.c:5857 g10/keygen.c:6027
+#: g10/keygen.c:5888 g10/keygen.c:6058
 msgid "Really create? (y/N) "
 msgstr "本当�作�����? (y/N) "
 
@@ -5657,30 +5671,30 @@ msgstr "   フィンガープリント ="
 msgid "      Card serial no. ="
 msgstr "   カードシリアル番� ="
 
-#: g10/keyring.c:1467
+#: g10/keyring.c:1477
 #, c-format
 msgid "caching keyring '%s'\n"
 msgstr "�リング'%s'をキャッシュ���\n"
 
-#: g10/keyring.c:1541
+#: g10/keyring.c:1551
 #, c-format
 msgid "%lu keys cached so far (%lu signature)\n"
 msgid_plural "%lu keys cached so far (%lu signatures)\n"
 msgstr[0] "�れ��%lu個��をキャッシュ���� (%lu個�署�)\n"
 
-#: g10/keyring.c:1557
+#: g10/keyring.c:1567
 #, c-format
 msgid "%lu key cached"
 msgid_plural "%lu keys cached"
 msgstr[0] "%lu個��をキャッシュ����"
 
-#: g10/keyring.c:1559
+#: g10/keyring.c:1569
 #, c-format
 msgid " (%lu signature)\n"
 msgid_plural " (%lu signatures)\n"
 msgstr[0] " (%lu個��正�署�)\n"
 
-#: g10/keyring.c:1636
+#: g10/keyring.c:1646
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: �リング������\n"
@@ -5709,76 +5723,71 @@ msgstr "署��検証時�自動的��を�得�る"
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "��設定�れる優先�サー�URLを与�る"
 
-#: g10/keyserver.c:537
+#: g10/keyserver.c:360
 msgid "disabled"
 msgstr "使用�止"
 
-#: g10/keyserver.c:740
+#: g10/keyserver.c:563
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "番�(s)�N)次����Q)中止を入力������ >"
 
-#: g10/keyserver.c:846
+#: g10/keyserver.c:669
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "無効��サー�・プロトコル�� (us %d!=handler %d)\n"
 
-#: g10/keyserver.c:986 g10/keyserver.c:1096
+#: g10/keyserver.c:809 g10/keyserver.c:919
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\"�ID���り��ん: スキップ���\n"
 
-#: g10/keyserver.c:1420 g10/keyserver.c:1453
+#: g10/keyserver.c:1217 g10/keyserver.c:1250
 #, 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:1427
+#: g10/keyserver.c:1224
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "*警告*: �%sを%s経由�更新����ん: %s\n"
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1316
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "�\"%s\"��サー��見��り��ん\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1319
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "���サー��見��り��ん\n"
 
-#: g10/keyserver.c:1722
-#, c-format
-msgid "requesting key %s from %s server %s\n"
-msgstr "�%sを%s�らサー�%s��求\n"
-
-#: g10/keyserver.c:1726
+#: g10/keyserver.c:1481
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "�%sを%s��求\n"
 
-#: g10/keyserver.c:1841 g10/keyserver.c:2020
+#: g10/keyserver.c:1600 g10/keyserver.c:1793
 #, c-format
 msgid "no keyserver known\n"
 msgstr "�サー����り��ん\n"
 
-#: g10/keyserver.c:1856 g10/skclist.c:213 g10/skclist.c:241
+#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "\"%s\"をスキップ����: %s\n"
 
-#: g10/keyserver.c:1860
+#: g10/keyserver.c:1619
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "�%sを%s��信\n"
 
-#: g10/keyserver.c:1901
+#: g10/keyserver.c:1662
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr "�を'%s'�ら�求\n"
 
-#: g10/keyserver.c:1917
+#: g10/keyserver.c:1680
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "*警告*: URI %s �らデータを�れ��ん: %s\n"
@@ -5803,67 +5812,67 @@ msgstr "�明�アルゴリズム%d.%s�よる暗�化\n"
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "�明�ダイジェスト・アルゴリズム�生��れ�パスフレーズ %d\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:473
 #, c-format
 msgid "public key is %s\n"
 msgstr "公開��%s��\n"
 
-#: g10/mainproc.c:524
+#: g10/mainproc.c:525
 #, c-format
 msgid "encrypted with %s key, ID %s, created %s\n"
 msgstr "%s�, ID %s, 日付%s�暗�化�れ���\n"
 
-#: g10/mainproc.c:528 g10/pkclist.c:231
+#: g10/mainproc.c:529 g10/pkclist.c:231
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:532
+#: g10/mainproc.c:533
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "%s�, ID %s�暗�化�れ���\n"
 
-#: g10/mainproc.c:552 g10/mainproc.c:935
+#: g10/mainproc.c:553 g10/mainproc.c:937
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "*警告*: 複数�プレインテクスト�見られ��\n"
 
-#: g10/mainproc.c:560
+#: g10/mainproc.c:561
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "%lu 個�パスフレーズ�暗�化\n"
 
-#: g10/mainproc.c:562
+#: g10/mainproc.c:563
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "1 個�パスフレーズ�暗�化\n"
 
-#: g10/mainproc.c:577 g10/mainproc.c:602
+#: g10/mainproc.c:578 g10/mainproc.c:603
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "公開��復��失敗����: %s\n"
 
-#: g10/mainproc.c:613
+#: g10/mainproc.c:614
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "公開��よる暗�化済�データ: 正��DEK��\n"
 
-#: g10/mainproc.c:642 g10/mainproc.c:663
+#: g10/mainproc.c:643 g10/mainproc.c:664
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "%s暗�化済�データを仮定\n"
 
-#: g10/mainproc.c:649
+#: g10/mainproc.c:650
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA暗�方��利用�能����楽天的���%s�代用�よ�������\n"
 
-#: g10/mainproc.c:742 g10/mainproc.c:780
+#: g10/mainproc.c:744 g10/mainproc.c:782
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "*警告*: メッセージ�完全性��護�れ����ん\n"
 
-#: g10/mainproc.c:753
+#: g10/mainproc.c:755
 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"
@@ -5873,179 +5882,179 @@ msgstr ""
 "��メッセージ���ら�正当��ょ�。当時�整�性�護�広�使�れ\n"
 "�����������。\n"
 
-#: g10/mainproc.c:756
+#: g10/mainproc.c:758
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr "�れ�も復��る��オプション '%s' を使���。\n"
 
-#: g10/mainproc.c:761
+#: g10/mainproc.c:763
 #, c-format
 msgid "decryption forced to fail!\n"
 msgstr "復��強制的�失敗��れ���!\n"
 
-#: g10/mainproc.c:773
+#: g10/mainproc.c:775
 #, c-format
 msgid "decryption okay\n"
 msgstr "復���功\n"
 
-#: g10/mainproc.c:786
+#: g10/mainproc.c:788
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "*警告*: 暗�化�れ�メッセージ�改竄�れ����!\n"
 
-#: g10/mainproc.c:804
+#: g10/mainproc.c:806
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "復��失敗����: %s\n"
 
-#: g10/mainproc.c:851
+#: g10/mainproc.c:853
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "注�: �信者�\"極秘��る\"よ��求�����\n"
 
-#: g10/mainproc.c:858
+#: g10/mainproc.c:860
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "元�ファイル�='%.*s'\n"
 
-#: g10/mainproc.c:1135
+#: g10/mainproc.c:1137
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "スタンドアロン失効 - \"gpg --import\"を使���用������\n"
 
-#: g10/mainproc.c:1440 g10/mainproc.c:1483
+#: g10/mainproc.c:1442 g10/mainproc.c:1485
 #, c-format
 msgid "no signature found\n"
 msgstr "署��見��り��ん\n"
 
-#: g10/mainproc.c:1763
+#: g10/mainproc.c:1765
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "\"%s\"�ら�*�正�*署�"
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1767
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "\"%s\"�ら�期�切れ�署�"
 
-#: g10/mainproc.c:1767
+#: g10/mainproc.c:1769
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "\"%s\"�ら�正��署�"
 
-#: g10/mainproc.c:1789
+#: g10/mainproc.c:1791
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "署��検証を�略\n"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1905
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "�������署�データ��り扱���ん\n"
 
-#: g10/mainproc.c:1919 g10/mainproc.c:1926
+#: g10/mainproc.c:1921 g10/mainproc.c:1928
 #, c-format
 msgid "Signature made %s\n"
 msgstr "%s�施�れ�署�\n"
 
-#: g10/mainproc.c:1920 g10/mainproc.c:1927 sm/verify.c:480
+#: g10/mainproc.c:1922 g10/mainproc.c:1929 sm/verify.c:480
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               %s�%sを使用\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1933
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "%s�%s�ID %s�施�れ�署�\n"
 
-#: g10/mainproc.c:1937
+#: g10/mainproc.c:1939
 #, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "               発行者\"%s\"\n"
 
-#: g10/mainproc.c:1992
+#: g10/mainproc.c:1994
 #, c-format
 msgid "Key available at: "
 msgstr "以下����り��: "
 
-#: g10/mainproc.c:2034
+#: g10/mainproc.c:2036
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr "注�: ��情報を利用�る�� '%s' を使������\n"
 
-#: g10/mainproc.c:2234
+#: g10/mainproc.c:2236
 msgid "[uncertain]"
 msgstr "[�確定]"
 
-#: g10/mainproc.c:2272
+#: g10/mainproc.c:2274
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                別�\"%s\""
 
-#: g10/mainproc.c:2347
+#: g10/mainproc.c:2349
 #, c-format
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr "*警告*: ����%sモード��署������ん!\n"
 
-#: g10/mainproc.c:2363
+#: g10/mainproc.c:2365
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "期�切れ�署� %s\n"
 
-#: g10/mainproc.c:2368
+#: g10/mainproc.c:2370
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "��署��%s�期�切れ��り��\n"
 
-#: g10/mainproc.c:2379
+#: g10/mainproc.c:2381
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s署��ダイジェスト・アルゴリズム %s%s%s\n"
 
-#: g10/mainproc.c:2380
+#: g10/mainproc.c:2382
 msgid "binary"
 msgstr "�イナリ"
 
-#: g10/mainproc.c:2381
+#: g10/mainproc.c:2383
 msgid "textmode"
 msgstr "テキストモード"
 
-#: g10/mainproc.c:2381 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2383 g10/trust.c:112 dirmngr/ocsp.c:793
 msgid "unknown"
 msgstr "�明�"
 
-#: g10/mainproc.c:2383
+#: g10/mainproc.c:2385
 msgid ", key algorithm "
 msgstr "��アルゴリズム "
 
-#: g10/mainproc.c:2418
+#: g10/mainproc.c:2420
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 "*警告*: 分�署����り��ん。ファイル「%s��検証�れ*��ん���*!\n"
 
-#: g10/mainproc.c:2457
+#: g10/mainproc.c:2459
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "署�を検査����ん: %s\n"
 
-#: g10/mainproc.c:2553 g10/mainproc.c:2572 g10/mainproc.c:2696
+#: g10/mainproc.c:2555 g10/mainproc.c:2574 g10/mainproc.c:2698
 #, c-format
 msgid "not a detached signature\n"
 msgstr "分�署���り��ん\n"
 
-#: g10/mainproc.c:2606
+#: g10/mainproc.c:2608
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "*警告*: 多�署��検出。最��も���検査���。\n"
 
-#: g10/mainproc.c:2615
+#: g10/mainproc.c:2617
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "クラス0x%02x�スタンドアロン署�\n"
 
-#: g10/mainproc.c:2700
+#: g10/mainproc.c:2702
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "��形� (PGP 2.x) �署�\n"
@@ -6227,46 +6236,52 @@ msgstr "�明�クリティカル�署�注釈: "
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "型%d�下�パケット�クリティカル・ビットを発見\n"
 
-#: g10/passphrase.c:208
+#: g10/passphrase.c:201 sm/decrypt.c:669
+#, fuzzy
+#| msgid "Please enter the new passphrase"
+msgid "Please enter the passphrase for decryption."
+msgstr "新��パスフレーズを入力������"
+
+#: g10/passphrase.c:203
 msgid "Enter passphrase\n"
 msgstr "パスフレーズを入力\n"
 
-#: g10/passphrase.c:219
+#: g10/passphrase.c:227
 #, c-format
 msgid "cancelled by user\n"
 msgstr "ユーザ�よる�消�\n"
 
-#: g10/passphrase.c:460
+#: g10/passphrase.c:472
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (主�ID %s)"
 
-#: g10/passphrase.c:467
+#: g10/passphrase.c:479
 msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 msgstr "OpenPGP�秘密��ロックを解除�る���パスフレーズを入力������:"
 
-#: g10/passphrase.c:471
+#: g10/passphrase.c:483
 msgid "Please enter the passphrase to import the OpenPGP secret key:"
 msgstr "OpenPGP�秘密�をイン�ート�る���パスフレーズを入力������:"
 
-#: g10/passphrase.c:476
+#: g10/passphrase.c:488
 msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 msgstr ""
 "OpenPGP�秘密副�をエクス�ート�る���パスフレーズを入力������:"
 
-#: g10/passphrase.c:479
+#: g10/passphrase.c:491
 msgid "Please enter the passphrase to export the OpenPGP secret key:"
 msgstr "OpenPGP�秘密�をエクス�ート�る���パスフレーズを入力������:"
 
-#: g10/passphrase.c:484
+#: g10/passphrase.c:496
 msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 msgstr "�択��OpenPGP副�を本当�永久�削除����? (y/N) "
 
-#: g10/passphrase.c:487
+#: g10/passphrase.c:499
 msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgstr "�択��OpenPGP秘密�を本当�永久�削除����? (y/N) "
 
-#: g10/passphrase.c:496
+#: g10/passphrase.c:508
 #, c-format
 msgid ""
 "%s\n"
@@ -6434,7 +6449,7 @@ msgid ""
 "\n"
 msgstr "����最�信用レベル: %s\n"
 
-#: g10/pkclist.c:313 g10/revoke.c:803
+#: g10/pkclist.c:313 g10/revoke.c:804
 msgid "Your decision? "
 msgstr "����決定�? "
 
@@ -6718,7 +6733,7 @@ msgstr "署��れ�データ'%s'�開���ん\n"
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "署��れ�データ fd=%d �開���ん: %s\n"
 
-#: g10/pubkey-enc.c:99 sm/decrypt.c:879
+#: g10/pubkey-enc.c:99 sm/decrypt.c:1329
 #, c-format
 msgid "key %s is not suitable for decryption in %s mode\n"
 msgstr "�%s�%sモード��復�化��������ん\n"
@@ -6764,7 +6779,7 @@ msgid "Note: key has been revoked"
 msgstr "注�: ��失効済���"
 
 #: g10/revoke.c:100 g10/revoke.c:126 g10/revoke.c:172 g10/revoke.c:184
-#: g10/revoke.c:502
+#: g10/revoke.c:503
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet �失敗����: %s\n"
@@ -6790,11 +6805,11 @@ msgstr "秘密��利用����ん。\n"
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "����対�る指�失効証明書を作�����? (y/N) "
 
-#: g10/revoke.c:334 g10/revoke.c:744
+#: g10/revoke.c:334 g10/revoke.c:745
 msgid "ASCII armored output forced.\n"
 msgstr "ASCII外装出力を強制���。\n"
 
-#: g10/revoke.c:350 g10/revoke.c:481
+#: g10/revoke.c:350 g10/revoke.c:482
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet �失敗����: %s\n"
@@ -6808,11 +6823,11 @@ msgstr "失効証明書を作�。\n"
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "\"%s\"用�失効��見��り��ん\n"
 
-#: g10/revoke.c:567
+#: g10/revoke.c:568
 msgid "This is a revocation certificate for the OpenPGP key:"
 msgstr "�れ�失効証明書���ら�OpenPGP��対�るも���:"
 
-#: g10/revoke.c:583
+#: g10/revoke.c:584
 msgid ""
 "A revocation certificate is a kind of \"kill switch\" to publicly\n"
 "declare that a key shall not anymore be used.  It is not possible\n"
@@ -6822,7 +6837,7 @@ msgstr ""
 "よ��公�宣言�るも���。一度発行�れる����よ��失効証明書�\n"
 "撤回�る�������ん。"
 
-#: g10/revoke.c:586
+#: g10/revoke.c:587
 msgid ""
 "Use it to revoke this key in case of a compromise or loss of\n"
 "the secret key.  However, if the secret key is still accessible,\n"
@@ -6835,7 +6850,7 @@ msgstr ""
 "失効��由を��る方�よ���ょ�。詳細��GnuPGマニュアル�gpgコマンド \"--"
 "generate-revocation\"�記述を�覧����。"
 
-#: g10/revoke.c:592
+#: g10/revoke.c:593
 msgid ""
 "To avoid an accidental use of this file, a colon has been inserted\n"
 "before the 5 dashes below.  Remove this colon with a text editor\n"
@@ -6845,12 +6860,12 @@ msgstr ""
 "���挿入�れ��。��失効証明書をイン�ート��公開�る���テク\n"
 "スト・エディタ���コロンを削除������。"
 
-#: g10/revoke.c:611
+#: g10/revoke.c:612
 #, c-format
 msgid "revocation certificate stored as '%s.rev'\n"
 msgstr "失効証明書を '%s.rev' ��管����。\n"
 
-#: g10/revoke.c:655
+#: g10/revoke.c:656
 #, c-format
 msgid "secret key \"%s\" not found\n"
 msgstr "秘密�\"%s\"�見��り��ん\n"
@@ -6858,21 +6873,21 @@ msgstr "秘密�\"%s\"�見��り��ん\n"
 #. TRANSLATORS: The %s prints a key specification which
 #. for example has been given at the command line.  Several lines
 #. lines with secret key infos are printed after this message.
-#: g10/revoke.c:680
+#: g10/revoke.c:681
 #, c-format
 msgid "'%s' matches multiple secret keys:\n"
 msgstr "'%s'�以下�複数�秘密��マッ����:\n"
 
-#: g10/revoke.c:705
+#: g10/revoke.c:706
 #, c-format
 msgid "error searching the keyring: %s\n"
 msgstr "�リング探索エラー: %s\n"
 
-#: g10/revoke.c:728
+#: g10/revoke.c:729
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "����対�る失効証明書を作�����? (y/N) "
 
-#: g10/revoke.c:752
+#: g10/revoke.c:753
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -6893,33 +6908,33 @@ msgstr ""
 "ã‚‹\n"
 "場所�データを������り��!\n"
 
-#: g10/revoke.c:786
+#: g10/revoke.c:787
 msgid "Please select the reason for the revocation:\n"
 msgstr "失効��由を�択������:\n"
 
-#: g10/revoke.c:796
+#: g10/revoke.c:797
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: g10/revoke.c:798
+#: g10/revoke.c:799
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(������ん%dを������ょ�)\n"
 
-#: g10/revoke.c:839
+#: g10/revoke.c:843
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "予備�説明を入力。空行�終了:\n"
 
-#: g10/revoke.c:867
+#: g10/revoke.c:871
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "失効�由: %s\n"
 
-#: g10/revoke.c:869
+#: g10/revoke.c:873
 msgid "(No description given)\n"
 msgstr "(説明��り��ん)\n"
 
-#: g10/revoke.c:874
+#: g10/revoke.c:878
 msgid "Is this okay? (y/N) "
 msgstr "よ������? (y/N) "
 
@@ -7072,24 +7087,24 @@ msgstr "署�:"
 msgid "%s.%s encryption will be used\n"
 msgstr "%s.%s暗�化を使用���\n"
 
-#: g10/skclist.c:172 g10/skclist.c:253
+#: g10/skclist.c:173 g10/skclist.c:254
 #, c-format
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "セキュア������フラグ����設定�れ����ん。\n"
 "�物乱数生�器�����ょ�使���ん!\n"
 
-#: g10/skclist.c:204
+#: g10/skclist.c:205
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "\"%s\"をスキップ���: �複\n"
 
-#: g10/skclist.c:223
+#: g10/skclist.c:224
 #, c-format
 msgid "skipped: secret key already present\n"
 msgstr "スキップ: 秘密��も��り��\n"
 
-#: g10/skclist.c:242
+#: g10/skclist.c:243
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr "�れ�PGP�生���Elgamal���署�用��安全���り��ん!"
 
@@ -7309,10 +7324,10 @@ msgstr "サ�ート�れ����TOFUデータベース�ージョン: %s\
 msgid "TOFU DB error"
 msgstr "TOFU DBエラー"
 
-#: g10/tofu.c:687 g10/tofu.c:2073 g10/tofu.c:2354 g10/tofu.c:2373
-#: g10/tofu.c:2386 g10/tofu.c:2398 g10/tofu.c:2413 g10/tofu.c:2425
-#: g10/tofu.c:3021 g10/tofu.c:3038 g10/tofu.c:3075 g10/tofu.c:3092
-#: g10/tofu.c:3404
+#: g10/tofu.c:687 g10/tofu.c:2077 g10/tofu.c:2358 g10/tofu.c:2377
+#: g10/tofu.c:2390 g10/tofu.c:2402 g10/tofu.c:2417 g10/tofu.c:2429
+#: g10/tofu.c:3025 g10/tofu.c:3042 g10/tofu.c:3079 g10/tofu.c:3096
+#: g10/tofu.c:3408
 #, c-format
 msgid "error reading TOFU database: %s\n"
 msgstr "TOFUデータベース�読�込�エラー: %s\n"
@@ -7332,7 +7347,7 @@ msgstr "TOFUデータベース��期化エラー: %s\n"
 msgid "error opening TOFU database '%s': %s\n"
 msgstr "TOFUデータベース�オープン�エラー '%s': %s\n"
 
-#: g10/tofu.c:1148 g10/tofu.c:3458 g10/tofu.c:3604
+#: g10/tofu.c:1148 g10/tofu.c:3462 g10/tofu.c:3608
 #, c-format
 msgid "error updating TOFU database: %s\n"
 msgstr "TOFUデータベース�更新エラー: %s\n"
@@ -7372,97 +7387,97 @@ msgstr "���ユーザID��集エラー: %s\n"
 msgid "This key's user IDs:\n"
 msgstr "����ユーザID:\n"
 
-#: g10/tofu.c:1634 g10/tofu.c:1799
+#: g10/tofu.c:1634 g10/tofu.c:1801
 #, c-format
 msgid "policy: %s"
 msgstr "�リシー: %s"
 
-#: g10/tofu.c:1725
+#: g10/tofu.c:1727
 #, c-format
 msgid "error gathering signature stats: %s\n"
 msgstr "署��統計��集エラー: %s\n"
 
-#: g10/tofu.c:1729
+#: g10/tofu.c:1731
 #, c-format
 msgid "The email address \"%s\" is associated with %d key:\n"
 msgid_plural "The email address \"%s\" is associated with %d keys:\n"
 msgstr[0] "電�メールアドレス\"%s\"�%d個�������られ��:\n"
 
-#: g10/tofu.c:1747
+#: g10/tofu.c:1749
 #, c-format
 msgid "Statistics for keys with the email address \"%s\":\n"
 msgstr "��電�メールアドレス\"%s\"���統計:\n"
 
-#: g10/tofu.c:1797
+#: g10/tofu.c:1799
 msgid "this key"
 msgstr "���"
 
-#: g10/tofu.c:1823
+#: g10/tofu.c:1825
 #, c-format
 msgid "Verified %d message."
 msgid_plural "Verified %d messages."
 msgstr[0] "%d個�メッセージを検証����。"
 
-#: g10/tofu.c:1827
+#: g10/tofu.c:1829
 #, c-format
 msgid "Encrypted %d message."
 msgid_plural "Encrypted %d messages."
 msgstr[0] "%d個�メッセージを暗�化����。"
 
-#: g10/tofu.c:1834
+#: g10/tofu.c:1836
 #, c-format
 msgid "Verified %d message in the future."
 msgid_plural "Verified %d messages in the future."
 msgstr[0] "%d個�メッセージ�未��検証�れ���。"
 
-#: g10/tofu.c:1838
+#: g10/tofu.c:1840
 #, c-format
 msgid "Encrypted %d message in the future."
 msgid_plural "Encrypted %d messages in the future."
 msgstr[0] "%d個�メッセージ�未��暗�化�れ���。"
 
-#: g10/tofu.c:1852
+#: g10/tofu.c:1854
 #, c-format
 msgid "Messages verified over the past %d day: %d."
 msgid_plural "Messages verified over the past %d days: %d."
 msgstr[0] "�去%d日間�検証�れ�メッセージ�数: %d."
 
-#: g10/tofu.c:1858
+#: g10/tofu.c:1860
 #, c-format
 msgid "Messages encrypted over the past %d day: %d."
 msgid_plural "Messages encrypted over the past %d days: %d."
 msgstr[0] "�去%d日間�暗�化�れ�メッセージ�数: %d."
 
-#: g10/tofu.c:1868
+#: g10/tofu.c:1870
 #, c-format
 msgid "Messages verified over the past %d month: %d."
 msgid_plural "Messages verified over the past %d months: %d."
 msgstr[0] "�去%d月�間�検証�れ�メッセージ�数: %d."
 
-#: g10/tofu.c:1874
+#: g10/tofu.c:1876
 #, c-format
 msgid "Messages encrypted over the past %d month: %d."
 msgid_plural "Messages encrypted over the past %d months: %d."
 msgstr[0] "�去%d月�間�暗�化�れ�メッセージ�数: %d."
 
-#: g10/tofu.c:1884
+#: g10/tofu.c:1886
 #, c-format
 msgid "Messages verified over the past %d year: %d."
 msgid_plural "Messages verified over the past %d years: %d."
 msgstr[0] "�去%d年間�検証�れ�メッセージ�数: %d."
 
-#: g10/tofu.c:1890
+#: g10/tofu.c:1892
 #, c-format
 msgid "Messages encrypted over the past %d year: %d."
 msgid_plural "Messages encrypted over the past %d years: %d."
 msgstr[0] "�去%d年間�暗�化�れ�メッセージ�数: %d."
 
-#: g10/tofu.c:1898
+#: g10/tofu.c:1900
 #, c-format
 msgid "Messages verified in the past: %d."
 msgstr "�れ���検証�れ�メッセージ�数: %d."
 
-#: g10/tofu.c:1902
+#: g10/tofu.c:1904
 #, c-format
 msgid "Messages encrypted in the past: %d."
 msgstr "�れ���暗�化�れ�メッセージ�数: %d."
@@ -7470,121 +7485,121 @@ msgstr "�れ���暗�化�れ�メッセージ�数: %d."
 #. TRANSLATORS: Please translate the text found in the source
 #. * file below.  We don't directly internationalize that text so
 #. * that we can tweak it without breaking translations.
-#: g10/tofu.c:1919
+#: g10/tofu.c:1921
 msgid "TOFU detected a binding conflict"
 msgstr "TOFU��インディング���を検出����"
 
 #. TRANSLATORS: Two letters (normally the lower and upper case
 #. * version of the hotkey) for each of the five choices.  If
 #. * there is only one choice in your language, repeat it.
-#: g10/tofu.c:1961
+#: g10/tofu.c:1963
 msgid "gGaAuUrRbB"
 msgstr "gGaAuUrRbB"
 
-#: g10/tofu.c:1967
+#: g10/tofu.c:1969
 msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 "(G)ood-良, (A)ccept once-一度����る, (U)nknown-�明, (R)eject once-一度�"
 "��, (B)ad-ダメ? "
 
-#: g10/tofu.c:1975
+#: g10/tofu.c:1978
 msgid "Defaulting to unknown.\n"
 msgstr "�明をデフォルト����。\n"
 
-#: g10/tofu.c:2093 g10/tofu.c:2228
+#: g10/tofu.c:2097 g10/tofu.c:2232
 #, c-format
 msgid "TOFU db corruption detected.\n"
 msgstr "TOFU db�壊れ��る���検出�れ���。\n"
 
-#: g10/tofu.c:2829
+#: g10/tofu.c:2833
 #, c-format
 msgid "error changing TOFU policy: %s\n"
 msgstr "TOFU�リシー�作�エラー: %s\n"
 
-#: g10/tofu.c:2880
+#: g10/tofu.c:2884
 #, c-format
 msgid "%lld~year"
 msgid_plural "%lld~years"
 msgstr[0] "%lldå¹´"
 
-#: g10/tofu.c:2885
+#: g10/tofu.c:2889
 #, c-format
 msgid "%lld~month"
 msgid_plural "%lld~months"
 msgstr[0] "%lld月"
 
-#: g10/tofu.c:2890
+#: g10/tofu.c:2894
 #, c-format
 msgid "%lld~week"
 msgid_plural "%lld~weeks"
 msgstr[0] "%lld週"
 
-#: g10/tofu.c:2895
+#: g10/tofu.c:2899
 #, c-format
 msgid "%lld~day"
 msgid_plural "%lld~days"
 msgstr[0] "%lldæ—¥"
 
-#: g10/tofu.c:2900
+#: g10/tofu.c:2904
 #, c-format
 msgid "%lld~hour"
 msgid_plural "%lld~hours"
 msgstr[0] "%lld時間"
 
-#: g10/tofu.c:2905
+#: g10/tofu.c:2909
 #, c-format
 msgid "%lld~minute"
 msgid_plural "%lld~minutes"
 msgstr[0] "%lld分"
 
-#: g10/tofu.c:2907
+#: g10/tofu.c:2911
 #, c-format
 msgid "%lld~second"
 msgid_plural "%lld~seconds"
 msgstr[0] "%lld秒"
 
-#: g10/tofu.c:3145
+#: g10/tofu.c:3149
 #, c-format
 msgid "%s: Verified 0~signatures and encrypted 0~messages."
 msgstr "%s: 0個�署�を検証�0個�メッセージを暗�化����。"
 
-#: g10/tofu.c:3151
+#: g10/tofu.c:3155
 #, c-format
 msgid "%s: Verified 0 signatures."
 msgstr "%s: 0個�署�を検証����。"
 
-#: g10/tofu.c:3165
+#: g10/tofu.c:3169
 msgid "Encrypted 0 messages."
 msgstr "0 個�メッセージを暗�化����。"
 
-#: g10/tofu.c:3181
+#: g10/tofu.c:3185
 #, c-format
 msgid "(policy: %s)"
 msgstr "(�リシー: %s)"
 
-#: g10/tofu.c:3215
+#: g10/tofu.c:3219
 #, c-format
 msgid ""
 "Warning: we have yet to see a message signed using this key and user id!\n"
 msgstr "警告: ����ユーザID�署��れ�メッセージ�一度も見���ん!\n"
 
-#: g10/tofu.c:3218
+#: g10/tofu.c:3222
 #, c-format
 msgid ""
 "Warning: we've only seen one message signed using this key and user id!\n"
 msgstr "警告: ����ユーザID�署��れ�メッセージ�一度��見���ん!\n"
 
-#: g10/tofu.c:3222
+#: g10/tofu.c:3226
 #, c-format
 msgid "Warning: you have yet to encrypt a message to this key!\n"
 msgstr "警告: �����一�もメッセージを暗�化������り��ん!\n"
 
-#: g10/tofu.c:3225
+#: g10/tofu.c:3229
 #, c-format
 msgid "Warning: you have only encrypted one message to this key!\n"
 msgstr "警告: �����一��メッセージ��暗�化������り��ん!\n"
 
-#: g10/tofu.c:3254
+#: g10/tofu.c:3258
 #, c-format
 msgid ""
 "Warning: if you think you've seen more signatures by this key and user id, "
@@ -7605,13 +7620,13 @@ msgstr[0] ""
 "  %s\n"
 "�ダメ�マーク������。\n"
 
-#: g10/tofu.c:3339 g10/tofu.c:3502 g10/tofu.c:3708 g10/tofu.c:3761
-#: g10/tofu.c:3902 g10/tofu.c:3979 g10/tofu.c:4017
+#: g10/tofu.c:3343 g10/tofu.c:3506 g10/tofu.c:3712 g10/tofu.c:3765
+#: g10/tofu.c:3906 g10/tofu.c:3983 g10/tofu.c:4021
 #, c-format
 msgid "error opening TOFU database: %s\n"
 msgstr "TOFUデータベース�オープン�エラー: %s\n"
 
-#: g10/tofu.c:3535
+#: g10/tofu.c:3539
 #, c-format
 msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
 msgstr ""
@@ -7677,7 +7692,7 @@ msgstr "%s信用モデルを使用\n"
 msgid "no need for a trustdb check\n"
 msgstr "信用データベース�検査������\n"
 
-#: g10/trustdb.c:601 g10/trustdb.c:2272
+#: g10/trustdb.c:601 g10/trustdb.c:2273
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "次回�信用データベース検査��%s��\n"
@@ -7707,58 +7722,58 @@ msgstr "--check-trustdbを実行������\n"
 msgid "checking the trustdb\n"
 msgstr "信用データベース�検査\n"
 
-#: g10/trustdb.c:1993
+#: g10/trustdb.c:1994
 #, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr[0] "%d個��を処�"
 
-#: g10/trustdb.c:1996
+#: g10/trustdb.c:1997
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] " (��%d本�有効性数をクリア)\n"
 
-#: g10/trustdb.c:2066
+#: g10/trustdb.c:2067
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "究極的�信用�る��見��り��ん\n"
 
-#: g10/trustdb.c:2080
+#: g10/trustdb.c:2081
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "究極的�信用�る�%s�公開��見��り��ん\n"
 
-#: g10/trustdb.c:2198
+#: g10/trustdb.c:2199
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr "深�: %d  有効性: %3d  署�: %3d  信用: %d-, %dq, %dn, %dm, %df, %du\n"
 
-#: g10/trustdb.c:2279
+#: g10/trustdb.c:2280
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
 "信用データベース��ージョン・レコード�更新����ん: 書�込��失敗���"
 "�: %s\n"
 
-#: g10/trust.c:125
+#: g10/trust.c:114
 msgid "undefined"
 msgstr "未定義"
 
-#: g10/trust.c:126
+#: g10/trust.c:115
 msgid "never"
 msgstr "全���"
 
-#: g10/trust.c:127
+#: g10/trust.c:116
 msgid "marginal"
 msgstr "����"
 
-#: g10/trust.c:128
+#: g10/trust.c:117
 msgid "full"
 msgstr "充分"
 
-#: g10/trust.c:129
+#: g10/trust.c:118
 msgid "ultimate"
 msgstr "究極"
 
@@ -7770,39 +7785,39 @@ msgstr "究極"
 #. It gets passed to atoi() so everything after the number is
 #. essentially a comment and need not be translated.  Either key and
 #. uid are both NULL, or neither are NULL.
-#: g10/trust.c:166
+#: g10/trust.c:155
 msgid "10 translator see trust.c:uid_trust_string_fixed"
 msgstr "10 translator see trust.c:uid_trust_string_fixed"
 
-#: g10/trust.c:169
+#: g10/trust.c:158
 msgid "[ revoked]"
 msgstr "[  失効  ]"
 
-#: g10/trust.c:171 g10/trust.c:177
+#: g10/trust.c:160 g10/trust.c:166
 msgid "[ expired]"
 msgstr "[期�切れ]"
 
-#: g10/trust.c:176
+#: g10/trust.c:165
 msgid "[ unknown]"
 msgstr "[  �明  ]"
 
-#: g10/trust.c:178
+#: g10/trust.c:167
 msgid "[  undef ]"
 msgstr "[ 未定義 ]"
 
-#: g10/trust.c:179
+#: g10/trust.c:168
 msgid "[  never ]"
 msgstr "[全���]"
 
-#: g10/trust.c:180
+#: g10/trust.c:169
 msgid "[marginal]"
 msgstr "[����]"
 
-#: g10/trust.c:181
+#: g10/trust.c:170
 msgid "[  full  ]"
 msgstr "[  充分  ]"
 
-#: g10/trust.c:182
+#: g10/trust.c:171
 msgid "[ultimate]"
 msgstr "[  究極  ]"
 
@@ -7860,16 +7875,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:4937 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2386
+#: scd/app-piv.c:1770 scd/app-p15.c:5035 scd/app-nks.c:1530
+#: scd/app-openpgp.c:2387
 #, 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:4956 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2402
+#: scd/app-piv.c:1787 scd/app-p15.c:5054 scd/app-nks.c:1549
+#: scd/app-openpgp.c:2403
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr "残�れ�試行回数: %d"
@@ -7898,10 +7913,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:2669
-#: scd/app-openpgp.c:2693 scd/app-openpgp.c:2871 scd/app-openpgp.c:2893
-#: scd/app-openpgp.c:3074 scd/app-openpgp.c:3361 scd/app-openpgp.c:3408
-#: scd/app-openpgp.c:3545 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2670
+#: scd/app-openpgp.c:2694 scd/app-openpgp.c:2872 scd/app-openpgp.c:2894
+#: scd/app-openpgp.c:3075 scd/app-openpgp.c:3362 scd/app-openpgp.c:3409
+#: scd/app-openpgp.c:3547 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PINコール�ック�エラーを返����: %s\n"
@@ -7921,91 +7936,91 @@ 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:3616
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3618
 #, c-format
 msgid "key already exists\n"
 msgstr "��も��り��\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3620
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3622
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "既存���置���られ��\n"
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3622
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3624
 #, c-format
 msgid "generating new key\n"
 msgstr "新���を生�\n"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3624
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3626
 #, c-format
 msgid "writing new key\n"
 msgstr "新���を書�込�\n"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4484 scd/app-openpgp.c:4767
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4486 scd/app-openpgp.c:4761
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "���管�失敗����: %s\n"
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1615
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1616
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr "応答�RSA�モジュラス���れ����ん\n"
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1622
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1623
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr "応答�RSA公開指数���れ����ん\n"
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1732
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1733
 #, c-format
 msgid "response does not contain the EC public key\n"
 msgstr "応答�楕円曲線�公開����れ����ん\n"
 
-#: scd/app-piv.c:3279 scd/app-openpgp.c:4943
+#: scd/app-piv.c:3279 scd/app-openpgp.c:4937
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr "�生��間��待����� ...\n"
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4951
+#: scd/app-piv.c:3294 scd/app-openpgp.c:4945
 #, c-format
 msgid "generating key failed\n"
 msgstr "��生��失敗����\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4957
+#: scd/app-piv.c:3300 scd/app-openpgp.c:4951
 #, 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:1842 scd/app-openpgp.c:4966
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1843 scd/app-openpgp.c:4960
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr "応答�公開�データ���れ����ん\n"
 
-#: scd/app-p15.c:5035 scd/app-nks.c:2038
+#: scd/app-p15.c:5133 scd/app-nks.c:2038
 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:5038 scd/app-openpgp.c:2818
+#: scd/app-p15.c:5136 scd/app-openpgp.c:2819
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|管�者PINを入力������"
 
-#: scd/app-p15.c:5040 scd/app-nks.c:2028
+#: scd/app-p15.c:5138 scd/app-nks.c:2028
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "|P|標準���PIN Unblocking Code (PUK)を入力������。"
 
-#: scd/app-p15.c:5043 scd/app-nks.c:2019
+#: scd/app-p15.c:5141 scd/app-nks.c:2019
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||PINを標準������入力������。"
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4321
+#: scd/app-nks.c:1468 scd/app-openpgp.c:4323
 #, 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:4333
+#: scd/app-nks.c:1476 scd/app-openpgp.c:4335
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "RSA公開指数���� %d ビットより大�����\n"
@@ -8045,27 +8060,27 @@ msgid ""
 msgstr ""
 "|P|�定署�������新��PINブロック解除コード(PUK)を入力������。"
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3442 scd/app-dinsig.c:534
+#: scd/app-nks.c:2221 scd/app-openpgp.c:3443 scd/app-dinsig.c:534
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "新��PIN��得エラー: %s\n"
 
-#: scd/app-openpgp.c:943
+#: scd/app-openpgp.c:944
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "指紋��管�失敗����: %s\n"
 
-#: scd/app-openpgp.c:956
+#: scd/app-openpgp.c:957
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "生�日��管�失敗����: %s\n"
 
-#: scd/app-openpgp.c:1427 scd/app-openpgp.c:3389 scd/app-openpgp.c:5715
+#: scd/app-openpgp.c:1428 scd/app-openpgp.c:3390 scd/app-openpgp.c:5709
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "カード�らCHVステイタス��得�エラー\n"
 
-#: scd/app-openpgp.c:1949
+#: scd/app-openpgp.c:1950
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "公開��読�込��失敗����: %s\n"
@@ -8073,64 +8088,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:2373
+#: scd/app-openpgp.c:2374
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr "%s番�: %s%%0A��者: %s%%0Aカウンタ: %lu%s"
 
-#: scd/app-openpgp.c:2621
+#: scd/app-openpgp.c:2622
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "デフォルトPINを%s���使���\n"
 
-#: scd/app-openpgp.c:2628
+#: scd/app-openpgp.c:2629
 #, 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:2641
+#: scd/app-openpgp.c:2642
 msgid "||Please unlock the card"
 msgstr "||カードをアンロック������"
 
-#: scd/app-openpgp.c:2700 scd/app-openpgp.c:2900 scd/app-openpgp.c:3368
+#: scd/app-openpgp.c:2701 scd/app-openpgp.c:2901 scd/app-openpgp.c:3369
 #, 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:2717 scd/app-openpgp.c:2760 scd/app-openpgp.c:2917
-#: scd/app-openpgp.c:5325
+#: scd/app-openpgp.c:2718 scd/app-openpgp.c:2761 scd/app-openpgp.c:2918
+#: scd/app-openpgp.c:5319
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "CHV%d��証�失敗����: %s\n"
 
-#: scd/app-openpgp.c:2804 scd/app-openpgp.c:5724
+#: scd/app-openpgp.c:2805 scd/app-openpgp.c:5718
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "カード�永久�ロック�れ���!\n"
 
-#: scd/app-openpgp.c:2808
+#: scd/app-openpgp.c:2809
 #, 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:2841
+#: scd/app-openpgp.c:2842
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr "管�コマンド��アクセス�設定�れ����ん\n"
 
-#: scd/app-openpgp.c:3355
+#: scd/app-openpgp.c:3356
 msgid "||Please enter the PIN"
 msgstr "||PINを入力������"
 
-#: scd/app-openpgp.c:3404
+#: scd/app-openpgp.c:3405
 msgid "||Please enter the Reset Code for the card"
 msgstr "||カード�リセット・コードを入力������"
 
-#: scd/app-openpgp.c:3414 scd/app-openpgp.c:3481
+#: scd/app-openpgp.c:3415 scd/app-openpgp.c:3484
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "リセット・コード�短����。最短�長��%d��。\n"
@@ -8138,78 +8153,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:3437
+#: scd/app-openpgp.c:3438
 msgid "|RN|New Reset Code"
 msgstr "|RN|新��リセット・コード"
 
-#: scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3439
 msgid "|AN|New Admin PIN"
 msgstr "|AN|新��管�者PIN"
 
-#: scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3439
 msgid "|N|New PIN"
 msgstr "|N|新��PIN"
 
-#: scd/app-openpgp.c:3541
+#: scd/app-openpgp.c:3543
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "||管�者PIN�新��管�者PINを入力������"
 
-#: scd/app-openpgp.c:3542
+#: scd/app-openpgp.c:3544
 msgid "||Please enter the PIN and New PIN"
 msgstr "||PIN�新��PINを入力������"
 
-#: scd/app-openpgp.c:3600 scd/app-openpgp.c:5026
+#: scd/app-openpgp.c:3602 scd/app-openpgp.c:5020
 #, c-format
 msgid "error reading application data\n"
 msgstr "アプリケーション・データ�読�込�エラー\n"
 
-#: scd/app-openpgp.c:3606 scd/app-openpgp.c:5033
+#: scd/app-openpgp.c:3608 scd/app-openpgp.c:5027
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "フィンガープリント�データ・オブジェクト�読�込�エラー\n"
 
-#: scd/app-openpgp.c:4302 scd/app-openpgp.c:4657
+#: scd/app-openpgp.c:4304 scd/app-openpgp.c:4653
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "作�時刻スタンプ��り��ん\n"
 
-#: scd/app-openpgp.c:4343 scd/app-openpgp.c:4351
+#: scd/app-openpgp.c:4345 scd/app-openpgp.c:4353
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA素数 %s ��り��ん����%dビット�も����り��ん\n"
 
-#: scd/app-openpgp.c:4651
+#: scd/app-openpgp.c:4647
 #, c-format
 msgid "unsupported curve\n"
 msgstr "サ�ート�れ����曲線\n"
 
-#: scd/app-openpgp.c:4991
+#: scd/app-openpgp.c:4985
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "OpenPGPカード�無効�構造 (データ・オブジェクト 0x93)\n"
 
-#: scd/app-openpgp.c:5041
+#: scd/app-openpgp.c:5035
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr "カード�フィンガープリント��求�れ�も��一致���ん\n"
 
-#: scd/app-openpgp.c:5240
+#: scd/app-openpgp.c:5234
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "カード�ダイジェスト・アルゴリズム %s をサ�ート�����ん\n"
 
-#: scd/app-openpgp.c:5298
+#: scd/app-openpgp.c:5292
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "�れ���作��れ�署�: %lu\n"
 
-#: scd/app-openpgp.c:5729
+#: scd/app-openpgp.c:5723
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr "管�者PIN�確����コマンド��今�����止�れ����\n"
 
-#: scd/app-openpgp.c:6241 scd/app-openpgp.c:6252
+#: scd/app-openpgp.c:6250 scd/app-openpgp.c:6261
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "%s�アクセス����ん - 無効�OpenPGPカード?\n"
@@ -8229,7 +8244,7 @@ msgstr "|N|�期�新��PIN"
 msgid "run in multi server mode (foreground)"
 msgstr "マル�・サー�・モード(フォアグラウンド)�実行"
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:274 dirmngr/dirmngr.c:198
+#: scd/scdaemon.c:136 sm/gpgsm.c:274 dirmngr/dirmngr.c:199
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LEVEL|デ�ッグ・レベルをLEVEL����"
 
@@ -8292,12 +8307,12 @@ msgstr ""
 "'--daemon'オプションを使���プログラムを�ックグラウンド�実行�����"
 "�\n"
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2104
+#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2143
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "fd %d��ンドラ�開始�れ���\n"
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2112
+#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2151
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "fd %d��ンドラ�終了����\n"
@@ -8307,11 +8322,11 @@ msgstr "fd %d��ンドラ�終了����\n"
 msgid "validation model requested by certificate: %s"
 msgstr "証明書�ら以下�検証モデル��求�れ���: %s"
 
-#: sm/certchain.c:199 sm/certchain.c:2172
+#: sm/certchain.c:199 sm/certchain.c:2174
 msgid "chain"
 msgstr "chain"
 
-#: sm/certchain.c:200 sm/certchain.c:2172
+#: sm/certchain.c:200 sm/certchain.c:2174
 msgid "shell"
 msgstr "shell"
 
@@ -8344,227 +8359,227 @@ msgstr "注æ„�: クリティカルã�§ã�ªã�„証明書ãƒ�リシーã�¯èª�ã‚�られã
 msgid "certificate policy not allowed"
 msgstr "証明書�リシー���られ��ん"
 
-#: sm/certchain.c:595 sm/keydb.c:1891 sm/keydb.c:1980
+#: sm/certchain.c:596 sm/keydb.c:1913 sm/keydb.c:2002
 #, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "フィンガープリント��得�失敗����\n"
 
-#: sm/certchain.c:624
+#: sm/certchain.c:625
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr "発行者�外部ロケーションを調�����\n"
 
-#: sm/certchain.c:644
+#: sm/certchain.c:645
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "マッ��る発行者�数: %d\n"
 
-#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#: sm/certchain.c:724 dirmngr/ocsp.c:683
 #, c-format
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "authorityInfoAccessを�得����ん: %s\n"
 
-#: sm/certchain.c:791
+#: sm/certchain.c:792
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr "Dirmngrキャッシュ�ら発行者を調�����\n"
 
-#: sm/certchain.c:816
+#: sm/certchain.c:817
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "マッ��る証明書�数: %d\n"
 
-#: sm/certchain.c:819
+#: sm/certchain.c:820
 #, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "dirmngr�キャッシュ����探索�失敗����: %s\n"
 
-#: sm/certchain.c:1046 sm/certchain.c:1561 sm/certchain.c:2200 sm/decrypt.c:643
-#: sm/encrypt.c:620 sm/import.c:414 sm/keydb.c:1898 sm/keydb.c:1987
-#: sm/sign.c:428 sm/verify.c:117
+#: sm/certchain.c:1047 sm/certchain.c:1562 sm/certchain.c:2202
+#: sm/decrypt.c:1084 sm/encrypt.c:621 sm/import.c:414 sm/keydb.c:1920
+#: sm/keydb.c:2009 sm/sign.c:428 sm/verify.c:117
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "keyDB�ンドル�確��失敗����\n"
 
-#: sm/certchain.c:1232
+#: sm/certchain.c:1233
 msgid "certificate has been revoked"
 msgstr "証明書�失効済���"
 
-#: sm/certchain.c:1247
+#: sm/certchain.c:1248
 msgid "the status of the certificate is unknown"
 msgstr "証明書�ステイタス��明��"
 
-#: sm/certchain.c:1254
+#: sm/certchain.c:1255
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr "\"dirmngr\" �正��インストール�れ��る��を確�������\n"
 
-#: sm/certchain.c:1260
+#: sm/certchain.c:1261
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "CRL�検査�失敗����: %s"
 
-#: sm/certchain.c:1289 sm/certchain.c:1357 dirmngr/validate.c:497
+#: sm/certchain.c:1290 sm/certchain.c:1358 dirmngr/validate.c:497
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "無効�妥当性�証明書: %s"
 
-#: sm/certchain.c:1304 sm/certchain.c:1389 dirmngr/validate.c:515
+#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:515
 #, c-format
 msgid "certificate not yet valid"
 msgstr "証明書���有効���り��ん"
 
-#: sm/certchain.c:1305 sm/certchain.c:1390
+#: sm/certchain.c:1306 sm/certchain.c:1391
 msgid "root certificate not yet valid"
 msgstr "ルート証明書���有効���り��ん"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1307 sm/certchain.c:1392
 msgid "intermediate certificate not yet valid"
 msgstr "中間証明書���有効���り��ん"
 
-#: sm/certchain.c:1319 dirmngr/validate.c:526
+#: sm/certchain.c:1320 dirmngr/validate.c:526
 #, c-format
 msgid "certificate has expired"
 msgstr "証明書�有効期�を������"
 
-#: sm/certchain.c:1320
+#: sm/certchain.c:1321
 msgid "root certificate has expired"
 msgstr "ルート証明書�有効期�を������"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1322
 msgid "intermediate certificate has expired"
 msgstr "中間証明書�有効期�を������"
 
-#: sm/certchain.c:1363
+#: sm/certchain.c:1364
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr "必��証明書�属性��り��ん: %s%s%s"
 
-#: sm/certchain.c:1372
+#: sm/certchain.c:1373
 msgid "certificate with invalid validity"
 msgstr "妥当性�無効�証明書"
 
-#: sm/certchain.c:1409
+#: sm/certchain.c:1410
 msgid "signature not created during lifetime of certificate"
 msgstr "証明書�ライフタイム�間�署��作られ����ん"
 
-#: sm/certchain.c:1411
+#: sm/certchain.c:1412
 msgid "certificate not created during lifetime of issuer"
 msgstr "発行者�ライフタイム�間�証明書�作られ����ん"
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1413
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr "発行者�ライフタイム�間�中間証明書�作られ����ん"
 
-#: sm/certchain.c:1416
+#: sm/certchain.c:1417
 #, c-format
 msgid "  (  signature created at "
 msgstr "  (  署��作�"
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1418
 #, c-format
 msgid "  (certificate created at "
 msgstr "   (証明書�作�"
 
-#: sm/certchain.c:1420
+#: sm/certchain.c:1421
 #, c-format
 msgid "  (certificate valid from "
 msgstr "  (     証明書�有効"
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1422
 #, c-format
 msgid "  (     issuer valid from "
 msgstr "  (     発行者�有効"
 
-#: sm/certchain.c:1451 dirmngr/validate.c:577
+#: sm/certchain.c:1452 dirmngr/validate.c:577
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "フィンガープリント=%s\n"
 
-#: sm/certchain.c:1460
+#: sm/certchain.c:1461
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr "ルート証明書�信用�る�今�マーク�れ���\n"
 
-#: sm/certchain.c:1473
+#: sm/certchain.c:1474
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 "インタラクティブ�信用�る�マーク�る���gpg-agent�有効�������ん\n"
 
-#: sm/certchain.c:1479
+#: sm/certchain.c:1480
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 "インタラクティブ�信用�る�マーク�る�����セッション��無効�����"
 "��\n"
 
-#: sm/certchain.c:1538
+#: sm/certchain.c:1539
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr "*警告*: 署��作�時間��明�� - �在時刻を仮定���"
 
-#: sm/certchain.c:1602
+#: sm/certchain.c:1603
 msgid "no issuer found in certificate"
 msgstr "証明書�発行者��り��ん"
 
-#: sm/certchain.c:1680
+#: sm/certchain.c:1681
 msgid "self-signed certificate has a BAD signature"
 msgstr "自己署�証明書�*�正�*署���り��"
 
-#: sm/certchain.c:1749 dirmngr/validate.c:575
+#: sm/certchain.c:1750 dirmngr/validate.c:575
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "ルート証明書�信用��る�マーク�れ����ん"
 
-#: sm/certchain.c:1765
+#: sm/certchain.c:1766
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "信用リスト�検査�失敗����: %s\n"
 
-#: sm/certchain.c:1796 sm/import.c:175 dirmngr/validate.c:630
+#: sm/certchain.c:1797 sm/import.c:175 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "証明書��ェイン�長����\n"
 
-#: sm/certchain.c:1808 dirmngr/validate.c:642
+#: sm/certchain.c:1809 dirmngr/validate.c:642
 #, c-format
 msgid "issuer certificate not found"
 msgstr "発行者証明書�見��り��ん"
 
-#: sm/certchain.c:1842 dirmngr/validate.c:668
+#: sm/certchain.c:1844 dirmngr/validate.c:668
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr "証明書�*�正�*署���り��"
 
-#: sm/certchain.c:1874 dirmngr/validate.c:692
+#: sm/certchain.c:1876 dirmngr/validate.c:692
 msgid "found another possible matching CA certificate - trying again"
 msgstr "別�一致�る�能性��るCA証明書�見��り��� - �度試���"
 
-#: sm/certchain.c:1933 dirmngr/validate.c:717
+#: sm/certchain.c:1935 dirmngr/validate.c:717
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "証明書��ェイン�CA�より��られ�も�(%d)より長�������"
 
-#: sm/certchain.c:1975 sm/certchain.c:2275 dirmngr/validate.c:747
+#: sm/certchain.c:1977 sm/certchain.c:2278 dirmngr/validate.c:747
 #, c-format
 msgid "certificate is good\n"
 msgstr "証明書�正����\n"
 
-#: sm/certchain.c:1976
+#: sm/certchain.c:1978
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "中間証明書�正����\n"
 
-#: sm/certchain.c:1977
+#: sm/certchain.c:1979
 #, c-format
 msgid "root certificate is good\n"
 msgstr "ルート証明書�正����\n"
 
-#: sm/certchain.c:2159
+#: sm/certchain.c:2161
 msgid "switching to chain model"
 msgstr "�ェイン・モデル�切り替����"
 
-#: sm/certchain.c:2168
+#: sm/certchain.c:2170
 #, c-format
 msgid "validation model used: %s"
 msgstr "使用��検証モデル: %s"
@@ -8575,18 +8590,18 @@ 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:1372 dirmngr/validate.c:903
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1411 dirmngr/validate.c:903
 #: dirmngr/validate.c:927
 #, c-format
 msgid "out of core\n"
 msgstr "メモリ��り��ん\n"
 
-#: sm/certcheck.c:389 sm/verify.c:212
+#: sm/certcheck.c:388 sm/verify.c:212
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(�れ�MD2アルゴリズム��)\n"
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:793
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:794
 msgid "none"
 msgstr "none"
 
@@ -8874,17 +8889,17 @@ msgstr "準備ã�Œã�§ã��ã�¾ã�—ã�Ÿã€‚今ã€�ã�“ã�®è¦�求をã�‚ã�ªã�Ÿã�®CAã�«é€�ã‚‹ã
 msgid "resource problem: out of core\n"
 msgstr "リソース��題: メモリ��り��ん\n"
 
-#: sm/decrypt.c:719
+#: sm/decrypt.c:1159
 #, c-format
 msgid "(this is the RC2 algorithm)\n"
 msgstr "(RC2アルゴリズム��)\n"
 
-#: sm/decrypt.c:721
+#: sm/decrypt.c:1161
 #, c-format
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr "(暗�化�れ�メッセージ����よ���)\n"
 
-#: sm/decrypt.c:868
+#: sm/decrypt.c:1318
 #, c-format
 msgid "encrypted to %s key %s\n"
 msgstr "%s� %s�対��暗�化�れ���\n"
@@ -8894,7 +8909,7 @@ msgstr "%s� %s�対��暗�化�れ���\n"
 msgid "certificate '%s' not found: %s\n"
 msgstr "証明書'%s'�見��り��ん: %s\n"
 
-#: sm/delete.c:120 sm/keydb.c:1999 sm/keydb.c:2098
+#: sm/delete.c:120 sm/keydb.c:2021 sm/keydb.c:2120
 #, c-format
 msgid "error locking keybox: %s\n"
 msgstr "keybox�ロック�エラー: %s\n"
@@ -8914,7 +8929,7 @@ msgstr "証明書'%s'を削除����\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "証明書'%s'�削除�失敗����: %s\n"
 
-#: sm/encrypt.c:606
+#: sm/encrypt.c:607
 #, c-format
 msgid "no valid recipients given\n"
 msgstr "有効����り手�指定�れ����ん\n"
@@ -8983,63 +8998,63 @@ msgstr "|USER-ID|USER-IDをデフォルト�秘密����使�"
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|FILE|�リングを�リング�リスト�追加"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:352 dirmngr/dirmngr.c:265
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|SPEC|��キーサー�を��検索�使�"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:363
 msgid "fetch missing issuer certificates"
 msgstr "紛失���る発行者証明書を�得�る"
 
-#: sm/gpgsm.c:364
+#: sm/gpgsm.c:365
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NAME|PKCS#12�パスフレーズ�NAME�エンコーディングを使�"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:386
 msgid "never consult a CRL"
 msgstr "決��CRLを調���"
 
-#: sm/gpgsm.c:389
+#: sm/gpgsm.c:390
 msgid "do not check CRLs for root certificates"
 msgstr "ルート証明書�CRLを�ェック���"
 
-#: sm/gpgsm.c:393
+#: sm/gpgsm.c:394
 msgid "check validity using OCSP"
 msgstr "OCSPを用��有効性を確��る"
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:396
 msgid "do not check certificate policies"
 msgstr "証明書�リシーを�ェック���"
 
-#: sm/gpgsm.c:398
+#: sm/gpgsm.c:399
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|暗�アルゴリズム�NAMEを使用"
 
-#: sm/gpgsm.c:400
+#: sm/gpgsm.c:401
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|ダイジェスト・アルゴリズム�NAMEを使用"
 
-#: sm/gpgsm.c:410
+#: sm/gpgsm.c:411
 msgid "batch mode: never ask"
 msgstr "�ッ�・モード: ��もユーザ��������"
 
-#: sm/gpgsm.c:412
+#: sm/gpgsm.c:413
 msgid "assume yes on most questions"
 msgstr "��ん��設��yesを仮定�る"
 
-#: sm/gpgsm.c:413
+#: sm/gpgsm.c:414
 msgid "assume no on most questions"
 msgstr "��ん��設��noを仮定�る"
 
-#: sm/gpgsm.c:430
+#: sm/gpgsm.c:431
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FILE|監査ログをFILE�書�出�"
 
-#: sm/gpgsm.c:615
+#: sm/gpgsm.c:616
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "使�方: @GPGSM@ [オプション] [ファイル] (ヘルプ� -h)"
 
-#: sm/gpgsm.c:618
+#: sm/gpgsm.c:619
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -9049,52 +9064,27 @@ msgstr ""
 "S/MIMEプロトコルを用���署��検査�暗�化や復�を行���\n"
 "デフォルト��作��入力データ��存���\n"
 
-#: sm/gpgsm.c:826
+#: sm/gpgsm.c:827
 #, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "注�:'%s'�対��暗�化����ん: %s\n"
 
-#: sm/gpgsm.c:837
+#: sm/gpgsm.c:838
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "�明�検証モデル '%s'\n"
 
-#: sm/gpgsm.c:896 dirmngr/ldapserver.c:89
-#, c-format
-msgid "%s:%u: no hostname given\n"
-msgstr "%s:%u: ホスト��指定�れ����ん\n"
-
-#: sm/gpgsm.c:915 dirmngr/ldapserver.c:108
-#, c-format
-msgid "%s:%u: password given without user\n"
-msgstr "%s:%u: ユーザ���与�られ�パスワード\n"
-
-#: sm/gpgsm.c:946 dirmngr/ldapserver.c:139
-#, c-format
-msgid "%s:%u: ignoring unknown flag '%s'\n"
-msgstr "%s:%u: 未知�フラグ '%s' を無視���\n"
-
-#: sm/gpgsm.c:962 dirmngr/ldapserver.c:155
-#, c-format
-msgid "%s:%u: skipping this line\n"
-msgstr "%s:%u: ��行�スキップ\n"
-
-#: sm/gpgsm.c:1550
-#, c-format
-msgid "could not parse keyserver\n"
-msgstr "�サー��URLを解��能\n"
-
-#: sm/gpgsm.c:1858
+#: sm/gpgsm.c:1711
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "共通証明書�イン�ート・エラー: %s\n"
 
-#: sm/gpgsm.c:1904
+#: sm/gpgsm.c:1757
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "'%s'を用��署�����ん: %s\n"
 
-#: sm/gpgsm.c:2273
+#: sm/gpgsm.c:2129
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "無効�コマンド (暗黙�コマンド��り��ん)\n"
@@ -9114,52 +9104,52 @@ msgstr "証明書��存�失敗����\n"
 msgid "basic certificate checks failed - not imported\n"
 msgstr "基本証明書�ェック�失敗���� - イン�ート�れ��ん���\n"
 
-#: sm/import.c:471 sm/keydb.c:2018 sm/keydb.c:2111
+#: sm/import.c:472 sm/keydb.c:2040 sm/keydb.c:2133
 #, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "�存�れ�フラグ��得エラー: %s\n"
 
-#: sm/import.c:530 sm/import.c:562
+#: sm/import.c:531 sm/import.c:563
 #, c-format
 msgid "error importing certificate: %s\n"
 msgstr "証明書�イン�ート・エラー: %s\n"
 
-#: sm/import.c:751 tools/gpg-connect-agent.c:1475
+#: sm/import.c:752 tools/gpg-connect-agent.c:1475
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "入力読�込�エラー: %s\n"
 
-#: sm/keydb.c:503
+#: sm/keydb.c:508
 #, c-format
 msgid "no keyboxd running in this session\n"
 msgstr "��セッション�keyboxd�実行�れ����ん\n"
 
-#: sm/keydb.c:595
+#: sm/keydb.c:600
 #, c-format
 msgid "error opening key DB: %s\n"
 msgstr "�DBを開�際�エラー: %s\n"
 
-#: sm/keydb.c:1936
+#: sm/keydb.c:1958
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr "既存�証明書�検索��題: %s\n"
 
-#: sm/keydb.c:1948
+#: sm/keydb.c:1970
 #, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "書�込��能keyDB�判定エラー: %s\n"
 
-#: sm/keydb.c:1956
+#: sm/keydb.c:1978
 #, c-format
 msgid "error storing certificate: %s\n"
 msgstr "証明書�存エラー: %s\n"
 
-#: sm/keydb.c:2009
+#: sm/keydb.c:2031
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "証明書��検索��題: %s\n"
 
-#: sm/keydb.c:2030 sm/keydb.c:2122
+#: sm/keydb.c:2052 sm/keydb.c:2144
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr "フラグ��存エラー: %s\n"
@@ -9342,57 +9332,57 @@ msgstr "サブジェクト ="
 msgid "error loading certificate '%s': %s\n"
 msgstr "証明書'%s'�読�込�エラー: %s\n"
 
-#: dirmngr/certcache.c:819
+#: dirmngr/certcache.c:820
 #, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "永続的�ロード�れる証明書: %u\n"
 
-#: dirmngr/certcache.c:821
+#: dirmngr/certcache.c:822
 #, c-format
 msgid "    runtime cached certificates: %u\n"
 msgstr "実行時キャッシュ証明書�数: %u\n"
 
-#: dirmngr/certcache.c:823
+#: dirmngr/certcache.c:824
 #, c-format
 msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "           信用�れ�証明書�数: %u (%u,%u,%u,%u)\n"
 
-#: dirmngr/certcache.c:851 dirmngr/dirmngr-client.c:392
+#: dirmngr/certcache.c:852 dirmngr/dirmngr-client.c:392
 #, c-format
 msgid "certificate already cached\n"
 msgstr "   ���キャッシュ�れ�証明書\n"
 
-#: dirmngr/certcache.c:853
+#: dirmngr/certcache.c:854
 #, c-format
 msgid "certificate cached\n"
 msgstr "キャッシュ�れ�証明書\n"
 
-#: dirmngr/certcache.c:855 dirmngr/certcache.c:875 dirmngr/dirmngr-client.c:396
+#: dirmngr/certcache.c:856 dirmngr/certcache.c:876 dirmngr/dirmngr-client.c:396
 #, c-format
 msgid "error caching certificate: %s\n"
 msgstr "証明書�キャッシュ�エラー: %s\n"
 
-#: dirmngr/certcache.c:938
+#: dirmngr/certcache.c:939
 #, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "無効�SHA1フィンガープリント文字列'%s'\n"
 
-#: dirmngr/certcache.c:1384 dirmngr/certcache.c:1393
+#: dirmngr/certcache.c:1385 dirmngr/certcache.c:1394
 #, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "S/N��証明書�得エラー : %s\n"
 
-#: dirmngr/certcache.c:1579 dirmngr/certcache.c:1588
+#: dirmngr/certcache.c:1580 dirmngr/certcache.c:1589
 #, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "サブジェクト��証明書�得エラー: %s\n"
 
-#: dirmngr/certcache.c:1694 dirmngr/validate.c:483
+#: dirmngr/certcache.c:1695 dirmngr/validate.c:483
 #, c-format
 msgid "no issuer found in certificate\n"
 msgstr "証明書�発行者����り��ん\n"
 
-#: dirmngr/certcache.c:1704
+#: dirmngr/certcache.c:1705
 #, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "authorityKeyIdentifier��得エラー: %s\n"
@@ -9427,7 +9417,7 @@ msgstr "キャッシュ・ファイル' %s'�削除\n"
 msgid "not removing file '%s'\n"
 msgstr "ファイル'%s'を削除���ん\n"
 
-#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2380
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2383
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr "キャッシュ・ファイル�クローズ�エラー: %s\n"
@@ -9658,13 +9648,13 @@ msgid "error getting data from cache file: %s\n"
 msgstr "キャッシュ・ファイル�らデータ��得エラー: %s\n"
 
 #: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1672 dirmngr/crlcache.c:1697
-#: dirmngr/crlcache.c:1763
+#: dirmngr/crlcache.c:1766
 #, c-format
 msgid "got an invalid S-expression from libksba\n"
 msgstr "libksba�ら無効�S-�を�得����\n"
 
 #: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1679 dirmngr/crlcache.c:1705
-#: dirmngr/crlcache.c:1770 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1773 dirmngr/misc.c:176
 #, c-format
 msgid "converting S-expression failed: %s\n"
 msgstr "S��変��失敗����: %s\n"
@@ -9679,134 +9669,134 @@ msgstr "�明��ッシュ・アルゴリズム'%s'\n"
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr "アルゴリズム%d�gcry_md_open�失敗: %s\n"
 
-#: dirmngr/crlcache.c:1797 dirmngr/ocsp.c:478
+#: dirmngr/crlcache.c:1800 dirmngr/ocsp.c:478
 #, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "S��作��失敗����: %s\n"
 
-#: dirmngr/crlcache.c:1871
+#: dirmngr/crlcache.c:1874
 #, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "ksba_crl_parse �失敗����: %s\n"
 
-#: dirmngr/crlcache.c:1886
+#: dirmngr/crlcache.c:1889
 #, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "CRL�更新時刻��得エラー: %s\n"
 
-#: dirmngr/crlcache.c:1893
+#: dirmngr/crlcache.c:1896
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr "��CRL�更新時刻: �れ=%s 次=%s\n"
 
-#: dirmngr/crlcache.c:1897
+#: dirmngr/crlcache.c:1900
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr "nextUpdate�与�られ����ん。一日�有効期間を仮定���\n"
 
-#: dirmngr/crlcache.c:1917
+#: dirmngr/crlcache.c:1920
 #, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "CRL項目��得エラー: %s\n"
 
-#: dirmngr/crlcache.c:1932
+#: dirmngr/crlcache.c:1935
 #, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "一時キャッシュ・ファイル�項目�挿入エラー: %s\n"
 
-#: dirmngr/crlcache.c:1959
+#: dirmngr/crlcache.c:1962
 #, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "CRL�発行者��り��ん: %s\n"
 
-#: dirmngr/crlcache.c:1974
+#: dirmngr/crlcache.c:1977
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr "CRL発行証明書をauthorityKeyIdentifier�見����\n"
 
-#: dirmngr/crlcache.c:2020
+#: dirmngr/crlcache.c:2023
 #, c-format
 msgid "CRL signature verification failed: %s\n"
 msgstr "CRL署��検証�失敗����: %s\n"
 
-#: dirmngr/crlcache.c:2032
+#: dirmngr/crlcache.c:2035
 #, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "CRL発行者証明書�検証検査エラ−: %s\n"
 
-#: dirmngr/crlcache.c:2174
+#: dirmngr/crlcache.c:2177
 #, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "ksba_crl_new �失敗����: %s\n"
 
-#: dirmngr/crlcache.c:2181
+#: dirmngr/crlcache.c:2184
 #, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "ksba_crl_set_reader �失敗����: %s\n"
 
-#: dirmngr/crlcache.c:2215
+#: dirmngr/crlcache.c:2218
 #, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "��一時キャッシュ・ファイル'%s'を削除����\n"
 
-#: dirmngr/crlcache.c:2219
+#: dirmngr/crlcache.c:2222
 #, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "��一時キャッシュ・ファイル'%s'�削除��題: %s\n"
 
-#: dirmngr/crlcache.c:2229
+#: dirmngr/crlcache.c:2232
 #, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "一時キャッシュ・ファイル'%s'�作�エラー: %s\n"
 
-#: dirmngr/crlcache.c:2239
+#: dirmngr/crlcache.c:2242
 #, c-format
 msgid "crl_parse_insert failed: %s\n"
 msgstr "crl_parse_insert �失敗����: %s\n"
 
-#: dirmngr/crlcache.c:2249
+#: dirmngr/crlcache.c:2252
 #, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "一時キャッシュ・ファイル'%s'�終了エラー: %s\n"
 
-#: dirmngr/crlcache.c:2256
+#: dirmngr/crlcache.c:2259
 #, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "一時キャッシュ・ファイル'%s'�クローズ・エラー: %s\n"
 
-#: dirmngr/crlcache.c:2281
+#: dirmngr/crlcache.c:2284
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 "**警告**: 新��CRL��������。%s�期������� - �れ�も読�込�"
 "��\n"
 
-#: dirmngr/crlcache.c:2285
+#: dirmngr/crlcache.c:2288
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr "新��CRL��������。%s�期�������\n"
 
-#: dirmngr/crlcache.c:2301
+#: dirmngr/crlcache.c:2304
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr "�明�クリティカルCRL�拡張 %s\n"
 
-#: dirmngr/crlcache.c:2311
+#: dirmngr/crlcache.c:2314
 #, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "CRL拡張�読�込�エラー: %s\n"
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2365
 #, c-format
 msgid "creating cache file '%s'\n"
 msgstr "キャッシュ・ファイル'%s'�作�\n"
 
-#: dirmngr/crlcache.c:2394
+#: dirmngr/crlcache.c:2397
 #, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "'%s'�ら'%s'���変更��題: %s\n"
 
-#: dirmngr/crlcache.c:2408
+#: dirmngr/crlcache.c:2411
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
@@ -9815,65 +9805,65 @@ msgstr ""
 "DIRファイル�更新�失敗 - キャッシュ・エントリ�次�プログラム�開始�失�れ"
 "��\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2448
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr "CRLダンプ�開始 (%s �ら�得)\n"
 
-#: dirmngr/crlcache.c:2468
+#: dirmngr/crlcache.c:2471
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 msgstr "*エラー*: CRL�使用�れ��ん。更新後�も����る�ら��!\n"
 
-#: dirmngr/crlcache.c:2471
+#: dirmngr/crlcache.c:2474
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr "*エラー*: CRL��明�クリティカル拡張���使用�れ��ん!\n"
 
-#: dirmngr/crlcache.c:2474
+#: dirmngr/crlcache.c:2477
 msgid " ERROR: The CRL will not be used\n"
 msgstr "*エラー*: CRL�使用�れ��ん\n"
 
-#: dirmngr/crlcache.c:2481
+#: dirmngr/crlcache.c:2484
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr "*エラー*: ��キャッシュ�れ�CRL�変更�れ��る�も�れ��ん!\n"
 
-#: dirmngr/crlcache.c:2499
+#: dirmngr/crlcache.c:2502
 #, c-format
 msgid " WARNING: invalid cache record length\n"
 msgstr "*警告*: 無効�キャッシュ・レコード長\n"
 
-#: dirmngr/crlcache.c:2506
+#: dirmngr/crlcache.c:2509
 #, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "キャッシュ・レコード�読�込���題: %s\n"
 
-#: dirmngr/crlcache.c:2517
+#: dirmngr/crlcache.c:2520
 #, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "キャッシュ���読�込���題: %s\n"
 
-#: dirmngr/crlcache.c:2548
+#: dirmngr/crlcache.c:2551
 #, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "db�らキャッシュ・エントリ�読�込�エラー: %s\n"
 
-#: dirmngr/crlcache.c:2551
+#: dirmngr/crlcache.c:2554
 msgid "End CRL dump\n"
 msgstr "CRLダンプ�終了\n"
 
-#: dirmngr/crlcache.c:2672
+#: dirmngr/crlcache.c:2675
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "DP�らcrl_fetch�失敗����: %s\n"
 
-#: dirmngr/crlcache.c:2683
+#: dirmngr/crlcache.c:2686
 #, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "DP�らcrl_cache_insert�失敗����: %s\n"
 
-#: dirmngr/crlcache.c:2743
+#: dirmngr/crlcache.c:2746
 #, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "発行者�らcrl_cache_insert�失敗����: %s\n"
@@ -9894,7 +9884,7 @@ msgstr "CRLアクセス��止�れ�%s�����能��\n"
 msgid "error retrieving '%s': %s\n"
 msgstr "'%s'を�得�る際�エラー: %s\n"
 
-#: dirmngr/crlfetch.c:218 dirmngr/ldap-wrapper.c:881 dirmngr/misc.c:573
+#: dirmngr/crlfetch.c:218 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
 #, c-format
 msgid "error initializing reader object: %s\n"
 msgstr "リーダ・オブジェクト��期化エラー: %s\n"
@@ -10051,131 +10041,131 @@ msgstr "絶対ファイル�����\n"
 msgid "looking up '%s'\n"
 msgstr "'%s'を検索���\n"
 
-#: dirmngr/dirmngr.c:175
+#: dirmngr/dirmngr.c:176
 msgid "list the contents of the CRL cache"
 msgstr "CRLキャッシュ�内容をリスト���"
 
-#: dirmngr/dirmngr.c:176
+#: dirmngr/dirmngr.c:177
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|FILE|FILE�らCRLをキャッシュ�ロード�る"
 
-#: dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr.c:178
 msgid "|URL|fetch a CRL from URL"
 msgstr "|URL|URL�らCRLを�得���"
 
-#: dirmngr/dirmngr.c:178
+#: dirmngr/dirmngr.c:179
 msgid "shutdown the dirmngr"
 msgstr "dirmngrをシャットダウン�る"
 
-#: dirmngr/dirmngr.c:179
+#: dirmngr/dirmngr.c:180
 msgid "flush the cache"
 msgstr "キャッシュをフラッシュ���"
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:213
 msgid "allow online software version check"
 msgstr "オンライン�ソフトウェア・�ージョン・�ェックを許�"
 
-#: dirmngr/dirmngr.c:215
+#: dirmngr/dirmngr.c:216
 msgid "|N|do not return more than N items in one query"
 msgstr "|N|一��クエリ�Nを越�る�アイテムを返���"
 
-#: dirmngr/dirmngr.c:221
+#: dirmngr/dirmngr.c:222
 msgid "Network related options"
 msgstr "�ットワーク関連オプション"
 
-#: dirmngr/dirmngr.c:223
+#: dirmngr/dirmngr.c:224
 msgid "route all network traffic via Tor"
 msgstr "�ットワーク・トラフィックを���Tor経由��る"
 
-#: dirmngr/dirmngr.c:235
+#: dirmngr/dirmngr.c:236
 msgid "Configuration for Keyservers"
 msgstr "キーサー��コンフィグレーション"
 
-#: dirmngr/dirmngr.c:238
+#: dirmngr/dirmngr.c:239
 msgid "|URL|use keyserver at URL"
 msgstr "|URL|�サー����URLを使用"
 
-#: dirmngr/dirmngr.c:240
+#: dirmngr/dirmngr.c:241
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr "|FILE|FILE��るCA証明書をTLS��HKP�使�"
 
-#: dirmngr/dirmngr.c:242
+#: dirmngr/dirmngr.c:243
 msgid "Configuration for HTTP servers"
 msgstr "HTTPサー��コンフィグレーション"
 
-#: dirmngr/dirmngr.c:244
+#: dirmngr/dirmngr.c:245
 msgid "inhibit the use of HTTP"
 msgstr "HTTP�使用を�止�る"
 
-#: dirmngr/dirmngr.c:246
+#: dirmngr/dirmngr.c:247
 msgid "ignore HTTP CRL distribution points"
 msgstr "HTTP CRL�布�イントを無視�る"
 
-#: dirmngr/dirmngr.c:248
+#: dirmngr/dirmngr.c:249
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr "|URL|����HTTPリクエストをURL�リダイレクト�る"
 
-#: dirmngr/dirmngr.c:250
+#: dirmngr/dirmngr.c:251
 msgid "use system's HTTP proxy setting"
 msgstr "システム�HTTPプロキシ設定を用���"
 
-#: dirmngr/dirmngr.c:254
+#: dirmngr/dirmngr.c:255
 msgid "Configuration of LDAP servers to use"
 msgstr "使用�るLDAPサー��コンフィグレーション"
 
-#: dirmngr/dirmngr.c:256
+#: dirmngr/dirmngr.c:257
 msgid "inhibit the use of LDAP"
 msgstr "LDAP�使用を�止�る"
 
-#: dirmngr/dirmngr.c:258
+#: dirmngr/dirmngr.c:259
 msgid "ignore LDAP CRL distribution points"
 msgstr "LDAP CRL�布�イントを無視�る"
 
-#: dirmngr/dirmngr.c:260
+#: dirmngr/dirmngr.c:261
 msgid "|HOST|use HOST for LDAP queries"
 msgstr "|HOST|LDAP�������HOSTを使�"
 
-#: dirmngr/dirmngr.c:262
+#: dirmngr/dirmngr.c:263
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr "--ldap-proxy �フォール�ック・ホストを使���"
 
-#: dirmngr/dirmngr.c:264
+#: dirmngr/dirmngr.c:267
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FILE|FILE�らLDAPサー�リストを読�込���"
 
-#: dirmngr/dirmngr.c:266
+#: dirmngr/dirmngr.c:269
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr "CRL�布�イント�発見�れ�新��サー�を serverlist �追加�る"
 
-#: dirmngr/dirmngr.c:269 dirmngr/dirmngr_ldap.c:104
+#: dirmngr/dirmngr.c:272
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|LDAP�タイムアウトをN秒��る"
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:275
 msgid "Configuration for OCSP"
 msgstr "OCSP�コンフィグレーション"
 
-#: dirmngr/dirmngr.c:274
+#: dirmngr/dirmngr.c:277
 msgid "allow sending OCSP requests"
 msgstr "OCSP�求��信を��る"
 
-#: dirmngr/dirmngr.c:276
+#: dirmngr/dirmngr.c:279
 msgid "ignore certificate contained OCSP service URLs"
 msgstr "OCSPサービスURL�入���る証明書を無視�る"
 
-#: dirmngr/dirmngr.c:278
+#: dirmngr/dirmngr.c:281
 msgid "|URL|use OCSP responder at URL"
 msgstr "|URL|OCSP応答���URLを使用"
 
-#: dirmngr/dirmngr.c:280
+#: dirmngr/dirmngr.c:283
 msgid "|FPR|OCSP response signed by FPR"
 msgstr "|FPR|FPR�署��れ�OCSPレス�ンス"
 
-#: dirmngr/dirmngr.c:288
+#: dirmngr/dirmngr.c:291
 msgid "force loading of outdated CRLs"
 msgstr "期日����CRL�ロードを強制�る"
 
-#: dirmngr/dirmngr.c:299
+#: dirmngr/dirmngr.c:302
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
@@ -10184,11 +10174,11 @@ msgstr ""
 "@\n"
 "(コマンド�オプション全部�一覧��\"info\" マニュアルを�覧����)\n"
 
-#: dirmngr/dirmngr.c:441
+#: dirmngr/dirmngr.c:449
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "使�方: @DIRMNGR@ [オプション] (ヘルプ� -h)"
 
-#: dirmngr/dirmngr.c:443
+#: dirmngr/dirmngr.c:451
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@ -10196,283 +10186,103 @@ msgstr ""
 "形�: @DIRMNGR@ [オプション] [コマンド [引数]]\n"
 "@GnuPG@��サー��CRL�OCSPアクセス\n"
 
-#: dirmngr/dirmngr.c:523
+#: dirmngr/dirmngr.c:531
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr "有効�debugレベル�: %s\n"
 
-#: dirmngr/dirmngr.c:609 tools/gpgconf.c:667 tools/gpgconf.c:702
-#: tools/gpgconf.c:802
+#: dirmngr/dirmngr.c:617 tools/gpgconf.c:701 tools/gpgconf.c:736
+#: tools/gpgconf.c:836
 #, c-format
 msgid "usage: %s [options] "
 msgstr "使�方: %s [オプション] "
 
-#: dirmngr/dirmngr.c:1260
+#: dirmngr/dirmngr.c:1299
 #, c-format
 msgid "colons are not allowed in the socket name\n"
 msgstr "コロン�ソケット��許�れ��ん\n"
 
-#: dirmngr/dirmngr.c:1495 dirmngr/server.c:1824
+#: dirmngr/dirmngr.c:1534 dirmngr/server.c:1878
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "'%s'�らCRL��得�失敗: %s\n"
 
-#: dirmngr/dirmngr.c:1501 dirmngr/server.c:1830
+#: dirmngr/dirmngr.c:1540 dirmngr/server.c:1884
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "'%s'�らCRL�処��失敗: %s\n"
 
-#: dirmngr/dirmngr.c:1643
+#: dirmngr/dirmngr.c:1682
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: 行�長���� - スキップ�れ���\n"
 
-#: dirmngr/dirmngr.c:1698 dirmngr/dirmngr.c:1782
+#: dirmngr/dirmngr.c:1737 dirmngr/dirmngr.c:1821
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: 無効�フィンガープリント�検出�れ���\n"
 
-#: dirmngr/dirmngr.c:1734 dirmngr/dirmngr.c:1760 tools/gpgconf-comp.c:3539
+#: dirmngr/dirmngr.c:1773 dirmngr/dirmngr.c:1799 tools/gpgconf-comp.c:3549
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: 読�込�エラー: %s\n"
 
-#: dirmngr/dirmngr.c:1789
+#: dirmngr/dirmngr.c:1828
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr "%s:%u: 行末�ゴミを無視\n"
 
-#: dirmngr/dirmngr.c:1876
+#: dirmngr/dirmngr.c:1915
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr "SIGHUPを���り - 設定を読�直��キャッシュをフラッシュ\n"
 
-#: dirmngr/dirmngr.c:1917
+#: dirmngr/dirmngr.c:1956
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "SIGUSR2を���り - 動作�定義�れ��\n"
 
-#: dirmngr/dirmngr.c:1922
+#: dirmngr/dirmngr.c:1961
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "SIGTERMを���り - シャットダウン...\n"
 
-#: dirmngr/dirmngr.c:1924
+#: dirmngr/dirmngr.c:1963
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "SIGTERMを���り - %d本�アクティブ�接続����り��\n"
 
-#: dirmngr/dirmngr.c:1929
+#: dirmngr/dirmngr.c:1968
 #, c-format
 msgid "shutdown forced\n"
 msgstr "強制的�シャットダウン�る\n"
 
-#: dirmngr/dirmngr.c:1937
+#: dirmngr/dirmngr.c:1976
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "SIGINTを���り - ���シャットダウン\n"
 
-#: dirmngr/dirmngr.c:1944
+#: dirmngr/dirmngr.c:1983
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "シグナル%dを���り - アクション�定義�れ��\n"
 
-#: dirmngr/dirmngr_ldap.c:105
-msgid "return all values in a record oriented format"
-msgstr "レコード形������値を返�"
-
-#: dirmngr/dirmngr_ldap.c:108
-msgid "|NAME|ignore host part and connect through NAME"
-msgstr "|NAME|host部分を無視��NAMEを����接続�る"
-
-#: dirmngr/dirmngr_ldap.c:109
-msgid "force a TLS connection"
-msgstr "TLS接続を強制�る"
-
-#: dirmngr/dirmngr_ldap.c:110
-msgid "|NAME|connect to host NAME"
-msgstr "|NAME|ホストNAME�接続�る"
-
-#: dirmngr/dirmngr_ldap.c:111
-msgid "|N|connect to port N"
-msgstr "|N|�ートN�接続���"
-
-#: dirmngr/dirmngr_ldap.c:112
-msgid "|NAME|use user NAME for authentication"
-msgstr "|NAME|ユーザNAMEを�証�使�"
-
-#: dirmngr/dirmngr_ldap.c:113
-msgid "|PASS|use password PASS for authentication"
-msgstr "|PASS|パスワードPASSを�証�使�"
-
-#: dirmngr/dirmngr_ldap.c:115
-msgid "take password from $DIRMNGR_LDAP_PASS"
-msgstr "パスワードを$DIRMNGR_LDAP_PASS�ら����る"
-
-#: dirmngr/dirmngr_ldap.c:116
-msgid "|STRING|query DN STRING"
-msgstr "|STRING|DN STRINGをクエリ�る"
-
-#: dirmngr/dirmngr_ldap.c:117
-msgid "|STRING|use STRING as filter expression"
-msgstr "|STRING|STRINGをフィルタ��使�"
-
-#: dirmngr/dirmngr_ldap.c:118
-msgid "|STRING|return the attribute STRING"
-msgstr "|STRING|STRING�属性を返�"
-
-#: dirmngr/dirmngr_ldap.c:179
-msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
-msgstr "使�方: dirmngr_ldap [オプション] [URL] (ヘルプ� -h)\n"
-
-#: dirmngr/dirmngr_ldap.c:182
-msgid ""
-"Syntax: dirmngr_ldap [options] [URL]\n"
-"Internal LDAP helper for Dirmngr\n"
-"Interface and options may change without notice\n"
-msgstr ""
-"形�: dirmngr_ldap [オプション] [URL]\n"
-"Dirmngr�内部LDAPヘルパー\n"
-"インタフェース�オプション�事��通知��変更�れる����り��\n"
-
-#: dirmngr/dirmngr_ldap.c:291
-#, c-format
-msgid "invalid port number %d\n"
-msgstr "無効��ート番� %d\n"
-
-#: dirmngr/dirmngr_ldap.c:400
-#, c-format
-msgid "scanning result for attribute '%s'\n"
-msgstr "属性'%s'�スキャン�果\n"
-
-#: dirmngr/dirmngr_ldap.c:407 dirmngr/dirmngr_ldap.c:490
-#: dirmngr/dirmngr_ldap.c:514 dirmngr/dirmngr_ldap.c:526
-#: dirmngr/dirmngr_ldap.c:722
-#, c-format
-msgid "error writing to stdout: %s\n"
-msgstr "stdout��書�込�エラー: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:424
-#, c-format
-msgid "          available attribute '%s'\n"
-msgstr "          利用�能�属性'%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:462
-#, c-format
-msgid "attribute '%s' not found\n"
-msgstr "属性'%s'�見��り��ん\n"
-
-#: dirmngr/dirmngr_ldap.c:469
-#, c-format
-msgid "found attribute '%s'\n"
-msgstr "属性'%s'�見��り���\n"
-
-#: dirmngr/dirmngr_ldap.c:581
-#, c-format
-msgid "processing url '%s'\n"
-msgstr "url'%s'を処�\n"
-
-#: dirmngr/dirmngr_ldap.c:588
-#, c-format
-msgid "          user '%s'\n"
-msgstr "        ユーザ '%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:590
-#, c-format
-msgid "          pass '%s'\n"
-msgstr "                パスワード '%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:592
-#, c-format
-msgid "          host '%s'\n"
-msgstr "        ホスト '%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:593
-#, c-format
-msgid "          port %d\n"
-msgstr "        �ート %d\n"
-
-#: dirmngr/dirmngr_ldap.c:595
-#, c-format
-msgid "            DN '%s'\n"
-msgstr "                DN '%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:597
-#, c-format
-msgid "        filter '%s'\n"
-msgstr "        フィルタ '%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:602 dirmngr/dirmngr_ldap.c:605
-#, c-format
-msgid "          attr '%s'\n"
-msgstr "         属性 '%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:611
-#, c-format
-msgid "no host name in '%s'\n"
-msgstr "'%s'�ホスト���り��ん\n"
-
-#: dirmngr/dirmngr_ldap.c:616
-#, c-format
-msgid "no attribute given for query '%s'\n"
-msgstr "クエリ '%s' �属性�指定�れ����ん\n"
-
-#: dirmngr/dirmngr_ldap.c:622
-#, c-format
-msgid "WARNING: using first attribute only\n"
-msgstr "*警告*: 最��属性��を使�����\n"
-
-#: dirmngr/dirmngr_ldap.c:637 dirmngr/dirmngr_ldap.c:678
-#, c-format
-msgid "LDAP init to '%s:%d' failed: %s\n"
-msgstr "'%s:%d'�LDAP�期化�失敗: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:659
-#, c-format
-msgid "LDAP init to '%s' failed: %s\n"
-msgstr "LDAP '%s' ���期化�失敗: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:665
-#, c-format
-msgid "LDAP init to '%s' done\n"
-msgstr "LDAP '%s' ���期化���れ���\n"
-
-#: dirmngr/dirmngr_ldap.c:704
-#, c-format
-msgid "binding to '%s:%d' failed: %s\n"
-msgstr "'%s:%d'��インド�失敗: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:728
-#, c-format
-msgid "searching '%s' failed: %s\n"
-msgstr "'%s'�探索�失敗����: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:759
-#, c-format
-msgid "'%s' is not an LDAP URL\n"
-msgstr "'%s'��LDAP URL���り��ん\n"
-
-#: dirmngr/dirmngr_ldap.c:765
-#, c-format
-msgid "'%s' is an invalid LDAP URL\n"
-msgstr "'%s' �無効�LDAP URL��\n"
-
-#: dirmngr/http.c:1989 dirmngr/ocsp.c:255
+#: dirmngr/http.c:1998 dirmngr/ocsp.c:255
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "'%s'�アクセス�エラー: httpステイタス %u\n"
 
-#: dirmngr/http.c:3630 dirmngr/ocsp.c:229
+#: dirmngr/http.c:3652 dirmngr/ocsp.c:229
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr "URL'%s' � '%s' (%u) �リダイレクト�れ���\n"
 
-#: dirmngr/http.c:3636 dirmngr/ocsp.c:246
+#: dirmngr/http.c:3658 dirmngr/ocsp.c:246
 #, c-format
 msgid "too many redirections\n"
 msgstr "リダイレクト�多����\n"
 
-#: dirmngr/http.c:3748
+#: dirmngr/http.c:3768
 #, c-format
 msgid "redirection changed to '%s'\n"
 msgstr "リダイレクト�'%s'�変更�れ���\n"
@@ -10512,31 +10322,51 @@ msgstr "ldap wrapper %d�待��失敗: %s\n"
 msgid "ldap wrapper %d stalled - killing\n"
 msgstr "ldap wrapper %d �止�り��� - kill�����\n"
 
-#: dirmngr/ldap.c:91
+#: dirmngr/ldap.c:92
 #, c-format
 msgid "invalid char 0x%02x in host name - not added\n"
 msgstr "ホスト��無効�文字 0x%02x - 加���ん\n"
 
-#: dirmngr/ldap.c:95
+#: dirmngr/ldap.c:96
 #, c-format
 msgid "adding '%s:%d' to the ldap server list\n"
 msgstr "'%s:%d'をLDAPサー�・リスト�追加\n"
 
-#: dirmngr/ldap.c:98 dirmngr/misc.c:512
+#: dirmngr/ldap.c:99 dirmngr/misc.c:512
 #, c-format
 msgid "malloc failed: %s\n"
 msgstr "malloc�失敗����: %s\n"
 
-#: dirmngr/ldap.c:634
+#: dirmngr/ldap.c:221
 #, c-format
-msgid "start_cert_fetch: invalid pattern '%s'\n"
-msgstr "start_cert_fetch: 無効�パターン '%s'\n"
+msgid "'%s' is not an LDAP URL\n"
+msgstr "'%s'��LDAP URL���り��ん\n"
 
-#: dirmngr/ldap.c:846
+#: dirmngr/ldap.c:227 dirmngr/ldap.c:233
+#, c-format
+msgid "'%s' is an invalid LDAP URL\n"
+msgstr "'%s' �無効�LDAP URL��\n"
+
+#: dirmngr/ldap.c:968
 #, c-format
 msgid "ldap_search hit the size limit of the server\n"
 msgstr "ldap_search �サー��サイズ�界を越����\n"
 
+#: dirmngr/ldapserver.c:119
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr "%s:%u: ユーザ���与�られ�パスワード\n"
+
+#: dirmngr/ldapserver.c:181
+#, c-format
+msgid "%s:%u: ignoring unknown flag '%s'\n"
+msgstr "%s:%u: 未知�フラグ '%s' を無視���\n"
+
+#: dirmngr/ldapserver.c:203
+#, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr "%s:%u: ��行�スキップ\n"
+
 #: dirmngr/misc.c:172
 #, c-format
 msgid "invalid canonical S-expression found\n"
@@ -10627,86 +10457,86 @@ msgstr "デフォルトOCSP署�者�証明�署��れ����ん"
 msgid "allocating list item failed: %s\n"
 msgstr "リスト項目�確��失敗����: %s\n"
 
-#: dirmngr/ocsp.c:537 dirmngr/ocsp.c:724
+#: dirmngr/ocsp.c:538 dirmngr/ocsp.c:725
 #, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "応答ID��得エラー: %s\n"
 
-#: dirmngr/ocsp.c:584
+#: dirmngr/ocsp.c:585
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr "OCSP応答を検証�る�切�証明書��り��ん���\n"
 
-#: dirmngr/ocsp.c:623 dirmngr/validate.c:648
+#: dirmngr/ocsp.c:624 dirmngr/validate.c:648
 #, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "発行者証明書�見��り��ん: %s\n"
 
-#: dirmngr/ocsp.c:633
+#: dirmngr/ocsp.c:634
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr "呼出��対象�証明書を返���ん���\n"
 
-#: dirmngr/ocsp.c:640
+#: dirmngr/ocsp.c:641
 #, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "呼出��発行�れる証明書を返���ん���\n"
 
-#: dirmngr/ocsp.c:650
+#: dirmngr/ocsp.c:651
 #, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "OCSPコンテクスト�確��失敗����: %s\n"
 
-#: dirmngr/ocsp.c:689
+#: dirmngr/ocsp.c:690
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr "デフォルトOCSPレス�ンダ�定義�れ����ん\n"
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:696
 #, c-format
 msgid "no default OCSP signer defined\n"
 msgstr "デフォルト�OCSP署�者�定義�れ����ん\n"
 
-#: dirmngr/ocsp.c:702
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr "デフォルトOCSP応答'%s'を使���\n"
 
-#: dirmngr/ocsp.c:707
+#: dirmngr/ocsp.c:708
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "OCSP応答'%s'を使���\n"
 
-#: dirmngr/ocsp.c:764
+#: dirmngr/ocsp.c:765
 #, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "対象�証明書�OCSPステイタス��得エラー: %s\n"
 
-#: dirmngr/ocsp.c:789
+#: dirmngr/ocsp.c:790
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr "証明書ステイタス�: %s (�れ=%s 次=%s)\n"
 
-#: dirmngr/ocsp.c:790
+#: dirmngr/ocsp.c:791
 msgid "good"
 msgstr "良好"
 
-#: dirmngr/ocsp.c:796
+#: dirmngr/ocsp.c:797
 #, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "証明書�失効済���: %s (�由: %s)\n"
 
-#: dirmngr/ocsp.c:831
+#: dirmngr/ocsp.c:832
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr "OSCPレス�ンダ�未��ステイタスを返����\n"
 
-#: dirmngr/ocsp.c:843
+#: dirmngr/ocsp.c:844
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr "OSCPレス�ンダ��在���ステイタスを返����\n"
 
-#: dirmngr/ocsp.c:858
+#: dirmngr/ocsp.c:859
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr "OSCPレス�ンダ����るステイタスを返����\n"
@@ -10716,71 +10546,67 @@ msgstr "OSCPレス�ンダ����るステイタスを返����\n"
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "assuan_inquire(%s)�失敗����: %s\n"
 
-#: dirmngr/server.c:1158
-msgid "ldapserver missing"
-msgstr "ldapserver��り��ん"
-
-#: dirmngr/server.c:1224
+#: dirmngr/server.c:1277
 msgid "serialno missing in cert ID"
 msgstr "serialno�cert ID��り��ん"
 
-#: dirmngr/server.c:1387 dirmngr/server.c:1473 dirmngr/server.c:1909
-#: dirmngr/server.c:1980 dirmngr/server.c:2556 dirmngr/server.c:2571
+#: dirmngr/server.c:1440 dirmngr/server.c:1526 dirmngr/server.c:1963
+#: dirmngr/server.c:2034 dirmngr/server.c:2662 dirmngr/server.c:2677
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "assuan_inquire�失敗����: %s\n"
 
-#: dirmngr/server.c:1516
+#: dirmngr/server.c:1569
 #, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "fetch_cert_by_url �失敗����: %s\n"
 
-#: dirmngr/server.c:1528 dirmngr/server.c:1559 dirmngr/server.c:1718
+#: dirmngr/server.c:1581 dirmngr/server.c:1612 dirmngr/server.c:1772
 #, c-format
 msgid "error sending data: %s\n"
 msgstr "データ�信エラー: %s\n"
 
-#: dirmngr/server.c:1666
+#: dirmngr/server.c:1720
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "start_cert_fetch �失敗����: %s\n"
 
-#: dirmngr/server.c:1699
+#: dirmngr/server.c:1753
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "fetch_next_cert �失敗����: %s\n"
 
-#: dirmngr/server.c:1726
+#: dirmngr/server.c:1780
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr "max_replies %d を越����\n"
 
-#: dirmngr/server.c:2860
+#: dirmngr/server.c:2966
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "制御構造を確�����ん: %s\n"
 
-#: dirmngr/server.c:2871
+#: dirmngr/server.c:2977
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "assuanコンテクスト�確��失敗����: %s\n"
 
-#: dirmngr/server.c:2892
+#: dirmngr/server.c:2998
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "サー���期化�失敗����: %s\n"
 
-#: dirmngr/server.c:2900
+#: dirmngr/server.c:3006
 #, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "Assuan�登録コマンド�失敗����: %s\n"
 
-#: dirmngr/server.c:2933
+#: dirmngr/server.c:3039
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "Assuan accept ��題: %s\n"
 
-#: dirmngr/server.c:2952
+#: dirmngr/server.c:3058
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "Assuan�処��失敗����: %s\n"
@@ -10925,67 +10751,67 @@ msgstr "��セッション�keyboxデーモン�実行�れ����ん
 msgid "error sending standard options: %s\n"
 msgstr "標準オプションを�信エラー: %s\n"
 
-#: tools/gpgconf-comp.c:649
+#: tools/gpgconf-comp.c:655
 msgid "OpenPGP"
 msgstr "OpenPGP"
 
-#: tools/gpgconf-comp.c:653
+#: tools/gpgconf-comp.c:659
 msgid "S/MIME"
 msgstr "S/MIME"
 
-#: tools/gpgconf-comp.c:657
+#: tools/gpgconf-comp.c:663
 msgid "Public Keys"
 msgstr "公開�"
 
-#: tools/gpgconf-comp.c:661
+#: tools/gpgconf-comp.c:667
 msgid "Private Keys"
 msgstr "プライベート�"
 
-#: tools/gpgconf-comp.c:665
+#: tools/gpgconf-comp.c:671
 msgid "Smartcards"
 msgstr "スマートカード"
 
-#: tools/gpgconf-comp.c:669
+#: tools/gpgconf-comp.c:676
 msgid "TPM"
 msgstr "TPM"
 
-#: tools/gpgconf-comp.c:673
+#: tools/gpgconf-comp.c:681
 msgid "Network"
 msgstr "�ットワーク"
 
-#: tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:685
 msgid "Passphrase Entry"
 msgstr "パスフレーズ入力"
 
-#: tools/gpgconf-comp.c:941
+#: tools/gpgconf-comp.c:951
 msgid "Component not suitable for launching"
 msgstr "コン�ー�ント�起動�る����切���り��ん"
 
-#: tools/gpgconf-comp.c:947
+#: tools/gpgconf-comp.c:957
 #, c-format
 msgid "Configuration file of component %s is broken\n"
 msgstr "コン�ー�ント%s�コンフィグレーション・ファイル�壊れ����\n"
 
-#: tools/gpgconf-comp.c:950
+#: tools/gpgconf-comp.c:960
 #, c-format
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr "注�: \"%s%s\"コマンドを使��詳細を得�����。\n"
 
-#: tools/gpgconf-comp.c:2816
+#: tools/gpgconf-comp.c:2826
 #, c-format
 msgid "External verification of component %s failed"
 msgstr "コン�ー�ント%s�外部�検証�失敗����"
 
-#: tools/gpgconf-comp.c:2946
+#: tools/gpgconf-comp.c:2956
 msgid "Note that group specifications are ignored\n"
 msgstr "グループ仕様�無視�れ��る���注�������\n"
 
-#: tools/gpgconf-comp.c:3543
+#: tools/gpgconf-comp.c:3553
 #, c-format
 msgid "error closing '%s'\n"
 msgstr "'%s'�クローズ�エラー\n"
 
-#: tools/gpgconf-comp.c:3545
+#: tools/gpgconf-comp.c:3555
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr "'%s'�パーズ�エラー\n"
@@ -11066,15 +10892,15 @@ msgstr ""
 "形�: @GPGCONF@ [オプション]\n"
 "@GNUPG@システム�ツール�対�コンフィグレーション・オプションを管��る\n"
 
-#: tools/gpgconf.c:669 tools/gpgconf.c:704
+#: tools/gpgconf.c:703 tools/gpgconf.c:738
 msgid "Need one component argument"
 msgstr "一�コン�ー�ント引数�必���"
 
-#: tools/gpgconf.c:678 tools/gpgconf.c:728 tools/gpgconf.c:778
+#: tools/gpgconf.c:712 tools/gpgconf.c:762 tools/gpgconf.c:812
 msgid "Component not found"
 msgstr "コン�ー�ント�見��り��ん"
 
-#: tools/gpgconf.c:804
+#: tools/gpgconf.c:838
 msgid "No argument allowed"
 msgstr "引数�許��れ����ん"
 
@@ -11090,34 +10916,34 @@ msgstr ""
 "形�: gpg-check-pattern [オプション] パターンファイル\n"
 "パターンファイル�対��標準入力�パスフレーズを確��る\n"
 
-#: tools/gpg-card.c:2390
+#: tools/gpg-card.c:2407
 #, c-format
 msgid "Note: key %s is already stored on the card!\n"
 msgstr "注�: � %s �も�カード��管���り��!\n"
 
-#: tools/gpg-card.c:2393
+#: tools/gpg-card.c:2410
 #, c-format
 msgid "Note: Keys are already stored on the card!\n"
 msgstr "注�: ��も�カード��管���り��!\n"
 
-#: tools/gpg-card.c:2396
+#: tools/gpg-card.c:2413
 #, c-format
 msgid "Replace existing key %s ? (y/N) "
 msgstr "既存�� %s を置������? (y/N) "
 
-#: tools/gpg-card.c:2549 tools/gpg-card.c:2712 tools/gpg-card.c:2935
-#: tools/gpg-card.c:3044
+#: tools/gpg-card.c:2566 tools/gpg-card.c:2729 tools/gpg-card.c:2952
+#: tools/gpg-card.c:3061
 #, c-format
 msgid "%s card no. %s detected\n"
 msgstr "%s カードno. %sを検出\n"
 
-#: tools/gpg-card.c:3396
+#: tools/gpg-card.c:3413
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 "ユーザインタラクションフラグ�\"%s\"�設定�れ���� - 変更����ん\n"
 
-#: tools/gpg-card.c:3406 tools/gpg-card.c:3420
+#: tools/gpg-card.c:3423 tools/gpg-card.c:3437
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
@@ -11126,47 +10952,173 @@ msgstr ""
 "警告: ユーザインタラクションフラグを\"%s\"�戻���\n"
 "      ファクトリリセット���り��ん!\n"
 
-#: tools/gpg-card.c:3423
+#: tools/gpg-card.c:3440
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr "\"uif --yes %d %s\"を使������\n"
 
-#: tools/gpg-card.c:3669
+#: tools/gpg-card.c:3686
 msgid "authenticate to the card"
 msgstr "カード�対���証���"
 
-#: tools/gpg-card.c:3671
+#: tools/gpg-card.c:3688
 msgid "send a reset to the card daemon"
 msgstr "カードデーモン�リセットを�信�る"
 
-#: tools/gpg-card.c:3673
+#: tools/gpg-card.c:3690
 msgid "setup KDF for PIN authentication"
 msgstr "PIN�証�KDFを設定�る"
 
-#: tools/gpg-card.c:3675
+#: tools/gpg-card.c:3692
 msgid "change a private data object"
 msgstr "プライベート使用�データオブジェクトを変更�る"
 
-#: tools/gpg-card.c:3676
+#: tools/gpg-card.c:3693
 msgid "read a certificate from a data object"
 msgstr "データオブジェクト�ら証明書を読�出���"
 
-#: tools/gpg-card.c:3677
+#: tools/gpg-card.c:3694
 msgid "store a certificate to a data object"
 msgstr "証明書をデータオブジェクト��管���"
 
-#: tools/gpg-card.c:3678
+#: tools/gpg-card.c:3695
 msgid "store a private key to a data object"
 msgstr "プライベート�をデータオブジェクト��管�る"
 
-#: tools/gpg-card.c:3679
+#: tools/gpg-card.c:3696
 msgid "Yubikey management commands"
 msgstr "Yubikey管�コマンド"
 
-#: tools/gpg-card.c:3681
+#: tools/gpg-card.c:3698
 msgid "manage the command history"
 msgstr "コマンド履歴を管��る"
 
+#~ msgid "requesting key %s from %s server %s\n"
+#~ msgstr "�%sを%s�らサー�%s��求\n"
+
+#~ msgid "%s:%u: no hostname given\n"
+#~ msgstr "%s:%u: ホスト��指定�れ����ん\n"
+
+#~ msgid "could not parse keyserver\n"
+#~ msgstr "�サー��URLを解��能\n"
+
+#~ msgid "return all values in a record oriented format"
+#~ msgstr "レコード形������値を返�"
+
+#~ msgid "|NAME|ignore host part and connect through NAME"
+#~ msgstr "|NAME|host部分を無視��NAMEを����接続�る"
+
+#~ msgid "force a TLS connection"
+#~ msgstr "TLS接続を強制�る"
+
+#~ msgid "|NAME|connect to host NAME"
+#~ msgstr "|NAME|ホストNAME�接続�る"
+
+#~ msgid "|N|connect to port N"
+#~ msgstr "|N|�ートN�接続���"
+
+#~ msgid "|NAME|use user NAME for authentication"
+#~ msgstr "|NAME|ユーザNAMEを�証�使�"
+
+#~ msgid "|PASS|use password PASS for authentication"
+#~ msgstr "|PASS|パスワードPASSを�証�使�"
+
+#~ msgid "take password from $DIRMNGR_LDAP_PASS"
+#~ msgstr "パスワードを$DIRMNGR_LDAP_PASS�ら����る"
+
+#~ msgid "|STRING|query DN STRING"
+#~ msgstr "|STRING|DN STRINGをクエリ�る"
+
+#~ msgid "|STRING|use STRING as filter expression"
+#~ msgstr "|STRING|STRINGをフィルタ��使�"
+
+#~ msgid "|STRING|return the attribute STRING"
+#~ msgstr "|STRING|STRING�属性を返�"
+
+#~ msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
+#~ msgstr "使�方: dirmngr_ldap [オプション] [URL] (ヘルプ� -h)\n"
+
+#~ msgid ""
+#~ "Syntax: dirmngr_ldap [options] [URL]\n"
+#~ "Internal LDAP helper for Dirmngr\n"
+#~ "Interface and options may change without notice\n"
+#~ msgstr ""
+#~ "形�: dirmngr_ldap [オプション] [URL]\n"
+#~ "Dirmngr�内部LDAPヘルパー\n"
+#~ "インタフェース�オプション�事��通知��変更�れる����り��\n"
+
+#~ msgid "invalid port number %d\n"
+#~ msgstr "無効��ート番� %d\n"
+
+#~ msgid "scanning result for attribute '%s'\n"
+#~ msgstr "属性'%s'�スキャン�果\n"
+
+#~ msgid "error writing to stdout: %s\n"
+#~ msgstr "stdout��書�込�エラー: %s\n"
+
+#~ msgid "          available attribute '%s'\n"
+#~ msgstr "          利用�能�属性'%s'\n"
+
+#~ msgid "attribute '%s' not found\n"
+#~ msgstr "属性'%s'�見��り��ん\n"
+
+#~ msgid "found attribute '%s'\n"
+#~ msgstr "属性'%s'�見��り���\n"
+
+#~ msgid "processing url '%s'\n"
+#~ msgstr "url'%s'を処�\n"
+
+#~ msgid "          user '%s'\n"
+#~ msgstr "        ユーザ '%s'\n"
+
+#~ msgid "          pass '%s'\n"
+#~ msgstr "                パスワード '%s'\n"
+
+#~ msgid "          host '%s'\n"
+#~ msgstr "        ホスト '%s'\n"
+
+#~ msgid "          port %d\n"
+#~ msgstr "        �ート %d\n"
+
+#~ msgid "            DN '%s'\n"
+#~ msgstr "                DN '%s'\n"
+
+#~ msgid "        filter '%s'\n"
+#~ msgstr "        フィルタ '%s'\n"
+
+#~ msgid "          attr '%s'\n"
+#~ msgstr "         属性 '%s'\n"
+
+#~ msgid "no host name in '%s'\n"
+#~ msgstr "'%s'�ホスト���り��ん\n"
+
+#~ msgid "no attribute given for query '%s'\n"
+#~ msgstr "クエリ '%s' �属性�指定�れ����ん\n"
+
+#~ msgid "WARNING: using first attribute only\n"
+#~ msgstr "*警告*: 最��属性��を使�����\n"
+
+#~ msgid "LDAP init to '%s:%d' failed: %s\n"
+#~ msgstr "'%s:%d'�LDAP�期化�失敗: %s\n"
+
+#~ msgid "LDAP init to '%s' failed: %s\n"
+#~ msgstr "LDAP '%s' ���期化�失敗: %s\n"
+
+#~ msgid "LDAP init to '%s' done\n"
+#~ msgstr "LDAP '%s' ���期化���れ���\n"
+
+#~ msgid "binding to '%s:%d' failed: %s\n"
+#~ msgstr "'%s:%d'��インド�失敗: %s\n"
+
+#~ msgid "searching '%s' failed: %s\n"
+#~ msgstr "'%s'�探索�失敗����: %s\n"
+
+#~ msgid "start_cert_fetch: invalid pattern '%s'\n"
+#~ msgstr "start_cert_fetch: 無効�パターン '%s'\n"
+
+#~ msgid "ldapserver missing"
+#~ msgstr "ldapserver��り��ん"
+
 #~ msgid "detected card with S/N: %s\n"
 #~ msgstr "カードを検出����。シリアル番�: %s\n"
 
diff --git a/po/nb.gmo b/po/nb.gmo
index b6e0d75..8037704 100644
--- a/po/nb.gmo
+++ b/po/nb.gmo
diff --git a/po/nb.po b/po/nb.po
index 15574ad..da91c0f 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: 2021-04-20 12:38+0200\n"
+"POT-Creation-Date: 2021-08-24 18:50+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:328
+#: agent/call-pinentry.c:338
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "klarte ikke å skaffe pin-inntastingslås: %s\n"
@@ -34,45 +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:546
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_OK"
 msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:547
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_Cancel"
 msgstr "|pinentry-label|_Avbryt"
 
-#: agent/call-pinentry.c:548
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|_Yes"
 msgstr "|pinentry-label|_Ja"
 
-#: agent/call-pinentry.c:549
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_No"
 msgstr "|pinentry-label|_Nei"
 
-#: agent/call-pinentry.c:550
+#: agent/call-pinentry.c:560
 msgid "|pinentry-label|PIN:"
 msgstr "|pinentry-label|PIN:"
 
-#: agent/call-pinentry.c:551
+#: agent/call-pinentry.c:561
 msgid "|pinentry-label|_Save in password manager"
 msgstr "|pinentry-label|_Lagre i passordbehandler"
 
-#: agent/call-pinentry.c:552
+#: agent/call-pinentry.c:562
 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:554
+#: agent/call-pinentry.c:564
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr "|pinentry-tt|Gjør passordfrase synlig"
 
-#: agent/call-pinentry.c:555
+#: agent/call-pinentry.c:565
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "|pinentry-tt|Skjul passordfrase"
 
+#: agent/call-pinentry.c:566
+msgid "Caps Lock is on"
+msgstr ""
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:944
+#: agent/call-pinentry.c:1022
 msgid "Suggest"
 msgstr ""
 
@@ -83,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:966
+#: agent/call-pinentry.c:1044
 #, fuzzy
 #| msgid "pinentry.qualitybar.tooltip"
 msgid "pinentry.genpin.tooltip"
@@ -91,9 +95,22 @@ msgstr ""
 "Kvaliteten på teksten overfor. Spør administrator for mer informasjon om "
 "hvordan kvaliteten vurderes."
 
+#: agent/call-pinentry.c:1072
+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
+#, fuzzy
+#| msgid "Passphrase too long"
+msgid "Passphrase Not Allowed"
+msgstr "For lang passordfrase"
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:998
+#: agent/call-pinentry.c:1198
 msgid "Quality:"
 msgstr "Kvalitet:"
 
@@ -103,20 +120,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:1019
+#: agent/call-pinentry.c:1219
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 "Kvaliteten på teksten overfor. Spør administrator for mer informasjon om "
 "hvordan kvaliteten vurderes."
 
-#: agent/call-pinentry.c:1263
+#: agent/call-pinentry.c:1477
 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:1266
+#: agent/call-pinentry.c:1480
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -124,76 +141,76 @@ msgstr ""
 "Skriv inn passordfrasen din, slik at hemmelig nøkkel kan låses opp for "
 "gjeldende økt"
 
-#: agent/call-pinentry.c:1303 agent/call-pinentry.c:1506
+#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
 msgid "PIN:"
 msgstr "PIN:"
 
-#: agent/call-pinentry.c:1303 agent/call-pinentry.c:1506
-#: agent/protect-tool.c:728
+#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/protect-tool.c:729
 msgid "Passphrase:"
 msgstr "Passordfrase:"
 
-#: agent/call-pinentry.c:1330 agent/call-pinentry.c:1580 agent/command.c:1799
-#: agent/command.c:1852 agent/command-ssh.c:3046 agent/genkey.c:398
+#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
+#: agent/command.c:1988 agent/command-ssh.c:3046 agent/genkey.c:442
 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:1351 agent/call-pinentry.c:1603
+#: agent/call-pinentry.c:1566 agent/call-pinentry.c:1830
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (forsøk %d av %d)"
 
-#: agent/call-pinentry.c:1362 agent/call-pinentry.c:1614
+#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
 msgid "Repeat:"
 msgstr "Gjenta:"
 
-#: agent/call-pinentry.c:1372 agent/call-pinentry.c:1384
-#: agent/call-pinentry.c:1624 agent/call-pinentry.c:1636
+#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
+#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
 msgid "PIN too long"
 msgstr "For lang PIN"
 
-#: agent/call-pinentry.c:1373 agent/call-pinentry.c:1625
+#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
 msgid "Passphrase too long"
 msgstr "For lang passordfrase"
 
-#: agent/call-pinentry.c:1381 agent/call-pinentry.c:1633
+#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
 msgid "Invalid characters in PIN"
 msgstr "Ugyldig tegn i PIN"
 
-#: agent/call-pinentry.c:1386 agent/call-pinentry.c:1638
+#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
 msgid "PIN too short"
 msgstr "Koden er for kort"
 
-#: agent/call-pinentry.c:1405 agent/call-pinentry.c:1656
+#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
 msgid "Bad PIN"
 msgstr "Ugyldig PIN"
 
-#: agent/call-pinentry.c:1405 agent/call-pinentry.c:1656
+#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
 msgid "Bad Passphrase"
 msgstr "Ugyldig passordfrase"
 
-#: agent/command.c:697
+#: agent/command.c:823
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:698
+#: agent/command.c:824
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1106 g10/card-util.c:708 g10/card-util.c:729
+#: agent/command.c:1235 g10/card-util.c:713 g10/card-util.c:734
 #, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "feil under henting av kort-serienummer: %s\n"
 
-#: agent/command.c:1634 agent/command.c:1791 agent/command-ssh.c:2974
-#: agent/genkey.c:333
+#: agent/command.c:1756 agent/command.c:1921 agent/command-ssh.c:2974
+#: agent/genkey.c:377
 msgid "Please re-enter this passphrase"
 msgstr "Skriv inn denne passordfrasen på nytt"
 
-#: agent/command.c:2567
+#: agent/command.c:2703
 #, fuzzy, c-format
 #| msgid ""
 #| "Please enter the passphrase to protect the imported object within the "
@@ -204,7 +221,7 @@ msgid ""
 msgstr ""
 "Skriv inn passordfrase for å låse nytt importert objekt i GnuPG-systemet."
 
-#: agent/command.c:2697
+#: agent/command.c:2833
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -215,25 +232,25 @@ msgstr ""
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ssh-nøkler som er lenger enn %d bit støttes ikke\n"
 
-#: agent/command-ssh.c:872 common/dotlock.c:852 g10/card-util.c:953
-#: g10/export.c:1329 g10/gpg.c:1431 g10/keygen.c:5347 g10/keyring.c:1319
-#: g10/keyring.c:1632 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
+#: agent/command-ssh.c:872 common/dotlock.c:852 g10/card-util.c:963
+#: g10/export.c:1329 g10/gpg.c:1431 g10/keygen.c:5377 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
 #: g10/sign.c:1106 g10/sign.c:1443 g10/tdbio.c:753 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:884 common/helpfile.c:57 g10/card-util.c:910
+#: agent/command-ssh.c:884 common/helpfile.c:57 g10/card-util.c:920
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
 #: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:721 g10/gpg.c:1432
-#: g10/import.c:371 g10/import.c:558 g10/import.c:793 g10/keygen.c:4322
-#: g10/keyring.c:1658 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
+#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4326
+#: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
 #: g10/plaintext.c:610 g10/sign.c:1086 g10/sign.c:1311 g10/sign.c:1424
 #: g10/sign.c:1596 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2380
-#: sm/gpgsm.c:2410 sm/gpgsm.c:2448 sm/keylist.c:1737 sm/qualified.c:65
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2236
+#: sm/gpgsm.c:2266 sm/gpgsm.c:2304 sm/keylist.c:1775 sm/qualified.c:65
 #: dirmngr/certcache.c:396 dirmngr/certcache.c:476 dirmngr/certcache.c:478
-#: dirmngr/crlcache.c:2588 dirmngr/dirmngr.c:1720 tools/gpg-card.c:408
+#: dirmngr/crlcache.c:2591 dirmngr/dirmngr.c:1759 tools/gpg-card.c:408
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "klarte ikke å åpne «%s»: %s\n"
@@ -341,28 +358,28 @@ msgstr "PIN ble ikke gjentatt korrekt. Prøv igjen"
 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:109 sm/certreqgen-ui.c:433
+#: 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:116
+#: 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
+#: agent/genkey.c:191
 msgid "Enter new passphrase"
 msgstr "Skriv inn ny passordfrase"
 
-#: agent/genkey.c:184
+#: agent/genkey.c:227
 #, 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:186
+#: agent/genkey.c:229
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -371,18 +388,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:198
+#: agent/genkey.c:241
 msgid "Yes, protection is not needed"
 msgstr "Ja, beskyttelse er unødvendig"
 
-#: agent/genkey.c:215
+#: agent/genkey.c:258
 #, 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:234
+#: agent/genkey.c:277
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -390,241 +407,240 @@ 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:260
+#: agent/genkey.c:304
 #, 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:275
+#: agent/genkey.c:319
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "Advarsel: du har skrevet inn en svak passordfrase."
 
-#: agent/genkey.c:296
+#: agent/genkey.c:340
 msgid "Take this one anyway"
 msgstr "Bruk denne likevel"
 
-#: agent/genkey.c:464
+#: agent/genkey.c:508
 #, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "Skriv inn passordfrase for å%0Abeskytte ny nøkkel"
 
-#: agent/genkey.c:590
+#: agent/genkey.c:637
 msgid "Please enter the new passphrase"
 msgstr "Skriv inn ny passordfrase"
 
-#: agent/gpg-agent.c:162 scd/scdaemon.c:115 dirmngr/dirmngr.c:182
+#: agent/gpg-agent.c:164 scd/scdaemon.c:115 dirmngr/dirmngr.c:183
 #, fuzzy
 #| msgid "Options useful for debugging"
 msgid "Options used for startup"
 msgstr "Nyttige feilsøkingsvalg"
 
-#: agent/gpg-agent.c:164 scd/scdaemon.c:120 dirmngr/dirmngr.c:171
+#: agent/gpg-agent.c:166 scd/scdaemon.c:120 dirmngr/dirmngr.c:172
 msgid "run in daemon mode (background)"
 msgstr "kjør som bakgrunnsprosess («daemon»)"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:117 dirmngr/dirmngr.c:170
+#: agent/gpg-agent.c:167 scd/scdaemon.c:117 dirmngr/dirmngr.c:171
 msgid "run in server mode (foreground)"
 msgstr "kjør i tjenermodus (forgrunn)"
 
-#: agent/gpg-agent.c:167 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:169 dirmngr/dirmngr.c:174
 msgid "run in supervised mode"
 msgstr "kjør i «supervised» modus"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:121 dirmngr/dirmngr.c:184
+#: agent/gpg-agent.c:171 scd/scdaemon.c:121 dirmngr/dirmngr.c:185
 msgid "do not detach from the console"
 msgstr "ikke løsne fra konsoll"
 
-#: agent/gpg-agent.c:170 scd/scdaemon.c:122 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:172 scd/scdaemon.c:122 dirmngr/dirmngr.c:186
 msgid "sh-style command output"
 msgstr "sh-utdata for kommandoer"
 
-#: agent/gpg-agent.c:171 scd/scdaemon.c:123 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:173 scd/scdaemon.c:123 dirmngr/dirmngr.c:187
 msgid "csh-style command output"
 msgstr "csh-utdata for kommandoer"
 
-#: agent/gpg-agent.c:179 g10/gpg.c:589 scd/scdaemon.c:125 sm/gpgsm.c:422
-#: dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:181 g10/gpg.c:589 scd/scdaemon.c:125 sm/gpgsm.c:423
+#: dirmngr/dirmngr.c:189
 msgid "|FILE|read options from FILE"
 msgstr "|FIL|les valg fra valgt FIL"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:574 scd/scdaemon.c:129 sm/gpgsm.c:265
-#: dirmngr/dirmngr.c:192
+#: agent/gpg-agent.c:185 g10/gpg.c:574 scd/scdaemon.c:129 sm/gpgsm.c:265
+#: dirmngr/dirmngr.c:193
 msgid "Options controlling the diagnostic output"
 msgstr "Styring av diagnostikk-utdata"
 
-#: agent/gpg-agent.c:185 g10/gpg.c:576 g10/gpgv.c:78 kbx/kbxutil.c:89
+#: agent/gpg-agent.c:187 g10/gpg.c:576 g10/gpgv.c:78 kbx/kbxutil.c:89
 #: scd/scdaemon.c:131 sm/gpgsm.c:267 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:194 dirmngr/dirmngr_ldap.c:102
-#: tools/gpg-connect-agent.c:85 tools/gpgconf.c:111
+#: dirmngr/dirmngr.c:195 tools/gpg-connect-agent.c:85 tools/gpgconf.c:111
 msgid "verbose"
 msgstr "detaljert utskrift"
 
-#: agent/gpg-agent.c:186 g10/gpg.c:578 g10/gpgv.c:79 kbx/kbxutil.c:90
+#: agent/gpg-agent.c:188 g10/gpg.c:578 g10/gpgv.c:79 kbx/kbxutil.c:90
 #: scd/scdaemon.c:132 sm/gpgsm.c:269 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:195 dirmngr/dirmngr_ldap.c:103
+#: dirmngr/dirmngr.c:196
 msgid "be somewhat more quiet"
 msgstr "være noenlunde stille"
 
-#: agent/gpg-agent.c:194 g10/gpg.c:593 sm/gpgsm.c:283 dirmngr/dirmngr.c:205
+#: agent/gpg-agent.c:196 g10/gpg.c:593 sm/gpgsm.c:283 dirmngr/dirmngr.c:206
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FIL|skriv tjenermodus-logger til valgt FIL"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 scd/scdaemon.c:146 sm/gpgsm.c:290
-#: dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:599 scd/scdaemon.c:146 sm/gpgsm.c:290
+#: dirmngr/dirmngr.c:210
 msgid "Options controlling the configuration"
 msgstr "Oppsettsvalg"
 
-#: agent/gpg-agent.c:201
+#: agent/gpg-agent.c:203
 msgid "do not use the SCdaemon"
 msgstr "ikke bruk SCdaemon"
 
-#: agent/gpg-agent.c:203
+#: agent/gpg-agent.c:205
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|bruk PGN som SCdaemon-program"
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 #, 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:209
+#: agent/gpg-agent.c:211
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|godta enkelte kommandoer via «NAME»"
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 msgid "ignore requests to change the TTY"
 msgstr "ignorer forespørsler om å bytte TTY"
 
-#: agent/gpg-agent.c:215
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the X display"
 msgstr "ignorer forespørsler om å bytte X-skjerm"
 
-#: agent/gpg-agent.c:216
+#: agent/gpg-agent.c:218
 msgid "enable ssh support"
 msgstr "slå på ssh-støtte"
 
-#: agent/gpg-agent.c:218
+#: agent/gpg-agent.c:220
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "|ALGO|bruk valgt ALGOritme til å vise ssh-fingeravtrykk"
 
-#: agent/gpg-agent.c:221
+#: agent/gpg-agent.c:223
 msgid "enable putty support"
 msgstr "slå på støtte for putty"
 
-#: agent/gpg-agent.c:233 g10/gpg.c:844 scd/scdaemon.c:176 sm/gpgsm.c:382
+#: agent/gpg-agent.c:235 g10/gpg.c:844 scd/scdaemon.c:176 sm/gpgsm.c:383
 msgid "Options controlling the security"
 msgstr "Sikkerhetsvalg"
 
-#: agent/gpg-agent.c:236
+#: agent/gpg-agent.c:238
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|fjern hurtiglagrede PIN-koder etter N sekunder"
 
-#: agent/gpg-agent.c:238
+#: agent/gpg-agent.c:240
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|SSH-nøkler utgår etter N antall sekunder"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:242
 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:242
+#: agent/gpg-agent.c:244
 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:244
+#: agent/gpg-agent.c:246
 msgid "do not use the PIN cache when signing"
 msgstr "ikke bruk PIN-hurtiglager under signering"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:248
 msgid "disallow the use of an external password cache"
 msgstr "ikke tillat bruk av eksternt passord-hurtiglager"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:250
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "ikke la klienter tillitsmarkere nøkler"
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:253
 msgid "allow presetting passphrase"
 msgstr "tillat valg av passordfrase på forhånd"
 
-#: agent/gpg-agent.c:256
+#: agent/gpg-agent.c:258
 msgid "Options enforcing a passphrase policy"
 msgstr "Valg som håndhever passordfrase-regler"
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:261
 msgid "do not allow bypassing the passphrase policy"
 msgstr "ikke tillat avvik fra passordregler"
 
-#: agent/gpg-agent.c:261
+#: agent/gpg-agent.c:263
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr "|N|endre minimal passordfrase-lengde til N"
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:265
 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:266
+#: agent/gpg-agent.c:268
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr "|FIL|kontroller nye passordfraser mot mønster i valgt FIL"
 
-#: agent/gpg-agent.c:268
+#: agent/gpg-agent.c:272
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|regn passord som ugyldig etter N antall dager"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:274
 msgid "do not allow the reuse of old passphrases"
 msgstr "ikke tillat gjenbruk av gamle passordfraser"
 
-#: agent/gpg-agent.c:273
+#: agent/gpg-agent.c:277
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the PIN-Entry"
 msgstr "Sikkerhetsvalg"
 
-#: agent/gpg-agent.c:275
+#: agent/gpg-agent.c:279
 msgid "never use the PIN-entry"
 msgstr ""
 
-#: agent/gpg-agent.c:277
+#: agent/gpg-agent.c:281
 msgid "disallow caller to override the pinentry"
 msgstr "ikke la kaller overstyre PIN-inntasting"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:283
 #, 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:282
+#: agent/gpg-agent.c:286
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|bruk PGM til inntasting av PIN-koder"
 
-#: agent/gpg-agent.c:286
+#: agent/gpg-agent.c:290
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|endre tidsavbrudd for PIN-inntasting til N antall sekunder"
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:294
 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:551 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: agent/gpg-agent.c:557 agent/preset-passphrase.c:99 agent/protect-tool.c:154
 #: g10/gpg.c:1132 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:612 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:438
-#: dirmngr/dirmngr_ldap.c:175 tools/gpg-connect-agent.c:220 tools/gpgconf.c:151
+#: sm/gpgsm.c:613 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:446
+#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:151
 #: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Rapporter programfeil til <@EMAIL@>.\n"
 
-#: agent/gpg-agent.c:560
+#: agent/gpg-agent.c:566
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Bruk: @GPG_AGENT@ [valg] («-h» for hjelp)"
 
-#: agent/gpg-agent.c:562
+#: agent/gpg-agent.c:568
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -632,131 +648,131 @@ msgstr ""
 "Syntaks: @GPG_AGENT@ [valg] [kommando [arg]]\n"
 "Håndtering av hemmelige nøkler for @GNUPG@\n"
 
-#: agent/gpg-agent.c:607 g10/gpg.c:1337 scd/scdaemon.c:384 sm/gpgsm.c:760
-#: dirmngr/dirmngr.c:522
+#: agent/gpg-agent.c:613 g10/gpg.c:1337 scd/scdaemon.c:384 sm/gpgsm.c:761
+#: dirmngr/dirmngr.c:530
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "«%s» er et ugyldig feilsøkingsnivå\n"
 
-#: agent/gpg-agent.c:972 g10/gpg.c:3910 g10/gpg.c:3934 sm/gpgsm.c:1769
-#: sm/gpgsm.c:1775
+#: agent/gpg-agent.c:986 g10/gpg.c:3907 g10/gpg.c:3931 sm/gpgsm.c:1622
+#: sm/gpgsm.c:1628
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "valg kontrollsum-algoritme er ugyldig\n"
 
-#: agent/gpg-agent.c:1196 agent/gpg-agent.c:2019 common/comopt.c:93
-#: g10/gpg.c:2591 scd/scdaemon.c:549 sm/gpgsm.c:1155 dirmngr/dirmngr.c:989
-#: dirmngr/dirmngr.c:1840
+#: agent/gpg-agent.c:1210 agent/gpg-agent.c:2035 common/comopt.c:93
+#: g10/gpg.c:2594 scd/scdaemon.c:549 sm/gpgsm.c:1028 dirmngr/dirmngr.c:1029
+#: dirmngr/dirmngr.c:1879
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "leser valg fra «%s»\n"
 
-#: agent/gpg-agent.c:1335 g10/gpg.c:3861 scd/scdaemon.c:687 sm/gpgsm.c:1709
-#: dirmngr/dirmngr.c:1108 tools/gpg-connect-agent.c:1270 tools/gpgconf.c:634
+#: agent/gpg-agent.c:1349 g10/gpg.c:3858 scd/scdaemon.c:687 sm/gpgsm.c:1562
+#: dirmngr/dirmngr.c:1145 tools/gpg-connect-agent.c:1270 tools/gpgconf.c:668
 #, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr "Merk: «%s» regnes ikke som et valg\n"
 
-#: agent/gpg-agent.c:2172 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1267
+#: agent/gpg-agent.c:2188 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1306
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "klarte ikke å lage sokkel: %s\n"
 
-#: agent/gpg-agent.c:2189 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1280
+#: agent/gpg-agent.c:2205 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1319
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "sokkelnavnet «%s» er for langt\n"
 
-#: agent/gpg-agent.c:2228
+#: agent/gpg-agent.c:2244
 #, 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:2239 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1312
+#: agent/gpg-agent.c:2255 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1351
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "feil under henting av sokkel-anledning\n"
 
-#: agent/gpg-agent.c:2244 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1315
+#: agent/gpg-agent.c:2260 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1354
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "feil under knytning av sokkel til «%s»: %s\n"
 
-#: agent/gpg-agent.c:2255 agent/gpg-agent.c:2295 agent/gpg-agent.c:2304
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1324
+#: agent/gpg-agent.c:2271 agent/gpg-agent.c:2311 agent/gpg-agent.c:2320
+#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1363
 #, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "klarte ikke å endre tillatelser til «%s»: %s\n"
 
-#: agent/gpg-agent.c:2269 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1336
+#: agent/gpg-agent.c:2285 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1375
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "lytter på sokkel «%s»\n"
 
-#: agent/gpg-agent.c:2289 agent/gpg-agent.c:2342 common/homedir.c:517
+#: agent/gpg-agent.c:2305 agent/gpg-agent.c:2358 common/homedir.c:537
 #: 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:2292 agent/gpg-agent.c:2347 common/homedir.c:520
+#: agent/gpg-agent.c:2308 agent/gpg-agent.c:2363 common/homedir.c:540
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "mappa «%s» er opprettet\n"
 
-#: agent/gpg-agent.c:2353
+#: agent/gpg-agent.c:2369
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "stat() mislyktes for «%s»: %s\n"
 
-#: agent/gpg-agent.c:2357
+#: agent/gpg-agent.c:2373
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "«%s» kan ikke brukes som hjemmemappe\n"
 
-#: agent/gpg-agent.c:2512 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2069
+#: agent/gpg-agent.c:2528 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2108
 #, 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:2719
+#: agent/gpg-agent.c:2735
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "startet behandler 0x%lx for fd %d\n"
 
-#: agent/gpg-agent.c:2724
+#: agent/gpg-agent.c:2740
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "avsluttet behandler 0x%lx for fd %d\n"
 
-#: agent/gpg-agent.c:2799
+#: agent/gpg-agent.c:2815
 #, 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:2804
+#: agent/gpg-agent.c:2820
 #, 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:3026 scd/scdaemon.c:1374 dirmngr/dirmngr.c:2283
+#: agent/gpg-agent.c:3042 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2322
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "npth_pselect mislyktes: %s - venter 1s\n"
 
-#: agent/gpg-agent.c:3114 scd/scdaemon.c:1439
+#: agent/gpg-agent.c:3130 scd/scdaemon.c:1441
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s stoppet\n"
 
-#: agent/gpg-agent.c:3252 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3271 common/simple-pwquery.c:247 g10/call-agent.c:260
 #: sm/call-agent.c:131 tools/gpg-connect-agent.c:2319 tools/card-call-scd.c:311
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "ingen gpg-agent kjører i gjeldende økt\n"
 
-#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:70
+#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:66
 msgid ""
 "@Options:\n"
 " "
@@ -777,7 +793,7 @@ msgstr ""
 "Vedlikehold av hurtiglager for passord\n"
 
 #: agent/protect-tool.c:107 g10/gpg.c:448 kbx/kbxutil.c:72 sm/gpgsm.c:215
-#: dirmngr/dirmngr.c:168 tools/gpgconf.c:81
+#: dirmngr/dirmngr.c:169 tools/gpgconf.c:81
 msgid ""
 "@Commands:\n"
 " "
@@ -808,22 +824,22 @@ msgstr ""
 "Syntaks: gpg-protect-tool [valg] [arg]\n"
 "Håndteringsverktøy for hemmelige nøkler\n"
 
-#: agent/protect-tool.c:707
+#: agent/protect-tool.c:708 sm/import.c:775
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Skriv inn passordfrase for å låse opp PKCS#12-objekt."
 
-#: agent/protect-tool.c:712
+#: agent/protect-tool.c:713 sm/export.c:727
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Skriv inn passordfrase for å låse nytt PKCS#12-objekt."
 
-#: agent/protect-tool.c:718
+#: agent/protect-tool.c:719
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 "Skriv inn passordfrase for å låse nytt importert objekt i GnuPG-systemet."
 
-#: agent/protect-tool.c:723
+#: agent/protect-tool.c:724
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -831,17 +847,17 @@ msgstr ""
 "Skriv inn passordfrase eller PIN-kode som\n"
 "kreves for å fullføre gjeldende handling."
 
-#: agent/protect-tool.c:734
+#: agent/protect-tool.c:735
 #, c-format
 msgid "cancelled\n"
 msgstr "avbrutt\n"
 
-#: agent/protect-tool.c:736
+#: agent/protect-tool.c:737
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "feil under spørring etter passordfrase: %s\n"
 
-#: agent/trustlist.c:153 agent/trustlist.c:363 tools/gpgconf.c:424
+#: agent/trustlist.c:153 agent/trustlist.c:363 tools/gpgconf.c:458
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "feil under åpning av «%s»: %s\n"
@@ -1002,7 +1018,7 @@ msgstr "kontroll av opprettet signatur mislyktes: %s\n"
 msgid "secret key parts are not available\n"
 msgstr "hemmelige nøkkeldeler er ikke tilgjenglig\n"
 
-#: agent/cvt-openpgp.c:343 g10/card-util.c:1562
+#: agent/cvt-openpgp.c:343 g10/card-util.c:1575
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr "offentlig nøkkelalgoritme %d (%s) støttes ikke\n"
@@ -1031,7 +1047,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:505 common/exechelp-posix.c:580
-#: common/exechelp-posix.c:866 dirmngr/dirmngr.c:1354
+#: common/exechelp-posix.c:866 dirmngr/dirmngr.c:1393
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "feil under kopiering av prosess: %s\n"
@@ -1104,7 +1120,7 @@ msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "klarte ikke å gi «%s» det nye navnet «%s»: %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3082
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3099
 msgid "yes"
 msgstr "ja"
 
@@ -1158,7 +1174,7 @@ msgstr "kjernen i sikkert minne ble full under tildeling av %lu byte"
 msgid "out of core while allocating %lu bytes"
 msgstr "kjernen ble full under tildeling av %lu byte"
 
-#: common/miscellaneous.c:115 g10/card-util.c:917 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:927 tools/no-libgcrypt.c:30
 #: tools/gpg-card.c:416
 #, c-format
 msgid "error allocating enough memory: %s\n"
@@ -1235,7 +1251,7 @@ msgstr "feil under henting av versjon fra «%s»: %s\n"
 msgid "server '%s' is older than us (%s < %s)"
 msgstr "tjener «%s» er eldre enn oss (%s < %s)"
 
-#: common/asshelp.c:737 g10/call-dirmngr.c:408
+#: common/asshelp.c:737 g10/call-dirmngr.c:407
 #, c-format
 msgid "WARNING: %s\n"
 msgstr "ADVARSEL: %s\n"
@@ -1318,7 +1334,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:4212
+#: scd/app-openpgp.c:4214
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "ustøttet algoritme: %s"
@@ -1393,11 +1409,11 @@ msgstr "Sertifikatkjede gyldig"
 msgid "Root certificate trustworthy"
 msgstr "Rotsertifikat regnes som troverdig"
 
-#: common/audit.c:1112 sm/certchain.c:1242
+#: common/audit.c:1112 sm/certchain.c:1243
 msgid "no CRL found for certificate"
 msgstr "fant ingen sertifikat-CRL"
 
-#: common/audit.c:1115 sm/certchain.c:1252
+#: common/audit.c:1115 sm/certchain.c:1253
 msgid "the available CRL is too old"
 msgstr "tilgjengelig CRL er for gammel"
 
@@ -1443,22 +1459,22 @@ msgstr "[ingen]"
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "hoppet over ugyldig radix64-tegn %02x\n"
 
-#: common/ttyio.c:433
+#: common/ttyio.c:447
 #, c-format
 msgid "Sorry, we are in batchmode - can't get input\n"
 msgstr ""
 
-#: common/ttyio.c:439
+#: common/ttyio.c:453
 #, c-format
 msgid "Sorry, no terminal at all requested - can't get input\n"
 msgstr ""
 
-#: common/ttyio.c:474 common/ttyio.c:484
+#: common/ttyio.c:488 common/ttyio.c:498
 #, c-format
 msgid "too many errors; giving up\n"
 msgstr ""
 
-#: common/ttyio.c:536
+#: common/ttyio.c:550
 #, c-format
 msgid "Control-D detected\n"
 msgstr ""
@@ -1512,8 +1528,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:1036 dirmngr/dirmngr.c:895
-#: dirmngr/dirmngr.c:904
+#: common/init.c:191 sm/gpgsm.c:909 dirmngr/dirmngr.c:935 dirmngr/dirmngr.c:944
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s er for gammel (krever %s, har %s)\n"
@@ -1665,7 +1680,7 @@ msgid "Enter passphrase: "
 msgstr "Skriv inn passordfrase: "
 
 #: g10/call-agent.c:318 g10/encrypt.c:282 g10/encrypt.c:818 g10/sign.c:473
-#: sm/call-agent.c:180 sm/encrypt.c:701 sm/sign.c:436
+#: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
 #, c-format
 msgid "%s is not compliant with %s mode\n"
 msgstr "%s kan ikke brukes i %s-modus\n"
@@ -1676,220 +1691,220 @@ msgstr "%s kan ikke brukes i %s-modus\n"
 msgid "error from TPM: %s\n"
 msgstr "feil under lesing fra %s: %s\n"
 
-#: g10/call-agent.c:2123 g10/passphrase.c:225 g10/passphrase.c:258
-#: tools/card-call-scd.c:1751
+#: g10/call-agent.c:2135 g10/passphrase.c:233 g10/passphrase.c:266
+#: tools/card-call-scd.c:1755
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problem med agent: %s\n"
 
-#: g10/call-dirmngr.c:179 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2316
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2316
 #, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "ingen dirmngr kjører i gjeldende økt\n"
 
-#: g10/call-dirmngr.c:213
+#: g10/call-dirmngr.c:212
 #, fuzzy, c-format
 #| msgid "option '%s' may not be used in %s mode\n"
 msgid "keyserver option \"honor-keyserver-url\" may not be used in Tor mode\n"
 msgstr "du kan ikke bruke valget «%s» i %s-modus\n"
 
-#: g10/call-dirmngr.c:386
+#: g10/call-dirmngr.c:385
 msgid "WKD uses a cached result"
 msgstr ""
 
-#: g10/call-dirmngr.c:389
+#: g10/call-dirmngr.c:388
 msgid "Tor is not running"
 msgstr ""
 
-#: g10/call-dirmngr.c:391
+#: g10/call-dirmngr.c:390
 #, fuzzy
 #| msgid "\"%s\" is not a proper fingerprint\n"
 msgid "Tor is not properly configured"
 msgstr "«%s» er et ugyldig fingeravtrykk\n"
 
-#: g10/call-dirmngr.c:393
+#: g10/call-dirmngr.c:392
 #, fuzzy
 #| msgid "\"%s\" is not a proper fingerprint\n"
 msgid "DNS is not properly configured"
 msgstr "«%s» er et ugyldig fingeravtrykk\n"
 
-#: g10/call-dirmngr.c:395
+#: g10/call-dirmngr.c:394
 msgid "unacceptable HTTP redirect from server"
 msgstr ""
 
-#: g10/call-dirmngr.c:397
+#: g10/call-dirmngr.c:396
 msgid "unacceptable HTTP redirect from server was cleaned up"
 msgstr ""
 
-#: g10/call-dirmngr.c:399
+#: g10/call-dirmngr.c:398
 #, fuzzy
 #| msgid "generate a revocation certificate"
 msgid "server uses an invalid certificate"
 msgstr "lag opphevelsessertifikat"
 
-#: g10/call-dirmngr.c:406 g10/gpg.c:4599
+#: g10/call-dirmngr.c:405 g10/gpg.c:4596
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "armor: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:369 g10/card-util.c:1924
-#: tools/gpg-card.c:3039
+#: g10/card-util.c:86 g10/card-util.c:374 g10/card-util.c:1937
+#: tools/gpg-card.c:3056
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP-kort er ikke tilgjengelig: %s\n"
 
-#: g10/card-util.c:91 g10/card-util.c:1930
+#: g10/card-util.c:91 g10/card-util.c:1943
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "Oppdaget OpenPGP-kortnummer %s\n"
 
-#: g10/card-util.c:97 g10/card-util.c:2309 g10/delkey.c:164 g10/keyedit.c:1428
-#: g10/keygen.c:4791 g10/revoke.c:214 g10/revoke.c:638
+#: g10/card-util.c:97 g10/card-util.c:2322 g10/delkey.c:164 g10/keyedit.c:1428
+#: g10/keygen.c:4795 g10/revoke.c:214 g10/revoke.c:639
 #, c-format
 msgid "can't do this in batch mode\n"
 msgstr "du kan ikke gjøres dette i buntmodus\n"
 
-#: g10/card-util.c:105 tools/gpg-card.c:2943
+#: g10/card-util.c:105 tools/gpg-card.c:2960
 #, c-format
 msgid "This command is only available for version 2 cards\n"
 msgstr "Denne kommandoen er bare tilgjengelig for kort av versjon 2\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3398 tools/gpg-card.c:2948
+#: g10/card-util.c:107 scd/app-openpgp.c:3399 tools/gpg-card.c:2965
 #, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "Tilbakestillingskode er ikke tilgjengelig\n"
 
-#: g10/card-util.c:140 g10/card-util.c:1448 g10/card-util.c:1710
-#: g10/card-util.c:1802 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1991 g10/keygen.c:2165 g10/keygen.c:2385 g10/keygen.c:2685
+#: g10/card-util.c:140 g10/card-util.c:1458 g10/card-util.c:1723
+#: g10/card-util.c:1815 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/keygen.c:1992 g10/keygen.c:2166 g10/keygen.c:2386 g10/keygen.c:2686
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
 #: tools/gpg-card.c:510
 msgid "Your selection? "
 msgstr "Ditt valg? "
 
-#: g10/card-util.c:262 g10/card-util.c:313 tools/gpg-card.c:596
+#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:596
 #: tools/gpg-card.c:636
 msgid "[not set]"
 msgstr "[ikke valgt]"
 
-#: g10/card-util.c:558 tools/gpg-card.c:903
+#: g10/card-util.c:563 tools/gpg-card.c:905
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:559 tools/gpg-card.c:904
+#: g10/card-util.c:564 tools/gpg-card.c:906
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:586 tools/gpg-card.c:931
+#: g10/card-util.c:591 tools/gpg-card.c:933
 msgid "not forced"
 msgstr "ikke tvunget"
 
-#: g10/card-util.c:586 tools/gpg-card.c:931
+#: g10/card-util.c:591 tools/gpg-card.c:933
 msgid "forced"
 msgstr "tvunget"
 
-#: g10/card-util.c:768 tools/gpg-card.c:1468
+#: g10/card-util.c:773 tools/gpg-card.c:1484
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Feil: Bare ren ASCII er foreløpig tillatt.\n"
 
-#: g10/card-util.c:770 tools/gpg-card.c:1470
+#: g10/card-util.c:775 tools/gpg-card.c:1486
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Feil: tegnet «<» kan ikke brukes.\n"
 
-#: g10/card-util.c:772 tools/gpg-card.c:1472
+#: g10/card-util.c:777 tools/gpg-card.c:1488
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Feil: Doble mellomrom er ikke tillatt.\n"
 
-#: g10/card-util.c:789 tools/gpg-card.c:1505
+#: g10/card-util.c:795 tools/gpg-card.c:1521
 msgid "Cardholder's surname: "
 msgstr "Kortholders etternavn: "
 
-#: g10/card-util.c:791 tools/gpg-card.c:1506
+#: g10/card-util.c:797 tools/gpg-card.c:1522
 msgid "Cardholder's given name: "
 msgstr "Kortholders fornavn: "
 
-#: g10/card-util.c:809 tools/gpg-card.c:1523
+#: g10/card-util.c:816 tools/gpg-card.c:1539
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Feil: Det kombinerte navnet er for langt (grensa går ved %d tegn).\n"
 
-#: g10/card-util.c:830 tools/gpg-card.c:1561
+#: g10/card-util.c:840 tools/gpg-card.c:1577
 msgid "URL to retrieve public key: "
 msgstr "Adresse for henting av offentlig nøkkel: "
 
-#: g10/card-util.c:926 g10/decrypt-data.c:495 g10/import.c:406 g10/import.c:756
-#: g10/import.c:815 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1666
-#: tools/gpgconf.c:437 tools/gpgconf.c:483 tools/gpg-card.c:426
+#: g10/card-util.c:936 g10/decrypt-data.c:495 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:1705
+#: tools/gpgconf.c:471 tools/gpgconf.c:517 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:959 g10/decrypt-data.c:498 g10/export.c:2496
+#: g10/card-util.c:969 g10/decrypt-data.c:498 g10/export.c:2496
 #: dirmngr/crlcache.c:925 tools/gpg-card.c:486 tools/gpg-card.c:493
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr "feil under skriving av «%s»: %s\n"
 
-#: g10/card-util.c:986 tools/gpg-card.c:1650
+#: g10/card-util.c:996 tools/gpg-card.c:1666
 msgid "Login data (account name): "
 msgstr "Logindata (kontonavn): "
 
-#: g10/card-util.c:1024 tools/gpg-card.c:1945
+#: g10/card-util.c:1034 tools/gpg-card.c:1962
 msgid "Private DO data: "
 msgstr "Privat DO-data: "
 
-#: g10/card-util.c:1109 tools/gpg-card.c:1699
+#: g10/card-util.c:1119 tools/gpg-card.c:1715
 msgid "Language preferences: "
 msgstr "Språkoppsett: "
 
-#: g10/card-util.c:1117 tools/gpg-card.c:1710
+#: g10/card-util.c:1127 tools/gpg-card.c:1726
 #, c-format
 msgid "Error: invalid length of preference string.\n"
 msgstr "Feil: oppsettsstreng har ugyldig lengde.\n"
 
-#: g10/card-util.c:1126 tools/gpg-card.c:1719
+#: g10/card-util.c:1136 tools/gpg-card.c:1735
 #, c-format
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Feil: oppsettsstreng inneholder ugyldige tegn.\n"
 
-#: g10/card-util.c:1148 tools/gpg-card.c:1753
+#: g10/card-util.c:1158 tools/gpg-card.c:1769
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1162 tools/gpg-card.c:1770
+#: g10/card-util.c:1172 tools/gpg-card.c:1786
 msgid "Error: invalid response.\n"
 msgstr "Feil: ugyldig svar.\n"
 
-#: g10/card-util.c:1185 tools/gpg-card.c:1835
+#: g10/card-util.c:1195 tools/gpg-card.c:1852
 msgid "CA fingerprint: "
 msgstr "CA-fingeravtrykk: "
 
-#: g10/card-util.c:1209 tools/gpg-card.c:1861
+#: g10/card-util.c:1219 tools/gpg-card.c:1878
 #, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Feil: feilformatert fingeravtrykk.\n"
 
-#: g10/card-util.c:1259
+#: g10/card-util.c:1269
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "klarte ikke å utføre nøkkelhandling: %s\n"
 
-#: g10/card-util.c:1260
+#: g10/card-util.c:1270
 msgid "not an OpenPGP card"
 msgstr "ikke et OpenPGP-kort"
 
-#: g10/card-util.c:1273 g10/keygen.c:4811 g10/keygen.c:5972
+#: g10/card-util.c:1283 g10/keygen.c:4815 g10/keygen.c:6003
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "feil under henting av nøkkelinfo: %s\n"
 
-#: g10/card-util.c:1358
+#: g10/card-util.c:1368
 msgid "Replace existing key? (y/N) "
 msgstr "Erstatte eksisterende nøkkel? (j/N) "
 
-#: g10/card-util.c:1375 tools/gpg-card.c:3328
+#: g10/card-util.c:1385 tools/gpg-card.c:3345
 #, fuzzy
 #| msgid ""
 #| "Note: There is no guarantee that the card supports the requested size.\n"
@@ -1905,109 +1920,109 @@ msgstr ""
 "      Se dokumentasjon for kortet du bruker og finn ut hvilke størrelser \n"
 "      det tillater hvis nøkkelgenerering mislykkes.\n"
 
-#: g10/card-util.c:1396 g10/keygen.c:2570 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1406 g10/keygen.c:2571 sm/certreqgen-ui.c:180
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Hvor stor skal nøkkelen være? (%u) "
 
-#: g10/card-util.c:1406 g10/keygen.c:2493 g10/keygen.c:2525
+#: g10/card-util.c:1416 g10/keygen.c:2494 g10/keygen.c:2526
 #: sm/certreqgen-ui.c:195
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rundet opp til %u bit\n"
 
-#: g10/card-util.c:1414 g10/keygen.c:2578 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1424 g10/keygen.c:2579 sm/certreqgen-ui.c:185
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s nøkkelstørrelser må ligge i rekkevidden %u-%u\n"
 
-#: g10/card-util.c:1433
+#: g10/card-util.c:1443
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1435
+#: g10/card-util.c:1445
 #, fuzzy
 #| msgid "   (1) Signature key\n"
 msgid "Signature key\n"
 msgstr "   (1) Signaturnøkkel\n"
 
-#: g10/card-util.c:1437
+#: g10/card-util.c:1447
 #, fuzzy
 #| msgid "   (2) Encryption key\n"
 msgid "Encryption key\n"
 msgstr "   (2) Krypteringsnøkkel\n"
 
-#: g10/card-util.c:1439
+#: g10/card-util.c:1449
 #, fuzzy
 #| msgid "   (3) Authentication key\n"
 msgid "Authentication key\n"
 msgstr "   (3) Autentiseringsnøkkel\n"
 
-#: g10/card-util.c:1441 g10/keygen.c:2112 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1451 g10/keygen.c:2113 sm/certreqgen-ui.c:158
 msgid "Please select what kind of key you want:\n"
 msgstr "Velg hvilken type nøkkel du vil ha:\n"
 
-#: g10/card-util.c:1442 sm/certreqgen-ui.c:159
+#: g10/card-util.c:1452 sm/certreqgen-ui.c:159
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1443
+#: g10/card-util.c:1453
 #, fuzzy, c-format
 #| msgid "   (%d) ECC and ECC\n"
 msgid "   (%d) ECC\n"
 msgstr "   (%d) ECC og ECC\n"
 
-#: g10/card-util.c:1455 g10/card-util.c:1722 g10/card-util.c:1822
-#: g10/keyedit.c:900 g10/keygen.c:2017 g10/keygen.c:2045 g10/keygen.c:2172
-#: g10/keygen.c:2425 g10/keygen.c:2713 g10/revoke.c:836
+#: g10/card-util.c:1468 g10/card-util.c:1735 g10/card-util.c:1835
+#: g10/keyedit.c:900 g10/keygen.c:2018 g10/keygen.c:2046 g10/keygen.c:2173
+#: g10/keygen.c:2426 g10/keygen.c:2714 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Ugyldig valg.\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1541
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr "Kortet blir nå satt opp på nytt for å lage nøkkel på %u bit\n"
 
-#: g10/card-util.c:1533
+#: g10/card-util.c:1546
 #, fuzzy, c-format
 #| msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr "Kortet blir nå satt opp på nytt for å lage nøkkel på %u bit\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1582
 #, fuzzy, c-format
 #| msgid "error changing size of key %d to %u bits: %s\n"
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "feil under endring av størrelse på nøkkel %d til %u bit: %s\n"
 
-#: g10/card-util.c:1585 g10/card-util.c:2106 g10/card-util.c:2162
+#: g10/card-util.c:1598 g10/card-util.c:2119 g10/card-util.c:2175
 #, fuzzy, c-format
 #| msgid "error getting current key info: %s\n"
 msgid "error getting card info: %s\n"
 msgstr "feil under henting av nøkkelinfo: %s\n"
 
-#: g10/card-util.c:1591 g10/card-util.c:1936 g10/card-util.c:2112
-#: g10/card-util.c:2171 tools/gpg-card.c:3057 tools/gpg-card.c:3296
-#: tools/gpg-card.c:3354
+#: g10/card-util.c:1604 g10/card-util.c:1949 g10/card-util.c:2125
+#: g10/card-util.c:2184 tools/gpg-card.c:3074 tools/gpg-card.c:3313
+#: tools/gpg-card.c:3371
 #, c-format
 msgid "This command is not supported by this card\n"
 msgstr "Denne kommandoen støttes ikke av dette kortet\n"
 
-#: g10/card-util.c:1637 tools/gpg-card.c:2426
+#: g10/card-util.c:1650 tools/gpg-card.c:2443
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Lage sikkerhetskopi av krypteringsnøkler utenfor kortet? (J/n) "
 
-#: g10/card-util.c:1651
+#: g10/card-util.c:1664
 #, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "MERK: det ligger allerede nøkler på kortet.\n"
 
-#: g10/card-util.c:1654 tools/gpg-card.c:2398
+#: g10/card-util.c:1667 tools/gpg-card.c:2415
 msgid "Replace existing keys? (y/N) "
 msgstr "Erstatte eksisterende nøkler? (j/N) "
 
-#: g10/card-util.c:1666 tools/gpg-card.c:2457
+#: g10/card-util.c:1679 tools/gpg-card.c:2474
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2018,162 +2033,162 @@ msgstr ""
 "   PIN = «%s»     Admin-PIN = «%s»\n"
 "Du bør endre disse med kommandoen «--change-pin»\n"
 
-#: g10/card-util.c:1701
+#: g10/card-util.c:1714
 msgid "Please select the type of key to generate:\n"
 msgstr "Velg hvilken type nøkkel du vil lage:\n"
 
-#: g10/card-util.c:1703 g10/card-util.c:1793
+#: g10/card-util.c:1716 g10/card-util.c:1806
 msgid "   (1) Signature key\n"
 msgstr "   (1) Signaturnøkkel\n"
 
-#: g10/card-util.c:1704 g10/card-util.c:1795
+#: g10/card-util.c:1717 g10/card-util.c:1808
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Krypteringsnøkkel\n"
 
-#: g10/card-util.c:1705 g10/card-util.c:1797
+#: g10/card-util.c:1718 g10/card-util.c:1810
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Autentiseringsnøkkel\n"
 
-#: g10/card-util.c:1790
+#: g10/card-util.c:1803
 msgid "Please select where to store the key:\n"
 msgstr "velg hvor nøkkelen skal lagres:\n"
 
-#: g10/card-util.c:1836
+#: g10/card-util.c:1849
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "KEYTOCARD mislyktes: %s\n"
 
-#: g10/card-util.c:1941 tools/gpg-card.c:3065
+#: g10/card-util.c:1954 tools/gpg-card.c:3082
 #, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr "Merk: denne kommandoen ødelegger alle nøkler på kortet.\n"
 
-#: g10/card-util.c:1944 tools/gpg-card.c:3068 tools/gpg-card.c:3409
+#: g10/card-util.c:1957 tools/gpg-card.c:3085 tools/gpg-card.c:3426
 msgid "Continue? (y/N) "
 msgstr "Vil du fortsette? (j/N) "
 
-#: g10/card-util.c:1949 tools/gpg-card.c:3079
+#: g10/card-util.c:1962 tools/gpg-card.c:3096
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr "Er du sikker på at du vil gjenopprette fabrikkoppsett? (skriv «ja») "
 
-#: g10/card-util.c:2142
+#: g10/card-util.c:2155
 #, fuzzy, c-format
 #| msgid "error looking up: %s\n"
 msgid "error for setup KDF: %s\n"
 msgstr "feil under oppslag av %s\n"
 
-#: g10/card-util.c:2188
+#: g10/card-util.c:2201
 #, fuzzy, c-format
 #| msgid "error looking up: %s\n"
 msgid "error for setup UIF: %s\n"
 msgstr "feil under oppslag av %s\n"
 
-#: g10/card-util.c:2212 g10/keyedit.c:1263 tools/gpg-card.c:3649
+#: g10/card-util.c:2225 g10/keyedit.c:1263 tools/gpg-card.c:3666
 msgid "quit this menu"
 msgstr "gå ut av denne menyen"
 
-#: g10/card-util.c:2214
+#: g10/card-util.c:2227
 msgid "show admin commands"
 msgstr "vis admin-kommandoer"
 
-#: g10/card-util.c:2215 g10/keyedit.c:1266 tools/gpg-card.c:3652
+#: g10/card-util.c:2228 g10/keyedit.c:1266 tools/gpg-card.c:3669
 msgid "show this help"
 msgstr "vis denne hjelpeteksten"
 
-#: g10/card-util.c:2217 tools/gpg-card.c:3654
+#: g10/card-util.c:2230 tools/gpg-card.c:3671
 msgid "list all available data"
 msgstr "vis alle tilgjengelige data"
 
-#: g10/card-util.c:2220 tools/gpg-card.c:3656
+#: g10/card-util.c:2233 tools/gpg-card.c:3673
 msgid "change card holder's name"
 msgstr "endre kortholders navn"
 
-#: g10/card-util.c:2221 tools/gpg-card.c:3657
+#: g10/card-util.c:2234 tools/gpg-card.c:3674
 msgid "change URL to retrieve key"
 msgstr "endre adresse for å hente nøkkel"
 
-#: g10/card-util.c:2222 tools/gpg-card.c:3658
+#: g10/card-util.c:2235 tools/gpg-card.c:3675
 msgid "fetch the key specified in the card URL"
 msgstr "hent nøkkel som ligger i kortets adresse"
 
-#: g10/card-util.c:2223 tools/gpg-card.c:3659
+#: g10/card-util.c:2236 tools/gpg-card.c:3676
 msgid "change the login name"
 msgstr "endre brukernavn"
 
-#: g10/card-util.c:2224 tools/gpg-card.c:3660
+#: g10/card-util.c:2237 tools/gpg-card.c:3677
 msgid "change the language preferences"
 msgstr "endre språkoppsett"
 
-#: g10/card-util.c:2225 tools/gpg-card.c:3661
+#: g10/card-util.c:2238 tools/gpg-card.c:3678
 #, fuzzy
 #| msgid "change card holder's sex"
 msgid "change card holder's salutation"
 msgstr "endre kortholders kjønn"
 
-#: g10/card-util.c:2227 tools/gpg-card.c:3663
+#: g10/card-util.c:2240 tools/gpg-card.c:3680
 msgid "change a CA fingerprint"
 msgstr "endre CA-fingeravtrykk"
 
-#: g10/card-util.c:2228 tools/gpg-card.c:3664
+#: g10/card-util.c:2241 tools/gpg-card.c:3681
 msgid "toggle the signature force PIN flag"
 msgstr "slå av på tvungen bruk av signatur-PIN"
 
-#: g10/card-util.c:2229 tools/gpg-card.c:3665
+#: g10/card-util.c:2242 tools/gpg-card.c:3682
 msgid "generate new keys"
 msgstr "lag nye nøkler"
 
-#: g10/card-util.c:2230 tools/gpg-card.c:3666
+#: g10/card-util.c:2243 tools/gpg-card.c:3683
 msgid "menu to change or unblock the PIN"
 msgstr "meny for å endre eller fjerne blokkering av PIN"
 
-#: g10/card-util.c:2231 tools/gpg-card.c:3667
+#: g10/card-util.c:2244 tools/gpg-card.c:3684
 msgid "verify the PIN and list all data"
 msgstr "bekrefte PIN og vise alle data"
 
-#: g10/card-util.c:2232 tools/gpg-card.c:3668
+#: g10/card-util.c:2245 tools/gpg-card.c:3685
 msgid "unblock the PIN using a Reset Code"
 msgstr "fjern PIN-blokkering med en tilbakestillingskode"
 
-#: g10/card-util.c:2233 tools/gpg-card.c:3672
+#: g10/card-util.c:2246 tools/gpg-card.c:3689
 msgid "destroy all keys and data"
 msgstr "ødelegg alle nøkler og data"
 
-#: g10/card-util.c:2235
+#: g10/card-util.c:2248
 #, fuzzy
 #| msgid "|NAME|use user NAME for authentication"
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr "|NAVN|bruk valgt brukerNAVN til autentisering"
 
-#: g10/card-util.c:2236
+#: g10/card-util.c:2249
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "endre eiertillit"
 
-#: g10/card-util.c:2237 tools/gpg-card.c:3674
+#: g10/card-util.c:2250 tools/gpg-card.c:3691
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the User Interaction Flag"
 msgstr "endre eiertillit"
 
-#: g10/card-util.c:2361 tools/gpg-card.c:3924
+#: g10/card-util.c:2374 tools/gpg-card.c:3941
 msgid "gpg/card> "
 msgstr "gpg/kort> "
 
-#: g10/card-util.c:2402
+#: g10/card-util.c:2415
 msgid "Admin-only command\n"
 msgstr "Admin-reservert kommando\n"
 
-#: g10/card-util.c:2433
+#: g10/card-util.c:2446
 msgid "Admin commands are allowed\n"
 msgstr "Admin-kommandoer er tillatt\n"
 
-#: g10/card-util.c:2435
+#: g10/card-util.c:2448
 msgid "Admin commands are not allowed\n"
 msgstr "Admin-kommandoer er ikke tillatt\n"
 
-#: g10/card-util.c:2546 g10/keyedit.c:2275 tools/gpg-card.c:3814
-#: tools/gpg-card.c:4072
+#: g10/card-util.c:2559 g10/keyedit.c:2275 tools/gpg-card.c:3831
+#: tools/gpg-card.c:4089
 #, c-format
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ugyldig kommando  (prøv «help»)\n"
@@ -2183,22 +2198,22 @@ msgstr "Ugyldig kommando  (prøv «help»)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "«--output» virker ikke med denne kommandoen\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5293 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5292 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:1934 g10/export.c:2342 g10/export.c:2463
-#: g10/getkey.c:1907 g10/gpg.c:5238 g10/keyedit.c:1450 g10/keyedit.c:2382
-#: g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:703 g10/keyserver.c:1240
-#: g10/revoke.c:230 g10/tofu.c:2168
+#: g10/getkey.c:2032 g10/gpg.c:5237 g10/keyedit.c:1450 g10/keyedit.c:2382
+#: g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:703 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:2002 g10/getkey.c:1915 g10/getkey.c:4330
-#: g10/gpg.c:5247 g10/keyedit.c:2354 g10/keyserver.c:1258 g10/revoke.c:236
-#: g10/revoke.c:665 g10/tofu.c:2176
+#: g10/delkey.c:90 g10/export.c:2002 g10/getkey.c:2040 g10/getkey.c:4455
+#: g10/gpg.c:5246 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"
 msgstr "feil under lesing av nøkkelblokk: %s\n"
@@ -2320,14 +2335,14 @@ msgstr "du kan ikke bruke algoritme «%s» i %s-modus\n"
 msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:555 g10/encrypt.c:808 g10/decrypt-data.c:261 g10/gpg.c:4083
-#: g10/gpg.c:4130 sm/decrypt.c:742 sm/encrypt.c:691 sm/gpgsm.c:1793
+#: g10/encrypt.c:555 g10/encrypt.c:808 g10/decrypt-data.c:261 g10/gpg.c:4080
+#: g10/gpg.c:4127 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1646
 #, 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:564 g10/gpg.c:4095 g10/gpg.c:4142 g10/sig-check.c:155
-#: g10/sign.c:452 sm/gpgsm.c:1803 sm/gpgsm.c:1813 sm/sign.c:596 sm/verify.c:510
+#: g10/encrypt.c:564 g10/gpg.c:4092 g10/gpg.c:4139 g10/sig-check.c:155
+#: g10/sign.c:452 sm/gpgsm.c:1656 sm/gpgsm.c:1666 sm/sign.c:596 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"
@@ -2345,7 +2360,7 @@ msgstr ""
 "ADVARSEL: tvungen bruk av symmetrisk krypt.metode %s (%d) bryter med "
 "mottakers oppsett\n"
 
-#: g10/encrypt.c:838 sm/encrypt.c:766
+#: g10/encrypt.c:838 sm/encrypt.c:767
 #, c-format
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "ADVARSEL: nøkkel %s egner seg ikke for kryptering i %s-modus\n"
@@ -2375,7 +2390,7 @@ msgstr "%s/%s kryptert for: «%s»\n"
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "du kan ikke bruke valget «%s» i %s-modus\n"
 
-#: g10/decrypt-data.c:239 g10/mainproc.c:380 sm/decrypt.c:494
+#: g10/decrypt-data.c:239 g10/mainproc.c:380 sm/decrypt.c:892
 #, fuzzy, c-format
 #| msgid "%s encrypted data\n"
 msgid "%s.%s encrypted data\n"
@@ -2386,7 +2401,7 @@ msgstr "%s krypterte data\n"
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "kryptert med en ukjent algoritme %d\n"
 
-#: g10/decrypt-data.c:361 g10/decrypt-data.c:414 sm/decrypt.c:508
+#: g10/decrypt-data.c:361 g10/decrypt-data.c:414 sm/decrypt.c:906
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2427,7 +2442,7 @@ msgstr "bruk GnuPG-format til sikkerhetskopiering av nøkkel"
 msgid " - skipped"
 msgstr ". Hoppet over"
 
-#: g10/export.c:1333 g10/import.c:2124 g10/openfile.c:202 g10/openfile.c:296
+#: g10/export.c:1333 g10/import.c:2132 g10/openfile.c:202 g10/openfile.c:296
 #: g10/sign.c:1110 g10/sign.c:1447
 #, c-format
 msgid "writing to '%s'\n"
@@ -2463,61 +2478,61 @@ msgstr "feil under oppretting av «%s»: %s\n"
 msgid "[User ID not found]"
 msgstr "[Fant ikke bruker-ID]"
 
-#: g10/getkey.c:1199
+#: g10/getkey.c:1324
 #, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "hentet «%s» via %s automatisk\n"
 
-#: g10/getkey.c:1205
+#: g10/getkey.c:1330
 #, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "feil under henting av «%s» via %s: %s\n"
 
-#: g10/getkey.c:1207
+#: g10/getkey.c:1332
 msgid "No fingerprint"
 msgstr "Ingen fingeravtrykk"
 
-#: g10/getkey.c:1449
+#: g10/getkey.c:1574
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1884 g10/revoke.c:657 g10/revoke.c:718
+#: g10/getkey.c:2009 g10/revoke.c:658 g10/revoke.c:719
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "fant ikke hemmelig nøkkel «%s»: %s\n"
 
-#: g10/getkey.c:1887 g10/pkclist.c:1012
+#: g10/getkey.c:2012 g10/pkclist.c:1012
 #, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "(kontroller argument for valget «%s»)\n"
 
-#: g10/getkey.c:1965
+#: g10/getkey.c:2090
 #, c-format
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "Advarsel: bruker ikke «%s» som forvalgt nøkkel: %s\n"
 
-#: g10/getkey.c:1973
+#: g10/getkey.c:2098
 #, c-format
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "bruker «%s» som forvalgt hemmelig signeringsnøkkel\n"
 
-#: g10/getkey.c:1980
+#: g10/getkey.c:2105
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr "alle verdier som sendes til «%s» blir ignorert\n"
 
-#: g10/getkey.c:2837
+#: g10/getkey.c:2962
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Ugyldig nøkkel %s gjort gyldig av --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:3703
+#: g10/getkey.c:3828
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "bruker undernøkkel %s i stedet for primærnøkkel %s\n"
 
-#: g10/getkey.c:4259 g10/gpg.c:2167
+#: g10/getkey.c:4384 g10/gpg.c:2168
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "følgende verdier er gyldige for «%s»:\n"
@@ -2704,7 +2719,7 @@ msgstr "|SPES|sett opp e-post-alias"
 msgid "use strict OpenPGP behavior"
 msgstr "bruk streng OpenPGP-oppførsel"
 
-#: g10/gpg.c:651 kbx/kbxutil.c:91 sm/gpgsm.c:424 tools/gpgconf.c:113
+#: g10/gpg.c:651 kbx/kbxutil.c:91 sm/gpgsm.c:425 tools/gpgconf.c:113
 msgid "do not make any changes"
 msgstr "ikke utfør valgte endringer"
 
@@ -2740,7 +2755,7 @@ msgstr "bruk kanonisk tekstmodus"
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|endre komprimeringsnivå til N (0 for å slå av)"
 
-#: g10/gpg.c:762 sm/gpgsm.c:357
+#: g10/gpg.c:762 sm/gpgsm.c:358
 #, fuzzy
 #| msgid "Options controlling the interactivity and enforcement"
 msgid "Options controlling key import and export"
@@ -2762,11 +2777,11 @@ msgstr "importer nøkler fra nøkkeltjener"
 msgid "include the public key in signatures"
 msgstr "vis og kontroller nøkkelsignaturer"
 
-#: g10/gpg.c:776 sm/gpgsm.c:360
+#: g10/gpg.c:776 sm/gpgsm.c:361
 msgid "disable all access to the dirmngr"
 msgstr "slå av all tilgang til dirmngr"
 
-#: g10/gpg.c:788 sm/gpgsm.c:367
+#: g10/gpg.c:788 sm/gpgsm.c:368
 #, fuzzy
 #| msgid "Options controlling the configuration"
 msgid "Options controlling key listings"
@@ -2786,15 +2801,15 @@ msgstr "|BRUKER-ID|krypter for valgt BRUKER-ID"
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|BRUKER-ID|bruk valgt BRUKER-ID til å signere eller dekryptere"
 
-#: g10/gpg.c:876 sm/gpgsm.c:408
+#: g10/gpg.c:876 sm/gpgsm.c:409
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:895 sm/gpgsm.c:420 dirmngr/dirmngr.c:286
+#: g10/gpg.c:895 sm/gpgsm.c:421 dirmngr/dirmngr.c:289
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:966 sm/gpgsm.c:453
+#: g10/gpg.c:966 sm/gpgsm.c:454
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2836,7 +2851,7 @@ msgstr ""
 "Signer, kontroller, krypter eller dekrypter.\n"
 "Forvalgt handling avhenger av inndata.\n"
 
-#: g10/gpg.c:1168 sm/gpgsm.c:636
+#: g10/gpg.c:1168 sm/gpgsm.c:637
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2860,12 +2875,12 @@ msgstr "Hash: "
 msgid "Compression: "
 msgstr "Komprimering: "
 
-#: g10/gpg.c:1274 sm/gpgsm.c:710
+#: g10/gpg.c:1274 sm/gpgsm.c:711
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "bruk: %s [valg] %s\n"
 
-#: g10/gpg.c:1467 sm/gpgsm.c:803
+#: g10/gpg.c:1467 sm/gpgsm.c:804
 #, c-format
 msgid "conflicting commands\n"
 msgstr "motstridende kommandoer\n"
@@ -2875,526 +2890,526 @@ msgstr "motstridende kommandoer\n"
 msgid "no = sign found in group definition '%s'\n"
 msgstr "fant ingen «=»-tegn i gruppedefinisjon «%s»\n"
 
-#: g10/gpg.c:1683
+#: g10/gpg.c:1684
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "ADVARSEL: utrygt eierskap til hjemmemappe «%s»\n"
 
-#: g10/gpg.c:1686
+#: g10/gpg.c:1687
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "ADVARSEL: utrygt eierskap til oppsettsfil «%s»\n"
 
-#: g10/gpg.c:1689
+#: g10/gpg.c:1690
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "ADVARSEL: utrygt eierskap til utvidelse «%s»\n"
 
-#: g10/gpg.c:1695
+#: g10/gpg.c:1696
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "ADVARSEL: utrygge tillatelser til hjemmemappe «%s»\n"
 
-#: g10/gpg.c:1698
+#: g10/gpg.c:1699
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "ADVARSEL: utrygge tillatelser til oppsettsfil «%s»\n"
 
-#: g10/gpg.c:1701
+#: g10/gpg.c:1702
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "ADVARSEL: utrygge tillatelser til utvidelse «%s»\n"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1708
 #, 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:1710
+#: g10/gpg.c:1711
 #, 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:1713
+#: g10/gpg.c:1714
 #, 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:1719
+#: g10/gpg.c:1720
 #, 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:1722
+#: g10/gpg.c:1723
 #, 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:1725
+#: g10/gpg.c:1726
 #, 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:1941
+#: g10/gpg.c:1942
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "oppsettselementet «%s» er ukjent\n"
 
-#: g10/gpg.c:2037
+#: g10/gpg.c:2038
 msgid "display photo IDs during key listings"
 msgstr "vis foto-id-er i nøkkelvisning"
 
-#: g10/gpg.c:2039
+#: g10/gpg.c:2040
 msgid "show key usage information during key listings"
 msgstr "vis informasjon om nøkkelbruk i nøkkelvisning"
 
-#: g10/gpg.c:2041
+#: g10/gpg.c:2042
 msgid "show policy URLs during signature listings"
 msgstr "vis regeladresser i signaturvisning"
 
-#: g10/gpg.c:2043
+#: g10/gpg.c:2044
 msgid "show all notations during signature listings"
 msgstr "vis alle notater i signaturvisning"
 
-#: g10/gpg.c:2045
+#: g10/gpg.c:2046
 msgid "show IETF standard notations during signature listings"
 msgstr "vis IETF-standardnotater under signaturvisning"
 
-#: g10/gpg.c:2049
+#: g10/gpg.c:2050
 msgid "show user-supplied notations during signature listings"
 msgstr "vis brukervalgte notater under signaturvisning"
 
-#: g10/gpg.c:2051
+#: g10/gpg.c:2052
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "vis foretrukne nøkkeltjener-adresser under signaturvisning"
 
-#: g10/gpg.c:2053
+#: g10/gpg.c:2054
 msgid "show user ID validity during key listings"
 msgstr "vis gyldighet for bruker-ID under nøkkelvisning"
 
-#: g10/gpg.c:2055
+#: g10/gpg.c:2056
 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:2057
+#: g10/gpg.c:2058
 msgid "show revoked and expired subkeys in key listings"
 msgstr "vis opphevede og utgåtte undernøkler i nøkkelvisning"
 
-#: g10/gpg.c:2059
+#: g10/gpg.c:2060
 msgid "show the keyring name in key listings"
 msgstr "vis nøkkelknippe-navn i nøkkelvisning"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2062
 msgid "show expiration dates during signature listings"
 msgstr "vis utløpsdatoer i nøkkelvisning"
 
-#: g10/gpg.c:2178
+#: g10/gpg.c:2179
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "«%s» er et ukjent TOFU-regelverk\n"
 
-#: g10/gpg.c:2180
+#: g10/gpg.c:2181
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(bruk «help» for å vise valg)\n"
 
-#: g10/gpg.c:2975 g10/gpg.c:3828 g10/gpg.c:3840
+#: g10/gpg.c:2978 g10/gpg.c:3825 g10/gpg.c:3837
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "Merk: %s er ikke ment for vanlig bruk.\n"
 
-#: g10/gpg.c:3151 g10/gpg.c:3163
+#: g10/gpg.c:3154 g10/gpg.c:3166
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "«%s» er en ugyldig signatur-utløpstid\n"
 
-#: g10/gpg.c:3185
+#: g10/gpg.c:3188
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "«%s» er en ugyldig e-postadresse\n"
 
-#: g10/gpg.c:3217 sm/gpgsm.c:1270
+#: g10/gpg.c:3220 sm/gpgsm.c:1143
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "PIN-inntastingsmodus «%s» er ugyldig\n"
 
-#: g10/gpg.c:3223 sm/gpgsm.c:1276
+#: g10/gpg.c:3226 sm/gpgsm.c:1149
 #, 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:3280
+#: g10/gpg.c:3283
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "«%s» er ikke et gyldig tegnsett\n"
 
-#: g10/gpg.c:3302 g10/gpg.c:3511 g10/keyedit.c:5319
+#: g10/gpg.c:3305 g10/gpg.c:3514 g10/keyedit.c:5322
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "klarte ikke å tolke nøkkeltjener-adresse\n"
 
-#: g10/gpg.c:3320
+#: g10/gpg.c:3323
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ugyldige nøkkeltjener-valg\n"
 
-#: g10/gpg.c:3323
+#: g10/gpg.c:3326
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "ugyldige nøkkeltjener-valg\n"
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3333
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ugyldige importeringsvalg\n"
 
-#: g10/gpg.c:3333
+#: g10/gpg.c:3336
 #, c-format
 msgid "invalid import options\n"
 msgstr "ugyldige importeringsvalg\n"
 
-#: g10/gpg.c:3339 g10/gpg.c:3354
+#: g10/gpg.c:3342 g10/gpg.c:3357
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "filtervalget %s er ugyldig\n"
 
-#: g10/gpg.c:3345
+#: g10/gpg.c:3348
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ugyldige eksporteringsvalg\n"
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3351
 #, c-format
 msgid "invalid export options\n"
 msgstr "ugyldige eksporteringsvalg\n"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3363
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ugyldige listevalg\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3366
 #, c-format
 msgid "invalid list options\n"
 msgstr "ugyldige listevalg\n"
 
-#: g10/gpg.c:3371
+#: g10/gpg.c:3374
 msgid "display photo IDs during signature verification"
 msgstr "vis bruker-ID under signaturbekreftelse"
 
-#: g10/gpg.c:3373
+#: g10/gpg.c:3376
 msgid "show policy URLs during signature verification"
 msgstr "vis adresser til retningslinjer under signaturbekreftelse"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3378
 msgid "show all notations during signature verification"
 msgstr "vis alle merknader under signaturbekreftelse"
 
-#: g10/gpg.c:3377
+#: g10/gpg.c:3380
 msgid "show IETF standard notations during signature verification"
 msgstr "vis IETF-standardnotater under signaturbekreftelse"
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3384
 msgid "show user-supplied notations during signature verification"
 msgstr "vis selvvalgte merknader under signaturbekreftelse"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3386
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "vis adresser til foretrukne nøkkeltjenere under signaturbekreftelse"
 
-#: g10/gpg.c:3385
+#: g10/gpg.c:3388
 msgid "show user ID validity during signature verification"
 msgstr "vis gyldighet for bruker-ID under signaturbekreftelse"
 
-#: g10/gpg.c:3387
+#: g10/gpg.c:3390
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "vis opphevede og utgåtte bruker-id-er under signaturbekreftelse"
 
-#: g10/gpg.c:3389
+#: g10/gpg.c:3392
 msgid "show only the primary user ID in signature verification"
 msgstr "bare vis primærbrukerens ID under signaturbekreftelse"
 
-#: g10/gpg.c:3396
+#: g10/gpg.c:3399
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ugyldige kontrollvalg\n"
 
-#: g10/gpg.c:3399
+#: g10/gpg.c:3402
 #, c-format
 msgid "invalid verify options\n"
 msgstr "ugyldige kontrollvalg\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3409
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "klarte ikke å endre «exec»-sti til %s\n"
 
-#: g10/gpg.c:3613
+#: g10/gpg.c:3616
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ugyldig «auto-key-locate»-liste\n"
 
-#: g10/gpg.c:3616
+#: g10/gpg.c:3619
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "ugyldig «auto-key-locate»-liste\n"
 
-#: g10/gpg.c:3625
+#: g10/gpg.c:3628
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "ugyldig argument for valget «%.50s»\n"
 
-#: g10/gpg.c:3807 sm/gpgsm.c:1675
+#: g10/gpg.c:3804 sm/gpgsm.c:1528
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "ADVARSEL: programmet kan lage en kjernefil.\n"
 
-#: g10/gpg.c:3821
+#: g10/gpg.c:3818
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ADVARSEL: %s overstyrere %s\n"
 
-#: g10/gpg.c:3830
+#: g10/gpg.c:3827
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "du kan ikke bruke %s med %s.\n"
 
-#: g10/gpg.c:3833
+#: g10/gpg.c:3830
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s gir ikke mening med %s.\n"
 
-#: g10/gpg.c:3848 sm/gpgsm.c:1696 dirmngr/dirmngr.c:1123
+#: g10/gpg.c:3845 sm/gpgsm.c:1549 dirmngr/dirmngr.c:1160
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "ADVARSEL: kjører med falsk systemtid: "
 
-#: g10/gpg.c:3869
+#: g10/gpg.c:3866
 #, 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:3897 g10/gpg.c:3928 sm/gpgsm.c:1763
+#: g10/gpg.c:3894 g10/gpg.c:3925 sm/gpgsm.c:1616
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgt krypteringsalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3901
 #, 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:3916
+#: g10/gpg.c:3913
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "valgt komprimeringsalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3922
+#: g10/gpg.c:3919
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valgt kontrollsum-algoritme for sertifisering er ugyldig\n"
 
-#: g10/gpg.c:3937
+#: g10/gpg.c:3934
 #, 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:3939
+#: g10/gpg.c:3936
 #, 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:3941
+#: g10/gpg.c:3938
 #, 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:3943
+#: g10/gpg.c:3940
 #, 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:3945
+#: g10/gpg.c:3942
 #, 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:3949
+#: g10/gpg.c:3946
 #, 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:3953
+#: g10/gpg.c:3950
 #, 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:3960
+#: g10/gpg.c:3957
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "ugyldig standardoppsett\n"
 
-#: g10/gpg.c:3964
+#: g10/gpg.c:3961
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "ugyldig personlig oppsett av krypteringsmetode\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3964
 #, 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:3971
+#: g10/gpg.c:3968
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "ugyldig personlig oppsett av kontrollsummetode\n"
 
-#: g10/gpg.c:3975
+#: g10/gpg.c:3972
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "ugyldig personlig oppsett av komprimeringsmetode\n"
 
-#: g10/gpg.c:3984 g10/gpg.c:3989
+#: g10/gpg.c:3981 g10/gpg.c:3986
 #, 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:4026
+#: g10/gpg.c:4023
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s virker ikke enda med %s\n"
 
-#: g10/gpg.c:4089
+#: g10/gpg.c:4086
 #, 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:4101
+#: g10/gpg.c:4098
 #, 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:4256
+#: g10/gpg.c:4253
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "klarte ikke å starte tillitsdatabase (TrustDB): %s\n"
 
-#: g10/gpg.c:4268
+#: g10/gpg.c:4265
 #, 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:4340
+#: g10/gpg.c:4337
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "symmetrisk kryptering av «%s» mislyktes: %s\n"
 
-#: g10/gpg.c:4369
+#: g10/gpg.c:4366
 #, 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:4372
+#: g10/gpg.c:4369
 #, 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:4430
+#: g10/gpg.c:4427
 #, 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:4433
+#: g10/gpg.c:4430
 #, 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:4821 g10/keyserver.c:1870
+#: g10/gpg.c:4818 g10/keyserver.c:1629
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "sending til nøkkeltjener mislyktes: %s\n"
 
-#: g10/gpg.c:4826
+#: g10/gpg.c:4823
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "mottak fra nøkkeltjener mislyktes: %s\n"
 
-#: g10/gpg.c:4832
+#: g10/gpg.c:4829
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "nøkkeleksport mislyktes: %s\n"
 
-#: g10/gpg.c:4845
+#: g10/gpg.c:4842
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "eksportering som ssh-nøkkel mislyktes: %s\n"
 
-#: g10/gpg.c:4857
+#: g10/gpg.c:4854
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "søk på nøkkeltjener mislyktes: %s\n"
 
-#: g10/gpg.c:4870
+#: g10/gpg.c:4867
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "oppdatering av nøkkeltjener mislyktes: %s\n"
 
-#: g10/gpg.c:4937
+#: g10/gpg.c:4936
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dearmoring failed: %s\n"
 
-#: g10/gpg.c:4948
+#: g10/gpg.c:4947
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enarmoring failed: %s\n"
 
-#: g10/gpg.c:5053
+#: g10/gpg.c:5052
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "«%s» er en ugyldig summeringsalgoritme\n"
 
-#: g10/gpg.c:5205 g10/tofu.c:2156
+#: g10/gpg.c:5204 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:5216
+#: g10/gpg.c:5215
 #, 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:5272
+#: g10/gpg.c:5271
 #, 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:5283
+#: g10/gpg.c:5282
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Skriv inn melding …\n"
 
-#: g10/gpg.c:5630
+#: g10/gpg.c:5629
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "valgt adresse for sertifikasjonsregler er ugyldig\n"
 
-#: g10/gpg.c:5632
+#: g10/gpg.c:5631
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "valgt adresse for signaturregler er ugyldig\n"
 
-#: g10/gpg.c:5665
+#: g10/gpg.c:5664
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "valgt adresse for foretrukket nøkkeltjener er ugyldig\n"
@@ -3407,7 +3422,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:414 tools/gpgconf.c:116 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:415 tools/gpgconf.c:116 tools/gpg-card.c:95
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skrive statusinfo til denne FD"
 
@@ -3496,97 +3511,97 @@ msgstr "forvent GnuPG-format på sikkerhetskopierte nøkler"
 msgid "repair keys on import"
 msgstr "reparer nøkler under importering"
 
-#: g10/import.c:399 g10/import.c:721
+#: g10/import.c:407 g10/import.c:729
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "hopper over blokk av typen %d\n"
 
-#: g10/import.c:738
+#: g10/import.c:746
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu nøkler behandlet hittil\n"
 
-#: g10/import.c:831
+#: g10/import.c:839
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Totalt antall behandlet: %lu\n"
 
-#: g10/import.c:834
+#: g10/import.c:842
 #, c-format
 msgid "    skipped PGP-2 keys: %lu\n"
 msgstr "    hopper over PGP 2-nøkler: %lu\n"
 
-#: g10/import.c:836
+#: g10/import.c:844
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      nye nøkler som ble hoppet over: %lu\n"
 
-#: g10/import.c:839
+#: g10/import.c:847
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          uten bruker-id-er: %lu\n"
 
-#: g10/import.c:842 sm/import.c:129
+#: g10/import.c:850 sm/import.c:129
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importert: %lu"
 
-#: g10/import.c:846 sm/import.c:133
+#: g10/import.c:854 sm/import.c:133
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             uendret: %lu\n"
 
-#: g10/import.c:848
+#: g10/import.c:856
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          nye bruker-id-er: %lu\n"
 
-#: g10/import.c:850
+#: g10/import.c:858
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           nye undernøkler: %lu\n"
 
-#: g10/import.c:852
+#: g10/import.c:860
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        nye signaturer: %lu\n"
 
-#: g10/import.c:854
+#: g10/import.c:862
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   nye nøkkelopphevinger: %lu\n"
 
-#: g10/import.c:856 sm/import.c:135
+#: g10/import.c:864 sm/import.c:135
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      leste hemmelige nøkler: %lu\n"
 
-#: g10/import.c:858 sm/import.c:137
+#: g10/import.c:866 sm/import.c:137
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  importerte hemmelige nøkler: %lu\n"
 
-#: g10/import.c:860 sm/import.c:139
+#: g10/import.c:868 sm/import.c:139
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " uforandrede hemmelige nøkler: %lu\n"
 
-#: g10/import.c:862 sm/import.c:141
+#: g10/import.c:870 sm/import.c:141
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "          ikke importert: %lu\n"
 
-#: g10/import.c:864
+#: g10/import.c:872
 #, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "    oppryddete signaturer: %lu\n"
 
-#: g10/import.c:866
+#: g10/import.c:874
 #, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "      tømte bruker-id-er: %lu\n"
 
-#: g10/import.c:1291
+#: g10/import.c:1299
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
@@ -3595,175 +3610,175 @@ msgstr ""
 "ADVARSEL: nøkkelen %s inneholder innstillinger for\n"
 "utilgjengelige algoritmer på følgende bruker-id-er:\n"
 
-#: g10/import.c:1333
+#: g10/import.c:1341
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         «%s»: innstilling for krypteringsalgoritme %s\n"
 
-#: g10/import.c:1351
+#: g10/import.c:1359
 #, fuzzy, c-format
 #| msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgid "         \"%s\": preference for AEAD algorithm %s\n"
 msgstr "         «%s»: innstilling for krypteringsalgoritme %s\n"
 
-#: g10/import.c:1366
+#: g10/import.c:1374
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         «%s»: oppsett for kontrollsum-algoritme %s\n"
 
-#: g10/import.c:1378
+#: g10/import.c:1386
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         «%s»: oppsett av komprimeringsalgoritme %s\n"
 
-#: g10/import.c:1391
+#: g10/import.c:1399
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "du anbefales på det sterkeste å endre oppsett og\n"
 
-#: g10/import.c:1393
+#: g10/import.c:1401
 #, c-format
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "dele ut denne nøkkelen på nytt for å unngå potensielle problemer med "
 "algoritme-samsvar\n"
 
-#: g10/import.c:1418
+#: g10/import.c:1426
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 "oppdater oppsettet med følgende kommando: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:1932 g10/import.c:3053
+#: g10/import.c:1940 g10/import.c:3061
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "nøkkel %s: ingen bruker-ID\n"
 
-#: g10/import.c:1938
+#: g10/import.c:1946
 #, c-format
 msgid "key %s: %s\n"
 msgstr "nøkkel %s: %s\n"
 
-#: g10/import.c:1939 g10/import.c:3025
+#: g10/import.c:1947 g10/import.c:3033
 msgid "rejected by import screener"
 msgstr "avvist av importeringskontrollør"
 
-#: g10/import.c:1988
+#: g10/import.c:1996
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "nøkkel %s: PKS-undernøkkel reparert\n"
 
-#: g10/import.c:2009
+#: g10/import.c:2017
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "nøkkel %s: akseptert ikke-selvsignert bruker-ID «%s»\n"
 
-#: g10/import.c:2020 g10/import.c:2051
+#: g10/import.c:2028 g10/import.c:2059
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "nøkkel %s: ingen gyldig bruker-id-er\n"
 
-#: g10/import.c:2022
+#: g10/import.c:2030
 #, c-format
 msgid "this may be caused by a missing self-signature\n"
 msgstr "dette kan skyldes manglende selvsignatur\n"
 
-#: g10/import.c:2101 g10/import.c:3439
+#: g10/import.c:2109 g10/import.c:3447
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "nøkkel %s: fant ikke offentlig nøkkel: %s\n"
 
-#: g10/import.c:2107
+#: g10/import.c:2115
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "nøkkel %s: ny nøkkel. Hoppet over\n"
 
-#: g10/import.c:2119
+#: g10/import.c:2127
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "fant ikke skrivbart nøkkelknippe: %s\n"
 
-#: g10/import.c:2151 g10/import.c:2253 g10/import.c:3514
+#: g10/import.c:2159 g10/import.c:2261 g10/import.c:3522
 #, c-format
 msgid "error writing keyring '%s': %s\n"
 msgstr "feil under skriving av nøkkelknippe «%s»: %s\n"
 
-#: g10/import.c:2174
+#: g10/import.c:2182
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "nøkkel %s: offentlig nøkkel «%s» importert\n"
 
-#: g10/import.c:2201
+#: g10/import.c:2209
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "nøkkel %s: stemmer ikke med vår kopi\n"
 
-#: g10/import.c:2269
+#: g10/import.c:2277
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "nøkkel %s: «%s» 1 ny bruker-ID\n"
 
-#: g10/import.c:2272
+#: g10/import.c:2280
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "nøkkel %s: «%s» %d nye bruker-id-er\n"
 
-#: g10/import.c:2275
+#: g10/import.c:2283
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "nøkkel %s: «%s» 1 ny signatur\n"
 
-#: g10/import.c:2278
+#: g10/import.c:2286
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "nøkkel: %s: «%s» %d nye signaturer\n"
 
-#: g10/import.c:2281
+#: g10/import.c:2289
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "nøkkel %s: «%s» 1 ny undernøkkel\n"
 
-#: g10/import.c:2284
+#: g10/import.c:2292
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "nøkkel %s: «%s» %d nye undernøkler\n"
 
-#: g10/import.c:2287
+#: g10/import.c:2295
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "nøkkel: %s: «%s» %d nye signaturer\n"
 
-#: g10/import.c:2290
+#: g10/import.c:2298
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "nøkkel: %s: «%s» %d nye signaturer\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2301
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "nøkkel %s: «%s» %d nye bruker-id-er\n"
 
-#: g10/import.c:2296
+#: g10/import.c:2304
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "nøkkel %s: «%s» %d nye bruker-id-er\n"
 
-#: g10/import.c:2332
+#: g10/import.c:2340
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "nøkkel %s: «%s» ikke endret\n"
 
-#: g10/import.c:2692 g10/import.c:2887
+#: g10/import.c:2700 g10/import.c:2895
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "nøkkel %s: hemmelig nøkkel importert\n"
 
-#: g10/import.c:2700
+#: g10/import.c:2708
 #, c-format
 msgid "key %s: secret key already exists\n"
 msgstr "nøkkel %s: hemmelig nøkkel finnes allerede\n"
 
-#: g10/import.c:2708
+#: g10/import.c:2716
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "nøkkel %s: feil under sending til agent: %s\n"
@@ -3776,209 +3791,208 @@ msgstr "nøkkel %s: feil under sending til agent: %s\n"
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2877
+#: g10/import.c:2885
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr "Kjør følgende kommando for å flytte «%s»: %s\n"
 
-#: g10/import.c:3024
+#: g10/import.c:3032
 #, c-format
 msgid "secret key %s: %s\n"
 msgstr "hemmelig nøkkel %s: %s\n"
 
-#: g10/import.c:3045 g10/import.c:3084
+#: g10/import.c:3053 g10/import.c:3092
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "importering av hemmelig nøkkel er ikke tillatt\n"
 
-#: g10/import.c:3072
+#: g10/import.c:3080
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr ""
 "nøkkel %s: hemmelig nøkkel med ugyldig krypteringsmetode %d - hoppet over\n"
 
-#: g10/import.c:3234 g10/pkclist.c:75 g10/revoke.c:774
+#: g10/import.c:3242 g10/pkclist.c:75 g10/revoke.c:775
 msgid "No reason specified"
 msgstr "Ingen grunn oppgitt"
 
-#: g10/import.c:3235 g10/pkclist.c:77 g10/revoke.c:776
+#: g10/import.c:3243 g10/pkclist.c:77 g10/revoke.c:777
 msgid "Key is superseded"
 msgstr "Nøkkelen er overgått"
 
-#: g10/import.c:3236 g10/pkclist.c:79 g10/revoke.c:775
+#: g10/import.c:3244 g10/pkclist.c:79 g10/revoke.c:776
 msgid "Key has been compromised"
 msgstr "Nøkkelen har blitt kompromittert"
 
-#: g10/import.c:3237 g10/pkclist.c:81 g10/revoke.c:777
+#: g10/import.c:3245 g10/pkclist.c:81 g10/revoke.c:778
 msgid "Key is no longer used"
 msgstr "Nøkkelen er ikke lengre i bruk"
 
-#: g10/import.c:3238 g10/pkclist.c:83 g10/revoke.c:778
+#: g10/import.c:3246 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "Bruker-ID er ikke lenger gyldig"
 
-#: g10/import.c:3363 g10/keylist.c:1105 g10/pkclist.c:87
+#: g10/import.c:3371 g10/keylist.c:1105 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "grunnen for opphevelse: "
 
-#: g10/import.c:3382 g10/keylist.c:1124 g10/pkclist.c:103
+#: g10/import.c:3390 g10/keylist.c:1124 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "kommentar til opphevelse: "
 
-#: g10/import.c:3432
+#: g10/import.c:3440
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "nøkkel %s: offentlig nøkkel mangler. Klarte ikke å bruke "
 "opphevelsessertifikat\n"
 
-#: g10/import.c:3461
+#: g10/import.c:3469
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "nøkkel %s: finner ikke original nøkkelblokk: %s\n"
 
-#: g10/import.c:3468
+#: g10/import.c:3476
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "nøkkel %s: klarte ikke å lese opprinnelig nøkkelblokk: %s\n"
 
-#: g10/import.c:3488
+#: g10/import.c:3496
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "nøkkel %s: ugyldig opphevingssertifikat: %s - avvist\n"
 
-#: g10/import.c:3523
+#: g10/import.c:3531
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "nøkkel %s: «%s» opphevingssertifikat importert\n"
 
-#: g10/import.c:3609
+#: g10/import.c:3617
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "nøkkel %s: ingen bruker-ID for signatur\n"
 
-#: g10/import.c:3626
+#: g10/import.c:3634
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "nøkkel %s: offentlig nøkkelalgoritme for bruker-ID («%s») støttes ikke\n"
 
-#: g10/import.c:3628
+#: g10/import.c:3636
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "nøkkel %s: ugyldig selvsignatur for bruker-ID «%s»\n"
 
-#: g10/import.c:3645 g10/import.c:3673 g10/import.c:3729
+#: g10/import.c:3653 g10/import.c:3681 g10/import.c:3737
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "nøkkel %s: ustøttet offentlig nøkkelalgoritme\n"
 
-#: g10/import.c:3646
+#: g10/import.c:3654
 #, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "nøkkel %s: ugyldig direkte nøkkelsignatur\n"
 
-#: g10/import.c:3660
+#: g10/import.c:3668
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "nøkkel %s: ingen undernøkkel for nøkkelbinding\n"
 
-#: g10/import.c:3675
+#: g10/import.c:3683
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "nøkkel %s: ugyldig undernøkkelbinding\n"
 
-#: g10/import.c:3694
+#: g10/import.c:3702
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "nøkkel %s: fjernet flere undernøkkelbindinger\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3726
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "nøkkel %s: ingen undernøkkel for nøkkeloppheving\n"
 
-#: g10/import.c:3731
+#: g10/import.c:3739
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "nøkkel %s: ugyldig undernøkkeloppheving\n"
 
-#: g10/import.c:3746
+#: g10/import.c:3754
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "nøkkel %s: fjernet flere undernøkkelopphevinger\n"
 
-#: g10/import.c:3790
+#: g10/import.c:3798
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "nøkkel %s: hoppet over bruker-ID «%s»\n"
 
-#: g10/import.c:3817
+#: g10/import.c:3825
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "nøkkel %s: hoppet over undernøkkel\n"
 
-#: g10/import.c:3849
+#: g10/import.c:3857
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "nøkkel %s: ikke-eksporterbar signatur (klasse 0x%02X) - hoppet over\n"
 
-#: g10/import.c:3860
+#: g10/import.c:3868
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "nøkkel %s: opphevingssertifikat på feil plass - hoppet over\n"
 
-#: g10/import.c:3878
+#: g10/import.c:3886
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "nøkkel %s: ugyldig opphevingssertifikat: %s - hoppet over\n"
 
-#: g10/import.c:3892
+#: g10/import.c:3900
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "nøkkel %s: undernøkkelsignatur på feil plass - hoppet over\n"
 
-#: g10/import.c:3900
+#: g10/import.c:3908
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "nøkkel %s: uforventet signaturklasse (0x%02X) - hoppet over\n"
 
-#: g10/import.c:4073
+#: g10/import.c:4081
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "nøkkel %s: oppdaget duplisert bruker-ID. Slått sammen\n"
 
-#: g10/import.c:4180
+#: g10/import.c:4188
 #, fuzzy, c-format
 #| msgid "key %s: duplicated user ID detected - merged\n"
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr "nøkkel %s: oppdaget duplisert bruker-ID. Slått sammen\n"
 
-#: g10/import.c:4245
+#: g10/import.c:4253
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "ADVARSEL: nøkkel %s kan være opphevet: henter opphevingsnøkkel %s\n"
 
-#: g10/import.c:4261
+#: g10/import.c:4269
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "ADVARSEL: nøkkel %s kan være opphevet: opphevingsnøkkel %s ikke tilstede.\n"
 
-#: g10/import.c:4327
+#: g10/import.c:4335
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "nøkkel %s: «%s» opphevingssertifikat lagt til\n"
 
-#: g10/import.c:4365
+#: g10/import.c:4373
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "nøkkel %s: direkte nøkkelsignatur lagt til\n"
 
-#: g10/key-check.c:133 dirmngr/dirmngr_ldap.c:650 dirmngr/ldap-wrapper.c:835
-#: dirmngr/ldap-wrapper.c:852
+#: g10/key-check.c:133 dirmngr/ldap-wrapper.c:835 dirmngr/ldap-wrapper.c:852
 #, c-format
 msgid "error allocating memory: %s\n"
 msgstr "feil under minnetildeling: %s\n"
@@ -4044,7 +4058,7 @@ msgstr ""
 "Advarsel: fant feil og kontrollerte bare selvsignaturer. Kjør «%s» for å "
 "kontrollere alle signaturer.\n"
 
-#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:284 sm/keydb.c:297
+#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:289 sm/keydb.c:302
 #, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "feil under opprettelse av nøkkelskrin «%s»: %s\n"
@@ -4054,7 +4068,7 @@ msgstr "feil under opprettelse av nøkkelskrin «%s»: %s\n"
 msgid "error creating keyring '%s': %s\n"
 msgstr "feil under opprettelse av nøkkelknippe «%s»: %s\n"
 
-#: g10/keydb.c:388 sm/keydb.c:303
+#: g10/keydb.c:388 sm/keydb.c:308
 #, c-format
 msgid "keybox '%s' created\n"
 msgstr "nøkkelskrin «%s» er opprettet\n"
@@ -4308,8 +4322,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:6192 g10/keyedit.c:6275 g10/keyedit.c:6404
-#: g10/keyedit.c:6466 g10/sign.c:528
+#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
+#: g10/keyedit.c:6474 g10/sign.c:528
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signering mislyktes: %s\n"
@@ -4685,7 +4699,7 @@ msgstr "Ingen treff på bruker-id-er."
 msgid "Nothing to sign.\n"
 msgstr "Ingenting å signere.\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6057
+#: g10/keyedit.c:2973 g10/keyedit.c:6065
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "Ikke signert av deg.\n"
@@ -4753,7 +4767,7 @@ msgstr "Denne nøkkelen kan bli opphevet av %s med nøkkelen %s"
 msgid "(sensitive)"
 msgstr "(sensitiv)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:525
+#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "opprettet: %s"
@@ -4769,7 +4783,7 @@ msgid "expired: %s"
 msgstr "utgikk: %s"
 
 #: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2262
-#: g10/keyserver.c:531
+#: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "utgår: %s"
@@ -4805,13 +4819,13 @@ 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:535
-#: g10/mainproc.c:2280 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
+#: g10/mainproc.c:2282 g10/tofu.c:1789 g10/trust.c:426 dirmngr/ocsp.c:792
 msgid "revoked"
 msgstr "opphevet"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:539
-#: g10/mainproc.c:2282 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
+#: g10/mainproc.c:2284 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "utgått"
 
@@ -4852,7 +4866,7 @@ msgstr "Er du sikker på at du vil legge den til? (j/N) "
 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:3107
+#: g10/keyedit.c:4273 g10/keygen.c:3111
 msgid "Such a user ID already exists on this key!\n"
 msgstr "Valgt bruker-ID finnes allerede på denne nøkkelen!\n"
 
@@ -4999,7 +5013,7 @@ msgstr ""
 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:5357 g10/keyedit.c:5495
+#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "hopper over v3-selvsignatur for bruker-ID «%s»\n"
@@ -5008,127 +5022,127 @@ msgstr "hopper over v3-selvsignatur for bruker-ID «%s»\n"
 msgid "Enter your preferred keyserver URL: "
 msgstr "Skriv inn adresse til foretrukket nøkkeltjener: "
 
-#: g10/keyedit.c:5380
+#: g10/keyedit.c:5383
 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:5381
+#: g10/keyedit.c:5384
 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:5441
+#: g10/keyedit.c:5449
 msgid "Enter the notation: "
 msgstr "Skriv inn notat: "
 
-#: g10/keyedit.c:5588
+#: g10/keyedit.c:5596
 msgid "Proceed? (y/N) "
 msgstr "Vil du fortsette? (j/N) "
 
-#: g10/keyedit.c:5658
+#: g10/keyedit.c:5666
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen bruker-ID med indeks %d\n"
 
-#: g10/keyedit.c:5720
+#: g10/keyedit.c:5728
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Ingen bruker-ID med kontrollsum %s\n"
 
-#: g10/keyedit.c:5821
+#: g10/keyedit.c:5829
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Ingen undernøkkel med ID «%s».\n"
 
-#: g10/keyedit.c:5843
+#: g10/keyedit.c:5851
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Ingen undernøkkel med indeks %d\n"
 
-#: g10/keyedit.c:5984
+#: g10/keyedit.c:5992
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "bruker-ID: «%s»\n"
 
-#: g10/keyedit.c:5987 g10/keyedit.c:6089 g10/keyedit.c:6137
+#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
 #, 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:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
+#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
 msgid " (non-exportable)"
 msgstr " (ikke-eksporterbar)"
 
-#: g10/keyedit.c:5993
+#: g10/keyedit.c:6001
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denne signaturen utgikk %s.\n"
 
-#: g10/keyedit.c:5998
+#: g10/keyedit.c:6006
 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:6003
+#: g10/keyedit.c:6011
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vil du lage et opphevelsessertifikat for denne signaturen? (j/N) "
 
-#: g10/keyedit.c:6063
+#: g10/keyedit.c:6071
 #, 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:6092
+#: g10/keyedit.c:6100
 msgid " (non-revocable)"
 msgstr " (kan ikke oppheves)"
 
-#: g10/keyedit.c:6099
+#: g10/keyedit.c:6107
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "opphevet med nøkkelen %s %s\n"
 
-#: g10/keyedit.c:6124
+#: g10/keyedit.c:6132
 msgid "You are about to revoke these signatures:\n"
 msgstr "Du er i ferd med å oppheve følgende signaturer:\n"
 
-#: g10/keyedit.c:6147
+#: g10/keyedit.c:6155
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Er du sikker på at du vil lage opphevelsessertifikatene? (j/N) "
 
-#: g10/keyedit.c:6180
+#: g10/keyedit.c:6188
 #, c-format
 msgid "no secret key\n"
 msgstr "ingen hemmelig nøkkel\n"
 
-#: g10/keyedit.c:6228
+#: g10/keyedit.c:6236
 #, 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:6238
+#: g10/keyedit.c:6246
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "bruker-ID «%s» er allerede opphevet\n"
 
-#: g10/keyedit.c:6255
+#: g10/keyedit.c:6263
 #, 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:6351
+#: g10/keyedit.c:6359
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Klarte ikke å oppheve siste gyldige bruker-ID.\n"
 
-#: g10/keyedit.c:6389
+#: g10/keyedit.c:6397
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Nøkkelen %s er allerede opphevet.\n"
 
-#: g10/keyedit.c:6451
+#: g10/keyedit.c:6459
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Undernøkkel %s er allerede opphevet.\n"
 
-#: g10/keyedit.c:6548
+#: g10/keyedit.c:6556
 #, 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"
@@ -5138,64 +5152,64 @@ msgstr "Viser %s foto-ID av størrelsen %ld for nøkkel %s (uid %d)\n"
 msgid "invalid value for option '%s'\n"
 msgstr "ugyldig verdi for valg «%s»\n"
 
-#: g10/keygen.c:338
+#: g10/keygen.c:339
 #, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "innstilling «%s» er duplisert\n"
 
-#: g10/keygen.c:345
+#: g10/keygen.c:346
 #, c-format
 msgid "too many cipher preferences\n"
 msgstr "for mange krypteringsinnstillinger\n"
 
-#: g10/keygen.c:347
+#: g10/keygen.c:348
 #, c-format
 msgid "too many digest preferences\n"
 msgstr "for mange kontrollsum-innstillinger\n"
 
-#: g10/keygen.c:349
+#: g10/keygen.c:350
 #, c-format
 msgid "too many compression preferences\n"
 msgstr "for mange komprimeringsinnstillinger\n"
 
-#: g10/keygen.c:351
+#: g10/keygen.c:352
 #, fuzzy, c-format
 #| msgid "too many cipher preferences\n"
 msgid "too many AEAD preferences\n"
 msgstr "for mange krypteringsinnstillinger\n"
 
-#: g10/keygen.c:521
+#: g10/keygen.c:522
 #, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "«%s» er et ugyldig oppsettsvalg\n"
 
-#: g10/keygen.c:1130
+#: g10/keygen.c:1131
 #, c-format
 msgid "writing direct signature\n"
 msgstr "skriver direkte signatur\n"
 
-#: g10/keygen.c:1176
+#: g10/keygen.c:1177
 #, c-format
 msgid "writing self signature\n"
 msgstr "skriver selvsignatur\n"
 
-#: g10/keygen.c:1233
+#: g10/keygen.c:1234
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "skriver nøkkelbindende signatur\n"
 
-#: g10/keygen.c:1598 g10/keygen.c:1603 g10/keygen.c:1655 g10/keygen.c:1660
-#: g10/keygen.c:1832 g10/keygen.c:1837
+#: g10/keygen.c:1599 g10/keygen.c:1604 g10/keygen.c:1656 g10/keygen.c:1661
+#: g10/keygen.c:1833 g10/keygen.c:1838
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "ugyldig nøkkelstørrelse. Bruker %u bit\n"
 
-#: g10/keygen.c:1609 g10/keygen.c:1666 g10/keygen.c:1674 g10/keygen.c:1843
+#: g10/keygen.c:1610 g10/keygen.c:1667 g10/keygen.c:1675 g10/keygen.c:1844
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "nøkkelstørrelse rundet opp til %u bit\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1701
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
@@ -5203,19 +5217,19 @@ msgstr ""
 "ADVARSEL: noen OpenPGP-programmer klarer ikke å behandle DSA-nøkler med "
 "denne kontrollsum-størrelsen\n"
 
-#: g10/keygen.c:1899
+#: g10/keygen.c:1900
 msgid "Sign"
 msgstr "Signere"
 
-#: g10/keygen.c:1902
+#: g10/keygen.c:1903
 msgid "Certify"
 msgstr "Bekrefte"
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1906
 msgid "Encrypt"
 msgstr "Kryptere data"
 
-#: g10/keygen.c:1908
+#: g10/keygen.c:1909
 msgid "Authenticate"
 msgstr "Autentisere"
 
@@ -5233,180 +5247,180 @@ msgstr "Autentisere"
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1929
+#: g10/keygen.c:1930
 msgid "SsEeAaQq"
 msgstr "SsKkAaQq"
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1967
 #, fuzzy, c-format
 #| msgid "Possible actions for a %s key: "
 msgid "Possible actions for this %s key: "
 msgstr "Mulige handlinger med en %s-nøkkel: "
 
-#: g10/keygen.c:1973
+#: g10/keygen.c:1974
 msgid "Current allowed actions: "
 msgstr "Tillatte handlinger: "
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1979
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Slå av/på signeringsfunksjon\n"
 
-#: g10/keygen.c:1981
+#: g10/keygen.c:1982
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Slå av/på krypteringsfunksjon\n"
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1985
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Slå av/på autentiseringsfunksjon\n"
 
-#: g10/keygen.c:1987
+#: g10/keygen.c:1988
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Ferdig\n"
 
-#: g10/keygen.c:2116
+#: g10/keygen.c:2117
 #, fuzzy, c-format
 #| msgid "   (%d) RSA and RSA (default)\n"
 msgid "   (%d) RSA and RSA%s\n"
 msgstr "   (%d) RSA og RSA (standard)\n"
 
-#: g10/keygen.c:2120
+#: g10/keygen.c:2121
 #, fuzzy, c-format
 #| msgid "   (%d) DSA and Elgamal\n"
 msgid "   (%d) DSA and Elgamal%s\n"
 msgstr "   (%d) DSA og Elgamal\n"
 
-#: g10/keygen.c:2123
+#: g10/keygen.c:2124
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "   (%d) DSA (sign only)%s\n"
 msgstr "   (%d) DSA (bare signering)\n"
 
-#: g10/keygen.c:2125
+#: g10/keygen.c:2126
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (sign only)\n"
 msgid "   (%d) RSA (sign only)%s\n"
 msgstr "   (%d) RSA (bare signering)\n"
 
-#: g10/keygen.c:2131
+#: g10/keygen.c:2132
 #, fuzzy, c-format
 #| msgid "   (%d) Elgamal (encrypt only)\n"
 msgid "   (%d) Elgamal (encrypt only)%s\n"
 msgstr "   (%d) ElGamal (bare kryptering)\n"
 
-#: g10/keygen.c:2133
+#: g10/keygen.c:2134
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (encrypt only)\n"
 msgid "   (%d) RSA (encrypt only)%s\n"
 msgstr "   (%d) RSA (bare kryptering)\n"
 
-#: g10/keygen.c:2139
+#: g10/keygen.c:2140
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (set your own capabilities)\n"
 msgid "   (%d) DSA (set your own capabilities)%s\n"
 msgstr "   (%d) DSA (sette dine egne muligheter)\n"
 
-#: g10/keygen.c:2141
+#: g10/keygen.c:2142
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (set your own capabilities)\n"
 msgid "   (%d) RSA (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (sette dine egne muligheter)\n"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2148
 #, fuzzy, c-format
 #| msgid "   (%d) sign, encrypt\n"
 msgid "   (%d) ECC (sign and encrypt)%s\n"
 msgstr "   (%d) signer, krypter\n"
 
-#: g10/keygen.c:2147 g10/keygen.c:2678
+#: g10/keygen.c:2148 g10/keygen.c:2679
 msgid " *default*"
 msgstr ""
 
-#: g10/keygen.c:2148
+#: g10/keygen.c:2149
 #, c-format
 msgid "  (%d) ECC (sign only)\n"
 msgstr "  (%d) ECC (kun signering)\n"
 
-#: g10/keygen.c:2150
+#: g10/keygen.c:2151
 #, fuzzy, c-format
 #| msgid "  (%d) ECC (set your own capabilities)\n"
 msgid "  (%d) ECC (set your own capabilities)%s\n"
 msgstr "  (%d) ECC (velg funksjoner selv)\n"
 
-#: g10/keygen.c:2152
+#: g10/keygen.c:2153
 #, fuzzy, c-format
 #| msgid "  (%d) ECC (encrypt only)\n"
 msgid "  (%d) ECC (encrypt only)%s\n"
 msgstr "  (%d) ECC (kun kryptering)\n"
 
-#: g10/keygen.c:2156
+#: g10/keygen.c:2157
 #, fuzzy, c-format
 #| msgid "  (%d) Existing key\n"
 msgid "  (%d) Existing key%s\n"
 msgstr "  (%d) Nøkkel\n"
 
-#: g10/keygen.c:2158
+#: g10/keygen.c:2159
 #, fuzzy, c-format
 #| msgid "   (%d) Existing key from card\n"
 msgid "  (%d) Existing key from card%s\n"
 msgstr "   (%d) Nøkkel fra kort\n"
 
-#: g10/keygen.c:2254 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2255 sm/certreqgen-ui.c:203
 msgid "Enter the keygrip: "
 msgstr "Skriv inn nøkkelgrep: "
 
-#: g10/keygen.c:2267 sm/certreqgen-ui.c:211 tools/gpg-card.c:2280
+#: g10/keygen.c:2268 sm/certreqgen-ui.c:211 tools/gpg-card.c:2297
 #, c-format
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr "Ugyldig nøkkelgrep (forventer 40 heks-sifre)\n"
 
-#: g10/keygen.c:2269 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2270 sm/certreqgen-ui.c:213
 msgid "No key with this keygrip\n"
 msgstr "Ingen nøkkel med dette nøkkelgrepet\n"
 
-#: g10/keygen.c:2288 g10/keygen.c:2298 g10/keygen.c:3440 g10/keygen.c:3451
+#: g10/keygen.c:2289 g10/keygen.c:2299 g10/keygen.c:3444 g10/keygen.c:3455
 #: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
 #, c-format
 msgid "error reading the card: %s\n"
 msgstr "feil under lesing av kort: %s\n"
 
-#: g10/keygen.c:2292 g10/keygen.c:3444 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2293 g10/keygen.c:3448 sm/certreqgen-ui.c:234
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "Kortets serienummer: %s\n"
 
-#: g10/keygen.c:2311 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2312 sm/certreqgen-ui.c:246
 msgid "Available keys:\n"
 msgstr "Tilgjengelige nøkler:\n"
 
-#: g10/keygen.c:2504 g10/keygen.c:2518
+#: g10/keygen.c:2505 g10/keygen.c:2519
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr "rundet av til %u bit\n"
 
-#: g10/keygen.c:2559
+#: g10/keygen.c:2560
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s-nøkler må være mellom %u og %u bit lange.\n"
 
-#: g10/keygen.c:2567
+#: g10/keygen.c:2568
 #, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Hvor stor vil du at undernøkkelen skal være? (%u) "
 
-#: g10/keygen.c:2584 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2585 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Forespurt nøkkelstørrelse er %u bit\n"
 
-#: g10/keygen.c:2630
+#: g10/keygen.c:2631
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Velg elliptisk kurve:\n"
 
-#: g10/keygen.c:2819
+#: g10/keygen.c:2820
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5422,7 +5436,7 @@ msgstr ""
 "      <n>m = nøkkelen utgår om n months\n"
 "      <n>y = nøkkelen utgår om n years\n"
 
-#: g10/keygen.c:2830
+#: g10/keygen.c:2831
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5438,38 +5452,38 @@ msgstr ""
 "      <n>m = signaturen utgår om n months\n"
 "      <n>y = signaturen utgår om n years\n"
 
-#: g10/keygen.c:2853
+#: g10/keygen.c:2854
 msgid "Key is valid for? (0) "
 msgstr "Nøkkelen er gyldig for? (0) "
 
-#: g10/keygen.c:2858
+#: g10/keygen.c:2859
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Signaturen er gyldig for? (%s) "
 
-#: g10/keygen.c:2871 g10/keygen.c:2896
+#: g10/keygen.c:2875 g10/keygen.c:2900
 msgid "invalid value\n"
 msgstr "ugyldig verdi\n"
 
-#: g10/keygen.c:2878
+#: g10/keygen.c:2882
 msgid "Key does not expire at all\n"
 msgstr "Nøkkel utgår ikke i det hele tatt\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2883
 msgid "Signature does not expire at all\n"
 msgstr "Signaturen utgår ikke i det hele tatt\n"
 
-#: g10/keygen.c:2884
+#: g10/keygen.c:2888
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Nøkkel utgår %s\n"
 
-#: g10/keygen.c:2885
+#: g10/keygen.c:2889
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Signaturen utgår %s\n"
 
-#: g10/keygen.c:2889
+#: g10/keygen.c:2893
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5477,11 +5491,11 @@ msgstr ""
 "Systemet ditt klarer ikke å håndtere datoer etter 2038.\n"
 "Likevel håndteres det korrekt fram til 2106.\n"
 
-#: g10/keygen.c:2902
+#: g10/keygen.c:2906
 msgid "Is this correct? (y/N) "
 msgstr "Er dette korrekt (j/N)? "
 
-#: g10/keygen.c:2970
+#: g10/keygen.c:2974
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5495,7 +5509,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2985
+#: g10/keygen.c:2989
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5511,49 +5525,49 @@ msgstr ""
 "    «Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>»\n"
 "\n"
 
-#: g10/keygen.c:3004
+#: g10/keygen.c:3008
 msgid "Real name: "
 msgstr "Fullt navn: "
 
-#: g10/keygen.c:3013
+#: g10/keygen.c:3017
 msgid "Invalid character in name\n"
 msgstr "Ugyldig tegn i navn\n"
 
-#: g10/keygen.c:3014
+#: g10/keygen.c:3018
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr "Tegnene «%s» og «%s» kan ikke brukes i navn\n"
 
-#: g10/keygen.c:3018
+#: g10/keygen.c:3022
 msgid "Name may not start with a digit\n"
 msgstr "Navn kan ikke begynne med siffer\n"
 
-#: g10/keygen.c:3021
+#: g10/keygen.c:3025
 msgid "Name must be at least 5 characters long\n"
 msgstr "Navnet må bestå av minst 5 tegn\n"
 
-#: g10/keygen.c:3031
+#: g10/keygen.c:3035
 msgid "Email address: "
 msgstr "E-postadresse: "
 
-#: g10/keygen.c:3037
+#: g10/keygen.c:3041
 msgid "Not a valid email address\n"
 msgstr "Ugyldig e-postadresse\n"
 
-#: g10/keygen.c:3046
+#: g10/keygen.c:3050
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:3052
+#: g10/keygen.c:3056
 msgid "Invalid character in comment\n"
 msgstr "Ugyldig tegn i kommentar\n"
 
-#: g10/keygen.c:3088
+#: g10/keygen.c:3092
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr "Du bruker tegnsettet «%s».\n"
 
-#: g10/keygen.c:3094
+#: g10/keygen.c:3098
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5564,7 +5578,7 @@ msgstr ""
 "    «%s»\n"
 "\n"
 
-#: g10/keygen.c:3099
+#: g10/keygen.c:3103
 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"
 
@@ -5579,31 +5593,31 @@ msgstr "Ikk bruk e-postadresse som navn eller kommentar\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3124
+#: g10/keygen.c:3128
 msgid "NnCcEeOoQq"
 msgstr "NnKeEeRrAa"
 
-#: g10/keygen.c:3134
+#: g10/keygen.c:3138
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Endre (N)avn, (K)ommentar, (E)postadresse eller (A)vslutt? "
 
-#: g10/keygen.c:3135
+#: g10/keygen.c:3139
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Endre (N)avn, (K)ommentar, (E)postadresse eller (R)iktig/(A)vslutt? "
 
-#: g10/keygen.c:3140
+#: g10/keygen.c:3144
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Endre (N)avn, (E)postadresse eller (A)vslutt? "
 
-#: g10/keygen.c:3141
+#: g10/keygen.c:3145
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "Endre (N)avn, (E)postadresse eller (R)iktig/(A)vslutt? "
 
-#: g10/keygen.c:3160
+#: g10/keygen.c:3164
 msgid "Please correct the error first\n"
 msgstr "Rett opp feilen først\n"
 
-#: g10/keygen.c:3206
+#: g10/keygen.c:3210
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -5615,18 +5629,18 @@ msgstr ""
 "diskene jobbe) mens dette pågår. Da får\n"
 "tallgeneratoren bedre muligheter til å samle inn vilkårlighetsdata.\n"
 
-#: g10/keygen.c:3591
+#: g10/keygen.c:3595
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4590 g10/keygen.c:4663 g10/keygen.c:4681 g10/keygen.c:4710
-#: g10/keygen.c:5086 g10/keygen.c:5632 g10/keygen.c:5943 g10/keygen.c:6050
+#: g10/keygen.c:4594 g10/keygen.c:4667 g10/keygen.c:4685 g10/keygen.c:4714
+#: g10/keygen.c:5113 g10/keygen.c:5663 g10/keygen.c:5974 g10/keygen.c:6081
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Nøkkelgenerering mislyktes: %s\n"
 
-#: g10/keygen.c:4599
+#: g10/keygen.c:4603
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5637,65 +5651,65 @@ msgstr ""
 "    «%s»\n"
 "\n"
 
-#: g10/keygen.c:4601
+#: g10/keygen.c:4605
 msgid "Continue? (Y/n) "
 msgstr "Vil du fortsette? (J/n) "
 
-#: g10/keygen.c:4622
+#: g10/keygen.c:4626
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "Det finnes allerede en nøkkel for «%s»\n"
 
-#: g10/keygen.c:4627
+#: g10/keygen.c:4631
 msgid "Create anyway? (y/N) "
 msgstr "Vil du lage nøkkel likevel? (j/N) "
 
-#: g10/keygen.c:4633
+#: g10/keygen.c:4637
 #, c-format
 msgid "creating anyway\n"
 msgstr "lager likevel\n"
 
-#: g10/keygen.c:5069
+#: g10/keygen.c:5096
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 "Merk: Bruk «%s %s» for å se et fullverdig dialogvindu for nøkkelgenerering.\n"
 
-#: g10/keygen.c:5118
+#: g10/keygen.c:5145
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Nøkkelgenerering ble avbrutt.\n"
 
-#: g10/keygen.c:5178
+#: g10/keygen.c:5205
 #, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "klarte ikke å lage sikkerhetskopifila «%s»: %s\n"
 
-#: g10/keygen.c:5198
+#: g10/keygen.c:5225
 #, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "Merk: sikkerhetskopi av kortnøkkel lagret på «%s»\n"
 
-#: g10/keygen.c:5359 g10/keygen.c:5561
+#: g10/keygen.c:5389 g10/keygen.c:5591
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr "skriver offentlig nøkkel til «%s»\n"
 
-#: g10/keygen.c:5555
+#: g10/keygen.c:5585
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "fant ikke skrivbart offentlig nøkkelknippe: %s\n"
 
-#: g10/keygen.c:5569
+#: g10/keygen.c:5599
 #, c-format
 msgid "error writing public keyring '%s': %s\n"
 msgstr "feil under skriving av offentlig nøkkelknippe «%s»: %s\n"
 
-#: g10/keygen.c:5603
+#: g10/keygen.c:5634
 msgid "public and secret key created and signed.\n"
 msgstr "offentlig og hemmelig nøkkel opprettet og signert.\n"
 
-#: g10/keygen.c:5619
+#: g10/keygen.c:5650
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -5704,7 +5718,7 @@ msgstr ""
 "vurdere å bruke kommandoen «--edit-key» for å lage en\n"
 "undernøkkel til dette formålet.\n"
 
-#: g10/keygen.c:5801 g10/keygen.c:6000
+#: g10/keygen.c:5832 g10/keygen.c:6031
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5712,7 +5726,7 @@ msgstr ""
 "nøkkel har blitt opprettet %lu sekund i framtiden (time warp- eller "
 "klokkeproblem)\n"
 
-#: g10/keygen.c:5803 g10/keygen.c:6002
+#: g10/keygen.c:5834 g10/keygen.c:6033
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5720,23 +5734,23 @@ msgstr ""
 "nøkkel har blitt opprettet %lu sekunder i framtiden (time warp- eller "
 "klokkeproblem)\n"
 
-#: g10/keygen.c:5814 g10/keygen.c:6013
+#: g10/keygen.c:5845 g10/keygen.c:6044
 #, c-format
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "Merk: det strider med OpenPGP-standarden å lage undernøkler for v3-nøkler\n"
 
-#: g10/keygen.c:5826 g10/keygen.c:5828
+#: g10/keygen.c:5857 g10/keygen.c:5859
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Hemmelige deler av primærnøkkelen er ikke tilgjengelig.\n"
 
-#: g10/keygen.c:5835 g10/keygen.c:5837
+#: g10/keygen.c:5866 g10/keygen.c:5868
 #, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Hemmelige deler av primærnøkkelen er lagret på kort.\n"
 
-#: g10/keygen.c:5857 g10/keygen.c:6027
+#: g10/keygen.c:5888 g10/keygen.c:6058
 msgid "Really create? (y/N) "
 msgstr "Er du sikker på at du vil fortsette? (j/N) "
 
@@ -5815,33 +5829,33 @@ msgstr "      Nøkkelfingeravtrykk ="
 msgid "      Card serial no. ="
 msgstr "      Serienummer for kort ="
 
-#: g10/keyring.c:1467
+#: g10/keyring.c:1477
 #, c-format
 msgid "caching keyring '%s'\n"
 msgstr "hurtiglagrer nøkkelknippe «%s»\n"
 
-#: g10/keyring.c:1541
+#: g10/keyring.c:1551
 #, c-format
 msgid "%lu keys cached so far (%lu signature)\n"
 msgid_plural "%lu keys cached so far (%lu signatures)\n"
 msgstr[0] "%lu nøkler hurtiglagret så langt (%lu signatur)\n"
 msgstr[1] "%lu nøkler hurtiglagret så langt (%lu signaturer)\n"
 
-#: g10/keyring.c:1557
+#: g10/keyring.c:1567
 #, c-format
 msgid "%lu key cached"
 msgid_plural "%lu keys cached"
 msgstr[0] "%lu nøkkel hurtiglagret"
 msgstr[1] "%lu nøkler hurtiglagret"
 
-#: g10/keyring.c:1559
+#: g10/keyring.c:1569
 #, c-format
 msgid " (%lu signature)\n"
 msgid_plural " (%lu signatures)\n"
 msgstr[0] " (%lu signatur)\n"
 msgstr[1] " (%lu signaturer)\n"
 
-#: g10/keyring.c:1636
+#: g10/keyring.c:1646
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: laget nøkkelknippe\n"
@@ -5870,77 +5884,72 @@ msgstr "hent nøkler automatisk ved bekreftelse av signaturer"
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "bruk nøklers foretrukne nøkkeltjener-adresse"
 
-#: g10/keyserver.c:537
+#: g10/keyserver.c:360
 msgid "disabled"
 msgstr "ikke i bruk"
 
-#: g10/keyserver.c:740
+#: g10/keyserver.c:563
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Skriv inn tall, N)este, eller Q)uit (Avslutt) > "
 
-#: g10/keyserver.c:846
+#: g10/keyserver.c:669
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "ugyldig nøkkeltjener-protokoll (us %d!=håndteringsprogram %d)\n"
 
-#: g10/keyserver.c:986 g10/keyserver.c:1096
+#: g10/keyserver.c:809 g10/keyserver.c:919
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "«%s» er ikke en nøkkel-ID, og blir hoppet over\n"
 
-#: g10/keyserver.c:1420 g10/keyserver.c:1453
+#: g10/keyserver.c:1217 g10/keyserver.c:1250
 #, 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:1427
+#: g10/keyserver.c:1224
 #, 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:1531
+#: g10/keyserver.c:1316
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "fant ikke nøkkelen «%s» på nøkkeltjener\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1319
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "fant ikke nøkkelen på nøkkeltjener\n"
 
-#: g10/keyserver.c:1722
-#, c-format
-msgid "requesting key %s from %s server %s\n"
-msgstr "ber om nøkkelen %s fra %s tjener %s\n"
-
-#: g10/keyserver.c:1726
+#: g10/keyserver.c:1481
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "ber om nøkkelen %s fra %s\n"
 
-#: g10/keyserver.c:1841 g10/keyserver.c:2020
+#: g10/keyserver.c:1600 g10/keyserver.c:1793
 #, c-format
 msgid "no keyserver known\n"
 msgstr "ingen kjent nøkkeltjener\n"
 
-#: g10/keyserver.c:1856 g10/skclist.c:213 g10/skclist.c:241
+#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "hoppet over «%s»: %s\n"
 
-#: g10/keyserver.c:1860
+#: g10/keyserver.c:1619
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "sender nøkkelen %s til %s\n"
 
-#: g10/keyserver.c:1901
+#: g10/keyserver.c:1662
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr "ber om nøkkel fra «%s»\n"
 
-#: g10/keyserver.c:1917
+#: g10/keyserver.c:1680
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "ADVARSEL: klarte ikke å fange URI %s: %s\n"
@@ -5967,12 +5976,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:472
+#: g10/mainproc.c:473
 #, c-format
 msgid "public key is %s\n"
 msgstr "offentlig nøkkel er %s\n"
 
-#: g10/mainproc.c:524
+#: g10/mainproc.c:525
 #, 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"
@@ -5980,236 +5989,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:528 g10/pkclist.c:231
+#: g10/mainproc.c:529 g10/pkclist.c:231
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      «%s»\n"
 
-#: g10/mainproc.c:532
+#: g10/mainproc.c:533
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "kryptert med %s-nøkkel, ID %s\n"
 
-#: g10/mainproc.c:552 g10/mainproc.c:935
+#: g10/mainproc.c:553 g10/mainproc.c:937
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "ADVARSEL: fant flere elementer i ren tekst\n"
 
-#: g10/mainproc.c:560
+#: g10/mainproc.c:561
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "kryptert med %lu passordfraser\n"
 
-#: g10/mainproc.c:562
+#: g10/mainproc.c:563
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "kryptert med 1 passordfrase\n"
 
-#: g10/mainproc.c:577 g10/mainproc.c:602
+#: g10/mainproc.c:578 g10/mainproc.c:603
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "offentlig nøkkel-dekryptering mislyktes: %s\n"
 
-#: g10/mainproc.c:613
+#: g10/mainproc.c:614
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "offentlig nøkkel-kryptert data: god DEK\n"
 
-#: g10/mainproc.c:642 g10/mainproc.c:663
+#: g10/mainproc.c:643 g10/mainproc.c:664
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "antar %s kryptert data\n"
 
-#: g10/mainproc.c:649
+#: g10/mainproc.c:650
 #, 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:742 g10/mainproc.c:780
+#: g10/mainproc.c:744 g10/mainproc.c:782
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ADVARSEL: meldinga var ikke integritetsbeskyttet\n"
 
-#: g10/mainproc.c:753
+#: g10/mainproc.c:755
 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:756
+#: g10/mainproc.c:758
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:761
+#: g10/mainproc.c:763
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "dekryptering mislyktes: %s\n"
 
-#: g10/mainproc.c:773
+#: g10/mainproc.c:775
 #, c-format
 msgid "decryption okay\n"
 msgstr "dekryptering ok\n"
 
-#: g10/mainproc.c:786
+#: g10/mainproc.c:788
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ADVARSEL: kryptert melding er blitt manipulert.\n"
 
-#: g10/mainproc.c:804
+#: g10/mainproc.c:806
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekryptering mislyktes: %s\n"
 
-#: g10/mainproc.c:851
+#: g10/mainproc.c:853
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "Merk: senderen spesifiserte «kun for dine øyne»\n"
 
-#: g10/mainproc.c:858
+#: g10/mainproc.c:860
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "opprinnelig filnavn=«%.*s»\n"
 
-#: g10/mainproc.c:1135
+#: g10/mainproc.c:1137
 #, 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:1440 g10/mainproc.c:1483
+#: g10/mainproc.c:1442 g10/mainproc.c:1485
 #, c-format
 msgid "no signature found\n"
 msgstr "fant ikke signatur\n"
 
-#: g10/mainproc.c:1763
+#: g10/mainproc.c:1765
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "DÅRLIG signatur fra «%s»"
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1767
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Utgått signatur fra «%s»"
 
-#: g10/mainproc.c:1767
+#: g10/mainproc.c:1769
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "God signatur fra «%s»"
 
-#: g10/mainproc.c:1789
+#: g10/mainproc.c:1791
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "signaturbekreftelse ble hindret\n"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1905
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "disse flertydige signaturdataene kan ikke behandles\n"
 
-#: g10/mainproc.c:1919 g10/mainproc.c:1926
+#: g10/mainproc.c:1921 g10/mainproc.c:1928
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Signatur opprettet %s\n"
 
-#: g10/mainproc.c:1920 g10/mainproc.c:1927 sm/verify.c:480
+#: g10/mainproc.c:1922 g10/mainproc.c:1929 sm/verify.c:480
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               bruker %s nøkkel %s\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1933
 #, 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:1937
+#: g10/mainproc.c:1939
 #, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "                utsteder «%s»\n"
 
-#: g10/mainproc.c:1992
+#: g10/mainproc.c:1994
 #, c-format
 msgid "Key available at: "
 msgstr "Nøkkel tilgjengelig ved: "
 
-#: g10/mainproc.c:2034
+#: g10/mainproc.c:2036
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2234
+#: g10/mainproc.c:2236
 msgid "[uncertain]"
 msgstr "[usikker]"
 
-#: g10/mainproc.c:2272
+#: g10/mainproc.c:2274
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                aka «%s»"
 
-#: g10/mainproc.c:2347
+#: g10/mainproc.c:2349
 #, 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:2363
+#: g10/mainproc.c:2365
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Signatur utgått %s\n"
 
-#: g10/mainproc.c:2368
+#: g10/mainproc.c:2370
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Signatur utgår %s\n"
 
-#: g10/mainproc.c:2379
+#: g10/mainproc.c:2381
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s-signatur, kontrollsum-algoritme %s%s%s\n"
 
-#: g10/mainproc.c:2380
+#: g10/mainproc.c:2382
 msgid "binary"
 msgstr "binær"
 
-#: g10/mainproc.c:2381
+#: g10/mainproc.c:2383
 msgid "textmode"
 msgstr "tekstmodus"
 
-#: g10/mainproc.c:2381 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2383 g10/trust.c:112 dirmngr/ocsp.c:793
 msgid "unknown"
 msgstr "ukjent"
 
-#: g10/mainproc.c:2383
+#: g10/mainproc.c:2385
 msgid ", key algorithm "
 msgstr ", nøkkelalgoritme"
 
-#: g10/mainproc.c:2418
+#: g10/mainproc.c:2420
 #, 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:2457
+#: g10/mainproc.c:2459
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Klarte ikke å kontrollere signatur: %s\n"
 
-#: g10/mainproc.c:2553 g10/mainproc.c:2572 g10/mainproc.c:2696
+#: g10/mainproc.c:2555 g10/mainproc.c:2574 g10/mainproc.c:2698
 #, c-format
 msgid "not a detached signature\n"
 msgstr "ikke en separat signatur\n"
 
-#: g10/mainproc.c:2606
+#: g10/mainproc.c:2608
 #, 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:2615
+#: g10/mainproc.c:2617
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "separat signatur av klasse 0x%02x\n"
 
-#: g10/mainproc.c:2700
+#: g10/mainproc.c:2702
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "gammeldags (PGP 2.x) signatur\n"
@@ -6390,46 +6399,52 @@ msgstr "Kritisk signaturnotat: "
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "underpakke %d er merket som kritisk\n"
 
-#: g10/passphrase.c:208
+#: g10/passphrase.c:201 sm/decrypt.c:669
+#, fuzzy
+#| msgid "Please enter the new passphrase"
+msgid "Please enter the passphrase for decryption."
+msgstr "Skriv inn ny passordfrase"
+
+#: g10/passphrase.c:203
 msgid "Enter passphrase\n"
 msgstr "Skriv inn passordfrase\n"
 
-#: g10/passphrase.c:219
+#: g10/passphrase.c:227
 #, c-format
 msgid "cancelled by user\n"
 msgstr "avbrutt av bruker\n"
 
-#: g10/passphrase.c:460
+#: g10/passphrase.c:472
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (hovednøkkelid %s)"
 
-#: g10/passphrase.c:467
+#: g10/passphrase.c:479
 msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 msgstr "Skriv inn passordfrase for å låse opp hemmelig OpenPGP-nøkkel:"
 
-#: g10/passphrase.c:471
+#: g10/passphrase.c:483
 msgid "Please enter the passphrase to import the OpenPGP secret key:"
 msgstr "Skriv inn passordfrase for å importere hemmelig OpenPGP-nøkkel:"
 
-#: g10/passphrase.c:476
+#: g10/passphrase.c:488
 msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 msgstr "Skriv inn passordfrase for å eksportere hemmelig OpenPGP-undernøkkel:"
 
-#: g10/passphrase.c:479
+#: g10/passphrase.c:491
 msgid "Please enter the passphrase to export the OpenPGP secret key:"
 msgstr "Skriv inn passordfrase for å eksportere hemmelig OpenPGP-nøkkel:"
 
-#: g10/passphrase.c:484
+#: g10/passphrase.c:496
 msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 msgstr ""
 "Er du sikker på at du vil slette følgende hemmelige OpenPGP-undernøkkel:"
 
-#: g10/passphrase.c:487
+#: g10/passphrase.c:499
 msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgstr "Er du sikker på at du vil slette følgende hemmelige OpenPGP-nøkkel:"
 
-#: g10/passphrase.c:496
+#: g10/passphrase.c:508
 #, c-format
 msgid ""
 "%s\n"
@@ -6599,7 +6614,7 @@ msgstr ""
 "Laveste tillitsnivå for denne nøkkelen er: %s\n"
 "\n"
 
-#: g10/pkclist.c:313 g10/revoke.c:803
+#: g10/pkclist.c:313 g10/revoke.c:804
 msgid "Your decision? "
 msgstr "Hva velger du? "
 
@@ -6900,7 +6915,7 @@ msgstr "klarte ikke å åpne signert data «%s»\n"
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "klarte ikke å åpne signert data fd=%d: «%s»\n"
 
-#: g10/pubkey-enc.c:99 sm/decrypt.c:879
+#: g10/pubkey-enc.c:99 sm/decrypt.c:1329
 #, c-format
 msgid "key %s is not suitable for decryption in %s mode\n"
 msgstr "nøkkel %s egner seg ikke for dekryptering i %s-modus\n"
@@ -6947,7 +6962,7 @@ msgid "Note: key has been revoked"
 msgstr "Merk: nøkkelen er opphevet"
 
 #: g10/revoke.c:100 g10/revoke.c:126 g10/revoke.c:172 g10/revoke.c:184
-#: g10/revoke.c:502
+#: g10/revoke.c:503
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet mislyktes: %s\n"
@@ -6973,11 +6988,11 @@ msgstr "Hemmelig nøkkel er ikke tilgjengelig.\n"
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Vil du lage et utpekt opphevelsessertifikat for denne nøkkelen? (j/N) "
 
-#: g10/revoke.c:334 g10/revoke.c:744
+#: g10/revoke.c:334 g10/revoke.c:745
 msgid "ASCII armored output forced.\n"
 msgstr "Tvunget ASCII-armert utdata.\n"
 
-#: g10/revoke.c:350 g10/revoke.c:481
+#: g10/revoke.c:350 g10/revoke.c:482
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet mislyktes: %s\n"
@@ -6991,11 +7006,11 @@ msgstr "Opphevelsessertifikat opprettet.\n"
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "fant ingen opphevelsesnøkler for «%s»\n"
 
-#: g10/revoke.c:567
+#: g10/revoke.c:568
 msgid "This is a revocation certificate for the OpenPGP key:"
 msgstr "Dette er et opphevelsessertifikat for følgende OpenPGP-nøkkel:"
 
-#: g10/revoke.c:583
+#: g10/revoke.c:584
 msgid ""
 "A revocation certificate is a kind of \"kill switch\" to publicly\n"
 "declare that a key shall not anymore be used.  It is not possible\n"
@@ -7005,7 +7020,7 @@ msgstr ""
 "erklære offentlig at en nøkkel ikke skal brukes mer. Det er ikke mulig\n"
 "Ã¥ trekke tilbake en oppheving straks den er blitt publisert."
 
-#: g10/revoke.c:586
+#: g10/revoke.c:587
 msgid ""
 "Use it to revoke this key in case of a compromise or loss of\n"
 "the secret key.  However, if the secret key is still accessible,\n"
@@ -7020,7 +7035,7 @@ msgstr ""
 "Se beskrivelse av kommandoen «--generate-revocation» i GnuPG-\n"
 "bruksanvisninga for detaljer."
 
-#: g10/revoke.c:592
+#: g10/revoke.c:593
 msgid ""
 "To avoid an accidental use of this file, a colon has been inserted\n"
 "before the 5 dashes below.  Remove this colon with a text editor\n"
@@ -7030,12 +7045,12 @@ msgstr ""
 "Fjern dette kolonet med en tekstbehandler før du importerer og\n"
 "publiserer opphevelsessertifikatet."
 
-#: g10/revoke.c:611
+#: g10/revoke.c:612
 #, c-format
 msgid "revocation certificate stored as '%s.rev'\n"
 msgstr "opphevelsessertifikat lagret som «%s.rev»\n"
 
-#: g10/revoke.c:655
+#: g10/revoke.c:656
 #, c-format
 msgid "secret key \"%s\" not found\n"
 msgstr "fant ikke hemmelig nøkkel «%s»\n"
@@ -7043,21 +7058,21 @@ msgstr "fant ikke hemmelig nøkkel «%s»\n"
 #. TRANSLATORS: The %s prints a key specification which
 #. for example has been given at the command line.  Several lines
 #. lines with secret key infos are printed after this message.
-#: g10/revoke.c:680
+#: g10/revoke.c:681
 #, c-format
 msgid "'%s' matches multiple secret keys:\n"
 msgstr "«%s» samsvarer med flere hemmelige nøkler:\n"
 
-#: g10/revoke.c:705
+#: g10/revoke.c:706
 #, c-format
 msgid "error searching the keyring: %s\n"
 msgstr "feil under søk på nøkkelknippe: %s\n"
 
-#: g10/revoke.c:728
+#: g10/revoke.c:729
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Vil du lage et opphevelsessertifikat for denne nøkkelen? (j/N) "
 
-#: g10/revoke.c:752
+#: g10/revoke.c:753
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -7079,33 +7094,33 @@ msgstr ""
 "utskriftssystem kan være satt opp til å lagre utskriftsdata og dermed gjøre\n"
 "det mulig for andre å lese sertifikatet.\n"
 
-#: g10/revoke.c:786
+#: g10/revoke.c:787
 msgid "Please select the reason for the revocation:\n"
 msgstr "Velg grunn for opphevelse:\n"
 
-#: g10/revoke.c:796
+#: g10/revoke.c:797
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: g10/revoke.c:798
+#: g10/revoke.c:799
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Normalt bør du velge %d her)\n"
 
-#: g10/revoke.c:839
+#: g10/revoke.c:843
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Skriv inn en beskrivelse hvis du vil, og avslutt med tom linje:\n"
 
-#: g10/revoke.c:867
+#: g10/revoke.c:871
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Grunnlag for opphevelse: %s\n"
 
-#: g10/revoke.c:869
+#: g10/revoke.c:873
 msgid "(No description given)\n"
 msgstr "(Ingen beskrivelse oppgitt)\n"
 
-#: g10/revoke.c:874
+#: g10/revoke.c:878
 msgid "Is this okay? (y/N) "
 msgstr "Er dette i orden? (j/N) "
 
@@ -7277,22 +7292,22 @@ msgstr "signerer:"
 msgid "%s.%s encryption will be used\n"
 msgstr "bruker %s-kryptering\n"
 
-#: g10/skclist.c:172 g10/skclist.c:253
+#: g10/skclist.c:173 g10/skclist.c:254
 #, c-format
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr "nøkkel er ikke merket som usikker, og kan ikke brukes med falsk RNG.\n"
 
-#: g10/skclist.c:204
+#: g10/skclist.c:205
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "hoppet over «%s»: er duplikat\n"
 
-#: g10/skclist.c:223
+#: g10/skclist.c:224
 #, c-format
 msgid "skipped: secret key already present\n"
 msgstr "hoppet over, fordi hemmelig nøkkel allerede er tilstede\n"
 
-#: g10/skclist.c:242
+#: g10/skclist.c:243
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "dette er en PGP-generelt Elgamal-nøkkel, og egner seg ikke til signering."
@@ -7513,10 +7528,10 @@ msgstr "TOFU-databaseversjon støttes ikke: %s\n"
 msgid "TOFU DB error"
 msgstr "TOFU DB-feil"
 
-#: g10/tofu.c:687 g10/tofu.c:2073 g10/tofu.c:2354 g10/tofu.c:2373
-#: g10/tofu.c:2386 g10/tofu.c:2398 g10/tofu.c:2413 g10/tofu.c:2425
-#: g10/tofu.c:3021 g10/tofu.c:3038 g10/tofu.c:3075 g10/tofu.c:3092
-#: g10/tofu.c:3404
+#: g10/tofu.c:687 g10/tofu.c:2077 g10/tofu.c:2358 g10/tofu.c:2377
+#: g10/tofu.c:2390 g10/tofu.c:2402 g10/tofu.c:2417 g10/tofu.c:2429
+#: g10/tofu.c:3025 g10/tofu.c:3042 g10/tofu.c:3079 g10/tofu.c:3096
+#: g10/tofu.c:3408
 #, c-format
 msgid "error reading TOFU database: %s\n"
 msgstr "feil under lesing av TOFU-database: %s\n"
@@ -7536,7 +7551,7 @@ msgstr "feil under oppstart av TOFU-database: %s\n"
 msgid "error opening TOFU database '%s': %s\n"
 msgstr "feil under åpning av TOFU-database «%s»: %s\n"
 
-#: g10/tofu.c:1148 g10/tofu.c:3458 g10/tofu.c:3604
+#: g10/tofu.c:1148 g10/tofu.c:3462 g10/tofu.c:3608
 #, c-format
 msgid "error updating TOFU database: %s\n"
 msgstr "feil under oppdatering av TOFU-database: %s\n"
@@ -7577,108 +7592,108 @@ msgstr "feil under henting av andre bruker-id-er: %s\n"
 msgid "This key's user IDs:\n"
 msgstr "Bruker-id-er tilknyttet denne nøkkelen:\n"
 
-#: g10/tofu.c:1634 g10/tofu.c:1799
+#: g10/tofu.c:1634 g10/tofu.c:1801
 #, c-format
 msgid "policy: %s"
 msgstr "regelverk: %s"
 
-#: g10/tofu.c:1725
+#: g10/tofu.c:1727
 #, c-format
 msgid "error gathering signature stats: %s\n"
 msgstr "feil under henting av signaturstatistikk: %s\n"
 
-#: g10/tofu.c:1729
+#: g10/tofu.c:1731
 #, c-format
 msgid "The email address \"%s\" is associated with %d key:\n"
 msgid_plural "The email address \"%s\" is associated with %d keys:\n"
 msgstr[0] "E-postadressen «%s» er tilknyttet %d nøkkel:\n"
 msgstr[1] "E-postadressen «%s» er tilknyttet %d nøkler:\n"
 
-#: g10/tofu.c:1747
+#: g10/tofu.c:1749
 #, c-format
 msgid "Statistics for keys with the email address \"%s\":\n"
 msgstr "Statistikk for nøkler med e-postadresse «%s»:\n"
 
-#: g10/tofu.c:1797
+#: g10/tofu.c:1799
 msgid "this key"
 msgstr "denne nøkkelen"
 
-#: g10/tofu.c:1823
+#: g10/tofu.c:1825
 #, c-format
 msgid "Verified %d message."
 msgid_plural "Verified %d messages."
 msgstr[0] "Bekreftet %d melding."
 msgstr[1] "Bekreftet %d meldinger."
 
-#: g10/tofu.c:1827
+#: g10/tofu.c:1829
 #, c-format
 msgid "Encrypted %d message."
 msgid_plural "Encrypted %d messages."
 msgstr[0] "Kryptert %d melding."
 msgstr[1] "Kryptert %d meldinger."
 
-#: g10/tofu.c:1834
+#: g10/tofu.c:1836
 #, c-format
 msgid "Verified %d message in the future."
 msgid_plural "Verified %d messages in the future."
 msgstr[0] "Bekreftet %d melding i framtid."
 msgstr[1] "Bekreftet %d meldinger i framtid."
 
-#: g10/tofu.c:1838
+#: g10/tofu.c:1840
 #, c-format
 msgid "Encrypted %d message in the future."
 msgid_plural "Encrypted %d messages in the future."
 msgstr[0] "Kryptert %d melding i framtid."
 msgstr[1] "%d meldinger signert i framtid."
 
-#: g10/tofu.c:1852
+#: g10/tofu.c:1854
 #, c-format
 msgid "Messages verified over the past %d day: %d."
 msgid_plural "Messages verified over the past %d days: %d."
 msgstr[0] "Bekreftede meldinger i løpet av siste %d dag: %d."
 msgstr[1] "Bekreftede meldinger i løpet av siste %d dager: %d."
 
-#: g10/tofu.c:1858
+#: g10/tofu.c:1860
 #, c-format
 msgid "Messages encrypted over the past %d day: %d."
 msgid_plural "Messages encrypted over the past %d days: %d."
 msgstr[0] "Krypterte meldinger i løpet av siste %d dag: %d."
 msgstr[1] "Krypterte meldinger i løpet av siste %d dager: %d."
 
-#: g10/tofu.c:1868
+#: g10/tofu.c:1870
 #, c-format
 msgid "Messages verified over the past %d month: %d."
 msgid_plural "Messages verified over the past %d months: %d."
 msgstr[0] "Bekreftede meldinger i løpet av siste %d måned: %d."
 msgstr[1] "Bekreftede meldinger i løpet av siste %d måneder: %d."
 
-#: g10/tofu.c:1874
+#: g10/tofu.c:1876
 #, c-format
 msgid "Messages encrypted over the past %d month: %d."
 msgid_plural "Messages encrypted over the past %d months: %d."
 msgstr[0] "Krypterte meldinger i løpet av siste %d måned: %d."
 msgstr[1] "Krypterte meldinger i løpet av siste %d måneder: %d."
 
-#: g10/tofu.c:1884
+#: g10/tofu.c:1886
 #, c-format
 msgid "Messages verified over the past %d year: %d."
 msgid_plural "Messages verified over the past %d years: %d."
 msgstr[0] "Bekreftede meldinger i løpet av siste %d år: %d."
 msgstr[1] "Bekreftede meldinger i løpet av siste %d år: %d."
 
-#: g10/tofu.c:1890
+#: g10/tofu.c:1892
 #, c-format
 msgid "Messages encrypted over the past %d year: %d."
 msgid_plural "Messages encrypted over the past %d years: %d."
 msgstr[0] "Krypterte meldinger i løpet av siste %d år: %d."
 msgstr[1] "Krypterte meldinger i løpet av siste %d år: %d."
 
-#: g10/tofu.c:1898
+#: g10/tofu.c:1900
 #, c-format
 msgid "Messages verified in the past: %d."
 msgstr "Meldinger bekreftet før dette: %d."
 
-#: g10/tofu.c:1902
+#: g10/tofu.c:1904
 #, c-format
 msgid "Messages encrypted in the past: %d."
 msgstr "Meldinger kryptert før dette: %d."
@@ -7686,104 +7701,104 @@ msgstr "Meldinger kryptert før dette: %d."
 #. TRANSLATORS: Please translate the text found in the source
 #. * file below.  We don't directly internationalize that text so
 #. * that we can tweak it without breaking translations.
-#: g10/tofu.c:1919
+#: g10/tofu.c:1921
 msgid "TOFU detected a binding conflict"
 msgstr "TOFU oppdaget en tilknytningskonflikt"
 
 #. TRANSLATORS: Two letters (normally the lower and upper case
 #. * version of the hotkey) for each of the five choices.  If
 #. * there is only one choice in your language, repeat it.
-#: g10/tofu.c:1961
+#: g10/tofu.c:1963
 msgid "gGaAuUrRbB"
 msgstr "gGaAuUnNdD"
 
-#: g10/tofu.c:1967
+#: g10/tofu.c:1969
 msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr "(G)od, (A)ksepter én gang, (U)kjent, (N)ekt én gang, (D)årlig? "
 
-#: g10/tofu.c:1975
+#: g10/tofu.c:1978
 msgid "Defaulting to unknown.\n"
 msgstr "Bruker standardverdi (ukjent).\n"
 
-#: g10/tofu.c:2093 g10/tofu.c:2228
+#: g10/tofu.c:2097 g10/tofu.c:2232
 #, c-format
 msgid "TOFU db corruption detected.\n"
 msgstr "Oppdaget ødelagt del av TOFU-database.\n"
 
-#: g10/tofu.c:2829
+#: g10/tofu.c:2833
 #, c-format
 msgid "error changing TOFU policy: %s\n"
 msgstr "feil under endring av TOFU-regler: %s\n"
 
-#: g10/tofu.c:2880
+#: g10/tofu.c:2884
 #, c-format
 msgid "%lld~year"
 msgid_plural "%lld~years"
 msgstr[0] "%lld~Ã¥r"
 msgstr[1] "%lld~Ã¥r"
 
-#: g10/tofu.c:2885
+#: g10/tofu.c:2889
 #, c-format
 msgid "%lld~month"
 msgid_plural "%lld~months"
 msgstr[0] "%lld~måned"
 msgstr[1] "%lld~måneder"
 
-#: g10/tofu.c:2890
+#: g10/tofu.c:2894
 #, c-format
 msgid "%lld~week"
 msgid_plural "%lld~weeks"
 msgstr[0] "%lld~uke"
 msgstr[1] "%lld~uker"
 
-#: g10/tofu.c:2895
+#: g10/tofu.c:2899
 #, c-format
 msgid "%lld~day"
 msgid_plural "%lld~days"
 msgstr[0] "%lld~dag"
 msgstr[1] "%lld~dager"
 
-#: g10/tofu.c:2900
+#: g10/tofu.c:2904
 #, c-format
 msgid "%lld~hour"
 msgid_plural "%lld~hours"
 msgstr[0] "%lld~time"
 msgstr[1] "%lld~timer"
 
-#: g10/tofu.c:2905
+#: g10/tofu.c:2909
 #, c-format
 msgid "%lld~minute"
 msgid_plural "%lld~minutes"
 msgstr[0] "%lld~minutt"
 msgstr[1] "%lld~minutter"
 
-#: g10/tofu.c:2907
+#: g10/tofu.c:2911
 #, c-format
 msgid "%lld~second"
 msgid_plural "%lld~seconds"
 msgstr[0] "%lld~sekund"
 msgstr[1] "%lld~sekunder"
 
-#: g10/tofu.c:3145
+#: g10/tofu.c:3149
 #, c-format
 msgid "%s: Verified 0~signatures and encrypted 0~messages."
 msgstr "%s: Bekreftet 0~signaturer og kryptert 0~meldinger."
 
-#: g10/tofu.c:3151
+#: g10/tofu.c:3155
 #, c-format
 msgid "%s: Verified 0 signatures."
 msgstr "%s: Bekreftet 0 signaturer."
 
-#: g10/tofu.c:3165
+#: g10/tofu.c:3169
 msgid "Encrypted 0 messages."
 msgstr "Kryptert 0 meldinger."
 
-#: g10/tofu.c:3181
+#: g10/tofu.c:3185
 #, c-format
 msgid "(policy: %s)"
 msgstr "(regelsett: %s)"
 
-#: g10/tofu.c:3215
+#: g10/tofu.c:3219
 #, c-format
 msgid ""
 "Warning: we have yet to see a message signed using this key and user id!\n"
@@ -7791,7 +7806,7 @@ msgstr ""
 "Advarsel: vi har enda ikke sett en melding som er signert med gjeldende "
 "nøkkel og bruker-ID.\n"
 
-#: g10/tofu.c:3218
+#: g10/tofu.c:3222
 #, c-format
 msgid ""
 "Warning: we've only seen one message signed using this key and user id!\n"
@@ -7799,17 +7814,17 @@ msgstr ""
 "Advarsel: vi har hittil bare sett én melding som er signert med gjeldende "
 "nøkkel og bruker-ID.\n"
 
-#: g10/tofu.c:3222
+#: g10/tofu.c:3226
 #, c-format
 msgid "Warning: you have yet to encrypt a message to this key!\n"
 msgstr "Advarsel: du har enda ikke kryptert en melding til denne nøkkelen.\n"
 
-#: g10/tofu.c:3225
+#: g10/tofu.c:3229
 #, c-format
 msgid "Warning: you have only encrypted one message to this key!\n"
 msgstr "Advarsel: du har bare kryptert én melding til denne nøkkelen.\n"
 
-#: g10/tofu.c:3254
+#: g10/tofu.c:3258
 #, c-format
 msgid ""
 "Warning: if you think you've seen more signatures by this key and user id, "
@@ -7837,13 +7852,13 @@ msgstr[1] ""
 "  %s\n"
 "to mark it as being bad.\n"
 
-#: g10/tofu.c:3339 g10/tofu.c:3502 g10/tofu.c:3708 g10/tofu.c:3761
-#: g10/tofu.c:3902 g10/tofu.c:3979 g10/tofu.c:4017
+#: g10/tofu.c:3343 g10/tofu.c:3506 g10/tofu.c:3712 g10/tofu.c:3765
+#: g10/tofu.c:3906 g10/tofu.c:3983 g10/tofu.c:4021
 #, c-format
 msgid "error opening TOFU database: %s\n"
 msgstr "feil under åpning av TOFU-database: %s\n"
 
-#: g10/tofu.c:3535
+#: g10/tofu.c:3539
 #, c-format
 msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
 msgstr ""
@@ -7912,7 +7927,7 @@ msgstr "bruker tillitsmodell %s\n"
 msgid "no need for a trustdb check\n"
 msgstr "kontroll av trustdb er ikke nødvendig\n"
 
-#: g10/trustdb.c:601 g10/trustdb.c:2272
+#: g10/trustdb.c:601 g10/trustdb.c:2273
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "neste kontroll av trustdb planlagt %s\n"
@@ -7942,60 +7957,60 @@ msgstr "kjør «--check-trustdb»\n"
 msgid "checking the trustdb\n"
 msgstr "kontrollerer trustdb\n"
 
-#: g10/trustdb.c:1993
+#: g10/trustdb.c:1994
 #, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr[0] "%d nøkkel behandlet"
 msgstr[1] "%d nøkler behandlet"
 
-#: g10/trustdb.c:1996
+#: g10/trustdb.c:1997
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] "(%d gyldighetsantall klarert)\n"
 msgstr[1] "(%d gyldighetsantall klarert)\n"
 
-#: g10/trustdb.c:2066
+#: g10/trustdb.c:2067
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "fant ingen nøkler med absolutt («ultimat») pålitelighet\n"
 
-#: g10/trustdb.c:2080
+#: g10/trustdb.c:2081
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "fant ikke offentlig nøkkel for absolutt pålitelig nøkkel %s\n"
 
-#: g10/trustdb.c:2198
+#: g10/trustdb.c:2199
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 "dybde: %d  gyldig: %3d  signert: %3d  tillit: %d-, %dq, %dn, %dm, %df, %du\n"
 
-#: g10/trustdb.c:2279
+#: g10/trustdb.c:2280
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
 "klarte ikke å oppdatere trustdb-versjonsoppføring. Skriving mislyktes: %s\n"
 
-#: g10/trust.c:125
+#: g10/trust.c:114
 msgid "undefined"
 msgstr "udefinert"
 
-#: g10/trust.c:126
+#: g10/trust.c:115
 msgid "never"
 msgstr "aldri"
 
-#: g10/trust.c:127
+#: g10/trust.c:116
 msgid "marginal"
 msgstr "marginal"
 
-#: g10/trust.c:128
+#: g10/trust.c:117
 msgid "full"
 msgstr "full"
 
-#: g10/trust.c:129
+#: g10/trust.c:118
 msgid "ultimate"
 msgstr "ultimat"
 
@@ -8007,39 +8022,39 @@ msgstr "ultimat"
 #. It gets passed to atoi() so everything after the number is
 #. essentially a comment and need not be translated.  Either key and
 #. uid are both NULL, or neither are NULL.
-#: g10/trust.c:166
+#: g10/trust.c:155
 msgid "10 translator see trust.c:uid_trust_string_fixed"
 msgstr "11 translator see trustdb.c:uid_trust_string_fixed"
 
-#: g10/trust.c:169
+#: g10/trust.c:158
 msgid "[ revoked]"
 msgstr "[ opphevet]"
 
-#: g10/trust.c:171 g10/trust.c:177
+#: g10/trust.c:160 g10/trust.c:166
 msgid "[ expired]"
 msgstr "[   utgått]"
 
-#: g10/trust.c:176
+#: g10/trust.c:165
 msgid "[ unknown]"
 msgstr "[   ukjent]"
 
-#: g10/trust.c:178
+#: g10/trust.c:167
 msgid "[  undef ]"
 msgstr "[    udef ]"
 
-#: g10/trust.c:179
+#: g10/trust.c:168
 msgid "[  never ]"
 msgstr "[   aldri ]"
 
-#: g10/trust.c:180
+#: g10/trust.c:169
 msgid "[marginal]"
 msgstr "[ marginal]"
 
-#: g10/trust.c:181
+#: g10/trust.c:170
 msgid "[  full  ]"
 msgstr "[   full  ]"
 
-#: g10/trust.c:182
+#: g10/trust.c:171
 msgid "[ultimate]"
 msgstr "[  fullst.]"
 
@@ -8099,16 +8114,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:4937 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2386
+#: scd/app-piv.c:1770 scd/app-p15.c:5035 scd/app-nks.c:1530
+#: scd/app-openpgp.c:2387
 #, 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:4956 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2402
+#: scd/app-piv.c:1787 scd/app-p15.c:5054 scd/app-nks.c:1549
+#: scd/app-openpgp.c:2403
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr "Gjenstående forsøk: %d"
@@ -8149,10 +8164,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:2669
-#: scd/app-openpgp.c:2693 scd/app-openpgp.c:2871 scd/app-openpgp.c:2893
-#: scd/app-openpgp.c:3074 scd/app-openpgp.c:3361 scd/app-openpgp.c:3408
-#: scd/app-openpgp.c:3545 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2670
+#: scd/app-openpgp.c:2694 scd/app-openpgp.c:2872 scd/app-openpgp.c:2894
+#: scd/app-openpgp.c:3075 scd/app-openpgp.c:3362 scd/app-openpgp.c:3409
+#: scd/app-openpgp.c:3547 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN-callback returnerte en feil: %s\n"
@@ -8174,92 +8189,92 @@ 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:3616
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3618
 #, c-format
 msgid "key already exists\n"
 msgstr "nøkkelen finnes allerede\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3620
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3622
 #, 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:3622
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3624
 #, c-format
 msgid "generating new key\n"
 msgstr "lager ny nøkkel\n"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3624
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3626
 #, c-format
 msgid "writing new key\n"
 msgstr "skriver ny nøkkel\n"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4484 scd/app-openpgp.c:4767
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4486 scd/app-openpgp.c:4761
 #, 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:1615
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1616
 #, 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:1622
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1623
 #, 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:1732
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1733
 #, 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:4943
+#: scd/app-piv.c:3279 scd/app-openpgp.c:4937
 #, 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:4951
+#: scd/app-piv.c:3294 scd/app-openpgp.c:4945
 #, c-format
 msgid "generating key failed\n"
 msgstr "nøkkelgenerering mislyktes\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4957
+#: scd/app-piv.c:3300 scd/app-openpgp.c:4951
 #, 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:1842 scd/app-openpgp.c:4966
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1843 scd/app-openpgp.c:4960
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr "svar inneholder ikke offentlig nøkkeldata\n"
 
-#: scd/app-p15.c:5035 scd/app-nks.c:2038
+#: scd/app-p15.c:5133 scd/app-nks.c:2038
 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:5038 scd/app-openpgp.c:2818
+#: scd/app-p15.c:5136 scd/app-openpgp.c:2819
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Skriv inn admin-PIN"
 
-#: scd/app-p15.c:5040 scd/app-nks.c:2028
+#: scd/app-p15.c:5138 scd/app-nks.c:2028
 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:5043 scd/app-nks.c:2019
+#: scd/app-p15.c:5141 scd/app-nks.c:2019
 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:4321
+#: scd/app-nks.c:1468 scd/app-openpgp.c:4323
 #, 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:4333
+#: scd/app-nks.c:1476 scd/app-openpgp.c:4335
 #, 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"
@@ -8300,27 +8315,27 @@ msgid ""
 "qualified signatures."
 msgstr "|P|Skriv inn PUK-kode for å la nøkkelen lage kvalifiserte signaturer."
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3442 scd/app-dinsig.c:534
+#: scd/app-nks.c:2221 scd/app-openpgp.c:3443 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:943
+#: scd/app-openpgp.c:944
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "klarte ikke å lagre fingeravtrykk: %s\n"
 
-#: scd/app-openpgp.c:956
+#: scd/app-openpgp.c:957
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "klarte ikke å lagre opprettelsesdato: %s\n"
 
-#: scd/app-openpgp.c:1427 scd/app-openpgp.c:3389 scd/app-openpgp.c:5715
+#: scd/app-openpgp.c:1428 scd/app-openpgp.c:3390 scd/app-openpgp.c:5709
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "feil under henting av CHV-status fra kort\n"
 
-#: scd/app-openpgp.c:1949
+#: scd/app-openpgp.c:1950
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "lesing av offentlig nøkkel mislyktes: %s\n"
@@ -8328,44 +8343,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:2373
+#: scd/app-openpgp.c:2374
 #, 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:2621
+#: scd/app-openpgp.c:2622
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "bruker forvalgt PIN som %s\n"
 
-#: scd/app-openpgp.c:2628
+#: scd/app-openpgp.c:2629
 #, 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:2641
+#: scd/app-openpgp.c:2642
 msgid "||Please unlock the card"
 msgstr "||LÃ¥s opp kort"
 
-#: scd/app-openpgp.c:2700 scd/app-openpgp.c:2900 scd/app-openpgp.c:3368
+#: scd/app-openpgp.c:2701 scd/app-openpgp.c:2901 scd/app-openpgp.c:3369
 #, 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:2717 scd/app-openpgp.c:2760 scd/app-openpgp.c:2917
-#: scd/app-openpgp.c:5325
+#: scd/app-openpgp.c:2718 scd/app-openpgp.c:2761 scd/app-openpgp.c:2918
+#: scd/app-openpgp.c:5319
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "bekreftelse av CHV%d mislyktes: %s\n"
 
-#: scd/app-openpgp.c:2804 scd/app-openpgp.c:5724
+#: scd/app-openpgp.c:2805 scd/app-openpgp.c:5718
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "kortet er låst for godt.\n"
 
-#: scd/app-openpgp.c:2808
+#: scd/app-openpgp.c:2809
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8373,20 +8388,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:2841
+#: scd/app-openpgp.c:2842
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr "tilgang til admin-kommandoer er ikke konfigurert\n"
 
-#: scd/app-openpgp.c:3355
+#: scd/app-openpgp.c:3356
 msgid "||Please enter the PIN"
 msgstr "||Skriv inn PIN-kode"
 
-#: scd/app-openpgp.c:3404
+#: scd/app-openpgp.c:3405
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Skriv inn tilbakestillingskode for kortet"
 
-#: scd/app-openpgp.c:3414 scd/app-openpgp.c:3481
+#: scd/app-openpgp.c:3415 scd/app-openpgp.c:3484
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "Tilbakestillingskoden er for kort. Minimumslengde er %d\n"
@@ -8394,78 +8409,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:3437
+#: scd/app-openpgp.c:3438
 msgid "|RN|New Reset Code"
 msgstr "|RN|Ny tilbakestillingskode"
 
-#: scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3439
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Ny Admin PIN"
 
-#: scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3439
 msgid "|N|New PIN"
 msgstr "|N|Ny PIN"
 
-#: scd/app-openpgp.c:3541
+#: scd/app-openpgp.c:3543
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "||Skriv inn admin-PIN og ny admin-PIN"
 
-#: scd/app-openpgp.c:3542
+#: scd/app-openpgp.c:3544
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Skriv inn PIN-kode og ny PIN-kode"
 
-#: scd/app-openpgp.c:3600 scd/app-openpgp.c:5026
+#: scd/app-openpgp.c:3602 scd/app-openpgp.c:5020
 #, c-format
 msgid "error reading application data\n"
 msgstr "feil under lesing av programdata\n"
 
-#: scd/app-openpgp.c:3606 scd/app-openpgp.c:5033
+#: scd/app-openpgp.c:3608 scd/app-openpgp.c:5027
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "feil under lesing av fingeravtrykk DO\n"
 
-#: scd/app-openpgp.c:4302 scd/app-openpgp.c:4657
+#: scd/app-openpgp.c:4304 scd/app-openpgp.c:4653
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "tidsstempel for opprettelse mangler\n"
 
-#: scd/app-openpgp.c:4343 scd/app-openpgp.c:4351
+#: scd/app-openpgp.c:4345 scd/app-openpgp.c:4353
 #, 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:4651
+#: scd/app-openpgp.c:4647
 #, c-format
 msgid "unsupported curve\n"
 msgstr "ustøttet kurve\n"
 
-#: scd/app-openpgp.c:4991
+#: scd/app-openpgp.c:4985
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "ugyldig struktur i OpenPGP-kort (DO 0x93)\n"
 
-#: scd/app-openpgp.c:5041
+#: scd/app-openpgp.c:5035
 #, 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:5240
+#: scd/app-openpgp.c:5234
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "kortet støtter ikke kontrollsum-algoritme %s\n"
 
-#: scd/app-openpgp.c:5298
+#: scd/app-openpgp.c:5292
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "signaturer opprettet så langt: %lu\n"
 
-#: scd/app-openpgp.c:5729
+#: scd/app-openpgp.c:5723
 #, 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:6241 scd/app-openpgp.c:6252
+#: scd/app-openpgp.c:6250 scd/app-openpgp.c:6261
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "fikk ikke tilgang til %s. Bruker du et ugyldig OpenPGP-kort?\n"
@@ -8485,7 +8500,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:274 dirmngr/dirmngr.c:198
+#: scd/scdaemon.c:136 sm/gpgsm.c:274 dirmngr/dirmngr.c:199
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|NIVÅ|endre feilsøkingsnivå til valgt NIVÅ"
 
@@ -8546,12 +8561,12 @@ msgstr ""
 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:2104
+#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2143
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "startet håndteringsprogram for fd %d\n"
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2112
+#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2151
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "avsluttet håndteringsprogram for fd %d\n"
@@ -8561,11 +8576,11 @@ msgstr "avsluttet håndteringsprogram for fd %d\n"
 msgid "validation model requested by certificate: %s"
 msgstr "kontrollmodell forespurt av sertifikat: %s"
 
-#: sm/certchain.c:199 sm/certchain.c:2172
+#: sm/certchain.c:199 sm/certchain.c:2174
 msgid "chain"
 msgstr "kjede"
 
-#: sm/certchain.c:200 sm/certchain.c:2172
+#: sm/certchain.c:200 sm/certchain.c:2174
 msgid "shell"
 msgstr "skall"
 
@@ -8598,225 +8613,225 @@ msgstr "Merk: ukritisk sertifikat-regelsett er ikke tillatt"
 msgid "certificate policy not allowed"
 msgstr "sertifikatregelverk tillates ikke"
 
-#: sm/certchain.c:595 sm/keydb.c:1891 sm/keydb.c:1980
+#: sm/certchain.c:596 sm/keydb.c:1913 sm/keydb.c:2002
 #, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "klarte ikke å hente fingeravtrykk\n"
 
-#: sm/certchain.c:624
+#: sm/certchain.c:625
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr "slår opp utsteder på ekstern plassering\n"
 
-#: sm/certchain.c:644
+#: sm/certchain.c:645
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "antall ustedere funnet: %d\n"
 
-#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#: sm/certchain.c:724 dirmngr/ocsp.c:683
 #, c-format
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "klarte ikke å hente «authorityInfoAccess»: %s\n"
 
-#: sm/certchain.c:791
+#: sm/certchain.c:792
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr "slår opp utsteder fra Dirmngr-hurtiglager\n"
 
-#: sm/certchain.c:816
+#: sm/certchain.c:817
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "antall treff på sertifikater: %d\n"
 
-#: sm/certchain.c:819
+#: sm/certchain.c:820
 #, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "nøkkeloppslag i dirmngr-hurtiglager mislyktes: %s\n"
 
-#: sm/certchain.c:1046 sm/certchain.c:1561 sm/certchain.c:2200 sm/decrypt.c:643
-#: sm/encrypt.c:620 sm/import.c:414 sm/keydb.c:1898 sm/keydb.c:1987
-#: sm/sign.c:428 sm/verify.c:117
+#: sm/certchain.c:1047 sm/certchain.c:1562 sm/certchain.c:2202
+#: sm/decrypt.c:1084 sm/encrypt.c:621 sm/import.c:414 sm/keydb.c:1920
+#: sm/keydb.c:2009 sm/sign.c:428 sm/verify.c:117
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "klarte ikke å tildele nøkkeldatabase-verdi\n"
 
-#: sm/certchain.c:1232
+#: sm/certchain.c:1233
 msgid "certificate has been revoked"
 msgstr "sertifikatet er opphevet"
 
-#: sm/certchain.c:1247
+#: sm/certchain.c:1248
 msgid "the status of the certificate is unknown"
 msgstr "sertifikatet har ukjent status"
 
-#: sm/certchain.c:1254
+#: sm/certchain.c:1255
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr "kontroller at «dirmngr» er installert skikkelig\n"
 
-#: sm/certchain.c:1260
+#: sm/certchain.c:1261
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "kontroll av CRL mislyktes: %s"
 
-#: sm/certchain.c:1289 sm/certchain.c:1357 dirmngr/validate.c:497
+#: sm/certchain.c:1290 sm/certchain.c:1358 dirmngr/validate.c:497
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "sertifikat med ugyldig gyldighetsverdi: %s"
 
-#: sm/certchain.c:1304 sm/certchain.c:1389 dirmngr/validate.c:515
+#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:515
 #, c-format
 msgid "certificate not yet valid"
 msgstr "sertifikatet er ikke gyldig enda"
 
-#: sm/certchain.c:1305 sm/certchain.c:1390
+#: sm/certchain.c:1306 sm/certchain.c:1391
 msgid "root certificate not yet valid"
 msgstr "rotsertifikat er ikke gyldig enda"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1307 sm/certchain.c:1392
 msgid "intermediate certificate not yet valid"
 msgstr "mellomsertifikat er ikke gyldig enda"
 
-#: sm/certchain.c:1319 dirmngr/validate.c:526
+#: sm/certchain.c:1320 dirmngr/validate.c:526
 #, c-format
 msgid "certificate has expired"
 msgstr "sertifikatet er utgått"
 
-#: sm/certchain.c:1320
+#: sm/certchain.c:1321
 msgid "root certificate has expired"
 msgstr "rotsertifikat er utgått"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1322
 msgid "intermediate certificate has expired"
 msgstr "mellomsertifikat er utgått"
 
-#: sm/certchain.c:1363
+#: sm/certchain.c:1364
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr "påkrevde sertifikategenskaper mangler: %s%s%s"
 
-#: sm/certchain.c:1372
+#: sm/certchain.c:1373
 msgid "certificate with invalid validity"
 msgstr "sertifikat med ugyldig gyldighetsverdi"
 
-#: sm/certchain.c:1409
+#: sm/certchain.c:1410
 msgid "signature not created during lifetime of certificate"
 msgstr "signatur ikke laget innenfor sertifikatets levetid"
 
-#: sm/certchain.c:1411
+#: sm/certchain.c:1412
 msgid "certificate not created during lifetime of issuer"
 msgstr "sertifikat ikke laget innenfor utsteders levetid"
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1413
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr "mellomsertifikat ikke laget innenfor utsteders levetid"
 
-#: sm/certchain.c:1416
+#: sm/certchain.c:1417
 #, c-format
 msgid "  (  signature created at "
 msgstr "  (  signatur opprettet "
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1418
 #, c-format
 msgid "  (certificate created at "
 msgstr "  (sertifikat opprettet "
 
-#: sm/certchain.c:1420
+#: sm/certchain.c:1421
 #, c-format
 msgid "  (certificate valid from "
 msgstr "  (sertifikat gyldig fra "
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1422
 #, c-format
 msgid "  (     issuer valid from "
 msgstr "  (     utsteder gyldig fra "
 
-#: sm/certchain.c:1451 dirmngr/validate.c:577
+#: sm/certchain.c:1452 dirmngr/validate.c:577
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "fingeravtrykk=%s\n"
 
-#: sm/certchain.c:1460
+#: sm/certchain.c:1461
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr "rotsertifikat er nå merket som troverdig\n"
 
-#: sm/certchain.c:1473
+#: sm/certchain.c:1474
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr "interaktiv tillitsmerking er ikke slått på i gpg-agent\n"
 
-#: sm/certchain.c:1479
+#: sm/certchain.c:1480
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr "interaktiv tillitsmarkering er slått av for gjeldende økt\n"
 
-#: sm/certchain.c:1538
+#: sm/certchain.c:1539
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 "ADVARSEL: opprettelsestid for signatur er ukjent. Antar gjeldende tidspunkt"
 
-#: sm/certchain.c:1602
+#: sm/certchain.c:1603
 msgid "no issuer found in certificate"
 msgstr "fant ingen utsteder i sertifikat"
 
-#: sm/certchain.c:1680
+#: sm/certchain.c:1681
 msgid "self-signed certificate has a BAD signature"
 msgstr "selvsignert sertifikat har ugyldig signatur"
 
-#: sm/certchain.c:1749 dirmngr/validate.c:575
+#: sm/certchain.c:1750 dirmngr/validate.c:575
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "rotsertifikat er ikke merket som troverdig"
 
-#: sm/certchain.c:1765
+#: sm/certchain.c:1766
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "kontroll av tillitsliste mislyktes: %s\n"
 
-#: sm/certchain.c:1796 sm/import.c:175 dirmngr/validate.c:630
+#: sm/certchain.c:1797 sm/import.c:175 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "sertifikatkjede er for langt\n"
 
-#: sm/certchain.c:1808 dirmngr/validate.c:642
+#: sm/certchain.c:1809 dirmngr/validate.c:642
 #, c-format
 msgid "issuer certificate not found"
 msgstr "fant ikke utstedersertifikat"
 
-#: sm/certchain.c:1842 dirmngr/validate.c:668
+#: sm/certchain.c:1844 dirmngr/validate.c:668
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr "sertifikatet har ugyldig signatur"
 
-#: sm/certchain.c:1874 dirmngr/validate.c:692
+#: sm/certchain.c:1876 dirmngr/validate.c:692
 msgid "found another possible matching CA certificate - trying again"
 msgstr "fant et annet CA-sertifikat som kan fungere. Prøver igjen"
 
-#: sm/certchain.c:1933 dirmngr/validate.c:717
+#: sm/certchain.c:1935 dirmngr/validate.c:717
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "sertifikatkjede er lengre enn CA tillater (%d)"
 
-#: sm/certchain.c:1975 sm/certchain.c:2275 dirmngr/validate.c:747
+#: sm/certchain.c:1977 sm/certchain.c:2278 dirmngr/validate.c:747
 #, c-format
 msgid "certificate is good\n"
 msgstr "sertifikatet er gyldig\n"
 
-#: sm/certchain.c:1976
+#: sm/certchain.c:1978
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "mellomsertifikat er ok\n"
 
-#: sm/certchain.c:1977
+#: sm/certchain.c:1979
 #, c-format
 msgid "root certificate is good\n"
 msgstr "rotsertifikat er gyldig\n"
 
-#: sm/certchain.c:2159
+#: sm/certchain.c:2161
 msgid "switching to chain model"
 msgstr "bytter til kjedemodell"
 
-#: sm/certchain.c:2168
+#: sm/certchain.c:2170
 #, c-format
 msgid "validation model used: %s"
 msgstr "gyldighetsmodell: %s"
@@ -8827,18 +8842,18 @@ 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:1372 dirmngr/validate.c:903
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1411 dirmngr/validate.c:903
 #: dirmngr/validate.c:927
 #, c-format
 msgid "out of core\n"
 msgstr "kjernen er full\n"
 
-#: sm/certcheck.c:389 sm/verify.c:212
+#: sm/certcheck.c:388 sm/verify.c:212
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(dette er algortime MD2)\n"
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:793
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:794
 msgid "none"
 msgstr "ingen"
 
@@ -9130,17 +9145,17 @@ msgstr ""
 msgid "resource problem: out of core\n"
 msgstr "ressursproblem: oppbrukt kjerne\n"
 
-#: sm/decrypt.c:719
+#: sm/decrypt.c:1159
 #, c-format
 msgid "(this is the RC2 algorithm)\n"
 msgstr "(dette er algoritme RC2)\n"
 
-#: sm/decrypt.c:721
+#: sm/decrypt.c:1161
 #, c-format
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr "(dette ser ikke ut som en kryptert melding)\n"
 
-#: sm/decrypt.c:868
+#: sm/decrypt.c:1318
 #, fuzzy, c-format
 #| msgid "encrypted with %s key, ID %s\n"
 msgid "encrypted to %s key %s\n"
@@ -9151,7 +9166,7 @@ msgstr "kryptert med %s-nøkkel, ID %s\n"
 msgid "certificate '%s' not found: %s\n"
 msgstr "fant ikke sertifikatet «%s»: %s\n"
 
-#: sm/delete.c:120 sm/keydb.c:1999 sm/keydb.c:2098
+#: sm/delete.c:120 sm/keydb.c:2021 sm/keydb.c:2120
 #, c-format
 msgid "error locking keybox: %s\n"
 msgstr "feil under låsing av nøkkelskrin: %s\n"
@@ -9171,7 +9186,7 @@ msgstr "sertifikat «%s» slettet\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "sletting av sertifikat «%s» mislyktes: %s\n"
 
-#: sm/encrypt.c:606
+#: sm/encrypt.c:607
 #, c-format
 msgid "no valid recipients given\n"
 msgstr "ingen gyldige mottakere valgt\n"
@@ -9240,63 +9255,63 @@ msgstr "|BRUKER-ID|bruk valgt BRUKER-ID som forvalgt hemmelig nøkkel"
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|FIL|legg til nøkkelknippe i liste over nøkkelknipper"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:352 dirmngr/dirmngr.c:265
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|SPEC|bruk valgt nøkkeltjener til å slå opp nøkler"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:363
 msgid "fetch missing issuer certificates"
 msgstr "hent manglende utstedersertifikat"
 
-#: sm/gpgsm.c:364
+#: sm/gpgsm.c:365
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NAVN|bruk valgt kodeNAVN til PKCS#12-passordfraser"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:386
 msgid "never consult a CRL"
 msgstr "aldri spør CRL"
 
-#: sm/gpgsm.c:389
+#: sm/gpgsm.c:390
 msgid "do not check CRLs for root certificates"
 msgstr "ikke se etter rotsertifikater i CRL"
 
-#: sm/gpgsm.c:393
+#: sm/gpgsm.c:394
 msgid "check validity using OCSP"
 msgstr "kontroller gyldighet med OCSP"
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:396
 msgid "do not check certificate policies"
 msgstr "ikke kontroller sertifikatregler"
 
-#: sm/gpgsm.c:398
+#: sm/gpgsm.c:399
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAVN|bruk valgt krypteringsalgoritme-NAVN"
 
-#: sm/gpgsm.c:400
+#: sm/gpgsm.c:401
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAVN|bruk valgt summeringsalgoritme-NAVN for melding"
 
-#: sm/gpgsm.c:410
+#: sm/gpgsm.c:411
 msgid "batch mode: never ask"
 msgstr "buntmodus: aldri spør"
 
-#: sm/gpgsm.c:412
+#: sm/gpgsm.c:413
 msgid "assume yes on most questions"
 msgstr "svar automatisk ja på de fleste spørsmål"
 
-#: sm/gpgsm.c:413
+#: sm/gpgsm.c:414
 msgid "assume no on most questions"
 msgstr "svar automatisk nei på de fleste spørsmål"
 
-#: sm/gpgsm.c:430
+#: sm/gpgsm.c:431
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FIL|lagre en revisjonslogg i valgt FIL"
 
-#: sm/gpgsm.c:615
+#: sm/gpgsm.c:616
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Bruk: @GPGSM@ [valg] [filer] (-h for hjelp)"
 
-#: sm/gpgsm.c:618
+#: sm/gpgsm.c:619
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -9306,52 +9321,27 @@ msgstr ""
 "Signer, kontroller, krypter eller dekrypter.\n"
 "Forvalgt handling avhenger av inndata.\n"
 
-#: sm/gpgsm.c:826
+#: sm/gpgsm.c:827
 #, 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:837
+#: sm/gpgsm.c:838
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "«%s» er en ukjent kontrollmodell\n"
 
-#: sm/gpgsm.c:896 dirmngr/ldapserver.c:89
-#, c-format
-msgid "%s:%u: no hostname given\n"
-msgstr "%s:%u: vertsnavn mangler\n"
-
-#: sm/gpgsm.c:915 dirmngr/ldapserver.c:108
-#, c-format
-msgid "%s:%u: password given without user\n"
-msgstr "%s:%u: passord skrevet inn uten brukernavn\n"
-
-#: sm/gpgsm.c:946 dirmngr/ldapserver.c:139
-#, c-format
-msgid "%s:%u: ignoring unknown flag '%s'\n"
-msgstr ""
-
-#: sm/gpgsm.c:962 dirmngr/ldapserver.c:155
-#, c-format
-msgid "%s:%u: skipping this line\n"
-msgstr "%s:%u: hopper over denne linja\n"
-
-#: sm/gpgsm.c:1550
-#, c-format
-msgid "could not parse keyserver\n"
-msgstr "klarte ikke å tolke nøkkeltjener\n"
-
-#: sm/gpgsm.c:1858
+#: sm/gpgsm.c:1711
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "importerer sertifikat «%s»\n"
 
-#: sm/gpgsm.c:1904
+#: sm/gpgsm.c:1757
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "klarte ikke å signere med «%s»: %s\n"
 
-#: sm/gpgsm.c:2273
+#: sm/gpgsm.c:2129
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "ugyldig kommando (implisitt kommando finnes ikke)\n"
@@ -9371,53 +9361,53 @@ msgstr "feil under lagring av sertifikat\n"
 msgid "basic certificate checks failed - not imported\n"
 msgstr "enkel sertifikatkontroll mislyktes. Ikke importert\n"
 
-#: sm/import.c:471 sm/keydb.c:2018 sm/keydb.c:2111
+#: sm/import.c:472 sm/keydb.c:2040 sm/keydb.c:2133
 #, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "feil under henting av lagrede valg: %s\n"
 
-#: sm/import.c:530 sm/import.c:562
+#: sm/import.c:531 sm/import.c:563
 #, c-format
 msgid "error importing certificate: %s\n"
 msgstr "feil under importering av sertifikat: %s\n"
 
-#: sm/import.c:751 tools/gpg-connect-agent.c:1475
+#: sm/import.c:752 tools/gpg-connect-agent.c:1475
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "feil under lesing av inndata: %s\n"
 
-#: sm/keydb.c:503
+#: sm/keydb.c:508
 #, fuzzy, c-format
 #| msgid "no dirmngr running in this session\n"
 msgid "no keyboxd running in this session\n"
 msgstr "ingen dirmngr kjører i gjeldende økt\n"
 
-#: sm/keydb.c:595
+#: sm/keydb.c:600
 #, c-format
 msgid "error opening key DB: %s\n"
 msgstr "feil under åpning av nøkkeldatabase: %s\n"
 
-#: sm/keydb.c:1936
+#: sm/keydb.c:1958
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr "klarte ikke å søke etter sertifikat: %s\n"
 
-#: sm/keydb.c:1948
+#: sm/keydb.c:1970
 #, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "feil under søk etter skrivbar nøkkeldatabase: %s\n"
 
-#: sm/keydb.c:1956
+#: sm/keydb.c:1978
 #, c-format
 msgid "error storing certificate: %s\n"
 msgstr "feil under lagring av sertifikat: %s\n"
 
-#: sm/keydb.c:2009
+#: sm/keydb.c:2031
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "det oppstod en feil under nytt søk etter sertifikat: %s\n"
 
-#: sm/keydb.c:2030 sm/keydb.c:2122
+#: sm/keydb.c:2052 sm/keydb.c:2144
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr "feil under lagring av valg: %s\n"
@@ -9602,57 +9592,57 @@ msgstr "  emne ="
 msgid "error loading certificate '%s': %s\n"
 msgstr "feil under innlasting av sertifikat «%s»: %s\n"
 
-#: dirmngr/certcache.c:819
+#: dirmngr/certcache.c:820
 #, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "permanent innlastede sertifikater: %u\n"
 
-#: dirmngr/certcache.c:821
+#: dirmngr/certcache.c:822
 #, c-format
 msgid "    runtime cached certificates: %u\n"
 msgstr "    hurtiglagrede sertifikater: %u\n"
 
-#: dirmngr/certcache.c:823
+#: dirmngr/certcache.c:824
 #, c-format
 msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "           pålitelige sertifikater: %u (%u,%u,%u,%u)\n"
 
-#: dirmngr/certcache.c:851 dirmngr/dirmngr-client.c:392
+#: dirmngr/certcache.c:852 dirmngr/dirmngr-client.c:392
 #, c-format
 msgid "certificate already cached\n"
 msgstr "sertifikat allerede hurtiglagret\n"
 
-#: dirmngr/certcache.c:853
+#: dirmngr/certcache.c:854
 #, c-format
 msgid "certificate cached\n"
 msgstr "sertifikat hurtiglagret\n"
 
-#: dirmngr/certcache.c:855 dirmngr/certcache.c:875 dirmngr/dirmngr-client.c:396
+#: dirmngr/certcache.c:856 dirmngr/certcache.c:876 dirmngr/dirmngr-client.c:396
 #, c-format
 msgid "error caching certificate: %s\n"
 msgstr "feil under hurtiglagring av sertifikat: %s\n"
 
-#: dirmngr/certcache.c:938
+#: dirmngr/certcache.c:939
 #, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "«%s» er et ugyldig SHA1-fingeravtrykk\n"
 
-#: dirmngr/certcache.c:1384 dirmngr/certcache.c:1393
+#: dirmngr/certcache.c:1385 dirmngr/certcache.c:1394
 #, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "feil under henting av sertifikat etter S/N: %s\n"
 
-#: dirmngr/certcache.c:1579 dirmngr/certcache.c:1588
+#: dirmngr/certcache.c:1580 dirmngr/certcache.c:1589
 #, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "feil under henting av sertifikat etter emne: %s\n"
 
-#: dirmngr/certcache.c:1694 dirmngr/validate.c:483
+#: dirmngr/certcache.c:1695 dirmngr/validate.c:483
 #, c-format
 msgid "no issuer found in certificate\n"
 msgstr "fant ingen utsteder av sertifikat\n"
 
-#: dirmngr/certcache.c:1704
+#: dirmngr/certcache.c:1705
 #, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "feil under henting av «authorityKeyIdentifier»: %s\n"
@@ -9687,7 +9677,7 @@ msgstr "fjerner hurtiglager-fil «%s»\n"
 msgid "not removing file '%s'\n"
 msgstr "lar være å fjerne «%s»\n"
 
-#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2380
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2383
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr "feil under lukking av hurtiglager-fil: %s\n"
@@ -9919,13 +9909,13 @@ msgid "error getting data from cache file: %s\n"
 msgstr "feil under henting av data fra hurtiglager-fil: %s\n"
 
 #: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1672 dirmngr/crlcache.c:1697
-#: dirmngr/crlcache.c:1763
+#: dirmngr/crlcache.c:1766
 #, c-format
 msgid "got an invalid S-expression from libksba\n"
 msgstr "fikk ugyldig S-uttrykk fra libksba\n"
 
 #: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1679 dirmngr/crlcache.c:1705
-#: dirmngr/crlcache.c:1770 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1773 dirmngr/misc.c:176
 #, c-format
 msgid "converting S-expression failed: %s\n"
 msgstr "konvertering av S-uttrykk mislyktes: %s\n"
@@ -9940,133 +9930,133 @@ msgstr "«%s» er en ugyldig summeringsalgoritme\n"
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr "«gcry_md_open» for algoritme %d mislyktes: %s\n"
 
-#: dirmngr/crlcache.c:1797 dirmngr/ocsp.c:478
+#: dirmngr/crlcache.c:1800 dirmngr/ocsp.c:478
 #, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "oppretting av S-uttrykk mislyktes: %s\n"
 
-#: dirmngr/crlcache.c:1871
+#: dirmngr/crlcache.c:1874
 #, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "ksba_crl_parse mislyktes: %s\n"
 
-#: dirmngr/crlcache.c:1886
+#: dirmngr/crlcache.c:1889
 #, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "feil under henting av CRL-oppdateringstid: %s\n"
 
-#: dirmngr/crlcache.c:1893
+#: dirmngr/crlcache.c:1896
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr "oppdateringstider for gjeldende CRL: denne=%s neste=%s\n"
 
-#: dirmngr/crlcache.c:1897
+#: dirmngr/crlcache.c:1900
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr "«nextUpdate» ikke oppgitt. Antar én dags gyldighet\n"
 
-#: dirmngr/crlcache.c:1917
+#: dirmngr/crlcache.c:1920
 #, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "feil under henting av CRL-element: %s\n"
 
-#: dirmngr/crlcache.c:1932
+#: dirmngr/crlcache.c:1935
 #, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "feil under innsetting av element i midlertidig hurtiglager-fil: %s\n"
 
-#: dirmngr/crlcache.c:1959
+#: dirmngr/crlcache.c:1962
 #, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "fant ingen CRL-utsteder i CRL: %s\n"
 
-#: dirmngr/crlcache.c:1974
+#: dirmngr/crlcache.c:1977
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr "finner CRL-utstedersertifikat med «authorityKeyIdentifier»\n"
 
-#: dirmngr/crlcache.c:2020
+#: dirmngr/crlcache.c:2023
 #, c-format
 msgid "CRL signature verification failed: %s\n"
 msgstr "CRL-signaturbekreftelse mislyktes: %s\n"
 
-#: dirmngr/crlcache.c:2032
+#: dirmngr/crlcache.c:2035
 #, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "feil under kontroll av gyldighet for CRL-utstedersertifikat: %s\n"
 
-#: dirmngr/crlcache.c:2174
+#: dirmngr/crlcache.c:2177
 #, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "ksba_crl_new mislyktes: %s\n"
 
-#: dirmngr/crlcache.c:2181
+#: dirmngr/crlcache.c:2184
 #, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "ksba_crl_set_reader mislyktes: %s\n"
 
-#: dirmngr/crlcache.c:2215
+#: dirmngr/crlcache.c:2218
 #, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "fjernet ødelagt midlertidig hurtiglager-fil «%s»\n"
 
-#: dirmngr/crlcache.c:2219
+#: dirmngr/crlcache.c:2222
 #, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "feil under fjerning av ødelagt midlertidig hurtiglager-fil «%s»: %s\n"
 
-#: dirmngr/crlcache.c:2229
+#: dirmngr/crlcache.c:2232
 #, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "feil under opprettelse av midlertidig hurtiglager-fil «%s»: %s\n"
 
-#: dirmngr/crlcache.c:2239
+#: dirmngr/crlcache.c:2242
 #, c-format
 msgid "crl_parse_insert failed: %s\n"
 msgstr "crl_parse_insert mislyktes: %s\n"
 
-#: dirmngr/crlcache.c:2249
+#: dirmngr/crlcache.c:2252
 #, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "feil under ferdigstillelse av midlertidig hurtiglager-fil «%s»: %s\n"
 
-#: dirmngr/crlcache.c:2256
+#: dirmngr/crlcache.c:2259
 #, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "feil under lukking av midlertidig hurtiglager-fil «%s»: %s\n"
 
-#: dirmngr/crlcache.c:2281
+#: dirmngr/crlcache.c:2284
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 "ADVARSEL: ny CRL er fremdeles for gammel (utgått %s). Laster inn likevel\n"
 
-#: dirmngr/crlcache.c:2285
+#: dirmngr/crlcache.c:2288
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr "ny CRL er fremdeles for gammel (utgått %s)\n"
 
-#: dirmngr/crlcache.c:2301
+#: dirmngr/crlcache.c:2304
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr "%s er en ukjent kritisk CRL-utvidelse\n"
 
-#: dirmngr/crlcache.c:2311
+#: dirmngr/crlcache.c:2314
 #, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "feil under lesing av CRL-utvidelser: %s\n"
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2365
 #, c-format
 msgid "creating cache file '%s'\n"
 msgstr "lager hurtiglager-fil «%s»\n"
 
-#: dirmngr/crlcache.c:2394
+#: dirmngr/crlcache.c:2397
 #, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "klarte ikke å endre navn på «%s» til «%s»: %s\n"
 
-#: dirmngr/crlcache.c:2408
+#: dirmngr/crlcache.c:2411
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
@@ -10075,12 +10065,12 @@ msgstr ""
 "oppdatering av DIR-fil mislyktes. Hurtiglager-oppføring går tapt neste gang "
 "programmet starter\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2448
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr "Start CRL-utskrift (hentet via %s)\n"
 
-#: dirmngr/crlcache.c:2468
+#: dirmngr/crlcache.c:2471
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
@@ -10088,54 +10078,54 @@ msgstr ""
 " FEIL: CRL blir ikke brukt fordi den fremdeles var for gammel etter "
 "oppdatering.\n"
 
-#: dirmngr/crlcache.c:2471
+#: dirmngr/crlcache.c:2474
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr " FEIL: CRL blir ikke brukt fordi en kritisk utvidelse er ukjent.\n"
 
-#: dirmngr/crlcache.c:2474
+#: dirmngr/crlcache.c:2477
 msgid " ERROR: The CRL will not be used\n"
 msgstr " FEIL: CRL blir ikke brukt\n"
 
-#: dirmngr/crlcache.c:2481
+#: dirmngr/crlcache.c:2484
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr " FEIL: Huriglagret CRL kan ha blitt endret av uvedkommende.\n"
 
-#: dirmngr/crlcache.c:2499
+#: dirmngr/crlcache.c:2502
 #, c-format
 msgid " WARNING: invalid cache record length\n"
 msgstr " ADVARSEL: ugyldig lengde på oppføring i hurtiglager\n"
 
-#: dirmngr/crlcache.c:2506
+#: dirmngr/crlcache.c:2509
 #, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "klarte ikke å lese hurtiglager-oppføring: %s\n"
 
-#: dirmngr/crlcache.c:2517
+#: dirmngr/crlcache.c:2520
 #, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "klarte ikke å lese hurtiglager-nøkkel: %s\n"
 
-#: dirmngr/crlcache.c:2548
+#: dirmngr/crlcache.c:2551
 #, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "feil under lesing av hurtiglager-oppføring fra db: %s\n"
 
-#: dirmngr/crlcache.c:2551
+#: dirmngr/crlcache.c:2554
 msgid "End CRL dump\n"
 msgstr "Avslutt CRL-utskrift\n"
 
-#: dirmngr/crlcache.c:2672
+#: dirmngr/crlcache.c:2675
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "crl_fetch via DP mislyktes: %s\n"
 
-#: dirmngr/crlcache.c:2683
+#: dirmngr/crlcache.c:2686
 #, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "crl_cache_insert via DP mislyktes: %s\n"
 
-#: dirmngr/crlcache.c:2743
+#: dirmngr/crlcache.c:2746
 #, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "crl_cache_insert via utsteder mislyktes: %s\n"
@@ -10156,7 +10146,7 @@ msgstr "Ingen CRL-tilgang fordi %s er slått av\n"
 msgid "error retrieving '%s': %s\n"
 msgstr "feil under henting av «%s»: %s\n"
 
-#: dirmngr/crlfetch.c:218 dirmngr/ldap-wrapper.c:881 dirmngr/misc.c:573
+#: dirmngr/crlfetch.c:218 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
 #, c-format
 msgid "error initializing reader object: %s\n"
 msgstr "feil under innlasting av leserobjekt: %s\n"
@@ -10312,132 +10302,132 @@ msgstr "forventet fullstendig filsti\n"
 msgid "looking up '%s'\n"
 msgstr "slår opp «%s»\n"
 
-#: dirmngr/dirmngr.c:175
+#: dirmngr/dirmngr.c:176
 msgid "list the contents of the CRL cache"
 msgstr "vis innhold i CRL-hurtiglager"
 
-#: dirmngr/dirmngr.c:176
+#: dirmngr/dirmngr.c:177
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|FIL|last inn CRL fra valgt FIL i hurtiglager"
 
-#: dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr.c:178
 msgid "|URL|fetch a CRL from URL"
 msgstr "|ADR|hent CRL fra valgt nettADResse"
 
-#: dirmngr/dirmngr.c:178
+#: dirmngr/dirmngr.c:179
 msgid "shutdown the dirmngr"
 msgstr "slå av dirmngr"
 
-#: dirmngr/dirmngr.c:179
+#: dirmngr/dirmngr.c:180
 msgid "flush the cache"
 msgstr "tøm hurtiglager"
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:213
 msgid "allow online software version check"
 msgstr "tillat kontroll av programvare-versjon over nett"
 
-#: dirmngr/dirmngr.c:215
+#: dirmngr/dirmngr.c:216
 msgid "|N|do not return more than N items in one query"
 msgstr "|N|ikke vis flere enn N antall elementer per spørring"
 
-#: dirmngr/dirmngr.c:221
+#: dirmngr/dirmngr.c:222
 msgid "Network related options"
 msgstr ""
 
-#: dirmngr/dirmngr.c:223
+#: dirmngr/dirmngr.c:224
 msgid "route all network traffic via Tor"
 msgstr "kjør all nettverkstrafikk gjennom Tor"
 
-#: dirmngr/dirmngr.c:235
+#: dirmngr/dirmngr.c:236
 msgid "Configuration for Keyservers"
 msgstr "Oppsett for nøkkeltjenere"
 
-#: dirmngr/dirmngr.c:238
+#: dirmngr/dirmngr.c:239
 msgid "|URL|use keyserver at URL"
 msgstr "|ADR|bruk nøkkeltjener på valgt nettADResse"
 
-#: dirmngr/dirmngr.c:240
+#: dirmngr/dirmngr.c:241
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr "|FIL|bruk CA-sertifikater i valgt FIL til HKP via TLS"
 
-#: dirmngr/dirmngr.c:242
+#: dirmngr/dirmngr.c:243
 msgid "Configuration for HTTP servers"
 msgstr "Oppsett for HTTP-tjenere"
 
-#: dirmngr/dirmngr.c:244
+#: dirmngr/dirmngr.c:245
 msgid "inhibit the use of HTTP"
 msgstr "hindre bruk av HTTP"
 
-#: dirmngr/dirmngr.c:246
+#: dirmngr/dirmngr.c:247
 msgid "ignore HTTP CRL distribution points"
 msgstr "ignorer HTTP CRL-distribusjonspunkter"
 
-#: dirmngr/dirmngr.c:248
+#: dirmngr/dirmngr.c:249
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr "|ADR|videresend alle HTTP-forespørsler til valgt nettADResse"
 
-#: dirmngr/dirmngr.c:250
+#: dirmngr/dirmngr.c:251
 msgid "use system's HTTP proxy setting"
 msgstr "bruk systemets innstilling for HTTP-mellomtjener"
 
-#: dirmngr/dirmngr.c:254
+#: dirmngr/dirmngr.c:255
 msgid "Configuration of LDAP servers to use"
 msgstr "Oppsett for bruk av LDAP-tjenere"
 
-#: dirmngr/dirmngr.c:256
+#: dirmngr/dirmngr.c:257
 msgid "inhibit the use of LDAP"
 msgstr "hindre bruk av LDAP"
 
-#: dirmngr/dirmngr.c:258
+#: dirmngr/dirmngr.c:259
 msgid "ignore LDAP CRL distribution points"
 msgstr "ignorer LDAP CRL-distribusjonspunkter"
 
-#: dirmngr/dirmngr.c:260
+#: dirmngr/dirmngr.c:261
 msgid "|HOST|use HOST for LDAP queries"
 msgstr "|VERT|bruk valgt VERT til LDAP-oppslag"
 
-#: dirmngr/dirmngr.c:262
+#: dirmngr/dirmngr.c:263
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr "ikke bruk tilbakefallsverter ved bruk av valget «--ldap-proxy»"
 
-#: dirmngr/dirmngr.c:264
+#: dirmngr/dirmngr.c:267
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FIL|les LDAP-tjenerliste fra valgt FIL"
 
-#: dirmngr/dirmngr.c:266
+#: dirmngr/dirmngr.c:269
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 "legg til tjenere i tjenerliste som blir oppdaget via CRL-distribusjonspunkter"
 
-#: dirmngr/dirmngr.c:269 dirmngr/dirmngr_ldap.c:104
+#: dirmngr/dirmngr.c:272
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|endre LDAP-tidsavbrudd til N antall sekunder"
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:275
 msgid "Configuration for OCSP"
 msgstr "Oppsett for OCSP"
 
-#: dirmngr/dirmngr.c:274
+#: dirmngr/dirmngr.c:277
 msgid "allow sending OCSP requests"
 msgstr "tillat sending av OCSP-forespørsler"
 
-#: dirmngr/dirmngr.c:276
+#: dirmngr/dirmngr.c:279
 msgid "ignore certificate contained OCSP service URLs"
 msgstr "ignorer OSCP-tjenesteadresser som følger sertifikater"
 
-#: dirmngr/dirmngr.c:278
+#: dirmngr/dirmngr.c:281
 msgid "|URL|use OCSP responder at URL"
 msgstr "|ADR|bruk OCSP-svartjeneste ved valgt nettADResse"
 
-#: dirmngr/dirmngr.c:280
+#: dirmngr/dirmngr.c:283
 msgid "|FPR|OCSP response signed by FPR"
 msgstr "|FPR|OCSP-svartjeneste signert av FPR"
 
-#: dirmngr/dirmngr.c:288
+#: dirmngr/dirmngr.c:291
 msgid "force loading of outdated CRLs"
 msgstr "tving innlasting av utdatert CRL"
 
-#: dirmngr/dirmngr.c:299
+#: dirmngr/dirmngr.c:302
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
@@ -10446,11 +10436,11 @@ msgstr ""
 "@\n"
 "Se «info»-bruksanvisning for fullstendig liste over alle kommandoer og valg\n"
 
-#: dirmngr/dirmngr.c:441
+#: dirmngr/dirmngr.c:449
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Bruk: @DIRMNGR@ [valg] (-h for hjelp)"
 
-#: dirmngr/dirmngr.c:443
+#: dirmngr/dirmngr.c:451
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@ -10458,285 +10448,103 @@ msgstr ""
 "Syntaks: @DIRMNGR@ [valg] [kommando [arg]]\n"
 "Tilgang til nøkkeltjener, CRL og OCSP for @GNUPG@\n"
 
-#: dirmngr/dirmngr.c:523
+#: dirmngr/dirmngr.c:531
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr "følgende feilsøkingsnivåer er gyldige: %s\n"
 
-#: dirmngr/dirmngr.c:609 tools/gpgconf.c:667 tools/gpgconf.c:702
-#: tools/gpgconf.c:802
+#: dirmngr/dirmngr.c:617 tools/gpgconf.c:701 tools/gpgconf.c:736
+#: tools/gpgconf.c:836
 #, c-format
 msgid "usage: %s [options] "
 msgstr "bruk: %s [valg] "
 
-#: dirmngr/dirmngr.c:1260
+#: dirmngr/dirmngr.c:1299
 #, c-format
 msgid "colons are not allowed in the socket name\n"
 msgstr "kolon tillates ikke i sokkelnavn\n"
 
-#: dirmngr/dirmngr.c:1495 dirmngr/server.c:1824
+#: dirmngr/dirmngr.c:1534 dirmngr/server.c:1878
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "henting av CRL fra «%s» mislyktes: %s\n"
 
-#: dirmngr/dirmngr.c:1501 dirmngr/server.c:1830
+#: dirmngr/dirmngr.c:1540 dirmngr/server.c:1884
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "behandling av CRL fra «%s» mislyktes: %s\n"
 
-#: dirmngr/dirmngr.c:1643
+#: dirmngr/dirmngr.c:1682
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: for lang linje. Hoppet over\n"
 
-#: dirmngr/dirmngr.c:1698 dirmngr/dirmngr.c:1782
+#: dirmngr/dirmngr.c:1737 dirmngr/dirmngr.c:1821
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: oppdaget ugyldig fingeravtrykk\n"
 
-#: dirmngr/dirmngr.c:1734 dirmngr/dirmngr.c:1760 tools/gpgconf-comp.c:3539
+#: dirmngr/dirmngr.c:1773 dirmngr/dirmngr.c:1799 tools/gpgconf-comp.c:3549
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: lesefeil: %s\n"
 
-#: dirmngr/dirmngr.c:1789
+#: dirmngr/dirmngr.c:1828
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr "%s:%u: ignorerer ugyldige data ved linjeslutt\n"
 
-#: dirmngr/dirmngr.c:1876
+#: dirmngr/dirmngr.c:1915
 #, 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:1917
+#: dirmngr/dirmngr.c:1956
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "SIGUSR2 mottatt. Ingen handling definert\n"
 
-#: dirmngr/dirmngr.c:1922
+#: dirmngr/dirmngr.c:1961
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "SIGTERM mottatt. Slår av …\n"
 
-#: dirmngr/dirmngr.c:1924
+#: dirmngr/dirmngr.c:1963
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "SIGTERM mottatt. %d tilkoblinger er fremdeles aktive\n"
 
-#: dirmngr/dirmngr.c:1929
+#: dirmngr/dirmngr.c:1968
 #, c-format
 msgid "shutdown forced\n"
 msgstr "slår av under tvang\n"
 
-#: dirmngr/dirmngr.c:1937
+#: dirmngr/dirmngr.c:1976
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "SIGINT mottatt. Slår av umiddelbart\n"
 
-#: dirmngr/dirmngr.c:1944
+#: dirmngr/dirmngr.c:1983
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "signal %d mottatt. Ingen handling definert\n"
 
-#: dirmngr/dirmngr_ldap.c:105
-msgid "return all values in a record oriented format"
-msgstr "vis alle verdier i oppføringsorientert format"
-
-#: dirmngr/dirmngr_ldap.c:108
-msgid "|NAME|ignore host part and connect through NAME"
-msgstr "|NAVN|ignorer vertsdel og koble til med NAVN"
-
-#: dirmngr/dirmngr_ldap.c:109
-msgid "force a TLS connection"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:110
-msgid "|NAME|connect to host NAME"
-msgstr "|NAVN|koble til valgt vertsNAVN"
-
-#: dirmngr/dirmngr_ldap.c:111
-msgid "|N|connect to port N"
-msgstr "|N|koble til port N"
-
-#: dirmngr/dirmngr_ldap.c:112
-msgid "|NAME|use user NAME for authentication"
-msgstr "|NAVN|bruk valgt brukerNAVN til autentisering"
-
-#: dirmngr/dirmngr_ldap.c:113
-msgid "|PASS|use password PASS for authentication"
-msgstr "|PASS|bruk valgt PASSord til autentisering "
-
-#: dirmngr/dirmngr_ldap.c:115
-msgid "take password from $DIRMNGR_LDAP_PASS"
-msgstr "hent passord fra $DIRMNGR_LDAP_PASS"
-
-#: dirmngr/dirmngr_ldap.c:116
-msgid "|STRING|query DN STRING"
-msgstr "|STRENG|utfør spørring med valgt DN-STRENG"
-
-#: dirmngr/dirmngr_ldap.c:117
-msgid "|STRING|use STRING as filter expression"
-msgstr "|STRENG|bruk valgt STRENG som filteruttrykk"
-
-#: dirmngr/dirmngr_ldap.c:118
-msgid "|STRING|return the attribute STRING"
-msgstr "|STRENG|vis attributt valgt med STRENG"
-
-#: dirmngr/dirmngr_ldap.c:179
-msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
-msgstr "Bruk: dirmngr_ldap [valg] [ADR] (-h for hjelp)\n"
-
-#: dirmngr/dirmngr_ldap.c:182
-msgid ""
-"Syntax: dirmngr_ldap [options] [URL]\n"
-"Internal LDAP helper for Dirmngr\n"
-"Interface and options may change without notice\n"
-msgstr ""
-"Syntaks: dirmngr_ldap [valg] [ADR]\n"
-"Internt LDAP-hjelpeverktøy for Dirmngr\n"
-"Grensesnitt og valgmuligheter kan endres uten varsel\n"
-
-#: dirmngr/dirmngr_ldap.c:291
-#, c-format
-msgid "invalid port number %d\n"
-msgstr "portnummer %d er ugyldig\n"
-
-#: dirmngr/dirmngr_ldap.c:400
-#, c-format
-msgid "scanning result for attribute '%s'\n"
-msgstr "ser gjennom treff for attributt «%s»\n"
-
-#: dirmngr/dirmngr_ldap.c:407 dirmngr/dirmngr_ldap.c:490
-#: dirmngr/dirmngr_ldap.c:514 dirmngr/dirmngr_ldap.c:526
-#: dirmngr/dirmngr_ldap.c:722
-#, c-format
-msgid "error writing to stdout: %s\n"
-msgstr "feil under skriving til std.utkanal: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:424
-#, c-format
-msgid "          available attribute '%s'\n"
-msgstr "          tilgjengelig attributt «%s»\n"
-
-#: dirmngr/dirmngr_ldap.c:462
-#, c-format
-msgid "attribute '%s' not found\n"
-msgstr "fant ikke attributt «%s»\n"
-
-#: dirmngr/dirmngr_ldap.c:469
-#, c-format
-msgid "found attribute '%s'\n"
-msgstr "fant attributt «%s»\n"
-
-#: dirmngr/dirmngr_ldap.c:581
-#, c-format
-msgid "processing url '%s'\n"
-msgstr "behandler adresse «%s»\n"
-
-#: dirmngr/dirmngr_ldap.c:588
-#, c-format
-msgid "          user '%s'\n"
-msgstr "          bruker «%s»\n"
-
-#: dirmngr/dirmngr_ldap.c:590
-#, c-format
-msgid "          pass '%s'\n"
-msgstr "          passord «%s»\n"
-
-#: dirmngr/dirmngr_ldap.c:592
-#, c-format
-msgid "          host '%s'\n"
-msgstr "          vert «%s»\n"
-
-#: dirmngr/dirmngr_ldap.c:593
-#, c-format
-msgid "          port %d\n"
-msgstr "          port %d\n"
-
-#: dirmngr/dirmngr_ldap.c:595
-#, c-format
-msgid "            DN '%s'\n"
-msgstr "            DN «%s»\n"
-
-#: dirmngr/dirmngr_ldap.c:597
-#, c-format
-msgid "        filter '%s'\n"
-msgstr "        filter «%s»\n"
-
-#: dirmngr/dirmngr_ldap.c:602 dirmngr/dirmngr_ldap.c:605
-#, c-format
-msgid "          attr '%s'\n"
-msgstr "          attr «%s»\n"
-
-#: dirmngr/dirmngr_ldap.c:611
-#, c-format
-msgid "no host name in '%s'\n"
-msgstr "ingen vertsnavn i «%s»\n"
-
-#: dirmngr/dirmngr_ldap.c:616
-#, c-format
-msgid "no attribute given for query '%s'\n"
-msgstr "ingen attributt oppgitt for spørring «%s»\n"
-
-#: dirmngr/dirmngr_ldap.c:622
-#, c-format
-msgid "WARNING: using first attribute only\n"
-msgstr "ADVARSEL: bruker bare første attributt\n"
-
-#: dirmngr/dirmngr_ldap.c:637 dirmngr/dirmngr_ldap.c:678
-#, c-format
-msgid "LDAP init to '%s:%d' failed: %s\n"
-msgstr "LDAP-init til «%s:%d» mislyktes: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:659
-#, fuzzy, c-format
-#| msgid "LDAP init to '%s:%d' failed: %s\n"
-msgid "LDAP init to '%s' failed: %s\n"
-msgstr "LDAP-init til «%s:%d» mislyktes: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:665
-#, fuzzy, c-format
-#| msgid "LDAP init to '%s:%d' failed: %s\n"
-msgid "LDAP init to '%s' done\n"
-msgstr "LDAP-init til «%s:%d» mislyktes: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:704
-#, c-format
-msgid "binding to '%s:%d' failed: %s\n"
-msgstr "tilknytning til «%s:%d» mislyktes: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:728
-#, c-format
-msgid "searching '%s' failed: %s\n"
-msgstr "søk etter «%s» mislyktes: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:759
-#, c-format
-msgid "'%s' is not an LDAP URL\n"
-msgstr "«%s» er ikke en LDAP-adresse\n"
-
-#: dirmngr/dirmngr_ldap.c:765
-#, c-format
-msgid "'%s' is an invalid LDAP URL\n"
-msgstr "«%s» er en ugyldig LDAP-adresse\n"
-
-#: dirmngr/http.c:1989 dirmngr/ocsp.c:255
+#: dirmngr/http.c:1998 dirmngr/ocsp.c:255
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "fikk ikke tilgang til «%s»: http-status %u\n"
 
-#: dirmngr/http.c:3630 dirmngr/ocsp.c:229
+#: dirmngr/http.c:3652 dirmngr/ocsp.c:229
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr "Videresendt fra adresse «%s» til «%s» (%u)\n"
 
-#: dirmngr/http.c:3636 dirmngr/ocsp.c:246
+#: dirmngr/http.c:3658 dirmngr/ocsp.c:246
 #, c-format
 msgid "too many redirections\n"
 msgstr "for mange videresendinger\n"
 
-#: dirmngr/http.c:3748
+#: dirmngr/http.c:3768
 #, fuzzy, c-format
 #| msgid "writing to '%s'\n"
 msgid "redirection changed to '%s'\n"
@@ -10777,31 +10585,51 @@ msgstr "venting på ldap-grensesnitt %d mislyktes: %s\n"
 msgid "ldap wrapper %d stalled - killing\n"
 msgstr "ldap-grensesnitt %d steilet - dreper prosess\n"
 
-#: dirmngr/ldap.c:91
+#: dirmngr/ldap.c:92
 #, c-format
 msgid "invalid char 0x%02x in host name - not added\n"
 msgstr "vertsnavn inneholder ugyldig tegn 0x%02x, og ble ikke lagt til\n"
 
-#: dirmngr/ldap.c:95
+#: dirmngr/ldap.c:96
 #, c-format
 msgid "adding '%s:%d' to the ldap server list\n"
 msgstr "legger til «%s:%d» i ldap-tjenerliste\n"
 
-#: dirmngr/ldap.c:98 dirmngr/misc.c:512
+#: dirmngr/ldap.c:99 dirmngr/misc.c:512
 #, c-format
 msgid "malloc failed: %s\n"
 msgstr "malloc mislyktes: %s\n"
 
-#: dirmngr/ldap.c:634
+#: dirmngr/ldap.c:221
 #, c-format
-msgid "start_cert_fetch: invalid pattern '%s'\n"
-msgstr "start_cert_fetch: mønsteret «%s» er ugyldig\n"
+msgid "'%s' is not an LDAP URL\n"
+msgstr "«%s» er ikke en LDAP-adresse\n"
 
-#: dirmngr/ldap.c:846
+#: dirmngr/ldap.c:227 dirmngr/ldap.c:233
+#, c-format
+msgid "'%s' is an invalid LDAP URL\n"
+msgstr "«%s» er en ugyldig LDAP-adresse\n"
+
+#: dirmngr/ldap.c:968
 #, c-format
 msgid "ldap_search hit the size limit of the server\n"
 msgstr "ldap_search overskred tjenerens størrelsesgrense\n"
 
+#: dirmngr/ldapserver.c:119
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr "%s:%u: passord skrevet inn uten brukernavn\n"
+
+#: dirmngr/ldapserver.c:181
+#, c-format
+msgid "%s:%u: ignoring unknown flag '%s'\n"
+msgstr ""
+
+#: dirmngr/ldapserver.c:203
+#, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr "%s:%u: hopper over denne linja\n"
+
 #: dirmngr/misc.c:172
 #, c-format
 msgid "invalid canonical S-expression found\n"
@@ -10892,86 +10720,86 @@ msgstr "ikke signert av sertifikat som tilhører en forvalgt OCSP-fullmektig"
 msgid "allocating list item failed: %s\n"
 msgstr "tildeling av listeelement mislyktes: %s\n"
 
-#: dirmngr/ocsp.c:537 dirmngr/ocsp.c:724
+#: dirmngr/ocsp.c:538 dirmngr/ocsp.c:725
 #, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "feil under henting av svartjeneste-ID: %s\n"
 
-#: dirmngr/ocsp.c:584
+#: dirmngr/ocsp.c:585
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr "fant ingen sertifikat som egner seg til å bekrefte OCSP-svar\n"
 
-#: dirmngr/ocsp.c:623 dirmngr/validate.c:648
+#: dirmngr/ocsp.c:624 dirmngr/validate.c:648
 #, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "fant ikke utstedersertifikat: %s\n"
 
-#: dirmngr/ocsp.c:633
+#: dirmngr/ocsp.c:634
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr "klient sendte ikke målsertifikat\n"
 
-#: dirmngr/ocsp.c:640
+#: dirmngr/ocsp.c:641
 #, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "klient sendte ikke utstedersertifikat\n"
 
-#: dirmngr/ocsp.c:650
+#: dirmngr/ocsp.c:651
 #, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "klarte ikke å tildele OCSP-kontekst: %s\n"
 
-#: dirmngr/ocsp.c:689
+#: dirmngr/ocsp.c:690
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr "ingen forvalgt OCSP-svartjeneste\n"
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:696
 #, c-format
 msgid "no default OCSP signer defined\n"
 msgstr "ingen OCSP-undertegner er definert som standard\n"
 
-#: dirmngr/ocsp.c:702
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr "bruker forvalgt OCSP-svartjeneste «%s»\n"
 
-#: dirmngr/ocsp.c:707
+#: dirmngr/ocsp.c:708
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "bruker OCSP-svartjeneste «%s»\n"
 
-#: dirmngr/ocsp.c:764
+#: dirmngr/ocsp.c:765
 #, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "feil under henting av OCSP-status for målsertifikat: %s\n"
 
-#: dirmngr/ocsp.c:789
+#: dirmngr/ocsp.c:790
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr "sertifikatstatus er: %s  (dette=%s  neste=%s)\n"
 
-#: dirmngr/ocsp.c:790
+#: dirmngr/ocsp.c:791
 msgid "good"
 msgstr "bra"
 
-#: dirmngr/ocsp.c:796
+#: dirmngr/ocsp.c:797
 #, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "sertifikat opphevet %s med følgende begrunnelse: %s\n"
 
-#: dirmngr/ocsp.c:831
+#: dirmngr/ocsp.c:832
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr "OCSP-svartjeneste sendte status datert i framtiden\n"
 
-#: dirmngr/ocsp.c:843
+#: dirmngr/ocsp.c:844
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr "OCSP-svartjeneste sendte status som ikke er datert i nåtid\n"
 
-#: dirmngr/ocsp.c:858
+#: dirmngr/ocsp.c:859
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr "OCSP-svartjeneste sendte for gammel status\n"
@@ -10981,71 +10809,67 @@ msgstr "OCSP-svartjeneste sendte for gammel status\n"
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "«assuan_inquire»(%s) mislyktes: %s\n"
 
-#: dirmngr/server.c:1158
-msgid "ldapserver missing"
-msgstr "ldapserver mangler"
-
-#: dirmngr/server.c:1224
+#: dirmngr/server.c:1277
 msgid "serialno missing in cert ID"
 msgstr "serienummer mangler i sertifikat-ID"
 
-#: dirmngr/server.c:1387 dirmngr/server.c:1473 dirmngr/server.c:1909
-#: dirmngr/server.c:1980 dirmngr/server.c:2556 dirmngr/server.c:2571
+#: dirmngr/server.c:1440 dirmngr/server.c:1526 dirmngr/server.c:1963
+#: dirmngr/server.c:2034 dirmngr/server.c:2662 dirmngr/server.c:2677
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "«assuan_inquire» mislyktes: %s\n"
 
-#: dirmngr/server.c:1516
+#: dirmngr/server.c:1569
 #, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "«fetch_cert_by_url» mislyktes: %s\n"
 
-#: dirmngr/server.c:1528 dirmngr/server.c:1559 dirmngr/server.c:1718
+#: dirmngr/server.c:1581 dirmngr/server.c:1612 dirmngr/server.c:1772
 #, c-format
 msgid "error sending data: %s\n"
 msgstr "feil under sending av data: %s\n"
 
-#: dirmngr/server.c:1666
+#: dirmngr/server.c:1720
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "«start_cert_fetch» mislyktes: %s\n"
 
-#: dirmngr/server.c:1699
+#: dirmngr/server.c:1753
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "«fetch_next_cert» mislyktes: %s\n"
 
-#: dirmngr/server.c:1726
+#: dirmngr/server.c:1780
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr "max_replies %d overskredet\n"
 
-#: dirmngr/server.c:2860
+#: dirmngr/server.c:2966
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "klarte ikke å tildele kontrollstruktur: %s\n"
 
-#: dirmngr/server.c:2871
+#: dirmngr/server.c:2977
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "klarte ikke å tildele assuan-kontekst: %s\n"
 
-#: dirmngr/server.c:2892
+#: dirmngr/server.c:2998
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "klarte ikke å starte opp tjener: %s\n"
 
-#: dirmngr/server.c:2900
+#: dirmngr/server.c:3006
 #, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "klarte ikke å registrere kommandoer i Assuan: %s\n"
 
-#: dirmngr/server.c:2933
+#: dirmngr/server.c:3039
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "Assuan-godkjenningsproblem: %s\n"
 
-#: dirmngr/server.c:2952
+#: dirmngr/server.c:3058
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "Assuan-behandling mislyktes: %s\n"
@@ -11193,71 +11017,71 @@ msgstr "ingen dirmngr kjører i gjeldende økt\n"
 msgid "error sending standard options: %s\n"
 msgstr "feil under sending av standardvalg: %s\n"
 
-#: tools/gpgconf-comp.c:649
+#: tools/gpgconf-comp.c:655
 msgid "OpenPGP"
 msgstr "OpenPGP"
 
-#: tools/gpgconf-comp.c:653
+#: tools/gpgconf-comp.c:659
 msgid "S/MIME"
 msgstr "S/MIME"
 
-#: tools/gpgconf-comp.c:657
+#: tools/gpgconf-comp.c:663
 #, fuzzy
 #| msgid "public key is %s\n"
 msgid "Public Keys"
 msgstr "offentlig nøkkel er %s\n"
 
-#: tools/gpgconf-comp.c:661
+#: tools/gpgconf-comp.c:667
 msgid "Private Keys"
 msgstr "Privatnøkler"
 
-#: tools/gpgconf-comp.c:665
+#: tools/gpgconf-comp.c:671
 msgid "Smartcards"
 msgstr "Smartkort"
 
-#: tools/gpgconf-comp.c:669
+#: tools/gpgconf-comp.c:676
 msgid "TPM"
 msgstr ""
 
-#: tools/gpgconf-comp.c:673
+#: tools/gpgconf-comp.c:681
 msgid "Network"
 msgstr "Nettverk"
 
-#: tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:685
 msgid "Passphrase Entry"
 msgstr "Skriving av passordfrase"
 
-#: tools/gpgconf-comp.c:941
+#: tools/gpgconf-comp.c:951
 msgid "Component not suitable for launching"
 msgstr "Komponent egner seg ikke for oppstart"
 
-#: tools/gpgconf-comp.c:947
+#: tools/gpgconf-comp.c:957
 #, fuzzy, c-format
 #| msgid "External verification of component %s failed"
 msgid "Configuration file of component %s is broken\n"
 msgstr "Ekstern bekreftelse av komponent %s mislyktes"
 
-#: tools/gpgconf-comp.c:950
+#: tools/gpgconf-comp.c:960
 #, fuzzy, c-format
 #| msgid "Note: Use the command \"%s\" to restart them.\n"
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr "Merk: Bruk kommandoen «%s» for å starte dem på nytt.\n"
 
-#: tools/gpgconf-comp.c:2816
+#: tools/gpgconf-comp.c:2826
 #, c-format
 msgid "External verification of component %s failed"
 msgstr "Ekstern bekreftelse av komponent %s mislyktes"
 
-#: tools/gpgconf-comp.c:2946
+#: tools/gpgconf-comp.c:2956
 msgid "Note that group specifications are ignored\n"
 msgstr "Merk at gruppespesifikasjoner blir ignorert\n"
 
-#: tools/gpgconf-comp.c:3543
+#: tools/gpgconf-comp.c:3553
 #, c-format
 msgid "error closing '%s'\n"
 msgstr "feil under lukking av «%s»\n"
 
-#: tools/gpgconf-comp.c:3545
+#: tools/gpgconf-comp.c:3555
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr "feil under tolkning av «%s»\n"
@@ -11338,15 +11162,15 @@ msgstr ""
 "Syntaks: @GPGCONF@ [valg]\n"
 "Behandle oppsettsvalg for verktøy i @GNUPG@-systemet\n"
 
-#: tools/gpgconf.c:669 tools/gpgconf.c:704
+#: tools/gpgconf.c:703 tools/gpgconf.c:738
 msgid "Need one component argument"
 msgstr "Komponent-argument mangler"
 
-#: tools/gpgconf.c:678 tools/gpgconf.c:728 tools/gpgconf.c:778
+#: tools/gpgconf.c:712 tools/gpgconf.c:762 tools/gpgconf.c:812
 msgid "Component not found"
 msgstr "Fant ikke komponent"
 
-#: tools/gpgconf.c:804
+#: tools/gpgconf.c:838
 msgid "No argument allowed"
 msgstr "Ingen argumenter tillatt"
 
@@ -11362,92 +11186,219 @@ msgstr ""
 "Syntaks: gpg-check-pattern [valg] mønsterfil\n"
 "Kontroller passordfrase oppgitt på standard innkanal mot valgt mønsterfil\n"
 
-#: tools/gpg-card.c:2390
+#: tools/gpg-card.c:2407
 #, fuzzy, c-format
 #| msgid "Note: keys are already stored on the card!\n"
 msgid "Note: key %s is already stored on the card!\n"
 msgstr "MERK: det ligger allerede nøkler på kortet.\n"
 
-#: tools/gpg-card.c:2393
+#: tools/gpg-card.c:2410
 #, fuzzy, c-format
 #| msgid "Note: keys are already stored on the card!\n"
 msgid "Note: Keys are already stored on the card!\n"
 msgstr "MERK: det ligger allerede nøkler på kortet.\n"
 
-#: tools/gpg-card.c:2396
+#: tools/gpg-card.c:2413
 #, fuzzy, c-format
 #| msgid "Replace existing keys? (y/N) "
 msgid "Replace existing key %s ? (y/N) "
 msgstr "Erstatte eksisterende nøkler? (j/N) "
 
-#: tools/gpg-card.c:2549 tools/gpg-card.c:2712 tools/gpg-card.c:2935
-#: tools/gpg-card.c:3044
+#: tools/gpg-card.c:2566 tools/gpg-card.c:2729 tools/gpg-card.c:2952
+#: tools/gpg-card.c:3061
 #, fuzzy, c-format
 #| msgid "OpenPGP card no. %s detected\n"
 msgid "%s card no. %s detected\n"
 msgstr "Oppdaget OpenPGP-kortnummer %s\n"
 
-#: tools/gpg-card.c:3396
+#: tools/gpg-card.c:3413
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3406 tools/gpg-card.c:3420
+#: tools/gpg-card.c:3423 tools/gpg-card.c:3437
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
 "         can only be reverted using a factory reset!\n"
 msgstr ""
 
-#: tools/gpg-card.c:3423
+#: tools/gpg-card.c:3440
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3669
+#: tools/gpg-card.c:3686
 #, fuzzy
 #| msgid "add a certificate to the cache"
 msgid "authenticate to the card"
 msgstr "legg til sertifikat i hurtiglager"
 
-#: tools/gpg-card.c:3671
+#: tools/gpg-card.c:3688
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3673
+#: tools/gpg-card.c:3690
 #, fuzzy
 #| msgid "|NAME|use user NAME for authentication"
 msgid "setup KDF for PIN authentication"
 msgstr "|NAVN|bruk valgt brukerNAVN til autentisering"
 
-#: tools/gpg-card.c:3675
+#: tools/gpg-card.c:3692
 msgid "change a private data object"
 msgstr ""
 
-#: tools/gpg-card.c:3676
+#: tools/gpg-card.c:3693
 #, fuzzy
 #| msgid "add a certificate to the cache"
 msgid "read a certificate from a data object"
 msgstr "legg til sertifikat i hurtiglager"
 
-#: tools/gpg-card.c:3677
+#: tools/gpg-card.c:3694
 #, fuzzy
 #| msgid "add a certificate to the cache"
 msgid "store a certificate to a data object"
 msgstr "legg til sertifikat i hurtiglager"
 
-#: tools/gpg-card.c:3678
+#: tools/gpg-card.c:3695
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3679
+#: tools/gpg-card.c:3696
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3681
+#: tools/gpg-card.c:3698
 msgid "manage the command history"
 msgstr ""
 
+#~ msgid "requesting key %s from %s server %s\n"
+#~ msgstr "ber om nøkkelen %s fra %s tjener %s\n"
+
+#~ msgid "%s:%u: no hostname given\n"
+#~ msgstr "%s:%u: vertsnavn mangler\n"
+
+#~ msgid "could not parse keyserver\n"
+#~ msgstr "klarte ikke å tolke nøkkeltjener\n"
+
+#~ msgid "return all values in a record oriented format"
+#~ msgstr "vis alle verdier i oppføringsorientert format"
+
+#~ msgid "|NAME|ignore host part and connect through NAME"
+#~ msgstr "|NAVN|ignorer vertsdel og koble til med NAVN"
+
+#~ msgid "|NAME|connect to host NAME"
+#~ msgstr "|NAVN|koble til valgt vertsNAVN"
+
+#~ msgid "|N|connect to port N"
+#~ msgstr "|N|koble til port N"
+
+#~ msgid "|NAME|use user NAME for authentication"
+#~ msgstr "|NAVN|bruk valgt brukerNAVN til autentisering"
+
+#~ msgid "|PASS|use password PASS for authentication"
+#~ msgstr "|PASS|bruk valgt PASSord til autentisering "
+
+#~ msgid "take password from $DIRMNGR_LDAP_PASS"
+#~ msgstr "hent passord fra $DIRMNGR_LDAP_PASS"
+
+#~ msgid "|STRING|query DN STRING"
+#~ msgstr "|STRENG|utfør spørring med valgt DN-STRENG"
+
+#~ msgid "|STRING|use STRING as filter expression"
+#~ msgstr "|STRENG|bruk valgt STRENG som filteruttrykk"
+
+#~ msgid "|STRING|return the attribute STRING"
+#~ msgstr "|STRENG|vis attributt valgt med STRENG"
+
+#~ msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
+#~ msgstr "Bruk: dirmngr_ldap [valg] [ADR] (-h for hjelp)\n"
+
+#~ msgid ""
+#~ "Syntax: dirmngr_ldap [options] [URL]\n"
+#~ "Internal LDAP helper for Dirmngr\n"
+#~ "Interface and options may change without notice\n"
+#~ msgstr ""
+#~ "Syntaks: dirmngr_ldap [valg] [ADR]\n"
+#~ "Internt LDAP-hjelpeverktøy for Dirmngr\n"
+#~ "Grensesnitt og valgmuligheter kan endres uten varsel\n"
+
+#~ msgid "invalid port number %d\n"
+#~ msgstr "portnummer %d er ugyldig\n"
+
+#~ msgid "scanning result for attribute '%s'\n"
+#~ msgstr "ser gjennom treff for attributt «%s»\n"
+
+#~ msgid "error writing to stdout: %s\n"
+#~ msgstr "feil under skriving til std.utkanal: %s\n"
+
+#~ msgid "          available attribute '%s'\n"
+#~ msgstr "          tilgjengelig attributt «%s»\n"
+
+#~ msgid "attribute '%s' not found\n"
+#~ msgstr "fant ikke attributt «%s»\n"
+
+#~ msgid "found attribute '%s'\n"
+#~ msgstr "fant attributt «%s»\n"
+
+#~ msgid "processing url '%s'\n"
+#~ msgstr "behandler adresse «%s»\n"
+
+#~ msgid "          user '%s'\n"
+#~ msgstr "          bruker «%s»\n"
+
+#~ msgid "          pass '%s'\n"
+#~ msgstr "          passord «%s»\n"
+
+#~ msgid "          host '%s'\n"
+#~ msgstr "          vert «%s»\n"
+
+#~ msgid "          port %d\n"
+#~ msgstr "          port %d\n"
+
+#~ msgid "            DN '%s'\n"
+#~ msgstr "            DN «%s»\n"
+
+#~ msgid "        filter '%s'\n"
+#~ msgstr "        filter «%s»\n"
+
+#~ msgid "          attr '%s'\n"
+#~ msgstr "          attr «%s»\n"
+
+#~ msgid "no host name in '%s'\n"
+#~ msgstr "ingen vertsnavn i «%s»\n"
+
+#~ msgid "no attribute given for query '%s'\n"
+#~ msgstr "ingen attributt oppgitt for spørring «%s»\n"
+
+#~ msgid "WARNING: using first attribute only\n"
+#~ msgstr "ADVARSEL: bruker bare første attributt\n"
+
+#~ msgid "LDAP init to '%s:%d' failed: %s\n"
+#~ msgstr "LDAP-init til «%s:%d» mislyktes: %s\n"
+
+#, fuzzy
+#~| msgid "LDAP init to '%s:%d' failed: %s\n"
+#~ msgid "LDAP init to '%s' failed: %s\n"
+#~ msgstr "LDAP-init til «%s:%d» mislyktes: %s\n"
+
+#, fuzzy
+#~| msgid "LDAP init to '%s:%d' failed: %s\n"
+#~ msgid "LDAP init to '%s' done\n"
+#~ msgstr "LDAP-init til «%s:%d» mislyktes: %s\n"
+
+#~ msgid "binding to '%s:%d' failed: %s\n"
+#~ msgstr "tilknytning til «%s:%d» mislyktes: %s\n"
+
+#~ msgid "searching '%s' failed: %s\n"
+#~ msgstr "søk etter «%s» mislyktes: %s\n"
+
+#~ msgid "start_cert_fetch: invalid pattern '%s'\n"
+#~ msgstr "start_cert_fetch: mønsteret «%s» er ugyldig\n"
+
+#~ msgid "ldapserver missing"
+#~ msgstr "ldapserver mangler"
+
 #, fuzzy
 #~| msgid "change a passphrase"
 #~ msgid "Suggest a random passphrase."
diff --git a/po/pl.gmo b/po/pl.gmo
index 00d5305..4ed34a6 100644
--- a/po/pl.gmo
+++ b/po/pl.gmo
diff --git a/po/pl.po b/po/pl.po
index 4f32a04..e862963 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: 2021-04-20 12:38+0200\n"
+"POT-Creation-Date: 2021-08-24 18:50+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:328
+#: agent/call-pinentry.c:338
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "nie udało się uzyskać blokady pinentry: %s\n"
@@ -30,45 +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:546
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_OK"
 msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:547
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_Cancel"
 msgstr "|pinentry-label|_Anuluj"
 
-#: agent/call-pinentry.c:548
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|_Yes"
 msgstr "|pinentry-label|_Tak"
 
-#: agent/call-pinentry.c:549
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_No"
 msgstr "|pinentry-label|_Nie"
 
-#: agent/call-pinentry.c:550
+#: agent/call-pinentry.c:560
 msgid "|pinentry-label|PIN:"
 msgstr "|pinentry-label|PIN:"
 
-#: agent/call-pinentry.c:551
+#: agent/call-pinentry.c:561
 msgid "|pinentry-label|_Save in password manager"
 msgstr "|pinentry-label|_Zapisz w zarządcy haseł"
 
-#: agent/call-pinentry.c:552
+#: agent/call-pinentry.c:562
 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:554
+#: agent/call-pinentry.c:564
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr "|pinentry-tt|Pokazanie hasła"
 
-#: agent/call-pinentry.c:555
+#: agent/call-pinentry.c:565
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "|pinentry-tt|Ukrycie hasła"
 
+#: agent/call-pinentry.c:566
+msgid "Caps Lock is on"
+msgstr ""
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:944
+#: agent/call-pinentry.c:1022
 msgid "Suggest"
 msgstr ""
 
@@ -79,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:966
+#: agent/call-pinentry.c:1044
 #, fuzzy
 #| msgid "pinentry.qualitybar.tooltip"
 msgid "pinentry.genpin.tooltip"
@@ -87,9 +91,22 @@ msgstr ""
 "Jakość wpisanego wyżej tekstu.\n"
 "Kryteria jakości można uzyskać od administratora."
 
+#: agent/call-pinentry.c:1072
+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
+#, fuzzy
+#| msgid "Passphrase too long"
+msgid "Passphrase Not Allowed"
+msgstr "Hasło zbyt długie"
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:998
+#: agent/call-pinentry.c:1198
 msgid "Quality:"
 msgstr "Jakość:"
 
@@ -99,95 +116,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:1019
+#: agent/call-pinentry.c:1219
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 "Jakość wpisanego wyżej tekstu.\n"
 "Kryteria jakości można uzyskać od administratora."
 
-#: agent/call-pinentry.c:1263
+#: agent/call-pinentry.c:1477
 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:1266
+#: agent/call-pinentry.c:1480
 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:1303 agent/call-pinentry.c:1506
+#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
 msgid "PIN:"
 msgstr "PIN:"
 
-#: agent/call-pinentry.c:1303 agent/call-pinentry.c:1506
-#: agent/protect-tool.c:728
+#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/protect-tool.c:729
 msgid "Passphrase:"
 msgstr "Hasło:"
 
-#: agent/call-pinentry.c:1330 agent/call-pinentry.c:1580 agent/command.c:1799
-#: agent/command.c:1852 agent/command-ssh.c:3046 agent/genkey.c:398
+#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
+#: agent/command.c:1988 agent/command-ssh.c:3046 agent/genkey.c:442
 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:1351 agent/call-pinentry.c:1603
+#: agent/call-pinentry.c:1566 agent/call-pinentry.c:1830
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (próba %d z %d)"
 
-#: agent/call-pinentry.c:1362 agent/call-pinentry.c:1614
+#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
 msgid "Repeat:"
 msgstr "Powtórzenie:"
 
-#: agent/call-pinentry.c:1372 agent/call-pinentry.c:1384
-#: agent/call-pinentry.c:1624 agent/call-pinentry.c:1636
+#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
+#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
 msgid "PIN too long"
 msgstr "PIN zbyt długi"
 
-#: agent/call-pinentry.c:1373 agent/call-pinentry.c:1625
+#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
 msgid "Passphrase too long"
 msgstr "Hasło zbyt długie"
 
-#: agent/call-pinentry.c:1381 agent/call-pinentry.c:1633
+#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
 msgid "Invalid characters in PIN"
 msgstr "Niewłaściwy znak w PIN-ie"
 
-#: agent/call-pinentry.c:1386 agent/call-pinentry.c:1638
+#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
 msgid "PIN too short"
 msgstr "PIN zbyt krótki"
 
-#: agent/call-pinentry.c:1405 agent/call-pinentry.c:1656
+#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
 msgid "Bad PIN"
 msgstr "Niepoprawny PIN"
 
-#: agent/call-pinentry.c:1405 agent/call-pinentry.c:1656
+#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
 msgid "Bad Passphrase"
 msgstr "Niepoprawne hasło"
 
-#: agent/command.c:697
+#: agent/command.c:823
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:698
+#: agent/command.c:824
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1106 g10/card-util.c:708 g10/card-util.c:729
+#: agent/command.c:1235 g10/card-util.c:713 g10/card-util.c:734
 #, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "błąd pobierania numeru seryjnego karty: %s\n"
 
-#: agent/command.c:1634 agent/command.c:1791 agent/command-ssh.c:2974
-#: agent/genkey.c:333
+#: agent/command.c:1756 agent/command.c:1921 agent/command-ssh.c:2974
+#: agent/genkey.c:377
 msgid "Please re-enter this passphrase"
 msgstr "Proszę ponownie wprowadzić to hasło"
 
-#: agent/command.c:2567
+#: agent/command.c:2703
 #, fuzzy, c-format
 #| msgid ""
 #| "Please enter the passphrase to protect the imported object within the "
@@ -198,7 +215,7 @@ msgid ""
 msgstr ""
 "Proszę wprowadzić hasło do zabezpieczenia ważnego obiektu w systemie GnuPG."
 
-#: agent/command.c:2697
+#: agent/command.c:2833
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -209,25 +226,25 @@ msgstr ""
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "klucze ssh większe niż %d bitów nie są obsługiwane\n"
 
-#: agent/command-ssh.c:872 common/dotlock.c:852 g10/card-util.c:953
-#: g10/export.c:1329 g10/gpg.c:1431 g10/keygen.c:5347 g10/keyring.c:1319
-#: g10/keyring.c:1632 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
+#: agent/command-ssh.c:872 common/dotlock.c:852 g10/card-util.c:963
+#: g10/export.c:1329 g10/gpg.c:1431 g10/keygen.c:5377 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
 #: g10/sign.c:1106 g10/sign.c:1443 g10/tdbio.c:753 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:884 common/helpfile.c:57 g10/card-util.c:910
+#: agent/command-ssh.c:884 common/helpfile.c:57 g10/card-util.c:920
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
 #: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:721 g10/gpg.c:1432
-#: g10/import.c:371 g10/import.c:558 g10/import.c:793 g10/keygen.c:4322
-#: g10/keyring.c:1658 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
+#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4326
+#: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
 #: g10/plaintext.c:610 g10/sign.c:1086 g10/sign.c:1311 g10/sign.c:1424
 #: g10/sign.c:1596 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2380
-#: sm/gpgsm.c:2410 sm/gpgsm.c:2448 sm/keylist.c:1737 sm/qualified.c:65
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2236
+#: sm/gpgsm.c:2266 sm/gpgsm.c:2304 sm/keylist.c:1775 sm/qualified.c:65
 #: dirmngr/certcache.c:396 dirmngr/certcache.c:476 dirmngr/certcache.c:478
-#: dirmngr/crlcache.c:2588 dirmngr/dirmngr.c:1720 tools/gpg-card.c:408
+#: dirmngr/crlcache.c:2591 dirmngr/dirmngr.c:1759 tools/gpg-card.c:408
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "nie można otworzyć ,,%s'': %s\n"
@@ -332,27 +349,27 @@ msgstr "PIN nie powtórzony poprawnie; spróbuj jeszcze raz"
 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:109 sm/certreqgen-ui.c:433
+#: 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:116
+#: 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
+#: agent/genkey.c:191
 msgid "Enter new passphrase"
 msgstr "Wprowadź nowe hasło"
 
-#: agent/genkey.c:184
+#: agent/genkey.c:227
 #, 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:186
+#: agent/genkey.c:229
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -361,11 +378,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:198
+#: agent/genkey.c:241
 msgid "Yes, protection is not needed"
 msgstr "Tak, ochrona nie jest potrzebna"
 
-#: agent/genkey.c:215
+#: agent/genkey.c:258
 #, c-format
 msgid "A passphrase should be at least %u character long."
 msgid_plural "A passphrase should be at least %u characters long."
@@ -373,7 +390,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:234
+#: agent/genkey.c:277
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -384,239 +401,238 @@ msgstr[1] ""
 msgstr[2] ""
 "Hasło powinno zawierać przynajmniej %u cyfr lub%%0Aznaków specjalnych."
 
-#: agent/genkey.c:260
+#: agent/genkey.c:304
 #, 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:275
+#: agent/genkey.c:319
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "Ostrzeżenie: Wprowadzono hasło, które nie jest bezpieczne."
 
-#: agent/genkey.c:296
+#: agent/genkey.c:340
 msgid "Take this one anyway"
 msgstr "Przyjmij je mimo to"
 
-#: agent/genkey.c:464
+#: agent/genkey.c:508
 #, 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:590
+#: agent/genkey.c:637
 msgid "Please enter the new passphrase"
 msgstr "Proszę wprowadzić nowe hasło"
 
-#: agent/gpg-agent.c:162 scd/scdaemon.c:115 dirmngr/dirmngr.c:182
+#: agent/gpg-agent.c:164 scd/scdaemon.c:115 dirmngr/dirmngr.c:183
 #, fuzzy
 #| msgid "Options useful for debugging"
 msgid "Options used for startup"
 msgstr "Opcje przydatne do diagnostyki"
 
-#: agent/gpg-agent.c:164 scd/scdaemon.c:120 dirmngr/dirmngr.c:171
+#: agent/gpg-agent.c:166 scd/scdaemon.c:120 dirmngr/dirmngr.c:172
 msgid "run in daemon mode (background)"
 msgstr "uruchomienie w trybie demona (w tle)"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:117 dirmngr/dirmngr.c:170
+#: agent/gpg-agent.c:167 scd/scdaemon.c:117 dirmngr/dirmngr.c:171
 msgid "run in server mode (foreground)"
 msgstr "uruchomienie w trybie serwera (pierwszoplanowo)"
 
-#: agent/gpg-agent.c:167 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:169 dirmngr/dirmngr.c:174
 msgid "run in supervised mode"
 msgstr "uruchomienie w trybie dozorowanym"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:121 dirmngr/dirmngr.c:184
+#: agent/gpg-agent.c:171 scd/scdaemon.c:121 dirmngr/dirmngr.c:185
 msgid "do not detach from the console"
 msgstr "bez odłączania od konsoli"
 
-#: agent/gpg-agent.c:170 scd/scdaemon.c:122 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:172 scd/scdaemon.c:122 dirmngr/dirmngr.c:186
 msgid "sh-style command output"
 msgstr "wyjście poleceń w stylu sh"
 
-#: agent/gpg-agent.c:171 scd/scdaemon.c:123 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:173 scd/scdaemon.c:123 dirmngr/dirmngr.c:187
 msgid "csh-style command output"
 msgstr "wyjście poleceń w stylu csh"
 
-#: agent/gpg-agent.c:179 g10/gpg.c:589 scd/scdaemon.c:125 sm/gpgsm.c:422
-#: dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:181 g10/gpg.c:589 scd/scdaemon.c:125 sm/gpgsm.c:423
+#: dirmngr/dirmngr.c:189
 msgid "|FILE|read options from FILE"
 msgstr "|PLIK|odczyt opcji z PLIKU"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:574 scd/scdaemon.c:129 sm/gpgsm.c:265
-#: dirmngr/dirmngr.c:192
+#: agent/gpg-agent.c:185 g10/gpg.c:574 scd/scdaemon.c:129 sm/gpgsm.c:265
+#: dirmngr/dirmngr.c:193
 msgid "Options controlling the diagnostic output"
 msgstr "Opcje sterujące wyjściem diagnostycznym"
 
-#: agent/gpg-agent.c:185 g10/gpg.c:576 g10/gpgv.c:78 kbx/kbxutil.c:89
+#: agent/gpg-agent.c:187 g10/gpg.c:576 g10/gpgv.c:78 kbx/kbxutil.c:89
 #: scd/scdaemon.c:131 sm/gpgsm.c:267 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:194 dirmngr/dirmngr_ldap.c:102
-#: tools/gpg-connect-agent.c:85 tools/gpgconf.c:111
+#: dirmngr/dirmngr.c:195 tools/gpg-connect-agent.c:85 tools/gpgconf.c:111
 msgid "verbose"
 msgstr "więcej komunikatów"
 
-#: agent/gpg-agent.c:186 g10/gpg.c:578 g10/gpgv.c:79 kbx/kbxutil.c:90
+#: agent/gpg-agent.c:188 g10/gpg.c:578 g10/gpgv.c:79 kbx/kbxutil.c:90
 #: scd/scdaemon.c:132 sm/gpgsm.c:269 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:195 dirmngr/dirmngr_ldap.c:103
+#: dirmngr/dirmngr.c:196
 msgid "be somewhat more quiet"
 msgstr "mniej komunikatów"
 
-#: agent/gpg-agent.c:194 g10/gpg.c:593 sm/gpgsm.c:283 dirmngr/dirmngr.c:205
+#: agent/gpg-agent.c:196 g10/gpg.c:593 sm/gpgsm.c:283 dirmngr/dirmngr.c:206
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|PLIK|zapis logów trybu serwera do PLIKU"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 scd/scdaemon.c:146 sm/gpgsm.c:290
-#: dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:599 scd/scdaemon.c:146 sm/gpgsm.c:290
+#: dirmngr/dirmngr.c:210
 msgid "Options controlling the configuration"
 msgstr "Opcje sterujÄ…ce konfiguracjÄ…"
 
-#: agent/gpg-agent.c:201
+#: agent/gpg-agent.c:203
 msgid "do not use the SCdaemon"
 msgstr "nieużywanie SCdaemona"
 
-#: agent/gpg-agent.c:203
+#: agent/gpg-agent.c:205
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|użycie PGM jako programu SCdaemon"
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 #, 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:209
+#: agent/gpg-agent.c:211
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAZWA|przyjęcie poleceń poprzez NAZWĘ"
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 msgid "ignore requests to change the TTY"
 msgstr "ignorowanie żądań zmiany TTY"
 
-#: agent/gpg-agent.c:215
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the X display"
 msgstr "ignorowanie żądań zmiany ekranu X"
 
-#: agent/gpg-agent.c:216
+#: agent/gpg-agent.c:218
 msgid "enable ssh support"
 msgstr "włączenie obsługi ssh"
 
-#: agent/gpg-agent.c:218
+#: agent/gpg-agent.c:220
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "|ALGO|użycie ALGO do wyświetlania odcisków ssh"
 
-#: agent/gpg-agent.c:221
+#: agent/gpg-agent.c:223
 msgid "enable putty support"
 msgstr "włączenie obsługi putty"
 
-#: agent/gpg-agent.c:233 g10/gpg.c:844 scd/scdaemon.c:176 sm/gpgsm.c:382
+#: agent/gpg-agent.c:235 g10/gpg.c:844 scd/scdaemon.c:176 sm/gpgsm.c:383
 msgid "Options controlling the security"
 msgstr "Opcje sterujące bezpieczeństwem"
 
-#: agent/gpg-agent.c:236
+#: agent/gpg-agent.c:238
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|przedawnienie pamiętanych PIN-ów po N sekundach"
 
-#: agent/gpg-agent.c:238
+#: agent/gpg-agent.c:240
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|przedawnienie kluczy SSH po N sekundach"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:242
 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:242
+#: agent/gpg-agent.c:244
 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:244
+#: agent/gpg-agent.c:246
 msgid "do not use the PIN cache when signing"
 msgstr "nieużywanie pamięci PIN-ów przy podpisywaniu"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:248
 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:248
+#: agent/gpg-agent.c:250
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "niezezwalanie klientom na oznaczanie kluczy jako ,,zaufanych''"
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:253
 msgid "allow presetting passphrase"
 msgstr "zezwolenie na predefiniowane hasło"
 
-#: agent/gpg-agent.c:256
+#: agent/gpg-agent.c:258
 msgid "Options enforcing a passphrase policy"
 msgstr "Opcje wymuszające politykę haseł"
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:261
 msgid "do not allow bypassing the passphrase policy"
 msgstr "niezezwalanie na pominięcie polityki haseł"
 
-#: agent/gpg-agent.c:261
+#: agent/gpg-agent.c:263
 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:263
+#: agent/gpg-agent.c:265
 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:266
+#: agent/gpg-agent.c:268
 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:268
+#: agent/gpg-agent.c:272
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|przedawnianie haseł po N dniach"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:274
 msgid "do not allow the reuse of old passphrases"
 msgstr "niezezwalanie na ponowne użycie starych haseł"
 
-#: agent/gpg-agent.c:273
+#: agent/gpg-agent.c:277
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the PIN-Entry"
 msgstr "Opcje sterujące bezpieczeństwem"
 
-#: agent/gpg-agent.c:275
+#: agent/gpg-agent.c:279
 msgid "never use the PIN-entry"
 msgstr ""
 
-#: agent/gpg-agent.c:277
+#: agent/gpg-agent.c:281
 msgid "disallow caller to override the pinentry"
 msgstr "niezezwalanie wywołującym na nadpisywanie pinentry"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:283
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:282
+#: agent/gpg-agent.c:286
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|użycie PGM jako programu do wprowadzania PIN-u"
 
-#: agent/gpg-agent.c:286
+#: agent/gpg-agent.c:290
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|ustawienie limitu czasu Pinentry na N sekund"
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:294
 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:551 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: agent/gpg-agent.c:557 agent/preset-passphrase.c:99 agent/protect-tool.c:154
 #: g10/gpg.c:1132 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:612 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:438
-#: dirmngr/dirmngr_ldap.c:175 tools/gpg-connect-agent.c:220 tools/gpgconf.c:151
+#: sm/gpgsm.c:613 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:446
+#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:151
 #: 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:560
+#: agent/gpg-agent.c:566
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Składnia: @GPG_AGENT@ [opcje] (-h wyświetla pomoc)"
 
-#: agent/gpg-agent.c:562
+#: agent/gpg-agent.c:568
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -624,131 +640,131 @@ msgstr ""
 "Składnia: @GPG_AGENT@ [opcje] [polecenie [argumenty]]\n"
 "ZarzÄ…dzanie kluczem tajnym dla @GNUPG@\n"
 
-#: agent/gpg-agent.c:607 g10/gpg.c:1337 scd/scdaemon.c:384 sm/gpgsm.c:760
-#: dirmngr/dirmngr.c:522
+#: agent/gpg-agent.c:613 g10/gpg.c:1337 scd/scdaemon.c:384 sm/gpgsm.c:761
+#: dirmngr/dirmngr.c:530
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "podano błędny poziom diagnostyki ,,%s''\n"
 
-#: agent/gpg-agent.c:972 g10/gpg.c:3910 g10/gpg.c:3934 sm/gpgsm.c:1769
-#: sm/gpgsm.c:1775
+#: agent/gpg-agent.c:986 g10/gpg.c:3907 g10/gpg.c:3931 sm/gpgsm.c:1622
+#: sm/gpgsm.c:1628
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "wybrany algorytm skrótów wiadomości jest niepoprawny\n"
 
-#: agent/gpg-agent.c:1196 agent/gpg-agent.c:2019 common/comopt.c:93
-#: g10/gpg.c:2591 scd/scdaemon.c:549 sm/gpgsm.c:1155 dirmngr/dirmngr.c:989
-#: dirmngr/dirmngr.c:1840
+#: agent/gpg-agent.c:1210 agent/gpg-agent.c:2035 common/comopt.c:93
+#: g10/gpg.c:2594 scd/scdaemon.c:549 sm/gpgsm.c:1028 dirmngr/dirmngr.c:1029
+#: dirmngr/dirmngr.c:1879
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "odczyt opcji z ,,%s''\n"
 
-#: agent/gpg-agent.c:1335 g10/gpg.c:3861 scd/scdaemon.c:687 sm/gpgsm.c:1709
-#: dirmngr/dirmngr.c:1108 tools/gpg-connect-agent.c:1270 tools/gpgconf.c:634
+#: agent/gpg-agent.c:1349 g10/gpg.c:3858 scd/scdaemon.c:687 sm/gpgsm.c:1562
+#: dirmngr/dirmngr.c:1145 tools/gpg-connect-agent.c:1270 tools/gpgconf.c:668
 #, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr "Uwaga: ,,%s'' nie jest uznane za opcjÄ™\n"
 
-#: agent/gpg-agent.c:2172 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1267
+#: agent/gpg-agent.c:2188 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1306
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "nie można utworzyć gniazda: %s\n"
 
-#: agent/gpg-agent.c:2189 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1280
+#: agent/gpg-agent.c:2205 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1319
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "nazwa gniazda ,,%s'' zbyt długa\n"
 
-#: agent/gpg-agent.c:2228
+#: agent/gpg-agent.c:2244
 #, 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:2239 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1312
+#: agent/gpg-agent.c:2255 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1351
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "błąd podczas pobierania nonce z gniazda\n"
 
-#: agent/gpg-agent.c:2244 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1315
+#: agent/gpg-agent.c:2260 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1354
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "błąd podczas przypisywania gniazda do ,,%s'': %s\n"
 
-#: agent/gpg-agent.c:2255 agent/gpg-agent.c:2295 agent/gpg-agent.c:2304
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1324
+#: agent/gpg-agent.c:2271 agent/gpg-agent.c:2311 agent/gpg-agent.c:2320
+#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1363
 #, 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:2269 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1336
+#: agent/gpg-agent.c:2285 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1375
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "nasłuchiwanie na gnieździe ,,%s''\n"
 
-#: agent/gpg-agent.c:2289 agent/gpg-agent.c:2342 common/homedir.c:517
+#: agent/gpg-agent.c:2305 agent/gpg-agent.c:2358 common/homedir.c:537
 #: 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:2292 agent/gpg-agent.c:2347 common/homedir.c:520
+#: agent/gpg-agent.c:2308 agent/gpg-agent.c:2363 common/homedir.c:540
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "katalog ,,%s'' utworzony\n"
 
-#: agent/gpg-agent.c:2353
+#: agent/gpg-agent.c:2369
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "stat() nie powiodło się dla ,,%s'': %s\n"
 
-#: agent/gpg-agent.c:2357
+#: agent/gpg-agent.c:2373
 #, 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:2512 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2069
+#: agent/gpg-agent.c:2528 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2108
 #, 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:2719
+#: agent/gpg-agent.c:2735
 #, 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:2724
+#: agent/gpg-agent.c:2740
 #, 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:2799
+#: agent/gpg-agent.c:2815
 #, 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:2804
+#: agent/gpg-agent.c:2820
 #, 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:3026 scd/scdaemon.c:1374 dirmngr/dirmngr.c:2283
+#: agent/gpg-agent.c:3042 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2322
 #, 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:3114 scd/scdaemon.c:1439
+#: agent/gpg-agent.c:3130 scd/scdaemon.c:1441
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s zatrzymany\n"
 
-#: agent/gpg-agent.c:3252 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3271 common/simple-pwquery.c:247 g10/call-agent.c:260
 #: sm/call-agent.c:131 tools/gpg-connect-agent.c:2319 tools/card-call-scd.c:311
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "brak działającego gpg-agenta w tej sesji\n"
 
-#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:70
+#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:66
 msgid ""
 "@Options:\n"
 " "
@@ -770,7 +786,7 @@ msgstr ""
 "Utrzymuwanie pamięci haseł\n"
 
 #: agent/protect-tool.c:107 g10/gpg.c:448 kbx/kbxutil.c:72 sm/gpgsm.c:215
-#: dirmngr/dirmngr.c:168 tools/gpgconf.c:81
+#: dirmngr/dirmngr.c:169 tools/gpgconf.c:81
 msgid ""
 "@Commands:\n"
 " "
@@ -801,22 +817,22 @@ msgstr ""
 "Składnia: gpg-protect-tool [opcje] [argumenty]\n"
 "Narzędzie do utrzymywania kluczy tajnych\n"
 
-#: agent/protect-tool.c:707
+#: agent/protect-tool.c:708 sm/import.c:775
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Proszę wprowadzić hasło do odbezpieczenia obiektu PKCS#12."
 
-#: agent/protect-tool.c:712
+#: agent/protect-tool.c:713 sm/export.c:727
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Proszę wprowadzić hasło do zabezpieczenia obiektu PKCS#12."
 
-#: agent/protect-tool.c:718
+#: agent/protect-tool.c:719
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 "Proszę wprowadzić hasło do zabezpieczenia ważnego obiektu w systemie GnuPG."
 
-#: agent/protect-tool.c:723
+#: agent/protect-tool.c:724
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -824,17 +840,17 @@ msgstr ""
 "Proszę wprowadzić hasło lub PIN\n"
 "Potrzebny do zakończenia tej operacji."
 
-#: agent/protect-tool.c:734
+#: agent/protect-tool.c:735
 #, c-format
 msgid "cancelled\n"
 msgstr "anulowano\n"
 
-#: agent/protect-tool.c:736
+#: agent/protect-tool.c:737
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "błąd podczas pytania o hasło: %s\n"
 
-#: agent/trustlist.c:153 agent/trustlist.c:363 tools/gpgconf.c:424
+#: agent/trustlist.c:153 agent/trustlist.c:363 tools/gpgconf.c:458
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "błąd podczas otwierania ,,%s'': %s\n"
@@ -994,7 +1010,7 @@ msgstr "sprawdzenie złożonego podpisu nie powiodło się: %s\n"
 msgid "secret key parts are not available\n"
 msgstr "tajne części klucza są niedostępne\n"
 
-#: agent/cvt-openpgp.c:343 g10/card-util.c:1562
+#: agent/cvt-openpgp.c:343 g10/card-util.c:1575
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr "algorytm klucza publicznego %d (%s) nie jest obsługiwany\n"
@@ -1023,7 +1039,7 @@ msgid "error creating a stream for a pipe: %s\n"
 msgstr "błąd tworzenia strumienia dla potoku: %s\n"
 
 #: common/exechelp-posix.c:505 common/exechelp-posix.c:580
-#: common/exechelp-posix.c:866 dirmngr/dirmngr.c:1354
+#: common/exechelp-posix.c:866 dirmngr/dirmngr.c:1393
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "błąd podczas tworzenia procesu: %s\n"
@@ -1095,7 +1111,7 @@ msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "zmiana nazwy ,,%s'' na ,,%s'' nie powiodła się: %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3082
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3099
 msgid "yes"
 msgstr "tak"
 
@@ -1149,7 +1165,7 @@ msgstr "brak miejsca w bezpiecznej pamięci podczas przydzielania %lu bajtów"
 msgid "out of core while allocating %lu bytes"
 msgstr "brak miejsca podczas przydzielania %lu bajtów"
 
-#: common/miscellaneous.c:115 g10/card-util.c:917 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:927 tools/no-libgcrypt.c:30
 #: tools/gpg-card.c:416
 #, c-format
 msgid "error allocating enough memory: %s\n"
@@ -1228,7 +1244,7 @@ msgstr "błąd pobierania wersji z ,,%s'': %s\n"
 msgid "server '%s' is older than us (%s < %s)"
 msgstr "serwer ,,%s'' jest starszy niż nasz (%s < %s)"
 
-#: common/asshelp.c:737 g10/call-dirmngr.c:408
+#: common/asshelp.c:737 g10/call-dirmngr.c:407
 #, c-format
 msgid "WARNING: %s\n"
 msgstr "OSTRZEŻENIE: %s\n"
@@ -1312,7 +1328,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:4212
+#: scd/app-openpgp.c:4214
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "nieobsługiwany algorytm: %s"
@@ -1387,11 +1403,11 @@ msgstr "�ańcuch certyfikatów poprawny"
 msgid "Root certificate trustworthy"
 msgstr "Certyfikat główny jest zaufany"
 
-#: common/audit.c:1112 sm/certchain.c:1242
+#: common/audit.c:1112 sm/certchain.c:1243
 msgid "no CRL found for certificate"
 msgstr "nie znaleziono CRL dla certyfikatu"
 
-#: common/audit.c:1115 sm/certchain.c:1252
+#: common/audit.c:1115 sm/certchain.c:1253
 msgid "the available CRL is too old"
 msgstr "dostępny CRL jest zbyt stary"
 
@@ -1437,22 +1453,22 @@ msgstr "[brak]"
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "niewłaściwy znak formatu radix64 %02x został pominięty\n"
 
-#: common/ttyio.c:433
+#: common/ttyio.c:447
 #, c-format
 msgid "Sorry, we are in batchmode - can't get input\n"
 msgstr ""
 
-#: common/ttyio.c:439
+#: common/ttyio.c:453
 #, c-format
 msgid "Sorry, no terminal at all requested - can't get input\n"
 msgstr ""
 
-#: common/ttyio.c:474 common/ttyio.c:484
+#: common/ttyio.c:488 common/ttyio.c:498
 #, c-format
 msgid "too many errors; giving up\n"
 msgstr ""
 
-#: common/ttyio.c:536
+#: common/ttyio.c:550
 #, c-format
 msgid "Control-D detected\n"
 msgstr ""
@@ -1506,8 +1522,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:1036 dirmngr/dirmngr.c:895
-#: dirmngr/dirmngr.c:904
+#: common/init.c:191 sm/gpgsm.c:909 dirmngr/dirmngr.c:935 dirmngr/dirmngr.c:944
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "biblioteka %s jest zbyt stara (wymagana %s, zainstalowana %s)\n"
@@ -1659,7 +1674,7 @@ msgid "Enter passphrase: "
 msgstr "Hasło: "
 
 #: g10/call-agent.c:318 g10/encrypt.c:282 g10/encrypt.c:818 g10/sign.c:473
-#: sm/call-agent.c:180 sm/encrypt.c:701 sm/sign.c:436
+#: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
 #, c-format
 msgid "%s is not compliant with %s mode\n"
 msgstr "%s nie jest zgodny z trybem %s\n"
@@ -1670,213 +1685,213 @@ msgstr "%s nie jest zgodny z trybem %s\n"
 msgid "error from TPM: %s\n"
 msgstr "błąd odczytu z %s: %s\n"
 
-#: g10/call-agent.c:2123 g10/passphrase.c:225 g10/passphrase.c:258
-#: tools/card-call-scd.c:1751
+#: g10/call-agent.c:2135 g10/passphrase.c:233 g10/passphrase.c:266
+#: tools/card-call-scd.c:1755
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problem z agentem: %s\n"
 
-#: g10/call-dirmngr.c:179 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2316
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2316
 #, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "brak działającego dirmngr w tej sesji\n"
 
-#: g10/call-dirmngr.c:213
+#: g10/call-dirmngr.c:212
 #, fuzzy, c-format
 #| msgid "keyserver option \"%s\" may not be used in %s mode\n"
 msgid "keyserver option \"honor-keyserver-url\" may not be used in Tor mode\n"
 msgstr "opcja serwera kluczy ,,%s'' nie może być używana w trybie %s\n"
 
-#: g10/call-dirmngr.c:386
+#: g10/call-dirmngr.c:385
 msgid "WKD uses a cached result"
 msgstr "WKD używa zapamiętanego wyniku"
 
-#: g10/call-dirmngr.c:389
+#: g10/call-dirmngr.c:388
 msgid "Tor is not running"
 msgstr "Tor nie działa"
 
-#: g10/call-dirmngr.c:391
+#: g10/call-dirmngr.c:390
 msgid "Tor is not properly configured"
 msgstr "Tor nie jest właściwie skonfigurowany"
 
-#: g10/call-dirmngr.c:393
+#: g10/call-dirmngr.c:392
 msgid "DNS is not properly configured"
 msgstr "DNS nie jest właściwie skonfigurowany"
 
-#: g10/call-dirmngr.c:395
+#: g10/call-dirmngr.c:394
 msgid "unacceptable HTTP redirect from server"
 msgstr "niedopuszczalne przekierowanie HTTP z serwera"
 
-#: g10/call-dirmngr.c:397
+#: g10/call-dirmngr.c:396
 msgid "unacceptable HTTP redirect from server was cleaned up"
 msgstr "niedopuszczalne przekierowanie HTTP z serwera zostało wyczyszczone"
 
-#: g10/call-dirmngr.c:399
+#: g10/call-dirmngr.c:398
 msgid "server uses an invalid certificate"
 msgstr "serwer używa błędnego certyfikatu"
 
-#: g10/call-dirmngr.c:406 g10/gpg.c:4599
+#: g10/call-dirmngr.c:405 g10/gpg.c:4596
 #, c-format
 msgid "Note: %s\n"
 msgstr "Uwaga: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:369 g10/card-util.c:1924
-#: tools/gpg-card.c:3039
+#: g10/card-util.c:86 g10/card-util.c:374 g10/card-util.c:1937
+#: tools/gpg-card.c:3056
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "Karta OpenPGP niedostępna: %s\n"
 
-#: g10/card-util.c:91 g10/card-util.c:1930
+#: g10/card-util.c:91 g10/card-util.c:1943
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "Wykryto kartÄ™ OpenPGP nr %s\n"
 
-#: g10/card-util.c:97 g10/card-util.c:2309 g10/delkey.c:164 g10/keyedit.c:1428
-#: g10/keygen.c:4791 g10/revoke.c:214 g10/revoke.c:638
+#: g10/card-util.c:97 g10/card-util.c:2322 g10/delkey.c:164 g10/keyedit.c:1428
+#: g10/keygen.c:4795 g10/revoke.c:214 g10/revoke.c:639
 #, c-format
 msgid "can't do this in batch mode\n"
 msgstr "nie działa w trybie wsadowym\n"
 
-#: g10/card-util.c:105 tools/gpg-card.c:2943
+#: g10/card-util.c:105 tools/gpg-card.c:2960
 #, c-format
 msgid "This command is only available for version 2 cards\n"
 msgstr "To polecenie jest dostępne tylko dla kart w wersji 2\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3398 tools/gpg-card.c:2948
+#: g10/card-util.c:107 scd/app-openpgp.c:3399 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"
 
-#: g10/card-util.c:140 g10/card-util.c:1448 g10/card-util.c:1710
-#: g10/card-util.c:1802 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1991 g10/keygen.c:2165 g10/keygen.c:2385 g10/keygen.c:2685
+#: g10/card-util.c:140 g10/card-util.c:1458 g10/card-util.c:1723
+#: g10/card-util.c:1815 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/keygen.c:1992 g10/keygen.c:2166 g10/keygen.c:2386 g10/keygen.c:2686
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
 #: tools/gpg-card.c:510
 msgid "Your selection? "
 msgstr "Twój wybór? "
 
-#: g10/card-util.c:262 g10/card-util.c:313 tools/gpg-card.c:596
+#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:596
 #: tools/gpg-card.c:636
 msgid "[not set]"
 msgstr "[nie ustawiono]"
 
-#: g10/card-util.c:558 tools/gpg-card.c:903
+#: g10/card-util.c:563 tools/gpg-card.c:905
 msgid "Mr."
 msgstr "Pan"
 
-#: g10/card-util.c:559 tools/gpg-card.c:904
+#: g10/card-util.c:564 tools/gpg-card.c:906
 msgid "Ms."
 msgstr "Pani"
 
-#: g10/card-util.c:586 tools/gpg-card.c:931
+#: g10/card-util.c:591 tools/gpg-card.c:933
 msgid "not forced"
 msgstr "nie wymuszono"
 
-#: g10/card-util.c:586 tools/gpg-card.c:931
+#: g10/card-util.c:591 tools/gpg-card.c:933
 msgid "forced"
 msgstr "wymuszono"
 
-#: g10/card-util.c:768 tools/gpg-card.c:1468
+#: g10/card-util.c:773 tools/gpg-card.c:1484
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "BÅ‚Ä…d: aktualnie dopuszczalne jest tylko czyste ASCII.\n"
 
-#: g10/card-util.c:770 tools/gpg-card.c:1470
+#: g10/card-util.c:775 tools/gpg-card.c:1486
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Błąd: znak ,,<'' nie może być użyty.\n"
 
-#: g10/card-util.c:772 tools/gpg-card.c:1472
+#: g10/card-util.c:777 tools/gpg-card.c:1488
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Błąd: podwójne spacje nie są dopuszczalne.\n"
 
-#: g10/card-util.c:789 tools/gpg-card.c:1505
+#: g10/card-util.c:795 tools/gpg-card.c:1521
 msgid "Cardholder's surname: "
 msgstr "Nazwisko posiadacza karty: "
 
-#: g10/card-util.c:791 tools/gpg-card.c:1506
+#: g10/card-util.c:797 tools/gpg-card.c:1522
 msgid "Cardholder's given name: "
 msgstr "ImiÄ™ posiadacza karty: "
 
-#: g10/card-util.c:809 tools/gpg-card.c:1523
+#: g10/card-util.c:816 tools/gpg-card.c:1539
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Błąd: pełne personalia zbyt długie (limit to %d znaków).\n"
 
-#: g10/card-util.c:830 tools/gpg-card.c:1561
+#: g10/card-util.c:840 tools/gpg-card.c:1577
 msgid "URL to retrieve public key: "
 msgstr "URL do odczytania klucza publicznego: "
 
-#: g10/card-util.c:926 g10/decrypt-data.c:495 g10/import.c:406 g10/import.c:756
-#: g10/import.c:815 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1666
-#: tools/gpgconf.c:437 tools/gpgconf.c:483 tools/gpg-card.c:426
+#: g10/card-util.c:936 g10/decrypt-data.c:495 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:1705
+#: tools/gpgconf.c:471 tools/gpgconf.c:517 tools/gpg-card.c:426
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "błąd odczytu ,,%s'': %s\n"
 
-#: g10/card-util.c:959 g10/decrypt-data.c:498 g10/export.c:2496
+#: g10/card-util.c:969 g10/decrypt-data.c:498 g10/export.c:2496
 #: dirmngr/crlcache.c:925 tools/gpg-card.c:486 tools/gpg-card.c:493
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr "błąd zapisu ,,%s'': %s\n"
 
-#: g10/card-util.c:986 tools/gpg-card.c:1650
+#: g10/card-util.c:996 tools/gpg-card.c:1666
 msgid "Login data (account name): "
 msgstr "Dane logowania (nazwa konta): "
 
-#: g10/card-util.c:1024 tools/gpg-card.c:1945
+#: g10/card-util.c:1034 tools/gpg-card.c:1962
 msgid "Private DO data: "
 msgstr "Prywatne dane DO: "
 
-#: g10/card-util.c:1109 tools/gpg-card.c:1699
+#: g10/card-util.c:1119 tools/gpg-card.c:1715
 msgid "Language preferences: "
 msgstr "Preferowane języki: "
 
-#: g10/card-util.c:1117 tools/gpg-card.c:1710
+#: g10/card-util.c:1127 tools/gpg-card.c:1726
 #, c-format
 msgid "Error: invalid length of preference string.\n"
 msgstr "Błąd: niewłaściwa długość tekstu preferencji.\n"
 
-#: g10/card-util.c:1126 tools/gpg-card.c:1719
+#: g10/card-util.c:1136 tools/gpg-card.c:1735
 #, c-format
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Błąd: niewłaściwe znaki w tekście preferencji.\n"
 
-#: g10/card-util.c:1148 tools/gpg-card.c:1753
+#: g10/card-util.c:1158 tools/gpg-card.c:1769
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr "Tutuł (M = Pan, F = Pani lub spacja): "
 
-#: g10/card-util.c:1162 tools/gpg-card.c:1770
+#: g10/card-util.c:1172 tools/gpg-card.c:1786
 msgid "Error: invalid response.\n"
 msgstr "Błąd: niewłaściwa odpowiedź.\n"
 
-#: g10/card-util.c:1185 tools/gpg-card.c:1835
+#: g10/card-util.c:1195 tools/gpg-card.c:1852
 msgid "CA fingerprint: "
 msgstr "Odcisk CA:"
 
-#: g10/card-util.c:1209 tools/gpg-card.c:1861
+#: g10/card-util.c:1219 tools/gpg-card.c:1878
 #, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Błąd: niewłaściwie sformatowany odcisk.\n"
 
-#: g10/card-util.c:1259
+#: g10/card-util.c:1269
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "operacja na kluczu niewykonalna: %s\n"
 
-#: g10/card-util.c:1260
+#: g10/card-util.c:1270
 msgid "not an OpenPGP card"
 msgstr "to nie jest karta OpenPGP"
 
-#: g10/card-util.c:1273 g10/keygen.c:4811 g10/keygen.c:5972
+#: g10/card-util.c:1283 g10/keygen.c:4815 g10/keygen.c:6003
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "błąd podczas odczytu aktualnych informacji o kluczu: %s\n"
 
-#: g10/card-util.c:1358
+#: g10/card-util.c:1368
 msgid "Replace existing key? (y/N) "
 msgstr "Zastąpić istniejący klucz? (t/N) "
 
-#: g10/card-util.c:1375 tools/gpg-card.c:3328
+#: g10/card-util.c:1385 tools/gpg-card.c:3345
 #, fuzzy
 #| msgid ""
 #| "Note: There is no guarantee that the card supports the requested size.\n"
@@ -1892,99 +1907,99 @@ msgstr ""
 "       Jeśli tworzenie klucza nie powiedzie się, proszę sprawdzić\n"
 "       dokumentację karty, aby poznać dozwolone rozmiary.\n"
 
-#: g10/card-util.c:1396 g10/keygen.c:2570 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1406 g10/keygen.c:2571 sm/certreqgen-ui.c:180
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Jakiej długości klucz wygenerować? (%u) "
 
-#: g10/card-util.c:1406 g10/keygen.c:2493 g10/keygen.c:2525
+#: g10/card-util.c:1416 g10/keygen.c:2494 g10/keygen.c:2526
 #: sm/certreqgen-ui.c:195
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokrąglono do %u bitów\n"
 
-#: g10/card-util.c:1414 g10/keygen.c:2578 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1424 g10/keygen.c:2579 sm/certreqgen-ui.c:185
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "Rozmiary kluczy %s muszą być z przedziału %u-%u\n"
 
-#: g10/card-util.c:1433
+#: g10/card-util.c:1443
 msgid "Changing card key attribute for: "
 msgstr "Zmiana atrybutu klucza karty dla: "
 
-#: g10/card-util.c:1435
+#: g10/card-util.c:1445
 msgid "Signature key\n"
 msgstr "Klucz do podpisów\n"
 
-#: g10/card-util.c:1437
+#: g10/card-util.c:1447
 msgid "Encryption key\n"
 msgstr "Klucz do szyfrowania\n"
 
-#: g10/card-util.c:1439
+#: g10/card-util.c:1449
 msgid "Authentication key\n"
 msgstr "Klucz do uwierzytelniania\n"
 
-#: g10/card-util.c:1441 g10/keygen.c:2112 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1451 g10/keygen.c:2113 sm/certreqgen-ui.c:158
 msgid "Please select what kind of key you want:\n"
 msgstr "Proszę wybrać rodzaj klucza:\n"
 
-#: g10/card-util.c:1442 sm/certreqgen-ui.c:159
+#: g10/card-util.c:1452 sm/certreqgen-ui.c:159
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1443
+#: g10/card-util.c:1453
 #, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) ECC\n"
 
-#: g10/card-util.c:1455 g10/card-util.c:1722 g10/card-util.c:1822
-#: g10/keyedit.c:900 g10/keygen.c:2017 g10/keygen.c:2045 g10/keygen.c:2172
-#: g10/keygen.c:2425 g10/keygen.c:2713 g10/revoke.c:836
+#: g10/card-util.c:1468 g10/card-util.c:1735 g10/card-util.c:1835
+#: g10/keyedit.c:900 g10/keygen.c:2018 g10/keygen.c:2046 g10/keygen.c:2173
+#: g10/keygen.c:2426 g10/keygen.c:2714 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Niewłaściwy wybór.\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1541
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr "Karta zostanie przekonfigurowana do tworzenia klucza %u-bitowego\n"
 
-#: g10/card-util.c:1533
+#: g10/card-util.c:1546
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr "Karta zostanie przekonfigurowana do tworzenia klucza typu: %s\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1582
 #, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "błąd podczas zmiany atrybutu klucza %d: %s\n"
 
-#: g10/card-util.c:1585 g10/card-util.c:2106 g10/card-util.c:2162
+#: g10/card-util.c:1598 g10/card-util.c:2119 g10/card-util.c:2175
 #, c-format
 msgid "error getting card info: %s\n"
 msgstr "błąd podczas pobierania informacji o karcie: %s\n"
 
-#: g10/card-util.c:1591 g10/card-util.c:1936 g10/card-util.c:2112
-#: g10/card-util.c:2171 tools/gpg-card.c:3057 tools/gpg-card.c:3296
-#: tools/gpg-card.c:3354
+#: g10/card-util.c:1604 g10/card-util.c:1949 g10/card-util.c:2125
+#: g10/card-util.c:2184 tools/gpg-card.c:3074 tools/gpg-card.c:3313
+#: tools/gpg-card.c:3371
 #, c-format
 msgid "This command is not supported by this card\n"
 msgstr "To polecenie nie jest obsługiwane przez tę kartę\n"
 
-#: g10/card-util.c:1637 tools/gpg-card.c:2426
+#: g10/card-util.c:1650 tools/gpg-card.c:2443
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Stworzyć poza kartą kopię zapasową klucza szyfrującego? (T/n) "
 
-#: g10/card-util.c:1651
+#: g10/card-util.c:1664
 #, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "Uwaga: klucze są już zapisane na karcie!\n"
 
-#: g10/card-util.c:1654 tools/gpg-card.c:2398
+#: g10/card-util.c:1667 tools/gpg-card.c:2415
 msgid "Replace existing keys? (y/N) "
 msgstr "Zastąpić istniejące klucze? (t/N) "
 
-#: g10/card-util.c:1666 tools/gpg-card.c:2457
+#: g10/card-util.c:1679 tools/gpg-card.c:2474
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1995,157 +2010,157 @@ msgstr ""
 "   PIN = ,,%s''   PIN administracyjny = ,,%s''\n"
 "Należy je zmienić przy użyciu polecenia --change-pin\n"
 
-#: g10/card-util.c:1701
+#: g10/card-util.c:1714
 msgid "Please select the type of key to generate:\n"
 msgstr "Proszę wybrać rodzaj klucza do wygenerowania:\n"
 
-#: g10/card-util.c:1703 g10/card-util.c:1793
+#: g10/card-util.c:1716 g10/card-util.c:1806
 msgid "   (1) Signature key\n"
 msgstr "   (1) Klucz do podpisów\n"
 
-#: g10/card-util.c:1704 g10/card-util.c:1795
+#: g10/card-util.c:1717 g10/card-util.c:1808
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Klucz do szyfrowania\n"
 
-#: g10/card-util.c:1705 g10/card-util.c:1797
+#: g10/card-util.c:1718 g10/card-util.c:1810
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Klucz do uwierzytelniania\n"
 
-#: g10/card-util.c:1790
+#: g10/card-util.c:1803
 msgid "Please select where to store the key:\n"
 msgstr "Proszę wybrać gdzie zapisać klucz:\n"
 
-#: g10/card-util.c:1836
+#: g10/card-util.c:1849
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "KEYTOCARD nie powiodło się: %s\n"
 
-#: g10/card-util.c:1941 tools/gpg-card.c:3065
+#: g10/card-util.c:1954 tools/gpg-card.c:3082
 #, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr "Uwaga: to polecenie niszczy wszystkie klucze zapisane na karcie!\n"
 
-#: g10/card-util.c:1944 tools/gpg-card.c:3068 tools/gpg-card.c:3409
+#: g10/card-util.c:1957 tools/gpg-card.c:3085 tools/gpg-card.c:3426
 msgid "Continue? (y/N) "
 msgstr "Kontynuować? (t/N) "
 
-#: g10/card-util.c:1949 tools/gpg-card.c:3079
+#: g10/card-util.c:1962 tools/gpg-card.c:3096
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr "Naprawdę przywrócić stan fabryczny? (proszę wpisać ,,yes'') "
 
-#: g10/card-util.c:2142
+#: g10/card-util.c:2155
 #, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "błąd przy ustawianiu KDF: %s\n"
 
-#: g10/card-util.c:2188
+#: g10/card-util.c:2201
 #, fuzzy, c-format
 #| msgid "error for setup KDF: %s\n"
 msgid "error for setup UIF: %s\n"
 msgstr "błąd przy ustawianiu KDF: %s\n"
 
-#: g10/card-util.c:2212 g10/keyedit.c:1263 tools/gpg-card.c:3649
+#: g10/card-util.c:2225 g10/keyedit.c:1263 tools/gpg-card.c:3666
 msgid "quit this menu"
 msgstr "wyjście z tego menu"
 
-#: g10/card-util.c:2214
+#: g10/card-util.c:2227
 msgid "show admin commands"
 msgstr "pokazanie poleceń administratora"
 
-#: g10/card-util.c:2215 g10/keyedit.c:1266 tools/gpg-card.c:3652
+#: g10/card-util.c:2228 g10/keyedit.c:1266 tools/gpg-card.c:3669
 msgid "show this help"
 msgstr "ten tekst pomocy"
 
-#: g10/card-util.c:2217 tools/gpg-card.c:3654
+#: g10/card-util.c:2230 tools/gpg-card.c:3671
 msgid "list all available data"
 msgstr "wypisanie wszystkich dostępnych danych"
 
-#: g10/card-util.c:2220 tools/gpg-card.c:3656
+#: g10/card-util.c:2233 tools/gpg-card.c:3673
 msgid "change card holder's name"
 msgstr "zmiana nazwy posiadacza karty"
 
-#: g10/card-util.c:2221 tools/gpg-card.c:3657
+#: g10/card-util.c:2234 tools/gpg-card.c:3674
 msgid "change URL to retrieve key"
 msgstr "zmiana URL-a do odczytu klucza"
 
-#: g10/card-util.c:2222 tools/gpg-card.c:3658
+#: g10/card-util.c:2235 tools/gpg-card.c:3675
 msgid "fetch the key specified in the card URL"
 msgstr "pobranie klucza określonego w URL-u karty"
 
-#: g10/card-util.c:2223 tools/gpg-card.c:3659
+#: g10/card-util.c:2236 tools/gpg-card.c:3676
 msgid "change the login name"
 msgstr "zmiana nazwy logowania"
 
-#: g10/card-util.c:2224 tools/gpg-card.c:3660
+#: g10/card-util.c:2237 tools/gpg-card.c:3677
 msgid "change the language preferences"
 msgstr "zmiana preferowanych języków"
 
-#: g10/card-util.c:2225 tools/gpg-card.c:3661
+#: g10/card-util.c:2238 tools/gpg-card.c:3678
 msgid "change card holder's salutation"
 msgstr "zmiana tytułu posiadacza karty"
 
-#: g10/card-util.c:2227 tools/gpg-card.c:3663
+#: g10/card-util.c:2240 tools/gpg-card.c:3680
 msgid "change a CA fingerprint"
 msgstr "zmiana odcisku CA"
 
-#: g10/card-util.c:2228 tools/gpg-card.c:3664
+#: g10/card-util.c:2241 tools/gpg-card.c:3681
 msgid "toggle the signature force PIN flag"
 msgstr "zmiana flagi wymuszenia PIN-u do podpisu"
 
-#: g10/card-util.c:2229 tools/gpg-card.c:3665
+#: g10/card-util.c:2242 tools/gpg-card.c:3682
 msgid "generate new keys"
 msgstr "wygenerowanie nowych kluczy"
 
-#: g10/card-util.c:2230 tools/gpg-card.c:3666
+#: g10/card-util.c:2243 tools/gpg-card.c:3683
 msgid "menu to change or unblock the PIN"
 msgstr "menu do zmiany lub odblokowania PIN-u"
 
-#: g10/card-util.c:2231 tools/gpg-card.c:3667
+#: g10/card-util.c:2244 tools/gpg-card.c:3684
 msgid "verify the PIN and list all data"
 msgstr "sprawdzenie PIN-u i wypisanie wszystkich danych"
 
-#: g10/card-util.c:2232 tools/gpg-card.c:3668
+#: g10/card-util.c:2245 tools/gpg-card.c:3685
 msgid "unblock the PIN using a Reset Code"
 msgstr "odblokowanie PIN-u przy użyciu kodu resetującego"
 
-#: g10/card-util.c:2233 tools/gpg-card.c:3672
+#: g10/card-util.c:2246 tools/gpg-card.c:3689
 msgid "destroy all keys and data"
 msgstr "zniszczenie wszystkich kluczy i danych"
 
-#: g10/card-util.c:2235
+#: g10/card-util.c:2248
 #, fuzzy
 #| msgid "setup KDF for PIN authentication"
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr "ustawienie KDF do uwierzytelniania PIN-em"
 
-#: g10/card-util.c:2236
+#: g10/card-util.c:2249
 msgid "change the key attribute"
 msgstr "zmiana atrybutu klucza"
 
-#: g10/card-util.c:2237 tools/gpg-card.c:3674
+#: g10/card-util.c:2250 tools/gpg-card.c:3691
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the User Interaction Flag"
 msgstr "zmiana zaufania właściciela"
 
-#: g10/card-util.c:2361 tools/gpg-card.c:3924
+#: g10/card-util.c:2374 tools/gpg-card.c:3941
 msgid "gpg/card> "
 msgstr "gpg/karta> "
 
-#: g10/card-util.c:2402
+#: g10/card-util.c:2415
 msgid "Admin-only command\n"
 msgstr "Polecenie tylko dla administratora\n"
 
-#: g10/card-util.c:2433
+#: g10/card-util.c:2446
 msgid "Admin commands are allowed\n"
 msgstr "Polecenia dla administratora sÄ… dozwolone\n"
 
-#: g10/card-util.c:2435
+#: g10/card-util.c:2448
 msgid "Admin commands are not allowed\n"
 msgstr "Polecenia dla administratora nie sÄ… dozwolone\n"
 
-#: g10/card-util.c:2546 g10/keyedit.c:2275 tools/gpg-card.c:3814
-#: tools/gpg-card.c:4072
+#: g10/card-util.c:2559 g10/keyedit.c:2275 tools/gpg-card.c:3831
+#: tools/gpg-card.c:4089
 #, c-format
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Niepoprawne polecenie  (spróbuj ,,help'')\n"
@@ -2155,22 +2170,22 @@ msgstr "Niepoprawne polecenie  (spróbuj ,,help'')\n"
 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:5293 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5292 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:1934 g10/export.c:2342 g10/export.c:2463
-#: g10/getkey.c:1907 g10/gpg.c:5238 g10/keyedit.c:1450 g10/keyedit.c:2382
-#: g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:703 g10/keyserver.c:1240
-#: g10/revoke.c:230 g10/tofu.c:2168
+#: g10/getkey.c:2032 g10/gpg.c:5237 g10/keyedit.c:1450 g10/keyedit.c:2382
+#: g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:703 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:2002 g10/getkey.c:1915 g10/getkey.c:4330
-#: g10/gpg.c:5247 g10/keyedit.c:2354 g10/keyserver.c:1258 g10/revoke.c:236
-#: g10/revoke.c:665 g10/tofu.c:2176
+#: g10/delkey.c:90 g10/export.c:2002 g10/getkey.c:2040 g10/getkey.c:4455
+#: g10/gpg.c:5246 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"
 msgstr "błąd odczytu bloku kluczy: %s\n"
@@ -2294,14 +2309,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:555 g10/encrypt.c:808 g10/decrypt-data.c:261 g10/gpg.c:4083
-#: g10/gpg.c:4130 sm/decrypt.c:742 sm/encrypt.c:691 sm/gpgsm.c:1793
+#: g10/encrypt.c:555 g10/encrypt.c:808 g10/decrypt-data.c:261 g10/gpg.c:4080
+#: g10/gpg.c:4127 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1646
 #, 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:564 g10/gpg.c:4095 g10/gpg.c:4142 g10/sig-check.c:155
-#: g10/sign.c:452 sm/gpgsm.c:1803 sm/gpgsm.c:1813 sm/sign.c:596 sm/verify.c:510
+#: g10/encrypt.c:564 g10/gpg.c:4092 g10/gpg.c:4139 g10/sig-check.c:155
+#: g10/sign.c:452 sm/gpgsm.c:1656 sm/gpgsm.c:1666 sm/sign.c:596 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"
@@ -2319,7 +2334,7 @@ msgstr ""
 "OSTRZEŻENIE: wymuszone użycie szyfru %s (%d) kłóci się z ustawieniami "
 "adresata\n"
 
-#: g10/encrypt.c:838 sm/encrypt.c:766
+#: g10/encrypt.c:838 sm/encrypt.c:767
 #, c-format
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "OSTRZEŻENIE: klucz %s nie nadaje się do szyfrowania w trybie %s\n"
@@ -2349,7 +2364,7 @@ msgstr "%s/%s zaszyfrowany dla: ,,%s''\n"
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "opcja ,,%s'' nie może być używana w trybie %s\n"
 
-#: g10/decrypt-data.c:239 g10/mainproc.c:380 sm/decrypt.c:494
+#: g10/decrypt-data.c:239 g10/mainproc.c:380 sm/decrypt.c:892
 #, fuzzy, c-format
 #| msgid "%s encrypted data\n"
 msgid "%s.%s encrypted data\n"
@@ -2360,7 +2375,7 @@ msgstr "dane zaszyfrowano za pomocÄ… %s\n"
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "dane zaszyfrowano nieznanym algorytmem numer %d\n"
 
-#: g10/decrypt-data.c:361 g10/decrypt-data.c:414 sm/decrypt.c:508
+#: g10/decrypt-data.c:361 g10/decrypt-data.c:414 sm/decrypt.c:906
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2400,7 +2415,7 @@ msgstr "użycie formatu kopii zapasowej klucza GnuPG"
 msgid " - skipped"
 msgstr " - pominięty"
 
-#: g10/export.c:1333 g10/import.c:2124 g10/openfile.c:202 g10/openfile.c:296
+#: g10/export.c:1333 g10/import.c:2132 g10/openfile.c:202 g10/openfile.c:296
 #: g10/sign.c:1110 g10/sign.c:1447
 #, c-format
 msgid "writing to '%s'\n"
@@ -2436,63 +2451,63 @@ msgstr "błąd tworzenia ,,%s'': %s\n"
 msgid "[User ID not found]"
 msgstr "[brak identyfikatora użytkownika]"
 
-#: g10/getkey.c:1199
+#: g10/getkey.c:1324
 #, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "automatycznie pobrano ,,%s'' poprzez %s\n"
 
-#: g10/getkey.c:1205
+#: g10/getkey.c:1330
 #, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "błąd pobierania ,,%s'' poprzez %s: %s\n"
 
-#: g10/getkey.c:1207
+#: g10/getkey.c:1332
 msgid "No fingerprint"
 msgstr "Brak odcisku"
 
-#: g10/getkey.c:1449
+#: g10/getkey.c:1574
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr "szukanie świeżej kopii wygasłego klucza poprzez %s\n"
 
-#: g10/getkey.c:1884 g10/revoke.c:657 g10/revoke.c:718
+#: g10/getkey.c:2009 g10/revoke.c:658 g10/revoke.c:719
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "klucz prywatny ,,%s'' nie został odnaleziony: %s\n"
 
-#: g10/getkey.c:1887 g10/pkclist.c:1012
+#: g10/getkey.c:2012 g10/pkclist.c:1012
 #, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "(sprawdzić argument opcji ,,%s'')\n"
 
-#: g10/getkey.c:1965
+#: g10/getkey.c:2090
 #, c-format
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "Ostrzeżenie: ,,%s'' nie jest użyty jako domyślny klucz: %s\n"
 
-#: g10/getkey.c:1973
+#: g10/getkey.c:2098
 #, c-format
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "użycie ,,%s'' jako domyślnego klucza tajnego do podpisywania\n"
 
-#: g10/getkey.c:1980
+#: g10/getkey.c:2105
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr "wszystkie wartości przekazane do ,,%s'' zostały zignorowane\n"
 
-#: g10/getkey.c:2837
+#: g10/getkey.c:2962
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Opcja --allow-non-selfsigned-uid wymusiła uznanie za poprawny niepoprawnego "
 "klucza %s.\n"
 
-#: g10/getkey.c:3703
+#: g10/getkey.c:3828
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "używany jest podklucz %s zamiast klucza głównego %s\n"
 
-#: g10/getkey.c:4259 g10/gpg.c:2167
+#: g10/getkey.c:4384 g10/gpg.c:2168
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "poprawne argimenty dla opcji ,,%s'':\n"
@@ -2677,7 +2692,7 @@ msgstr "|SPEC|określ adres email"
 msgid "use strict OpenPGP behavior"
 msgstr "ścisłe zachowanie OpenPGP"
 
-#: g10/gpg.c:651 kbx/kbxutil.c:91 sm/gpgsm.c:424 tools/gpgconf.c:113
+#: g10/gpg.c:651 kbx/kbxutil.c:91 sm/gpgsm.c:425 tools/gpgconf.c:113
 msgid "do not make any changes"
 msgstr "pozostawienie bez zmian"
 
@@ -2713,7 +2728,7 @@ msgstr "kanoniczny format tekstowy"
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|ustawienie poziomu kompresji N (0 - bez)"
 
-#: g10/gpg.c:762 sm/gpgsm.c:357
+#: g10/gpg.c:762 sm/gpgsm.c:358
 #, fuzzy
 #| msgid "Options controlling the interactivity and enforcement"
 msgid "Options controlling key import and export"
@@ -2733,11 +2748,11 @@ msgstr "import brakujÄ…cego klucza z podpisu"
 msgid "include the public key in signatures"
 msgstr "włączanie klucza publicznego do podpisów"
 
-#: g10/gpg.c:776 sm/gpgsm.c:360
+#: g10/gpg.c:776 sm/gpgsm.c:361
 msgid "disable all access to the dirmngr"
 msgstr "zablokuj dostęp do dirmngr"
 
-#: g10/gpg.c:788 sm/gpgsm.c:367
+#: g10/gpg.c:788 sm/gpgsm.c:368
 #, fuzzy
 #| msgid "Options controlling the configuration"
 msgid "Options controlling key listings"
@@ -2759,15 +2774,15 @@ msgstr ""
 "|UŻYTKOWNIK|użycie tego identyfikatora użytkownika do podpisania lub "
 "odszyfrowania"
 
-#: g10/gpg.c:876 sm/gpgsm.c:408
+#: g10/gpg.c:876 sm/gpgsm.c:409
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:895 sm/gpgsm.c:420 dirmngr/dirmngr.c:286
+#: g10/gpg.c:895 sm/gpgsm.c:421 dirmngr/dirmngr.c:289
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:966 sm/gpgsm.c:453
+#: g10/gpg.c:966 sm/gpgsm.c:454
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2811,7 +2826,7 @@ msgstr ""
 "Podpisywanie, sprawdzanie podpisów, szyfrowanie, rozszyfrowywanie\n"
 "Domyślnie wykonywana operacja zależy od danych wejściowych\n"
 
-#: g10/gpg.c:1168 sm/gpgsm.c:636
+#: g10/gpg.c:1168 sm/gpgsm.c:637
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2835,12 +2850,12 @@ msgstr "Skrótów: "
 msgid "Compression: "
 msgstr "Kompresji: "
 
-#: g10/gpg.c:1274 sm/gpgsm.c:710
+#: g10/gpg.c:1274 sm/gpgsm.c:711
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "składnia: %s [opcje] %s\n"
 
-#: g10/gpg.c:1467 sm/gpgsm.c:803
+#: g10/gpg.c:1467 sm/gpgsm.c:804
 #, c-format
 msgid "conflicting commands\n"
 msgstr "sprzeczne polecenia\n"
@@ -2850,47 +2865,47 @@ msgstr "sprzeczne polecenia\n"
 msgid "no = sign found in group definition '%s'\n"
 msgstr "w definicji grupy ,,%s'' brak znaku ,,=''\n"
 
-#: g10/gpg.c:1683
+#: g10/gpg.c:1684
 #, 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:1686
+#: g10/gpg.c:1687
 #, 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:1689
+#: g10/gpg.c:1690
 #, 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:1695
+#: g10/gpg.c:1696
 #, 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:1698
+#: g10/gpg.c:1699
 #, 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:1701
+#: g10/gpg.c:1702
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "OSTRZEŻENIE: niebezpieczne prawa dostępu do rozszerzenia ,,%s''\n"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1708
 #, 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:1710
+#: g10/gpg.c:1711
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@ -2898,21 +2913,21 @@ msgstr ""
 "OSTRZEŻENIE: niebezpieczne prawa własności do katalogu zawierającego plik "
 "konfiguracyjny ,,%s''\n"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1714
 #, 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:1719
+#: g10/gpg.c:1720
 #, 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:1722
+#: g10/gpg.c:1723
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@ -2920,475 +2935,475 @@ msgstr ""
 "OSTRZEŻENIE: niebezpieczne prawa dostępu do katalogu zawierającego plik "
 "konfiguracyjny ,,%s''\n"
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1726
 #, 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:1941
+#: g10/gpg.c:1942
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "nieznana opcja konfiguracyjna ,,%s''\n"
 
-#: g10/gpg.c:2037
+#: g10/gpg.c:2038
 msgid "display photo IDs during key listings"
 msgstr "wyświetlenie ID zdjęć przy wypisywaniu kluczy"
 
-#: g10/gpg.c:2039
+#: g10/gpg.c:2040
 msgid "show key usage information during key listings"
 msgstr "pokazywanie informacji o zastosowaniu klucza przy wypisywaniu kluczy"
 
-#: g10/gpg.c:2041
+#: g10/gpg.c:2042
 msgid "show policy URLs during signature listings"
 msgstr "pokazywanie URL-i polityk przy wypisywaniu podpisów"
 
-#: g10/gpg.c:2043
+#: g10/gpg.c:2044
 msgid "show all notations during signature listings"
 msgstr "pokazywanie wszystkich adnotacji przy wypisywaniu podpisów"
 
-#: g10/gpg.c:2045
+#: g10/gpg.c:2046
 msgid "show IETF standard notations during signature listings"
 msgstr "pokazywanie standardowych adnotacji IETF przy wypisywaniu podpisów"
 
-#: g10/gpg.c:2049
+#: g10/gpg.c:2050
 msgid "show user-supplied notations during signature listings"
 msgstr "pokazywanie adnotacji użytkownika przy wypisywaniu podpisów"
 
-#: g10/gpg.c:2051
+#: g10/gpg.c:2052
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 "pokazywanie URL-i preferowanych serwerów kluczy przy wypisywaniu podpisów"
 
-#: g10/gpg.c:2053
+#: g10/gpg.c:2054
 msgid "show user ID validity during key listings"
 msgstr "pokazywanie poprawności ID użytkownika przy wypisywaniu kluczy"
 
-#: g10/gpg.c:2055
+#: g10/gpg.c:2056
 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:2057
+#: g10/gpg.c:2058
 msgid "show revoked and expired subkeys in key listings"
 msgstr "pokazywanie unieważnionych i wygasłych podkluczy na listach kluczy"
 
-#: g10/gpg.c:2059
+#: g10/gpg.c:2060
 msgid "show the keyring name in key listings"
 msgstr "pokazywanie nazwy zbioru kluczy na listach kluczy"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2062
 msgid "show expiration dates during signature listings"
 msgstr "pokazywanie dat wygaśnięcia przy wypisywaniu podpisów"
 
-#: g10/gpg.c:2178
+#: g10/gpg.c:2179
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "nieznana polityka TOFU ,,%s''\n"
 
-#: g10/gpg.c:2180
+#: g10/gpg.c:2181
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(,,help'' wyświetli listę wyborów)\n"
 
-#: g10/gpg.c:2975 g10/gpg.c:3828 g10/gpg.c:3840
+#: g10/gpg.c:2978 g10/gpg.c:3825 g10/gpg.c:3837
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "Uwaga: %s nie jest do normalnego użytku!\n"
 
-#: g10/gpg.c:3151 g10/gpg.c:3163
+#: g10/gpg.c:3154 g10/gpg.c:3166
 #, 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:3185
+#: g10/gpg.c:3188
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr ",,%s'' nie jest niepoprawnym adresem e-mail\n"
 
-#: g10/gpg.c:3217 sm/gpgsm.c:1270
+#: g10/gpg.c:3220 sm/gpgsm.c:1143
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "błędny tryb pinentry ,,%s''\n"
 
-#: g10/gpg.c:3223 sm/gpgsm.c:1276
+#: g10/gpg.c:3226 sm/gpgsm.c:1149
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "błędne źródło żądania ,,%s''\n"
 
-#: g10/gpg.c:3280
+#: g10/gpg.c:3283
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr ",,%s'' nie jest poprawną nazwą zestawu znaków\n"
 
-#: g10/gpg.c:3302 g10/gpg.c:3511 g10/keyedit.c:5319
+#: g10/gpg.c:3305 g10/gpg.c:3514 g10/keyedit.c:5322
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "niezrozumiały URL serwera kluczy\n"
 
-#: g10/gpg.c:3320
+#: g10/gpg.c:3323
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: niepoprawne opcje serwera kluczy\n"
 
-#: g10/gpg.c:3323
+#: g10/gpg.c:3326
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "niepoprawne opcje serwera kluczy\n"
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3333
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:3333
+#: g10/gpg.c:3336
 #, c-format
 msgid "invalid import options\n"
 msgstr "niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:3339 g10/gpg.c:3354
+#: g10/gpg.c:3342 g10/gpg.c:3357
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "niepoprawne opcje filtrowania: %s\n"
 
-#: g10/gpg.c:3345
+#: g10/gpg.c:3348
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3351
 #, c-format
 msgid "invalid export options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3363
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: niepoprawne opcje wypisywania\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3366
 #, c-format
 msgid "invalid list options\n"
 msgstr "niepoprawne opcje wypisywania\n"
 
-#: g10/gpg.c:3371
+#: g10/gpg.c:3374
 msgid "display photo IDs during signature verification"
 msgstr "wyświetlanie ID zdjęć przy sprawdzaniu podpisów"
 
-#: g10/gpg.c:3373
+#: g10/gpg.c:3376
 msgid "show policy URLs during signature verification"
 msgstr "pokazywanie URL-i polityk przy sprawdzaniu podpisów"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3378
 msgid "show all notations during signature verification"
 msgstr "pokazywanie wszystkich adnotacji przy sprawdzaniu podpisów"
 
-#: g10/gpg.c:3377
+#: g10/gpg.c:3380
 msgid "show IETF standard notations during signature verification"
 msgstr "pokazywanie standardowych adnotacji IETF przy sprawdzaniu podpisów"
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3384
 msgid "show user-supplied notations during signature verification"
 msgstr "pokazywanie adnotacji użytkownika przy sprawdzaniu podpisów"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3386
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 "pokazywanie URL-i preferowanych serwerów kluczy przy sprawdzaniu podpisów"
 
-#: g10/gpg.c:3385
+#: g10/gpg.c:3388
 msgid "show user ID validity during signature verification"
 msgstr "pokazywanie poprawności ID użytkownika przy sprawdzaniu podpisów"
 
-#: g10/gpg.c:3387
+#: g10/gpg.c:3390
 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:3389
+#: g10/gpg.c:3392
 msgid "show only the primary user ID in signature verification"
 msgstr "pokazywanie tylko głównego ID użytkownika przy sprawdzaniu podpisu"
 
-#: g10/gpg.c:3396
+#: g10/gpg.c:3399
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: niepoprawne opcje sprawdzania\n"
 
-#: g10/gpg.c:3399
+#: g10/gpg.c:3402
 #, c-format
 msgid "invalid verify options\n"
 msgstr "niepoprawne opcje sprawdzania\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3409
 #, 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:3613
+#: g10/gpg.c:3616
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: niepoprawna lista auto-key-locate\n"
 
-#: g10/gpg.c:3616
+#: g10/gpg.c:3619
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "Niepoprawna lista auto-key-locate\n"
 
-#: g10/gpg.c:3625
+#: g10/gpg.c:3628
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "błędny argument dla opcji ,,%.50s''\n"
 
-#: g10/gpg.c:3807 sm/gpgsm.c:1675
+#: g10/gpg.c:3804 sm/gpgsm.c:1528
 #, 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:3821
+#: g10/gpg.c:3818
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "OSTRZEŻENIE: %s powoduje obejście %s\n"
 
-#: g10/gpg.c:3830
+#: g10/gpg.c:3827
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie wolno używać %s z %s!\n"
 
-#: g10/gpg.c:3833
+#: g10/gpg.c:3830
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nie ma sensu w połączeniu z %s!\n"
 
-#: g10/gpg.c:3848 sm/gpgsm.c:1696 dirmngr/dirmngr.c:1123
+#: g10/gpg.c:3845 sm/gpgsm.c:1549 dirmngr/dirmngr.c:1160
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "OSTRZEŻENIE: działanie z fałszywym czasem systemowym: "
 
-#: g10/gpg.c:3869
+#: g10/gpg.c:3866
 #, 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:3897 g10/gpg.c:3928 sm/gpgsm.c:1763
+#: g10/gpg.c:3894 g10/gpg.c:3925 sm/gpgsm.c:1616
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "wybrany algorytm szyfrujÄ…cy jest niepoprawny\n"
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3901
 #, 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:3916
+#: g10/gpg.c:3913
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "wybrany algorytm kompresji jest niepoprawny\n"
 
-#: g10/gpg.c:3922
+#: g10/gpg.c:3919
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "wybrany algorytm skrótów poświadczeń jest niepoprawny\n"
 
-#: g10/gpg.c:3937
+#: g10/gpg.c:3934
 #, 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:3939
+#: g10/gpg.c:3936
 #, 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:3941
+#: g10/gpg.c:3938
 #, 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:3943
+#: g10/gpg.c:3940
 #, 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:3945
+#: g10/gpg.c:3942
 #, 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:3949
+#: g10/gpg.c:3946
 #, 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:3953
+#: g10/gpg.c:3950
 #, 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:3960
+#: g10/gpg.c:3957
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "niewłaściwe domyślne ustawienia\n"
 
-#: g10/gpg.c:3964
+#: g10/gpg.c:3961
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "niewłaściwe ustawienia szyfrów\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3964
 #, 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:3971
+#: g10/gpg.c:3968
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "niewłaściwe ustawienia skrótów\n"
 
-#: g10/gpg.c:3975
+#: g10/gpg.c:3972
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "niewłaściwe ustawienia algorytmów kompresji\n"
 
-#: g10/gpg.c:3984 g10/gpg.c:3989
+#: g10/gpg.c:3981 g10/gpg.c:3986
 #, 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:4026
+#: g10/gpg.c:4023
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s jeszcze nie działa z %s!\n"
 
-#: g10/gpg.c:4089
+#: g10/gpg.c:4086
 #, 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:4101
+#: g10/gpg.c:4098
 #, 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:4256
+#: g10/gpg.c:4253
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiodło się: %s\n"
 
-#: g10/gpg.c:4268
+#: g10/gpg.c:4265
 #, 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:4340
+#: g10/gpg.c:4337
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "szyfrowanie symetryczne ,,%s'' nie powiodło się: %s\n"
 
-#: g10/gpg.c:4369
+#: g10/gpg.c:4366
 #, 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:4372
+#: g10/gpg.c:4369
 #, 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:4430
+#: g10/gpg.c:4427
 #, 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:4433
+#: g10/gpg.c:4430
 #, 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:4821 g10/keyserver.c:1870
+#: g10/gpg.c:4818 g10/keyserver.c:1629
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "wysyłka do serwera kluczy nie powiodła się: %s\n"
 
-#: g10/gpg.c:4826
+#: g10/gpg.c:4823
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "odbiór z serwera kluczy nie powiódł się: %s\n"
 
-#: g10/gpg.c:4832
+#: g10/gpg.c:4829
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "eksport kluczy nie powiódł się: %s\n"
 
-#: g10/gpg.c:4845
+#: g10/gpg.c:4842
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "eksport do klucza ssh powiódł się: %s\n"
 
-#: g10/gpg.c:4857
+#: g10/gpg.c:4854
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "szukanie w serwerze kluczy nie powiodło się: %s\n"
 
-#: g10/gpg.c:4870
+#: g10/gpg.c:4867
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "odświeżenie kluczy z serwera nie powiodło się: %s\n"
 
-#: g10/gpg.c:4937
+#: g10/gpg.c:4936
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zdjęcie opakowania ASCII nie powiodło się: %s\n"
 
-#: g10/gpg.c:4948
+#: g10/gpg.c:4947
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "opakowywanie ASCII nie powiodło się: %s\n"
 
-#: g10/gpg.c:5053
+#: g10/gpg.c:5052
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "niewłaściwy algorytm skrótu ,,%s''\n"
 
-#: g10/gpg.c:5205 g10/tofu.c:2156
+#: g10/gpg.c:5204 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:5216
+#: g10/gpg.c:5215
 #, 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:5272
+#: g10/gpg.c:5271
 #, 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:5283
+#: g10/gpg.c:5282
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Wpisz tutaj swoją wiadomość ...\n"
 
-#: g10/gpg.c:5630
+#: g10/gpg.c:5629
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "podany URL regulaminu poświadczania jest niepoprawny\n"
 
-#: g10/gpg.c:5632
+#: g10/gpg.c:5631
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "podany URL regulaminu podpisów jest niepoprawny\n"
 
-#: g10/gpg.c:5665
+#: g10/gpg.c:5664
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "podany preferowany URL serwera kluczy jest niepoprawny\n"
@@ -3401,7 +3416,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:414 tools/gpgconf.c:116 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:415 tools/gpgconf.c:116 tools/gpg-card.c:95
 msgid "|FD|write status info to this FD"
 msgstr "|FD|pisanie opisu stanu do deskryptora FD"
 
@@ -3490,97 +3505,97 @@ msgstr "przyjęcie wejścia w formacie kopii zapasowej klucza GnuPG"
 msgid "repair keys on import"
 msgstr "naprawienie kluczy przy imporcie"
 
-#: g10/import.c:399 g10/import.c:721
+#: g10/import.c:407 g10/import.c:729
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "blok typu %d zostaje pominięty\n"
 
-#: g10/import.c:738
+#: g10/import.c:746
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu kluczy przetworzonych do tej chwili\n"
 
-#: g10/import.c:831
+#: g10/import.c:839
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Ogółem przetworzonych kluczy: %lu\n"
 
-#: g10/import.c:834
+#: g10/import.c:842
 #, c-format
 msgid "    skipped PGP-2 keys: %lu\n"
 msgstr "    pominiętych kluczy PGP-2: %lu\n"
 
-#: g10/import.c:836
+#: g10/import.c:844
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "   pominiętych nowych kluczy: %lu\n"
 
-#: g10/import.c:839
+#: g10/import.c:847
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          bez identyfikatora: %lu\n"
 
-#: g10/import.c:842 sm/import.c:129
+#: g10/import.c:850 sm/import.c:129
 #, c-format
 msgid "              imported: %lu"
 msgstr "         dołączono do zbioru: %lu"
 
-#: g10/import.c:846 sm/import.c:133
+#: g10/import.c:854 sm/import.c:133
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                   bez zmian: %lu\n"
 
-#: g10/import.c:848
+#: g10/import.c:856
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      nowych identyfikatorów: %lu\n"
 
-#: g10/import.c:850
+#: g10/import.c:858
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "            nowych podkluczy: %lu\n"
 
-#: g10/import.c:852
+#: g10/import.c:860
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "             nowych podpisów: %lu\n"
 
-#: g10/import.c:854
+#: g10/import.c:862
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   nowych unieważnień kluczy: %lu\n"
 
-#: g10/import.c:856 sm/import.c:135
+#: g10/import.c:864 sm/import.c:135
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "   tajnych kluczy wczytanych: %lu\n"
 
-#: g10/import.c:858 sm/import.c:137
+#: g10/import.c:866 sm/import.c:137
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "     tajnych kluczy dodanych: %lu\n"
 
-#: g10/import.c:860 sm/import.c:139
+#: g10/import.c:868 sm/import.c:139
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "    tajnych kluczy bez zmian: %lu\n"
 
-#: g10/import.c:862 sm/import.c:141
+#: g10/import.c:870 sm/import.c:141
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "      nie włączono do zbioru: %lu\n"
 
-#: g10/import.c:864
+#: g10/import.c:872
 #, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "     podpisów wyczyszczonych: %lu\n"
 
-#: g10/import.c:866
+#: g10/import.c:874
 #, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "ID użytkownika wyczyszczonych: %lu\n"
 
-#: g10/import.c:1291
+#: g10/import.c:1299
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
@@ -3589,173 +3604,173 @@ msgstr ""
 "OSTRZEŻENIE: klucz %s zawiera preferencje dla niedostępnych\n"
 "algorytmów dla tych ID użytkownika:\n"
 
-#: g10/import.c:1333
+#: g10/import.c:1341
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         ,,%s'': preferowany szyfr %s\n"
 
-#: g10/import.c:1351
+#: g10/import.c:1359
 #, fuzzy, c-format
 #| msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgid "         \"%s\": preference for AEAD algorithm %s\n"
 msgstr "         ,,%s'': preferowany szyfr %s\n"
 
-#: g10/import.c:1366
+#: g10/import.c:1374
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         ,,%s'': preferowany algorytm skrótu %s\n"
 
-#: g10/import.c:1378
+#: g10/import.c:1386
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         ,,%s'': preferowany algorytm kompresji %s\n"
 
-#: g10/import.c:1391
+#: g10/import.c:1399
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "zdecydowanie sugerowane jest uaktualnienie ustawień i ponowne\n"
 
-#: g10/import.c:1393
+#: g10/import.c:1401
 #, c-format
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr "rozesłanie tego klucza w celu uniknięcia niezgodności algorytmów\n"
 
-#: g10/import.c:1418
+#: g10/import.c:1426
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 "można uaktualnić swoje ustawienia poprzez: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:1932 g10/import.c:3053
+#: g10/import.c:1940 g10/import.c:3061
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "klucz %s: brak identyfikatora użytkownika\n"
 
-#: g10/import.c:1938
+#: g10/import.c:1946
 #, c-format
 msgid "key %s: %s\n"
 msgstr "klucz %s: %s\n"
 
-#: g10/import.c:1939 g10/import.c:3025
+#: g10/import.c:1947 g10/import.c:3033
 msgid "rejected by import screener"
 msgstr "odrzucony przez filtr importu"
 
-#: g10/import.c:1988
+#: g10/import.c:1996
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "klucz %s: podklucz uszkodzony przez serwer został naprawiony\n"
 
-#: g10/import.c:2009
+#: g10/import.c:2017
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "klucz %s: przyjęto identyfikator nie podpisany nim samym ,,%s''\n"
 
-#: g10/import.c:2020 g10/import.c:2051
+#: g10/import.c:2028 g10/import.c:2059
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "klucz %s: brak poprawnych identyfikatorów użytkownika\n"
 
-#: g10/import.c:2022
+#: g10/import.c:2030
 #, c-format
 msgid "this may be caused by a missing self-signature\n"
 msgstr "to może być spowodowane brakiem podpisu klucza nim samym\n"
 
-#: g10/import.c:2101 g10/import.c:3439
+#: g10/import.c:2109 g10/import.c:3447
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "klucz %s: brak klucza publicznego: %s\n"
 
-#: g10/import.c:2107
+#: g10/import.c:2115
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "klucz %s: nowy klucz - pominięty\n"
 
-#: g10/import.c:2119
+#: g10/import.c:2127
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy: %s\n"
 
-#: g10/import.c:2151 g10/import.c:2253 g10/import.c:3514
+#: g10/import.c:2159 g10/import.c:2261 g10/import.c:3522
 #, c-format
 msgid "error writing keyring '%s': %s\n"
 msgstr "błąd zapisu zbioru kluczy ,,%s'': %s\n"
 
-#: g10/import.c:2174
+#: g10/import.c:2182
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "klucz %s: klucz publiczny ,,%s'' wczytano do zbioru\n"
 
-#: g10/import.c:2201
+#: g10/import.c:2209
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "klucz %s: nie zgadza siÄ™ z lokalnÄ… kopiÄ…\n"
 
-#: g10/import.c:2269
+#: g10/import.c:2277
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "klucz %s: ,,%s'' 1 nowy identyfikator użytkownika\n"
 
-#: g10/import.c:2272
+#: g10/import.c:2280
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "klucz %s: ,,%s'' %d nowych identyfikatorów użytkownika\n"
 
-#: g10/import.c:2275
+#: g10/import.c:2283
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "klucz %s: ,,%s'' 1 nowy podpis\n"
 
-#: g10/import.c:2278
+#: g10/import.c:2286
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "klucz %s: ,,%s'' %d nowych podpisów\n"
 
-#: g10/import.c:2281
+#: g10/import.c:2289
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "klucz %s: ,,%s'' 1 nowy podklucz\n"
 
-#: g10/import.c:2284
+#: g10/import.c:2292
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "klucz %s: ,,%s'' %d nowych podkluczy\n"
 
-#: g10/import.c:2287
+#: g10/import.c:2295
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "klucz %s: ,,%s'' %d podpis wyczyszczony\n"
 
-#: g10/import.c:2290
+#: g10/import.c:2298
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "klucz %s: ,,%s'' %d podpisów wyczyszczonych\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2301
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "klucz %s: ,,%s'' %d identyfikator użytkownika wyczyszczony\n"
 
-#: g10/import.c:2296
+#: g10/import.c:2304
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "klucz %s: ,,%s'' %d identyfikatorów użytkownika wyczyszczonych\n"
 
-#: g10/import.c:2332
+#: g10/import.c:2340
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "klucz %s: ,,%s'' bez zmian\n"
 
-#: g10/import.c:2692 g10/import.c:2887
+#: g10/import.c:2700 g10/import.c:2895
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "klucz %s: klucz tajny wczytany do zbioru\n"
 
-#: g10/import.c:2700
+#: g10/import.c:2708
 #, c-format
 msgid "key %s: secret key already exists\n"
 msgstr "klucz %s: klucz prywatny już istnieje\n"
 
-#: g10/import.c:2708
+#: g10/import.c:2716
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "klucz %s: błąd wysyłania do agenta: %s\n"
@@ -3768,213 +3783,212 @@ msgstr "klucz %s: błąd wysyłania do agenta: %s\n"
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2877
+#: g10/import.c:2885
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 "Aby zmigrować ,,%s'', dla każdej karty procesorowej należy uruchomić: %s\n"
 
-#: g10/import.c:3024
+#: g10/import.c:3032
 #, c-format
 msgid "secret key %s: %s\n"
 msgstr "klucz prywatny %s: %s\n"
 
-#: g10/import.c:3045 g10/import.c:3084
+#: g10/import.c:3053 g10/import.c:3092
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "wczytywanie kluczy tajnych nie jest dozwolone\n"
 
-#: g10/import.c:3072
+#: g10/import.c:3080
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "klucz %s: klucz tajny z błędnym szyfrem %d - pominięty\n"
 
-#: g10/import.c:3234 g10/pkclist.c:75 g10/revoke.c:774
+#: g10/import.c:3242 g10/pkclist.c:75 g10/revoke.c:775
 msgid "No reason specified"
 msgstr "nie podano przyczyny"
 
-#: g10/import.c:3235 g10/pkclist.c:77 g10/revoke.c:776
+#: g10/import.c:3243 g10/pkclist.c:77 g10/revoke.c:777
 msgid "Key is superseded"
 msgstr "klucz został zastąpiony"
 
-#: g10/import.c:3236 g10/pkclist.c:79 g10/revoke.c:775
+#: g10/import.c:3244 g10/pkclist.c:79 g10/revoke.c:776
 msgid "Key has been compromised"
 msgstr "klucz został skompromitowany"
 
-#: g10/import.c:3237 g10/pkclist.c:81 g10/revoke.c:777
+#: g10/import.c:3245 g10/pkclist.c:81 g10/revoke.c:778
 msgid "Key is no longer used"
 msgstr "klucz nie jest już używany"
 
-#: g10/import.c:3238 g10/pkclist.c:83 g10/revoke.c:778
+#: g10/import.c:3246 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "identyfikator użytkownika przestał być poprawny"
 
-#: g10/import.c:3363 g10/keylist.c:1105 g10/pkclist.c:87
+#: g10/import.c:3371 g10/keylist.c:1105 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "powód unieważnienia: "
 
-#: g10/import.c:3382 g10/keylist.c:1124 g10/pkclist.c:103
+#: g10/import.c:3390 g10/keylist.c:1124 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "komentarz do unieważnienia: "
 
-#: g10/import.c:3432
+#: g10/import.c:3440
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "klucz %s: brak klucza publicznego, którego dotyczy wczytany certyfikat\n"
 "              unieważnienia\n"
 
-#: g10/import.c:3461
+#: g10/import.c:3469
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "klucz %s: brak oryginalnego bloku klucza; %s\n"
 
-#: g10/import.c:3468
+#: g10/import.c:3476
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "klucz %s: nie można odczytać oryginalnego bloku klucza: %s\n"
 
-#: g10/import.c:3488
+#: g10/import.c:3496
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "klucz %s: niepoprawny certyfikat unieważnienia: %s - odrzucony\n"
 
-#: g10/import.c:3523
+#: g10/import.c:3531
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "klucz %s: ,,%s'' certyfikat unieważnienia został już wczytany\n"
 
-#: g10/import.c:3609
+#: g10/import.c:3617
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "klucz %s: brak identyfikatora użytkownika do podpisu\n"
 
-#: g10/import.c:3626
+#: g10/import.c:3634
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "klucz %s: algorytm asymetryczny dla id ,,%s'' nie jest obsługiwany\n"
 
-#: g10/import.c:3628
+#: g10/import.c:3636
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "klucz %s: niepoprawny podpis na identyfikatorze ,,%s''\n"
 
-#: g10/import.c:3645 g10/import.c:3673 g10/import.c:3729
+#: g10/import.c:3653 g10/import.c:3681 g10/import.c:3737
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "klucz %s: nieobsługiwany algorytm asymetryczny\n"
 
-#: g10/import.c:3646
+#: g10/import.c:3654
 #, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "klucz %s: nieprawidłowy bezpośredni podpis\n"
 
-#: g10/import.c:3660
+#: g10/import.c:3668
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "klucz %s: brak podklucza do dowiÄ…zania\n"
 
-#: g10/import.c:3675
+#: g10/import.c:3683
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "klucz %s: niepoprawne dowiÄ…zanie podklucza\n"
 
-#: g10/import.c:3694
+#: g10/import.c:3702
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "klucz %s: usunięto wielokrotne dowiązanie podklucza\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3726
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "klucz %s: brak podklucza, którego dotyczy unieważnienie\n"
 
-#: g10/import.c:3731
+#: g10/import.c:3739
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "klucz %s: niepoprawne unieważnienie podklucza\n"
 
-#: g10/import.c:3746
+#: g10/import.c:3754
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "klucz %s: usunięto wielokrotne unieważnienie podklucza\n"
 
-#: g10/import.c:3790
+#: g10/import.c:3798
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "klucz %s: pominięto identyfikator użytkownika ,,%s''\n"
 
-#: g10/import.c:3817
+#: g10/import.c:3825
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "klucz %s: podklucz pominięty\n"
 
-#: g10/import.c:3849
+#: g10/import.c:3857
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "klucz %s: podpis nieeksportowalny (klasy 0x%02X) - pominięty\n"
 
-#: g10/import.c:3860
+#: g10/import.c:3868
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "klucz %s: pominięto certyfikat unieważnienia umieszczony\n"
 "              w niewłaściwym miejscu\n"
 
-#: g10/import.c:3878
+#: g10/import.c:3886
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "klucz %s: pominięto -  niepoprawny certyfikat unieważnienia: %s\n"
 
-#: g10/import.c:3892
+#: g10/import.c:3900
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "klucz %s: pominięto - podpis na podkluczu w niewłaściwym miejscu\n"
 
-#: g10/import.c:3900
+#: g10/import.c:3908
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "klucz %s: pominięto - nieoczekiwana klasa podpisu (0x%02X)\n"
 
-#: g10/import.c:4073
+#: g10/import.c:4081
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "key %s: dołączono powtórzony identyfikator użytkownika\n"
 
-#: g10/import.c:4180
+#: g10/import.c:4188
 #, fuzzy, c-format
 #| msgid "key %s: duplicated user ID detected - merged\n"
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr "key %s: dołączono powtórzony identyfikator użytkownika\n"
 
-#: g10/import.c:4245
+#: g10/import.c:4253
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "OSTRZEŻENIE: klucz %s mógł zostać unieważniony:\n"
 "             zapytanie o unieważniający klucz %s w serwerze kluczy\n"
 
-#: g10/import.c:4261
+#: g10/import.c:4269
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "OSTRZEŻENIE: klucz %s mógł zostać unieważniony:\n"
 "             brak unieważniającego klucza %s.\n"
 
-#: g10/import.c:4327
+#: g10/import.c:4335
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "klucz %s: ,,%s'' dodany certyfikat unieważnienia\n"
 
-#: g10/import.c:4365
+#: g10/import.c:4373
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "klucz %s: dodano bezpośredni podpis\n"
 
-#: g10/key-check.c:133 dirmngr/dirmngr_ldap.c:650 dirmngr/ldap-wrapper.c:835
-#: dirmngr/ldap-wrapper.c:852
+#: g10/key-check.c:133 dirmngr/ldap-wrapper.c:835 dirmngr/ldap-wrapper.c:852
 #, c-format
 msgid "error allocating memory: %s\n"
 msgstr "błąd przydzielania pamięci: %s\n"
@@ -4043,7 +4057,7 @@ msgstr ""
 "Uwaga: znaleziono błędy, a sprawdzono tylko podpisy własne; uruchomienie "
 "'%s' sprawdzi wszystkie podpisy.\n"
 
-#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:284 sm/keydb.c:297
+#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:289 sm/keydb.c:302
 #, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "błąd tworzenia keyboksa ,,%s'': %s\n"
@@ -4053,7 +4067,7 @@ msgstr "błąd tworzenia keyboksa ,,%s'': %s\n"
 msgid "error creating keyring '%s': %s\n"
 msgstr "błąd tworzenia zbioru kluczy ,,%s'': %s\n"
 
-#: g10/keydb.c:388 sm/keydb.c:303
+#: g10/keydb.c:388 sm/keydb.c:308
 #, c-format
 msgid "keybox '%s' created\n"
 msgstr "keybox ,,%s'' utworzony\n"
@@ -4312,8 +4326,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:6192 g10/keyedit.c:6275 g10/keyedit.c:6404
-#: g10/keyedit.c:6466 g10/sign.c:528
+#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
+#: g10/keyedit.c:6474 g10/sign.c:528
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "złożenie podpisu nie powiodło się: %s\n"
@@ -4697,7 +4711,7 @@ msgstr "Brak pasującego identyfikatora użytkownika."
 msgid "Nothing to sign.\n"
 msgstr "Nie ma nic do podpisania.\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6057
+#: g10/keyedit.c:2973 g10/keyedit.c:6065
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "Nie podpisane przez ciebie.\n"
@@ -4764,7 +4778,7 @@ msgstr "Klucz może zostać unieważniony przez klucz %s użytkownika %s"
 msgid "(sensitive)"
 msgstr "(poufne)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:525
+#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "utworzono: %s"
@@ -4780,7 +4794,7 @@ msgid "expired: %s"
 msgstr "wygasł: %s"
 
 #: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2262
-#: g10/keyserver.c:531
+#: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "wygasa: %s"
@@ -4816,13 +4830,13 @@ 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:535
-#: g10/mainproc.c:2280 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
+#: g10/mainproc.c:2282 g10/tofu.c:1789 g10/trust.c:426 dirmngr/ocsp.c:792
 msgid "revoked"
 msgstr "unieważniony"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:539
-#: g10/mainproc.c:2282 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
+#: g10/mainproc.c:2284 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "wygasł"
 
@@ -4863,7 +4877,7 @@ msgstr "Czy dalej chcesz je dodać? (t/N) "
 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:3107
+#: g10/keyedit.c:4273 g10/keygen.c:3111
 msgid "Such a user ID already exists on this key!\n"
 msgstr "Taki identyfikator użytkownika już istnieje na tym kluczu!\n"
 
@@ -5007,7 +5021,7 @@ msgstr ""
 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:5357 g10/keyedit.c:5495
+#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "podpis w wersji 3 na identyfikatorze ,,%s'' zostaje pominięty\n"
@@ -5016,131 +5030,131 @@ msgstr "podpis w wersji 3 na identyfikatorze ,,%s'' zostaje pominięty\n"
 msgid "Enter your preferred keyserver URL: "
 msgstr "Podaj preferowany URL serwera kluczy: "
 
-#: g10/keyedit.c:5380
+#: g10/keyedit.c:5383
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Czy na pewno chcesz go zastąpić? (t/N) "
 
-#: g10/keyedit.c:5381
+#: g10/keyedit.c:5384
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Czy na pewno chcesz go usunąć? (t/N) "
 
-#: g10/keyedit.c:5441
+#: g10/keyedit.c:5449
 msgid "Enter the notation: "
 msgstr "Adnotacje: "
 
-#: g10/keyedit.c:5588
+#: g10/keyedit.c:5596
 msgid "Proceed? (y/N) "
 msgstr "Kontynuować? (t/N) "
 
-#: g10/keyedit.c:5658
+#: g10/keyedit.c:5666
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Brak identyfikatora użytkownika o numerze %d.\n"
 
-#: g10/keyedit.c:5720
+#: g10/keyedit.c:5728
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Brak identyfikatora użytkownika o skrócie %s\n"
 
-#: g10/keyedit.c:5821
+#: g10/keyedit.c:5829
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Brak podklucza o identyfikatorze ,,%s''.\n"
 
-#: g10/keyedit.c:5843
+#: g10/keyedit.c:5851
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Brak podklucza o numerze %d.\n"
 
-#: g10/keyedit.c:5984
+#: g10/keyedit.c:5992
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "identyfikator użytkownika: ,,%s''\n"
 
-#: g10/keyedit.c:5987 g10/keyedit.c:6089 g10/keyedit.c:6137
+#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
 #, 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:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
+#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
 msgid " (non-exportable)"
 msgstr " (podpis nieeksportowalny) "
 
-#: g10/keyedit.c:5993
+#: g10/keyedit.c:6001
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Ważność tego klucza wygasła %s.\n"
 
-#: g10/keyedit.c:5998
+#: g10/keyedit.c:6006
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Czy dalej chcesz go unieważnić? (t/N) "
 
-#: g10/keyedit.c:6003
+#: g10/keyedit.c:6011
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Stworzyć certyfikat unieważnienia tego podpisu? (t/N) "
 
-#: g10/keyedit.c:6063
+#: g10/keyedit.c:6071
 #, 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:6092
+#: g10/keyedit.c:6100
 msgid " (non-revocable)"
 msgstr " (podpis nieunieważnialny) "
 
-#: g10/keyedit.c:6099
+#: g10/keyedit.c:6107
 #, 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:6124
+#: g10/keyedit.c:6132
 msgid "You are about to revoke these signatures:\n"
 msgstr "Czy na pewno chcesz unieważnić te podpisy:\n"
 
-#: g10/keyedit.c:6147
+#: g10/keyedit.c:6155
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Na pewno utworzyć certyfikaty unieważnienia ? (t/N) "
 
-#: g10/keyedit.c:6180
+#: g10/keyedit.c:6188
 #, c-format
 msgid "no secret key\n"
 msgstr "brak klucza tajnego\n"
 
-#: g10/keyedit.c:6228
+#: g10/keyedit.c:6236
 #, 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:6238
+#: g10/keyedit.c:6246
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "identyfikator użytkownika ,,%s'' został już unieważniony\n"
 
-#: g10/keyedit.c:6255
+#: g10/keyedit.c:6263
 #, 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:6351
+#: g10/keyedit.c:6359
 #, 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:6389
+#: g10/keyedit.c:6397
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Klucz %s jest już unieważniony.\n"
 
-#: g10/keyedit.c:6451
+#: g10/keyedit.c:6459
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Podklucz %s jest już unieważniony.\n"
 
-#: g10/keyedit.c:6548
+#: g10/keyedit.c:6556
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -5152,64 +5166,64 @@ msgstr ""
 msgid "invalid value for option '%s'\n"
 msgstr "błędna wartość dla opcji ,,%s''\n"
 
-#: g10/keygen.c:338
+#: g10/keygen.c:339
 #, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "ustawienie ,,%s'' powtarza siÄ™\n"
 
-#: g10/keygen.c:345
+#: g10/keygen.c:346
 #, c-format
 msgid "too many cipher preferences\n"
 msgstr "zbyt wiele ustawień szyfru\n"
 
-#: g10/keygen.c:347
+#: g10/keygen.c:348
 #, c-format
 msgid "too many digest preferences\n"
 msgstr "zbyt wiele ustawień funkcji skrótu\n"
 
-#: g10/keygen.c:349
+#: g10/keygen.c:350
 #, c-format
 msgid "too many compression preferences\n"
 msgstr "zbyt wiele ustawień kompresji\n"
 
-#: g10/keygen.c:351
+#: g10/keygen.c:352
 #, fuzzy, c-format
 #| msgid "too many cipher preferences\n"
 msgid "too many AEAD preferences\n"
 msgstr "zbyt wiele ustawień szyfru\n"
 
-#: g10/keygen.c:521
+#: g10/keygen.c:522
 #, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "niewłaściwy element ,,%s'' w tekście ustawień\n"
 
-#: g10/keygen.c:1130
+#: g10/keygen.c:1131
 #, c-format
 msgid "writing direct signature\n"
 msgstr "zapis podpisu bezpośredniego\n"
 
-#: g10/keygen.c:1176
+#: g10/keygen.c:1177
 #, c-format
 msgid "writing self signature\n"
 msgstr "zapis podpisu klucza nim samym\n"
 
-#: g10/keygen.c:1233
+#: g10/keygen.c:1234
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "zapis podpisu wiążącego klucz\n"
 
-#: g10/keygen.c:1598 g10/keygen.c:1603 g10/keygen.c:1655 g10/keygen.c:1660
-#: g10/keygen.c:1832 g10/keygen.c:1837
+#: g10/keygen.c:1599 g10/keygen.c:1604 g10/keygen.c:1656 g10/keygen.c:1661
+#: g10/keygen.c:1833 g10/keygen.c:1838
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "niewłaściwa długość klucza; wykorzystano %u bitów\n"
 
-#: g10/keygen.c:1609 g10/keygen.c:1666 g10/keygen.c:1674 g10/keygen.c:1843
+#: g10/keygen.c:1610 g10/keygen.c:1667 g10/keygen.c:1675 g10/keygen.c:1844
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "rozmiar klucza zaokrąglony w górę do %u bitów\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1701
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
@@ -5217,19 +5231,19 @@ msgstr ""
 "OSTRZEŻENIE: niektóre programy OpenPGP nie potrafią obsłużyć klucza RSA o "
 "tej długości skrótu\n"
 
-#: g10/keygen.c:1899
+#: g10/keygen.c:1900
 msgid "Sign"
 msgstr "Podpisywanie"
 
-#: g10/keygen.c:1902
+#: g10/keygen.c:1903
 msgid "Certify"
 msgstr "Certyfikowanie"
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1906
 msgid "Encrypt"
 msgstr "Szyfrowanie"
 
-#: g10/keygen.c:1908
+#: g10/keygen.c:1909
 msgid "Authenticate"
 msgstr "Uwierzytelnianie"
 
@@ -5243,180 +5257,180 @@ msgstr "Uwierzytelnianie"
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1929
+#: g10/keygen.c:1930
 msgid "SsEeAaQq"
 msgstr "PpSsUuZz"
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1967
 #, fuzzy, c-format
 #| msgid "Possible actions for a %s key: "
 msgid "Possible actions for this %s key: "
 msgstr "Możliwe akcje dla klucza %s: "
 
-#: g10/keygen.c:1973
+#: g10/keygen.c:1974
 msgid "Current allowed actions: "
 msgstr "Aktualnie dopuszczalne akcje: "
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1979
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Przełączenie możliwości podpisywania\n"
 
-#: g10/keygen.c:1981
+#: g10/keygen.c:1982
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Przełączenie możliwości szyfrowania\n"
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1985
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Przełączenie możliwości uwierzytelniania\n"
 
-#: g10/keygen.c:1987
+#: g10/keygen.c:1988
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Zakończenie\n"
 
-#: g10/keygen.c:2116
+#: g10/keygen.c:2117
 #, fuzzy, c-format
 #| msgid "   (%d) RSA and RSA (default)\n"
 msgid "   (%d) RSA and RSA%s\n"
 msgstr "   (%d) RSA i RSA (domyślne)\n"
 
-#: g10/keygen.c:2120
+#: g10/keygen.c:2121
 #, fuzzy, c-format
 #| msgid "   (%d) DSA and Elgamal\n"
 msgid "   (%d) DSA and Elgamal%s\n"
 msgstr "   (%d) DSA i Elgamala\n"
 
-#: g10/keygen.c:2123
+#: g10/keygen.c:2124
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "   (%d) DSA (sign only)%s\n"
 msgstr "   (%d) DSA (tylko do podpisywania)\n"
 
-#: g10/keygen.c:2125
+#: g10/keygen.c:2126
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (sign only)\n"
 msgid "   (%d) RSA (sign only)%s\n"
 msgstr "   (%d) RSA (tylko do podpisywania)\n"
 
-#: g10/keygen.c:2131
+#: g10/keygen.c:2132
 #, fuzzy, c-format
 #| msgid "   (%d) Elgamal (encrypt only)\n"
 msgid "   (%d) Elgamal (encrypt only)%s\n"
 msgstr "   (%d) Elgamala (tylko do szyfrowania)\n"
 
-#: g10/keygen.c:2133
+#: g10/keygen.c:2134
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (encrypt only)\n"
 msgid "   (%d) RSA (encrypt only)%s\n"
 msgstr "   (%d) RSA (tylko do szyfrowania)\n"
 
-#: g10/keygen.c:2139
+#: g10/keygen.c:2140
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (set your own capabilities)\n"
 msgid "   (%d) DSA (set your own capabilities)%s\n"
 msgstr "   (%d) DSA (możliwości do ustawienia)\n"
 
-#: g10/keygen.c:2141
+#: g10/keygen.c:2142
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (set your own capabilities)\n"
 msgid "   (%d) RSA (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (możliwości do ustawienia)\n"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2148
 #, fuzzy, c-format
 #| msgid "   (%d) sign, encrypt\n"
 msgid "   (%d) ECC (sign and encrypt)%s\n"
 msgstr "   (%d) podpisywanie, szyfrowanie\n"
 
-#: g10/keygen.c:2147 g10/keygen.c:2678
+#: g10/keygen.c:2148 g10/keygen.c:2679
 msgid " *default*"
 msgstr ""
 
-#: g10/keygen.c:2148
+#: g10/keygen.c:2149
 #, c-format
 msgid "  (%d) ECC (sign only)\n"
 msgstr "   (%d) ECC (tylko do podpisywania)\n"
 
-#: g10/keygen.c:2150
+#: g10/keygen.c:2151
 #, fuzzy, c-format
 #| msgid "  (%d) ECC (set your own capabilities)\n"
 msgid "  (%d) ECC (set your own capabilities)%s\n"
 msgstr "   (%d) ECC (możliwości do ustawienia)\n"
 
-#: g10/keygen.c:2152
+#: g10/keygen.c:2153
 #, fuzzy, c-format
 #| msgid "  (%d) ECC (encrypt only)\n"
 msgid "  (%d) ECC (encrypt only)%s\n"
 msgstr "   (%d) ECC (tylko do szyfrowania)\n"
 
-#: g10/keygen.c:2156
+#: g10/keygen.c:2157
 #, fuzzy, c-format
 #| msgid "  (%d) Existing key\n"
 msgid "  (%d) Existing key%s\n"
 msgstr "   (%d) IstniejÄ…cy klucz\n"
 
-#: g10/keygen.c:2158
+#: g10/keygen.c:2159
 #, fuzzy, c-format
 #| msgid "  (%d) Existing key from card\n"
 msgid "  (%d) Existing key from card%s\n"
 msgstr "  (%d) IstniejÄ…cy klucz z karty\n"
 
-#: g10/keygen.c:2254 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2255 sm/certreqgen-ui.c:203
 msgid "Enter the keygrip: "
 msgstr "Uchwyt klucza: "
 
-#: g10/keygen.c:2267 sm/certreqgen-ui.c:211 tools/gpg-card.c:2280
+#: g10/keygen.c:2268 sm/certreqgen-ui.c:211 tools/gpg-card.c:2297
 #, c-format
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr "Nieprawidłowy uchwyt klucza (oczekiwano 40 cyfr szesnastkowych)\n"
 
-#: g10/keygen.c:2269 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2270 sm/certreqgen-ui.c:213
 msgid "No key with this keygrip\n"
 msgstr "Brak klucza o tym uchwycie\n"
 
-#: g10/keygen.c:2288 g10/keygen.c:2298 g10/keygen.c:3440 g10/keygen.c:3451
+#: g10/keygen.c:2289 g10/keygen.c:2299 g10/keygen.c:3444 g10/keygen.c:3455
 #: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
 #, c-format
 msgid "error reading the card: %s\n"
 msgstr "błąd odczytu karty: %s\n"
 
-#: g10/keygen.c:2292 g10/keygen.c:3444 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2293 g10/keygen.c:3448 sm/certreqgen-ui.c:234
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "Numer seryjny karty: %s\n"
 
-#: g10/keygen.c:2311 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2312 sm/certreqgen-ui.c:246
 msgid "Available keys:\n"
 msgstr "Dostępne klucze:\n"
 
-#: g10/keygen.c:2504 g10/keygen.c:2518
+#: g10/keygen.c:2505 g10/keygen.c:2519
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr "zaokrąglono do %u bitów\n"
 
-#: g10/keygen.c:2559
+#: g10/keygen.c:2560
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "Klucze %s będą miały od %u do %u bitów długości.\n"
 
-#: g10/keygen.c:2567
+#: g10/keygen.c:2568
 #, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Jakiej długości podklucz wygenerować? (%u) "
 
-#: g10/keygen.c:2584 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2585 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Żądana długość klucza to %u bitów.\n"
 
-#: g10/keygen.c:2630
+#: g10/keygen.c:2631
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Proszę wybrać rodzaj krzywej eliptycznej:\n"
 
-#: g10/keygen.c:2819
+#: g10/keygen.c:2820
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5432,7 +5446,7 @@ msgstr ""
 "      <n>m = termin ważności klucza upływa za n miesięcy\n"
 "      <n>y = termin ważności klucza upływa za n lat\n"
 
-#: g10/keygen.c:2830
+#: g10/keygen.c:2831
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5448,38 +5462,38 @@ msgstr ""
 "      <n>m = termin ważności podpisu upływa za n miesięcy\n"
 "      <n>y = termin ważności podpisu upływa za n lat\n"
 
-#: g10/keygen.c:2853
+#: g10/keygen.c:2854
 msgid "Key is valid for? (0) "
 msgstr "Okres ważności klucza? (0) "
 
-#: g10/keygen.c:2858
+#: g10/keygen.c:2859
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Okres ważności podpisu? (%s) "
 
-#: g10/keygen.c:2871 g10/keygen.c:2896
+#: g10/keygen.c:2875 g10/keygen.c:2900
 msgid "invalid value\n"
 msgstr "niepoprawna wartość\n"
 
-#: g10/keygen.c:2878
+#: g10/keygen.c:2882
 msgid "Key does not expire at all\n"
 msgstr "Klucz nie wygaśnie w ogóle\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2883
 msgid "Signature does not expire at all\n"
 msgstr "Podpis nie wygaśnie w ogóle\n"
 
-#: g10/keygen.c:2884
+#: g10/keygen.c:2888
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Klucz traci ważność %s\n"
 
-#: g10/keygen.c:2885
+#: g10/keygen.c:2889
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Ważność podpisu wygasa %s\n"
 
-#: g10/keygen.c:2889
+#: g10/keygen.c:2893
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5487,11 +5501,11 @@ msgstr ""
 "Twój system nie potrafi pokazać daty po roku 2038.\n"
 "Niemniej daty do roku 2106 będą poprawnie obsługiwane.\n"
 
-#: g10/keygen.c:2902
+#: g10/keygen.c:2906
 msgid "Is this correct? (y/N) "
 msgstr "Czy wszystko siÄ™ zgadza (t/N)? "
 
-#: g10/keygen.c:2970
+#: g10/keygen.c:2974
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5505,7 +5519,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2985
+#: g10/keygen.c:2989
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5521,49 +5535,49 @@ msgstr ""
 "    \"Tadeusz Żeleński (Boy) <tzb@ziemianska.pl>\"\n"
 "\n"
 
-#: g10/keygen.c:3004
+#: g10/keygen.c:3008
 msgid "Real name: "
 msgstr "ImiÄ™ i nazwisko: "
 
-#: g10/keygen.c:3013
+#: g10/keygen.c:3017
 msgid "Invalid character in name\n"
 msgstr "Niewłaściwy znak w imieniu lub nazwisku\n"
 
-#: g10/keygen.c:3014
+#: g10/keygen.c:3018
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr "Znaki ,,%s'' i ,,%s'' nie mogą występować w inieniu ani nazwisku\n"
 
-#: g10/keygen.c:3018
+#: g10/keygen.c:3022
 msgid "Name may not start with a digit\n"
 msgstr "Imię lub nazwisko nie może zaczynać się od cyfry\n"
 
-#: g10/keygen.c:3021
+#: g10/keygen.c:3025
 msgid "Name must be at least 5 characters long\n"
 msgstr "Imię i nazwisko muszą mieć co najmniej 5 znaków długości.\n"
 
-#: g10/keygen.c:3031
+#: g10/keygen.c:3035
 msgid "Email address: "
 msgstr "Adres poczty elektronicznej: "
 
-#: g10/keygen.c:3037
+#: g10/keygen.c:3041
 msgid "Not a valid email address\n"
 msgstr "To nie jest poprawny adres poczty elektronicznej\n"
 
-#: g10/keygen.c:3046
+#: g10/keygen.c:3050
 msgid "Comment: "
 msgstr "Komentarz: "
 
-#: g10/keygen.c:3052
+#: g10/keygen.c:3056
 msgid "Invalid character in comment\n"
 msgstr "Niewłaściwy znak w komentarzu\n"
 
-#: g10/keygen.c:3088
+#: g10/keygen.c:3092
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr "Używany zestaw znaków: ,,%s''.\n"
 
-#: g10/keygen.c:3094
+#: g10/keygen.c:3098
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5574,7 +5588,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3099
+#: g10/keygen.c:3103
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Nie należy umieszczać adresu poczty elektronicznej w polu nazwiska czy\n"
@@ -5591,35 +5605,35 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3124
+#: g10/keygen.c:3128
 msgid "NnCcEeOoQq"
 msgstr "IiKkEeDdWw"
 
-#: g10/keygen.c:3134
+#: g10/keygen.c:3138
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Zmienić (I)mię/nazwisko, (K)omentarz, adres (E)mail, czy (W)yjść? "
 
-#: g10/keygen.c:3135
+#: g10/keygen.c:3139
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "Zmienić (I)mię/nazwisko, (K)omentarz, adres (E)mail, przejść (D)alej,\n"
 "czy (W)yjść z programu? "
 
-#: g10/keygen.c:3140
+#: g10/keygen.c:3144
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Zmienić (I)mię/nazwisko, adres (E)mail, czy (W)yjść? "
 
-#: g10/keygen.c:3141
+#: g10/keygen.c:3145
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr ""
 "Zmienić (I)mię/nazwisko, adres (E)mail, przejść (D)alej,\n"
 "czy (W)yjść z programu? "
 
-#: g10/keygen.c:3160
+#: g10/keygen.c:3164
 msgid "Please correct the error first\n"
 msgstr "Najpierw trzeba poprawić ten błąd\n"
 
-#: g10/keygen.c:3206
+#: g10/keygen.c:3210
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -5635,18 +5649,18 @@ msgstr ""
 "ilości\n"
 "entropii.\n"
 
-#: g10/keygen.c:3591
+#: g10/keygen.c:3595
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4590 g10/keygen.c:4663 g10/keygen.c:4681 g10/keygen.c:4710
-#: g10/keygen.c:5086 g10/keygen.c:5632 g10/keygen.c:5943 g10/keygen.c:6050
+#: g10/keygen.c:4594 g10/keygen.c:4667 g10/keygen.c:4685 g10/keygen.c:4714
+#: g10/keygen.c:5113 g10/keygen.c:5663 g10/keygen.c:5974 g10/keygen.c:6081
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generacja klucza nie powiodła się: %s\n"
 
-#: g10/keygen.c:4599
+#: g10/keygen.c:4603
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5657,66 +5671,66 @@ msgstr ""
 "    ,,%s''\n"
 "\n"
 
-#: g10/keygen.c:4601
+#: g10/keygen.c:4605
 msgid "Continue? (Y/n) "
 msgstr "Kontynuować? (T/n) "
 
-#: g10/keygen.c:4622
+#: g10/keygen.c:4626
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "klucz dla ,,%s'' już istnieje\n"
 
-#: g10/keygen.c:4627
+#: g10/keygen.c:4631
 msgid "Create anyway? (y/N) "
 msgstr "Utworzyć klucz mimo to? (t/N) "
 
-#: g10/keygen.c:4633
+#: g10/keygen.c:4637
 #, c-format
 msgid "creating anyway\n"
 msgstr "tworzenie mimo to\n"
 
-#: g10/keygen.c:5069
+#: g10/keygen.c:5096
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 "Uwaga: pełną funkcjonalność generowania klucza można uzyskać przez ,,%s "
 "%s''.\n"
 
-#: g10/keygen.c:5118
+#: g10/keygen.c:5145
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Procedura generacji klucza została anulowana.\n"
 
-#: g10/keygen.c:5178
+#: g10/keygen.c:5205
 #, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "nie można utworzyć pliku kopii zapasowej ,,%s'': %s\n"
 
-#: g10/keygen.c:5198
+#: g10/keygen.c:5225
 #, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "Uwaga: kopia zapasowa klucza karty zapisana do ,,%s''\n"
 
-#: g10/keygen.c:5359 g10/keygen.c:5561
+#: g10/keygen.c:5389 g10/keygen.c:5591
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr "zapis klucza publicznego w ,,%s''\n"
 
-#: g10/keygen.c:5555
+#: g10/keygen.c:5585
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy publicznych: %s\n"
 
-#: g10/keygen.c:5569
+#: g10/keygen.c:5599
 #, c-format
 msgid "error writing public keyring '%s': %s\n"
 msgstr "błąd podczas zapisu zbioru kluczy publicznych ,,%s'': %s\n"
 
-#: g10/keygen.c:5603
+#: g10/keygen.c:5634
 msgid "public and secret key created and signed.\n"
 msgstr "klucz publiczny i prywatny (tajny) zostały utworzone i podpisane.\n"
 
-#: g10/keygen.c:5619
+#: g10/keygen.c:5650
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -5724,7 +5738,7 @@ msgstr ""
 "Ten klucz nie może być wykorzystany do szyfrowania. Komendą \"--edit-key\"\n"
 "można dodać do niego podklucz szyfrujący.\n"
 
-#: g10/keygen.c:5801 g10/keygen.c:6000
+#: g10/keygen.c:5832 g10/keygen.c:6031
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5732,7 +5746,7 @@ msgstr ""
 "klucz został stworzony %lu sekundę w przyszłości (zaburzenia\n"
 "czasoprzestrzeni, lub źle ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:5803 g10/keygen.c:6002
+#: g10/keygen.c:5834 g10/keygen.c:6033
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5740,23 +5754,23 @@ msgstr ""
 "klucz został stworzony %lu sekund w przyszłości (zaburzenia\n"
 "czasoprzestrzeni, lub źle ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:5814 g10/keygen.c:6013
+#: g10/keygen.c:5845 g10/keygen.c:6044
 #, c-format
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "Uwaga: tworzenie podkluczy dla kluczy wersji 3 jest niezgodne z OpenPGP.\n"
 
-#: g10/keygen.c:5826 g10/keygen.c:5828
+#: g10/keygen.c:5857 g10/keygen.c:5859
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Część tajna głównego klucza jest niedostępna.\n"
 
-#: g10/keygen.c:5835 g10/keygen.c:5837
+#: g10/keygen.c:5866 g10/keygen.c:5868
 #, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Część tajna głównego klucza jest zapisana na karcie.\n"
 
-#: g10/keygen.c:5857 g10/keygen.c:6027
+#: g10/keygen.c:5888 g10/keygen.c:6058
 msgid "Really create? (y/N) "
 msgstr "Czy na pewno utworzyć? (t/N) "
 
@@ -5838,12 +5852,12 @@ msgstr "       Odcisk klucza ="
 msgid "      Card serial no. ="
 msgstr "    Nr seryjny karty ="
 
-#: g10/keyring.c:1467
+#: g10/keyring.c:1477
 #, c-format
 msgid "caching keyring '%s'\n"
 msgstr "buforowanie zbioru kluczy ,,%s''\n"
 
-#: g10/keyring.c:1541
+#: g10/keyring.c:1551
 #, c-format
 msgid "%lu keys cached so far (%lu signature)\n"
 msgid_plural "%lu keys cached so far (%lu signatures)\n"
@@ -5851,7 +5865,7 @@ msgstr[0] "%lu kluczy zbuforowano do tej pory (%lu podpis)\n"
 msgstr[1] "%lu kluczy zbuforowano do tej pory (%lu podpisy)\n"
 msgstr[2] "%lu kluczy zbuforowano do tej pory (%lu podpisów)\n"
 
-#: g10/keyring.c:1557
+#: g10/keyring.c:1567
 #, c-format
 msgid "%lu key cached"
 msgid_plural "%lu keys cached"
@@ -5859,7 +5873,7 @@ msgstr[0] "%lu klucz zbuforowany"
 msgstr[1] "%lu klucze zbuforowane"
 msgstr[2] "%lu kluczy zbuforowanych"
 
-#: g10/keyring.c:1559
+#: g10/keyring.c:1569
 #, c-format
 msgid " (%lu signature)\n"
 msgid_plural " (%lu signatures)\n"
@@ -5867,7 +5881,7 @@ msgstr[0] " (%lu podpis)\n"
 msgstr[1] " (%lu podpisy)\n"
 msgstr[2] " (%lu podpisów)\n"
 
-#: g10/keyring.c:1636
+#: g10/keyring.c:1646
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: zbiór kluczy utworzony\n"
@@ -5896,25 +5910,25 @@ msgstr "automatyczne pobieranie kluczy przy sprawdzaniu podpisów"
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "honorowanie URL-a preferowanego serwera kluczy ustawionego w kluczu"
 
-#: g10/keyserver.c:537
+#: g10/keyserver.c:360
 msgid "disabled"
 msgstr "wyłączony"
 
-#: g10/keyserver.c:740
+#: g10/keyserver.c:563
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Wprowadź numer(y), N)astępny lub Q)uit > "
 
-#: g10/keyserver.c:846
+#: g10/keyserver.c:669
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "niepoprawny protokół serwera kluczy (nasz %d != moduł obsługi %d)\n"
 
-#: g10/keyserver.c:986 g10/keyserver.c:1096
+#: g10/keyserver.c:809 g10/keyserver.c:919
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ",,%s'' nie jest identyfikatorem klucza - pominięto\n"
 
-#: g10/keyserver.c:1420 g10/keyserver.c:1453
+#: g10/keyserver.c:1217 g10/keyserver.c:1250
 #, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
@@ -5922,52 +5936,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:1427
+#: g10/keyserver.c:1224
 #, 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:1531
+#: g10/keyserver.c:1316
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "klucz ,,%s'' nie został odnaleziony na serwerze kluczy\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1319
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "klucz nie został odnaleziony na serwerze kluczy\n"
 
-#: g10/keyserver.c:1722
-#, c-format
-msgid "requesting key %s from %s server %s\n"
-msgstr "zapytanie o klucz %s z serwera %s %s\n"
-
-#: g10/keyserver.c:1726
+#: g10/keyserver.c:1481
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "zapytanie o klucz %s z %s\n"
 
-#: g10/keyserver.c:1841 g10/keyserver.c:2020
+#: g10/keyserver.c:1600 g10/keyserver.c:1793
 #, c-format
 msgid "no keyserver known\n"
 msgstr "brak znanego serwera kluczy\n"
 
-#: g10/keyserver.c:1856 g10/skclist.c:213 g10/skclist.c:241
+#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "pominięty ,,%s'': %s\n"
 
-#: g10/keyserver.c:1860
+#: g10/keyserver.c:1619
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "wysyłanie klucza %s na %s\n"
 
-#: g10/keyserver.c:1901
+#: g10/keyserver.c:1662
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr "zapytanie o klucz z ,,%s''\n"
 
-#: g10/keyserver.c:1917
+#: g10/keyserver.c:1680
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "OSTRZEŻENIE: nie można pobrać URI %s: %s\n"
@@ -5994,69 +6003,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:472
+#: g10/mainproc.c:473
 #, c-format
 msgid "public key is %s\n"
 msgstr "klucz publiczny to %s\n"
 
-#: g10/mainproc.c:524
+#: g10/mainproc.c:525
 #, 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:528 g10/pkclist.c:231
+#: g10/mainproc.c:529 g10/pkclist.c:231
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      ,,%s''\n"
 
-#: g10/mainproc.c:532
+#: g10/mainproc.c:533
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "zaszyfrowano kluczem %s o identyfikatorze %s\n"
 
-#: g10/mainproc.c:552 g10/mainproc.c:935
+#: g10/mainproc.c:553 g10/mainproc.c:937
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "OSTRZEŻENIE: widziano wiele czystych tekstów\n"
 
-#: g10/mainproc.c:560
+#: g10/mainproc.c:561
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "zaszyfrowane za pomocą %lu haseł\n"
 
-#: g10/mainproc.c:562
+#: g10/mainproc.c:563
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "zaszyfrowane jednym hasłem\n"
 
-#: g10/mainproc.c:577 g10/mainproc.c:602
+#: g10/mainproc.c:578 g10/mainproc.c:603
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "błąd odszyfrowywania kluczem publicznym: %s\n"
 
-#: g10/mainproc.c:613
+#: g10/mainproc.c:614
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "dane zaszyfrowane kluczem publicznym: poprawny klucz sesyjny\n"
 
-#: g10/mainproc.c:642 g10/mainproc.c:663
+#: g10/mainproc.c:643 g10/mainproc.c:664
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "przyjmując że dane zostały zaszyfrowane za pomocą %s\n"
 
-#: g10/mainproc.c:649
+#: g10/mainproc.c:650
 #, 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:742 g10/mainproc.c:780
+#: g10/mainproc.c:744 g10/mainproc.c:782
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "OSTRZEŻENIE: wiadomość nie była zabezpieczona przed manipulacją\n"
 
-#: g10/mainproc.c:753
+#: g10/mainproc.c:755
 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"
@@ -6066,182 +6075,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:756
+#: g10/mainproc.c:758
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr "Użycie mimo to opcji ,,%s'' do odszyfrowania.\n"
 
-#: g10/mainproc.c:761
+#: g10/mainproc.c:763
 #, c-format
 msgid "decryption forced to fail!\n"
 msgstr "wymuszono błąd odszyfrowywania!\n"
 
-#: g10/mainproc.c:773
+#: g10/mainproc.c:775
 #, c-format
 msgid "decryption okay\n"
 msgstr "odszyfrowanie poprawne\n"
 
-#: g10/mainproc.c:786
+#: g10/mainproc.c:788
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "OSTRZEŻENIE: zaszyfrowana wiadomość była manipulowana!\n"
 
-#: g10/mainproc.c:804
+#: g10/mainproc.c:806
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "błąd odszyfrowywania: %s\n"
 
-#: g10/mainproc.c:851
+#: g10/mainproc.c:853
 #, 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:858
+#: g10/mainproc.c:860
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "pierwotna nazwa pliku='%.*s'\n"
 
-#: g10/mainproc.c:1135
+#: g10/mainproc.c:1137
 #, 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:1440 g10/mainproc.c:1483
+#: g10/mainproc.c:1442 g10/mainproc.c:1485
 #, c-format
 msgid "no signature found\n"
 msgstr "nie znaleziono podpisu\n"
 
-#: g10/mainproc.c:1763
+#: g10/mainproc.c:1765
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "NIEPOPRAWNY podpis złożony przez ,,%s''"
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1767
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Przeterminowany podpis złożony przez ,,%s''"
 
-#: g10/mainproc.c:1767
+#: g10/mainproc.c:1769
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Poprawny podpis złożony przez ,,%s''"
 
-#: g10/mainproc.c:1789
+#: g10/mainproc.c:1791
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "wymuszono pominięcie sprawdzenia podpisu\n"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1905
 #, 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:1919 g10/mainproc.c:1926
+#: g10/mainproc.c:1921 g10/mainproc.c:1928
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Podpisano w %s\n"
 
-#: g10/mainproc.c:1920 g10/mainproc.c:1927 sm/verify.c:480
+#: g10/mainproc.c:1922 g10/mainproc.c:1929 sm/verify.c:480
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               przy użyciu klucza %s %s\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1933
 #, 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:1937
+#: g10/mainproc.c:1939
 #, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "                        wystawca ,,%s''\n"
 
-#: g10/mainproc.c:1992
+#: g10/mainproc.c:1994
 #, c-format
 msgid "Key available at: "
 msgstr "Klucz dostępny w: "
 
-#: g10/mainproc.c:2034
+#: g10/mainproc.c:2036
 #, 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:2234
+#: g10/mainproc.c:2236
 msgid "[uncertain]"
 msgstr "[niepewne]"
 
-#: g10/mainproc.c:2272
+#: g10/mainproc.c:2274
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                        alias ,,%s''"
 
-#: g10/mainproc.c:2347
+#: g10/mainproc.c:2349
 #, 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:2363
+#: g10/mainproc.c:2365
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Ważność podpisu wygasła %s.\n"
 
-#: g10/mainproc.c:2368
+#: g10/mainproc.c:2370
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Ważność podpisu wygasa %s.\n"
 
-#: g10/mainproc.c:2379
+#: g10/mainproc.c:2381
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "podpis %s, algorytm skrótu %s%s%s\n"
 
-#: g10/mainproc.c:2380
+#: g10/mainproc.c:2382
 msgid "binary"
 msgstr "binarny"
 
-#: g10/mainproc.c:2381
+#: g10/mainproc.c:2383
 msgid "textmode"
 msgstr "tekstowy"
 
-#: g10/mainproc.c:2381 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2383 g10/trust.c:112 dirmngr/ocsp.c:793
 msgid "unknown"
 msgstr "nieznany"
 
-#: g10/mainproc.c:2383
+#: g10/mainproc.c:2385
 msgid ", key algorithm "
 msgstr ", algorytm klucza "
 
-#: g10/mainproc.c:2418
+#: g10/mainproc.c:2420
 #, 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:2457
+#: g10/mainproc.c:2459
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nie można sprawdzić podpisu: %s\n"
 
-#: g10/mainproc.c:2553 g10/mainproc.c:2572 g10/mainproc.c:2696
+#: g10/mainproc.c:2555 g10/mainproc.c:2574 g10/mainproc.c:2698
 #, c-format
 msgid "not a detached signature\n"
 msgstr "nie jest oddzielonym podpisem.\n"
 
-#: g10/mainproc.c:2606
+#: g10/mainproc.c:2608
 #, 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:2615
+#: g10/mainproc.c:2617
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "oddzielony podpis klasy 0x%02x.\n"
 
-#: g10/mainproc.c:2700
+#: g10/mainproc.c:2702
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis starego typu (PGP 2.x).\n"
@@ -6430,46 +6439,52 @@ msgstr "Nieznane krytyczne adnotacje podpisu: "
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpakiet typu %d ma ustawiony krytyczny bit\n"
 
-#: g10/passphrase.c:208
+#: g10/passphrase.c:201 sm/decrypt.c:669
+#, fuzzy
+#| msgid "Please enter the new passphrase"
+msgid "Please enter the passphrase for decryption."
+msgstr "Proszę wprowadzić nowe hasło"
+
+#: g10/passphrase.c:203
 msgid "Enter passphrase\n"
 msgstr "Hasło\n"
 
-#: g10/passphrase.c:219
+#: g10/passphrase.c:227
 #, c-format
 msgid "cancelled by user\n"
 msgstr "anulowano przez użytkownika\n"
 
-#: g10/passphrase.c:460
+#: g10/passphrase.c:472
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (ID głównego klucza %s)"
 
-#: g10/passphrase.c:467
+#: g10/passphrase.c:479
 msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 msgstr "Proszę wprowadzić hasło do odbezpieczenia klucza prywatnego OpenPGP:"
 
-#: g10/passphrase.c:471
+#: g10/passphrase.c:483
 msgid "Please enter the passphrase to import the OpenPGP secret key:"
 msgstr "Proszę wprowadzić hasło do zaimportowania klucza prywatnego OpenPGP:"
 
-#: g10/passphrase.c:476
+#: g10/passphrase.c:488
 msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 msgstr ""
 "Proszę wprowadzić hasło do wyeksportowania podklucza prywatnego OpenPGP:"
 
-#: g10/passphrase.c:479
+#: g10/passphrase.c:491
 msgid "Please enter the passphrase to export the OpenPGP secret key:"
 msgstr "Proszę wprowadzić hasło do wyeksportowania klucza prywatnego OpenPGP:"
 
-#: g10/passphrase.c:484
+#: g10/passphrase.c:496
 msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 msgstr "Czy na pewno trwale usunąć podklucz prywatny OpenPGP:"
 
-#: g10/passphrase.c:487
+#: g10/passphrase.c:499
 msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgstr "Czy na pewno trwale usunąć klucz prywatny OpenPGP:"
 
-#: g10/passphrase.c:496
+#: g10/passphrase.c:508
 #, c-format
 msgid ""
 "%s\n"
@@ -6638,7 +6653,7 @@ msgstr ""
 "Minimalny poziom zaufania dla tego klucza to: %s\n"
 "\n"
 
-#: g10/pkclist.c:313 g10/revoke.c:803
+#: g10/pkclist.c:313 g10/revoke.c:804
 msgid "Your decision? "
 msgstr "Decyzja? "
 
@@ -6935,7 +6950,7 @@ msgstr "nie można otworzyć podpisanego pliku ,,%s''\n"
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "nie można otworzyć podpisanych danych z fd=%d: %s\n"
 
-#: g10/pubkey-enc.c:99 sm/decrypt.c:879
+#: g10/pubkey-enc.c:99 sm/decrypt.c:1329
 #, c-format
 msgid "key %s is not suitable for decryption in %s mode\n"
 msgstr "klucz %s nie nadaje siÄ™ do odszyfrowywania w trybie %s\n"
@@ -6982,7 +6997,7 @@ msgid "Note: key has been revoked"
 msgstr "Uwaga: klucz został unieważniony"
 
 #: g10/revoke.c:100 g10/revoke.c:126 g10/revoke.c:172 g10/revoke.c:184
-#: g10/revoke.c:502
+#: g10/revoke.c:503
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "wywołanie funkcji build_packet nie powiodło się: %s\n"
@@ -7008,11 +7023,11 @@ msgstr "Klucz tajny nie jest dostępny.\n"
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Stworzyć certyfikat unieważnienia tego klucza? (t/N) "
 
-#: g10/revoke.c:334 g10/revoke.c:744
+#: g10/revoke.c:334 g10/revoke.c:745
 msgid "ASCII armored output forced.\n"
 msgstr "wymuszono opakowanie ASCII wyniku.\n"
 
-#: g10/revoke.c:350 g10/revoke.c:481
+#: g10/revoke.c:350 g10/revoke.c:482
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "wywołanie funkcji make_keysig_packet nie powiodło się: %s\n"
@@ -7026,11 +7041,11 @@ msgstr "Certyfikat unieważnienia został utworzony.\n"
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "brak kluczy unieważniających dla ,,%s''\n"
 
-#: g10/revoke.c:567
+#: g10/revoke.c:568
 msgid "This is a revocation certificate for the OpenPGP key:"
 msgstr "To certyfikat unieważnienia dla klucza OpenPGP:"
 
-#: g10/revoke.c:583
+#: g10/revoke.c:584
 msgid ""
 "A revocation certificate is a kind of \"kill switch\" to publicly\n"
 "declare that a key shall not anymore be used.  It is not possible\n"
@@ -7041,7 +7056,7 @@ msgstr ""
 "używany. Po opublikowaniu takiego certyfikatu nie jest już możliwe\n"
 "wycofanie go."
 
-#: g10/revoke.c:586
+#: g10/revoke.c:587
 msgid ""
 "Use it to revoke this key in case of a compromise or loss of\n"
 "the secret key.  However, if the secret key is still accessible,\n"
@@ -7055,7 +7070,7 @@ msgstr ""
 "unieważnienia. Więcej szczegółów w opisie polecenia gpg\n"
 ",,--generate-revocation'' w podręczniku do GnuPG."
 
-#: g10/revoke.c:592
+#: g10/revoke.c:593
 msgid ""
 "To avoid an accidental use of this file, a colon has been inserted\n"
 "before the 5 dashes below.  Remove this colon with a text editor\n"
@@ -7066,12 +7081,12 @@ msgstr ""
 "tekstu przed zaimportowaniem i opublikowaniem tego certyfikatu\n"
 "unieważnienia."
 
-#: g10/revoke.c:611
+#: g10/revoke.c:612
 #, c-format
 msgid "revocation certificate stored as '%s.rev'\n"
 msgstr "certyfikat unieważnienia został zapisany jako ,,%s.rev''\n"
 
-#: g10/revoke.c:655
+#: g10/revoke.c:656
 #, c-format
 msgid "secret key \"%s\" not found\n"
 msgstr "klucz prywatny ,,%s'' nie został odnaleziony\n"
@@ -7079,21 +7094,21 @@ msgstr "klucz prywatny ,,%s'' nie został odnaleziony\n"
 #. TRANSLATORS: The %s prints a key specification which
 #. for example has been given at the command line.  Several lines
 #. lines with secret key infos are printed after this message.
-#: g10/revoke.c:680
+#: g10/revoke.c:681
 #, c-format
 msgid "'%s' matches multiple secret keys:\n"
 msgstr ",,%s'' pasuje do wielu kluczy tajnych:\n"
 
-#: g10/revoke.c:705
+#: g10/revoke.c:706
 #, c-format
 msgid "error searching the keyring: %s\n"
 msgstr "błąd przeszukiwania zbioru kluczy: %s\n"
 
-#: g10/revoke.c:728
+#: g10/revoke.c:729
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Stworzyć certyfikat unieważnienia tego klucza? (t/N) "
 
-#: g10/revoke.c:752
+#: g10/revoke.c:753
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -7117,33 +7132,33 @@ msgstr ""
 "komputerów mogą zachować treść wydruku i udostępnić ją osobom "
 "nieupoważnionym.\n"
 
-#: g10/revoke.c:786
+#: g10/revoke.c:787
 msgid "Please select the reason for the revocation:\n"
 msgstr "Proszę wybrać powód unieważnienia:\n"
 
-#: g10/revoke.c:796
+#: g10/revoke.c:797
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: g10/revoke.c:798
+#: g10/revoke.c:799
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Prawdopodobnie chcesz tu wybrać %d)\n"
 
-#: g10/revoke.c:839
+#: g10/revoke.c:843
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Wprowadź opis (nieobowiązkowy) i zakończ go pustą linią:\n"
 
-#: g10/revoke.c:867
+#: g10/revoke.c:871
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Powód unieważnienia: %s\n"
 
-#: g10/revoke.c:869
+#: g10/revoke.c:873
 msgid "(No description given)\n"
 msgstr "(nie podano)\n"
 
-#: g10/revoke.c:874
+#: g10/revoke.c:878
 msgid "Is this okay? (y/N) "
 msgstr "Informacje poprawne? (t/N) "
 
@@ -7327,24 +7342,24 @@ msgstr "podpis:"
 msgid "%s.%s encryption will be used\n"
 msgstr "zostanie użyty szyfr %s\n"
 
-#: g10/skclist.c:172 g10/skclist.c:253
+#: g10/skclist.c:173 g10/skclist.c:254
 #, c-format
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "klucz nie jest oznaczony jako niepewny - nie można go użyć z atrapą\n"
 "generatora liczb losowych!\n"
 
-#: g10/skclist.c:204
+#: g10/skclist.c:205
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "pominięty ,,%s'': duplikat\n"
 
-#: g10/skclist.c:223
+#: g10/skclist.c:224
 #, c-format
 msgid "skipped: secret key already present\n"
 msgstr "pominięty: klucz prywatny jest już wpisany\n"
 
-#: g10/skclist.c:242
+#: g10/skclist.c:243
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "klucz algorytmu Elgamala wygenerowany przez PGP nie zapewniajÄ…cy "
@@ -7566,10 +7581,10 @@ msgstr "nieobsługiwana wersja bazy danych TOFU: %s\n"
 msgid "TOFU DB error"
 msgstr "BÅ‚Ä…d bazy danych TOFU"
 
-#: g10/tofu.c:687 g10/tofu.c:2073 g10/tofu.c:2354 g10/tofu.c:2373
-#: g10/tofu.c:2386 g10/tofu.c:2398 g10/tofu.c:2413 g10/tofu.c:2425
-#: g10/tofu.c:3021 g10/tofu.c:3038 g10/tofu.c:3075 g10/tofu.c:3092
-#: g10/tofu.c:3404
+#: g10/tofu.c:687 g10/tofu.c:2077 g10/tofu.c:2358 g10/tofu.c:2377
+#: g10/tofu.c:2390 g10/tofu.c:2402 g10/tofu.c:2417 g10/tofu.c:2429
+#: g10/tofu.c:3025 g10/tofu.c:3042 g10/tofu.c:3079 g10/tofu.c:3096
+#: g10/tofu.c:3408
 #, c-format
 msgid "error reading TOFU database: %s\n"
 msgstr "błąd odczytu bazy danych TOFU: %s\n"
@@ -7589,7 +7604,7 @@ msgstr "błąd inicjowania bazy danych TOFU: %s\n"
 msgid "error opening TOFU database '%s': %s\n"
 msgstr "błąd otwierania bazy danych TOFU ,,%s'': %s\n"
 
-#: g10/tofu.c:1148 g10/tofu.c:3458 g10/tofu.c:3604
+#: g10/tofu.c:1148 g10/tofu.c:3462 g10/tofu.c:3608
 #, c-format
 msgid "error updating TOFU database: %s\n"
 msgstr "błąd uaktualniania bazy danych TOFU: %s\n"
@@ -7632,17 +7647,17 @@ msgstr "błąd zbierania ID innych użytkowników: %s\n"
 msgid "This key's user IDs:\n"
 msgstr "ID użytkowników tego klucza:\n"
 
-#: g10/tofu.c:1634 g10/tofu.c:1799
+#: g10/tofu.c:1634 g10/tofu.c:1801
 #, c-format
 msgid "policy: %s"
 msgstr "polityka: %s"
 
-#: g10/tofu.c:1725
+#: g10/tofu.c:1727
 #, c-format
 msgid "error gathering signature stats: %s\n"
 msgstr "błąd zbierania statystyk podpisów: %s\n"
 
-#: g10/tofu.c:1729
+#: g10/tofu.c:1731
 #, c-format
 msgid "The email address \"%s\" is associated with %d key:\n"
 msgid_plural "The email address \"%s\" is associated with %d keys:\n"
@@ -7650,16 +7665,16 @@ msgstr[0] "Adres e-mail ,,%s'' jest powiÄ…zany z %d kluczem:\n"
 msgstr[1] "Adres e-mail ,,%s'' jest powiÄ…zany z %d kluczami:\n"
 msgstr[2] "Adres e-mail ,,%s'' jest powiÄ…zany z %d kluczami:\n"
 
-#: g10/tofu.c:1747
+#: g10/tofu.c:1749
 #, c-format
 msgid "Statistics for keys with the email address \"%s\":\n"
 msgstr "Statystyki dla kluczy o adresie e-mail ,,%s'':\n"
 
-#: g10/tofu.c:1797
+#: g10/tofu.c:1799
 msgid "this key"
 msgstr "ten klucz"
 
-#: g10/tofu.c:1823
+#: g10/tofu.c:1825
 #, c-format
 msgid "Verified %d message."
 msgid_plural "Verified %d messages."
@@ -7667,7 +7682,7 @@ msgstr[0] "Sprawdzono %d wiadomość."
 msgstr[1] "Sprawdzono %d wiadomości."
 msgstr[2] "Sprawdzono %d wiadomości."
 
-#: g10/tofu.c:1827
+#: g10/tofu.c:1829
 #, c-format
 msgid "Encrypted %d message."
 msgid_plural "Encrypted %d messages."
@@ -7675,7 +7690,7 @@ msgstr[0] "Zaszyfrowano %d wiadomość."
 msgstr[1] "Zaszyfrowano %d wiadomości."
 msgstr[2] "Zaszyfrowano %d wiadomości."
 
-#: g10/tofu.c:1834
+#: g10/tofu.c:1836
 #, c-format
 msgid "Verified %d message in the future."
 msgid_plural "Verified %d messages in the future."
@@ -7683,7 +7698,7 @@ msgstr[0] "Sprawdzono %d wiadomość w przyszłości."
 msgstr[1] "Sprawdzono %d wiadomości w przyszłości."
 msgstr[2] "Sprawdzono %d wiadomości w przyszłości."
 
-#: g10/tofu.c:1838
+#: g10/tofu.c:1840
 #, c-format
 msgid "Encrypted %d message in the future."
 msgid_plural "Encrypted %d messages in the future."
@@ -7691,7 +7706,7 @@ msgstr[0] "Zaszyfrowano %d wiadomość w przyszłości."
 msgstr[1] "Zaszyfrowano %d wiadomości w przyszłości."
 msgstr[2] "Zaszyfrowano %d wiadomości w przyszłości."
 
-#: g10/tofu.c:1852
+#: g10/tofu.c:1854
 #, c-format
 msgid "Messages verified over the past %d day: %d."
 msgid_plural "Messages verified over the past %d days: %d."
@@ -7699,7 +7714,7 @@ msgstr[0] "Wiadomości sprawdzonych przez ostatni %d dzień: %d."
 msgstr[1] "Wiadomości sprawdzonych przez ostatnie %d dni: %d."
 msgstr[2] "Wiadomości sprawdzonych przez ostatnie %d dni: %d."
 
-#: g10/tofu.c:1858
+#: g10/tofu.c:1860
 #, c-format
 msgid "Messages encrypted over the past %d day: %d."
 msgid_plural "Messages encrypted over the past %d days: %d."
@@ -7707,7 +7722,7 @@ msgstr[0] "Wiadomości zaszyfrowanych przez ostatni %d dzień: %d."
 msgstr[1] "Wiadomości zaszyfrowanych przez ostatnie %d dni: %d."
 msgstr[2] "Wiadomości zaszyfrowanych przez ostatnie %d dni: %d."
 
-#: g10/tofu.c:1868
+#: g10/tofu.c:1870
 #, c-format
 msgid "Messages verified over the past %d month: %d."
 msgid_plural "Messages verified over the past %d months: %d."
@@ -7715,7 +7730,7 @@ msgstr[0] "Wiadomości sprawdzonych przez ostatni %d miesiąc: %d."
 msgstr[1] "Wiadomości sprawdzonych przez ostatnie %d miesiące: %d."
 msgstr[2] "Wiadomości sprawdzonych przez ostatnie %d miesięcy: %d."
 
-#: g10/tofu.c:1874
+#: g10/tofu.c:1876
 #, c-format
 msgid "Messages encrypted over the past %d month: %d."
 msgid_plural "Messages encrypted over the past %d months: %d."
@@ -7723,7 +7738,7 @@ msgstr[0] "Wiadomości zaszyfrowanych przez ostatni %d miesiąc: %d."
 msgstr[1] "Wiadomości zaszyfrowanych przez ostatnie %d miesiące: %d."
 msgstr[2] "Wiadomości zaszyfrowanych przez ostatnie %d miesięcy: %d."
 
-#: g10/tofu.c:1884
+#: g10/tofu.c:1886
 #, c-format
 msgid "Messages verified over the past %d year: %d."
 msgid_plural "Messages verified over the past %d years: %d."
@@ -7731,7 +7746,7 @@ msgstr[0] "Wiadomości sprawdzonych przez ostatni %d rok: %d."
 msgstr[1] "Wiadomości sprawdzonych przez ostatnie %d lata: %d."
 msgstr[2] "Wiadomości sprawdzonych przez ostatnie %d lat: %d."
 
-#: g10/tofu.c:1890
+#: g10/tofu.c:1892
 #, c-format
 msgid "Messages encrypted over the past %d year: %d."
 msgid_plural "Messages encrypted over the past %d years: %d."
@@ -7739,12 +7754,12 @@ msgstr[0] "Wiadomości zaszyfrowanych przez ostatni %d rok: %d."
 msgstr[1] "Wiadomości zaszyfrowanych przez ostatnie %d lata: %d."
 msgstr[2] "Wiadomości zaszyfrowanych przez ostatnie %d lat: %d."
 
-#: g10/tofu.c:1898
+#: g10/tofu.c:1900
 #, c-format
 msgid "Messages verified in the past: %d."
 msgstr "Wiadomości sprawdzonych w przeszłości: %d."
 
-#: g10/tofu.c:1902
+#: g10/tofu.c:1904
 #, c-format
 msgid "Messages encrypted in the past: %d."
 msgstr "Wiadomości zaszyfrowanych w przeszłości: %d."
@@ -7752,7 +7767,7 @@ msgstr "Wiadomości zaszyfrowanych w przeszłości: %d."
 #. TRANSLATORS: Please translate the text found in the source
 #. * file below.  We don't directly internationalize that text so
 #. * that we can tweak it without breaking translations.
-#: g10/tofu.c:1919
+#: g10/tofu.c:1921
 msgid "TOFU detected a binding conflict"
 msgstr ""
 "Zwykle adres e-mail jest powiÄ…zany z pojedynczym kluczem. Jednak ludzie "
@@ -7764,29 +7779,29 @@ msgstr ""
 #. TRANSLATORS: Two letters (normally the lower and upper case
 #. * version of the hotkey) for each of the five choices.  If
 #. * there is only one choice in your language, repeat it.
-#: g10/tofu.c:1961
+#: g10/tofu.c:1963
 msgid "gGaAuUrRbB"
 msgstr "dDaAnNoOzZ"
 
-#: g10/tofu.c:1967
+#: g10/tofu.c:1969
 msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr "(D)obry, (A)kceptuj raz, (N)ieznany, (O)drzuć raz, (Z)ły? "
 
-#: g10/tofu.c:1975
+#: g10/tofu.c:1978
 msgid "Defaulting to unknown.\n"
 msgstr "Domyślnie nieznany.\n"
 
-#: g10/tofu.c:2093 g10/tofu.c:2228
+#: g10/tofu.c:2097 g10/tofu.c:2232
 #, c-format
 msgid "TOFU db corruption detected.\n"
 msgstr "Wykryto uszkodzenie bazy danych TOFU.\n"
 
-#: g10/tofu.c:2829
+#: g10/tofu.c:2833
 #, c-format
 msgid "error changing TOFU policy: %s\n"
 msgstr "błąd zmiany polityki TOFU: %s\n"
 
-#: g10/tofu.c:2880
+#: g10/tofu.c:2884
 #, c-format
 msgid "%lld~year"
 msgid_plural "%lld~years"
@@ -7794,7 +7809,7 @@ msgstr[0] "ostatni %lld~rok"
 msgstr[1] "ostatnie %lld~lata"
 msgstr[2] "ostatnie %lld~lat"
 
-#: g10/tofu.c:2885
+#: g10/tofu.c:2889
 #, c-format
 msgid "%lld~month"
 msgid_plural "%lld~months"
@@ -7802,7 +7817,7 @@ msgstr[0] "ostatni %lld~miesiÄ…c"
 msgstr[1] "ostatnie %lld~miesiÄ…ce"
 msgstr[2] "ostatnie %lld~miesięcy"
 
-#: g10/tofu.c:2890
+#: g10/tofu.c:2894
 #, c-format
 msgid "%lld~week"
 msgid_plural "%lld~weeks"
@@ -7810,7 +7825,7 @@ msgstr[0] "ostatni %lld~tydzień"
 msgstr[1] "ostatnie %lld~tygodnie"
 msgstr[2] "ostatnie %lld~tygodni"
 
-#: g10/tofu.c:2895
+#: g10/tofu.c:2899
 #, c-format
 msgid "%lld~day"
 msgid_plural "%lld~days"
@@ -7818,7 +7833,7 @@ msgstr[0] "ostatni %lld~dzień"
 msgstr[1] "ostatnie %lld~dni"
 msgstr[2] "ostatnie %lld~dni"
 
-#: g10/tofu.c:2900
+#: g10/tofu.c:2904
 #, c-format
 msgid "%lld~hour"
 msgid_plural "%lld~hours"
@@ -7826,7 +7841,7 @@ msgstr[0] "ostatniÄ… %lld~godzinÄ™"
 msgstr[1] "ostatnie %lld~godziny"
 msgstr[2] "ostatnie %lld~godzin"
 
-#: g10/tofu.c:2905
+#: g10/tofu.c:2909
 #, c-format
 msgid "%lld~minute"
 msgid_plural "%lld~minutes"
@@ -7834,7 +7849,7 @@ msgstr[0] "ostatniÄ… %lld~minutÄ™"
 msgstr[1] "ostatnie %lld~minuty"
 msgstr[2] "ostatnie %lld~minut"
 
-#: g10/tofu.c:2907
+#: g10/tofu.c:2911
 #, c-format
 msgid "%lld~second"
 msgid_plural "%lld~seconds"
@@ -7842,26 +7857,26 @@ msgstr[0] "ostatniÄ… %lld~sekundÄ™"
 msgstr[1] "ostatnie %lld~sekundy"
 msgstr[2] "ostatnie %lld~sekund"
 
-#: g10/tofu.c:3145
+#: g10/tofu.c:3149
 #, c-format
 msgid "%s: Verified 0~signatures and encrypted 0~messages."
 msgstr "%s: Sprawdzono 0~podpisów i zaszyfrowano 0~wiadomości."
 
-#: g10/tofu.c:3151
+#: g10/tofu.c:3155
 #, c-format
 msgid "%s: Verified 0 signatures."
 msgstr "%s Sprawdzono 0 podpisów."
 
-#: g10/tofu.c:3165
+#: g10/tofu.c:3169
 msgid "Encrypted 0 messages."
 msgstr "Zaszyfrowano 0 wiadomości."
 
-#: g10/tofu.c:3181
+#: g10/tofu.c:3185
 #, c-format
 msgid "(policy: %s)"
 msgstr "(polityka: %s)"
 
-#: g10/tofu.c:3215
+#: g10/tofu.c:3219
 #, c-format
 msgid ""
 "Warning: we have yet to see a message signed using this key and user id!\n"
@@ -7869,7 +7884,7 @@ msgstr ""
 "Ostrzeżenie: jeszcze nie widzieliśmy wiadomości podpisanej tym kluczem i "
 "identyfikatorem użytkownika!\n"
 
-#: g10/tofu.c:3218
+#: g10/tofu.c:3222
 #, c-format
 msgid ""
 "Warning: we've only seen one message signed using this key and user id!\n"
@@ -7877,17 +7892,17 @@ msgstr ""
 "Ostrzeżenie: widzieliśmy tylko jedną wiadomość podpisaną tym kluczem i "
 "identyfikatorem użytkownika!\n"
 
-#: g10/tofu.c:3222
+#: g10/tofu.c:3226
 #, c-format
 msgid "Warning: you have yet to encrypt a message to this key!\n"
 msgstr "Ostrzeżenie: jeszcze nie zaszyfrowano wiadomości tym kluczem!\n"
 
-#: g10/tofu.c:3225
+#: g10/tofu.c:3229
 #, c-format
 msgid "Warning: you have only encrypted one message to this key!\n"
 msgstr "Ostrzeżenie: zaszyfrowano tylko jedną wiadomość tym kluczem!\n"
 
-#: g10/tofu.c:3254
+#: g10/tofu.c:3258
 #, c-format
 msgid ""
 "Warning: if you think you've seen more signatures by this key and user id, "
@@ -7923,13 +7938,13 @@ msgstr[2] ""
 "  %s\n"
 "aby oznaczyć go jako zły.\n"
 
-#: g10/tofu.c:3339 g10/tofu.c:3502 g10/tofu.c:3708 g10/tofu.c:3761
-#: g10/tofu.c:3902 g10/tofu.c:3979 g10/tofu.c:4017
+#: g10/tofu.c:3343 g10/tofu.c:3506 g10/tofu.c:3712 g10/tofu.c:3765
+#: g10/tofu.c:3906 g10/tofu.c:3983 g10/tofu.c:4021
 #, c-format
 msgid "error opening TOFU database: %s\n"
 msgstr "błąd otwierania bazy danych TOFU: %s\n"
 
-#: g10/tofu.c:3535
+#: g10/tofu.c:3539
 #, c-format
 msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
 msgstr ""
@@ -7997,7 +8012,7 @@ msgstr "użycie modelu zaufania %s\n"
 msgid "no need for a trustdb check\n"
 msgstr "sprawdzanie bazy jest niepotrzebne\n"
 
-#: g10/trustdb.c:601 g10/trustdb.c:2272
+#: g10/trustdb.c:601 g10/trustdb.c:2273
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "następne sprawdzanie bazy odbędzie się %s\n"
@@ -8027,7 +8042,7 @@ msgstr "należy uruchomić gpg z opcją ,,--check-trustdb''\n"
 msgid "checking the trustdb\n"
 msgstr "sprawdzanie bazy zaufania\n"
 
-#: g10/trustdb.c:1993
+#: g10/trustdb.c:1994
 #, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
@@ -8035,7 +8050,7 @@ msgstr[0] "przetworzono %d klucz"
 msgstr[1] "przetworzono %d klucze"
 msgstr[2] "przetworzono %d kluczy"
 
-#: g10/trustdb.c:1996
+#: g10/trustdb.c:1997
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
@@ -8043,17 +8058,17 @@ msgstr[0] " (skasowano %d licznik zaufania)\n"
 msgstr[1] " (skasowano %d liczniki zaufania)\n"
 msgstr[2] " (skasowano %d liczników zaufania)\n"
 
-#: g10/trustdb.c:2066
+#: g10/trustdb.c:2067
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "brak absolutnie zaufanych kluczy\n"
 
-#: g10/trustdb.c:2080
+#: g10/trustdb.c:2081
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "klucz publiczny absolutnie zaufanego klucza %s nie odnaleziony\n"
 
-#: g10/trustdb.c:2198
+#: g10/trustdb.c:2199
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -8061,30 +8076,30 @@ msgstr ""
 "poziom: %d poprawnych: %3d podpisanych: %3d zaufanie: %d-,%dq,%dn,%dm,%df,"
 "%du\n"
 
-#: g10/trustdb.c:2279
+#: g10/trustdb.c:2280
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
 "nie można uaktualnić rekordu wersji bazy zaufania: zapis nie powiódł się: "
 "%s\n"
 
-#: g10/trust.c:125
+#: g10/trust.c:114
 msgid "undefined"
 msgstr "nieokreślone"
 
-#: g10/trust.c:126
+#: g10/trust.c:115
 msgid "never"
 msgstr "nigdy"
 
-#: g10/trust.c:127
+#: g10/trust.c:116
 msgid "marginal"
 msgstr "marginalne"
 
-#: g10/trust.c:128
+#: g10/trust.c:117
 msgid "full"
 msgstr "pełne"
 
-#: g10/trust.c:129
+#: g10/trust.c:118
 msgid "ultimate"
 msgstr "absolutne"
 
@@ -8096,39 +8111,39 @@ msgstr "absolutne"
 #. It gets passed to atoi() so everything after the number is
 #. essentially a comment and need not be translated.  Either key and
 #. uid are both NULL, or neither are NULL.
-#: g10/trust.c:166
+#: g10/trust.c:155
 msgid "10 translator see trust.c:uid_trust_string_fixed"
 msgstr "17"
 
-#: g10/trust.c:169
+#: g10/trust.c:158
 msgid "[ revoked]"
 msgstr "[  unieważniony ]"
 
-#: g10/trust.c:171 g10/trust.c:177
+#: g10/trust.c:160 g10/trust.c:166
 msgid "[ expired]"
 msgstr "[przeterminowany]"
 
-#: g10/trust.c:176
+#: g10/trust.c:165
 msgid "[ unknown]"
 msgstr "[    nieznane   ]"
 
-#: g10/trust.c:178
+#: g10/trust.c:167
 msgid "[  undef ]"
 msgstr "[  nieokreślone ]"
 
-#: g10/trust.c:179
+#: g10/trust.c:168
 msgid "[  never ]"
 msgstr "[     nigdy     ]"
 
-#: g10/trust.c:180
+#: g10/trust.c:169
 msgid "[marginal]"
 msgstr "[   marginalne  ]"
 
-#: g10/trust.c:181
+#: g10/trust.c:170
 msgid "[  full  ]"
 msgstr "[     pełne     ]"
 
-#: g10/trust.c:182
+#: g10/trust.c:171
 msgid "[ultimate]"
 msgstr "[   absolutne   ]"
 
@@ -8188,16 +8203,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:4937 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2386
+#: scd/app-piv.c:1770 scd/app-p15.c:5035 scd/app-nks.c:1530
+#: scd/app-openpgp.c:2387
 #, 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:4956 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2402
+#: scd/app-piv.c:1787 scd/app-p15.c:5054 scd/app-nks.c:1549
+#: scd/app-openpgp.c:2403
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr "Pozostało prób: %d"
@@ -8238,10 +8253,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:2669
-#: scd/app-openpgp.c:2693 scd/app-openpgp.c:2871 scd/app-openpgp.c:2893
-#: scd/app-openpgp.c:3074 scd/app-openpgp.c:3361 scd/app-openpgp.c:3408
-#: scd/app-openpgp.c:3545 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2670
+#: scd/app-openpgp.c:2694 scd/app-openpgp.c:2872 scd/app-openpgp.c:2894
+#: scd/app-openpgp.c:3075 scd/app-openpgp.c:3362 scd/app-openpgp.c:3409
+#: scd/app-openpgp.c:3547 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"
@@ -8263,57 +8278,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:3616
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3618
 #, c-format
 msgid "key already exists\n"
 msgstr "klucz już istnieje\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3620
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3622
 #, 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:3622
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3624
 #, c-format
 msgid "generating new key\n"
 msgstr "generowanie nowego klucza\n"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3624
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3626
 #, c-format
 msgid "writing new key\n"
 msgstr "zapisywanie nowego klucza\n"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4484 scd/app-openpgp.c:4767
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4486 scd/app-openpgp.c:4761
 #, 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:1615
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1616
 #, 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:1622
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1623
 #, 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:1732
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1733
 #, 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:4943
+#: scd/app-piv.c:3279 scd/app-openpgp.c:4937
 #, 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:4951
+#: scd/app-piv.c:3294 scd/app-openpgp.c:4945
 #, c-format
 msgid "generating key failed\n"
 msgstr "generowanie klucza nie powiodło się\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4957
+#: scd/app-piv.c:3300 scd/app-openpgp.c:4951
 #, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
@@ -8321,36 +8336,36 @@ 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:1842 scd/app-openpgp.c:4966
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1843 scd/app-openpgp.c:4960
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr "odpowiedź nie zawiera danych klucza publicznego\n"
 
-#: scd/app-p15.c:5035 scd/app-nks.c:2038
+#: scd/app-p15.c:5133 scd/app-nks.c:2038
 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:5038 scd/app-openpgp.c:2818
+#: scd/app-p15.c:5136 scd/app-openpgp.c:2819
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Proszę wprowadzić PIN administracyjny"
 
-#: scd/app-p15.c:5040 scd/app-nks.c:2028
+#: scd/app-p15.c:5138 scd/app-nks.c:2028
 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:5043 scd/app-nks.c:2019
+#: scd/app-p15.c:5141 scd/app-nks.c:2019
 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:4321
+#: scd/app-nks.c:1468 scd/app-openpgp.c:4323
 #, 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:4333
+#: scd/app-nks.c:1476 scd/app-openpgp.c:4335
 #, 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"
@@ -8397,27 +8412,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:3442 scd/app-dinsig.c:534
+#: scd/app-nks.c:2221 scd/app-openpgp.c:3443 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:943
+#: scd/app-openpgp.c:944
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "nie powiódł się zapis odcisku: %s\n"
 
-#: scd/app-openpgp.c:956
+#: scd/app-openpgp.c:957
 #, 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:1427 scd/app-openpgp.c:3389 scd/app-openpgp.c:5715
+#: scd/app-openpgp.c:1428 scd/app-openpgp.c:3390 scd/app-openpgp.c:5709
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "błąd podczas odczytu stanu CHV z karty\n"
 
-#: scd/app-openpgp.c:1949
+#: scd/app-openpgp.c:1950
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "odczyt klucza publicznego nie powiódł się: %s\n"
@@ -8425,44 +8440,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:2373
+#: scd/app-openpgp.c:2374
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr "%sNumer: %s%%0AWłaściciel: %s%%0ALicznik: %lu%s"
 
-#: scd/app-openpgp.c:2621
+#: scd/app-openpgp.c:2622
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "użycie domyślnego PIN-u jako %s\n"
 
-#: scd/app-openpgp.c:2628
+#: scd/app-openpgp.c:2629
 #, 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:2641
+#: scd/app-openpgp.c:2642
 msgid "||Please unlock the card"
 msgstr "||Proszę odblokować kartę"
 
-#: scd/app-openpgp.c:2700 scd/app-openpgp.c:2900 scd/app-openpgp.c:3368
+#: scd/app-openpgp.c:2701 scd/app-openpgp.c:2901 scd/app-openpgp.c:3369
 #, 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:2717 scd/app-openpgp.c:2760 scd/app-openpgp.c:2917
-#: scd/app-openpgp.c:5325
+#: scd/app-openpgp.c:2718 scd/app-openpgp.c:2761 scd/app-openpgp.c:2918
+#: scd/app-openpgp.c:5319
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "weryfikacja CHV%d nie powiodła się: %s\n"
 
-#: scd/app-openpgp.c:2804 scd/app-openpgp.c:5724
+#: scd/app-openpgp.c:2805 scd/app-openpgp.c:5718
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "karta została trwale zablokowana!\n"
 
-#: scd/app-openpgp.c:2808
+#: scd/app-openpgp.c:2809
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8474,20 +8489,20 @@ msgstr[1] ""
 msgstr[2] ""
 "Zostało %d prób PIN-u administracyjnego do trwałego zablokowania karty\n"
 
-#: scd/app-openpgp.c:2841
+#: scd/app-openpgp.c:2842
 #, 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:3355
+#: scd/app-openpgp.c:3356
 msgid "||Please enter the PIN"
 msgstr "||Proszę wpisać PIN"
 
-#: scd/app-openpgp.c:3404
+#: scd/app-openpgp.c:3405
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Proszę wprowadzić kod resetujący dla karty"
 
-#: scd/app-openpgp.c:3414 scd/app-openpgp.c:3481
+#: scd/app-openpgp.c:3415 scd/app-openpgp.c:3484
 #, 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"
@@ -8495,72 +8510,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:3437
+#: scd/app-openpgp.c:3438
 msgid "|RN|New Reset Code"
 msgstr "|RN|Nowy kod resetujÄ…cy"
 
-#: scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3439
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Nowy PIN administracyjny"
 
-#: scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3439
 msgid "|N|New PIN"
 msgstr "|N|Nowy PIN"
 
-#: scd/app-openpgp.c:3541
+#: scd/app-openpgp.c:3543
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "||Proszę wprowadzić PIN administracyjny i nowy PIN administracyjny"
 
-#: scd/app-openpgp.c:3542
+#: scd/app-openpgp.c:3544
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Proszę wprowadzić PIN i nowy PIN"
 
-#: scd/app-openpgp.c:3600 scd/app-openpgp.c:5026
+#: scd/app-openpgp.c:3602 scd/app-openpgp.c:5020
 #, c-format
 msgid "error reading application data\n"
 msgstr "błąd podczas odczytu danych aplikacji\n"
 
-#: scd/app-openpgp.c:3606 scd/app-openpgp.c:5033
+#: scd/app-openpgp.c:3608 scd/app-openpgp.c:5027
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "błąd podczas odczytu odcisku DO\n"
 
-#: scd/app-openpgp.c:4302 scd/app-openpgp.c:4657
+#: scd/app-openpgp.c:4304 scd/app-openpgp.c:4653
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "brak datownika utworzenia\n"
 
-#: scd/app-openpgp.c:4343 scd/app-openpgp.c:4351
+#: scd/app-openpgp.c:4345 scd/app-openpgp.c:4353
 #, 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:4651
+#: scd/app-openpgp.c:4647
 #, c-format
 msgid "unsupported curve\n"
 msgstr "nieobsługiwana krzywa\n"
 
-#: scd/app-openpgp.c:4991
+#: scd/app-openpgp.c:4985
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "niepoprawna struktura karty OpenPGP (DO 0x93)\n"
 
-#: scd/app-openpgp.c:5041
+#: scd/app-openpgp.c:5035
 #, 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:5240
+#: scd/app-openpgp.c:5234
 #, 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:5298
+#: scd/app-openpgp.c:5292
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "dotychczas stworzono podpisów: %lu\n"
 
-#: scd/app-openpgp.c:5729
+#: scd/app-openpgp.c:5723
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
@@ -8568,7 +8583,7 @@ msgstr ""
 "weryfikacja PIN-u administracyjnego tym poleceniem jest aktualnie "
 "zabroniona\n"
 
-#: scd/app-openpgp.c:6241 scd/app-openpgp.c:6252
+#: scd/app-openpgp.c:6250 scd/app-openpgp.c:6261
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nie można dostać się do %s - niepoprawna karta OpenPGP?\n"
@@ -8588,7 +8603,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:274 dirmngr/dirmngr.c:198
+#: scd/scdaemon.c:136 sm/gpgsm.c:274 dirmngr/dirmngr.c:199
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|POZIOM|ustawienie POZIOMU diagnostyki"
 
@@ -8649,12 +8664,12 @@ msgstr ""
 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:2104
+#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2143
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "obsługa fd %d uruchomiona\n"
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2112
+#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2151
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "obsługa fd %d zakończona\n"
@@ -8664,11 +8679,11 @@ msgstr "obsługa fd %d zakończona\n"
 msgid "validation model requested by certificate: %s"
 msgstr "model poprawności żądany przez certyfikat: %s"
 
-#: sm/certchain.c:199 sm/certchain.c:2172
+#: sm/certchain.c:199 sm/certchain.c:2174
 msgid "chain"
 msgstr "łańcuchowy"
 
-#: sm/certchain.c:200 sm/certchain.c:2172
+#: sm/certchain.c:200 sm/certchain.c:2174
 msgid "shell"
 msgstr "powłokowy"
 
@@ -8701,226 +8716,226 @@ msgstr "Uwaga: niekrytyczna polityka certyfikatu niedozwolona"
 msgid "certificate policy not allowed"
 msgstr "polityka certyfikatu niedozwolona"
 
-#: sm/certchain.c:595 sm/keydb.c:1891 sm/keydb.c:1980
+#: sm/certchain.c:596 sm/keydb.c:1913 sm/keydb.c:2002
 #, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "nie udało się pobrać odcisku\n"
 
-#: sm/certchain.c:624
+#: sm/certchain.c:625
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr "poszukiwanie wystawcy na zewnÄ…trz\n"
 
-#: sm/certchain.c:644
+#: sm/certchain.c:645
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "liczba pasujących wystawców: %d\n"
 
-#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#: sm/certchain.c:724 dirmngr/ocsp.c:683
 #, c-format
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "nie można uzyskać authorityInfoAccess: %s\n"
 
-#: sm/certchain.c:791
+#: sm/certchain.c:792
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr "poszukiwanie wystawcy w pamięci podręcznej Dirmngr\n"
 
-#: sm/certchain.c:816
+#: sm/certchain.c:817
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "liczba pasujących certyfikatów: %d\n"
 
-#: sm/certchain.c:819
+#: sm/certchain.c:820
 #, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr ""
 "wyszukiwanie klucza tylko w pamięci podręcznej dirmngr nie powiodło się: %s\n"
 
-#: sm/certchain.c:1046 sm/certchain.c:1561 sm/certchain.c:2200 sm/decrypt.c:643
-#: sm/encrypt.c:620 sm/import.c:414 sm/keydb.c:1898 sm/keydb.c:1987
-#: sm/sign.c:428 sm/verify.c:117
+#: sm/certchain.c:1047 sm/certchain.c:1562 sm/certchain.c:2202
+#: sm/decrypt.c:1084 sm/encrypt.c:621 sm/import.c:414 sm/keydb.c:1920
+#: sm/keydb.c:2009 sm/sign.c:428 sm/verify.c:117
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "nie udało się przydzielić uchwytu keyDB\n"
 
-#: sm/certchain.c:1232
+#: sm/certchain.c:1233
 msgid "certificate has been revoked"
 msgstr "certyfikat został unieważniony"
 
-#: sm/certchain.c:1247
+#: sm/certchain.c:1248
 msgid "the status of the certificate is unknown"
 msgstr "status certyfikatu jest nieznany"
 
-#: sm/certchain.c:1254
+#: sm/certchain.c:1255
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr "proszę upewnić się, że ,,dirmngr'' jest poprawnie zainstalowany\n"
 
-#: sm/certchain.c:1260
+#: sm/certchain.c:1261
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "sprawdzenie CRL nie powiodło się: %s"
 
-#: sm/certchain.c:1289 sm/certchain.c:1357 dirmngr/validate.c:497
+#: sm/certchain.c:1290 sm/certchain.c:1358 dirmngr/validate.c:497
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "certyfikat z błędną ważnością: %s"
 
-#: sm/certchain.c:1304 sm/certchain.c:1389 dirmngr/validate.c:515
+#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:515
 #, c-format
 msgid "certificate not yet valid"
 msgstr "certyfikat jeszcze nie jest ważny"
 
-#: sm/certchain.c:1305 sm/certchain.c:1390
+#: sm/certchain.c:1306 sm/certchain.c:1391
 msgid "root certificate not yet valid"
 msgstr "certyfikat główny jeszcze nie jest ważny"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1307 sm/certchain.c:1392
 msgid "intermediate certificate not yet valid"
 msgstr "certyfikat pośredni jeszcze nie jest ważny"
 
-#: sm/certchain.c:1319 dirmngr/validate.c:526
+#: sm/certchain.c:1320 dirmngr/validate.c:526
 #, c-format
 msgid "certificate has expired"
 msgstr "certyfikat wygasł"
 
-#: sm/certchain.c:1320
+#: sm/certchain.c:1321
 msgid "root certificate has expired"
 msgstr "certyfikat główny wygasł"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1322
 msgid "intermediate certificate has expired"
 msgstr "certyfikat pośredni wygasł"
 
-#: sm/certchain.c:1363
+#: sm/certchain.c:1364
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr "brak wymaganych atrybutów certyfikatu: %s%s%s"
 
-#: sm/certchain.c:1372
+#: sm/certchain.c:1373
 msgid "certificate with invalid validity"
 msgstr "certyfikat o nieważnej ważności"
 
-#: sm/certchain.c:1409
+#: sm/certchain.c:1410
 msgid "signature not created during lifetime of certificate"
 msgstr "podpis nie utworzony w czasie życia certyfikatu"
 
-#: sm/certchain.c:1411
+#: sm/certchain.c:1412
 msgid "certificate not created during lifetime of issuer"
 msgstr "certyfikat nie utworzony w czasie życia wystawcy"
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1413
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr "pośredni certyfikat nie utworzony w czasie życia wystawcy"
 
-#: sm/certchain.c:1416
+#: sm/certchain.c:1417
 #, c-format
 msgid "  (  signature created at "
 msgstr "  (  podpis utworzony "
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1418
 #, c-format
 msgid "  (certificate created at "
 msgstr "  (certyfikat utworzony "
 
-#: sm/certchain.c:1420
+#: sm/certchain.c:1421
 #, c-format
 msgid "  (certificate valid from "
 msgstr "  (certyfikat ważny od "
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1422
 #, c-format
 msgid "  (     issuer valid from "
 msgstr "  (     wystawca ważny od "
 
-#: sm/certchain.c:1451 dirmngr/validate.c:577
+#: sm/certchain.c:1452 dirmngr/validate.c:577
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "odcisk=%s\n"
 
-#: sm/certchain.c:1460
+#: sm/certchain.c:1461
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr "główny certyfikat nie został oznaczony jako zaufany\n"
 
-#: sm/certchain.c:1473
+#: sm/certchain.c:1474
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr "interaktywne oznaczanie zaufania nie włączone w gpg-agencie\n"
 
-#: sm/certchain.c:1479
+#: sm/certchain.c:1480
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr "interaktywne oznaczanie zaufania wyłączone dla tej sesji\n"
 
-#: sm/certchain.c:1538
+#: sm/certchain.c:1539
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 "OSTRZEŻENIE: czas utworzenia podpisu nie jest znany - przyjęto czas bieżący"
 
-#: sm/certchain.c:1602
+#: sm/certchain.c:1603
 msgid "no issuer found in certificate"
 msgstr "nie znaleziono wystawcy w certyfikacie"
 
-#: sm/certchain.c:1680
+#: sm/certchain.c:1681
 msgid "self-signed certificate has a BAD signature"
 msgstr "własnoręcznie podpisany certyfikat ma Z�Y podpis"
 
-#: sm/certchain.c:1749 dirmngr/validate.c:575
+#: sm/certchain.c:1750 dirmngr/validate.c:575
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "główny certyfikat nie jest oznaczony jako zaufany"
 
-#: sm/certchain.c:1765
+#: sm/certchain.c:1766
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "sprawdzenie listy zaufania nie powiodło się: %s\n"
 
-#: sm/certchain.c:1796 sm/import.c:175 dirmngr/validate.c:630
+#: sm/certchain.c:1797 sm/import.c:175 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "łańcuch certyfikatów zbyt długi\n"
 
-#: sm/certchain.c:1808 dirmngr/validate.c:642
+#: sm/certchain.c:1809 dirmngr/validate.c:642
 #, c-format
 msgid "issuer certificate not found"
 msgstr "nie znaleziono certyfikatu wystawcy"
 
-#: sm/certchain.c:1842 dirmngr/validate.c:668
+#: sm/certchain.c:1844 dirmngr/validate.c:668
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr "certyfikat ma Z�Y podpis"
 
-#: sm/certchain.c:1874 dirmngr/validate.c:692
+#: sm/certchain.c:1876 dirmngr/validate.c:692
 msgid "found another possible matching CA certificate - trying again"
 msgstr "znaleziono inny być może pasujący certyfikat CA - ponawianie próby"
 
-#: sm/certchain.c:1933 dirmngr/validate.c:717
+#: sm/certchain.c:1935 dirmngr/validate.c:717
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "łańcuch certyfikatów dłuższy niż dozwolony przez CA (%d)"
 
-#: sm/certchain.c:1975 sm/certchain.c:2275 dirmngr/validate.c:747
+#: sm/certchain.c:1977 sm/certchain.c:2278 dirmngr/validate.c:747
 #, c-format
 msgid "certificate is good\n"
 msgstr "certyfikat jest dobry\n"
 
-#: sm/certchain.c:1976
+#: sm/certchain.c:1978
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "certyfikat pośredni jest dobry\n"
 
-#: sm/certchain.c:1977
+#: sm/certchain.c:1979
 #, c-format
 msgid "root certificate is good\n"
 msgstr "certyfikat główny jest dobry\n"
 
-#: sm/certchain.c:2159
+#: sm/certchain.c:2161
 msgid "switching to chain model"
 msgstr "przełączanie do modelu łańcuchowego"
 
-#: sm/certchain.c:2168
+#: sm/certchain.c:2170
 #, c-format
 msgid "validation model used: %s"
 msgstr "użyty model poprawności: %s"
@@ -8931,18 +8946,18 @@ 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:1372 dirmngr/validate.c:903
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1411 dirmngr/validate.c:903
 #: dirmngr/validate.c:927
 #, c-format
 msgid "out of core\n"
 msgstr "brak pamięci\n"
 
-#: sm/certcheck.c:389 sm/verify.c:212
+#: sm/certcheck.c:388 sm/verify.c:212
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(to jest algorytm MD2)\n"
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:793
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:794
 msgid "none"
 msgstr "brak"
 
@@ -9231,17 +9246,17 @@ msgstr ""
 msgid "resource problem: out of core\n"
 msgstr "problem z zasobami: brak pamięci\n"
 
-#: sm/decrypt.c:719
+#: sm/decrypt.c:1159
 #, c-format
 msgid "(this is the RC2 algorithm)\n"
 msgstr "(to jest algorytm RC2)\n"
 
-#: sm/decrypt.c:721
+#: sm/decrypt.c:1161
 #, c-format
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr "(to nie wygląda na zaszyfrowaną wiadomość)\n"
 
-#: sm/decrypt.c:868
+#: sm/decrypt.c:1318
 #, fuzzy, c-format
 #| msgid "encrypted with %s key, ID %s\n"
 msgid "encrypted to %s key %s\n"
@@ -9252,7 +9267,7 @@ msgstr "zaszyfrowano kluczem %s o identyfikatorze %s\n"
 msgid "certificate '%s' not found: %s\n"
 msgstr "nie znaleziono certyfikatu ,,%s'': %s\n"
 
-#: sm/delete.c:120 sm/keydb.c:1999 sm/keydb.c:2098
+#: sm/delete.c:120 sm/keydb.c:2021 sm/keydb.c:2120
 #, c-format
 msgid "error locking keybox: %s\n"
 msgstr "błąd blokowania keyboksa: %s\n"
@@ -9272,7 +9287,7 @@ msgstr "certyfikat ,,%s'' usunięty\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "usunięcie certyfikatu ,,%s'' nie powiodło się: %s\n"
 
-#: sm/encrypt.c:606
+#: sm/encrypt.c:607
 #, c-format
 msgid "no valid recipients given\n"
 msgstr "nie podano poprawnych adresatów\n"
@@ -9341,63 +9356,63 @@ msgstr "|UŻYTKOWNIK|użycie tego identyfikatora jako domyślnego klucza tajnego
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|PLIK|dodanie tego zbioru kluczy do listy zbiorów kluczy"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:352 dirmngr/dirmngr.c:265
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|SPEC|użycie tego serwera do wyszukiwania kluczy"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:363
 msgid "fetch missing issuer certificates"
 msgstr "pobranie brakujących certyfikatów wystawców"
 
-#: sm/gpgsm.c:364
+#: sm/gpgsm.c:365
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NAZWA|użycie kodowania NAZWA dla haseł PKCS#12"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:386
 msgid "never consult a CRL"
 msgstr "pominięcie CRL"
 
-#: sm/gpgsm.c:389
+#: sm/gpgsm.c:390
 msgid "do not check CRLs for root certificates"
 msgstr "niesprawdzanie CRL dla głównych certyfikatów"
 
-#: sm/gpgsm.c:393
+#: sm/gpgsm.c:394
 msgid "check validity using OCSP"
 msgstr "sprawdzenie poprawności przy użyciu OCSP"
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:396
 msgid "do not check certificate policies"
 msgstr "niesprawdzanie polityk certyfikatów"
 
-#: sm/gpgsm.c:398
+#: sm/gpgsm.c:399
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAZWA|użycie tego algorytmu szyfrowania NAZWA"
 
-#: sm/gpgsm.c:400
+#: sm/gpgsm.c:401
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAZWA|użycie tego algorytmu skrótu wiadomości"
 
-#: sm/gpgsm.c:410
+#: sm/gpgsm.c:411
 msgid "batch mode: never ask"
 msgstr "tryb wsadowy: bez żadnych pytań"
 
-#: sm/gpgsm.c:412
+#: sm/gpgsm.c:413
 msgid "assume yes on most questions"
 msgstr "przyjęcie odpowiedzi ,,tak'' na większość pytań"
 
-#: sm/gpgsm.c:413
+#: sm/gpgsm.c:414
 msgid "assume no on most questions"
 msgstr "przyjęcie odpowiedzi ,,nie'' na większość pytań"
 
-#: sm/gpgsm.c:430
+#: sm/gpgsm.c:431
 msgid "|FILE|write an audit log to FILE"
 msgstr "|PLIK|zapisanie logów audytowych do PLIKU"
 
-#: sm/gpgsm.c:615
+#: sm/gpgsm.c:616
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Składnia: @GPGSM@ [opcje] [pliki] (-h wyświetla pomoc)"
 
-#: sm/gpgsm.c:618
+#: sm/gpgsm.c:619
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -9408,52 +9423,27 @@ msgstr ""
 "S/MIME\n"
 "Domyślnie wykonywana operacja zależy od danych wejściowych\n"
 
-#: sm/gpgsm.c:826
+#: sm/gpgsm.c:827
 #, 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:837
+#: sm/gpgsm.c:838
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "nieznany model poprawności ,,%s''\n"
 
-#: sm/gpgsm.c:896 dirmngr/ldapserver.c:89
-#, c-format
-msgid "%s:%u: no hostname given\n"
-msgstr "%s:%u: nie podano nazwy hosta\n"
-
-#: sm/gpgsm.c:915 dirmngr/ldapserver.c:108
-#, c-format
-msgid "%s:%u: password given without user\n"
-msgstr "%s:%u: podano hasło bez użytkownika\n"
-
-#: sm/gpgsm.c:946 dirmngr/ldapserver.c:139
-#, c-format
-msgid "%s:%u: ignoring unknown flag '%s'\n"
-msgstr ""
-
-#: sm/gpgsm.c:962 dirmngr/ldapserver.c:155
-#, c-format
-msgid "%s:%u: skipping this line\n"
-msgstr "%s:%u: linia pominięta\n"
-
-#: sm/gpgsm.c:1550
-#, c-format
-msgid "could not parse keyserver\n"
-msgstr "niezrozumiały adres serwera kluczy\n"
-
-#: sm/gpgsm.c:1858
+#: sm/gpgsm.c:1711
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "import wspólnych certyfikatów ,,%s''\n"
 
-#: sm/gpgsm.c:1904
+#: sm/gpgsm.c:1757
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "nie można podpisać z użyciem ,,%s'': %s\n"
 
-#: sm/gpgsm.c:2273
+#: sm/gpgsm.c:2129
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "błędne polecenie (nie ma polecenia domyślnego)\n"
@@ -9474,53 +9464,53 @@ msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 "podstawowe sprawdzenia certyikatu nie powiodły się - nie zaimportowany\n"
 
-#: sm/import.c:471 sm/keydb.c:2018 sm/keydb.c:2111
+#: sm/import.c:472 sm/keydb.c:2040 sm/keydb.c:2133
 #, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "błąd pobierania zapisanych flag: %s\n"
 
-#: sm/import.c:530 sm/import.c:562
+#: sm/import.c:531 sm/import.c:563
 #, c-format
 msgid "error importing certificate: %s\n"
 msgstr "błąd importu certyfikatu: %s\n"
 
-#: sm/import.c:751 tools/gpg-connect-agent.c:1475
+#: sm/import.c:752 tools/gpg-connect-agent.c:1475
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "błąd odczytu wejścia: %s\n"
 
-#: sm/keydb.c:503
+#: sm/keydb.c:508
 #, fuzzy, c-format
 #| msgid "no dirmngr running in this session\n"
 msgid "no keyboxd running in this session\n"
 msgstr "brak działającego dirmngr w tej sesji\n"
 
-#: sm/keydb.c:595
+#: sm/keydb.c:600
 #, c-format
 msgid "error opening key DB: %s\n"
 msgstr "błąd podczas otwierania bazy kluczy: %s\n"
 
-#: sm/keydb.c:1936
+#: sm/keydb.c:1958
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr "problem odszukaniem istniejÄ…cego certyfikatu: %s\n"
 
-#: sm/keydb.c:1948
+#: sm/keydb.c:1970
 #, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "błąd podczas szukania zapisywalnego keyDB: %s\n"
 
-#: sm/keydb.c:1956
+#: sm/keydb.c:1978
 #, c-format
 msgid "error storing certificate: %s\n"
 msgstr "błąd zapisywania certyfikatu: %s\n"
 
-#: sm/keydb.c:2009
+#: sm/keydb.c:2031
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "problem z ponownym odszukaniem certyfikatu: %s\n"
 
-#: sm/keydb.c:2030 sm/keydb.c:2122
+#: sm/keydb.c:2052 sm/keydb.c:2144
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr "błąd zapisywania flag: %s\n"
@@ -9705,57 +9695,57 @@ msgstr "  przedmiot ="
 msgid "error loading certificate '%s': %s\n"
 msgstr "błąd ładowania certyfikatu ,,%s'': %s\n"
 
-#: dirmngr/certcache.c:819
+#: dirmngr/certcache.c:820
 #, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr " trwale załadowanych certyfikatów: %u\n"
 
-#: dirmngr/certcache.c:821
+#: dirmngr/certcache.c:822
 #, c-format
 msgid "    runtime cached certificates: %u\n"
 msgstr "certyfikatów w pamięci podręcznej: %u\n"
 
-#: dirmngr/certcache.c:823
+#: dirmngr/certcache.c:824
 #, c-format
 msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "           certyfikatów zaufanych: %u (%u,%u,%u,%u)\n"
 
-#: dirmngr/certcache.c:851 dirmngr/dirmngr-client.c:392
+#: dirmngr/certcache.c:852 dirmngr/dirmngr-client.c:392
 #, c-format
 msgid "certificate already cached\n"
 msgstr "certyfikat już istnieje w pamięci podręcznej\n"
 
-#: dirmngr/certcache.c:853
+#: dirmngr/certcache.c:854
 #, c-format
 msgid "certificate cached\n"
 msgstr "certyfikat zapisany w pamięci podręcznej\n"
 
-#: dirmngr/certcache.c:855 dirmngr/certcache.c:875 dirmngr/dirmngr-client.c:396
+#: dirmngr/certcache.c:856 dirmngr/certcache.c:876 dirmngr/dirmngr-client.c:396
 #, c-format
 msgid "error caching certificate: %s\n"
 msgstr "błąd zapisu certyfikatu w pamięci podręcznej: %s\n"
 
-#: dirmngr/certcache.c:938
+#: dirmngr/certcache.c:939
 #, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "niewłaściwy łańcuch odcisku SHA1 ,,%s''\n"
 
-#: dirmngr/certcache.c:1384 dirmngr/certcache.c:1393
+#: dirmngr/certcache.c:1385 dirmngr/certcache.c:1394
 #, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "błąd pobierania certyfikatu wg S/N: %s\n"
 
-#: dirmngr/certcache.c:1579 dirmngr/certcache.c:1588
+#: dirmngr/certcache.c:1580 dirmngr/certcache.c:1589
 #, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "błąd pobierania certyfikatu wg przedmiotu: %s\n"
 
-#: dirmngr/certcache.c:1694 dirmngr/validate.c:483
+#: dirmngr/certcache.c:1695 dirmngr/validate.c:483
 #, c-format
 msgid "no issuer found in certificate\n"
 msgstr "nie znaleziono wystawcy w certyfikacie\n"
 
-#: dirmngr/certcache.c:1704
+#: dirmngr/certcache.c:1705
 #, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "błąd pobierania authorityKeyIdentifier: %s\n"
@@ -9790,7 +9780,7 @@ msgstr "usuwanie pliku pamięci podręcznej ,,%s''\n"
 msgid "not removing file '%s'\n"
 msgstr "bez usuwania pliku ,,%s''\n"
 
-#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2380
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2383
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr "błąd zamykania pliku pamięci podręcznej: %s\n"
@@ -10030,13 +10020,13 @@ msgid "error getting data from cache file: %s\n"
 msgstr "błąd pobierania danych z pliku pamięci podręcznej: %s\n"
 
 #: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1672 dirmngr/crlcache.c:1697
-#: dirmngr/crlcache.c:1763
+#: dirmngr/crlcache.c:1766
 #, c-format
 msgid "got an invalid S-expression from libksba\n"
 msgstr "odebrano błędne S-wyrażenie z libksba\n"
 
 #: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1679 dirmngr/crlcache.c:1705
-#: dirmngr/crlcache.c:1770 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1773 dirmngr/misc.c:176
 #, c-format
 msgid "converting S-expression failed: %s\n"
 msgstr "konwersja S-wyrażenia nie powiodła się: %s\n"
@@ -10051,136 +10041,136 @@ msgstr "niewłaściwy algorytm skrótu ,,%s''\n"
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr "gcry_md_open dla algorytmu %d nie powiodło się: %s\n"
 
-#: dirmngr/crlcache.c:1797 dirmngr/ocsp.c:478
+#: dirmngr/crlcache.c:1800 dirmngr/ocsp.c:478
 #, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "tworzenie S-wyrażenia nie powiodło się: %s\n"
 
-#: dirmngr/crlcache.c:1871
+#: dirmngr/crlcache.c:1874
 #, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "ksba_crl_parse nie powiodło się: %s\n"
 
-#: dirmngr/crlcache.c:1886
+#: dirmngr/crlcache.c:1889
 #, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "błąd pobierania czasów aktualizacji CRL: %s\n"
 
-#: dirmngr/crlcache.c:1893
+#: dirmngr/crlcache.c:1896
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr "czasy uaktualnienia tego CRL: obecne=%s następne=%s\n"
 
-#: dirmngr/crlcache.c:1897
+#: dirmngr/crlcache.c:1900
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr "nie podano nextUpdate; przyjęto okreś ważności jednego dnia\n"
 
-#: dirmngr/crlcache.c:1917
+#: dirmngr/crlcache.c:1920
 #, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "błąd pobierania elementu CRL: %s\n"
 
-#: dirmngr/crlcache.c:1932
+#: dirmngr/crlcache.c:1935
 #, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr ""
 "błąd wstawiania elementu do pliku tymczasowego pamięci podręcznej: %s\n"
 
-#: dirmngr/crlcache.c:1959
+#: dirmngr/crlcache.c:1962
 #, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "nie znaleziono wystawcy CRL w CRL: %s\n"
 
-#: dirmngr/crlcache.c:1974
+#: dirmngr/crlcache.c:1977
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr "wyszukiwanie certyfikatu wystawcy CRL po authorityKeyIdentifier\n"
 
-#: dirmngr/crlcache.c:2020
+#: dirmngr/crlcache.c:2023
 #, c-format
 msgid "CRL signature verification failed: %s\n"
 msgstr "weryfikacja podpisu CRL nie powiodła się: %s\n"
 
-#: dirmngr/crlcache.c:2032
+#: dirmngr/crlcache.c:2035
 #, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "błąd sprawdzania poprawności certyfikatu wystawcy CRL: %s\n"
 
-#: dirmngr/crlcache.c:2174
+#: dirmngr/crlcache.c:2177
 #, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "ksba_crl_new nie powiodło się: %s\n"
 
-#: dirmngr/crlcache.c:2181
+#: dirmngr/crlcache.c:2184
 #, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "ksba_crl_set_reader nie powiodło się: %s\n"
 
-#: dirmngr/crlcache.c:2215
+#: dirmngr/crlcache.c:2218
 #, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "usunięto zleżały plik tymczasowy pamięci podręcznej ,,%s''\n"
 
-#: dirmngr/crlcache.c:2219
+#: dirmngr/crlcache.c:2222
 #, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr ""
 "problem z usunięciem zleżałego pliku tymczasowego pamięci podręcznej ,,%s'': "
 "%s\n"
 
-#: dirmngr/crlcache.c:2229
+#: dirmngr/crlcache.c:2232
 #, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "błąd tworzenia pliku tymczasowego pamięci podręcznej ,,%s'': %s\n"
 
-#: dirmngr/crlcache.c:2239
+#: dirmngr/crlcache.c:2242
 #, c-format
 msgid "crl_parse_insert failed: %s\n"
 msgstr "crl_parse_insert nie powiodło się: %s\n"
 
-#: dirmngr/crlcache.c:2249
+#: dirmngr/crlcache.c:2252
 #, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "błąd finalizacji pliku tymczasowego pamięci podręcznej ,,%s'': %s\n"
 
-#: dirmngr/crlcache.c:2256
+#: dirmngr/crlcache.c:2259
 #, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "błąd zamykania pliku tymczasowego pamięci podręcznej ,,%s'': %s\n"
 
-#: dirmngr/crlcache.c:2281
+#: dirmngr/crlcache.c:2284
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 "OSTRZEŻENIE: nowe CRL jest nadal zbyt stare; wygasło %s - ładowanie mimo to\n"
 
-#: dirmngr/crlcache.c:2285
+#: dirmngr/crlcache.c:2288
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr "nowe CRL jest nadal zbyt stare; wygasło %s\n"
 
-#: dirmngr/crlcache.c:2301
+#: dirmngr/crlcache.c:2304
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr "nieznane rozszerzenie krytyczne CRL %s\n"
 
-#: dirmngr/crlcache.c:2311
+#: dirmngr/crlcache.c:2314
 #, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "błąd odczytu rozszerzeń CRL: %s\n"
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2365
 #, c-format
 msgid "creating cache file '%s'\n"
 msgstr "błąd tworzenia pliku pamięci podręcznej ,,%s''\n"
 
-#: dirmngr/crlcache.c:2394
+#: dirmngr/crlcache.c:2397
 #, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "problem ze zmianÄ… nazwy ,,%s'' na ,,%s'': %s\n"
 
-#: dirmngr/crlcache.c:2408
+#: dirmngr/crlcache.c:2411
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
@@ -10189,12 +10179,12 @@ msgstr ""
 "uaktualnianie pliku DIR nie powiodło się - wpis pamięci podręcznej zostanie "
 "utracony przy następnym starcie programu\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2448
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr "Rozpoczęcie zrzutu cRL (uzyskanego poprzez %s)\n"
 
-#: dirmngr/crlcache.c:2468
+#: dirmngr/crlcache.c:2471
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
@@ -10202,55 +10192,55 @@ msgstr ""
 " B�ĄD: CRL nie będzie użyte, ponieważ po uaktualnieniu jest nadal zbyt "
 "stare!\n"
 
-#: dirmngr/crlcache.c:2471
+#: dirmngr/crlcache.c:2474
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 " B�ĄD: CRL nie będzie użyte ze względu na nieznane rozszerzenie krytyczne!\n"
 
-#: dirmngr/crlcache.c:2474
+#: dirmngr/crlcache.c:2477
 msgid " ERROR: The CRL will not be used\n"
 msgstr " B�ĄD: CRL nie będzie użyte\n"
 
-#: dirmngr/crlcache.c:2481
+#: dirmngr/crlcache.c:2484
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr " B�ĄD: to zapamiętane CRL mogło zostać naruszone!\n"
 
-#: dirmngr/crlcache.c:2499
+#: dirmngr/crlcache.c:2502
 #, c-format
 msgid " WARNING: invalid cache record length\n"
 msgstr " OSTRZEŻENIE: błędna długość rekordu pamięci podręcznej\n"
 
-#: dirmngr/crlcache.c:2506
+#: dirmngr/crlcache.c:2509
 #, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "problem z odczytem rekordu pamięci podręcznej: %s\n"
 
-#: dirmngr/crlcache.c:2517
+#: dirmngr/crlcache.c:2520
 #, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "problem z odczytem klucza pamięci podręcznej: %s\n"
 
-#: dirmngr/crlcache.c:2548
+#: dirmngr/crlcache.c:2551
 #, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "błąd odczytu wpisu pamięci podręcznej z db: %s\n"
 
-#: dirmngr/crlcache.c:2551
+#: dirmngr/crlcache.c:2554
 msgid "End CRL dump\n"
 msgstr "Koniec zrzutu CRL\n"
 
-#: dirmngr/crlcache.c:2672
+#: dirmngr/crlcache.c:2675
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "crl_fetch po DP nie powiodło się: %s\n"
 
-#: dirmngr/crlcache.c:2683
+#: dirmngr/crlcache.c:2686
 #, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "crl_cache_insert po DP nie powiodło się: %s\n"
 
-#: dirmngr/crlcache.c:2743
+#: dirmngr/crlcache.c:2746
 #, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "crl_cache_insert po wystawcy nie powiodło się: %s\n"
@@ -10271,7 +10261,7 @@ msgstr "Dostęp do CRL niemożliwy z powodu wyłączonego %s\n"
 msgid "error retrieving '%s': %s\n"
 msgstr "błąd odtwarzania ,,%s'': %s\n"
 
-#: dirmngr/crlfetch.c:218 dirmngr/ldap-wrapper.c:881 dirmngr/misc.c:573
+#: dirmngr/crlfetch.c:218 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
 #, c-format
 msgid "error initializing reader object: %s\n"
 msgstr "błąd inicjowania obiektu czytelnika: %s\n"
@@ -10429,133 +10419,133 @@ msgstr "oczekiwano bezwzględnej nazwy pliku\n"
 msgid "looking up '%s'\n"
 msgstr "wyszukiwanie ,,%s''\n"
 
-#: dirmngr/dirmngr.c:175
+#: dirmngr/dirmngr.c:176
 msgid "list the contents of the CRL cache"
 msgstr "lista zawartości pamięci podręcznej CRL"
 
-#: dirmngr/dirmngr.c:176
+#: dirmngr/dirmngr.c:177
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|PLIK|załadowanie CRL z PLIKU do pamięci podręcznej"
 
-#: dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr.c:178
 msgid "|URL|fetch a CRL from URL"
 msgstr "|URL|pobranie CRL z URL-a"
 
-#: dirmngr/dirmngr.c:178
+#: dirmngr/dirmngr.c:179
 msgid "shutdown the dirmngr"
 msgstr "wyłączenie dirmngr"
 
-#: dirmngr/dirmngr.c:179
+#: dirmngr/dirmngr.c:180
 msgid "flush the cache"
 msgstr "zapis pamięci podręcznej"
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:213
 msgid "allow online software version check"
 msgstr "zezwolenie na sprawdzenie wersji oprogramowania online"
 
-#: dirmngr/dirmngr.c:215
+#: dirmngr/dirmngr.c:216
 msgid "|N|do not return more than N items in one query"
 msgstr "|N|bez zwracania więcej niż N elementów w jednym zapytaniu"
 
-#: dirmngr/dirmngr.c:221
+#: dirmngr/dirmngr.c:222
 msgid "Network related options"
 msgstr ""
 
-#: dirmngr/dirmngr.c:223
+#: dirmngr/dirmngr.c:224
 msgid "route all network traffic via Tor"
 msgstr "trasowanie całego ruchu sieciowego przez Tora"
 
-#: dirmngr/dirmngr.c:235
+#: dirmngr/dirmngr.c:236
 msgid "Configuration for Keyservers"
 msgstr "Konfiguracja dla serwerów kluczy"
 
-#: dirmngr/dirmngr.c:238
+#: dirmngr/dirmngr.c:239
 msgid "|URL|use keyserver at URL"
 msgstr "|URL|używaj serwera kluczy URL"
 
-#: dirmngr/dirmngr.c:240
+#: dirmngr/dirmngr.c:241
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr "|PLIK|użycie certyfikatów CA w PLIKU dla HKP po TLS"
 
-#: dirmngr/dirmngr.c:242
+#: dirmngr/dirmngr.c:243
 msgid "Configuration for HTTP servers"
 msgstr "Konfiguracja dla serwerów HTTP"
 
-#: dirmngr/dirmngr.c:244
+#: dirmngr/dirmngr.c:245
 msgid "inhibit the use of HTTP"
 msgstr "powstrzymanie od użycia HTTP"
 
-#: dirmngr/dirmngr.c:246
+#: dirmngr/dirmngr.c:247
 msgid "ignore HTTP CRL distribution points"
 msgstr "ignorowanie punktów dystrybucji CRL przez HTTP"
 
-#: dirmngr/dirmngr.c:248
+#: dirmngr/dirmngr.c:249
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr "|URL|przekierowanie wszystkich żądań HTTP na URL"
 
-#: dirmngr/dirmngr.c:250
+#: dirmngr/dirmngr.c:251
 msgid "use system's HTTP proxy setting"
 msgstr "użycie systemowego ustawienia proxy HTTP"
 
-#: dirmngr/dirmngr.c:254
+#: dirmngr/dirmngr.c:255
 msgid "Configuration of LDAP servers to use"
 msgstr "Konfiguracja używanych serwerów LDAP"
 
-#: dirmngr/dirmngr.c:256
+#: dirmngr/dirmngr.c:257
 msgid "inhibit the use of LDAP"
 msgstr "powstrzymanie od użycia LDAP"
 
-#: dirmngr/dirmngr.c:258
+#: dirmngr/dirmngr.c:259
 msgid "ignore LDAP CRL distribution points"
 msgstr "ignorowanie punktów dystrybucji CRL przez LDAP"
 
-#: dirmngr/dirmngr.c:260
+#: dirmngr/dirmngr.c:261
 msgid "|HOST|use HOST for LDAP queries"
 msgstr "|HOST|użycie HOSTA do zapytań LDAP"
 
-#: dirmngr/dirmngr.c:262
+#: dirmngr/dirmngr.c:263
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr "bez użycia hostów zapasowych z --ldap-proxy"
 
-#: dirmngr/dirmngr.c:264
+#: dirmngr/dirmngr.c:267
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|PLIK|odczyt listy serwerów LDAP z PLIKU"
 
-#: dirmngr/dirmngr.c:266
+#: dirmngr/dirmngr.c:269
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 "dodanie nowych serwerów wykrytych w pinktach dystrybucji CRL do listy "
 "serwerów"
 
-#: dirmngr/dirmngr.c:269 dirmngr/dirmngr_ldap.c:104
+#: dirmngr/dirmngr.c:272
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|ustawienie limitu czasu LDAP na N sekund"
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:275
 msgid "Configuration for OCSP"
 msgstr "Konfiguracja dla OCSP"
 
-#: dirmngr/dirmngr.c:274
+#: dirmngr/dirmngr.c:277
 msgid "allow sending OCSP requests"
 msgstr "zezwolenie na wysyłanie żądań OCSP"
 
-#: dirmngr/dirmngr.c:276
+#: dirmngr/dirmngr.c:279
 msgid "ignore certificate contained OCSP service URLs"
 msgstr "ignorowanie URL-i usług OCSP zawartych w certyfikatach"
 
-#: dirmngr/dirmngr.c:278
+#: dirmngr/dirmngr.c:281
 msgid "|URL|use OCSP responder at URL"
 msgstr "|URL|użycie respondera OCSP spod URL-a"
 
-#: dirmngr/dirmngr.c:280
+#: dirmngr/dirmngr.c:283
 msgid "|FPR|OCSP response signed by FPR"
 msgstr "|FPR|odpowiedź OCSP podpisana przez FPR"
 
-#: dirmngr/dirmngr.c:288
+#: dirmngr/dirmngr.c:291
 msgid "force loading of outdated CRLs"
 msgstr "wymuszenie Å‚adowania nieaktualnych CRL"
 
-#: dirmngr/dirmngr.c:299
+#: dirmngr/dirmngr.c:302
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
@@ -10564,11 +10554,11 @@ msgstr ""
 "@\n"
 "(pełną listę poleceń i opcji można znaleźć w podręczniku ,,info'')\n"
 
-#: dirmngr/dirmngr.c:441
+#: dirmngr/dirmngr.c:449
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Składnia: @DIRMNGR@ [opcje] (-h wyświetla pomoc)"
 
-#: dirmngr/dirmngr.c:443
+#: dirmngr/dirmngr.c:451
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@ -10576,286 +10566,104 @@ msgstr ""
 "Składnia: @DIRMNGR@ [opcje] [polecenie [argumenty]]\n"
 "Dostęp do serwera kluczy, CRL i OCSP dla @GNUPG@\n"
 
-#: dirmngr/dirmngr.c:523
+#: dirmngr/dirmngr.c:531
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr "poprawne poziomy diagnostyki to: %s\n"
 
-#: dirmngr/dirmngr.c:609 tools/gpgconf.c:667 tools/gpgconf.c:702
-#: tools/gpgconf.c:802
+#: dirmngr/dirmngr.c:617 tools/gpgconf.c:701 tools/gpgconf.c:736
+#: tools/gpgconf.c:836
 #, c-format
 msgid "usage: %s [options] "
 msgstr "składnia: %s [opcje]"
 
-#: dirmngr/dirmngr.c:1260
+#: dirmngr/dirmngr.c:1299
 #, c-format
 msgid "colons are not allowed in the socket name\n"
 msgstr "dwukropki nie sÄ… dozwolone w nazwie gniazda\n"
 
-#: dirmngr/dirmngr.c:1495 dirmngr/server.c:1824
+#: dirmngr/dirmngr.c:1534 dirmngr/server.c:1878
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "pobranie CRL z ,,%s'' nie powiodło się: %s\n"
 
-#: dirmngr/dirmngr.c:1501 dirmngr/server.c:1830
+#: dirmngr/dirmngr.c:1540 dirmngr/server.c:1884
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "przetworzenie CRL z ,,%s'' nie powiodło się: %s\n"
 
-#: dirmngr/dirmngr.c:1643
+#: dirmngr/dirmngr.c:1682
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: linia zbyt długa - pominięto\n"
 
-#: dirmngr/dirmngr.c:1698 dirmngr/dirmngr.c:1782
+#: dirmngr/dirmngr.c:1737 dirmngr/dirmngr.c:1821
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: wykryto błędny odcisk\n"
 
-#: dirmngr/dirmngr.c:1734 dirmngr/dirmngr.c:1760 tools/gpgconf-comp.c:3539
+#: dirmngr/dirmngr.c:1773 dirmngr/dirmngr.c:1799 tools/gpgconf-comp.c:3549
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: błąd odczytu: %s\n"
 
-#: dirmngr/dirmngr.c:1789
+#: dirmngr/dirmngr.c:1828
 #, 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:1876
+#: dirmngr/dirmngr.c:1915
 #, 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:1917
+#: dirmngr/dirmngr.c:1956
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "otrzymano SIGUSR2 - nie zdefiniowano akcji\n"
 
-#: dirmngr/dirmngr.c:1922
+#: dirmngr/dirmngr.c:1961
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "otrzymano SIGTERM - zamykanie...\n"
 
-#: dirmngr/dirmngr.c:1924
+#: dirmngr/dirmngr.c:1963
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "otrzymano SIGTERM - nadal są aktywne połączenia: %d\n"
 
-#: dirmngr/dirmngr.c:1929
+#: dirmngr/dirmngr.c:1968
 #, c-format
 msgid "shutdown forced\n"
 msgstr "wymuszono zamknięcie\n"
 
-#: dirmngr/dirmngr.c:1937
+#: dirmngr/dirmngr.c:1976
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "otrzymano SIGINT - natychmiastowe zamknięcie\n"
 
-#: dirmngr/dirmngr.c:1944
+#: dirmngr/dirmngr.c:1983
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "otrzymano sygnał %d - nie zdefiniowano akcji\n"
 
-#: dirmngr/dirmngr_ldap.c:105
-msgid "return all values in a record oriented format"
-msgstr "zwrócenie wszystkich wartości w formacie rekordu"
-
-#: dirmngr/dirmngr_ldap.c:108
-msgid "|NAME|ignore host part and connect through NAME"
-msgstr "|NAZWA|zignorowanie części z hostem i połączenie poprzez NAZWĘ"
-
-#: dirmngr/dirmngr_ldap.c:109
-msgid "force a TLS connection"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:110
-msgid "|NAME|connect to host NAME"
-msgstr "|NAZWA|połączenie z hostem NAZWA"
-
-#: dirmngr/dirmngr_ldap.c:111
-msgid "|N|connect to port N"
-msgstr "|N|połączenie z portem N"
-
-#: dirmngr/dirmngr_ldap.c:112
-msgid "|NAME|use user NAME for authentication"
-msgstr "|NAZWA|użycie NAZWY użytkownika do uwierzytelnienia"
-
-#: dirmngr/dirmngr_ldap.c:113
-msgid "|PASS|use password PASS for authentication"
-msgstr "|HAS�O|użycie HAS�A do uwierzytelnienia"
-
-#: dirmngr/dirmngr_ldap.c:115
-msgid "take password from $DIRMNGR_LDAP_PASS"
-msgstr "pobranie hasła z $DIRMNGR_LDAP_PASS"
-
-#: dirmngr/dirmngr_ldap.c:116
-msgid "|STRING|query DN STRING"
-msgstr "|�AŃCUCH|�AŃCUCH zapytania DN"
-
-#: dirmngr/dirmngr_ldap.c:117
-msgid "|STRING|use STRING as filter expression"
-msgstr "|�AŃCUCH|użycie �AŃCUCHA jako wyrażenia filtra"
-
-#: dirmngr/dirmngr_ldap.c:118
-msgid "|STRING|return the attribute STRING"
-msgstr "|�AŃCUCH|zwrócenie atrybutu �AŃCUCH"
-
-#: dirmngr/dirmngr_ldap.c:179
-msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
-msgstr "Składnia: dirmngr_ldap [opcje] [URL] (-h wyświetla pomoc)\n"
-
-#: dirmngr/dirmngr_ldap.c:182
-msgid ""
-"Syntax: dirmngr_ldap [options] [URL]\n"
-"Internal LDAP helper for Dirmngr\n"
-"Interface and options may change without notice\n"
-msgstr ""
-"Składnia: dirmngr_ldap [opcje] [URL]\n"
-"Wewnętrzny program pomocniczy LDAP dla Dirmngr\n"
-"Interfejs i opcje mogą się zmienić bez uprzedzenia\n"
-
-#: dirmngr/dirmngr_ldap.c:291
-#, c-format
-msgid "invalid port number %d\n"
-msgstr "błędny numer portu %d\n"
-
-#: dirmngr/dirmngr_ldap.c:400
-#, c-format
-msgid "scanning result for attribute '%s'\n"
-msgstr "przeszukiwanie wyniku pod kÄ…tem atrybutu ,,%s''\n"
-
-#: dirmngr/dirmngr_ldap.c:407 dirmngr/dirmngr_ldap.c:490
-#: dirmngr/dirmngr_ldap.c:514 dirmngr/dirmngr_ldap.c:526
-#: dirmngr/dirmngr_ldap.c:722
-#, c-format
-msgid "error writing to stdout: %s\n"
-msgstr "błąd zapisu na standardowe wyjście: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:424
-#, c-format
-msgid "          available attribute '%s'\n"
-msgstr "          dostępny atrybut ,,%s''\n"
-
-#: dirmngr/dirmngr_ldap.c:462
-#, c-format
-msgid "attribute '%s' not found\n"
-msgstr "nie znaleziono atrybutu ,,%s''\n"
-
-#: dirmngr/dirmngr_ldap.c:469
-#, c-format
-msgid "found attribute '%s'\n"
-msgstr "znaleziono atrybut ,,%s''\n"
-
-#: dirmngr/dirmngr_ldap.c:581
-#, c-format
-msgid "processing url '%s'\n"
-msgstr "przetwarzanie URL-a ,,%s''\n"
-
-#: dirmngr/dirmngr_ldap.c:588
-#, c-format
-msgid "          user '%s'\n"
-msgstr "          użytkownik ,,%s''\n"
-
-#: dirmngr/dirmngr_ldap.c:590
-#, c-format
-msgid "          pass '%s'\n"
-msgstr "          hasło ,,%s''\n"
-
-#: dirmngr/dirmngr_ldap.c:592
-#, c-format
-msgid "          host '%s'\n"
-msgstr "          host ,,%s''\n"
-
-#: dirmngr/dirmngr_ldap.c:593
-#, c-format
-msgid "          port %d\n"
-msgstr "          port %d\n"
-
-#: dirmngr/dirmngr_ldap.c:595
-#, c-format
-msgid "            DN '%s'\n"
-msgstr "            DN ,,%s''\n"
-
-#: dirmngr/dirmngr_ldap.c:597
-#, c-format
-msgid "        filter '%s'\n"
-msgstr "        filtr ,,%s''\n"
-
-#: dirmngr/dirmngr_ldap.c:602 dirmngr/dirmngr_ldap.c:605
-#, c-format
-msgid "          attr '%s'\n"
-msgstr "          atrybut ,,%s''\n"
-
-#: dirmngr/dirmngr_ldap.c:611
-#, c-format
-msgid "no host name in '%s'\n"
-msgstr "brak nazwy hosta w ,,%s''\n"
-
-#: dirmngr/dirmngr_ldap.c:616
-#, c-format
-msgid "no attribute given for query '%s'\n"
-msgstr "nie podano atrybutu dla zapytania ,,%s''\n"
-
-#: dirmngr/dirmngr_ldap.c:622
-#, c-format
-msgid "WARNING: using first attribute only\n"
-msgstr "OSTRZEŻENIE: użyto tylko pierwszego atrybutu\n"
-
-#: dirmngr/dirmngr_ldap.c:637 dirmngr/dirmngr_ldap.c:678
-#, c-format
-msgid "LDAP init to '%s:%d' failed: %s\n"
-msgstr "nie udało się zainicjować LDAP na ,,%s:%d'': %s\n"
-
-#: dirmngr/dirmngr_ldap.c:659
-#, fuzzy, c-format
-#| msgid "LDAP init to '%s:%d' failed: %s\n"
-msgid "LDAP init to '%s' failed: %s\n"
-msgstr "nie udało się zainicjować LDAP na ,,%s:%d'': %s\n"
-
-#: dirmngr/dirmngr_ldap.c:665
-#, fuzzy, c-format
-#| msgid "LDAP init to '%s:%d' failed: %s\n"
-msgid "LDAP init to '%s' done\n"
-msgstr "nie udało się zainicjować LDAP na ,,%s:%d'': %s\n"
-
-#: dirmngr/dirmngr_ldap.c:704
-#, c-format
-msgid "binding to '%s:%d' failed: %s\n"
-msgstr "dowiązanie do ,,%s:%d'' nie powiodło się: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:728
-#, c-format
-msgid "searching '%s' failed: %s\n"
-msgstr "szukanie ,,%s'' nie powiodło się: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:759
-#, c-format
-msgid "'%s' is not an LDAP URL\n"
-msgstr ",,%s'' nie jest URL-em LDAP\n"
-
-#: dirmngr/dirmngr_ldap.c:765
-#, c-format
-msgid "'%s' is an invalid LDAP URL\n"
-msgstr ",,%s'' jest nieprawidłowym URL-em LDAP\n"
-
-#: dirmngr/http.c:1989 dirmngr/ocsp.c:255
+#: dirmngr/http.c:1998 dirmngr/ocsp.c:255
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "błąd dostępu do ,,%s'': status http %u\n"
 
-#: dirmngr/http.c:3630 dirmngr/ocsp.c:229
+#: dirmngr/http.c:3652 dirmngr/ocsp.c:229
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr "URL ,,%s'' przekierowany na ,,%s'' (%u)\n"
 
-#: dirmngr/http.c:3636 dirmngr/ocsp.c:246
+#: dirmngr/http.c:3658 dirmngr/ocsp.c:246
 #, c-format
 msgid "too many redirections\n"
 msgstr "za dużo przekierowań\n"
 
-#: dirmngr/http.c:3748
+#: dirmngr/http.c:3768
 #, c-format
 msgid "redirection changed to '%s'\n"
 msgstr "przekierowanie zmienione na ,,%s''\n"
@@ -10895,31 +10703,51 @@ msgstr "oczekiwanie na wrapper LDAP %d nie powiodło się: %s\n"
 msgid "ldap wrapper %d stalled - killing\n"
 msgstr "wrapper LDAP %d przytkany - zabito\n"
 
-#: dirmngr/ldap.c:91
+#: dirmngr/ldap.c:92
 #, c-format
 msgid "invalid char 0x%02x in host name - not added\n"
 msgstr "błędny znak 0x%02x w nazwie hosta - nie dodano\n"
 
-#: dirmngr/ldap.c:95
+#: dirmngr/ldap.c:96
 #, c-format
 msgid "adding '%s:%d' to the ldap server list\n"
 msgstr "dodano ,,%s:%d'' do listy serwerów LDAP\n"
 
-#: dirmngr/ldap.c:98 dirmngr/misc.c:512
+#: dirmngr/ldap.c:99 dirmngr/misc.c:512
 #, c-format
 msgid "malloc failed: %s\n"
 msgstr "malloc nie powiodło się: %s\n"
 
-#: dirmngr/ldap.c:634
+#: dirmngr/ldap.c:221
 #, c-format
-msgid "start_cert_fetch: invalid pattern '%s'\n"
-msgstr "start_cert_fetch: błędny wzorzec ,,%s''\n"
+msgid "'%s' is not an LDAP URL\n"
+msgstr ",,%s'' nie jest URL-em LDAP\n"
 
-#: dirmngr/ldap.c:846
+#: dirmngr/ldap.c:227 dirmngr/ldap.c:233
+#, c-format
+msgid "'%s' is an invalid LDAP URL\n"
+msgstr ",,%s'' jest nieprawidłowym URL-em LDAP\n"
+
+#: dirmngr/ldap.c:968
 #, c-format
 msgid "ldap_search hit the size limit of the server\n"
 msgstr "ldap_search natrafiło na limit rozmiaru w serwerze\n"
 
+#: dirmngr/ldapserver.c:119
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr "%s:%u: podano hasło bez użytkownika\n"
+
+#: dirmngr/ldapserver.c:181
+#, c-format
+msgid "%s:%u: ignoring unknown flag '%s'\n"
+msgstr ""
+
+#: dirmngr/ldapserver.c:203
+#, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr "%s:%u: linia pominięta\n"
+
 #: dirmngr/misc.c:172
 #, c-format
 msgid "invalid canonical S-expression found\n"
@@ -11010,87 +10838,87 @@ msgstr "nie podpisane domyślnym certyfikatem podpisującego OCSP"
 msgid "allocating list item failed: %s\n"
 msgstr "przydzielanie elementu listy nie powiodło się: %s\n"
 
-#: dirmngr/ocsp.c:537 dirmngr/ocsp.c:724
+#: dirmngr/ocsp.c:538 dirmngr/ocsp.c:725
 #, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "błąd pobierania ID respondera: %s\n"
 
-#: dirmngr/ocsp.c:584
+#: dirmngr/ocsp.c:585
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr ""
 "nie znaleziono odpowiedniego certyfikatu do zweryfikowania odpowiedzi OCSP\n"
 
-#: dirmngr/ocsp.c:623 dirmngr/validate.c:648
+#: dirmngr/ocsp.c:624 dirmngr/validate.c:648
 #, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "nie znaleziono certyfikatu wystawcy: %s\n"
 
-#: dirmngr/ocsp.c:633
+#: dirmngr/ocsp.c:634
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr "wywołujący nie zwrócił certyfikatu docelowego\n"
 
-#: dirmngr/ocsp.c:640
+#: dirmngr/ocsp.c:641
 #, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "wywołujący nie zwrócił certyfikatu wystawcy\n"
 
-#: dirmngr/ocsp.c:650
+#: dirmngr/ocsp.c:651
 #, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "nie udało się przydzielić kontekstu OCSP: %s\n"
 
-#: dirmngr/ocsp.c:689
+#: dirmngr/ocsp.c:690
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr "nie zdefiniowano domyślnego respondera OCSP\n"
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:696
 #, c-format
 msgid "no default OCSP signer defined\n"
 msgstr "nie zdefiniowano domyślnego podpisującego OCSP\n"
 
-#: dirmngr/ocsp.c:702
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr "użycie domyślnego respondera OCSP ,,%s''\n"
 
-#: dirmngr/ocsp.c:707
+#: dirmngr/ocsp.c:708
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "użycie respondera OCSP ,,%s''\n"
 
-#: dirmngr/ocsp.c:764
+#: dirmngr/ocsp.c:765
 #, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "błąd pobierania stanu OCSP dla certyfikatu docelowego: %s\n"
 
-#: dirmngr/ocsp.c:789
+#: dirmngr/ocsp.c:790
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr "stan certyfikatu: %s (ten=%s następny=%s)\n"
 
-#: dirmngr/ocsp.c:790
+#: dirmngr/ocsp.c:791
 msgid "good"
 msgstr "poprawny"
 
-#: dirmngr/ocsp.c:796
+#: dirmngr/ocsp.c:797
 #, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "certyfikat został unieważniony: %s z powodu: %s\n"
 
-#: dirmngr/ocsp.c:831
+#: dirmngr/ocsp.c:832
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr "responder OCSP zwrócił stan z przyszłości\n"
 
-#: dirmngr/ocsp.c:843
+#: dirmngr/ocsp.c:844
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr "responder OCSP zwrócił stan niebieżący\n"
 
-#: dirmngr/ocsp.c:858
+#: dirmngr/ocsp.c:859
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr "responder OCSP zwrócił stan zbyt stary\n"
@@ -11100,71 +10928,67 @@ msgstr "responder OCSP zwrócił stan zbyt stary\n"
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "assuan_inquire(%s) nie powiodło się: %s\n"
 
-#: dirmngr/server.c:1158
-msgid "ldapserver missing"
-msgstr "brak pola ldapserver"
-
-#: dirmngr/server.c:1224
+#: dirmngr/server.c:1277
 msgid "serialno missing in cert ID"
 msgstr "brak pola serialno w ID certyfikatu"
 
-#: dirmngr/server.c:1387 dirmngr/server.c:1473 dirmngr/server.c:1909
-#: dirmngr/server.c:1980 dirmngr/server.c:2556 dirmngr/server.c:2571
+#: dirmngr/server.c:1440 dirmngr/server.c:1526 dirmngr/server.c:1963
+#: dirmngr/server.c:2034 dirmngr/server.c:2662 dirmngr/server.c:2677
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "assuan_inquire nie powiodło się: %s\n"
 
-#: dirmngr/server.c:1516
+#: dirmngr/server.c:1569
 #, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "fetch_cert_by_url nie powiodło się: %s\n"
 
-#: dirmngr/server.c:1528 dirmngr/server.c:1559 dirmngr/server.c:1718
+#: dirmngr/server.c:1581 dirmngr/server.c:1612 dirmngr/server.c:1772
 #, c-format
 msgid "error sending data: %s\n"
 msgstr "błąd wysyłania danych: %s\n"
 
-#: dirmngr/server.c:1666
+#: dirmngr/server.c:1720
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "start_cert_fetch nie powiodło się: %s\n"
 
-#: dirmngr/server.c:1699
+#: dirmngr/server.c:1753
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "fetch_next_cert nie powiodło się: %s\n"
 
-#: dirmngr/server.c:1726
+#: dirmngr/server.c:1780
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr "przekroczono max_replies %d\n"
 
-#: dirmngr/server.c:2860
+#: dirmngr/server.c:2966
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "nie można przydzielić struktury sterującej: %s\n"
 
-#: dirmngr/server.c:2871
+#: dirmngr/server.c:2977
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "nie udało się przydzielić kontekstu assuan: %s\n"
 
-#: dirmngr/server.c:2892
+#: dirmngr/server.c:2998
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "nie udało się zainicjować serwera: %s\n"
 
-#: dirmngr/server.c:2900
+#: dirmngr/server.c:3006
 #, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "nie udało się zarejestrować poleceń przez Assuana: %s\n"
 
-#: dirmngr/server.c:2933
+#: dirmngr/server.c:3039
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "Problem z accept u Assuana: %s\n"
 
-#: dirmngr/server.c:2952
+#: dirmngr/server.c:3058
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "Przetwarzanie u Assuana nie powiodło się: %s\n"
@@ -11312,69 +11136,69 @@ msgstr "brak działającego dirmngr w tej sesji\n"
 msgid "error sending standard options: %s\n"
 msgstr "błąd wysyłania standardowych opcji: %s\n"
 
-#: tools/gpgconf-comp.c:649
+#: tools/gpgconf-comp.c:655
 msgid "OpenPGP"
 msgstr "OpenPGP"
 
-#: tools/gpgconf-comp.c:653
+#: tools/gpgconf-comp.c:659
 msgid "S/MIME"
 msgstr "S/MIME"
 
-#: tools/gpgconf-comp.c:657
+#: tools/gpgconf-comp.c:663
 #, fuzzy
 #| msgid "public key is %s\n"
 msgid "Public Keys"
 msgstr "klucz publiczny to %s\n"
 
-#: tools/gpgconf-comp.c:661
+#: tools/gpgconf-comp.c:667
 msgid "Private Keys"
 msgstr "Klucze prywatne"
 
-#: tools/gpgconf-comp.c:665
+#: tools/gpgconf-comp.c:671
 msgid "Smartcards"
 msgstr "Karty procesorowe"
 
-#: tools/gpgconf-comp.c:669
+#: tools/gpgconf-comp.c:676
 msgid "TPM"
 msgstr ""
 
-#: tools/gpgconf-comp.c:673
+#: tools/gpgconf-comp.c:681
 msgid "Network"
 msgstr "Sieć"
 
-#: tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:685
 msgid "Passphrase Entry"
 msgstr "Wpisywanie hasła"
 
-#: tools/gpgconf-comp.c:941
+#: tools/gpgconf-comp.c:951
 msgid "Component not suitable for launching"
 msgstr "Komponent nie nadaje siÄ™ do uruchomienia"
 
-#: tools/gpgconf-comp.c:947
+#: tools/gpgconf-comp.c:957
 #, c-format
 msgid "Configuration file of component %s is broken\n"
 msgstr "Plik konfiguracyjny komponentu %s jest uszkodzony\n"
 
-#: tools/gpgconf-comp.c:950
+#: tools/gpgconf-comp.c:960
 #, c-format
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr "Podpowiedź: można użyć polecenia ,,%s%s'', aby uzyskać szczegóły.\n"
 
-#: tools/gpgconf-comp.c:2816
+#: tools/gpgconf-comp.c:2826
 #, c-format
 msgid "External verification of component %s failed"
 msgstr "Zewnętrzna weryfikacja komponentu %s nie powiodła się"
 
-#: tools/gpgconf-comp.c:2946
+#: tools/gpgconf-comp.c:2956
 msgid "Note that group specifications are ignored\n"
 msgstr "Uwaga, określenia grup są ignorowane\n"
 
-#: tools/gpgconf-comp.c:3543
+#: tools/gpgconf-comp.c:3553
 #, c-format
 msgid "error closing '%s'\n"
 msgstr "błąd zamykania ,,%s''\n"
 
-#: tools/gpgconf-comp.c:3545
+#: tools/gpgconf-comp.c:3555
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr "błąd analizy ,,%s''\n"
@@ -11455,15 +11279,15 @@ msgstr ""
 "Składnia: @GPGCONF@ [opcje]\n"
 "Zarządzanie opcjami konfiguracji dla narzędzi z systemu @GNUPG@\n"
 
-#: tools/gpgconf.c:669 tools/gpgconf.c:704
+#: tools/gpgconf.c:703 tools/gpgconf.c:738
 msgid "Need one component argument"
 msgstr "Wymagany jest jeden argument komponentu"
 
-#: tools/gpgconf.c:678 tools/gpgconf.c:728 tools/gpgconf.c:778
+#: tools/gpgconf.c:712 tools/gpgconf.c:762 tools/gpgconf.c:812
 msgid "Component not found"
 msgstr "Nie znaleziono komponentu"
 
-#: tools/gpgconf.c:804
+#: tools/gpgconf.c:838
 msgid "No argument allowed"
 msgstr "Argument nie jest dozwolony"
 
@@ -11480,90 +11304,217 @@ msgstr ""
 "Składnia: gpg-check-pattern [opcje] plik-wzorców\n"
 "Sprawdzanie hasła ze standardowego wejścia względem pliku wzorców\n"
 
-#: tools/gpg-card.c:2390
+#: tools/gpg-card.c:2407
 #, fuzzy, c-format
 #| msgid "Note: keys are already stored on the card!\n"
 msgid "Note: key %s is already stored on the card!\n"
 msgstr "Uwaga: klucze są już zapisane na karcie!\n"
 
-#: tools/gpg-card.c:2393
+#: tools/gpg-card.c:2410
 #, fuzzy, c-format
 #| msgid "Note: keys are already stored on the card!\n"
 msgid "Note: Keys are already stored on the card!\n"
 msgstr "Uwaga: klucze są już zapisane na karcie!\n"
 
-#: tools/gpg-card.c:2396
+#: tools/gpg-card.c:2413
 #, fuzzy, c-format
 #| msgid "Replace existing keys? (y/N) "
 msgid "Replace existing key %s ? (y/N) "
 msgstr "Zastąpić istniejące klucze? (t/N) "
 
-#: tools/gpg-card.c:2549 tools/gpg-card.c:2712 tools/gpg-card.c:2935
-#: tools/gpg-card.c:3044
+#: tools/gpg-card.c:2566 tools/gpg-card.c:2729 tools/gpg-card.c:2952
+#: tools/gpg-card.c:3061
 #, fuzzy, c-format
 #| msgid "OpenPGP card no. %s detected\n"
 msgid "%s card no. %s detected\n"
 msgstr "Wykryto kartÄ™ OpenPGP nr %s\n"
 
-#: tools/gpg-card.c:3396
+#: tools/gpg-card.c:3413
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3406 tools/gpg-card.c:3420
+#: tools/gpg-card.c:3423 tools/gpg-card.c:3437
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
 "         can only be reverted using a factory reset!\n"
 msgstr ""
 
-#: tools/gpg-card.c:3423
+#: tools/gpg-card.c:3440
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3669
+#: tools/gpg-card.c:3686
 #, fuzzy
 #| msgid "add a certificate to the cache"
 msgid "authenticate to the card"
 msgstr "dodanie certyfikatu do pamięci podręcznej"
 
-#: tools/gpg-card.c:3671
+#: tools/gpg-card.c:3688
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3673
+#: tools/gpg-card.c:3690
 msgid "setup KDF for PIN authentication"
 msgstr "ustawienie KDF do uwierzytelniania PIN-em"
 
-#: tools/gpg-card.c:3675
+#: tools/gpg-card.c:3692
 msgid "change a private data object"
 msgstr ""
 
-#: tools/gpg-card.c:3676
+#: tools/gpg-card.c:3693
 #, fuzzy
 #| msgid "add a certificate to the cache"
 msgid "read a certificate from a data object"
 msgstr "dodanie certyfikatu do pamięci podręcznej"
 
-#: tools/gpg-card.c:3677
+#: tools/gpg-card.c:3694
 #, fuzzy
 #| msgid "add a certificate to the cache"
 msgid "store a certificate to a data object"
 msgstr "dodanie certyfikatu do pamięci podręcznej"
 
-#: tools/gpg-card.c:3678
+#: tools/gpg-card.c:3695
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3679
+#: tools/gpg-card.c:3696
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3681
+#: tools/gpg-card.c:3698
 msgid "manage the command history"
 msgstr ""
 
+#~ msgid "requesting key %s from %s server %s\n"
+#~ msgstr "zapytanie o klucz %s z serwera %s %s\n"
+
+#~ msgid "%s:%u: no hostname given\n"
+#~ msgstr "%s:%u: nie podano nazwy hosta\n"
+
+#~ msgid "could not parse keyserver\n"
+#~ msgstr "niezrozumiały adres serwera kluczy\n"
+
+#~ msgid "return all values in a record oriented format"
+#~ msgstr "zwrócenie wszystkich wartości w formacie rekordu"
+
+#~ msgid "|NAME|ignore host part and connect through NAME"
+#~ msgstr "|NAZWA|zignorowanie części z hostem i połączenie poprzez NAZWĘ"
+
+#~ msgid "|NAME|connect to host NAME"
+#~ msgstr "|NAZWA|połączenie z hostem NAZWA"
+
+#~ msgid "|N|connect to port N"
+#~ msgstr "|N|połączenie z portem N"
+
+#~ msgid "|NAME|use user NAME for authentication"
+#~ msgstr "|NAZWA|użycie NAZWY użytkownika do uwierzytelnienia"
+
+#~ msgid "|PASS|use password PASS for authentication"
+#~ msgstr "|HAS�O|użycie HAS�A do uwierzytelnienia"
+
+#~ msgid "take password from $DIRMNGR_LDAP_PASS"
+#~ msgstr "pobranie hasła z $DIRMNGR_LDAP_PASS"
+
+#~ msgid "|STRING|query DN STRING"
+#~ msgstr "|�AŃCUCH|�AŃCUCH zapytania DN"
+
+#~ msgid "|STRING|use STRING as filter expression"
+#~ msgstr "|�AŃCUCH|użycie �AŃCUCHA jako wyrażenia filtra"
+
+#~ msgid "|STRING|return the attribute STRING"
+#~ msgstr "|�AŃCUCH|zwrócenie atrybutu �AŃCUCH"
+
+#~ msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
+#~ msgstr "Składnia: dirmngr_ldap [opcje] [URL] (-h wyświetla pomoc)\n"
+
+#~ msgid ""
+#~ "Syntax: dirmngr_ldap [options] [URL]\n"
+#~ "Internal LDAP helper for Dirmngr\n"
+#~ "Interface and options may change without notice\n"
+#~ msgstr ""
+#~ "Składnia: dirmngr_ldap [opcje] [URL]\n"
+#~ "Wewnętrzny program pomocniczy LDAP dla Dirmngr\n"
+#~ "Interfejs i opcje mogą się zmienić bez uprzedzenia\n"
+
+#~ msgid "invalid port number %d\n"
+#~ msgstr "błędny numer portu %d\n"
+
+#~ msgid "scanning result for attribute '%s'\n"
+#~ msgstr "przeszukiwanie wyniku pod kÄ…tem atrybutu ,,%s''\n"
+
+#~ msgid "error writing to stdout: %s\n"
+#~ msgstr "błąd zapisu na standardowe wyjście: %s\n"
+
+#~ msgid "          available attribute '%s'\n"
+#~ msgstr "          dostępny atrybut ,,%s''\n"
+
+#~ msgid "attribute '%s' not found\n"
+#~ msgstr "nie znaleziono atrybutu ,,%s''\n"
+
+#~ msgid "found attribute '%s'\n"
+#~ msgstr "znaleziono atrybut ,,%s''\n"
+
+#~ msgid "processing url '%s'\n"
+#~ msgstr "przetwarzanie URL-a ,,%s''\n"
+
+#~ msgid "          user '%s'\n"
+#~ msgstr "          użytkownik ,,%s''\n"
+
+#~ msgid "          pass '%s'\n"
+#~ msgstr "          hasło ,,%s''\n"
+
+#~ msgid "          host '%s'\n"
+#~ msgstr "          host ,,%s''\n"
+
+#~ msgid "          port %d\n"
+#~ msgstr "          port %d\n"
+
+#~ msgid "            DN '%s'\n"
+#~ msgstr "            DN ,,%s''\n"
+
+#~ msgid "        filter '%s'\n"
+#~ msgstr "        filtr ,,%s''\n"
+
+#~ msgid "          attr '%s'\n"
+#~ msgstr "          atrybut ,,%s''\n"
+
+#~ msgid "no host name in '%s'\n"
+#~ msgstr "brak nazwy hosta w ,,%s''\n"
+
+#~ msgid "no attribute given for query '%s'\n"
+#~ msgstr "nie podano atrybutu dla zapytania ,,%s''\n"
+
+#~ msgid "WARNING: using first attribute only\n"
+#~ msgstr "OSTRZEŻENIE: użyto tylko pierwszego atrybutu\n"
+
+#~ msgid "LDAP init to '%s:%d' failed: %s\n"
+#~ msgstr "nie udało się zainicjować LDAP na ,,%s:%d'': %s\n"
+
+#, fuzzy
+#~| msgid "LDAP init to '%s:%d' failed: %s\n"
+#~ msgid "LDAP init to '%s' failed: %s\n"
+#~ msgstr "nie udało się zainicjować LDAP na ,,%s:%d'': %s\n"
+
+#, fuzzy
+#~| msgid "LDAP init to '%s:%d' failed: %s\n"
+#~ msgid "LDAP init to '%s' done\n"
+#~ msgstr "nie udało się zainicjować LDAP na ,,%s:%d'': %s\n"
+
+#~ msgid "binding to '%s:%d' failed: %s\n"
+#~ msgstr "dowiązanie do ,,%s:%d'' nie powiodło się: %s\n"
+
+#~ msgid "searching '%s' failed: %s\n"
+#~ msgstr "szukanie ,,%s'' nie powiodło się: %s\n"
+
+#~ msgid "start_cert_fetch: invalid pattern '%s'\n"
+#~ msgstr "start_cert_fetch: błędny wzorzec ,,%s''\n"
+
+#~ msgid "ldapserver missing"
+#~ msgstr "brak pola ldapserver"
+
 #, fuzzy
 #~| msgid "change a passphrase"
 #~ msgid "Suggest a random passphrase."
diff --git a/po/pt.po b/po/pt.po
index 4c0aae6..45b479c 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: 2021-04-20 12:38+0200\n"
+"POT-Creation-Date: 2021-08-24 18:50+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:328
+#: agent/call-pinentry.c:338
 #, 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,48 +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:546
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_OK"
 msgstr ""
 
-#: agent/call-pinentry.c:547
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
-#: agent/call-pinentry.c:548
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|_Yes"
 msgstr ""
 
-#: agent/call-pinentry.c:549
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_No"
 msgstr ""
 
-#: agent/call-pinentry.c:550
+#: agent/call-pinentry.c:560
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:551
+#: agent/call-pinentry.c:561
 msgid "|pinentry-label|_Save in password manager"
 msgstr ""
 
-#: agent/call-pinentry.c:552
+#: agent/call-pinentry.c:562
 #, 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:554
+#: agent/call-pinentry.c:564
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:555
+#: agent/call-pinentry.c:565
 #, fuzzy
 #| msgid "invalid passphrase"
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "frase-secreta inválida"
 
+#: agent/call-pinentry.c:566
+msgid "Caps Lock is on"
+msgstr ""
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:944
+#: agent/call-pinentry.c:1022
 msgid "Suggest"
 msgstr ""
 
@@ -81,13 +85,25 @@ 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:966
+#: agent/call-pinentry.c:1044
 msgid "pinentry.genpin.tooltip"
 msgstr ""
 
+#: agent/call-pinentry.c:1072
+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
+#, 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:998
+#: agent/call-pinentry.c:1198
 msgid "Quality:"
 msgstr ""
 
@@ -97,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:1019
+#: agent/call-pinentry.c:1219
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:1263
+#: agent/call-pinentry.c:1477
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:1266
+#: agent/call-pinentry.c:1480
 #, 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:1303 agent/call-pinentry.c:1506
+#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1303 agent/call-pinentry.c:1506
-#: agent/protect-tool.c:728
+#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/protect-tool.c:729
 #, fuzzy
 msgid "Passphrase:"
 msgstr "frase secreta incorrecta"
 
-#: agent/call-pinentry.c:1330 agent/call-pinentry.c:1580 agent/command.c:1799
-#: agent/command.c:1852 agent/command-ssh.c:3046 agent/genkey.c:398
+#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
+#: agent/command.c:1988 agent/command-ssh.c:3046 agent/genkey.c:442
 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:1351 agent/call-pinentry.c:1603
+#: agent/call-pinentry.c:1566 agent/call-pinentry.c:1830
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:1362 agent/call-pinentry.c:1614
+#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
 msgid "Repeat:"
 msgstr ""
 
-#: agent/call-pinentry.c:1372 agent/call-pinentry.c:1384
-#: agent/call-pinentry.c:1624 agent/call-pinentry.c:1636
+#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
+#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
 #, fuzzy
 msgid "PIN too long"
 msgstr "frase secreta demasiado longa\n"
 
-#: agent/call-pinentry.c:1373 agent/call-pinentry.c:1625
+#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "frase secreta demasiado longa\n"
 
-#: agent/call-pinentry.c:1381 agent/call-pinentry.c:1633
+#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caracter inválido no nome\n"
 
-#: agent/call-pinentry.c:1386 agent/call-pinentry.c:1638
+#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:1405 agent/call-pinentry.c:1656
+#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI incorreto"
 
-#: agent/call-pinentry.c:1405 agent/call-pinentry.c:1656
+#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "frase secreta incorrecta"
 
-#: agent/command.c:697
+#: agent/command.c:823
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:698
+#: agent/command.c:824
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1106 g10/card-util.c:708 g10/card-util.c:729
+#: agent/command.c:1235 g10/card-util.c:713 g10/card-util.c:734
 #, 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:1634 agent/command.c:1791 agent/command-ssh.c:2974
-#: agent/genkey.c:333
+#: agent/command.c:1756 agent/command.c:1921 agent/command-ssh.c:2974
+#: agent/genkey.c:377
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "muda a frase secreta"
 
-#: agent/command.c:2567
+#: agent/command.c:2703
 #, 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:2697
+#: agent/command.c:2833
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -208,26 +224,26 @@ msgstr ""
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "algoritmo de protecção %d%s não é suportado\n"
 
-#: agent/command-ssh.c:872 common/dotlock.c:852 g10/card-util.c:953
-#: g10/export.c:1329 g10/gpg.c:1431 g10/keygen.c:5347 g10/keyring.c:1319
-#: g10/keyring.c:1632 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
+#: agent/command-ssh.c:872 common/dotlock.c:852 g10/card-util.c:963
+#: g10/export.c:1329 g10/gpg.c:1431 g10/keygen.c:5377 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
 #: g10/sign.c:1106 g10/sign.c:1443 g10/tdbio.c:753 tools/gpg-card.c:479
 #, fuzzy, c-format
 #| msgid "can't create `%s': %s\n"
 msgid "can't create '%s': %s\n"
 msgstr "impossível criar `%s': %s\n"
 
-#: agent/command-ssh.c:884 common/helpfile.c:57 g10/card-util.c:910
+#: agent/command-ssh.c:884 common/helpfile.c:57 g10/card-util.c:920
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
 #: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:721 g10/gpg.c:1432
-#: g10/import.c:371 g10/import.c:558 g10/import.c:793 g10/keygen.c:4322
-#: g10/keyring.c:1658 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
+#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4326
+#: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
 #: g10/plaintext.c:610 g10/sign.c:1086 g10/sign.c:1311 g10/sign.c:1424
 #: g10/sign.c:1596 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2380
-#: sm/gpgsm.c:2410 sm/gpgsm.c:2448 sm/keylist.c:1737 sm/qualified.c:65
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2236
+#: sm/gpgsm.c:2266 sm/gpgsm.c:2304 sm/keylist.c:1775 sm/qualified.c:65
 #: dirmngr/certcache.c:396 dirmngr/certcache.c:476 dirmngr/certcache.c:478
-#: dirmngr/crlcache.c:2588 dirmngr/dirmngr.c:1720 tools/gpg-card.c:408
+#: dirmngr/crlcache.c:2591 dirmngr/dirmngr.c:1759 tools/gpg-card.c:408
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
@@ -336,39 +352,39 @@ msgstr "a frase secreta não foi repetida corretamente; tente outra vez"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:109 sm/certreqgen-ui.c:433
+#: 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:116
+#: agent/genkey.c:150
 #, fuzzy, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "a escrever para `%s'\n"
 
-#: agent/genkey.c:154
+#: agent/genkey.c:191
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Insira a frase secreta\n"
 
-#: agent/genkey.c:184
+#: agent/genkey.c:227
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:186
+#: agent/genkey.c:229
 #, 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:198
+#: agent/genkey.c:241
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:215
+#: agent/genkey.c:258
 #, fuzzy, c-format
 #| msgid "Name must be at least 5 characters long\n"
 msgid "A passphrase should be at least %u character long."
@@ -376,7 +392,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:234
+#: agent/genkey.c:277
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -384,109 +400,108 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:260
+#: agent/genkey.c:304
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:275
+#: agent/genkey.c:319
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
-#: agent/genkey.c:296
+#: agent/genkey.c:340
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "Usar esta chave de qualquer modo? "
 
-#: agent/genkey.c:464
+#: agent/genkey.c:508
 #, 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:590
+#: agent/genkey.c:637
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "muda a frase secreta"
 
-#: agent/gpg-agent.c:162 scd/scdaemon.c:115 dirmngr/dirmngr.c:182
+#: agent/gpg-agent.c:164 scd/scdaemon.c:115 dirmngr/dirmngr.c:183
 msgid "Options used for startup"
 msgstr ""
 
-#: agent/gpg-agent.c:164 scd/scdaemon.c:120 dirmngr/dirmngr.c:171
+#: agent/gpg-agent.c:166 scd/scdaemon.c:120 dirmngr/dirmngr.c:172
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:117 dirmngr/dirmngr.c:170
+#: agent/gpg-agent.c:167 scd/scdaemon.c:117 dirmngr/dirmngr.c:171
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:167 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:169 dirmngr/dirmngr.c:174
 #, fuzzy
 #| msgid "Key is superseded"
 msgid "run in supervised mode"
 msgstr "A chave foi substituída"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:121 dirmngr/dirmngr.c:184
+#: agent/gpg-agent.c:171 scd/scdaemon.c:121 dirmngr/dirmngr.c:185
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:170 scd/scdaemon.c:122 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:172 scd/scdaemon.c:122 dirmngr/dirmngr.c:186
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:171 scd/scdaemon.c:123 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:173 scd/scdaemon.c:123 dirmngr/dirmngr.c:187
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:179 g10/gpg.c:589 scd/scdaemon.c:125 sm/gpgsm.c:422
-#: dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:181 g10/gpg.c:589 scd/scdaemon.c:125 sm/gpgsm.c:423
+#: dirmngr/dirmngr.c:189
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:574 scd/scdaemon.c:129 sm/gpgsm.c:265
-#: dirmngr/dirmngr.c:192
+#: agent/gpg-agent.c:185 g10/gpg.c:574 scd/scdaemon.c:129 sm/gpgsm.c:265
+#: dirmngr/dirmngr.c:193
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: agent/gpg-agent.c:185 g10/gpg.c:576 g10/gpgv.c:78 kbx/kbxutil.c:89
+#: agent/gpg-agent.c:187 g10/gpg.c:576 g10/gpgv.c:78 kbx/kbxutil.c:89
 #: scd/scdaemon.c:131 sm/gpgsm.c:267 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:194 dirmngr/dirmngr_ldap.c:102
-#: tools/gpg-connect-agent.c:85 tools/gpgconf.c:111
+#: dirmngr/dirmngr.c:195 tools/gpg-connect-agent.c:85 tools/gpgconf.c:111
 msgid "verbose"
 msgstr "detalhado"
 
-#: agent/gpg-agent.c:186 g10/gpg.c:578 g10/gpgv.c:79 kbx/kbxutil.c:90
+#: agent/gpg-agent.c:188 g10/gpg.c:578 g10/gpgv.c:79 kbx/kbxutil.c:90
 #: scd/scdaemon.c:132 sm/gpgsm.c:269 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:195 dirmngr/dirmngr_ldap.c:103
+#: dirmngr/dirmngr.c:196
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: agent/gpg-agent.c:194 g10/gpg.c:593 sm/gpgsm.c:283 dirmngr/dirmngr.c:205
+#: agent/gpg-agent.c:196 g10/gpg.c:593 sm/gpgsm.c:283 dirmngr/dirmngr.c:206
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 scd/scdaemon.c:146 sm/gpgsm.c:290
-#: dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:599 scd/scdaemon.c:146 sm/gpgsm.c:290
+#: dirmngr/dirmngr.c:210
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: agent/gpg-agent.c:201
+#: agent/gpg-agent.c:203
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualizar a base de dados de confiança"
 
-#: agent/gpg-agent.c:203
+#: agent/gpg-agent.c:205
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 #, fuzzy
 #| msgid "|NAME|set terminal charset to NAME"
 msgid "|NAME|accept some commands via NAME"
@@ -494,278 +509,278 @@ msgstr ""
 "|NOME|definir mapa de caracteres do terminal como\n"
 "NOME"
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:215
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:216
+#: agent/gpg-agent.c:218
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
 msgstr "não suportado"
 
-#: agent/gpg-agent.c:218
+#: agent/gpg-agent.c:220
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:221
+#: agent/gpg-agent.c:223
 #, fuzzy
 #| msgid "not supported"
 msgid "enable putty support"
 msgstr "não suportado"
 
-#: agent/gpg-agent.c:233 g10/gpg.c:844 scd/scdaemon.c:176 sm/gpgsm.c:382
+#: agent/gpg-agent.c:235 g10/gpg.c:844 scd/scdaemon.c:176 sm/gpgsm.c:383
 msgid "Options controlling the security"
 msgstr ""
 
-#: agent/gpg-agent.c:236
+#: agent/gpg-agent.c:238
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:238
+#: agent/gpg-agent.c:240
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:242
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:244
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:246
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:248
 #, fuzzy
 msgid "disallow the use of an external password cache"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:250
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:253
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: agent/gpg-agent.c:256
+#: agent/gpg-agent.c:258
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:261
 msgid "do not allow bypassing the passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:261
+#: agent/gpg-agent.c:263
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:265
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:266
+#: agent/gpg-agent.c:268
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:268
+#: agent/gpg-agent.c:272
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|usar mode de frase secreta N"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:274
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: agent/gpg-agent.c:273
+#: agent/gpg-agent.c:277
 msgid "Options controlling the PIN-Entry"
 msgstr ""
 
-#: agent/gpg-agent.c:275
+#: agent/gpg-agent.c:279
 #, fuzzy
 #| msgid "use the gpg-agent"
 msgid "never use the PIN-entry"
 msgstr "utilizar o gpg-agent"
 
-#: agent/gpg-agent.c:277
+#: agent/gpg-agent.c:281
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:283
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:282
+#: agent/gpg-agent.c:286
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:286
+#: agent/gpg-agent.c:290
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:294
 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:551 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: agent/gpg-agent.c:557 agent/preset-passphrase.c:99 agent/protect-tool.c:154
 #: g10/gpg.c:1132 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:612 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:438
-#: dirmngr/dirmngr_ldap.c:175 tools/gpg-connect-agent.c:220 tools/gpgconf.c:151
+#: sm/gpgsm.c:613 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:446
+#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:151
 #: 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:560
+#: agent/gpg-agent.c:566
 #, fuzzy
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
 
-#: agent/gpg-agent.c:562
+#: agent/gpg-agent.c:568
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:607 g10/gpg.c:1337 scd/scdaemon.c:384 sm/gpgsm.c:760
-#: dirmngr/dirmngr.c:522
+#: agent/gpg-agent.c:613 g10/gpg.c:1337 scd/scdaemon.c:384 sm/gpgsm.c:761
+#: dirmngr/dirmngr.c:530
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:972 g10/gpg.c:3910 g10/gpg.c:3934 sm/gpgsm.c:1769
-#: sm/gpgsm.c:1775
+#: agent/gpg-agent.c:986 g10/gpg.c:3907 g10/gpg.c:3931 sm/gpgsm.c:1622
+#: sm/gpgsm.c:1628
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado é inválido\n"
 
-#: agent/gpg-agent.c:1196 agent/gpg-agent.c:2019 common/comopt.c:93
-#: g10/gpg.c:2591 scd/scdaemon.c:549 sm/gpgsm.c:1155 dirmngr/dirmngr.c:989
-#: dirmngr/dirmngr.c:1840
+#: agent/gpg-agent.c:1210 agent/gpg-agent.c:2035 common/comopt.c:93
+#: g10/gpg.c:2594 scd/scdaemon.c:549 sm/gpgsm.c:1028 dirmngr/dirmngr.c:1029
+#: dirmngr/dirmngr.c:1879
 #, 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:1335 g10/gpg.c:3861 scd/scdaemon.c:687 sm/gpgsm.c:1709
-#: dirmngr/dirmngr.c:1108 tools/gpg-connect-agent.c:1270 tools/gpgconf.c:634
+#: agent/gpg-agent.c:1349 g10/gpg.c:3858 scd/scdaemon.c:687 sm/gpgsm.c:1562
+#: dirmngr/dirmngr.c:1145 tools/gpg-connect-agent.c:1270 tools/gpgconf.c:668
 #, 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:2172 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1267
+#: agent/gpg-agent.c:2188 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1306
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "impossível criar %s: %s\n"
 
-#: agent/gpg-agent.c:2189 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1280
+#: agent/gpg-agent.c:2205 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1319
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2228
+#: agent/gpg-agent.c:2244
 #, 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:2239 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1312
+#: agent/gpg-agent.c:2255 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1351
 #, 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:2244 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1315
+#: agent/gpg-agent.c:2260 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1354
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "erro ao enviar para `%s': %s\n"
 
-#: agent/gpg-agent.c:2255 agent/gpg-agent.c:2295 agent/gpg-agent.c:2304
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1324
+#: agent/gpg-agent.c:2271 agent/gpg-agent.c:2311 agent/gpg-agent.c:2320
+#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1363
 #, 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:2269 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1336
+#: agent/gpg-agent.c:2285 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1375
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: agent/gpg-agent.c:2289 agent/gpg-agent.c:2342 common/homedir.c:517
+#: agent/gpg-agent.c:2305 agent/gpg-agent.c:2358 common/homedir.c:537
 #: 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:2292 agent/gpg-agent.c:2347 common/homedir.c:520
+#: agent/gpg-agent.c:2308 agent/gpg-agent.c:2363 common/homedir.c:540
 #: g10/openfile.c:402
 #, fuzzy, c-format
 msgid "directory '%s' created\n"
 msgstr "%s: directoria criada\n"
 
-#: agent/gpg-agent.c:2353
+#: agent/gpg-agent.c:2369
 #, 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:2357
+#: agent/gpg-agent.c:2373
 #, fuzzy, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "%s: impossível criar directoria: %s\n"
 
-#: agent/gpg-agent.c:2512 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2069
+#: agent/gpg-agent.c:2528 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2108
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: agent/gpg-agent.c:2719
+#: agent/gpg-agent.c:2735
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2724
+#: agent/gpg-agent.c:2740
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2799
+#: agent/gpg-agent.c:2815
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2804
+#: agent/gpg-agent.c:2820
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3026 scd/scdaemon.c:1374 dirmngr/dirmngr.c:2283
+#: agent/gpg-agent.c:3042 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2322
 #, fuzzy, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "actualização da chave secreta falhou: %s\n"
 
-#: agent/gpg-agent.c:3114 scd/scdaemon.c:1439
+#: agent/gpg-agent.c:3130 scd/scdaemon.c:1441
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: ignorado: %s\n"
 
-#: agent/gpg-agent.c:3252 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3271 common/simple-pwquery.c:247 g10/call-agent.c:260
 #: sm/call-agent.c:131 tools/gpg-connect-agent.c:2319 tools/card-call-scd.c:311
 #, fuzzy, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "o gpg-agent não está disponível nesta sessão\n"
 
-#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:70
+#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:66
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -787,7 +802,7 @@ msgid ""
 msgstr ""
 
 #: agent/protect-tool.c:107 g10/gpg.c:448 kbx/kbxutil.c:72 sm/gpgsm.c:215
-#: dirmngr/dirmngr.c:168 tools/gpgconf.c:81
+#: dirmngr/dirmngr.c:169 tools/gpgconf.c:81
 msgid ""
 "@Commands:\n"
 " "
@@ -817,40 +832,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:707
+#: agent/protect-tool.c:708 sm/import.c:775
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Por favor digite a frase secreta \n"
 
-#: agent/protect-tool.c:712
+#: agent/protect-tool.c:713 sm/export.c:727
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Por favor digite a frase secreta \n"
 
-#: agent/protect-tool.c:718
+#: agent/protect-tool.c:719
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:723
+#: agent/protect-tool.c:724
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Por favor digite a frase secreta \n"
 
-#: agent/protect-tool.c:734
+#: agent/protect-tool.c:735
 #, fuzzy, c-format
 msgid "cancelled\n"
 msgstr "cancelado pelo utilizador\n"
 
-#: agent/protect-tool.c:736
+#: agent/protect-tool.c:737
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: agent/trustlist.c:153 agent/trustlist.c:363 tools/gpgconf.c:424
+#: agent/trustlist.c:153 agent/trustlist.c:363 tools/gpgconf.c:458
 #, fuzzy, c-format
 msgid "error opening '%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
@@ -1005,7 +1020,7 @@ msgstr "verificação da assinatura criada falhou: %s\n"
 msgid "secret key parts are not available\n"
 msgstr "partes da chave secreta não disponíveis\n"
 
-#: agent/cvt-openpgp.c:343 g10/card-util.c:1562
+#: agent/cvt-openpgp.c:343 g10/card-util.c:1575
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -1037,7 +1052,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:505 common/exechelp-posix.c:580
-#: common/exechelp-posix.c:866 dirmngr/dirmngr.c:1354
+#: common/exechelp-posix.c:866 dirmngr/dirmngr.c:1393
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
@@ -1110,7 +1125,7 @@ msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "criação de armadura falhou: %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3082
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3099
 #, fuzzy
 msgid "yes"
 msgstr "sim"
@@ -1166,7 +1181,7 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:115 g10/card-util.c:917 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:927 tools/no-libgcrypt.c:30
 #: tools/gpg-card.c:416
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
@@ -1238,7 +1253,7 @@ msgstr "erro ao criar porta-chaves `%s': %s\n"
 msgid "server '%s' is older than us (%s < %s)"
 msgstr ""
 
-#: common/asshelp.c:737 g10/call-dirmngr.c:408
+#: common/asshelp.c:737 g10/call-dirmngr.c:407
 #, fuzzy, c-format
 #| msgid "WARNING: %s overrides %s\n"
 msgid "WARNING: %s\n"
@@ -1333,7 +1348,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:4212
+#: scd/app-openpgp.c:4214
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
@@ -1417,12 +1432,12 @@ msgstr "Esta chave expirou!"
 msgid "Root certificate trustworthy"
 msgstr "certificado incorrecto"
 
-#: common/audit.c:1112 sm/certchain.c:1242
+#: common/audit.c:1112 sm/certchain.c:1243
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "certificado incorrecto"
 
-#: common/audit.c:1115 sm/certchain.c:1252
+#: common/audit.c:1115 sm/certchain.c:1253
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Nenhuma ajuda disponível"
@@ -1474,22 +1489,22 @@ msgstr "versão desconhecida"
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "caracter radix64 inválido %02x ignorado\n"
 
-#: common/ttyio.c:433
+#: common/ttyio.c:447
 #, c-format
 msgid "Sorry, we are in batchmode - can't get input\n"
 msgstr ""
 
-#: common/ttyio.c:439
+#: common/ttyio.c:453
 #, c-format
 msgid "Sorry, no terminal at all requested - can't get input\n"
 msgstr ""
 
-#: common/ttyio.c:474 common/ttyio.c:484
+#: common/ttyio.c:488 common/ttyio.c:498
 #, c-format
 msgid "too many errors; giving up\n"
 msgstr ""
 
-#: common/ttyio.c:536
+#: common/ttyio.c:550
 #, c-format
 msgid "Control-D detected\n"
 msgstr ""
@@ -1543,8 +1558,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:1036 dirmngr/dirmngr.c:895
-#: dirmngr/dirmngr.c:904
+#: common/init.c:191 sm/gpgsm.c:909 dirmngr/dirmngr.c:935 dirmngr/dirmngr.c:944
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
@@ -1702,7 +1716,7 @@ msgid "Enter passphrase: "
 msgstr "Digite a frase secreta: "
 
 #: g10/call-agent.c:318 g10/encrypt.c:282 g10/encrypt.c:818 g10/sign.c:473
-#: sm/call-agent.c:180 sm/encrypt.c:701 sm/sign.c:436
+#: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
 #, fuzzy, c-format
 msgid "%s is not compliant with %s mode\n"
 msgstr "%s não faz sentido com %s!\n"
@@ -1712,225 +1726,225 @@ msgstr "%s não faz sentido com %s!\n"
 msgid "error from TPM: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/call-agent.c:2123 g10/passphrase.c:225 g10/passphrase.c:258
-#: tools/card-call-scd.c:1751
+#: g10/call-agent.c:2135 g10/passphrase.c:233 g10/passphrase.c:266
+#: tools/card-call-scd.c:1755
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problema com o agente: o agente returnou 0x%lx\n"
 
-#: g10/call-dirmngr.c:179 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2316
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2316
 #, fuzzy, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "o gpg-agent não está disponível nesta sessão\n"
 
-#: g10/call-dirmngr.c:213
+#: g10/call-dirmngr.c:212
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "keyserver option \"honor-keyserver-url\" may not be used in Tor mode\n"
 msgstr "não pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/call-dirmngr.c:386
+#: g10/call-dirmngr.c:385
 msgid "WKD uses a cached result"
 msgstr ""
 
-#: g10/call-dirmngr.c:389
+#: g10/call-dirmngr.c:388
 msgid "Tor is not running"
 msgstr ""
 
-#: g10/call-dirmngr.c:391
+#: g10/call-dirmngr.c:390
 #, fuzzy
 msgid "Tor is not properly configured"
 msgstr "%s: versão de ficheiro inválida %d\n"
 
-#: g10/call-dirmngr.c:393
+#: g10/call-dirmngr.c:392
 #, fuzzy
 msgid "DNS is not properly configured"
 msgstr "%s: versão de ficheiro inválida %d\n"
 
-#: g10/call-dirmngr.c:395
+#: g10/call-dirmngr.c:394
 msgid "unacceptable HTTP redirect from server"
 msgstr ""
 
-#: g10/call-dirmngr.c:397
+#: g10/call-dirmngr.c:396
 msgid "unacceptable HTTP redirect from server was cleaned up"
 msgstr ""
 
-#: g10/call-dirmngr.c:399
+#: g10/call-dirmngr.c:398
 #, fuzzy
 #| msgid "generate a revocation certificate"
 msgid "server uses an invalid certificate"
 msgstr "gerar um certificado de revogação"
 
-#: g10/call-dirmngr.c:406 g10/gpg.c:4599
+#: g10/call-dirmngr.c:405 g10/gpg.c:4596
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:369 g10/card-util.c:1924
-#: tools/gpg-card.c:3039
+#: g10/card-util.c:86 g10/card-util.c:374 g10/card-util.c:1937
+#: tools/gpg-card.c:3056
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "chave secreta não disponível"
 
-#: g10/card-util.c:91 g10/card-util.c:1930
+#: g10/card-util.c:91 g10/card-util.c:1943
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:97 g10/card-util.c:2309 g10/delkey.c:164 g10/keyedit.c:1428
-#: g10/keygen.c:4791 g10/revoke.c:214 g10/revoke.c:638
+#: g10/card-util.c:97 g10/card-util.c:2322 g10/delkey.c:164 g10/keyedit.c:1428
+#: g10/keygen.c:4795 g10/revoke.c:214 g10/revoke.c:639
 #, fuzzy, c-format
 msgid "can't do this in batch mode\n"
 msgstr "impossível fazer isso em modo não-interativo\n"
 
-#: g10/card-util.c:105 tools/gpg-card.c:2943
+#: g10/card-util.c:105 tools/gpg-card.c:2960
 #, fuzzy, c-format
 msgid "This command is only available for version 2 cards\n"
 msgstr "Este comando não é permitido no modo %s.\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3398 tools/gpg-card.c:2948
+#: g10/card-util.c:107 scd/app-openpgp.c:3399 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"
 
-#: g10/card-util.c:140 g10/card-util.c:1448 g10/card-util.c:1710
-#: g10/card-util.c:1802 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1991 g10/keygen.c:2165 g10/keygen.c:2385 g10/keygen.c:2685
+#: g10/card-util.c:140 g10/card-util.c:1458 g10/card-util.c:1723
+#: g10/card-util.c:1815 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/keygen.c:1992 g10/keygen.c:2166 g10/keygen.c:2386 g10/keygen.c:2686
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
 #: tools/gpg-card.c:510
 msgid "Your selection? "
 msgstr "Opção? "
 
-#: g10/card-util.c:262 g10/card-util.c:313 tools/gpg-card.c:596
+#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:596
 #: tools/gpg-card.c:636
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:558 tools/gpg-card.c:903
+#: g10/card-util.c:563 tools/gpg-card.c:905
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:559 tools/gpg-card.c:904
+#: g10/card-util.c:564 tools/gpg-card.c:906
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:586 tools/gpg-card.c:931
+#: g10/card-util.c:591 tools/gpg-card.c:933
 #, fuzzy
 msgid "not forced"
 msgstr "não processado"
 
-#: g10/card-util.c:586 tools/gpg-card.c:931
+#: g10/card-util.c:591 tools/gpg-card.c:933
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:768 tools/gpg-card.c:1468
+#: g10/card-util.c:773 tools/gpg-card.c:1484
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:770 tools/gpg-card.c:1470
+#: g10/card-util.c:775 tools/gpg-card.c:1486
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:772 tools/gpg-card.c:1472
+#: g10/card-util.c:777 tools/gpg-card.c:1488
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:789 tools/gpg-card.c:1505
+#: g10/card-util.c:795 tools/gpg-card.c:1521
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:791 tools/gpg-card.c:1506
+#: g10/card-util.c:797 tools/gpg-card.c:1522
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:809 tools/gpg-card.c:1523
+#: g10/card-util.c:816 tools/gpg-card.c:1539
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:830 tools/gpg-card.c:1561
+#: g10/card-util.c:840 tools/gpg-card.c:1577
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "a escrever chave pública para `%s'\n"
 
-#: g10/card-util.c:926 g10/decrypt-data.c:495 g10/import.c:406 g10/import.c:756
-#: g10/import.c:815 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1666
-#: tools/gpgconf.c:437 tools/gpgconf.c:483 tools/gpg-card.c:426
+#: g10/card-util.c:936 g10/decrypt-data.c:495 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:1705
+#: tools/gpgconf.c:471 tools/gpgconf.c:517 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:959 g10/decrypt-data.c:498 g10/export.c:2496
+#: g10/card-util.c:969 g10/decrypt-data.c:498 g10/export.c:2496
 #: dirmngr/crlcache.c:925 tools/gpg-card.c:486 tools/gpg-card.c:493
 #, fuzzy, c-format
 msgid "error writing '%s': %s\n"
 msgstr "erro na escrita do porta-chaves `%s': %s\n"
 
-#: g10/card-util.c:986 tools/gpg-card.c:1650
+#: g10/card-util.c:996 tools/gpg-card.c:1666
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:1024 tools/gpg-card.c:1945
+#: g10/card-util.c:1034 tools/gpg-card.c:1962
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:1109 tools/gpg-card.c:1699
+#: g10/card-util.c:1119 tools/gpg-card.c:1715
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferências actualizadas"
 
-#: g10/card-util.c:1117 tools/gpg-card.c:1710
+#: g10/card-util.c:1127 tools/gpg-card.c:1726
 #, fuzzy, c-format
 msgid "Error: invalid length of preference string.\n"
 msgstr "caracter inválido na cadeia de caractéres da preferência\n"
 
-#: g10/card-util.c:1126 tools/gpg-card.c:1719
+#: g10/card-util.c:1136 tools/gpg-card.c:1735
 #, fuzzy, c-format
 msgid "Error: invalid characters in preference string.\n"
 msgstr "caracter inválido na cadeia de caractéres da preferência\n"
 
-#: g10/card-util.c:1148 tools/gpg-card.c:1753
+#: g10/card-util.c:1158 tools/gpg-card.c:1769
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1162 tools/gpg-card.c:1770
+#: g10/card-util.c:1172 tools/gpg-card.c:1786
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "%s: versão de ficheiro inválida %d\n"
 
-#: g10/card-util.c:1185 tools/gpg-card.c:1835
+#: g10/card-util.c:1195 tools/gpg-card.c:1852
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "mostra impressão digital"
 
-#: g10/card-util.c:1209 tools/gpg-card.c:1861
+#: g10/card-util.c:1219 tools/gpg-card.c:1878
 #, fuzzy, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "%s: versão de ficheiro inválida %d\n"
 
-#: g10/card-util.c:1259
+#: g10/card-util.c:1269
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "A geração de chaves falhou: %s\n"
 
-#: g10/card-util.c:1260
+#: g10/card-util.c:1270
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "nenhum dado OpenPGP válido encontrado.\n"
 
-#: g10/card-util.c:1273 g10/keygen.c:4811 g10/keygen.c:5972
+#: g10/card-util.c:1283 g10/keygen.c:4815 g10/keygen.c:6003
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
 
-#: g10/card-util.c:1358
+#: g10/card-util.c:1368
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1375 tools/gpg-card.c:3328
+#: g10/card-util.c:1385 tools/gpg-card.c:3345
 msgid ""
 "Note: There is no guarantee that the card supports the requested\n"
 "      key type or size.  If the key generation does not succeed,\n"
@@ -1938,102 +1952,102 @@ msgid ""
 "      key types and sizes are supported.\n"
 msgstr ""
 
-#: g10/card-util.c:1396 g10/keygen.c:2570 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1406 g10/keygen.c:2571 sm/certreqgen-ui.c:180
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Qual o tamanho de chave desejado? (1024) "
 
-#: g10/card-util.c:1406 g10/keygen.c:2493 g10/keygen.c:2525
+#: g10/card-util.c:1416 g10/keygen.c:2494 g10/keygen.c:2526
 #: sm/certreqgen-ui.c:195
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/card-util.c:1414 g10/keygen.c:2578 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1424 g10/keygen.c:2579 sm/certreqgen-ui.c:185
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/card-util.c:1433
+#: g10/card-util.c:1443
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1435
+#: g10/card-util.c:1445
 #, fuzzy
 msgid "Signature key\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/card-util.c:1437
+#: g10/card-util.c:1447
 #, fuzzy
 msgid "Encryption key\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/card-util.c:1439
+#: g10/card-util.c:1449
 msgid "Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1441 g10/keygen.c:2112 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1451 g10/keygen.c:2113 sm/certreqgen-ui.c:158
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/card-util.c:1442 sm/certreqgen-ui.c:159
+#: g10/card-util.c:1452 sm/certreqgen-ui.c:159
 #, fuzzy, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA (apenas assinatura)\n"
 
-#: g10/card-util.c:1443
+#: g10/card-util.c:1453
 #, fuzzy, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) DSA e ElGamal (por omissão)\n"
 
-#: g10/card-util.c:1455 g10/card-util.c:1722 g10/card-util.c:1822
-#: g10/keyedit.c:900 g10/keygen.c:2017 g10/keygen.c:2045 g10/keygen.c:2172
-#: g10/keygen.c:2425 g10/keygen.c:2713 g10/revoke.c:836
+#: g10/card-util.c:1468 g10/card-util.c:1735 g10/card-util.c:1835
+#: g10/keyedit.c:900 g10/keygen.c:2018 g10/keygen.c:2046 g10/keygen.c:2173
+#: g10/keygen.c:2426 g10/keygen.c:2714 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Opção inválida.\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1541
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 
-#: g10/card-util.c:1533
+#: g10/card-util.c:1546
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1582
 #, fuzzy, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "erro ao enviar para `%s': %s\n"
 
-#: g10/card-util.c:1585 g10/card-util.c:2106 g10/card-util.c:2162
+#: g10/card-util.c:1598 g10/card-util.c:2119 g10/card-util.c:2175
 #, fuzzy, c-format
 msgid "error getting card info: %s\n"
 msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
 
-#: g10/card-util.c:1591 g10/card-util.c:1936 g10/card-util.c:2112
-#: g10/card-util.c:2171 tools/gpg-card.c:3057 tools/gpg-card.c:3296
-#: tools/gpg-card.c:3354
+#: g10/card-util.c:1604 g10/card-util.c:1949 g10/card-util.c:2125
+#: g10/card-util.c:2184 tools/gpg-card.c:3074 tools/gpg-card.c:3313
+#: tools/gpg-card.c:3371
 #, fuzzy, c-format
 #| msgid "This command is not allowed while in %s mode.\n"
 msgid "This command is not supported by this card\n"
 msgstr "Este comando não é permitido no modo %s.\n"
 
-#: g10/card-util.c:1637 tools/gpg-card.c:2426
+#: g10/card-util.c:1650 tools/gpg-card.c:2443
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1651
+#: g10/card-util.c:1664
 #, fuzzy, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "ignorado: a chave secreta já está presente\n"
 
-#: g10/card-util.c:1654 tools/gpg-card.c:2398
+#: g10/card-util.c:1667 tools/gpg-card.c:2415
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1666 tools/gpg-card.c:2457
+#: g10/card-util.c:1679 tools/gpg-card.c:2474
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2041,172 +2055,172 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1701
+#: g10/card-util.c:1714
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/card-util.c:1703 g10/card-util.c:1793
+#: g10/card-util.c:1716 g10/card-util.c:1806
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/card-util.c:1704 g10/card-util.c:1795
+#: g10/card-util.c:1717 g10/card-util.c:1808
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/card-util.c:1705 g10/card-util.c:1797
+#: g10/card-util.c:1718 g10/card-util.c:1810
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1790
+#: g10/card-util.c:1803
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "motivo da revocação: "
 
-#: g10/card-util.c:1836
+#: g10/card-util.c:1849
 #, fuzzy, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "actualização falhou: %s\n"
 
-#: g10/card-util.c:1941 tools/gpg-card.c:3065
+#: g10/card-util.c:1954 tools/gpg-card.c:3082
 #, fuzzy, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr "ignorado: a chave secreta já está presente\n"
 
-#: g10/card-util.c:1944 tools/gpg-card.c:3068 tools/gpg-card.c:3409
+#: g10/card-util.c:1957 tools/gpg-card.c:3085 tools/gpg-card.c:3426
 #, fuzzy
 msgid "Continue? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/card-util.c:1949 tools/gpg-card.c:3079
+#: g10/card-util.c:1962 tools/gpg-card.c:3096
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2142
+#: g10/card-util.c:2155
 #, fuzzy, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/card-util.c:2188
+#: g10/card-util.c:2201
 #, fuzzy, c-format
 msgid "error for setup UIF: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/card-util.c:2212 g10/keyedit.c:1263 tools/gpg-card.c:3649
+#: g10/card-util.c:2225 g10/keyedit.c:1263 tools/gpg-card.c:3666
 msgid "quit this menu"
 msgstr "sair deste menu"
 
-#: g10/card-util.c:2214
+#: g10/card-util.c:2227
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandos em conflito\n"
 
-#: g10/card-util.c:2215 g10/keyedit.c:1266 tools/gpg-card.c:3652
+#: g10/card-util.c:2228 g10/keyedit.c:1266 tools/gpg-card.c:3669
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
-#: g10/card-util.c:2217 tools/gpg-card.c:3654
+#: g10/card-util.c:2230 tools/gpg-card.c:3671
 #, fuzzy
 msgid "list all available data"
 msgstr "Nenhuma ajuda disponível"
 
-#: g10/card-util.c:2220 tools/gpg-card.c:3656
+#: g10/card-util.c:2233 tools/gpg-card.c:3673
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:2221 tools/gpg-card.c:3657
+#: g10/card-util.c:2234 tools/gpg-card.c:3674
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:2222 tools/gpg-card.c:3658
+#: g10/card-util.c:2235 tools/gpg-card.c:3675
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:2223 tools/gpg-card.c:3659
+#: g10/card-util.c:2236 tools/gpg-card.c:3676
 #, fuzzy
 msgid "change the login name"
 msgstr "muda a data de validade"
 
-#: g10/card-util.c:2224 tools/gpg-card.c:3660
+#: g10/card-util.c:2237 tools/gpg-card.c:3677
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muda os valores de confiança"
 
-#: g10/card-util.c:2225 tools/gpg-card.c:3661
+#: g10/card-util.c:2238 tools/gpg-card.c:3678
 msgid "change card holder's salutation"
 msgstr ""
 
-#: g10/card-util.c:2227 tools/gpg-card.c:3663
+#: g10/card-util.c:2240 tools/gpg-card.c:3680
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra impressão digital"
 
-#: g10/card-util.c:2228 tools/gpg-card.c:3664
+#: g10/card-util.c:2241 tools/gpg-card.c:3681
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:2229 tools/gpg-card.c:3665
+#: g10/card-util.c:2242 tools/gpg-card.c:3682
 #, fuzzy
 msgid "generate new keys"
 msgstr "gerar um novo par de chaves"
 
-#: g10/card-util.c:2230 tools/gpg-card.c:3666
+#: g10/card-util.c:2243 tools/gpg-card.c:3683
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:2231 tools/gpg-card.c:3667
+#: g10/card-util.c:2244 tools/gpg-card.c:3684
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:2232 tools/gpg-card.c:3668
+#: g10/card-util.c:2245 tools/gpg-card.c:3685
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:2233 tools/gpg-card.c:3672
+#: g10/card-util.c:2246 tools/gpg-card.c:3689
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2235
+#: g10/card-util.c:2248
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr "|NOME|usar NOME como destinatário por omissão"
 
-#: g10/card-util.c:2236
+#: g10/card-util.c:2249
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "muda os valores de confiança"
 
-#: g10/card-util.c:2237 tools/gpg-card.c:3674
+#: g10/card-util.c:2250 tools/gpg-card.c:3691
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the User Interaction Flag"
 msgstr "muda os valores de confiança"
 
-#: g10/card-util.c:2361 tools/gpg-card.c:3924
+#: g10/card-util.c:2374 tools/gpg-card.c:3941
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2402
+#: g10/card-util.c:2415
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandos em conflito\n"
 
-#: g10/card-util.c:2433
+#: g10/card-util.c:2446
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "comandos em conflito\n"
 
-#: g10/card-util.c:2435
+#: g10/card-util.c:2448
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/card-util.c:2546 g10/keyedit.c:2275 tools/gpg-card.c:3814
-#: tools/gpg-card.c:4072
+#: g10/card-util.c:2559 g10/keyedit.c:2275 tools/gpg-card.c:3831
+#: tools/gpg-card.c:4089
 #, c-format
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inválido (tente \"help\")\n"
@@ -2216,23 +2230,23 @@ msgstr "Comando inválido (tente \"help\")\n"
 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:5293 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5292 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:1934 g10/export.c:2342 g10/export.c:2463
-#: g10/getkey.c:1907 g10/gpg.c:5238 g10/keyedit.c:1450 g10/keyedit.c:2382
-#: g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:703 g10/keyserver.c:1240
-#: g10/revoke.c:230 g10/tofu.c:2168
+#: g10/getkey.c:2032 g10/gpg.c:5237 g10/keyedit.c:1450 g10/keyedit.c:2382
+#: g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:703 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:2002 g10/getkey.c:1915 g10/getkey.c:4330
-#: g10/gpg.c:5247 g10/keyedit.c:2354 g10/keyserver.c:1258 g10/revoke.c:236
-#: g10/revoke.c:665 g10/tofu.c:2176
+#: g10/delkey.c:90 g10/export.c:2002 g10/getkey.c:2040 g10/getkey.c:4455
+#: g10/gpg.c:5246 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"
 msgstr "erro na leitura do bloco de chave: %s\n"
@@ -2357,14 +2371,14 @@ msgstr "não pode utilizar %s enquanto estiver no modo %s\n"
 msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:555 g10/encrypt.c:808 g10/decrypt-data.c:261 g10/gpg.c:4083
-#: g10/gpg.c:4130 sm/decrypt.c:742 sm/encrypt.c:691 sm/gpgsm.c:1793
+#: g10/encrypt.c:555 g10/encrypt.c:808 g10/decrypt-data.c:261 g10/gpg.c:4080
+#: g10/gpg.c:4127 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1646
 #, 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:564 g10/gpg.c:4095 g10/gpg.c:4142 g10/sig-check.c:155
-#: g10/sign.c:452 sm/gpgsm.c:1803 sm/gpgsm.c:1813 sm/sign.c:596 sm/verify.c:510
+#: g10/encrypt.c:564 g10/gpg.c:4092 g10/gpg.c:4139 g10/sig-check.c:155
+#: g10/sign.c:452 sm/gpgsm.c:1656 sm/gpgsm.c:1666 sm/sign.c:596 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"
@@ -2382,7 +2396,7 @@ msgid ""
 msgstr ""
 "ao forçar a cifra simétrica %s (%d) viola as preferências do destinatário\n"
 
-#: g10/encrypt.c:838 sm/encrypt.c:766
+#: g10/encrypt.c:838 sm/encrypt.c:767
 #, fuzzy, c-format
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "AVISO: \"%s\" é uma opção depreciada\n"
@@ -2414,7 +2428,7 @@ msgstr "%s/%s cifrado para: \"%s\"\n"
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "não pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/decrypt-data.c:239 g10/mainproc.c:380 sm/decrypt.c:494
+#: g10/decrypt-data.c:239 g10/mainproc.c:380 sm/decrypt.c:892
 #, fuzzy, c-format
 #| msgid "%s encrypted data\n"
 msgid "%s.%s encrypted data\n"
@@ -2425,7 +2439,7 @@ msgstr "dados cifrados com %s\n"
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrado com algoritmo desconhecido %d\n"
 
-#: g10/decrypt-data.c:361 g10/decrypt-data.c:414 sm/decrypt.c:508
+#: g10/decrypt-data.c:361 g10/decrypt-data.c:414 sm/decrypt.c:906
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2471,7 +2485,7 @@ msgstr ""
 msgid " - skipped"
 msgstr "%s: ignorado: %s\n"
 
-#: g10/export.c:1333 g10/import.c:2124 g10/openfile.c:202 g10/openfile.c:296
+#: g10/export.c:1333 g10/import.c:2132 g10/openfile.c:202 g10/openfile.c:296
 #: g10/sign.c:1110 g10/sign.c:1447
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
@@ -2510,64 +2524,64 @@ msgstr "erro ao criar `%s': %s\n"
 msgid "[User ID not found]"
 msgstr "[Utilizador não encontrado]"
 
-#: g10/getkey.c:1199
+#: g10/getkey.c:1324
 #, fuzzy, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "erro ao criar `%s': %s\n"
 
-#: g10/getkey.c:1205
+#: g10/getkey.c:1330
 #, fuzzy, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "erro ao criar `%s': %s\n"
 
-#: g10/getkey.c:1207
+#: g10/getkey.c:1332
 #, fuzzy
 msgid "No fingerprint"
 msgstr "mostra impressão digital"
 
-#: g10/getkey.c:1449
+#: g10/getkey.c:1574
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1884 g10/revoke.c:657 g10/revoke.c:718
+#: g10/getkey.c:2009 g10/revoke.c:658 g10/revoke.c:719
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "chave `%s' não encontrada: %s\n"
 
-#: g10/getkey.c:1887 g10/pkclist.c:1012
+#: g10/getkey.c:2012 g10/pkclist.c:1012
 #, fuzzy, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "opções de importação inválidas\n"
 
-#: g10/getkey.c:1965
+#: g10/getkey.c:2090
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "|NOME|usar NOME como chave secreta por omissão"
 
-#: g10/getkey.c:1973
+#: g10/getkey.c:2098
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "|NOME|usar NOME como chave secreta por omissão"
 
-#: g10/getkey.c:1980
+#: g10/getkey.c:2105
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr ""
 
-#: g10/getkey.c:2837
+#: g10/getkey.c:2962
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Chave inválida %08lX tornada válida por --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:3703
+#: g10/getkey.c:3828
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "usando chave secundária %08lX ao invés de chave primária %08lX\n"
 
-#: g10/getkey.c:4259 g10/gpg.c:2167
+#: g10/getkey.c:4384 g10/gpg.c:2168
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "opções de importação inválidas\n"
@@ -2772,7 +2786,7 @@ msgstr ""
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:651 kbx/kbxutil.c:91 sm/gpgsm.c:424 tools/gpgconf.c:113
+#: g10/gpg.c:651 kbx/kbxutil.c:91 sm/gpgsm.c:425 tools/gpgconf.c:113
 msgid "do not make any changes"
 msgstr "não fazer alterações"
 
@@ -2808,7 +2822,7 @@ msgstr ""
 "|N|estabelecer nível de compressão N\n"
 "(0 desactiva)"
 
-#: g10/gpg.c:762 sm/gpgsm.c:357
+#: g10/gpg.c:762 sm/gpgsm.c:358
 msgid "Options controlling key import and export"
 msgstr ""
 
@@ -2827,11 +2841,11 @@ msgstr "importar chaves de um servidor de chaves"
 msgid "include the public key in signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/gpg.c:776 sm/gpgsm.c:360
+#: g10/gpg.c:776 sm/gpgsm.c:361
 msgid "disable all access to the dirmngr"
 msgstr ""
 
-#: g10/gpg.c:788 sm/gpgsm.c:367
+#: g10/gpg.c:788 sm/gpgsm.c:368
 msgid "Options controlling key listings"
 msgstr ""
 
@@ -2853,15 +2867,15 @@ msgstr ""
 "usar este identificador de utilizador para\n"
 "assinar ou decifrar"
 
-#: g10/gpg.c:876 sm/gpgsm.c:408
+#: g10/gpg.c:876 sm/gpgsm.c:409
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:895 sm/gpgsm.c:420 dirmngr/dirmngr.c:286
+#: g10/gpg.c:895 sm/gpgsm.c:421 dirmngr/dirmngr.c:289
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:966 sm/gpgsm.c:453
+#: g10/gpg.c:966 sm/gpgsm.c:454
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2920,7 +2934,7 @@ msgstr ""
 "assina, verifica, cifra ou decifra\n"
 "a operação por omissão depende dos dados de entrada\n"
 
-#: g10/gpg.c:1168 sm/gpgsm.c:636
+#: g10/gpg.c:1168 sm/gpgsm.c:637
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2944,12 +2958,12 @@ msgstr "Dispersão: "
 msgid "Compression: "
 msgstr "Compressão: "
 
-#: g10/gpg.c:1274 sm/gpgsm.c:710
+#: g10/gpg.c:1274 sm/gpgsm.c:711
 #, fuzzy, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "uso: gpg [opções] "
 
-#: g10/gpg.c:1467 sm/gpgsm.c:803
+#: g10/gpg.c:1467 sm/gpgsm.c:804
 #, c-format
 msgid "conflicting commands\n"
 msgstr "comandos em conflito\n"
@@ -2959,534 +2973,534 @@ msgstr "comandos em conflito\n"
 msgid "no = sign found in group definition '%s'\n"
 msgstr "nenhum sinal = encontrada na definição de grupo \"%s\"\n"
 
-#: g10/gpg.c:1683
+#: g10/gpg.c:1684
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1686
+#: g10/gpg.c:1687
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1689
+#: g10/gpg.c:1690
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1695
+#: g10/gpg.c:1696
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "AVISO: permissões pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1698
+#: g10/gpg.c:1699
 #, 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:1701
+#: g10/gpg.c:1702
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "AVISO: permissões pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1708
 #, 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:1710
+#: g10/gpg.c:1711
 #, 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:1713
+#: g10/gpg.c:1714
 #, 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:1719
+#: g10/gpg.c:1720
 #, 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:1722
+#: g10/gpg.c:1723
 #, 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:1725
+#: g10/gpg.c:1726
 #, 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:1941
+#: g10/gpg.c:1942
 #, fuzzy, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "criado um novo ficheiro de configuração `%s'\n"
 
-#: g10/gpg.c:2037
+#: g10/gpg.c:2038
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:2039
+#: g10/gpg.c:2040
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/gpg.c:2041
+#: g10/gpg.c:2042
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2043
+#: g10/gpg.c:2044
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/gpg.c:2045
+#: g10/gpg.c:2046
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2049
+#: g10/gpg.c:2050
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2051
+#: g10/gpg.c:2052
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "a URL de política de assinatura dada é inválida\n"
 
-#: g10/gpg.c:2053
+#: g10/gpg.c:2054
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:2055
+#: g10/gpg.c:2056
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:2057
+#: g10/gpg.c:2058
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:2059
+#: g10/gpg.c:2060
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mostrar em que porta-chave a chave está"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2062
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/gpg.c:2178
+#: g10/gpg.c:2179
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "destinatário por omissão desconhecido `%s'\n"
 
-#: g10/gpg.c:2180
+#: g10/gpg.c:2181
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2975 g10/gpg.c:3828 g10/gpg.c:3840
+#: g10/gpg.c:2978 g10/gpg.c:3825 g10/gpg.c:3837
 #, 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:3151 g10/gpg.c:3163
+#: g10/gpg.c:3154 g10/gpg.c:3166
 #, 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:3185
+#: g10/gpg.c:3188
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "Endereço eletrónico inválido\n"
 
-#: g10/gpg.c:3217 sm/gpgsm.c:1270
+#: g10/gpg.c:3220 sm/gpgsm.c:1143
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "algoritmo de dispersão inválido `%s'\n"
 
-#: g10/gpg.c:3223 sm/gpgsm.c:1276
+#: g10/gpg.c:3226 sm/gpgsm.c:1149
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "opções de importação inválidas\n"
 
-#: g10/gpg.c:3280
+#: g10/gpg.c:3283
 #, 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:3302 g10/gpg.c:3511 g10/keyedit.c:5319
+#: g10/gpg.c:3305 g10/gpg.c:3514 g10/keyedit.c:5322
 #, 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:3320
+#: g10/gpg.c:3323
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opções de exportação inválidas\n"
 
-#: g10/gpg.c:3323
+#: g10/gpg.c:3326
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "opções de exportação inválidas\n"
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3333
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opções de importação inválidas\n"
 
-#: g10/gpg.c:3333
+#: g10/gpg.c:3336
 #, c-format
 msgid "invalid import options\n"
 msgstr "opções de importação inválidas\n"
 
-#: g10/gpg.c:3339 g10/gpg.c:3354
+#: g10/gpg.c:3342 g10/gpg.c:3357
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "opções de importação inválidas\n"
 
-#: g10/gpg.c:3345
+#: g10/gpg.c:3348
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opções de exportação inválidas\n"
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3351
 #, c-format
 msgid "invalid export options\n"
 msgstr "opções de exportação inválidas\n"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3363
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opções de importação inválidas\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3366
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "opções de importação inválidas\n"
 
-#: g10/gpg.c:3371
+#: g10/gpg.c:3374
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3373
+#: g10/gpg.c:3376
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3378
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s não é um conjunto de caracteres válido\n"
 
-#: g10/gpg.c:3377
+#: g10/gpg.c:3380
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3384
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3386
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "a URL de política de assinatura dada é inválida\n"
 
-#: g10/gpg.c:3385
+#: g10/gpg.c:3388
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s não é um conjunto de caracteres válido\n"
 
-#: g10/gpg.c:3387
+#: g10/gpg.c:3390
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3389
+#: g10/gpg.c:3392
 #, 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:3396
+#: g10/gpg.c:3399
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opções de exportação inválidas\n"
 
-#: g10/gpg.c:3399
+#: g10/gpg.c:3402
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "opções de exportação inválidas\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3409
 #, 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:3613
+#: g10/gpg.c:3616
 #, 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:3616
+#: g10/gpg.c:3619
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3625
+#: g10/gpg.c:3628
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "opções de importação inválidas\n"
 
-#: g10/gpg.c:3807 sm/gpgsm.c:1675
+#: g10/gpg.c:3804 sm/gpgsm.c:1528
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um ficheiro core!\n"
 
-#: g10/gpg.c:3821
+#: g10/gpg.c:3818
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sobrepõe %s\n"
 
-#: g10/gpg.c:3830
+#: g10/gpg.c:3827
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s não é permitido com %s!\n"
 
-#: g10/gpg.c:3833
+#: g10/gpg.c:3830
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s não faz sentido com %s!\n"
 
-#: g10/gpg.c:3848 sm/gpgsm.c:1696 dirmngr/dirmngr.c:1123
+#: g10/gpg.c:3845 sm/gpgsm.c:1549 dirmngr/dirmngr.c:1160
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3869
+#: g10/gpg.c:3866
 #, 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:3897 g10/gpg.c:3928 sm/gpgsm.c:1763
+#: g10/gpg.c:3894 g10/gpg.c:3925 sm/gpgsm.c:1616
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado é inválido\n"
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3901
 #, 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:3916
+#: g10/gpg.c:3913
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado é inválido\n"
 
-#: g10/gpg.c:3922
+#: g10/gpg.c:3919
 #, 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:3937
+#: g10/gpg.c:3934
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/gpg.c:3939
+#: g10/gpg.c:3936
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/gpg.c:3941
+#: g10/gpg.c:3938
 #, 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:3943
+#: g10/gpg.c:3940
 #, 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:3945
+#: g10/gpg.c:3942
 #, 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:3949
+#: g10/gpg.c:3946
 #, 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:3953
+#: g10/gpg.c:3950
 #, 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:3960
+#: g10/gpg.c:3957
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "preferências por omissão inválidas\n"
 
-#: g10/gpg.c:3964
+#: g10/gpg.c:3961
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "preferências pessoais de cifra inválidas\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3964
 #, 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:3971
+#: g10/gpg.c:3968
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "preferências pessoais de 'digest' inválidas\n"
 
-#: g10/gpg.c:3975
+#: g10/gpg.c:3972
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "preferências pessoais de compressão inválidas\n"
 
-#: g10/gpg.c:3984 g10/gpg.c:3989
+#: g10/gpg.c:3981 g10/gpg.c:3986
 #, 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:4026
+#: g10/gpg.c:4023
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s não faz sentido com %s!\n"
 
-#: g10/gpg.c:4089
+#: g10/gpg.c:4086
 #, 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:4101
+#: g10/gpg.c:4098
 #, 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:4256
+#: g10/gpg.c:4253
 #, 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:4268
+#: g10/gpg.c:4265
 #, 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:4340
+#: g10/gpg.c:4337
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "decifragem falhou: %s\n"
 
-#: g10/gpg.c:4369
+#: g10/gpg.c:4366
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4372
+#: g10/gpg.c:4369
 #, 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:4430
+#: g10/gpg.c:4427
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4433
+#: g10/gpg.c:4430
 #, 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:4821 g10/keyserver.c:1870
+#: g10/gpg.c:4818 g10/keyserver.c:1629
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "A geração de chaves falhou: %s\n"
 
-#: g10/gpg.c:4826
+#: g10/gpg.c:4823
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "A geração de chaves falhou: %s\n"
 
-#: g10/gpg.c:4832
+#: g10/gpg.c:4829
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "A geração de chaves falhou: %s\n"
 
-#: g10/gpg.c:4845
+#: g10/gpg.c:4842
 #, fuzzy, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "A geração de chaves falhou: %s\n"
 
-#: g10/gpg.c:4857
+#: g10/gpg.c:4854
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "A geração de chaves falhou: %s\n"
 
-#: g10/gpg.c:4870
+#: g10/gpg.c:4867
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualização da chave secreta falhou: %s\n"
 
-#: g10/gpg.c:4937
+#: g10/gpg.c:4936
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/gpg.c:4948
+#: g10/gpg.c:4947
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "criação de armadura falhou: %s\n"
 
-#: g10/gpg.c:5053
+#: g10/gpg.c:5052
 #, 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:5205 g10/tofu.c:2156
+#: g10/gpg.c:5204 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:5216
+#: g10/gpg.c:5215
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5272
+#: g10/gpg.c:5271
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5283
+#: g10/gpg.c:5282
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Digite a sua mensagem ...\n"
 
-#: g10/gpg.c:5630
+#: g10/gpg.c:5629
 #, 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:5632
+#: g10/gpg.c:5631
 #, 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:5665
+#: g10/gpg.c:5664
 #, fuzzy, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "a URL de política de assinatura dada é inválida\n"
@@ -3501,7 +3515,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:414 tools/gpgconf.c:116 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:415 tools/gpgconf.c:116 tools/gpg-card.c:95
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|DF|escrever informações de estado para o\n"
@@ -3596,271 +3610,271 @@ msgstr ""
 msgid "repair keys on import"
 msgstr "mostra impressão digital"
 
-#: g10/import.c:399 g10/import.c:721
+#: g10/import.c:407 g10/import.c:729
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ignorando bloco do tipo %d\n"
 
-#: g10/import.c:738
+#: g10/import.c:746
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu chaves processadas até agora\n"
 
-#: g10/import.c:831
+#: g10/import.c:839
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Número total processado: %lu\n"
 
-#: g10/import.c:834
+#: g10/import.c:842
 #, fuzzy, c-format
 #| msgid "      skipped new keys: %lu\n"
 msgid "    skipped PGP-2 keys: %lu\n"
 msgstr "      ignorei novas chaves: %lu\n"
 
-#: g10/import.c:836
+#: g10/import.c:844
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      ignorei novas chaves: %lu\n"
 
-#: g10/import.c:839
+#: g10/import.c:847
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          sem IDs de utilizadores: %lu\n"
 
-#: g10/import.c:842 sm/import.c:129
+#: g10/import.c:850 sm/import.c:129
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importados: %lu"
 
-#: g10/import.c:846 sm/import.c:133
+#: g10/import.c:854 sm/import.c:133
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             não modificados: %lu\n"
 
-#: g10/import.c:848
+#: g10/import.c:856
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          novos IDs de utilizadores: %lu\n"
 
-#: g10/import.c:850
+#: g10/import.c:858
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           novas subchaves: %lu\n"
 
-#: g10/import.c:852
+#: g10/import.c:860
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        novas assinaturas: %lu\n"
 
-#: g10/import.c:854
+#: g10/import.c:862
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   novas revogações de chaves: %lu\n"
 
-#: g10/import.c:856 sm/import.c:135
+#: g10/import.c:864 sm/import.c:135
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      chaves secretas lidas: %lu\n"
 
-#: g10/import.c:858 sm/import.c:137
+#: g10/import.c:866 sm/import.c:137
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  chaves secretas importadas: %lu\n"
 
-#: g10/import.c:860 sm/import.c:139
+#: g10/import.c:868 sm/import.c:139
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " chaves secretas não modificadas: %lu\n"
 
-#: g10/import.c:862 sm/import.c:141
+#: g10/import.c:870 sm/import.c:141
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "        não importadas: %lu\n"
 
-#: g10/import.c:864
+#: g10/import.c:872
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "        novas assinaturas: %lu\n"
 
-#: g10/import.c:866
+#: g10/import.c:874
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "      chaves secretas lidas: %lu\n"
 
-#: g10/import.c:1291
+#: g10/import.c:1299
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:1333
+#: g10/import.c:1341
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:1351
+#: g10/import.c:1359
 #, fuzzy, c-format
 msgid "         \"%s\": preference for AEAD algorithm %s\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: g10/import.c:1366
+#: g10/import.c:1374
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: g10/import.c:1378
+#: g10/import.c:1386
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:1391
+#: g10/import.c:1399
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:1393
+#: g10/import.c:1401
 #, c-format
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:1418
+#: g10/import.c:1426
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:1932 g10/import.c:3053
+#: g10/import.c:1940 g10/import.c:3061
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "chave %08lX: sem ID de utilizador\n"
 
-#: g10/import.c:1938
+#: g10/import.c:1946
 #, fuzzy, c-format
 msgid "key %s: %s\n"
 msgstr "ignorado `%s': %s\n"
 
-#: g10/import.c:1939 g10/import.c:3025
+#: g10/import.c:1947 g10/import.c:3033
 msgid "rejected by import screener"
 msgstr ""
 
-#: g10/import.c:1988
+#: g10/import.c:1996
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "chave %08lX: subchave HKP corrompida foi reparada\n"
 
-#: g10/import.c:2009
+#: g10/import.c:2017
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "chave %08lX: aceite ID de utilizador sem auto-assinatura '%s'\n"
 
-#: g10/import.c:2020 g10/import.c:2051
+#: g10/import.c:2028 g10/import.c:2059
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "chave %08lX: sem IDs de utilizadores válidos\n"
 
-#: g10/import.c:2022
+#: g10/import.c:2030
 #, c-format
 msgid "this may be caused by a missing self-signature\n"
 msgstr "isto pode ser causado por falta de auto-assinatura\n"
 
-#: g10/import.c:2101 g10/import.c:3439
+#: g10/import.c:2109 g10/import.c:3447
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "chave %08lX: chave pública não encontrada: %s\n"
 
-#: g10/import.c:2107
+#: g10/import.c:2115
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "chave %08lX: chave nova - ignorada\n"
 
-#: g10/import.c:2119
+#: g10/import.c:2127
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "não foi encontrada nenhum porta-chaves onde escrever: %s\n"
 
-#: g10/import.c:2151 g10/import.c:2253 g10/import.c:3514
+#: g10/import.c:2159 g10/import.c:2261 g10/import.c:3522
 #, fuzzy, c-format
 #| msgid "error writing keyring `%s': %s\n"
 msgid "error writing keyring '%s': %s\n"
 msgstr "erro na escrita do porta-chaves `%s': %s\n"
 
-#: g10/import.c:2174
+#: g10/import.c:2182
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "chave %08lX: chave pública \"%s\" importada\n"
 
-#: g10/import.c:2201
+#: g10/import.c:2209
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "chave %08lX: não corresponde à nossa cópia\n"
 
-#: g10/import.c:2269
+#: g10/import.c:2277
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "chave %8lX: \"%s\" 1 novo ID de utilizador\n"
 
-#: g10/import.c:2272
+#: g10/import.c:2280
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "chave %08lX: \"%s\" %d novos IDs de utilizadores\n"
 
-#: g10/import.c:2275
+#: g10/import.c:2283
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "chave %08lX: \"%s\" 1 nova assinatura\n"
 
-#: g10/import.c:2278
+#: g10/import.c:2286
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "chave %08lX: \"%s\" %d novas assinaturas\n"
 
-#: g10/import.c:2281
+#: g10/import.c:2289
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "chave %08lX: \"%s\" 1 nova subchave\n"
 
-#: g10/import.c:2284
+#: g10/import.c:2292
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "chave %08lX: \"%s\" %d novas subchaves\n"
 
-#: g10/import.c:2287
+#: g10/import.c:2295
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novas assinaturas\n"
 
-#: g10/import.c:2290
+#: g10/import.c:2298
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novas assinaturas\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2301
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novos IDs de utilizadores\n"
 
-#: g10/import.c:2296
+#: g10/import.c:2304
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novos IDs de utilizadores\n"
 
-#: g10/import.c:2332
+#: g10/import.c:2340
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "chave %08lX: \"%s\" não modificada\n"
 
-#: g10/import.c:2692 g10/import.c:2887
+#: g10/import.c:2700 g10/import.c:2895
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "chave %08lX: chave secreta importada\n"
 
-#: g10/import.c:2700
+#: g10/import.c:2708
 #, fuzzy, c-format
 #| msgid "skipped: secret key already present\n"
 msgid "key %s: secret key already exists\n"
 msgstr "ignorado: a chave secreta já está presente\n"
 
-#: g10/import.c:2708
+#: g10/import.c:2716
 #, fuzzy, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "erro ao enviar para `%s': %s\n"
@@ -3873,210 +3887,209 @@ msgstr "erro ao enviar para `%s': %s\n"
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2877
+#: g10/import.c:2885
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:3024
+#: g10/import.c:3032
 #, fuzzy, c-format
 msgid "secret key %s: %s\n"
 msgstr "chave `%s' não encontrada: %s\n"
 
-#: g10/import.c:3045 g10/import.c:3084
+#: g10/import.c:3053 g10/import.c:3092
 #, fuzzy, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/import.c:3072
+#: g10/import.c:3080
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "chave %08lX: chave secreta com cifra inválida %d - ignorada\n"
 
-#: g10/import.c:3234 g10/pkclist.c:75 g10/revoke.c:774
+#: g10/import.c:3242 g10/pkclist.c:75 g10/revoke.c:775
 msgid "No reason specified"
 msgstr "Nenhum motivo especificado"
 
-#: g10/import.c:3235 g10/pkclist.c:77 g10/revoke.c:776
+#: g10/import.c:3243 g10/pkclist.c:77 g10/revoke.c:777
 msgid "Key is superseded"
 msgstr "A chave foi substituída"
 
-#: g10/import.c:3236 g10/pkclist.c:79 g10/revoke.c:775
+#: g10/import.c:3244 g10/pkclist.c:79 g10/revoke.c:776
 msgid "Key has been compromised"
 msgstr "A chave foi comprometida"
 
-#: g10/import.c:3237 g10/pkclist.c:81 g10/revoke.c:777
+#: g10/import.c:3245 g10/pkclist.c:81 g10/revoke.c:778
 msgid "Key is no longer used"
 msgstr "A chave já não é utilizada"
 
-#: g10/import.c:3238 g10/pkclist.c:83 g10/revoke.c:778
+#: g10/import.c:3246 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "O identificador do utilizador já não é válido"
 
-#: g10/import.c:3363 g10/keylist.c:1105 g10/pkclist.c:87
+#: g10/import.c:3371 g10/keylist.c:1105 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "motivo da revocação: "
 
-#: g10/import.c:3382 g10/keylist.c:1124 g10/pkclist.c:103
+#: g10/import.c:3390 g10/keylist.c:1124 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "comentário da revocação: "
 
-#: g10/import.c:3432
+#: g10/import.c:3440
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "chave %08lX: sem chave pública - impossível aplicar certificado\n"
 "de revogação\n"
 
-#: g10/import.c:3461
+#: g10/import.c:3469
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "chave %08lX: impossível localizar bloco de chaves original: %s\n"
 
-#: g10/import.c:3468
+#: g10/import.c:3476
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "chave %08lX: impossível ler bloco de chaves original: %s\n"
 
-#: g10/import.c:3488
+#: g10/import.c:3496
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "chave %08lX: certificado de revogação inválido: %s - rejeitado\n"
 
-#: g10/import.c:3523
+#: g10/import.c:3531
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "chave %08lX: \"%s\" certificado de revogação importado\n"
 
-#: g10/import.c:3609
+#: g10/import.c:3617
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "chave %08lX: nenhum ID de utilizador para assinatura\n"
 
-#: g10/import.c:3626
+#: g10/import.c:3634
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "chave %08lX: algoritmo de chave pública não suportado no utilizador \"%s\"\n"
 
-#: g10/import.c:3628
+#: g10/import.c:3636
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "chave %08lX: auto-assinatura inválida do utilizador \"%s\"\n"
 
-#: g10/import.c:3645 g10/import.c:3673 g10/import.c:3729
+#: g10/import.c:3653 g10/import.c:3681 g10/import.c:3737
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "chave %08lX: algoritmo de chave pública não suportado\n"
 
-#: g10/import.c:3646
+#: g10/import.c:3654
 #, fuzzy, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "chave %08lX: assinatura directa de chave adicionada\n"
 
-#: g10/import.c:3660
+#: g10/import.c:3668
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "chave %08lX: sem subchave para ligação de chaves\n"
 
-#: g10/import.c:3675
+#: g10/import.c:3683
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "chave %08lX: ligação de subchave inválida\n"
 
-#: g10/import.c:3694
+#: g10/import.c:3702
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "chave %08lX: apagada ligação múltipla de subchave \n"
 
-#: g10/import.c:3718
+#: g10/import.c:3726
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "chave %08lX: sem subchave para revocação de chave\n"
 
-#: g10/import.c:3731
+#: g10/import.c:3739
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "chave %08lX: revocação de subchave inválida\n"
 
-#: g10/import.c:3746
+#: g10/import.c:3754
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "chave %08lX: removida revogação múltiplace de subchaves\n"
 
-#: g10/import.c:3790
+#: g10/import.c:3798
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "chave %08lX: ignorado ID de utilizador '"
 
-#: g10/import.c:3817
+#: g10/import.c:3825
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "chave %08lX: subchave ignorada\n"
 
-#: g10/import.c:3849
+#: g10/import.c:3857
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "chave %08lX: assinatura não exportável (classe %02x) - ignorada\n"
 
-#: g10/import.c:3860
+#: g10/import.c:3868
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "chave %08lX: certificado de revogação no local errado - ignorado\n"
 
-#: g10/import.c:3878
+#: g10/import.c:3886
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "chave %08lX: certificado de revogação inválido: %s - ignorado\n"
 
-#: g10/import.c:3892
+#: g10/import.c:3900
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "chave %08lX: assintura da subchave no local errado - ignorado\n"
 
-#: g10/import.c:3900
+#: g10/import.c:3908
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "chave %08lX: classe de assinatura inesperada (%02x) - ignorada\n"
 
-#: g10/import.c:4073
+#: g10/import.c:4081
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "chave %08lX: detectado ID de utilizador duplicado - fundido\n"
 
-#: g10/import.c:4180
+#: g10/import.c:4188
 #, fuzzy, c-format
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr "chave %08lX: detectado ID de utilizador duplicado - fundido\n"
 
-#: g10/import.c:4245
+#: g10/import.c:4253
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "AVISO: a chave %08lX pode estar revocada: a transferir a chave de revocação "
 "%08lX\n"
 
-#: g10/import.c:4261
+#: g10/import.c:4269
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVISO: a chave %08lX pode estar revocada: chave de revocação %08lX não "
 "presente.\n"
 
-#: g10/import.c:4327
+#: g10/import.c:4335
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "chave %08lX: certificado de revogação \"%s\" adicionado\n"
 
-#: g10/import.c:4365
+#: g10/import.c:4373
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "chave %08lX: assinatura directa de chave adicionada\n"
 
-#: g10/key-check.c:133 dirmngr/dirmngr_ldap.c:650 dirmngr/ldap-wrapper.c:835
-#: dirmngr/ldap-wrapper.c:852
+#: g10/key-check.c:133 dirmngr/ldap-wrapper.c:835 dirmngr/ldap-wrapper.c:852
 #, fuzzy, c-format
 msgid "error allocating memory: %s\n"
 msgstr "erro ao criar porta-chaves `%s': %s\n"
@@ -4139,7 +4152,7 @@ msgid ""
 "all signatures.\n"
 msgstr ""
 
-#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:284 sm/keydb.c:297
+#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:289 sm/keydb.c:302
 #, fuzzy, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "erro ao criar porta-chaves `%s': %s\n"
@@ -4150,7 +4163,7 @@ msgstr "erro ao criar porta-chaves `%s': %s\n"
 msgid "error creating keyring '%s': %s\n"
 msgstr "erro ao criar porta-chaves `%s': %s\n"
 
-#: g10/keydb.c:388 sm/keydb.c:303
+#: g10/keydb.c:388 sm/keydb.c:308
 #, fuzzy, c-format
 msgid "keybox '%s' created\n"
 msgstr "porta-chaves `%s' criado\n"
@@ -4431,8 +4444,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6192 g10/keyedit.c:6275 g10/keyedit.c:6404
-#: g10/keyedit.c:6466 g10/sign.c:528
+#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
+#: g10/keyedit.c:6474 g10/sign.c:528
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
@@ -4843,7 +4856,7 @@ msgstr "Identificador de utilizador inexistente.\n"
 msgid "Nothing to sign.\n"
 msgstr "Nada para assinar com a chave %08lX\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6057
+#: g10/keyedit.c:2973 g10/keyedit.c:6065
 #, fuzzy, c-format
 msgid "Not signed by you.\n"
 msgstr "   assinado por %08lX em %s%s\n"
@@ -4913,7 +4926,7 @@ msgstr "Esta chave pode ser revogada pela chave %s "
 msgid "(sensitive)"
 msgstr " (sensível)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:525
+#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "impossível criar %s: %s\n"
@@ -4929,7 +4942,7 @@ msgid "expired: %s"
 msgstr "[expira: %s]"
 
 #: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2262
-#: g10/keyserver.c:531
+#: g10/keyserver.c:354
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "[expira: %s]"
@@ -4965,14 +4978,14 @@ 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:535
-#: g10/mainproc.c:2280 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
+#: g10/mainproc.c:2282 g10/tofu.c:1789 g10/trust.c:426 dirmngr/ocsp.c:792
 #, fuzzy
 msgid "revoked"
 msgstr "revkey"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:539
-#: g10/mainproc.c:2282 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
+#: g10/mainproc.c:2284 g10/tofu.c:1794 g10/trust.c:113
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -5013,7 +5026,7 @@ 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:3107
+#: g10/keyedit.c:4273 g10/keygen.c:3111
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
@@ -5161,7 +5174,7 @@ msgstr ""
 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:5357 g10/keyedit.c:5495
+#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
 #, 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"
@@ -5170,134 +5183,134 @@ msgstr "a ignorar auto-assinatura v3 no utilizar com o id \"%s\"\n"
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5380
+#: g10/keyedit.c:5383
 #, 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:5381
+#: g10/keyedit.c:5384
 #, 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:5441
+#: g10/keyedit.c:5449
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notação de assinatura: "
 
-#: g10/keyedit.c:5588
+#: g10/keyedit.c:5596
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Escrever por cima (s/N)? "
 
-#: g10/keyedit.c:5658
+#: g10/keyedit.c:5666
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de utilizador com índice %d\n"
 
-#: g10/keyedit.c:5720
+#: g10/keyedit.c:5728
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nenhum ID de utilizador com índice %d\n"
 
-#: g10/keyedit.c:5821
+#: g10/keyedit.c:5829
 #, fuzzy, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Nenhum ID de utilizador com índice %d\n"
 
-#: g10/keyedit.c:5843
+#: g10/keyedit.c:5851
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nenhum ID de utilizador com índice %d\n"
 
-#: g10/keyedit.c:5984
+#: g10/keyedit.c:5992
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de utilizador: \""
 
-#: g10/keyedit.c:5987 g10/keyedit.c:6089 g10/keyedit.c:6137
+#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
 #, 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:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
+#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
 msgid " (non-exportable)"
 msgstr "  (não-exportável)"
 
-#: g10/keyedit.c:5993
+#: g10/keyedit.c:6001
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/keyedit.c:5998
+#: g10/keyedit.c:6006
 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:6003
+#: g10/keyedit.c:6011
 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:6063
+#: g10/keyedit.c:6071
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Assinou estes identificadores de utilizadores:\n"
 
-#: g10/keyedit.c:6092
+#: g10/keyedit.c:6100
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "  (não-exportável)"
 
-#: g10/keyedit.c:6099
+#: g10/keyedit.c:6107
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:6124
+#: g10/keyedit.c:6132
 msgid "You are about to revoke these signatures:\n"
 msgstr "Está prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:6147
+#: g10/keyedit.c:6155
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realmente criar os certificados de revogação? (s/N) "
 
-#: g10/keyedit.c:6180
+#: g10/keyedit.c:6188
 #, c-format
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
-#: g10/keyedit.c:6228
+#: g10/keyedit.c:6236
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6238
+#: g10/keyedit.c:6246
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "o utilizador com o id \"%s\" já está revocado\n"
 
-#: g10/keyedit.c:6255
+#: g10/keyedit.c:6263
 #, 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:6351
+#: g10/keyedit.c:6359
 #, 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:6389
+#: g10/keyedit.c:6397
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "o utilizador com o id \"%s\" já está revocado\n"
 
-#: g10/keyedit.c:6451
+#: g10/keyedit.c:6459
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "o utilizador com o id \"%s\" já está revocado\n"
 
-#: g10/keyedit.c:6548
+#: g10/keyedit.c:6556
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -5308,83 +5321,83 @@ msgstr ""
 msgid "invalid value for option '%s'\n"
 msgstr "opções de importação inválidas\n"
 
-#: g10/keygen.c:338
+#: g10/keygen.c:339
 #, fuzzy, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "preferência %c%lu duplicada\n"
 
-#: g10/keygen.c:345
+#: g10/keygen.c:346
 #, fuzzy, c-format
 msgid "too many cipher preferences\n"
 msgstr "demasiadas preferências `%c'\n"
 
-#: g10/keygen.c:347
+#: g10/keygen.c:348
 #, fuzzy, c-format
 msgid "too many digest preferences\n"
 msgstr "demasiadas preferências `%c'\n"
 
-#: g10/keygen.c:349
+#: g10/keygen.c:350
 #, fuzzy, c-format
 msgid "too many compression preferences\n"
 msgstr "demasiadas preferências `%c'\n"
 
-#: g10/keygen.c:351
+#: g10/keygen.c:352
 #, fuzzy, c-format
 msgid "too many AEAD preferences\n"
 msgstr "demasiadas preferências `%c'\n"
 
-#: g10/keygen.c:521
+#: g10/keygen.c:522
 #, fuzzy, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "caracter inválido na cadeia de caractéres da preferência\n"
 
-#: g10/keygen.c:1130
+#: g10/keygen.c:1131
 #, c-format
 msgid "writing direct signature\n"
 msgstr "a escrever a assinatura directa\n"
 
-#: g10/keygen.c:1176
+#: g10/keygen.c:1177
 #, c-format
 msgid "writing self signature\n"
 msgstr "a escrever a auto-assinatura\n"
 
-#: g10/keygen.c:1233
+#: g10/keygen.c:1234
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "a escrever a assinatura ligada a uma chave\n"
 
-#: g10/keygen.c:1598 g10/keygen.c:1603 g10/keygen.c:1655 g10/keygen.c:1660
-#: g10/keygen.c:1832 g10/keygen.c:1837
+#: g10/keygen.c:1599 g10/keygen.c:1604 g10/keygen.c:1656 g10/keygen.c:1661
+#: g10/keygen.c:1833 g10/keygen.c:1838
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tamanho de chave inválido; a utilizar %u bits\n"
 
-#: g10/keygen.c:1609 g10/keygen.c:1666 g10/keygen.c:1674 g10/keygen.c:1843
+#: g10/keygen.c:1610 g10/keygen.c:1667 g10/keygen.c:1675 g10/keygen.c:1844
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tamanho da chave arredondado para %u bits\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1701
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1899
+#: g10/keygen.c:1900
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1902
+#: g10/keygen.c:1903
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1906
 #, fuzzy
 msgid "Encrypt"
 msgstr "cifrar dados"
 
-#: g10/keygen.c:1908
+#: g10/keygen.c:1909
 msgid "Authenticate"
 msgstr ""
 
@@ -5398,180 +5411,180 @@ msgstr ""
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1929
+#: g10/keygen.c:1930
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1967
 #, c-format
 msgid "Possible actions for this %s key: "
 msgstr ""
 
-#: g10/keygen.c:1973
+#: g10/keygen.c:1974
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1979
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1981
+#: g10/keygen.c:1982
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (apenas cifragem)\n"
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1985
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1987
+#: g10/keygen.c:1988
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:2116
+#: g10/keygen.c:2117
 #, fuzzy, c-format
 msgid "   (%d) RSA and RSA%s\n"
 msgstr "   (%d) DSA e ElGamal (por omissão)\n"
 
-#: g10/keygen.c:2120
+#: g10/keygen.c:2121
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal%s\n"
 msgstr "   (%d) DSA e ElGamal (por omissão)\n"
 
-#: g10/keygen.c:2123
+#: g10/keygen.c:2124
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "   (%d) DSA (sign only)%s\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:2125
+#: g10/keygen.c:2126
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (sign only)\n"
 msgid "   (%d) RSA (sign only)%s\n"
 msgstr "   (%d) RSA (apenas assinatura)\n"
 
-#: g10/keygen.c:2131
+#: g10/keygen.c:2132
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)%s\n"
 msgstr "   (%d) ElGamal (apenas cifragem)\n"
 
-#: g10/keygen.c:2133
+#: g10/keygen.c:2134
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (encrypt only)\n"
 msgid "   (%d) RSA (encrypt only)%s\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/keygen.c:2139
+#: g10/keygen.c:2140
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/keygen.c:2141
+#: g10/keygen.c:2142
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2148
 #, fuzzy, c-format
 #| msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgid "   (%d) ECC (sign and encrypt)%s\n"
 msgstr "   (%d) ElGamal (assinatura e cifragem)\n"
 
-#: g10/keygen.c:2147 g10/keygen.c:2678
+#: g10/keygen.c:2148 g10/keygen.c:2679
 #, fuzzy
 #| msgid " (default)"
 msgid " *default*"
 msgstr " (por omissão)"
 
-#: g10/keygen.c:2148
+#: g10/keygen.c:2149
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "  (%d) ECC (sign only)\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:2150
+#: g10/keygen.c:2151
 #, fuzzy, c-format
 msgid "  (%d) ECC (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/keygen.c:2152
+#: g10/keygen.c:2153
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (encrypt only)\n"
 msgid "  (%d) ECC (encrypt only)%s\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/keygen.c:2156
+#: g10/keygen.c:2157
 #, fuzzy, c-format
 msgid "  (%d) Existing key%s\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/keygen.c:2158
+#: g10/keygen.c:2159
 #, fuzzy, c-format
 msgid "  (%d) Existing key from card%s\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/keygen.c:2254 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2255 sm/certreqgen-ui.c:203
 #, fuzzy
 msgid "Enter the keygrip: "
 msgstr "Notação de assinatura: "
 
-#: g10/keygen.c:2267 sm/certreqgen-ui.c:211 tools/gpg-card.c:2280
+#: g10/keygen.c:2268 sm/certreqgen-ui.c:211 tools/gpg-card.c:2297
 #, c-format
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr ""
 
-#: g10/keygen.c:2269 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2270 sm/certreqgen-ui.c:213
 #, fuzzy
 msgid "No key with this keygrip\n"
 msgstr "Nenhum ID de utilizador com índice %d\n"
 
-#: g10/keygen.c:2288 g10/keygen.c:2298 g10/keygen.c:3440 g10/keygen.c:3451
+#: g10/keygen.c:2289 g10/keygen.c:2299 g10/keygen.c:3444 g10/keygen.c:3455
 #: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
 #, fuzzy, c-format
 msgid "error reading the card: %s\n"
 msgstr "%s: erro ao ler registo livre: %s\n"
 
-#: g10/keygen.c:2292 g10/keygen.c:3444 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2293 g10/keygen.c:3448 sm/certreqgen-ui.c:234
 #, fuzzy, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: g10/keygen.c:2311 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2312 sm/certreqgen-ui.c:246
 #, fuzzy
 msgid "Available keys:\n"
 msgstr "desactiva uma chave"
 
-#: g10/keygen.c:2504 g10/keygen.c:2518
+#: g10/keygen.c:2505 g10/keygen.c:2519
 #, fuzzy, c-format
 #| msgid "rounded up to %u bits\n"
 msgid "rounded to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:2559
+#: g10/keygen.c:2560
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:2567
+#: g10/keygen.c:2568
 #, fuzzy, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Qual o tamanho de chave desejado? (1024) "
 
-#: g10/keygen.c:2584 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2585 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tamanho de chave pedido é %u bits\n"
 
-#: g10/keygen.c:2630
+#: g10/keygen.c:2631
 #, fuzzy
 #| msgid "Please select what kind of key you want:\n"
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/keygen.c:2819
+#: g10/keygen.c:2820
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5587,7 +5600,7 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:2830
+#: g10/keygen.c:2831
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5603,40 +5616,40 @@ msgstr ""
 "      <n>m = assinatura expira em n meses\n"
 "      <n>y = assinatura expira em n anos\n"
 
-#: g10/keygen.c:2853
+#: g10/keygen.c:2854
 msgid "Key is valid for? (0) "
 msgstr "A chave é valida por? (0) "
 
-#: g10/keygen.c:2858
+#: g10/keygen.c:2859
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "A assinatura é valida por? (0) "
 
-#: g10/keygen.c:2871 g10/keygen.c:2896
+#: g10/keygen.c:2875 g10/keygen.c:2900
 msgid "invalid value\n"
 msgstr "valor inválido\n"
 
-#: g10/keygen.c:2878
+#: g10/keygen.c:2882
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "A %s não expira nunca\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2883
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "A %s não expira nunca\n"
 
-#: g10/keygen.c:2884
+#: g10/keygen.c:2888
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s expira em %s\n"
 
-#: g10/keygen.c:2885
+#: g10/keygen.c:2889
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/keygen.c:2889
+#: g10/keygen.c:2893
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5644,12 +5657,12 @@ msgstr ""
 "O seu sistema não consegue mostrar datas para além de 2038.\n"
 "No entanto, estas vão ser tratadas correctamente até 2106.\n"
 
-#: g10/keygen.c:2902
+#: g10/keygen.c:2906
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Está correto (s/n)? "
 
-#: g10/keygen.c:2970
+#: g10/keygen.c:2974
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5660,7 +5673,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2985
+#: g10/keygen.c:2989
 #, fuzzy
 msgid ""
 "\n"
@@ -5678,50 +5691,50 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:3004
+#: g10/keygen.c:3008
 msgid "Real name: "
 msgstr "Nome completo: "
 
-#: g10/keygen.c:3013
+#: g10/keygen.c:3017
 msgid "Invalid character in name\n"
 msgstr "Caracter inválido no nome\n"
 
-#: g10/keygen.c:3014
+#: g10/keygen.c:3018
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:3018
+#: g10/keygen.c:3022
 msgid "Name may not start with a digit\n"
 msgstr "O nome não pode começar com um dígito\n"
 
-#: g10/keygen.c:3021
+#: g10/keygen.c:3025
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome deve ter pelo menos 5 caracteres\n"
 
-#: g10/keygen.c:3031
+#: g10/keygen.c:3035
 msgid "Email address: "
 msgstr "Endereço de correio eletrónico: "
 
-#: g10/keygen.c:3037
+#: g10/keygen.c:3041
 msgid "Not a valid email address\n"
 msgstr "Endereço eletrónico inválido\n"
 
-#: g10/keygen.c:3046
+#: g10/keygen.c:3050
 msgid "Comment: "
 msgstr "Comentário: "
 
-#: g10/keygen.c:3052
+#: g10/keygen.c:3056
 msgid "Invalid character in comment\n"
 msgstr "Caracter inválido no comentário\n"
 
-#: g10/keygen.c:3088
+#: g10/keygen.c:3092
 #, fuzzy, c-format
 #| msgid "You are using the `%s' character set.\n"
 msgid "You are using the '%s' character set.\n"
 msgstr "Você está usando o conjunto de caracteres `%s'.\n"
 
-#: g10/keygen.c:3094
+#: g10/keygen.c:3098
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5732,7 +5745,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3099
+#: g10/keygen.c:3103
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Por favor não coloque o endereço de email no nome verdadeiro ou no "
@@ -5749,35 +5762,35 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3124
+#: g10/keygen.c:3128
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoSs"
 
-#: g10/keygen.c:3134
+#: g10/keygen.c:3138
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Mudar (N)ome, (C)omentário, (E)mail ou (S)air? "
 
-#: g10/keygen.c:3135
+#: g10/keygen.c:3139
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Mudar (N)ome, (C)omentário, (E)ndereço ou (O)k/(S)air? "
 
-#: g10/keygen.c:3140
+#: g10/keygen.c:3144
 #, fuzzy
 #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Mudar (N)ome, (C)omentário, (E)mail ou (S)air? "
 
-#: g10/keygen.c:3141
+#: g10/keygen.c:3145
 #, fuzzy
 #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "Mudar (N)ome, (C)omentário, (E)ndereço ou (O)k/(S)air? "
 
-#: g10/keygen.c:3160
+#: g10/keygen.c:3164
 msgid "Please correct the error first\n"
 msgstr "Por favor corrija primeiro o erro\n"
 
-#: g10/keygen.c:3206
+#: g10/keygen.c:3210
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -5789,18 +5802,18 @@ msgstr ""
 "geração dos números primos; isso dá ao gerador de números aleatórios\n"
 "uma hipótese maior de ganhar entropia suficiente.\n"
 
-#: g10/keygen.c:3591
+#: g10/keygen.c:3595
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4590 g10/keygen.c:4663 g10/keygen.c:4681 g10/keygen.c:4710
-#: g10/keygen.c:5086 g10/keygen.c:5632 g10/keygen.c:5943 g10/keygen.c:6050
+#: g10/keygen.c:4594 g10/keygen.c:4667 g10/keygen.c:4685 g10/keygen.c:4714
+#: g10/keygen.c:5113 g10/keygen.c:5663 g10/keygen.c:5974 g10/keygen.c:6081
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A geração de chaves falhou: %s\n"
 
-#: g10/keygen.c:4599
+#: g10/keygen.c:4603
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5808,69 +5821,69 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:4601
+#: g10/keygen.c:4605
 msgid "Continue? (Y/n) "
 msgstr ""
 
-#: g10/keygen.c:4622
+#: g10/keygen.c:4626
 #, fuzzy, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "%s' já comprimido\n"
 
-#: g10/keygen.c:4627
+#: g10/keygen.c:4631
 #, fuzzy
 #| msgid "Create anyway? "
 msgid "Create anyway? (y/N) "
 msgstr "Criar mesmo assim?"
 
-#: g10/keygen.c:4633
+#: g10/keygen.c:4637
 #, fuzzy, c-format
 #| msgid "Create anyway? "
 msgid "creating anyway\n"
 msgstr "Criar mesmo assim?"
 
-#: g10/keygen.c:5069
+#: g10/keygen.c:5096
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 
-#: g10/keygen.c:5118
+#: g10/keygen.c:5145
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Geração de chave cancelada.\n"
 
-#: g10/keygen.c:5178
+#: g10/keygen.c:5205
 #, fuzzy, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "impossível criar `%s': %s\n"
 
-#: g10/keygen.c:5198
+#: g10/keygen.c:5225
 #, fuzzy, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "NOTA: chave secreta %08lX expirou em %s\n"
 
-#: g10/keygen.c:5359 g10/keygen.c:5561
+#: g10/keygen.c:5389 g10/keygen.c:5591
 #, fuzzy, c-format
 #| msgid "writing public key to `%s'\n"
 msgid "writing public key to '%s'\n"
 msgstr "a escrever chave pública para `%s'\n"
 
-#: g10/keygen.c:5555
+#: g10/keygen.c:5585
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "nenhum porta-chaves público com permissões de escrita encontrado: %s\n"
 
-#: g10/keygen.c:5569
+#: g10/keygen.c:5599
 #, fuzzy, c-format
 #| msgid "error writing public keyring `%s': %s\n"
 msgid "error writing public keyring '%s': %s\n"
 msgstr "erro ao escrever no porta-chaves público `%s': %s\n"
 
-#: g10/keygen.c:5603
+#: g10/keygen.c:5634
 msgid "public and secret key created and signed.\n"
 msgstr "chaves pública e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:5619
+#: g10/keygen.c:5650
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -5879,7 +5892,7 @@ msgstr ""
 "Note que esta chave não pode ser usada para cifragem. Você pode usar\n"
 "o comando \"--edit-key\" para gerar uma chave secundária para esse fim.\n"
 
-#: g10/keygen.c:5801 g10/keygen.c:6000
+#: g10/keygen.c:5832 g10/keygen.c:6031
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5887,7 +5900,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no relógio)\n"
 
-#: g10/keygen.c:5803 g10/keygen.c:6002
+#: g10/keygen.c:5834 g10/keygen.c:6033
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5895,23 +5908,23 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no relógio)\n"
 
-#: g10/keygen.c:5814 g10/keygen.c:6013
+#: g10/keygen.c:5845 g10/keygen.c:6044
 #, fuzzy, c-format
 #| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOTA: a criação de sub-chave para chaves v3 não respeito o OpenPGP\n"
 
-#: g10/keygen.c:5826 g10/keygen.c:5828
+#: g10/keygen.c:5857 g10/keygen.c:5859
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Componentes secretas da chave primária não disponíveis.\n"
 
-#: g10/keygen.c:5835 g10/keygen.c:5837
+#: g10/keygen.c:5866 g10/keygen.c:5868
 #, fuzzy, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Componentes secretas da chave primária não disponíveis.\n"
 
-#: g10/keygen.c:5857 g10/keygen.c:6027
+#: g10/keygen.c:5888 g10/keygen.c:6058
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Realmente criar? "
@@ -5994,26 +6007,26 @@ msgstr "  Impressão da chave ="
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1467
+#: g10/keyring.c:1477
 #, fuzzy, c-format
 msgid "caching keyring '%s'\n"
 msgstr "a verificar o porta chaves `%s'\n"
 
-#: g10/keyring.c:1541
+#: g10/keyring.c:1551
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signature)\n"
 msgid_plural "%lu keys cached so far (%lu signatures)\n"
 msgstr[0] "%lu chave verificadas (%lu assinaturas)\n"
 msgstr[1] "%lu chave verificadas (%lu assinaturas)\n"
 
-#: g10/keyring.c:1557
+#: g10/keyring.c:1567
 #, c-format
 msgid "%lu key cached"
 msgid_plural "%lu keys cached"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/keyring.c:1559
+#: g10/keyring.c:1569
 #, fuzzy, c-format
 #| msgid "1 bad signature\n"
 msgid " (%lu signature)\n"
@@ -6021,7 +6034,7 @@ msgid_plural " (%lu signatures)\n"
 msgstr[0] "1 assinatura incorrecta\n"
 msgstr[1] "1 assinatura incorrecta\n"
 
-#: g10/keyring.c:1636
+#: g10/keyring.c:1646
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: porta-chaves criado\n"
@@ -6051,80 +6064,75 @@ msgstr ""
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "a URL de política de assinatura dada é inválida\n"
 
-#: g10/keyserver.c:537
+#: g10/keyserver.c:360
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:740
+#: g10/keyserver.c:563
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:846
+#: g10/keyserver.c:669
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "opções de exportação inválidas\n"
 
-#: g10/keyserver.c:986 g10/keyserver.c:1096
+#: g10/keyserver.c:809 g10/keyserver.c:919
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1420 g10/keyserver.c:1453
+#: g10/keyserver.c:1217 g10/keyserver.c:1250
 #, 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:1427
+#: g10/keyserver.c:1224
 #, 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:1531
+#: g10/keyserver.c:1316
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "chave `%s' não encontrada: %s\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1319
 #, fuzzy, c-format
 msgid "key not found on keyserver\n"
 msgstr "chave `%s' não encontrada: %s\n"
 
-#: g10/keyserver.c:1722
-#, fuzzy, c-format
-msgid "requesting key %s from %s server %s\n"
-msgstr "a pedir a chave %08lX de %s\n"
-
-#: g10/keyserver.c:1726
+#: g10/keyserver.c:1481
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "a pedir a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1841 g10/keyserver.c:2020
+#: g10/keyserver.c:1600 g10/keyserver.c:1793
 #, fuzzy, c-format
 msgid "no keyserver known\n"
 msgstr "opções de exportação inválidas\n"
 
-#: g10/keyserver.c:1856 g10/skclist.c:213 g10/skclist.c:241
+#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "ignorado `%s': %s\n"
 
-#: g10/keyserver.c:1860
+#: g10/keyserver.c:1619
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "assinado com a sua chave %08lX em %s\n"
 
-#: g10/keyserver.c:1901
+#: g10/keyserver.c:1662
 #, fuzzy, c-format
 msgid "requesting key from '%s'\n"
 msgstr "a pedir a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1917
+#: g10/keyserver.c:1680
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
@@ -6150,253 +6158,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:472
+#: g10/mainproc.c:473
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "a chave pública é %08lX\n"
 
-#: g10/mainproc.c:524
+#: g10/mainproc.c:525
 #, 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:528 g10/pkclist.c:231
+#: g10/mainproc.c:529 g10/pkclist.c:231
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                   ou \""
 
-#: g10/mainproc.c:532
+#: g10/mainproc.c:533
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrado com chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:552 g10/mainproc.c:935
+#: g10/mainproc.c:553 g10/mainproc.c:937
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:560
+#: g10/mainproc.c:561
 #, fuzzy, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Repita a frase secreta\n"
 
-#: g10/mainproc.c:562
+#: g10/mainproc.c:563
 #, fuzzy, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "Repita a frase secreta\n"
 
-#: g10/mainproc.c:577 g10/mainproc.c:602
+#: g10/mainproc.c:578 g10/mainproc.c:603
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decifragem de chave pública falhou: %s\n"
 
-#: g10/mainproc.c:613
+#: g10/mainproc.c:614
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "dados cifrados com chave pública: DEK válido\n"
 
-#: g10/mainproc.c:642 g10/mainproc.c:663
+#: g10/mainproc.c:643 g10/mainproc.c:664
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "a assumir dados cifrados %s\n"
 
-#: g10/mainproc.c:649
+#: g10/mainproc.c:650
 #, 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:742 g10/mainproc.c:780
+#: g10/mainproc.c:744 g10/mainproc.c:782
 #, 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:753
+#: g10/mainproc.c:755
 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:756
+#: g10/mainproc.c:758
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:761
+#: g10/mainproc.c:763
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "decifragem falhou: %s\n"
 
-#: g10/mainproc.c:773
+#: g10/mainproc.c:775
 #, c-format
 msgid "decryption okay\n"
 msgstr "decifragem correcta\n"
 
-#: g10/mainproc.c:786
+#: g10/mainproc.c:788
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "CUIDADO: a mensagem cifrada foi manipulada!\n"
 
-#: g10/mainproc.c:804
+#: g10/mainproc.c:806
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decifragem falhou: %s\n"
 
-#: g10/mainproc.c:851
+#: g10/mainproc.c:853
 #, 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:858
+#: g10/mainproc.c:860
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome do ficheiro original='%.*s'\n"
 
-#: g10/mainproc.c:1135
+#: g10/mainproc.c:1137
 #, 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:1440 g10/mainproc.c:1483
+#: g10/mainproc.c:1442 g10/mainproc.c:1485
 #, fuzzy, c-format
 msgid "no signature found\n"
 msgstr "Assinatura correcta de \""
 
-#: g10/mainproc.c:1763
+#: g10/mainproc.c:1765
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Assinatura INCORRECTA de \""
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1767
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Assinatura expirada de \""
 
-#: g10/mainproc.c:1767
+#: g10/mainproc.c:1769
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Assinatura correcta de \""
 
-#: g10/mainproc.c:1789
+#: g10/mainproc.c:1791
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "verificação de assinatura suprimida\n"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1905
 #, 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:1919 g10/mainproc.c:1926
+#: g10/mainproc.c:1921 g10/mainproc.c:1928
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/mainproc.c:1920 g10/mainproc.c:1927 sm/verify.c:480
+#: g10/mainproc.c:1922 g10/mainproc.c:1929 sm/verify.c:480
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1933
 #, 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:1937
+#: g10/mainproc.c:1939
 #, fuzzy, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1992
+#: g10/mainproc.c:1994
 #, fuzzy, c-format
 msgid "Key available at: "
 msgstr "Nenhuma ajuda disponível"
 
-#: g10/mainproc.c:2034
+#: g10/mainproc.c:2036
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2234
+#: g10/mainproc.c:2236
 msgid "[uncertain]"
 msgstr "[incerto]"
 
-#: g10/mainproc.c:2272
+#: g10/mainproc.c:2274
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                   ou \""
 
-#: g10/mainproc.c:2347
+#: g10/mainproc.c:2349
 #, 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:2363
+#: g10/mainproc.c:2365
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/mainproc.c:2368
+#: g10/mainproc.c:2370
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/mainproc.c:2379
+#: g10/mainproc.c:2381
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: g10/mainproc.c:2380
+#: g10/mainproc.c:2382
 #, fuzzy
 msgid "binary"
 msgstr "primary"
 
-#: g10/mainproc.c:2381
+#: g10/mainproc.c:2383
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:2381 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2383 g10/trust.c:112 dirmngr/ocsp.c:793
 #, fuzzy
 msgid "unknown"
 msgstr "versão desconhecida"
 
-#: g10/mainproc.c:2383
+#: g10/mainproc.c:2385
 #, fuzzy
 #| msgid "unknown pubkey algorithm"
 msgid ", key algorithm "
 msgstr "algoritmo de chave pública desconhecido"
 
-#: g10/mainproc.c:2418
+#: g10/mainproc.c:2420
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2457
+#: g10/mainproc.c:2459
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossível verificar assinatura: %s\n"
 
-#: g10/mainproc.c:2553 g10/mainproc.c:2572 g10/mainproc.c:2696
+#: g10/mainproc.c:2555 g10/mainproc.c:2574 g10/mainproc.c:2698
 #, c-format
 msgid "not a detached signature\n"
 msgstr "não é uma assinatura separada\n"
 
-#: g10/mainproc.c:2606
+#: g10/mainproc.c:2608
 #, 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:2615
+#: g10/mainproc.c:2617
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "assinatura de classe 0x%02x\n"
 
-#: g10/mainproc.c:2700
+#: g10/mainproc.c:2702
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "formato de assinatura antigo (PGP2.x)\n"
@@ -6584,51 +6592,56 @@ msgstr "Notação de assinatura crítica: "
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit crítico ligado\n"
 
-#: g10/passphrase.c:208
+#: g10/passphrase.c:201 sm/decrypt.c:669
+#, fuzzy
+msgid "Please enter the passphrase for decryption."
+msgstr "muda a frase secreta"
+
+#: g10/passphrase.c:203
 msgid "Enter passphrase\n"
 msgstr "Insira a frase secreta\n"
 
-#: g10/passphrase.c:219
+#: g10/passphrase.c:227
 #, c-format
 msgid "cancelled by user\n"
 msgstr "cancelado pelo utilizador\n"
 
-#: g10/passphrase.c:460
+#: g10/passphrase.c:472
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID principal da chave %08lX)"
 
-#: g10/passphrase.c:467
+#: g10/passphrase.c:479
 #, fuzzy
 msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 msgstr "Por favor digite a frase secreta \n"
 
-#: g10/passphrase.c:471
+#: g10/passphrase.c:483
 #, fuzzy
 msgid "Please enter the passphrase to import the OpenPGP secret key:"
 msgstr "Por favor digite a frase secreta \n"
 
-#: g10/passphrase.c:476
+#: g10/passphrase.c:488
 #, fuzzy
 msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 msgstr "Por favor digite a frase secreta \n"
 
-#: g10/passphrase.c:479
+#: g10/passphrase.c:491
 #, fuzzy
 msgid "Please enter the passphrase to export the OpenPGP secret key:"
 msgstr "Por favor digite a frase secreta \n"
 
-#: g10/passphrase.c:484
+#: g10/passphrase.c:496
 #, fuzzy
 msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 msgstr "Você quer realmente remover as chaves selecionadas? "
 
-#: g10/passphrase.c:487
+#: g10/passphrase.c:499
 #, fuzzy
 msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgstr "Você quer realmente remover as chaves selecionadas? "
 
-#: g10/passphrase.c:496
+#: g10/passphrase.c:508
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -6791,7 +6804,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:313 g10/revoke.c:803
+#: g10/pkclist.c:313 g10/revoke.c:804
 msgid "Your decision? "
 msgstr "Decisão? "
 
@@ -7092,7 +7105,7 @@ msgstr "impossível abrir dados assinados `%s'\n"
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "impossível abrir dados assinados `%s'\n"
 
-#: g10/pubkey-enc.c:99 sm/decrypt.c:879
+#: g10/pubkey-enc.c:99 sm/decrypt.c:1329
 #, fuzzy, c-format
 msgid "key %s is not suitable for decryption in %s mode\n"
 msgstr "chave %08lX: sem ID de utilizador\n"
@@ -7139,7 +7152,7 @@ msgid "Note: key has been revoked"
 msgstr "NOTA: a chave foi revogada"
 
 #: g10/revoke.c:100 g10/revoke.c:126 g10/revoke.c:172 g10/revoke.c:184
-#: g10/revoke.c:502
+#: g10/revoke.c:503
 #, fuzzy, c-format
 msgid "build_packet failed: %s\n"
 msgstr "actualização falhou: %s\n"
@@ -7168,11 +7181,11 @@ msgstr "Chave secreta disponível.\n"
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Gerar um certificado de revogação para esta assinatura? (s/N)"
 
-#: g10/revoke.c:334 g10/revoke.c:744
+#: g10/revoke.c:334 g10/revoke.c:745
 msgid "ASCII armored output forced.\n"
 msgstr ""
 
-#: g10/revoke.c:350 g10/revoke.c:481
+#: g10/revoke.c:350 g10/revoke.c:482
 #, fuzzy, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "actualização da chave secreta falhou: %s\n"
@@ -7187,19 +7200,19 @@ msgstr "chave %08lX: certificado de revogação \"%s\" adicionado\n"
 msgid "no revocation keys found for \"%s\"\n"
 msgstr ""
 
-#: g10/revoke.c:567
+#: g10/revoke.c:568
 #, fuzzy
 msgid "This is a revocation certificate for the OpenPGP key:"
 msgstr "Gerar um certificado de revogação para esta assinatura? (s/N)"
 
-#: g10/revoke.c:583
+#: g10/revoke.c:584
 msgid ""
 "A revocation certificate is a kind of \"kill switch\" to publicly\n"
 "declare that a key shall not anymore be used.  It is not possible\n"
 "to retract such a revocation certificate once it has been published."
 msgstr ""
 
-#: g10/revoke.c:586
+#: g10/revoke.c:587
 msgid ""
 "Use it to revoke this key in case of a compromise or loss of\n"
 "the secret key.  However, if the secret key is still accessible,\n"
@@ -7208,19 +7221,19 @@ msgid ""
 "of the gpg command \"--generate-revocation\" in the GnuPG manual."
 msgstr ""
 
-#: g10/revoke.c:592
+#: g10/revoke.c:593
 msgid ""
 "To avoid an accidental use of this file, a colon has been inserted\n"
 "before the 5 dashes below.  Remove this colon with a text editor\n"
 "before importing and publishing this revocation certificate."
 msgstr ""
 
-#: g10/revoke.c:611
+#: g10/revoke.c:612
 #, fuzzy, c-format
 msgid "revocation certificate stored as '%s.rev'\n"
 msgstr "chave %08lX: certificado de revogação \"%s\" adicionado\n"
 
-#: g10/revoke.c:655
+#: g10/revoke.c:656
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found\n"
 msgstr "chave `%s' não encontrada: %s\n"
@@ -7228,23 +7241,23 @@ msgstr "chave `%s' não encontrada: %s\n"
 #. TRANSLATORS: The %s prints a key specification which
 #. for example has been given at the command line.  Several lines
 #. lines with secret key infos are printed after this message.
-#: g10/revoke.c:680
+#: g10/revoke.c:681
 #, c-format
 msgid "'%s' matches multiple secret keys:\n"
 msgstr ""
 
-#: g10/revoke.c:705
+#: g10/revoke.c:706
 #, fuzzy, c-format
 #| msgid "error creating keyring `%s': %s\n"
 msgid "error searching the keyring: %s\n"
 msgstr "erro ao criar porta-chaves `%s': %s\n"
 
-#: g10/revoke.c:728
+#: g10/revoke.c:729
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Gerar um certificado de revogação para esta assinatura? (s/N)"
 
-#: g10/revoke.c:752
+#: g10/revoke.c:753
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -7255,37 +7268,37 @@ msgid ""
 "your machine might store the data and make it available to others!\n"
 msgstr ""
 
-#: g10/revoke.c:786
+#: g10/revoke.c:787
 #, fuzzy
 msgid "Please select the reason for the revocation:\n"
 msgstr "motivo da revocação: "
 
-#: g10/revoke.c:796
+#: g10/revoke.c:797
 msgid "Cancel"
 msgstr ""
 
-#: g10/revoke.c:798
+#: g10/revoke.c:799
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr ""
 
-#: g10/revoke.c:839
+#: g10/revoke.c:843
 #, fuzzy
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 "\n"
 "Insira o identificador do utilizador. Termine com uma linha vazia: "
 
-#: g10/revoke.c:867
+#: g10/revoke.c:871
 #, fuzzy, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "motivo da revocação: "
 
-#: g10/revoke.c:869
+#: g10/revoke.c:873
 msgid "(No description given)\n"
 msgstr ""
 
-#: g10/revoke.c:874
+#: g10/revoke.c:878
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Usar esta chave de qualquer modo? "
@@ -7464,23 +7477,23 @@ msgstr "a assinar:"
 msgid "%s.%s encryption will be used\n"
 msgstr "será utilizada a cifragem %s\n"
 
-#: g10/skclist.c:172 g10/skclist.c:253
+#: g10/skclist.c:173 g10/skclist.c:254
 #, c-format
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "a chave não está marcada insegura - impossível usá-la com o RNG falso!\n"
 
-#: g10/skclist.c:204
+#: g10/skclist.c:205
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "ignorado `%s': duplicada\n"
 
-#: g10/skclist.c:223
+#: g10/skclist.c:224
 #, c-format
 msgid "skipped: secret key already present\n"
 msgstr "ignorado: a chave secreta já está presente\n"
 
-#: g10/skclist.c:242
+#: g10/skclist.c:243
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
@@ -7707,10 +7720,10 @@ msgstr ""
 msgid "TOFU DB error"
 msgstr ""
 
-#: g10/tofu.c:687 g10/tofu.c:2073 g10/tofu.c:2354 g10/tofu.c:2373
-#: g10/tofu.c:2386 g10/tofu.c:2398 g10/tofu.c:2413 g10/tofu.c:2425
-#: g10/tofu.c:3021 g10/tofu.c:3038 g10/tofu.c:3075 g10/tofu.c:3092
-#: g10/tofu.c:3404
+#: g10/tofu.c:687 g10/tofu.c:2077 g10/tofu.c:2358 g10/tofu.c:2377
+#: g10/tofu.c:2390 g10/tofu.c:2402 g10/tofu.c:2417 g10/tofu.c:2429
+#: g10/tofu.c:3025 g10/tofu.c:3042 g10/tofu.c:3079 g10/tofu.c:3096
+#: g10/tofu.c:3408
 #, fuzzy, c-format
 msgid "error reading TOFU database: %s\n"
 msgstr "erro ao enviar para `%s': %s\n"
@@ -7732,7 +7745,7 @@ msgstr "%s: erro ao escrever registo de diretório: %s\n"
 msgid "error opening TOFU database '%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/tofu.c:1148 g10/tofu.c:3458 g10/tofu.c:3604
+#: g10/tofu.c:1148 g10/tofu.c:3462 g10/tofu.c:3608
 #, fuzzy, c-format
 msgid "error updating TOFU database: %s\n"
 msgstr "erro ao enviar para `%s': %s\n"
@@ -7772,111 +7785,111 @@ msgstr "erro na criação da frase secreta: %s\n"
 msgid "This key's user IDs:\n"
 msgstr "lista chave e identificadores de utilizadores"
 
-#: g10/tofu.c:1634 g10/tofu.c:1799
+#: g10/tofu.c:1634 g10/tofu.c:1801
 #, fuzzy, c-format
 #| msgid "Policy: "
 msgid "policy: %s"
 msgstr "Política: "
 
-#: g10/tofu.c:1725
+#: g10/tofu.c:1727
 #, fuzzy, c-format
 msgid "error gathering signature stats: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: g10/tofu.c:1729
+#: g10/tofu.c:1731
 #, c-format
 msgid "The email address \"%s\" is associated with %d key:\n"
 msgid_plural "The email address \"%s\" is associated with %d keys:\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1747
+#: g10/tofu.c:1749
 #, c-format
 msgid "Statistics for keys with the email address \"%s\":\n"
 msgstr ""
 
-#: g10/tofu.c:1797
+#: g10/tofu.c:1799
 #, fuzzy
 #| msgid "list keys"
 msgid "this key"
 msgstr "listar as chaves"
 
-#: g10/tofu.c:1823
+#: g10/tofu.c:1825
 #, fuzzy, c-format
 msgid "Verified %d message."
 msgid_plural "Verified %d messages."
 msgstr[0] "|algo [ficheiros]|imprimir \"digests\" de mensagens"
 msgstr[1] "|algo [ficheiros]|imprimir \"digests\" de mensagens"
 
-#: g10/tofu.c:1827
+#: g10/tofu.c:1829
 #, fuzzy, c-format
 msgid "Encrypted %d message."
 msgid_plural "Encrypted %d messages."
 msgstr[0] "Repita a frase secreta\n"
 msgstr[1] "Repita a frase secreta\n"
 
-#: g10/tofu.c:1834
+#: g10/tofu.c:1836
 #, fuzzy, c-format
 msgid "Verified %d message in the future."
 msgid_plural "Verified %d messages in the future."
 msgstr[0] "|algo [ficheiros]|imprimir \"digests\" de mensagens"
 msgstr[1] "|algo [ficheiros]|imprimir \"digests\" de mensagens"
 
-#: g10/tofu.c:1838
+#: g10/tofu.c:1840
 #, fuzzy, c-format
 msgid "Encrypted %d message in the future."
 msgid_plural "Encrypted %d messages in the future."
 msgstr[0] "|algo [ficheiros]|imprimir \"digests\" de mensagens"
 msgstr[1] "|algo [ficheiros]|imprimir \"digests\" de mensagens"
 
-#: g10/tofu.c:1852
+#: g10/tofu.c:1854
 #, c-format
 msgid "Messages verified over the past %d day: %d."
 msgid_plural "Messages verified over the past %d days: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1858
+#: g10/tofu.c:1860
 #, c-format
 msgid "Messages encrypted over the past %d day: %d."
 msgid_plural "Messages encrypted over the past %d days: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1868
+#: g10/tofu.c:1870
 #, c-format
 msgid "Messages verified over the past %d month: %d."
 msgid_plural "Messages verified over the past %d months: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1874
+#: g10/tofu.c:1876
 #, c-format
 msgid "Messages encrypted over the past %d month: %d."
 msgid_plural "Messages encrypted over the past %d months: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1884
+#: g10/tofu.c:1886
 #, c-format
 msgid "Messages verified over the past %d year: %d."
 msgid_plural "Messages verified over the past %d years: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1890
+#: g10/tofu.c:1892
 #, c-format
 msgid "Messages encrypted over the past %d year: %d."
 msgid_plural "Messages encrypted over the past %d years: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1898
+#: g10/tofu.c:1900
 #, c-format
 msgid "Messages verified in the past: %d."
 msgstr ""
 
-#: g10/tofu.c:1902
+#: g10/tofu.c:1904
 #, fuzzy, c-format
 msgid "Messages encrypted in the past: %d."
 msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
@@ -7884,129 +7897,129 @@ msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
 #. TRANSLATORS: Please translate the text found in the source
 #. * file below.  We don't directly internationalize that text so
 #. * that we can tweak it without breaking translations.
-#: g10/tofu.c:1919
+#: g10/tofu.c:1921
 msgid "TOFU detected a binding conflict"
 msgstr ""
 
 #. TRANSLATORS: Two letters (normally the lower and upper case
 #. * version of the hotkey) for each of the five choices.  If
 #. * there is only one choice in your language, repeat it.
-#: g10/tofu.c:1961
+#: g10/tofu.c:1963
 msgid "gGaAuUrRbB"
 msgstr ""
 
-#: g10/tofu.c:1967
+#: g10/tofu.c:1969
 msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 
-#: g10/tofu.c:1975
+#: g10/tofu.c:1978
 msgid "Defaulting to unknown.\n"
 msgstr ""
 
-#: g10/tofu.c:2093 g10/tofu.c:2228
+#: g10/tofu.c:2097 g10/tofu.c:2232
 #, c-format
 msgid "TOFU db corruption detected.\n"
 msgstr ""
 
-#: g10/tofu.c:2829
+#: g10/tofu.c:2833
 #, fuzzy, c-format
 msgid "error changing TOFU policy: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: g10/tofu.c:2880
+#: g10/tofu.c:2884
 #, c-format
 msgid "%lld~year"
 msgid_plural "%lld~years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2885
+#: g10/tofu.c:2889
 #, c-format
 msgid "%lld~month"
 msgid_plural "%lld~months"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2890
+#: g10/tofu.c:2894
 #, c-format
 msgid "%lld~week"
 msgid_plural "%lld~weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2895
+#: g10/tofu.c:2899
 #, c-format
 msgid "%lld~day"
 msgid_plural "%lld~days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2900
+#: g10/tofu.c:2904
 #, c-format
 msgid "%lld~hour"
 msgid_plural "%lld~hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2905
+#: g10/tofu.c:2909
 #, c-format
 msgid "%lld~minute"
 msgid_plural "%lld~minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2907
+#: g10/tofu.c:2911
 #, c-format
 msgid "%lld~second"
 msgid_plural "%lld~seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:3145
+#: g10/tofu.c:3149
 #, c-format
 msgid "%s: Verified 0~signatures and encrypted 0~messages."
 msgstr ""
 
-#: g10/tofu.c:3151
+#: g10/tofu.c:3155
 #, fuzzy, c-format
 #| msgid "Deleted %d signatures.\n"
 msgid "%s: Verified 0 signatures."
 msgstr "%d assinaturas removidas.\n"
 
-#: g10/tofu.c:3165
+#: g10/tofu.c:3169
 #, fuzzy
 msgid "Encrypted 0 messages."
 msgstr "Repita a frase secreta\n"
 
-#: g10/tofu.c:3181
+#: g10/tofu.c:3185
 #, fuzzy, c-format
 #| msgid "Policy: "
 msgid "(policy: %s)"
 msgstr "Política: "
 
-#: g10/tofu.c:3215
+#: g10/tofu.c:3219
 #, c-format
 msgid ""
 "Warning: we have yet to see a message signed using this key and user id!\n"
 msgstr ""
 
-#: g10/tofu.c:3218
+#: g10/tofu.c:3222
 #, c-format
 msgid ""
 "Warning: we've only seen one message signed using this key and user id!\n"
 msgstr ""
 
-#: g10/tofu.c:3222
+#: g10/tofu.c:3226
 #, c-format
 msgid "Warning: you have yet to encrypt a message to this key!\n"
 msgstr ""
 
-#: g10/tofu.c:3225
+#: g10/tofu.c:3229
 #, c-format
 msgid "Warning: you have only encrypted one message to this key!\n"
 msgstr ""
 
-#: g10/tofu.c:3254
+#: g10/tofu.c:3258
 #, c-format
 msgid ""
 "Warning: if you think you've seen more signatures by this key and user id, "
@@ -8023,13 +8036,13 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:3339 g10/tofu.c:3502 g10/tofu.c:3708 g10/tofu.c:3761
-#: g10/tofu.c:3902 g10/tofu.c:3979 g10/tofu.c:4017
+#: g10/tofu.c:3343 g10/tofu.c:3506 g10/tofu.c:3712 g10/tofu.c:3765
+#: g10/tofu.c:3906 g10/tofu.c:3983 g10/tofu.c:4021
 #, fuzzy, c-format
 msgid "error opening TOFU database: %s\n"
 msgstr "erro ao enviar para `%s': %s\n"
 
-#: g10/tofu.c:3535
+#: g10/tofu.c:3539
 #, c-format
 msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
 msgstr ""
@@ -8097,7 +8110,7 @@ msgstr ""
 msgid "no need for a trustdb check\n"
 msgstr "não é necessária uma verificação da base de dados de confiança\n"
 
-#: g10/trustdb.c:601 g10/trustdb.c:2272
+#: g10/trustdb.c:601 g10/trustdb.c:2273
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "proxima verificação da base de dados de confiança a %s\n"
@@ -8127,60 +8140,60 @@ msgstr ""
 msgid "checking the trustdb\n"
 msgstr "a verificar a base de dados de confiança\n"
 
-#: g10/trustdb.c:1993
+#: g10/trustdb.c:1994
 #, fuzzy, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr[0] "%lu chaves processadas até agora\n"
 msgstr[1] "%lu chaves processadas até agora\n"
 
-#: g10/trustdb.c:1996
+#: g10/trustdb.c:1997
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/trustdb.c:2066
+#: g10/trustdb.c:2067
 #, fuzzy, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr ""
 "chave pública da chave absolutamente de confiança %08lX não encontrada\n"
 
-#: g10/trustdb.c:2080
+#: g10/trustdb.c:2081
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 "chave pública da chave absolutamente de confiança %08lX não encontrada\n"
 
-#: g10/trustdb.c:2198
+#: g10/trustdb.c:2199
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2279
+#: g10/trustdb.c:2280
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "registo de confiança %lu, tipo %d: escrita falhou: %s\n"
 
-#: g10/trust.c:125
+#: g10/trust.c:114
 msgid "undefined"
 msgstr ""
 
-#: g10/trust.c:126
+#: g10/trust.c:115
 msgid "never"
 msgstr ""
 
-#: g10/trust.c:127
+#: g10/trust.c:116
 msgid "marginal"
 msgstr ""
 
-#: g10/trust.c:128
+#: g10/trust.c:117
 msgid "full"
 msgstr ""
 
-#: g10/trust.c:129
+#: g10/trust.c:118
 msgid "ultimate"
 msgstr ""
 
@@ -8192,42 +8205,42 @@ msgstr ""
 #. It gets passed to atoi() so everything after the number is
 #. essentially a comment and need not be translated.  Either key and
 #. uid are both NULL, or neither are NULL.
-#: g10/trust.c:166
+#: g10/trust.c:155
 msgid "10 translator see trust.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trust.c:169
+#: g10/trust.c:158
 #, fuzzy
 msgid "[ revoked]"
 msgstr "revkey"
 
-#: g10/trust.c:171 g10/trust.c:177
+#: g10/trust.c:160 g10/trust.c:166
 #, fuzzy
 msgid "[ expired]"
 msgstr "expire"
 
-#: g10/trust.c:176
+#: g10/trust.c:165
 #, fuzzy
 msgid "[ unknown]"
 msgstr "versão desconhecida"
 
-#: g10/trust.c:178
+#: g10/trust.c:167
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trust.c:179
+#: g10/trust.c:168
 msgid "[  never ]"
 msgstr ""
 
-#: g10/trust.c:180
+#: g10/trust.c:169
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trust.c:181
+#: g10/trust.c:170
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trust.c:182
+#: g10/trust.c:171
 msgid "[ultimate]"
 msgstr ""
 
@@ -8286,16 +8299,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:4937 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2386
+#: scd/app-piv.c:1770 scd/app-p15.c:5035 scd/app-nks.c:1530
+#: scd/app-openpgp.c:2387
 #, 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:4956 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2402
+#: scd/app-piv.c:1787 scd/app-p15.c:5054 scd/app-nks.c:1549
+#: scd/app-openpgp.c:2403
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
@@ -8330,10 +8343,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:2669
-#: scd/app-openpgp.c:2693 scd/app-openpgp.c:2871 scd/app-openpgp.c:2893
-#: scd/app-openpgp.c:3074 scd/app-openpgp.c:3361 scd/app-openpgp.c:3408
-#: scd/app-openpgp.c:3545 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2670
+#: scd/app-openpgp.c:2694 scd/app-openpgp.c:2872 scd/app-openpgp.c:2894
+#: scd/app-openpgp.c:3075 scd/app-openpgp.c:3362 scd/app-openpgp.c:3409
+#: scd/app-openpgp.c:3547 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -8353,96 +8366,96 @@ msgstr ""
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr ""
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3616
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3618
 #, fuzzy, c-format
 msgid "key already exists\n"
 msgstr "%s' já comprimido\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3620
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3622
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3622
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3624
 #, fuzzy, c-format
 msgid "generating new key\n"
 msgstr "gerar um novo par de chaves"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3624
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3626
 #, fuzzy, c-format
 msgid "writing new key\n"
 msgstr "gerar um novo par de chaves"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4484 scd/app-openpgp.c:4767
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4486 scd/app-openpgp.c:4761
 #, 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:1615
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1616
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1622
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1623
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1732
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1733
 #, 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:4943
+#: scd/app-piv.c:3279 scd/app-openpgp.c:4937
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4951
+#: scd/app-piv.c:3294 scd/app-openpgp.c:4945
 #, 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:4957
+#: scd/app-piv.c:3300 scd/app-openpgp.c:4951
 #, 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:1842 scd/app-openpgp.c:4966
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1843 scd/app-openpgp.c:4960
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-p15.c:5035 scd/app-nks.c:2038
+#: scd/app-p15.c:5133 scd/app-nks.c:2038
 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:5038 scd/app-openpgp.c:2818
+#: scd/app-p15.c:5136 scd/app-openpgp.c:2819
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "muda a frase secreta"
 
-#: scd/app-p15.c:5040 scd/app-nks.c:2028
+#: scd/app-p15.c:5138 scd/app-nks.c:2028
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "motivo da revocação: "
 
-#: scd/app-p15.c:5043 scd/app-nks.c:2019
+#: scd/app-p15.c:5141 scd/app-nks.c:2019
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "muda a frase secreta"
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4321
+#: scd/app-nks.c:1468 scd/app-openpgp.c:4323
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1476 scd/app-openpgp.c:4333
+#: scd/app-nks.c:1476 scd/app-openpgp.c:4335
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
@@ -8484,27 +8497,27 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3442 scd/app-dinsig.c:534
+#: scd/app-nks.c:2221 scd/app-openpgp.c:3443 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:943
+#: scd/app-openpgp.c:944
 #, 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:956
+#: scd/app-openpgp.c:957
 #, 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:1427 scd/app-openpgp.c:3389 scd/app-openpgp.c:5715
+#: scd/app-openpgp.c:1428 scd/app-openpgp.c:3390 scd/app-openpgp.c:5709
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1949
+#: scd/app-openpgp.c:1950
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "remoção do bloco de chave falhou: %s\n"
@@ -8512,43 +8525,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:2373
+#: scd/app-openpgp.c:2374
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2621
+#: scd/app-openpgp.c:2622
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2628
+#: scd/app-openpgp.c:2629
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2641
+#: scd/app-openpgp.c:2642
 #, fuzzy
 msgid "||Please unlock the card"
 msgstr "muda a frase secreta"
 
-#: scd/app-openpgp.c:2700 scd/app-openpgp.c:2900 scd/app-openpgp.c:3368
+#: scd/app-openpgp.c:2701 scd/app-openpgp.c:2901 scd/app-openpgp.c:3369
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2717 scd/app-openpgp.c:2760 scd/app-openpgp.c:2917
-#: scd/app-openpgp.c:5325
+#: scd/app-openpgp.c:2718 scd/app-openpgp.c:2761 scd/app-openpgp.c:2918
+#: scd/app-openpgp.c:5319
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "A geração de chaves falhou: %s\n"
 
-#: scd/app-openpgp.c:2804 scd/app-openpgp.c:5724
+#: scd/app-openpgp.c:2805 scd/app-openpgp.c:5718
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2808
+#: scd/app-openpgp.c:2809
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8556,22 +8569,22 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: scd/app-openpgp.c:2841
+#: scd/app-openpgp.c:2842
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3355
+#: scd/app-openpgp.c:3356
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "muda a frase secreta"
 
-#: scd/app-openpgp.c:3404
+#: scd/app-openpgp.c:3405
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "motivo da revocação: "
 
-#: scd/app-openpgp.c:3414 scd/app-openpgp.c:3481
+#: scd/app-openpgp.c:3415 scd/app-openpgp.c:3484
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
@@ -8579,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:3437
+#: scd/app-openpgp.c:3438
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3439
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3439
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3541
+#: scd/app-openpgp.c:3543
 #, fuzzy
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "muda a frase secreta"
 
-#: scd/app-openpgp.c:3542
+#: scd/app-openpgp.c:3544
 #, fuzzy
 msgid "||Please enter the PIN and New PIN"
 msgstr "muda a frase secreta"
 
-#: scd/app-openpgp.c:3600 scd/app-openpgp.c:5026
+#: scd/app-openpgp.c:3602 scd/app-openpgp.c:5020
 #, fuzzy, c-format
 msgid "error reading application data\n"
 msgstr "erro na leitura do bloco de chave: %s\n"
 
-#: scd/app-openpgp.c:3606 scd/app-openpgp.c:5033
+#: scd/app-openpgp.c:3608 scd/app-openpgp.c:5027
 #, fuzzy, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "%s: erro ao ler registo livre: %s\n"
 
-#: scd/app-openpgp.c:4302 scd/app-openpgp.c:4657
+#: scd/app-openpgp.c:4304 scd/app-openpgp.c:4653
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4343 scd/app-openpgp.c:4351
+#: scd/app-openpgp.c:4345 scd/app-openpgp.c:4353
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4651
+#: scd/app-openpgp.c:4647
 #, fuzzy, c-format
 #| msgid "unsupported URI"
 msgid "unsupported curve\n"
 msgstr "URI não suportado"
 
-#: scd/app-openpgp.c:4991
+#: scd/app-openpgp.c:4985
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5041
+#: scd/app-openpgp.c:5035
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5240
+#: scd/app-openpgp.c:5234
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: scd/app-openpgp.c:5298
+#: scd/app-openpgp.c:5292
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5729
+#: scd/app-openpgp.c:5723
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:6241 scd/app-openpgp.c:6252
+#: scd/app-openpgp.c:6250 scd/app-openpgp.c:6261
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nenhum dado OpenPGP válido encontrado.\n"
@@ -8674,7 +8687,7 @@ msgstr ""
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:274 dirmngr/dirmngr.c:198
+#: scd/scdaemon.c:136 sm/gpgsm.c:274 dirmngr/dirmngr.c:199
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
@@ -8739,12 +8752,12 @@ msgstr ""
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2104
+#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2143
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2112
+#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2151
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -8754,11 +8767,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:199 sm/certchain.c:2172
+#: sm/certchain.c:199 sm/certchain.c:2174
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:200 sm/certchain.c:2172
+#: sm/certchain.c:200 sm/certchain.c:2174
 #, fuzzy
 msgid "shell"
 msgstr "help"
@@ -8792,231 +8805,231 @@ msgstr "a escrever chave privada para `%s'\n"
 msgid "certificate policy not allowed"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: sm/certchain.c:595 sm/keydb.c:1891 sm/keydb.c:1980
+#: sm/certchain.c:596 sm/keydb.c:1913 sm/keydb.c:2002
 #, fuzzy, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "falha ao inicializar a base de dados de confiança: %s\n"
 
-#: sm/certchain.c:624
+#: sm/certchain.c:625
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:644
+#: sm/certchain.c:645
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#: sm/certchain.c:724 dirmngr/ocsp.c:683
 #, fuzzy, c-format
 #| msgid "%s: can't access: %s\n"
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "%s: impossível aceder: %s\n"
 
-#: sm/certchain.c:791
+#: sm/certchain.c:792
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr ""
 
-#: sm/certchain.c:816
+#: sm/certchain.c:817
 #, fuzzy, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: sm/certchain.c:819
+#: sm/certchain.c:820
 #, fuzzy, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "remoção do bloco de chave falhou: %s\n"
 
-#: sm/certchain.c:1046 sm/certchain.c:1561 sm/certchain.c:2200 sm/decrypt.c:643
-#: sm/encrypt.c:620 sm/import.c:414 sm/keydb.c:1898 sm/keydb.c:1987
-#: sm/sign.c:428 sm/verify.c:117
+#: sm/certchain.c:1047 sm/certchain.c:1562 sm/certchain.c:2202
+#: sm/decrypt.c:1084 sm/encrypt.c:621 sm/import.c:414 sm/keydb.c:1920
+#: sm/keydb.c:2009 sm/sign.c:428 sm/verify.c:117
 #, fuzzy, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "falha ao inicializar a base de dados de confiança: %s\n"
 
-#: sm/certchain.c:1232
+#: sm/certchain.c:1233
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "NOTA: a chave foi revogada"
 
-#: sm/certchain.c:1247
+#: sm/certchain.c:1248
 msgid "the status of the certificate is unknown"
 msgstr ""
 
-#: sm/certchain.c:1254
+#: sm/certchain.c:1255
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:1260
+#: sm/certchain.c:1261
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "verificação da assinatura criada falhou: %s\n"
 
-#: sm/certchain.c:1289 sm/certchain.c:1357 dirmngr/validate.c:497
+#: sm/certchain.c:1290 sm/certchain.c:1358 dirmngr/validate.c:497
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:1304 sm/certchain.c:1389 dirmngr/validate.c:515
+#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:515
 #, c-format
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1305 sm/certchain.c:1390
+#: sm/certchain.c:1306 sm/certchain.c:1391
 #, fuzzy
 msgid "root certificate not yet valid"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1307 sm/certchain.c:1392
 msgid "intermediate certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1319 dirmngr/validate.c:526
+#: sm/certchain.c:1320 dirmngr/validate.c:526
 #, fuzzy, c-format
 msgid "certificate has expired"
 msgstr "Esta chave expirou!"
 
-#: sm/certchain.c:1320
+#: sm/certchain.c:1321
 #, fuzzy
 msgid "root certificate has expired"
 msgstr "Esta chave expirou!"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1322
 #, fuzzy
 msgid "intermediate certificate has expired"
 msgstr "Esta chave expirou!"
 
-#: sm/certchain.c:1363
+#: sm/certchain.c:1364
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:1372
+#: sm/certchain.c:1373
 #, fuzzy
 msgid "certificate with invalid validity"
 msgstr "Esta chave expirou!"
 
-#: sm/certchain.c:1409
+#: sm/certchain.c:1410
 msgid "signature not created during lifetime of certificate"
 msgstr ""
 
-#: sm/certchain.c:1411
+#: sm/certchain.c:1412
 msgid "certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1413
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1416
+#: sm/certchain.c:1417
 #, fuzzy, c-format
 msgid "  (  signature created at "
 msgstr "        novas assinaturas: %lu\n"
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1418
 #, fuzzy, c-format
 msgid "  (certificate created at "
 msgstr "chave %08lX: certificado de revogação \"%s\" adicionado\n"
 
-#: sm/certchain.c:1420
+#: sm/certchain.c:1421
 #, fuzzy, c-format
 msgid "  (certificate valid from "
 msgstr "certificado incorrecto"
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1422
 #, c-format
 msgid "  (     issuer valid from "
 msgstr ""
 
-#: sm/certchain.c:1451 dirmngr/validate.c:577
+#: sm/certchain.c:1452 dirmngr/validate.c:577
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "mostra impressão digital"
 
-#: sm/certchain.c:1460
+#: sm/certchain.c:1461
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:1473
+#: sm/certchain.c:1474
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1479
+#: sm/certchain.c:1480
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1538
+#: sm/certchain.c:1539
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 
-#: sm/certchain.c:1602
+#: sm/certchain.c:1603
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "gerar um certificado de revogação"
 
-#: sm/certchain.c:1680
+#: sm/certchain.c:1681
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1749 dirmngr/validate.c:575
+#: sm/certchain.c:1750 dirmngr/validate.c:575
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:1765
+#: sm/certchain.c:1766
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "verificação da assinatura criada falhou: %s\n"
 
-#: sm/certchain.c:1796 sm/import.c:175 dirmngr/validate.c:630
+#: sm/certchain.c:1797 sm/import.c:175 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1808 dirmngr/validate.c:642
+#: sm/certchain.c:1809 dirmngr/validate.c:642
 #, c-format
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1842 dirmngr/validate.c:668
+#: sm/certchain.c:1844 dirmngr/validate.c:668
 #, fuzzy, c-format
 msgid "certificate has a BAD signature"
 msgstr "verificar uma assinatura"
 
-#: sm/certchain.c:1874 dirmngr/validate.c:692
+#: sm/certchain.c:1876 dirmngr/validate.c:692
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1933 dirmngr/validate.c:717
+#: sm/certchain.c:1935 dirmngr/validate.c:717
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1975 sm/certchain.c:2275 dirmngr/validate.c:747
+#: sm/certchain.c:1977 sm/certchain.c:2278 dirmngr/validate.c:747
 #, fuzzy, c-format
 msgid "certificate is good\n"
 msgstr "preferência %c%lu duplicada\n"
 
-#: sm/certchain.c:1976
+#: sm/certchain.c:1978
 #, fuzzy, c-format
 msgid "intermediate certificate is good\n"
 msgstr "chave %08lX: certificado de revogação \"%s\" adicionado\n"
 
-#: sm/certchain.c:1977
+#: sm/certchain.c:1979
 #, fuzzy, c-format
 msgid "root certificate is good\n"
 msgstr "certificado incorrecto"
 
-#: sm/certchain.c:2159
+#: sm/certchain.c:2161
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:2168
+#: sm/certchain.c:2170
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -9027,18 +9040,18 @@ 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:1372 dirmngr/validate.c:903
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1411 dirmngr/validate.c:903
 #: dirmngr/validate.c:927
 #, fuzzy, c-format
 msgid "out of core\n"
 msgstr "não processado"
 
-#: sm/certcheck.c:389 sm/verify.c:212
+#: sm/certcheck.c:388 sm/verify.c:212
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:793
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:794
 #, fuzzy
 msgid "none"
 msgstr "não"
@@ -9337,17 +9350,17 @@ msgstr ""
 msgid "resource problem: out of core\n"
 msgstr ""
 
-#: sm/decrypt.c:719
+#: sm/decrypt.c:1159
 #, c-format
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
 
-#: sm/decrypt.c:721
+#: sm/decrypt.c:1161
 #, c-format
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr ""
 
-#: sm/decrypt.c:868
+#: sm/decrypt.c:1318
 #, fuzzy, c-format
 msgid "encrypted to %s key %s\n"
 msgstr "cifrado com chave %s, ID %08lX\n"
@@ -9357,7 +9370,7 @@ msgstr "cifrado com chave %s, ID %08lX\n"
 msgid "certificate '%s' not found: %s\n"
 msgstr "chave `%s' não encontrada: %s\n"
 
-#: sm/delete.c:120 sm/keydb.c:1999 sm/keydb.c:2098
+#: sm/delete.c:120 sm/keydb.c:2021 sm/keydb.c:2120
 #, fuzzy, c-format
 msgid "error locking keybox: %s\n"
 msgstr "erro na leitura do bloco de chave: %s\n"
@@ -9377,7 +9390,7 @@ msgstr "preferência %c%lu duplicada\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "remoção do bloco de chave falhou: %s\n"
 
-#: sm/encrypt.c:606
+#: sm/encrypt.c:607
 #, fuzzy, c-format
 msgid "no valid recipients given\n"
 msgstr "resposta do agente inválida\n"
@@ -9455,70 +9468,70 @@ msgstr ""
 "adicionar este porta-chaves\n"
 "à lista de porta-chaves"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:352 dirmngr/dirmngr.c:265
 #, fuzzy
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|ENDEREÇO|usar este servidor para buscar chaves"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:363
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:364
+#: sm/gpgsm.c:365
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 "|NOME|usar algoritmo de criptografia NOME para\n"
 "frases secretas"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:386
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:389
+#: sm/gpgsm.c:390
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: sm/gpgsm.c:393
+#: sm/gpgsm.c:394
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:396
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:398
+#: sm/gpgsm.c:399
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usar algoritmo de criptografia NOME"
 
-#: sm/gpgsm.c:400
+#: sm/gpgsm.c:401
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
 
-#: sm/gpgsm.c:410
+#: sm/gpgsm.c:411
 msgid "batch mode: never ask"
 msgstr "modo não-interactivo: nunca perguntar"
 
-#: sm/gpgsm.c:412
+#: sm/gpgsm.c:413
 msgid "assume yes on most questions"
 msgstr "assumir sim para a maioria das perguntas"
 
-#: sm/gpgsm.c:413
+#: sm/gpgsm.c:414
 msgid "assume no on most questions"
 msgstr "assumir não para a maioria das perguntas"
 
-#: sm/gpgsm.c:430
+#: sm/gpgsm.c:431
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
 
-#: sm/gpgsm.c:615
+#: sm/gpgsm.c:616
 #, 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:618
+#: sm/gpgsm.c:619
 #, fuzzy
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
@@ -9529,52 +9542,27 @@ msgstr ""
 "assina, verifica, cifra ou decifra\n"
 "a operação por omissão depende dos dados de entrada\n"
 
-#: sm/gpgsm.c:826
+#: sm/gpgsm.c:827
 #, 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:837
+#: sm/gpgsm.c:838
 #, fuzzy, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "destinatário por omissão desconhecido `%s'\n"
 
-#: sm/gpgsm.c:896 dirmngr/ldapserver.c:89
-#, c-format
-msgid "%s:%u: no hostname given\n"
-msgstr ""
-
-#: sm/gpgsm.c:915 dirmngr/ldapserver.c:108
-#, c-format
-msgid "%s:%u: password given without user\n"
-msgstr ""
-
-#: sm/gpgsm.c:946 dirmngr/ldapserver.c:139
-#, c-format
-msgid "%s:%u: ignoring unknown flag '%s'\n"
-msgstr ""
-
-#: sm/gpgsm.c:962 dirmngr/ldapserver.c:155
-#, fuzzy, c-format
-msgid "%s:%u: skipping this line\n"
-msgstr " s = saltar esta chave\n"
-
-#: sm/gpgsm.c:1550
-#, fuzzy, c-format
-msgid "could not parse keyserver\n"
-msgstr "não consegui processar a URI do servidor de chaves\n"
-
-#: sm/gpgsm.c:1858
+#: sm/gpgsm.c:1711
 #, fuzzy, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "a escrever para `%s'\n"
 
-#: sm/gpgsm.c:1904
+#: sm/gpgsm.c:1757
 #, fuzzy, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "impossível fechar `%s': %s\n"
 
-#: sm/gpgsm.c:2273
+#: sm/gpgsm.c:2129
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
@@ -9594,52 +9582,52 @@ msgstr "gerar um certificado de revogação"
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:471 sm/keydb.c:2018 sm/keydb.c:2111
+#: sm/import.c:472 sm/keydb.c:2040 sm/keydb.c:2133
 #, fuzzy, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: sm/import.c:530 sm/import.c:562
+#: sm/import.c:531 sm/import.c:563
 #, fuzzy, c-format
 msgid "error importing certificate: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: sm/import.c:751 tools/gpg-connect-agent.c:1475
+#: sm/import.c:752 tools/gpg-connect-agent.c:1475
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: sm/keydb.c:503
+#: sm/keydb.c:508
 #, fuzzy, c-format
 msgid "no keyboxd running in this session\n"
 msgstr "o gpg-agent não está disponível nesta sessão\n"
 
-#: sm/keydb.c:595
+#: sm/keydb.c:600
 #, fuzzy, c-format
 msgid "error opening key DB: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: sm/keydb.c:1936
+#: sm/keydb.c:1958
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1948
+#: sm/keydb.c:1970
 #, fuzzy, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: sm/keydb.c:1956
+#: sm/keydb.c:1978
 #, fuzzy, c-format
 msgid "error storing certificate: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: sm/keydb.c:2009
+#: sm/keydb.c:2031
 #, fuzzy, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "rev? problema ao verificar revogação: %s\n"
 
-#: sm/keydb.c:2030 sm/keydb.c:2122
+#: sm/keydb.c:2052 sm/keydb.c:2144
 #, fuzzy, c-format
 msgid "error storing flags: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
@@ -9811,57 +9799,57 @@ msgstr ""
 msgid "error loading certificate '%s': %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: dirmngr/certcache.c:819
+#: dirmngr/certcache.c:820
 #, fuzzy, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "certificado incorrecto"
 
-#: dirmngr/certcache.c:821
+#: dirmngr/certcache.c:822
 #, fuzzy, c-format
 msgid "    runtime cached certificates: %u\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: dirmngr/certcache.c:823
+#: dirmngr/certcache.c:824
 #, fuzzy, c-format
 msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: dirmngr/certcache.c:851 dirmngr/dirmngr-client.c:392
+#: dirmngr/certcache.c:852 dirmngr/dirmngr-client.c:392
 #, fuzzy, c-format
 msgid "certificate already cached\n"
 msgstr "chave %08lX: certificado de revogação \"%s\" adicionado\n"
 
-#: dirmngr/certcache.c:853
+#: dirmngr/certcache.c:854
 #, fuzzy, c-format
 msgid "certificate cached\n"
 msgstr "preferência %c%lu duplicada\n"
 
-#: dirmngr/certcache.c:855 dirmngr/certcache.c:875 dirmngr/dirmngr-client.c:396
+#: dirmngr/certcache.c:856 dirmngr/certcache.c:876 dirmngr/dirmngr-client.c:396
 #, fuzzy, c-format
 msgid "error caching certificate: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: dirmngr/certcache.c:938
+#: dirmngr/certcache.c:939
 #, fuzzy, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "%s: versão de ficheiro inválida %d\n"
 
-#: dirmngr/certcache.c:1384 dirmngr/certcache.c:1393
+#: dirmngr/certcache.c:1385 dirmngr/certcache.c:1394
 #, fuzzy, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: dirmngr/certcache.c:1579 dirmngr/certcache.c:1588
+#: dirmngr/certcache.c:1580 dirmngr/certcache.c:1589
 #, fuzzy, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: dirmngr/certcache.c:1694 dirmngr/validate.c:483
+#: dirmngr/certcache.c:1695 dirmngr/validate.c:483
 #, fuzzy, c-format
 msgid "no issuer found in certificate\n"
 msgstr "gerar um certificado de revogação"
 
-#: dirmngr/certcache.c:1704
+#: dirmngr/certcache.c:1705
 #, fuzzy, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
@@ -9897,7 +9885,7 @@ msgstr "remoção do bloco de chave falhou: %s\n"
 msgid "not removing file '%s'\n"
 msgstr "criação de armadura falhou: %s\n"
 
-#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2380
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2383
 #, fuzzy, c-format
 msgid "error closing cache file: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
@@ -10131,13 +10119,13 @@ msgid "error getting data from cache file: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
 #: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1672 dirmngr/crlcache.c:1697
-#: dirmngr/crlcache.c:1763
+#: dirmngr/crlcache.c:1766
 #, c-format
 msgid "got an invalid S-expression from libksba\n"
 msgstr ""
 
 #: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1679 dirmngr/crlcache.c:1705
-#: dirmngr/crlcache.c:1770 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1773 dirmngr/misc.c:176
 #, fuzzy, c-format
 msgid "converting S-expression failed: %s\n"
 msgstr "impossível abrir %s: %s\n"
@@ -10153,201 +10141,201 @@ msgstr "algoritmo de dispersão inválido `%s'\n"
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1797 dirmngr/ocsp.c:478
+#: dirmngr/crlcache.c:1800 dirmngr/ocsp.c:478
 #, fuzzy, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "remoção do bloco de chave falhou: %s\n"
 
-#: dirmngr/crlcache.c:1871
+#: dirmngr/crlcache.c:1874
 #, fuzzy, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "actualização falhou: %s\n"
 
-#: dirmngr/crlcache.c:1886
+#: dirmngr/crlcache.c:1889
 #, fuzzy, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: dirmngr/crlcache.c:1893
+#: dirmngr/crlcache.c:1896
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1897
+#: dirmngr/crlcache.c:1900
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1917
+#: dirmngr/crlcache.c:1920
 #, fuzzy, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: dirmngr/crlcache.c:1932
+#: dirmngr/crlcache.c:1935
 #, fuzzy, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "a escrever para `%s'\n"
 
-#: dirmngr/crlcache.c:1959
+#: dirmngr/crlcache.c:1962
 #, fuzzy, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "gerar um certificado de revogação"
 
-#: dirmngr/crlcache.c:1974
+#: dirmngr/crlcache.c:1977
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2020
+#: dirmngr/crlcache.c:2023
 #, fuzzy, c-format
 #| msgid "signature verification suppressed\n"
 msgid "CRL signature verification failed: %s\n"
 msgstr "verificação de assinatura suprimida\n"
 
-#: dirmngr/crlcache.c:2032
+#: dirmngr/crlcache.c:2035
 #, fuzzy, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "verificação da assinatura criada falhou: %s\n"
 
-#: dirmngr/crlcache.c:2174
+#: dirmngr/crlcache.c:2177
 #, fuzzy, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "remoção do bloco de chave falhou: %s\n"
 
-#: dirmngr/crlcache.c:2181
+#: dirmngr/crlcache.c:2184
 #, fuzzy, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "actualização falhou: %s\n"
 
-#: dirmngr/crlcache.c:2215
+#: dirmngr/crlcache.c:2218
 #, fuzzy, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "%s: impossível criar directoria: %s\n"
 
-#: dirmngr/crlcache.c:2219
+#: dirmngr/crlcache.c:2222
 #, fuzzy, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "%s: impossível criar directoria: %s\n"
 
-#: dirmngr/crlcache.c:2229
+#: dirmngr/crlcache.c:2232
 #, fuzzy, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: dirmngr/crlcache.c:2239
+#: dirmngr/crlcache.c:2242
 #, fuzzy, c-format
 #| msgid "update secret failed: %s\n"
 msgid "crl_parse_insert failed: %s\n"
 msgstr "actualização da chave secreta falhou: %s\n"
 
-#: dirmngr/crlcache.c:2249
+#: dirmngr/crlcache.c:2252
 #, fuzzy, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "a escrever para `%s'\n"
 
-#: dirmngr/crlcache.c:2256
+#: dirmngr/crlcache.c:2259
 #, fuzzy, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: dirmngr/crlcache.c:2281
+#: dirmngr/crlcache.c:2284
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2285
+#: dirmngr/crlcache.c:2288
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2301
+#: dirmngr/crlcache.c:2304
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2311
+#: dirmngr/crlcache.c:2314
 #, fuzzy, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2365
 #, fuzzy, c-format
 msgid "creating cache file '%s'\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: dirmngr/crlcache.c:2394
+#: dirmngr/crlcache.c:2397
 #, fuzzy, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "criação de armadura falhou: %s\n"
 
-#: dirmngr/crlcache.c:2408
+#: dirmngr/crlcache.c:2411
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
 "program start\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2448
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2468
+#: dirmngr/crlcache.c:2471
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2471
+#: dirmngr/crlcache.c:2474
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2474
+#: dirmngr/crlcache.c:2477
 msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2481
+#: dirmngr/crlcache.c:2484
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2499
+#: dirmngr/crlcache.c:2502
 #, fuzzy, c-format
 #| msgid "WARNING: invalid size of random_seed file - not used\n"
 msgid " WARNING: invalid cache record length\n"
 msgstr ""
 "AVISO: o ficheiro random_seed tem um tamanho inválido - não utilizado\n"
 
-#: dirmngr/crlcache.c:2506
+#: dirmngr/crlcache.c:2509
 #, fuzzy, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "%s: erro ao ler registo livre: %s\n"
 
-#: dirmngr/crlcache.c:2517
+#: dirmngr/crlcache.c:2520
 #, fuzzy, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "rev? problema ao verificar revogação: %s\n"
 
-#: dirmngr/crlcache.c:2548
+#: dirmngr/crlcache.c:2551
 #, fuzzy, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: dirmngr/crlcache.c:2551
+#: dirmngr/crlcache.c:2554
 msgid "End CRL dump\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2672
+#: dirmngr/crlcache.c:2675
 #, fuzzy, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "actualização falhou: %s\n"
 
-#: dirmngr/crlcache.c:2683
+#: dirmngr/crlcache.c:2686
 #, fuzzy, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "verificação da assinatura criada falhou: %s\n"
 
-#: dirmngr/crlcache.c:2743
+#: dirmngr/crlcache.c:2746
 #, fuzzy, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "remoção do bloco de chave falhou: %s\n"
@@ -10368,7 +10356,7 @@ msgstr ""
 msgid "error retrieving '%s': %s\n"
 msgstr "erro ao criar `%s': %s\n"
 
-#: dirmngr/crlfetch.c:218 dirmngr/ldap-wrapper.c:881 dirmngr/misc.c:573
+#: dirmngr/crlfetch.c:218 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
 #, fuzzy, c-format
 #| msgid "%s: error writing dir record: %s\n"
 msgid "error initializing reader object: %s\n"
@@ -10536,135 +10524,135 @@ msgstr ""
 msgid "looking up '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:175
+#: dirmngr/dirmngr.c:176
 msgid "list the contents of the CRL cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:176
+#: dirmngr/dirmngr.c:177
 #, fuzzy
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
 
-#: dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr.c:178
 msgid "|URL|fetch a CRL from URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:178
+#: dirmngr/dirmngr.c:179
 msgid "shutdown the dirmngr"
 msgstr ""
 
-#: dirmngr/dirmngr.c:179
+#: dirmngr/dirmngr.c:180
 msgid "flush the cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:213
 msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:215
+#: dirmngr/dirmngr.c:216
 msgid "|N|do not return more than N items in one query"
 msgstr ""
 
-#: dirmngr/dirmngr.c:221
+#: dirmngr/dirmngr.c:222
 msgid "Network related options"
 msgstr ""
 
-#: dirmngr/dirmngr.c:223
+#: dirmngr/dirmngr.c:224
 msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:235
+#: dirmngr/dirmngr.c:236
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:238
+#: dirmngr/dirmngr.c:239
 #, fuzzy
 msgid "|URL|use keyserver at URL"
 msgstr "não consegui processar a URI do servidor de chaves\n"
 
-#: dirmngr/dirmngr.c:240
+#: dirmngr/dirmngr.c:241
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-#: dirmngr/dirmngr.c:242
+#: dirmngr/dirmngr.c:243
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:244
+#: dirmngr/dirmngr.c:245
 msgid "inhibit the use of HTTP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:246
+#: dirmngr/dirmngr.c:247
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:248
+#: dirmngr/dirmngr.c:249
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:250
+#: dirmngr/dirmngr.c:251
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: dirmngr/dirmngr.c:254
+#: dirmngr/dirmngr.c:255
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: dirmngr/dirmngr.c:256
+#: dirmngr/dirmngr.c:257
 msgid "inhibit the use of LDAP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:258
+#: dirmngr/dirmngr.c:259
 msgid "ignore LDAP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:260
+#: dirmngr/dirmngr.c:261
 msgid "|HOST|use HOST for LDAP queries"
 msgstr ""
 
-#: dirmngr/dirmngr.c:262
+#: dirmngr/dirmngr.c:263
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr ""
 
-#: dirmngr/dirmngr.c:264
+#: dirmngr/dirmngr.c:267
 #, fuzzy
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
 
-#: dirmngr/dirmngr.c:266
+#: dirmngr/dirmngr.c:269
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 
-#: dirmngr/dirmngr.c:269 dirmngr/dirmngr_ldap.c:104
+#: dirmngr/dirmngr.c:272
 msgid "|N|set LDAP timeout to N seconds"
 msgstr ""
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:275
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:274
+#: dirmngr/dirmngr.c:277
 msgid "allow sending OCSP requests"
 msgstr ""
 
-#: dirmngr/dirmngr.c:276
+#: dirmngr/dirmngr.c:279
 msgid "ignore certificate contained OCSP service URLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:278
+#: dirmngr/dirmngr.c:281
 #, fuzzy
 msgid "|URL|use OCSP responder at URL"
 msgstr "não consegui processar a URI do servidor de chaves\n"
 
-#: dirmngr/dirmngr.c:280
+#: dirmngr/dirmngr.c:283
 msgid "|FPR|OCSP response signed by FPR"
 msgstr ""
 
-#: dirmngr/dirmngr.c:288
+#: dirmngr/dirmngr.c:291
 msgid "force loading of outdated CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:299
+#: dirmngr/dirmngr.c:302
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -10677,306 +10665,115 @@ msgstr ""
 "@\n"
 "(Veja a página man para uma lista completa de comandos e opções)\n"
 
-#: dirmngr/dirmngr.c:441
+#: dirmngr/dirmngr.c:449
 #, fuzzy
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
 
-#: dirmngr/dirmngr.c:443
+#: dirmngr/dirmngr.c:451
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:523
+#: dirmngr/dirmngr.c:531
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:609 tools/gpgconf.c:667 tools/gpgconf.c:702
-#: tools/gpgconf.c:802
+#: dirmngr/dirmngr.c:617 tools/gpgconf.c:701 tools/gpgconf.c:736
+#: tools/gpgconf.c:836
 #, fuzzy, c-format
 msgid "usage: %s [options] "
 msgstr "uso: gpg [opções] "
 
-#: dirmngr/dirmngr.c:1260
+#: dirmngr/dirmngr.c:1299
 #, 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:1495 dirmngr/server.c:1824
+#: dirmngr/dirmngr.c:1534 dirmngr/server.c:1878
 #, fuzzy, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "criação de armadura falhou: %s\n"
 
-#: dirmngr/dirmngr.c:1501 dirmngr/server.c:1830
+#: dirmngr/dirmngr.c:1540 dirmngr/server.c:1884
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "criação de armadura falhou: %s\n"
 
-#: dirmngr/dirmngr.c:1643
+#: dirmngr/dirmngr.c:1682
 #, fuzzy, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "frase secreta demasiado longa\n"
 
-#: dirmngr/dirmngr.c:1698 dirmngr/dirmngr.c:1782
+#: dirmngr/dirmngr.c:1737 dirmngr/dirmngr.c:1821
 #, fuzzy, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s: versão de ficheiro inválida %d\n"
 
-#: dirmngr/dirmngr.c:1734 dirmngr/dirmngr.c:1760 tools/gpgconf-comp.c:3539
+#: dirmngr/dirmngr.c:1773 dirmngr/dirmngr.c:1799 tools/gpgconf-comp.c:3549
 #, fuzzy, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "armadura: %s\n"
 
-#: dirmngr/dirmngr.c:1789
+#: dirmngr/dirmngr.c:1828
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1876
+#: dirmngr/dirmngr.c:1915
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1917
+#: dirmngr/dirmngr.c:1956
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1922
+#: dirmngr/dirmngr.c:1961
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1924
+#: dirmngr/dirmngr.c:1963
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1929
+#: dirmngr/dirmngr.c:1968
 #, fuzzy, c-format
 msgid "shutdown forced\n"
 msgstr "não processado"
 
-#: dirmngr/dirmngr.c:1937
+#: dirmngr/dirmngr.c:1976
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1944
+#: dirmngr/dirmngr.c:1983
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:105
-msgid "return all values in a record oriented format"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:108
-msgid "|NAME|ignore host part and connect through NAME"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:109
-msgid "force a TLS connection"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:110
-#, fuzzy
-#| msgid "|NAME|set terminal charset to NAME"
-msgid "|NAME|connect to host NAME"
-msgstr ""
-"|NOME|definir mapa de caracteres do terminal como\n"
-"NOME"
-
-#: dirmngr/dirmngr_ldap.c:111
-msgid "|N|connect to port N"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:112
-#, fuzzy
-#| msgid "|NAME|use NAME as default recipient"
-msgid "|NAME|use user NAME for authentication"
-msgstr "|NOME|usar NOME como destinatário por omissão"
-
-#: dirmngr/dirmngr_ldap.c:113
-msgid "|PASS|use password PASS for authentication"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:115
-msgid "take password from $DIRMNGR_LDAP_PASS"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:116
-msgid "|STRING|query DN STRING"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:117
-msgid "|STRING|use STRING as filter expression"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:118
-msgid "|STRING|return the attribute STRING"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:179
-#, fuzzy
-#| msgid "Usage: gpg [options] [files] (-h for help)"
-msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
-msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
-
-#: dirmngr/dirmngr_ldap.c:182
-msgid ""
-"Syntax: dirmngr_ldap [options] [URL]\n"
-"Internal LDAP helper for Dirmngr\n"
-"Interface and options may change without notice\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:291
-#, fuzzy, c-format
-#| msgid "invalid import options\n"
-msgid "invalid port number %d\n"
-msgstr "opções de importação inválidas\n"
-
-#: dirmngr/dirmngr_ldap.c:400
-#, c-format
-msgid "scanning result for attribute '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:407 dirmngr/dirmngr_ldap.c:490
-#: dirmngr/dirmngr_ldap.c:514 dirmngr/dirmngr_ldap.c:526
-#: dirmngr/dirmngr_ldap.c:722
-#, fuzzy, c-format
-msgid "error writing to stdout: %s\n"
-msgstr "erro na escrita do porta-chaves `%s': %s\n"
-
-#: dirmngr/dirmngr_ldap.c:424
-#, c-format
-msgid "          available attribute '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:462
-#, fuzzy, c-format
-msgid "attribute '%s' not found\n"
-msgstr "chave `%s' não encontrada: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:469
-#, c-format
-msgid "found attribute '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:581
-#, fuzzy, c-format
-#| msgid "reading from `%s'\n"
-msgid "processing url '%s'\n"
-msgstr "lendo de `%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:588
-#, fuzzy, c-format
-#| msgid "          w/o user IDs: %lu\n"
-msgid "          user '%s'\n"
-msgstr "          sem IDs de utilizadores: %lu\n"
-
-#: dirmngr/dirmngr_ldap.c:590
-#, fuzzy, c-format
-msgid "          pass '%s'\n"
-msgstr "                   ou \""
-
-#: dirmngr/dirmngr_ldap.c:592
-#, fuzzy, c-format
-msgid "          host '%s'\n"
-msgstr "                   ou \""
-
-#: dirmngr/dirmngr_ldap.c:593
-#, fuzzy, c-format
-#| msgid "          not imported: %lu\n"
-msgid "          port %d\n"
-msgstr "        não importadas: %lu\n"
-
-#: dirmngr/dirmngr_ldap.c:595
-#, fuzzy, c-format
-msgid "            DN '%s'\n"
-msgstr "                   ou \""
-
-#: dirmngr/dirmngr_ldap.c:597
-#, c-format
-msgid "        filter '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:602 dirmngr/dirmngr_ldap.c:605
-#, fuzzy, c-format
-msgid "          attr '%s'\n"
-msgstr "                   ou \""
-
-#: dirmngr/dirmngr_ldap.c:611
-#, c-format
-msgid "no host name in '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:616
-#, c-format
-msgid "no attribute given for query '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:622
-#, fuzzy, c-format
-#| msgid "WARNING: using insecure memory!\n"
-msgid "WARNING: using first attribute only\n"
-msgstr "AVISO: a utilizar memória insegura!\n"
-
-#: dirmngr/dirmngr_ldap.c:637 dirmngr/dirmngr_ldap.c:678
-#, fuzzy, c-format
-msgid "LDAP init to '%s:%d' failed: %s\n"
-msgstr "criação de armadura falhou: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:659
-#, fuzzy, c-format
-msgid "LDAP init to '%s' failed: %s\n"
-msgstr "criação de armadura falhou: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:665
-#, fuzzy, c-format
-msgid "LDAP init to '%s' done\n"
-msgstr "criação de armadura falhou: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:704
-#, fuzzy, c-format
-msgid "binding to '%s:%d' failed: %s\n"
-msgstr "criação de armadura falhou: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:728
-#, fuzzy, c-format
-#| msgid "dearmoring failed: %s\n"
-msgid "searching '%s' failed: %s\n"
-msgstr "retirada de armadura falhou: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:759
-#, fuzzy, c-format
-msgid "'%s' is not an LDAP URL\n"
-msgstr "%s: não é um base de dados de confiança\n"
-
-#: dirmngr/dirmngr_ldap.c:765
-#, c-format
-msgid "'%s' is an invalid LDAP URL\n"
-msgstr ""
-
-#: dirmngr/http.c:1989 dirmngr/ocsp.c:255
+#: dirmngr/http.c:1998 dirmngr/ocsp.c:255
 #, fuzzy, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: dirmngr/http.c:3630 dirmngr/ocsp.c:229
+#: dirmngr/http.c:3652 dirmngr/ocsp.c:229
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr ""
 
-#: dirmngr/http.c:3636 dirmngr/ocsp.c:246
+#: dirmngr/http.c:3658 dirmngr/ocsp.c:246
 #, fuzzy, c-format
 msgid "too many redirections\n"
 msgstr "demasiadas preferências `%c'\n"
 
-#: dirmngr/http.c:3748
+#: dirmngr/http.c:3768
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "redirection changed to '%s'\n"
@@ -11017,31 +10814,51 @@ msgstr "actualização falhou: %s\n"
 msgid "ldap wrapper %d stalled - killing\n"
 msgstr ""
 
-#: dirmngr/ldap.c:91
+#: dirmngr/ldap.c:92
 #, c-format
 msgid "invalid char 0x%02x in host name - not added\n"
 msgstr ""
 
-#: dirmngr/ldap.c:95
+#: dirmngr/ldap.c:96
 #, fuzzy, c-format
 msgid "adding '%s:%d' to the ldap server list\n"
 msgstr "a procurar por \"%s\" no servidor HKP %s\n"
 
-#: dirmngr/ldap.c:98 dirmngr/misc.c:512
+#: dirmngr/ldap.c:99 dirmngr/misc.c:512
 #, fuzzy, c-format
 msgid "malloc failed: %s\n"
 msgstr "remoção do bloco de chave falhou: %s\n"
 
-#: dirmngr/ldap.c:634
+#: dirmngr/ldap.c:221
+#, fuzzy, c-format
+msgid "'%s' is not an LDAP URL\n"
+msgstr "%s: não é um base de dados de confiança\n"
+
+#: dirmngr/ldap.c:227 dirmngr/ldap.c:233
 #, c-format
-msgid "start_cert_fetch: invalid pattern '%s'\n"
+msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
-#: dirmngr/ldap.c:846
+#: dirmngr/ldap.c:968
 #, c-format
 msgid "ldap_search hit the size limit of the server\n"
 msgstr ""
 
+#: dirmngr/ldapserver.c:119
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr ""
+
+#: dirmngr/ldapserver.c:181
+#, c-format
+msgid "%s:%u: ignoring unknown flag '%s'\n"
+msgstr ""
+
+#: dirmngr/ldapserver.c:203
+#, fuzzy, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr " s = saltar esta chave\n"
+
 #: dirmngr/misc.c:172
 #, fuzzy, c-format
 #| msgid "%s: invalid file version %d\n"
@@ -11134,87 +10951,87 @@ msgstr ""
 msgid "allocating list item failed: %s\n"
 msgstr "remoção do bloco de chave falhou: %s\n"
 
-#: dirmngr/ocsp.c:537 dirmngr/ocsp.c:724
+#: dirmngr/ocsp.c:538 dirmngr/ocsp.c:725
 #, fuzzy, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: dirmngr/ocsp.c:584
+#: dirmngr/ocsp.c:585
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:623 dirmngr/validate.c:648
+#: dirmngr/ocsp.c:624 dirmngr/validate.c:648
 #, fuzzy, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "chave `%s' não encontrada: %s\n"
 
-#: dirmngr/ocsp.c:633
+#: dirmngr/ocsp.c:634
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:640
+#: dirmngr/ocsp.c:641
 #, fuzzy, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "gerar um certificado de revogação"
 
-#: dirmngr/ocsp.c:650
+#: dirmngr/ocsp.c:651
 #, fuzzy, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "falha ao inicializar a base de dados de confiança: %s\n"
 
-#: dirmngr/ocsp.c:689
+#: dirmngr/ocsp.c:690
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:696
 #, fuzzy, c-format
 #| msgid "no default secret keyring: %s\n"
 msgid "no default OCSP signer defined\n"
 msgstr "sem porta-chaves público por omissão: %s\n"
 
-#: dirmngr/ocsp.c:702
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:707
+#: dirmngr/ocsp.c:708
 #, fuzzy, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "assinatura falhou: %s\n"
 
-#: dirmngr/ocsp.c:764
+#: dirmngr/ocsp.c:765
 #, fuzzy, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: dirmngr/ocsp.c:789
+#: dirmngr/ocsp.c:790
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:790
+#: dirmngr/ocsp.c:791
 msgid "good"
 msgstr ""
 
-#: dirmngr/ocsp.c:796
+#: dirmngr/ocsp.c:797
 #, fuzzy, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "NOTA: a chave foi revogada"
 
-#: dirmngr/ocsp.c:831
+#: dirmngr/ocsp.c:832
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:843
+#: dirmngr/ocsp.c:844
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:858
+#: dirmngr/ocsp.c:859
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr ""
@@ -11224,72 +11041,68 @@ msgstr ""
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: dirmngr/server.c:1158
-msgid "ldapserver missing"
-msgstr ""
-
-#: dirmngr/server.c:1224
+#: dirmngr/server.c:1277
 msgid "serialno missing in cert ID"
 msgstr ""
 
-#: dirmngr/server.c:1387 dirmngr/server.c:1473 dirmngr/server.c:1909
-#: dirmngr/server.c:1980 dirmngr/server.c:2556 dirmngr/server.c:2571
+#: dirmngr/server.c:1440 dirmngr/server.c:1526 dirmngr/server.c:1963
+#: dirmngr/server.c:2034 dirmngr/server.c:2662 dirmngr/server.c:2677
 #, fuzzy, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: dirmngr/server.c:1516
+#: dirmngr/server.c:1569
 #, fuzzy, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "remoção do bloco de chave falhou: %s\n"
 
-#: dirmngr/server.c:1528 dirmngr/server.c:1559 dirmngr/server.c:1718
+#: dirmngr/server.c:1581 dirmngr/server.c:1612 dirmngr/server.c:1772
 #, fuzzy, c-format
 msgid "error sending data: %s\n"
 msgstr "erro ao enviar para `%s': %s\n"
 
-#: dirmngr/server.c:1666
+#: dirmngr/server.c:1720
 #, fuzzy, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "remoção do bloco de chave falhou: %s\n"
 
-#: dirmngr/server.c:1699
+#: dirmngr/server.c:1753
 #, fuzzy, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "remoção do bloco de chave falhou: %s\n"
 
-#: dirmngr/server.c:1726
+#: dirmngr/server.c:1780
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:2860
+#: dirmngr/server.c:2966
 #, fuzzy, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "impossível criar `%s': %s\n"
 
-#: dirmngr/server.c:2871
+#: dirmngr/server.c:2977
 #, fuzzy, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "%s: falha ao criar tabela de dispersão: %s\n"
 
-#: dirmngr/server.c:2892
+#: dirmngr/server.c:2998
 #, fuzzy, c-format
 #| msgid "failed to initialize the TrustDB: %s\n"
 msgid "failed to initialize the server: %s\n"
 msgstr "falha ao inicializar a base de dados de confiança: %s\n"
 
-#: dirmngr/server.c:2900
+#: dirmngr/server.c:3006
 #, fuzzy, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "falha ao criar 'cache' do porta-chaves: %s\n"
 
-#: dirmngr/server.c:2933
+#: dirmngr/server.c:3039
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:2952
+#: dirmngr/server.c:3058
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -11438,73 +11251,73 @@ msgstr "o gpg-agent não está disponível nesta sessão\n"
 msgid "error sending standard options: %s\n"
 msgstr "erro ao enviar para `%s': %s\n"
 
-#: tools/gpgconf-comp.c:649
+#: tools/gpgconf-comp.c:655
 msgid "OpenPGP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:653
+#: tools/gpgconf-comp.c:659
 msgid "S/MIME"
 msgstr ""
 
-#: tools/gpgconf-comp.c:657
+#: tools/gpgconf-comp.c:663
 #, fuzzy
 msgid "Public Keys"
 msgstr "a chave pública é %08lX\n"
 
-#: tools/gpgconf-comp.c:661
+#: tools/gpgconf-comp.c:667
 msgid "Private Keys"
 msgstr ""
 
-#: tools/gpgconf-comp.c:665
+#: tools/gpgconf-comp.c:671
 msgid "Smartcards"
 msgstr ""
 
-#: tools/gpgconf-comp.c:669
+#: tools/gpgconf-comp.c:676
 msgid "TPM"
 msgstr ""
 
-#: tools/gpgconf-comp.c:673
+#: tools/gpgconf-comp.c:681
 #, fuzzy
 #| msgid "network error"
 msgid "Network"
 msgstr "erro na rede"
 
-#: tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:685
 #, fuzzy
 msgid "Passphrase Entry"
 msgstr "frase secreta incorrecta"
 
-#: tools/gpgconf-comp.c:941
+#: tools/gpgconf-comp.c:951
 #, fuzzy
 msgid "Component not suitable for launching"
 msgstr "chave pública não encontrada"
 
-#: tools/gpgconf-comp.c:947
+#: tools/gpgconf-comp.c:957
 #, c-format
 msgid "Configuration file of component %s is broken\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:950
+#: tools/gpgconf-comp.c:960
 #, fuzzy, c-format
 #| msgid "Please use the command \"toggle\" first.\n"
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr "Por favor utilize o comando \"toggle\" primeiro.\n"
 
-#: tools/gpgconf-comp.c:2816
+#: tools/gpgconf-comp.c:2826
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2946
+#: tools/gpgconf-comp.c:2956
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3543
+#: tools/gpgconf-comp.c:3553
 #, fuzzy, c-format
 msgid "error closing '%s'\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: tools/gpgconf-comp.c:3545
+#: tools/gpgconf-comp.c:3555
 #, fuzzy, c-format
 msgid "error parsing '%s'\n"
 msgstr "erro na leitura de `%s': %s\n"
@@ -11588,16 +11401,16 @@ msgid ""
 "Manage configuration options for tools of the @GNUPG@ system\n"
 msgstr ""
 
-#: tools/gpgconf.c:669 tools/gpgconf.c:704
+#: tools/gpgconf.c:703 tools/gpgconf.c:738
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:678 tools/gpgconf.c:728 tools/gpgconf.c:778
+#: tools/gpgconf.c:712 tools/gpgconf.c:762 tools/gpgconf.c:812
 #, fuzzy
 msgid "Component not found"
 msgstr "chave pública não encontrada"
 
-#: tools/gpgconf.c:804
+#: tools/gpgconf.c:838
 #, fuzzy
 msgid "No argument allowed"
 msgstr "a escrever chave privada para `%s'\n"
@@ -11613,88 +11426,183 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
-#: tools/gpg-card.c:2390
+#: tools/gpg-card.c:2407
 #, fuzzy, c-format
 msgid "Note: key %s is already stored on the card!\n"
 msgstr "ignorado: a chave secreta já está presente\n"
 
-#: tools/gpg-card.c:2393
+#: tools/gpg-card.c:2410
 #, fuzzy, c-format
 msgid "Note: Keys are already stored on the card!\n"
 msgstr "ignorado: a chave secreta já está presente\n"
 
-#: tools/gpg-card.c:2396
+#: tools/gpg-card.c:2413
 #, c-format
 msgid "Replace existing key %s ? (y/N) "
 msgstr ""
 
-#: tools/gpg-card.c:2549 tools/gpg-card.c:2712 tools/gpg-card.c:2935
-#: tools/gpg-card.c:3044
+#: tools/gpg-card.c:2566 tools/gpg-card.c:2729 tools/gpg-card.c:2952
+#: tools/gpg-card.c:3061
 #, c-format
 msgid "%s card no. %s detected\n"
 msgstr ""
 
-#: tools/gpg-card.c:3396
+#: tools/gpg-card.c:3413
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3406 tools/gpg-card.c:3420
+#: tools/gpg-card.c:3423 tools/gpg-card.c:3437
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
 "         can only be reverted using a factory reset!\n"
 msgstr ""
 
-#: tools/gpg-card.c:3423
+#: tools/gpg-card.c:3440
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3669
+#: tools/gpg-card.c:3686
 #, fuzzy
 msgid "authenticate to the card"
 msgstr "chave %08lX: certificado de revogação \"%s\" adicionado\n"
 
-#: tools/gpg-card.c:3671
+#: tools/gpg-card.c:3688
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3673
+#: tools/gpg-card.c:3690
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication"
 msgstr "|NOME|usar NOME como destinatário por omissão"
 
-#: tools/gpg-card.c:3675
+#: tools/gpg-card.c:3692
 #, fuzzy
 #| msgid "change the expire date"
 msgid "change a private data object"
 msgstr "muda a data de validade"
 
-#: tools/gpg-card.c:3676
+#: tools/gpg-card.c:3693
 #, fuzzy
 msgid "read a certificate from a data object"
 msgstr "chave %08lX: certificado de revogação \"%s\" adicionado\n"
 
-#: tools/gpg-card.c:3677
+#: tools/gpg-card.c:3694
 #, fuzzy
 msgid "store a certificate to a data object"
 msgstr "chave %08lX: certificado de revogação \"%s\" adicionado\n"
 
-#: tools/gpg-card.c:3678
+#: tools/gpg-card.c:3695
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3679
+#: tools/gpg-card.c:3696
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3681
+#: tools/gpg-card.c:3698
 msgid "manage the command history"
 msgstr ""
 
 #, fuzzy
+#~ msgid "requesting key %s from %s server %s\n"
+#~ msgstr "a pedir a chave %08lX de %s\n"
+
+#, fuzzy
+#~ msgid "could not parse keyserver\n"
+#~ msgstr "não consegui processar a URI do servidor de chaves\n"
+
+#, fuzzy
+#~| msgid "|NAME|set terminal charset to NAME"
+#~ msgid "|NAME|connect to host NAME"
+#~ msgstr ""
+#~ "|NOME|definir mapa de caracteres do terminal como\n"
+#~ "NOME"
+
+#, fuzzy
+#~| msgid "|NAME|use NAME as default recipient"
+#~ msgid "|NAME|use user NAME for authentication"
+#~ msgstr "|NOME|usar NOME como destinatário por omissão"
+
+#, fuzzy
+#~| msgid "Usage: gpg [options] [files] (-h for help)"
+#~ msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
+#~ msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
+
+#, fuzzy
+#~| msgid "invalid import options\n"
+#~ msgid "invalid port number %d\n"
+#~ msgstr "opções de importação inválidas\n"
+
+#, fuzzy
+#~ msgid "error writing to stdout: %s\n"
+#~ msgstr "erro na escrita do porta-chaves `%s': %s\n"
+
+#, fuzzy
+#~ msgid "attribute '%s' not found\n"
+#~ msgstr "chave `%s' não encontrada: %s\n"
+
+#, fuzzy
+#~| msgid "reading from `%s'\n"
+#~ msgid "processing url '%s'\n"
+#~ msgstr "lendo de `%s'\n"
+
+#, fuzzy
+#~| msgid "          w/o user IDs: %lu\n"
+#~ msgid "          user '%s'\n"
+#~ msgstr "          sem IDs de utilizadores: %lu\n"
+
+#, fuzzy
+#~ msgid "          pass '%s'\n"
+#~ msgstr "                   ou \""
+
+#, fuzzy
+#~ msgid "          host '%s'\n"
+#~ msgstr "                   ou \""
+
+#, fuzzy
+#~| msgid "          not imported: %lu\n"
+#~ msgid "          port %d\n"
+#~ msgstr "        não importadas: %lu\n"
+
+#, fuzzy
+#~ msgid "            DN '%s'\n"
+#~ msgstr "                   ou \""
+
+#, fuzzy
+#~ msgid "          attr '%s'\n"
+#~ msgstr "                   ou \""
+
+#, fuzzy
+#~| msgid "WARNING: using insecure memory!\n"
+#~ msgid "WARNING: using first attribute only\n"
+#~ msgstr "AVISO: a utilizar memória insegura!\n"
+
+#, fuzzy
+#~ msgid "LDAP init to '%s:%d' failed: %s\n"
+#~ msgstr "criação de armadura falhou: %s\n"
+
+#, fuzzy
+#~ msgid "LDAP init to '%s' failed: %s\n"
+#~ msgstr "criação de armadura falhou: %s\n"
+
+#, fuzzy
+#~ msgid "LDAP init to '%s' done\n"
+#~ msgstr "criação de armadura falhou: %s\n"
+
+#, fuzzy
+#~ msgid "binding to '%s:%d' failed: %s\n"
+#~ msgstr "criação de armadura falhou: %s\n"
+
+#, fuzzy
+#~| msgid "dearmoring failed: %s\n"
+#~ msgid "searching '%s' failed: %s\n"
+#~ msgstr "retirada de armadura falhou: %s\n"
+
+#, fuzzy
 #~ msgid "Suggest a random passphrase."
 #~ msgstr "muda a frase secreta"
 
diff --git a/po/ro.gmo b/po/ro.gmo
index cc493cd..7a66412 100644
--- a/po/ro.gmo
+++ b/po/ro.gmo
diff --git a/po/ro.po b/po/ro.po
index 8441879..9b0684c 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: 2021-04-20 12:38+0200\n"
+"POT-Creation-Date: 2021-08-24 18:50+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:328
+#: agent/call-pinentry.c:338
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "am eşuat să stochez amprenta: %s\n"
@@ -30,49 +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:546
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_OK"
 msgstr ""
 
-#: agent/call-pinentry.c:547
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
-#: agent/call-pinentry.c:548
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|_Yes"
 msgstr ""
 
-#: agent/call-pinentry.c:549
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_No"
 msgstr ""
 
-#: agent/call-pinentry.c:550
+#: agent/call-pinentry.c:560
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:551
+#: agent/call-pinentry.c:561
 msgid "|pinentry-label|_Save in password manager"
 msgstr ""
 
-#: agent/call-pinentry.c:552
+#: agent/call-pinentry.c:562
 #, 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:554
+#: agent/call-pinentry.c:564
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:555
+#: agent/call-pinentry.c:565
 #, fuzzy
 #| msgid "invalid passphrase"
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "frază-parolă invalidă"
 
+#: agent/call-pinentry.c:566
+msgid "Caps Lock is on"
+msgstr ""
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:944
+#: agent/call-pinentry.c:1022
 msgid "Suggest"
 msgstr ""
 
@@ -83,13 +87,25 @@ 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:966
+#: agent/call-pinentry.c:1044
 msgid "pinentry.genpin.tooltip"
 msgstr ""
 
+#: agent/call-pinentry.c:1072
+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
+#, 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:998
+#: agent/call-pinentry.c:1198
 #, fuzzy
 msgid "Quality:"
 msgstr "validitate: %s"
@@ -100,17 +116,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:1019
+#: agent/call-pinentry.c:1219
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:1263
+#: agent/call-pinentry.c:1477
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:1266
+#: agent/call-pinentry.c:1480
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
@@ -118,83 +134,83 @@ msgid ""
 msgstr ""
 "Vă rugăm introduceţi fraza-parolă; aceasta este o propoziţie secretă \n"
 
-#: agent/call-pinentry.c:1303 agent/call-pinentry.c:1506
+#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1303 agent/call-pinentry.c:1506
-#: agent/protect-tool.c:728
+#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/protect-tool.c:729
 #, fuzzy
 msgid "Passphrase:"
 msgstr "frază-parolă incorectă"
 
-#: agent/call-pinentry.c:1330 agent/call-pinentry.c:1580 agent/command.c:1799
-#: agent/command.c:1852 agent/command-ssh.c:3046 agent/genkey.c:398
+#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
+#: agent/command.c:1988 agent/command-ssh.c:3046 agent/genkey.c:442
 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:1351 agent/call-pinentry.c:1603
+#: agent/call-pinentry.c:1566 agent/call-pinentry.c:1830
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:1362 agent/call-pinentry.c:1614
+#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
 msgid "Repeat:"
 msgstr ""
 
-#: agent/call-pinentry.c:1372 agent/call-pinentry.c:1384
-#: agent/call-pinentry.c:1624 agent/call-pinentry.c:1636
+#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
+#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
 #, fuzzy
 msgid "PIN too long"
 msgstr "linie prea lungă"
 
-#: agent/call-pinentry.c:1373 agent/call-pinentry.c:1625
+#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "frază-parolă prea lungă\n"
 
-#: agent/call-pinentry.c:1381 agent/call-pinentry.c:1633
+#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caracter invalid în nume\n"
 
-#: agent/call-pinentry.c:1386 agent/call-pinentry.c:1638
+#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:1405 agent/call-pinentry.c:1656
+#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI incorect"
 
-#: agent/call-pinentry.c:1405 agent/call-pinentry.c:1656
+#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "frază-parolă incorectă"
 
-#: agent/command.c:697
+#: agent/command.c:823
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:698
+#: agent/command.c:824
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1106 g10/card-util.c:708 g10/card-util.c:729
+#: agent/command.c:1235 g10/card-util.c:713 g10/card-util.c:734
 #, 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:1634 agent/command.c:1791 agent/command-ssh.c:2974
-#: agent/genkey.c:333
+#: agent/command.c:1756 agent/command.c:1921 agent/command-ssh.c:2974
+#: agent/genkey.c:377
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "schimbă fraza-parolă"
 
-#: agent/command.c:2567
+#: agent/command.c:2703
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to protect the imported object within the %s "
@@ -202,7 +218,7 @@ msgid ""
 msgstr ""
 "Vă rugăm introduceţi fraza-parolă; aceasta este o propoziţie secretă \n"
 
-#: agent/command.c:2697
+#: agent/command.c:2833
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -213,26 +229,26 @@ msgstr ""
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "algoritm rezumat %d nu este suportat\n"
 
-#: agent/command-ssh.c:872 common/dotlock.c:852 g10/card-util.c:953
-#: g10/export.c:1329 g10/gpg.c:1431 g10/keygen.c:5347 g10/keyring.c:1319
-#: g10/keyring.c:1632 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
+#: agent/command-ssh.c:872 common/dotlock.c:852 g10/card-util.c:963
+#: g10/export.c:1329 g10/gpg.c:1431 g10/keygen.c:5377 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
 #: g10/sign.c:1106 g10/sign.c:1443 g10/tdbio.c:753 tools/gpg-card.c:479
 #, fuzzy, c-format
 #| msgid "can't create `%s': %s\n"
 msgid "can't create '%s': %s\n"
 msgstr "nu pot crea `%s': %s\n"
 
-#: agent/command-ssh.c:884 common/helpfile.c:57 g10/card-util.c:910
+#: agent/command-ssh.c:884 common/helpfile.c:57 g10/card-util.c:920
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
 #: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:721 g10/gpg.c:1432
-#: g10/import.c:371 g10/import.c:558 g10/import.c:793 g10/keygen.c:4322
-#: g10/keyring.c:1658 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
+#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4326
+#: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
 #: g10/plaintext.c:610 g10/sign.c:1086 g10/sign.c:1311 g10/sign.c:1424
 #: g10/sign.c:1596 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2380
-#: sm/gpgsm.c:2410 sm/gpgsm.c:2448 sm/keylist.c:1737 sm/qualified.c:65
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2236
+#: sm/gpgsm.c:2266 sm/gpgsm.c:2304 sm/keylist.c:1775 sm/qualified.c:65
 #: dirmngr/certcache.c:396 dirmngr/certcache.c:476 dirmngr/certcache.c:478
-#: dirmngr/crlcache.c:2588 dirmngr/dirmngr.c:1720 tools/gpg-card.c:408
+#: dirmngr/crlcache.c:2591 dirmngr/dirmngr.c:1759 tools/gpg-card.c:408
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
@@ -346,39 +362,39 @@ msgstr "PIN-ul nu a fost repetat corect; mai încercaţi o dată"
 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:109 sm/certreqgen-ui.c:433
+#: agent/genkey.c:142 sm/certreqgen-ui.c:433
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "eroare la crearea frazei-parolă: %s\n"
 
-#: agent/genkey.c:116
+#: agent/genkey.c:150
 #, fuzzy, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "%s: eroare scriere înregistrare dir: %s\n"
 
-#: agent/genkey.c:154
+#: agent/genkey.c:191
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Introduceţi fraza-parolă\n"
 
-#: agent/genkey.c:184
+#: agent/genkey.c:227
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:186
+#: agent/genkey.c:229
 #, 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:198
+#: agent/genkey.c:241
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:215
+#: agent/genkey.c:258
 #, fuzzy, c-format
 #| msgid "Name must be at least 5 characters long\n"
 msgid "A passphrase should be at least %u character long."
@@ -386,7 +402,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:234
+#: agent/genkey.c:277
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -394,388 +410,387 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:260
+#: agent/genkey.c:304
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:275
+#: agent/genkey.c:319
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
-#: agent/genkey.c:296
+#: agent/genkey.c:340
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "Folosiţi oricum această cheie? (d/N) "
 
-#: agent/genkey.c:464
+#: agent/genkey.c:508
 #, 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:590
+#: agent/genkey.c:637
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "schimbă fraza-parolă"
 
-#: agent/gpg-agent.c:162 scd/scdaemon.c:115 dirmngr/dirmngr.c:182
+#: agent/gpg-agent.c:164 scd/scdaemon.c:115 dirmngr/dirmngr.c:183
 msgid "Options used for startup"
 msgstr ""
 
-#: agent/gpg-agent.c:164 scd/scdaemon.c:120 dirmngr/dirmngr.c:171
+#: agent/gpg-agent.c:166 scd/scdaemon.c:120 dirmngr/dirmngr.c:172
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:117 dirmngr/dirmngr.c:170
+#: agent/gpg-agent.c:167 scd/scdaemon.c:117 dirmngr/dirmngr.c:171
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:167 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:169 dirmngr/dirmngr.c:174
 #, fuzzy
 #| msgid "Key is superseded"
 msgid "run in supervised mode"
 msgstr "Cheia este înlocuită"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:121 dirmngr/dirmngr.c:184
+#: agent/gpg-agent.c:171 scd/scdaemon.c:121 dirmngr/dirmngr.c:185
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:170 scd/scdaemon.c:122 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:172 scd/scdaemon.c:122 dirmngr/dirmngr.c:186
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:171 scd/scdaemon.c:123 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:173 scd/scdaemon.c:123 dirmngr/dirmngr.c:187
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:179 g10/gpg.c:589 scd/scdaemon.c:125 sm/gpgsm.c:422
-#: dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:181 g10/gpg.c:589 scd/scdaemon.c:125 sm/gpgsm.c:423
+#: dirmngr/dirmngr.c:189
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FIŞIER|încarcă modulul extensie FIŞIER"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:574 scd/scdaemon.c:129 sm/gpgsm.c:265
-#: dirmngr/dirmngr.c:192
+#: agent/gpg-agent.c:185 g10/gpg.c:574 scd/scdaemon.c:129 sm/gpgsm.c:265
+#: dirmngr/dirmngr.c:193
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: agent/gpg-agent.c:185 g10/gpg.c:576 g10/gpgv.c:78 kbx/kbxutil.c:89
+#: agent/gpg-agent.c:187 g10/gpg.c:576 g10/gpgv.c:78 kbx/kbxutil.c:89
 #: scd/scdaemon.c:131 sm/gpgsm.c:267 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:194 dirmngr/dirmngr_ldap.c:102
-#: tools/gpg-connect-agent.c:85 tools/gpgconf.c:111
+#: dirmngr/dirmngr.c:195 tools/gpg-connect-agent.c:85 tools/gpgconf.c:111
 msgid "verbose"
 msgstr "locvace"
 
-#: agent/gpg-agent.c:186 g10/gpg.c:578 g10/gpgv.c:79 kbx/kbxutil.c:90
+#: agent/gpg-agent.c:188 g10/gpg.c:578 g10/gpgv.c:79 kbx/kbxutil.c:90
 #: scd/scdaemon.c:132 sm/gpgsm.c:269 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:195 dirmngr/dirmngr_ldap.c:103
+#: dirmngr/dirmngr.c:196
 msgid "be somewhat more quiet"
 msgstr "fii oarecum mai tăcut"
 
-#: agent/gpg-agent.c:194 g10/gpg.c:593 sm/gpgsm.c:283 dirmngr/dirmngr.c:205
+#: agent/gpg-agent.c:196 g10/gpg.c:593 sm/gpgsm.c:283 dirmngr/dirmngr.c:206
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 scd/scdaemon.c:146 sm/gpgsm.c:290
-#: dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:599 scd/scdaemon.c:146 sm/gpgsm.c:290
+#: dirmngr/dirmngr.c:210
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: agent/gpg-agent.c:201
+#: agent/gpg-agent.c:203
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualizează baza de date de încredere"
 
-#: agent/gpg-agent.c:203
+#: agent/gpg-agent.c:205
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 #, 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:213
+#: agent/gpg-agent.c:215
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:215
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:216
+#: agent/gpg-agent.c:218
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
 msgstr "nu este suportat(ă)"
 
-#: agent/gpg-agent.c:218
+#: agent/gpg-agent.c:220
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:221
+#: agent/gpg-agent.c:223
 #, fuzzy
 #| msgid "not supported"
 msgid "enable putty support"
 msgstr "nu este suportat(ă)"
 
-#: agent/gpg-agent.c:233 g10/gpg.c:844 scd/scdaemon.c:176 sm/gpgsm.c:382
+#: agent/gpg-agent.c:235 g10/gpg.c:844 scd/scdaemon.c:176 sm/gpgsm.c:383
 msgid "Options controlling the security"
 msgstr ""
 
-#: agent/gpg-agent.c:236
+#: agent/gpg-agent.c:238
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:238
+#: agent/gpg-agent.c:240
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:242
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:244
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:246
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:248
 #, fuzzy
 msgid "disallow the use of an external password cache"
 msgstr "eroare la crearea frazei-parolă: %s\n"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:250
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:253
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "eroare la crearea frazei-parolă: %s\n"
 
-#: agent/gpg-agent.c:256
+#: agent/gpg-agent.c:258
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:261
 msgid "do not allow bypassing the passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:261
+#: agent/gpg-agent.c:263
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:265
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:266
+#: agent/gpg-agent.c:268
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:268
+#: agent/gpg-agent.c:272
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|foloseşte modul frază-parolă N"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:274
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "eroare la crearea frazei-parolă: %s\n"
 
-#: agent/gpg-agent.c:273
+#: agent/gpg-agent.c:277
 msgid "Options controlling the PIN-Entry"
 msgstr ""
 
-#: agent/gpg-agent.c:275
+#: agent/gpg-agent.c:279
 #, fuzzy
 #| msgid "use the gpg-agent"
 msgid "never use the PIN-entry"
 msgstr "foloseÅŸte gpg-agent"
 
-#: agent/gpg-agent.c:277
+#: agent/gpg-agent.c:281
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:283
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:282
+#: agent/gpg-agent.c:286
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:286
+#: agent/gpg-agent.c:290
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:294
 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:551 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: agent/gpg-agent.c:557 agent/preset-passphrase.c:99 agent/protect-tool.c:154
 #: g10/gpg.c:1132 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:612 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:438
-#: dirmngr/dirmngr_ldap.c:175 tools/gpg-connect-agent.c:220 tools/gpgconf.c:151
+#: sm/gpgsm.c:613 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:446
+#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:151
 #: 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:560
+#: agent/gpg-agent.c:566
 #, fuzzy
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
 
-#: agent/gpg-agent.c:562
+#: agent/gpg-agent.c:568
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:607 g10/gpg.c:1337 scd/scdaemon.c:384 sm/gpgsm.c:760
-#: dirmngr/dirmngr.c:522
+#: agent/gpg-agent.c:613 g10/gpg.c:1337 scd/scdaemon.c:384 sm/gpgsm.c:761
+#: dirmngr/dirmngr.c:530
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:972 g10/gpg.c:3910 g10/gpg.c:3934 sm/gpgsm.c:1769
-#: sm/gpgsm.c:1775
+#: agent/gpg-agent.c:986 g10/gpg.c:3907 g10/gpg.c:3931 sm/gpgsm.c:1622
+#: sm/gpgsm.c:1628
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritm rezumat selectat este invalid\n"
 
-#: agent/gpg-agent.c:1196 agent/gpg-agent.c:2019 common/comopt.c:93
-#: g10/gpg.c:2591 scd/scdaemon.c:549 sm/gpgsm.c:1155 dirmngr/dirmngr.c:989
-#: dirmngr/dirmngr.c:1840
+#: agent/gpg-agent.c:1210 agent/gpg-agent.c:2035 common/comopt.c:93
+#: g10/gpg.c:2594 scd/scdaemon.c:549 sm/gpgsm.c:1028 dirmngr/dirmngr.c:1029
+#: dirmngr/dirmngr.c:1879
 #, 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:1335 g10/gpg.c:3861 scd/scdaemon.c:687 sm/gpgsm.c:1709
-#: dirmngr/dirmngr.c:1108 tools/gpg-connect-agent.c:1270 tools/gpgconf.c:634
+#: agent/gpg-agent.c:1349 g10/gpg.c:3858 scd/scdaemon.c:687 sm/gpgsm.c:1562
+#: dirmngr/dirmngr.c:1145 tools/gpg-connect-agent.c:1270 tools/gpgconf.c:668
 #, 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:2172 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1267
+#: agent/gpg-agent.c:2188 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1306
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "nu pot crea `%s': %s\n"
 
-#: agent/gpg-agent.c:2189 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1280
+#: agent/gpg-agent.c:2205 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1319
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2228
+#: agent/gpg-agent.c:2244
 #, 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:2239 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1312
+#: agent/gpg-agent.c:2255 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1351
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "eroare la obţinere noului PIN: %s\n"
 
-#: agent/gpg-agent.c:2244 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1315
+#: agent/gpg-agent.c:2260 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1354
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "eroare trimitere la `%s': %s\n"
 
-#: agent/gpg-agent.c:2255 agent/gpg-agent.c:2295 agent/gpg-agent.c:2304
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1324
+#: agent/gpg-agent.c:2271 agent/gpg-agent.c:2311 agent/gpg-agent.c:2320
+#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1363
 #, 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:2269 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1336
+#: agent/gpg-agent.c:2285 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1375
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "scriu cheia secretă în `%s'\n"
 
-#: agent/gpg-agent.c:2289 agent/gpg-agent.c:2342 common/homedir.c:517
+#: agent/gpg-agent.c:2305 agent/gpg-agent.c:2358 common/homedir.c:537
 #: 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:2292 agent/gpg-agent.c:2347 common/homedir.c:520
+#: agent/gpg-agent.c:2308 agent/gpg-agent.c:2363 common/homedir.c:540
 #: 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:2353
+#: agent/gpg-agent.c:2369
 #, fuzzy, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "fstat(%d) a eşuat în %s: %s\n"
 
-#: agent/gpg-agent.c:2357
+#: agent/gpg-agent.c:2373
 #, fuzzy, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "%s: nu pot crea director: %s\n"
 
-#: agent/gpg-agent.c:2512 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2069
+#: agent/gpg-agent.c:2528 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2108
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: agent/gpg-agent.c:2719
+#: agent/gpg-agent.c:2735
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2724
+#: agent/gpg-agent.c:2740
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2799
+#: agent/gpg-agent.c:2815
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2804
+#: agent/gpg-agent.c:2820
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3026 scd/scdaemon.c:1374 dirmngr/dirmngr.c:2283
+#: agent/gpg-agent.c:3042 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2322
 #, fuzzy, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "actualizarea secretului a eÅŸuat: %s\n"
 
-#: agent/gpg-agent.c:3114 scd/scdaemon.c:1439
+#: agent/gpg-agent.c:3130 scd/scdaemon.c:1441
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: sărită: %s\n"
 
-#: agent/gpg-agent.c:3252 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3271 common/simple-pwquery.c:247 g10/call-agent.c:260
 #: sm/call-agent.c:131 tools/gpg-connect-agent.c:2319 tools/card-call-scd.c:311
 #, fuzzy, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent nu este disponibil în această sesiune\n"
 
-#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:70
+#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:66
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -797,7 +812,7 @@ msgid ""
 msgstr ""
 
 #: agent/protect-tool.c:107 g10/gpg.c:448 kbx/kbxutil.c:72 sm/gpgsm.c:215
-#: dirmngr/dirmngr.c:168 tools/gpgconf.c:81
+#: dirmngr/dirmngr.c:169 tools/gpgconf.c:81
 msgid ""
 "@Commands:\n"
 " "
@@ -827,25 +842,25 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:707
+#: agent/protect-tool.c:708 sm/import.c:775
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr ""
 "Vă rugăm introduceţi fraza-parolă; aceasta este o propoziţie secretă \n"
 
-#: agent/protect-tool.c:712
+#: agent/protect-tool.c:713 sm/export.c:727
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr ""
 "Vă rugăm introduceţi fraza-parolă; aceasta este o propoziţie secretă \n"
 
-#: agent/protect-tool.c:718
+#: agent/protect-tool.c:719
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:723
+#: agent/protect-tool.c:724
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
@@ -853,17 +868,17 @@ msgid ""
 msgstr ""
 "Vă rugăm introduceţi fraza-parolă; aceasta este o propoziţie secretă \n"
 
-#: agent/protect-tool.c:734
+#: agent/protect-tool.c:735
 #, fuzzy, c-format
 msgid "cancelled\n"
 msgstr "anulată"
 
-#: agent/protect-tool.c:736
+#: agent/protect-tool.c:737
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "eroare la crearea frazei-parolă: %s\n"
 
-#: agent/trustlist.c:153 agent/trustlist.c:363 tools/gpgconf.c:424
+#: agent/trustlist.c:153 agent/trustlist.c:363 tools/gpgconf.c:458
 #, fuzzy, c-format
 msgid "error opening '%s': %s\n"
 msgstr "eroare în `%s': %s\n"
@@ -1020,7 +1035,7 @@ msgstr "verificarea semnăturii create a eşuat: %s\n"
 msgid "secret key parts are not available\n"
 msgstr "părţi ale cheii secrete nu sunt disponibile\n"
 
-#: agent/cvt-openpgp.c:343 g10/card-util.c:1562
+#: agent/cvt-openpgp.c:343 g10/card-util.c:1575
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -1052,7 +1067,7 @@ msgid "error creating a stream for a pipe: %s\n"
 msgstr "eroare la crearea frazei-parolă: %s\n"
 
 #: common/exechelp-posix.c:505 common/exechelp-posix.c:580
-#: common/exechelp-posix.c:866 dirmngr/dirmngr.c:1354
+#: common/exechelp-posix.c:866 dirmngr/dirmngr.c:1393
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "eroare la citire `%s': %s\n"
@@ -1126,7 +1141,7 @@ msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "redenumirea `%s' ca `%s' a eÅŸuat: %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3082
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3099
 msgid "yes"
 msgstr "da"
 
@@ -1180,7 +1195,7 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:115 g10/card-util.c:917 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:927 tools/no-libgcrypt.c:30
 #: tools/gpg-card.c:416
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
@@ -1256,7 +1271,7 @@ msgstr "eroare la crearea inelului de chei `%s': %s\n"
 msgid "server '%s' is older than us (%s < %s)"
 msgstr ""
 
-#: common/asshelp.c:737 g10/call-dirmngr.c:408
+#: common/asshelp.c:737 g10/call-dirmngr.c:407
 #, fuzzy, c-format
 #| msgid "WARNING: "
 msgid "WARNING: %s\n"
@@ -1351,7 +1366,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:4212
+#: scd/app-openpgp.c:4214
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
@@ -1436,12 +1451,12 @@ msgstr "Această cheie a expirat!"
 msgid "Root certificate trustworthy"
 msgstr "certificat incorect"
 
-#: common/audit.c:1112 sm/certchain.c:1242
+#: common/audit.c:1112 sm/certchain.c:1243
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "certificat incorect"
 
-#: common/audit.c:1115 sm/certchain.c:1252
+#: common/audit.c:1115 sm/certchain.c:1253
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Cheie disponibilă la: "
@@ -1493,22 +1508,22 @@ msgstr "[nesetat(ă)]"
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "caracter radix64 invalid %02X sărit\n"
 
-#: common/ttyio.c:433
+#: common/ttyio.c:447
 #, c-format
 msgid "Sorry, we are in batchmode - can't get input\n"
 msgstr ""
 
-#: common/ttyio.c:439
+#: common/ttyio.c:453
 #, c-format
 msgid "Sorry, no terminal at all requested - can't get input\n"
 msgstr ""
 
-#: common/ttyio.c:474 common/ttyio.c:484
+#: common/ttyio.c:488 common/ttyio.c:498
 #, c-format
 msgid "too many errors; giving up\n"
 msgstr ""
 
-#: common/ttyio.c:536
+#: common/ttyio.c:550
 #, c-format
 msgid "Control-D detected\n"
 msgstr ""
@@ -1562,8 +1577,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:1036 dirmngr/dirmngr.c:895
-#: dirmngr/dirmngr.c:904
+#: common/init.c:191 sm/gpgsm.c:909 dirmngr/dirmngr.c:935 dirmngr/dirmngr.c:944
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
@@ -1723,7 +1737,7 @@ msgid "Enter passphrase: "
 msgstr "Introduceţi fraza-parolă: "
 
 #: g10/call-agent.c:318 g10/encrypt.c:282 g10/encrypt.c:818 g10/sign.c:473
-#: sm/call-agent.c:180 sm/encrypt.c:701 sm/sign.c:436
+#: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
 #, fuzzy, c-format
 #| msgid "%s does not yet work with %s\n"
 msgid "%s is not compliant with %s mode\n"
@@ -1734,221 +1748,221 @@ msgstr "%s nu merge încă cu %s!\n"
 msgid "error from TPM: %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: g10/call-agent.c:2123 g10/passphrase.c:225 g10/passphrase.c:258
-#: tools/card-call-scd.c:1751
+#: g10/call-agent.c:2135 g10/passphrase.c:233 g10/passphrase.c:266
+#: tools/card-call-scd.c:1755
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problemă cu agentul: agentul returnează 0x%lx\n"
 
-#: g10/call-dirmngr.c:179 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2316
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2316
 #, fuzzy, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "gpg-agent nu este disponibil în această sesiune\n"
 
-#: g10/call-dirmngr.c:213
+#: g10/call-dirmngr.c:212
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "keyserver option \"honor-keyserver-url\" may not be used in Tor mode\n"
 msgstr "nu puteţi folosi %s câtă vreme în modul %s\n"
 
-#: g10/call-dirmngr.c:386
+#: g10/call-dirmngr.c:385
 msgid "WKD uses a cached result"
 msgstr ""
 
-#: g10/call-dirmngr.c:389
+#: g10/call-dirmngr.c:388
 msgid "Tor is not running"
 msgstr ""
 
-#: g10/call-dirmngr.c:391
+#: g10/call-dirmngr.c:390
 #, fuzzy
 #| msgid "invalid fingerprint"
 msgid "Tor is not properly configured"
 msgstr "amprentă invalidă"
 
-#: g10/call-dirmngr.c:393
+#: g10/call-dirmngr.c:392
 #, fuzzy
 #| msgid "invalid fingerprint"
 msgid "DNS is not properly configured"
 msgstr "amprentă invalidă"
 
-#: g10/call-dirmngr.c:395
+#: g10/call-dirmngr.c:394
 msgid "unacceptable HTTP redirect from server"
 msgstr ""
 
-#: g10/call-dirmngr.c:397
+#: g10/call-dirmngr.c:396
 msgid "unacceptable HTTP redirect from server was cleaned up"
 msgstr ""
 
-#: g10/call-dirmngr.c:399
+#: g10/call-dirmngr.c:398
 #, fuzzy
 #| msgid "generate a revocation certificate"
 msgid "server uses an invalid certificate"
 msgstr "generează un certificat de revocare"
 
-#: g10/call-dirmngr.c:406 g10/gpg.c:4599
+#: g10/call-dirmngr.c:405 g10/gpg.c:4596
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "armură: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:369 g10/card-util.c:1924
-#: tools/gpg-card.c:3039
+#: g10/card-util.c:86 g10/card-util.c:374 g10/card-util.c:1937
+#: tools/gpg-card.c:3056
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "cardul OpenPGP nu e disponibil: %s\n"
 
-#: g10/card-util.c:91 g10/card-util.c:1930
+#: g10/card-util.c:91 g10/card-util.c:1943
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "cardul OpenPGP nr. %s detectat\n"
 
-#: g10/card-util.c:97 g10/card-util.c:2309 g10/delkey.c:164 g10/keyedit.c:1428
-#: g10/keygen.c:4791 g10/revoke.c:214 g10/revoke.c:638
+#: g10/card-util.c:97 g10/card-util.c:2322 g10/delkey.c:164 g10/keyedit.c:1428
+#: g10/keygen.c:4795 g10/revoke.c:214 g10/revoke.c:639
 #, c-format
 msgid "can't do this in batch mode\n"
 msgstr "nu pot face acest lucru în modul batch\n"
 
-#: g10/card-util.c:105 tools/gpg-card.c:2943
+#: g10/card-util.c:105 tools/gpg-card.c:2960
 #, fuzzy, c-format
 msgid "This command is only available for version 2 cards\n"
 msgstr "Această comandă nu este permisă în modul %s.\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3398 tools/gpg-card.c:2948
+#: g10/card-util.c:107 scd/app-openpgp.c:3399 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"
 
-#: g10/card-util.c:140 g10/card-util.c:1448 g10/card-util.c:1710
-#: g10/card-util.c:1802 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1991 g10/keygen.c:2165 g10/keygen.c:2385 g10/keygen.c:2685
+#: g10/card-util.c:140 g10/card-util.c:1458 g10/card-util.c:1723
+#: g10/card-util.c:1815 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/keygen.c:1992 g10/keygen.c:2166 g10/keygen.c:2386 g10/keygen.c:2686
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
 #: tools/gpg-card.c:510
 msgid "Your selection? "
 msgstr "Selecţia d-voastră? "
 
-#: g10/card-util.c:262 g10/card-util.c:313 tools/gpg-card.c:596
+#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:596
 #: tools/gpg-card.c:636
 msgid "[not set]"
 msgstr "[nesetat(ă)]"
 
-#: g10/card-util.c:558 tools/gpg-card.c:903
+#: g10/card-util.c:563 tools/gpg-card.c:905
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:559 tools/gpg-card.c:904
+#: g10/card-util.c:564 tools/gpg-card.c:906
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:586 tools/gpg-card.c:931
+#: g10/card-util.c:591 tools/gpg-card.c:933
 msgid "not forced"
 msgstr "neforţat(ă)"
 
-#: g10/card-util.c:586 tools/gpg-card.c:931
+#: g10/card-util.c:591 tools/gpg-card.c:933
 msgid "forced"
 msgstr "forţat(ă)"
 
-#: g10/card-util.c:768 tools/gpg-card.c:1468
+#: g10/card-util.c:773 tools/gpg-card.c:1484
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Eroare: Deocamdată sunt permise numai caractere ASCII.\n"
 
-#: g10/card-util.c:770 tools/gpg-card.c:1470
+#: g10/card-util.c:775 tools/gpg-card.c:1486
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Eroare: Caracterul \"<\" nu poate fi folosit.\n"
 
-#: g10/card-util.c:772 tools/gpg-card.c:1472
+#: g10/card-util.c:777 tools/gpg-card.c:1488
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Eroare: Spaţiile duble nu sunt permise.\n"
 
-#: g10/card-util.c:789 tools/gpg-card.c:1505
+#: g10/card-util.c:795 tools/gpg-card.c:1521
 msgid "Cardholder's surname: "
 msgstr "Numele de familie al proprietarului cardului: "
 
-#: g10/card-util.c:791 tools/gpg-card.c:1506
+#: g10/card-util.c:797 tools/gpg-card.c:1522
 msgid "Cardholder's given name: "
 msgstr "Prenumele proprietarului cardului: "
 
-#: g10/card-util.c:809 tools/gpg-card.c:1523
+#: g10/card-util.c:816 tools/gpg-card.c:1539
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Eroare: Nume combinat prea lung (limita este de %d caractere).\n"
 
-#: g10/card-util.c:830 tools/gpg-card.c:1561
+#: g10/card-util.c:840 tools/gpg-card.c:1577
 msgid "URL to retrieve public key: "
 msgstr "URL pentru a aduce cheia publică: "
 
-#: g10/card-util.c:926 g10/decrypt-data.c:495 g10/import.c:406 g10/import.c:756
-#: g10/import.c:815 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1666
-#: tools/gpgconf.c:437 tools/gpgconf.c:483 tools/gpg-card.c:426
+#: g10/card-util.c:936 g10/decrypt-data.c:495 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:1705
+#: tools/gpgconf.c:471 tools/gpgconf.c:517 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:959 g10/decrypt-data.c:498 g10/export.c:2496
+#: g10/card-util.c:969 g10/decrypt-data.c:498 g10/export.c:2496
 #: dirmngr/crlcache.c:925 tools/gpg-card.c:486 tools/gpg-card.c:493
 #, fuzzy, c-format
 msgid "error writing '%s': %s\n"
 msgstr "eroare la scrierea inelului de chei `%s': %s\n"
 
-#: g10/card-util.c:986 tools/gpg-card.c:1650
+#: g10/card-util.c:996 tools/gpg-card.c:1666
 msgid "Login data (account name): "
 msgstr "Date login (nume cont): "
 
-#: g10/card-util.c:1024 tools/gpg-card.c:1945
+#: g10/card-util.c:1034 tools/gpg-card.c:1962
 msgid "Private DO data: "
 msgstr "Date DO personale: "
 
-#: g10/card-util.c:1109 tools/gpg-card.c:1699
+#: g10/card-util.c:1119 tools/gpg-card.c:1715
 msgid "Language preferences: "
 msgstr "Preferinţe limbă: "
 
-#: g10/card-util.c:1117 tools/gpg-card.c:1710
+#: g10/card-util.c:1127 tools/gpg-card.c:1726
 #, c-format
 msgid "Error: invalid length of preference string.\n"
 msgstr "Eroare: lungime invalidă pentru şir preferinţe.\n"
 
-#: g10/card-util.c:1126 tools/gpg-card.c:1719
+#: g10/card-util.c:1136 tools/gpg-card.c:1735
 #, c-format
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Eroare: caractere invalide în şir preferinţe.\n"
 
-#: g10/card-util.c:1148 tools/gpg-card.c:1753
+#: g10/card-util.c:1158 tools/gpg-card.c:1769
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1162 tools/gpg-card.c:1770
+#: g10/card-util.c:1172 tools/gpg-card.c:1786
 msgid "Error: invalid response.\n"
 msgstr "Eroare: răspuns invalid.\n"
 
-#: g10/card-util.c:1185 tools/gpg-card.c:1835
+#: g10/card-util.c:1195 tools/gpg-card.c:1852
 msgid "CA fingerprint: "
 msgstr "Amprenta CA: "
 
-#: g10/card-util.c:1209 tools/gpg-card.c:1861
+#: g10/card-util.c:1219 tools/gpg-card.c:1878
 #, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Eroare: amprentă formatată invalid.\n"
 
-#: g10/card-util.c:1259
+#: g10/card-util.c:1269
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "operaţia pe cheie nu e posibilă: %s\n"
 
-#: g10/card-util.c:1260
+#: g10/card-util.c:1270
 msgid "not an OpenPGP card"
 msgstr "nu este un card OpenPGP"
 
-#: g10/card-util.c:1273 g10/keygen.c:4811 g10/keygen.c:5972
+#: g10/card-util.c:1283 g10/keygen.c:4815 g10/keygen.c:6003
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "eroare la obţinerea informaţiei pentru cheia curentă: %s\n"
 
-#: g10/card-util.c:1358
+#: g10/card-util.c:1368
 msgid "Replace existing key? (y/N) "
 msgstr "Înlocuiesc cheia existentă? (d/N) "
 
-#: g10/card-util.c:1375 tools/gpg-card.c:3328
+#: g10/card-util.c:1385 tools/gpg-card.c:3345
 msgid ""
 "Note: There is no guarantee that the card supports the requested\n"
 "      key type or size.  If the key generation does not succeed,\n"
@@ -1956,107 +1970,107 @@ msgid ""
 "      key types and sizes are supported.\n"
 msgstr ""
 
-#: g10/card-util.c:1396 g10/keygen.c:2570 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1406 g10/keygen.c:2571 sm/certreqgen-ui.c:180
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Ce lungime de cheie doriţi? (%u) "
 
-#: g10/card-util.c:1406 g10/keygen.c:2493 g10/keygen.c:2525
+#: g10/card-util.c:1416 g10/keygen.c:2494 g10/keygen.c:2526
 #: sm/certreqgen-ui.c:195
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rotunjită prin adaos la %u biţi\n"
 
-#: g10/card-util.c:1414 g10/keygen.c:2578 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1424 g10/keygen.c:2579 sm/certreqgen-ui.c:185
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "dimensiunile cheii %s trebuie să fie în intervalul %u-%u\n"
 
-#: g10/card-util.c:1433
+#: g10/card-util.c:1443
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1435
+#: g10/card-util.c:1445
 #, fuzzy
 #| msgid "   (1) Signature key\n"
 msgid "Signature key\n"
 msgstr "   (1) Cheie de semnare\n"
 
-#: g10/card-util.c:1437
+#: g10/card-util.c:1447
 #, fuzzy
 #| msgid "   (2) Encryption key\n"
 msgid "Encryption key\n"
 msgstr "   (2) Cheie de cifrare\n"
 
-#: g10/card-util.c:1439
+#: g10/card-util.c:1449
 #, fuzzy
 #| msgid "   (3) Authentication key\n"
 msgid "Authentication key\n"
 msgstr "   (3) Cheie de autentificare\n"
 
-#: g10/card-util.c:1441 g10/keygen.c:2112 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1451 g10/keygen.c:2113 sm/certreqgen-ui.c:158
 msgid "Please select what kind of key you want:\n"
 msgstr "Selectaţi ce fel de cheie doriţi:\n"
 
-#: g10/card-util.c:1442 sm/certreqgen-ui.c:159
+#: g10/card-util.c:1452 sm/certreqgen-ui.c:159
 #, fuzzy, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA (numai semnare)\n"
 
-#: g10/card-util.c:1443
+#: g10/card-util.c:1453
 #, fuzzy, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) DSA ÅŸi Elgamal (implicit)\n"
 
-#: g10/card-util.c:1455 g10/card-util.c:1722 g10/card-util.c:1822
-#: g10/keyedit.c:900 g10/keygen.c:2017 g10/keygen.c:2045 g10/keygen.c:2172
-#: g10/keygen.c:2425 g10/keygen.c:2713 g10/revoke.c:836
+#: g10/card-util.c:1468 g10/card-util.c:1735 g10/card-util.c:1835
+#: g10/keyedit.c:900 g10/keygen.c:2018 g10/keygen.c:2046 g10/keygen.c:2173
+#: g10/keygen.c:2426 g10/keygen.c:2714 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Selecţie invalidă.\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1541
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 
-#: g10/card-util.c:1533
+#: g10/card-util.c:1546
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1582
 #, fuzzy, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "eroare trimitere la `%s': %s\n"
 
-#: g10/card-util.c:1585 g10/card-util.c:2106 g10/card-util.c:2162
+#: g10/card-util.c:1598 g10/card-util.c:2119 g10/card-util.c:2175
 #, fuzzy, c-format
 #| msgid "error getting current key info: %s\n"
 msgid "error getting card info: %s\n"
 msgstr "eroare la obţinerea informaţiei pentru cheia curentă: %s\n"
 
-#: g10/card-util.c:1591 g10/card-util.c:1936 g10/card-util.c:2112
-#: g10/card-util.c:2171 tools/gpg-card.c:3057 tools/gpg-card.c:3296
-#: tools/gpg-card.c:3354
+#: g10/card-util.c:1604 g10/card-util.c:1949 g10/card-util.c:2125
+#: g10/card-util.c:2184 tools/gpg-card.c:3074 tools/gpg-card.c:3313
+#: tools/gpg-card.c:3371
 #, fuzzy, c-format
 #| msgid "This command is not allowed while in %s mode.\n"
 msgid "This command is not supported by this card\n"
 msgstr "Această comandă nu este permisă în modul %s.\n"
 
-#: g10/card-util.c:1637 tools/gpg-card.c:2426
+#: g10/card-util.c:1650 tools/gpg-card.c:2443
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Creez copie de rezervă a cheii de cifrare în afara cardului? (d/N) "
 
-#: g10/card-util.c:1651
+#: g10/card-util.c:1664
 #, fuzzy, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "cheia secretă deja stocată pe un card\n"
 
-#: g10/card-util.c:1654 tools/gpg-card.c:2398
+#: g10/card-util.c:1667 tools/gpg-card.c:2415
 msgid "Replace existing keys? (y/N) "
 msgstr "ÃŽnlocuiesc cheile existente? (d/N) "
 
-#: g10/card-util.c:1666 tools/gpg-card.c:2457
+#: g10/card-util.c:1679 tools/gpg-card.c:2474
 #, fuzzy, c-format
 #| msgid ""
 #| "Please note that the factory settings of the PINs are\n"
@@ -2071,162 +2085,162 @@ msgstr ""
 "   PIN = `%s'     PIN Admin = `%s'\n"
 "Ar trebui să le schimbaţi folosind comanda --change-pin\n"
 
-#: g10/card-util.c:1701
+#: g10/card-util.c:1714
 msgid "Please select the type of key to generate:\n"
 msgstr "Vă rugăm selectaţi tipul de cheie de generat:\n"
 
-#: g10/card-util.c:1703 g10/card-util.c:1793
+#: g10/card-util.c:1716 g10/card-util.c:1806
 msgid "   (1) Signature key\n"
 msgstr "   (1) Cheie de semnare\n"
 
-#: g10/card-util.c:1704 g10/card-util.c:1795
+#: g10/card-util.c:1717 g10/card-util.c:1808
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Cheie de cifrare\n"
 
-#: g10/card-util.c:1705 g10/card-util.c:1797
+#: g10/card-util.c:1718 g10/card-util.c:1810
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Cheie de autentificare\n"
 
-#: g10/card-util.c:1790
+#: g10/card-util.c:1803
 msgid "Please select where to store the key:\n"
 msgstr "Vă rugăm selectaţi unde să fie stocată cheia:\n"
 
-#: g10/card-util.c:1836
+#: g10/card-util.c:1849
 #, fuzzy, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "actualizarea a eÅŸuat: %s\n"
 
-#: g10/card-util.c:1941 tools/gpg-card.c:3065
+#: g10/card-util.c:1954 tools/gpg-card.c:3082
 #, fuzzy, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr "cheia secretă deja stocată pe un card\n"
 
-#: g10/card-util.c:1944 tools/gpg-card.c:3068 tools/gpg-card.c:3409
+#: g10/card-util.c:1957 tools/gpg-card.c:3085 tools/gpg-card.c:3426
 #, fuzzy
 #| msgid "Sign it? (y/N) "
 msgid "Continue? (y/N) "
 msgstr "Doriţi să-l semnaţi? (d/N) "
 
-#: g10/card-util.c:1949 tools/gpg-card.c:3079
+#: g10/card-util.c:1962 tools/gpg-card.c:3096
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2142
+#: g10/card-util.c:2155
 #, fuzzy, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "eroare în `%s': %s\n"
 
-#: g10/card-util.c:2188
+#: g10/card-util.c:2201
 #, fuzzy, c-format
 msgid "error for setup UIF: %s\n"
 msgstr "eroare în `%s': %s\n"
 
-#: g10/card-util.c:2212 g10/keyedit.c:1263 tools/gpg-card.c:3649
+#: g10/card-util.c:2225 g10/keyedit.c:1263 tools/gpg-card.c:3666
 msgid "quit this menu"
 msgstr "ieÅŸi din acest meniu"
 
-#: g10/card-util.c:2214
+#: g10/card-util.c:2227
 msgid "show admin commands"
 msgstr "arată comenzi administrare"
 
-#: g10/card-util.c:2215 g10/keyedit.c:1266 tools/gpg-card.c:3652
+#: g10/card-util.c:2228 g10/keyedit.c:1266 tools/gpg-card.c:3669
 msgid "show this help"
 msgstr "afişează acest mesaj"
 
-#: g10/card-util.c:2217 tools/gpg-card.c:3654
+#: g10/card-util.c:2230 tools/gpg-card.c:3671
 msgid "list all available data"
 msgstr "afişează toate datele disponibile"
 
-#: g10/card-util.c:2220 tools/gpg-card.c:3656
+#: g10/card-util.c:2233 tools/gpg-card.c:3673
 msgid "change card holder's name"
 msgstr "schimbă numele purtătorului cardului"
 
-#: g10/card-util.c:2221 tools/gpg-card.c:3657
+#: g10/card-util.c:2234 tools/gpg-card.c:3674
 msgid "change URL to retrieve key"
 msgstr "schimbă URL-ul de unde să fie adusă cheia"
 
-#: g10/card-util.c:2222 tools/gpg-card.c:3658
+#: g10/card-util.c:2235 tools/gpg-card.c:3675
 msgid "fetch the key specified in the card URL"
 msgstr "adu cheia specificată de URL-ul de pe card"
 
-#: g10/card-util.c:2223 tools/gpg-card.c:3659
+#: g10/card-util.c:2236 tools/gpg-card.c:3676
 msgid "change the login name"
 msgstr "schimbă numele de login"
 
-#: g10/card-util.c:2224 tools/gpg-card.c:3660
+#: g10/card-util.c:2237 tools/gpg-card.c:3677
 msgid "change the language preferences"
 msgstr "schimbă preferinţele de limbă"
 
-#: g10/card-util.c:2225 tools/gpg-card.c:3661
+#: g10/card-util.c:2238 tools/gpg-card.c:3678
 #, fuzzy
 #| msgid "change card holder's sex"
 msgid "change card holder's salutation"
 msgstr "schimbă sexul purtătorului cardului"
 
-#: g10/card-util.c:2227 tools/gpg-card.c:3663
+#: g10/card-util.c:2240 tools/gpg-card.c:3680
 msgid "change a CA fingerprint"
 msgstr "schimbă o amprentă CA"
 
-#: g10/card-util.c:2228 tools/gpg-card.c:3664
+#: g10/card-util.c:2241 tools/gpg-card.c:3681
 msgid "toggle the signature force PIN flag"
 msgstr "comută fanionul PIN de forţare a semnăturii"
 
-#: g10/card-util.c:2229 tools/gpg-card.c:3665
+#: g10/card-util.c:2242 tools/gpg-card.c:3682
 msgid "generate new keys"
 msgstr "generează noi chei"
 
-#: g10/card-util.c:2230 tools/gpg-card.c:3666
+#: g10/card-util.c:2243 tools/gpg-card.c:3683
 msgid "menu to change or unblock the PIN"
 msgstr "meniu pentru a schimba sau debloca PIN-ul"
 
-#: g10/card-util.c:2231 tools/gpg-card.c:3667
+#: g10/card-util.c:2244 tools/gpg-card.c:3684
 msgid "verify the PIN and list all data"
 msgstr "verifică PIN-ul şi listează toate datele"
 
-#: g10/card-util.c:2232 tools/gpg-card.c:3668
+#: g10/card-util.c:2245 tools/gpg-card.c:3685
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:2233 tools/gpg-card.c:3672
+#: g10/card-util.c:2246 tools/gpg-card.c:3689
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2235
+#: g10/card-util.c:2248
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr "|NUME|foloseÅŸte NUME ca destinatar implicit"
 
-#: g10/card-util.c:2236
+#: g10/card-util.c:2249
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "schimbă încrederea pentru proprietar"
 
-#: g10/card-util.c:2237 tools/gpg-card.c:3674
+#: g10/card-util.c:2250 tools/gpg-card.c:3691
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the User Interaction Flag"
 msgstr "schimbă încrederea pentru proprietar"
 
-#: g10/card-util.c:2361 tools/gpg-card.c:3924
+#: g10/card-util.c:2374 tools/gpg-card.c:3941
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2402
+#: g10/card-util.c:2415
 msgid "Admin-only command\n"
 msgstr "Comandă numai-administrare\n"
 
-#: g10/card-util.c:2433
+#: g10/card-util.c:2446
 msgid "Admin commands are allowed\n"
 msgstr "Sunt permise comenzi administrare\n"
 
-#: g10/card-util.c:2435
+#: g10/card-util.c:2448
 msgid "Admin commands are not allowed\n"
 msgstr "Nu sunt permise comenzi administrare\n"
 
-#: g10/card-util.c:2546 g10/keyedit.c:2275 tools/gpg-card.c:3814
-#: tools/gpg-card.c:4072
+#: g10/card-util.c:2559 g10/keyedit.c:2275 tools/gpg-card.c:3831
+#: tools/gpg-card.c:4089
 #, c-format
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comandă invalidă  (încercaţi \"ajutor\")\n"
@@ -2236,23 +2250,23 @@ msgstr "Comandă invalidă  (încercaţi \"ajutor\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output nu merge pentru această comandă\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5293 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5292 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:1934 g10/export.c:2342 g10/export.c:2463
-#: g10/getkey.c:1907 g10/gpg.c:5238 g10/keyedit.c:1450 g10/keyedit.c:2382
-#: g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:703 g10/keyserver.c:1240
-#: g10/revoke.c:230 g10/tofu.c:2168
+#: g10/getkey.c:2032 g10/gpg.c:5237 g10/keyedit.c:1450 g10/keyedit.c:2382
+#: g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:703 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:2002 g10/getkey.c:1915 g10/getkey.c:4330
-#: g10/gpg.c:5247 g10/keyedit.c:2354 g10/keyserver.c:1258 g10/revoke.c:236
-#: g10/revoke.c:665 g10/tofu.c:2176
+#: g10/delkey.c:90 g10/export.c:2002 g10/getkey.c:2040 g10/getkey.c:4455
+#: g10/gpg.c:5246 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"
 msgstr "eroare la citire keyblock: %s\n"
@@ -2380,15 +2394,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:555 g10/encrypt.c:808 g10/decrypt-data.c:261 g10/gpg.c:4083
-#: g10/gpg.c:4130 sm/decrypt.c:742 sm/encrypt.c:691 sm/gpgsm.c:1793
+#: g10/encrypt.c:555 g10/encrypt.c:808 g10/decrypt-data.c:261 g10/gpg.c:4080
+#: g10/gpg.c:4127 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1646
 #, 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:564 g10/gpg.c:4095 g10/gpg.c:4142 g10/sig-check.c:155
-#: g10/sign.c:452 sm/gpgsm.c:1803 sm/gpgsm.c:1813 sm/sign.c:596 sm/verify.c:510
+#: g10/encrypt.c:564 g10/gpg.c:4092 g10/gpg.c:4139 g10/sig-check.c:155
+#: g10/sign.c:452 sm/gpgsm.c:1656 sm/gpgsm.c:1666 sm/sign.c:596 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"
@@ -2408,7 +2422,7 @@ msgstr ""
 "AVERTISMENT: forţând cifrul simetric %s (%d) violaţi preferinţele "
 "destinatarului\n"
 
-#: g10/encrypt.c:838 sm/encrypt.c:766
+#: g10/encrypt.c:838 sm/encrypt.c:767
 #, fuzzy, c-format
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "AVERTISMENT: \"%s\" este o opţiune învechită\n"
@@ -2439,7 +2453,7 @@ msgstr "%s/%s cifrat pentru: \"%s\"\n"
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "nu puteţi folosi %s câtă vreme în modul %s\n"
 
-#: g10/decrypt-data.c:239 g10/mainproc.c:380 sm/decrypt.c:494
+#: g10/decrypt-data.c:239 g10/mainproc.c:380 sm/decrypt.c:892
 #, fuzzy, c-format
 #| msgid "%s encrypted data\n"
 msgid "%s.%s encrypted data\n"
@@ -2450,7 +2464,7 @@ msgstr "%s date cifrate\n"
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrat cu un algoritm necunoscut %d\n"
 
-#: g10/decrypt-data.c:361 g10/decrypt-data.c:414 sm/decrypt.c:508
+#: g10/decrypt-data.c:361 g10/decrypt-data.c:414 sm/decrypt.c:906
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2495,7 +2509,7 @@ msgstr ""
 msgid " - skipped"
 msgstr "%s: sărită: %s\n"
 
-#: g10/export.c:1333 g10/import.c:2124 g10/openfile.c:202 g10/openfile.c:296
+#: g10/export.c:1333 g10/import.c:2132 g10/openfile.c:202 g10/openfile.c:296
 #: g10/sign.c:1110 g10/sign.c:1447
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
@@ -2533,64 +2547,64 @@ msgstr "eroare la creearea `%s': %s\n"
 msgid "[User ID not found]"
 msgstr "[ID utilizator nu a fost găsit]"
 
-#: g10/getkey.c:1199
+#: g10/getkey.c:1324
 #, fuzzy, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "eroare la creearea `%s': %s\n"
 
-#: g10/getkey.c:1205
+#: g10/getkey.c:1330
 #, fuzzy, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "eroare la creearea `%s': %s\n"
 
-#: g10/getkey.c:1207
+#: g10/getkey.c:1332
 #, fuzzy
 msgid "No fingerprint"
 msgstr "Amprenta CA: "
 
-#: g10/getkey.c:1449
+#: g10/getkey.c:1574
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1884 g10/revoke.c:657 g10/revoke.c:718
+#: g10/getkey.c:2009 g10/revoke.c:658 g10/revoke.c:719
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "cheia secretă \"%s\" nu a fost găsită: %s\n"
 
-#: g10/getkey.c:1887 g10/pkclist.c:1012
+#: g10/getkey.c:2012 g10/pkclist.c:1012
 #, fuzzy, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "opţiuni enumerare invalide\n"
 
-#: g10/getkey.c:1965
+#: g10/getkey.c:2090
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "|NUME|foloseşte NUME ca cheie secretă implicită"
 
-#: g10/getkey.c:1973
+#: g10/getkey.c:2098
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "|NUME|foloseşte NUME ca cheie secretă implicită"
 
-#: g10/getkey.c:1980
+#: g10/getkey.c:2105
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr ""
 
-#: g10/getkey.c:2837
+#: g10/getkey.c:2962
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Cheia invalidă %s făcută validă de --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:3703
+#: g10/getkey.c:3828
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "folosim subcheia %s în loc de cheia primară %s\n"
 
-#: g10/getkey.c:4259 g10/gpg.c:2167
+#: g10/getkey.c:4384 g10/gpg.c:2168
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "opţiuni enumerare invalide\n"
@@ -2794,7 +2808,7 @@ msgstr ""
 msgid "use strict OpenPGP behavior"
 msgstr "foloseÅŸte comportament strict OpenPGP"
 
-#: g10/gpg.c:651 kbx/kbxutil.c:91 sm/gpgsm.c:424 tools/gpgconf.c:113
+#: g10/gpg.c:651 kbx/kbxutil.c:91 sm/gpgsm.c:425 tools/gpgconf.c:113
 msgid "do not make any changes"
 msgstr "nu face nici o schimbare"
 
@@ -2828,7 +2842,7 @@ msgstr "foloseÅŸte modul text canonic"
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|setează nivel de compresie N (0 deactivează)"
 
-#: g10/gpg.c:762 sm/gpgsm.c:357
+#: g10/gpg.c:762 sm/gpgsm.c:358
 msgid "Options controlling key import and export"
 msgstr ""
 
@@ -2848,11 +2862,11 @@ msgstr "importă chei de la un server de chei"
 msgid "include the public key in signatures"
 msgstr "enumeră şi verifică semnăturile cheii"
 
-#: g10/gpg.c:776 sm/gpgsm.c:360
+#: g10/gpg.c:776 sm/gpgsm.c:361
 msgid "disable all access to the dirmngr"
 msgstr ""
 
-#: g10/gpg.c:788 sm/gpgsm.c:367
+#: g10/gpg.c:788 sm/gpgsm.c:368
 msgid "Options controlling key listings"
 msgstr ""
 
@@ -2872,15 +2886,15 @@ msgstr "|NUME|cifrare pentru NUME"
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "foloseÅŸte acest id-utilizator pentru a semna sau decripta"
 
-#: g10/gpg.c:876 sm/gpgsm.c:408
+#: g10/gpg.c:876 sm/gpgsm.c:409
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:895 sm/gpgsm.c:420 dirmngr/dirmngr.c:286
+#: g10/gpg.c:895 sm/gpgsm.c:421 dirmngr/dirmngr.c:289
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:966 sm/gpgsm.c:453
+#: g10/gpg.c:966 sm/gpgsm.c:454
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2939,7 +2953,7 @@ msgstr ""
 "sign, check, encrypt sau decrypt\n"
 "operaţiunea implicită depinde de datele de intrare\n"
 
-#: g10/gpg.c:1168 sm/gpgsm.c:636
+#: g10/gpg.c:1168 sm/gpgsm.c:637
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2963,12 +2977,12 @@ msgstr "Hash: "
 msgid "Compression: "
 msgstr "Compresie: "
 
-#: g10/gpg.c:1274 sm/gpgsm.c:710
+#: g10/gpg.c:1274 sm/gpgsm.c:711
 #, fuzzy, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "folosire: gpg [opţiuni] "
 
-#: g10/gpg.c:1467 sm/gpgsm.c:803
+#: g10/gpg.c:1467 sm/gpgsm.c:804
 #, c-format
 msgid "conflicting commands\n"
 msgstr "comenzi în conflict\n"
@@ -2979,47 +2993,47 @@ msgstr "comenzi în conflict\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:1683
+#: g10/gpg.c:1684
 #, 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:1686
+#: g10/gpg.c:1687
 #, 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:1689
+#: g10/gpg.c:1690
 #, 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:1695
+#: g10/gpg.c:1696
 #, 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:1698
+#: g10/gpg.c:1699
 #, 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:1701
+#: g10/gpg.c:1702
 #, 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:1707
+#: g10/gpg.c:1708
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
@@ -3027,7 +3041,7 @@ msgstr ""
 "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru "
 "directorul home `%s'\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1711
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -3037,7 +3051,7 @@ msgstr ""
 "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru fiÅŸier "
 "configurare `%s'\n"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1714
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
@@ -3045,7 +3059,7 @@ msgstr ""
 "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru "
 "extensia `%s'\n"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1720
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
@@ -3053,7 +3067,7 @@ msgstr ""
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru "
 "directorul home `%s'\n"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1723
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@ -3064,7 +3078,7 @@ msgstr ""
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru fiÅŸier "
 "configurare `%s'\n"
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1726
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
@@ -3072,485 +3086,485 @@ msgstr ""
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru "
 "extensia `%s'\n"
 
-#: g10/gpg.c:1941
+#: g10/gpg.c:1942
 #, fuzzy, c-format
 #| msgid "unknown configuration item `%s'\n"
 msgid "unknown configuration item '%s'\n"
 msgstr "articol configurare necunoscut `%s'\n"
 
-#: g10/gpg.c:2037
+#: g10/gpg.c:2038
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:2039
+#: g10/gpg.c:2040
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "Nici o semnătură corespunzătoare în inelul secret\n"
 
-#: g10/gpg.c:2041
+#: g10/gpg.c:2042
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2043
+#: g10/gpg.c:2044
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nici o semnătură corespunzătoare în inelul secret\n"
 
-#: g10/gpg.c:2045
+#: g10/gpg.c:2046
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2049
+#: g10/gpg.c:2050
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2051
+#: g10/gpg.c:2052
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
-#: g10/gpg.c:2053
+#: g10/gpg.c:2054
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:2055
+#: g10/gpg.c:2056
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:2057
+#: g10/gpg.c:2058
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:2059
+#: g10/gpg.c:2060
 #, 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:2061
+#: g10/gpg.c:2062
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nici o semnătură corespunzătoare în inelul secret\n"
 
-#: g10/gpg.c:2178
+#: g10/gpg.c:2179
 #, fuzzy, c-format
 #| msgid "unknown option `%s'\n"
 msgid "unknown TOFU policy '%s'\n"
 msgstr "opţiune necunoscută `%s'\n"
 
-#: g10/gpg.c:2180
+#: g10/gpg.c:2181
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2975 g10/gpg.c:3828 g10/gpg.c:3840
+#: g10/gpg.c:2978 g10/gpg.c:3825 g10/gpg.c:3837
 #, 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:3151 g10/gpg.c:3163
+#: g10/gpg.c:3154 g10/gpg.c:3166
 #, 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:3185
+#: g10/gpg.c:3188
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "Nu este o adresă de email validă\n"
 
-#: g10/gpg.c:3217 sm/gpgsm.c:1270
+#: g10/gpg.c:3220 sm/gpgsm.c:1143
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "algoritm hash invalid `%s'\n"
 
-#: g10/gpg.c:3223 sm/gpgsm.c:1276
+#: g10/gpg.c:3226 sm/gpgsm.c:1149
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "opţiuni enumerare invalide\n"
 
-#: g10/gpg.c:3280
+#: g10/gpg.c:3283
 #, 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:3302 g10/gpg.c:3511 g10/keyedit.c:5319
+#: g10/gpg.c:3305 g10/gpg.c:3514 g10/keyedit.c:5322
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "nu am putut interpreta URL-ul serverului de chei\n"
 
-#: g10/gpg.c:3320
+#: g10/gpg.c:3323
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opţiuni server de chei invalide\n"
 
-#: g10/gpg.c:3323
+#: g10/gpg.c:3326
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "opţiuni server de chei invalide\n"
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3333
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opţiuni import invalide\n"
 
-#: g10/gpg.c:3333
+#: g10/gpg.c:3336
 #, c-format
 msgid "invalid import options\n"
 msgstr "opţiuni import invalide\n"
 
-#: g10/gpg.c:3339 g10/gpg.c:3354
+#: g10/gpg.c:3342 g10/gpg.c:3357
 #, fuzzy, c-format
 #| msgid "invalid list options\n"
 msgid "invalid filter option: %s\n"
 msgstr "opţiuni enumerare invalide\n"
 
-#: g10/gpg.c:3345
+#: g10/gpg.c:3348
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opţiuni export invalide\n"
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3351
 #, c-format
 msgid "invalid export options\n"
 msgstr "opţiuni export invalide\n"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3363
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opţiuni enumerare invalide\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3366
 #, c-format
 msgid "invalid list options\n"
 msgstr "opţiuni enumerare invalide\n"
 
-#: g10/gpg.c:3371
+#: g10/gpg.c:3374
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3373
+#: g10/gpg.c:3376
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3378
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' nu este expirare de semnătură validă\n"
 
-#: g10/gpg.c:3377
+#: g10/gpg.c:3380
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3384
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3386
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
-#: g10/gpg.c:3385
+#: g10/gpg.c:3388
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' nu este expirare de semnătură validă\n"
 
-#: g10/gpg.c:3387
+#: g10/gpg.c:3390
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3389
+#: g10/gpg.c:3392
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "`%s' nu este expirare de semnătură validă\n"
 
-#: g10/gpg.c:3396
+#: g10/gpg.c:3399
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opţiuni verificare invalide\n"
 
-#: g10/gpg.c:3399
+#: g10/gpg.c:3402
 #, c-format
 msgid "invalid verify options\n"
 msgstr "opţiuni verificare invalide\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3409
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nu pot seta cale-execuţie ca %s\n"
 
-#: g10/gpg.c:3613
+#: g10/gpg.c:3616
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opţiuni verificare invalide\n"
 
-#: g10/gpg.c:3616
+#: g10/gpg.c:3619
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3625
+#: g10/gpg.c:3628
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "opţiuni enumerare invalide\n"
 
-#: g10/gpg.c:3807 sm/gpgsm.c:1675
+#: g10/gpg.c:3804 sm/gpgsm.c:1528
 #, 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:3821
+#: g10/gpg.c:3818
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTISMENT: %s înlocuieşte %s\n"
 
-#: g10/gpg.c:3830
+#: g10/gpg.c:3827
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s nu este permis cu %s!\n"
 
-#: g10/gpg.c:3833
+#: g10/gpg.c:3830
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nu are sens cu %s!\n"
 
-#: g10/gpg.c:3848 sm/gpgsm.c:1696 dirmngr/dirmngr.c:1123
+#: g10/gpg.c:3845 sm/gpgsm.c:1549 dirmngr/dirmngr.c:1160
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3869
+#: g10/gpg.c:3866
 #, 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:3897 g10/gpg.c:3928 sm/gpgsm.c:1763
+#: g10/gpg.c:3894 g10/gpg.c:3925 sm/gpgsm.c:1616
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritm cifrare selectat este invalid\n"
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3901
 #, 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:3916
+#: g10/gpg.c:3913
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritm compresie selectat este invalid\n"
 
-#: g10/gpg.c:3922
+#: g10/gpg.c:3919
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritm rezumat certificare selectat este invalid\n"
 
-#: g10/gpg.c:3937
+#: g10/gpg.c:3934
 #, 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:3939
+#: g10/gpg.c:3936
 #, 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:3941
+#: g10/gpg.c:3938
 #, 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:3943
+#: g10/gpg.c:3940
 #, 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:3945
+#: g10/gpg.c:3942
 #, 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:3949
+#: g10/gpg.c:3946
 #, 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:3953
+#: g10/gpg.c:3950
 #, 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:3960
+#: g10/gpg.c:3957
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "preferinţe implicite invalide\n"
 
-#: g10/gpg.c:3964
+#: g10/gpg.c:3961
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "preferinţe cifrare personale invalide\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3964
 #, 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:3971
+#: g10/gpg.c:3968
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "preferinţe rezumat personale invalide\n"
 
-#: g10/gpg.c:3975
+#: g10/gpg.c:3972
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "preferinţe compresie personale invalide\n"
 
-#: g10/gpg.c:3984 g10/gpg.c:3989
+#: g10/gpg.c:3981 g10/gpg.c:3986
 #, 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:4026
+#: g10/gpg.c:4023
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s nu merge încă cu %s!\n"
 
-#: g10/gpg.c:4089
+#: g10/gpg.c:4086
 #, 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:4101
+#: g10/gpg.c:4098
 #, 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:4256
+#: g10/gpg.c:4253
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "am eşuat să iniţializez TrustDB:%s\n"
 
-#: g10/gpg.c:4268
+#: g10/gpg.c:4265
 #, 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:4340
+#: g10/gpg.c:4337
 #, 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:4369
+#: g10/gpg.c:4366
 #, 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:4372
+#: g10/gpg.c:4369
 #, 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:4430
+#: g10/gpg.c:4427
 #, 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:4433
+#: g10/gpg.c:4430
 #, 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:4821 g10/keyserver.c:1870
+#: g10/gpg.c:4818 g10/keyserver.c:1629
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "trimitere server de chei eşuată: %s\n"
 
-#: g10/gpg.c:4826
+#: g10/gpg.c:4823
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recepţie server de chei eşuată: %s\n"
 
-#: g10/gpg.c:4832
+#: g10/gpg.c:4829
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export cheie eÅŸuat: %s\n"
 
-#: g10/gpg.c:4845
+#: g10/gpg.c:4842
 #, 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:4857
+#: g10/gpg.c:4854
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "căutare server de chei eşuată: %s\n"
 
-#: g10/gpg.c:4870
+#: g10/gpg.c:4867
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualizare server de chei eşuată: %s\n"
 
-#: g10/gpg.c:4937
+#: g10/gpg.c:4936
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminarea armurii a eÅŸuat: %s\n"
 
-#: g10/gpg.c:4948
+#: g10/gpg.c:4947
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "punerea armurii a eÅŸuat: %s\n"
 
-#: g10/gpg.c:5053
+#: g10/gpg.c:5052
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "algoritm hash invalid `%s'\n"
 
-#: g10/gpg.c:5205 g10/tofu.c:2156
+#: g10/gpg.c:5204 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:5216
+#: g10/gpg.c:5215
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5272
+#: g10/gpg.c:5271
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5283
+#: g10/gpg.c:5282
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Daţi-i drumul şi scrieţi mesajul ...\n"
 
-#: g10/gpg.c:5630
+#: g10/gpg.c:5629
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL-ul politicii de certificare furnizat este invalid\n"
 
-#: g10/gpg.c:5632
+#: g10/gpg.c:5631
 #, 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:5665
+#: g10/gpg.c:5664
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
@@ -3564,7 +3578,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:414 tools/gpgconf.c:116 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:415 tools/gpgconf.c:116 tools/gpg-card.c:95
 msgid "|FD|write status info to this FD"
 msgstr "|FD|scrie informaţii de stare în acest FD"
 
@@ -3662,276 +3676,276 @@ msgstr ""
 msgid "repair keys on import"
 msgstr "afişează amprenta cheii"
 
-#: g10/import.c:399 g10/import.c:721
+#: g10/import.c:407 g10/import.c:729
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "bloc de tip %d sărit\n"
 
-#: g10/import.c:738
+#: g10/import.c:746
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu chei procesate până acum\n"
 
-#: g10/import.c:831
+#: g10/import.c:839
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Număr total procesate: %lu\n"
 
-#: g10/import.c:834
+#: g10/import.c:842
 #, fuzzy, c-format
 #| msgid "      skipped new keys: %lu\n"
 msgid "    skipped PGP-2 keys: %lu\n"
 msgstr "      chei noi sărite: %lu\n"
 
-#: g10/import.c:836
+#: g10/import.c:844
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      chei noi sărite: %lu\n"
 
-#: g10/import.c:839
+#: g10/import.c:847
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "  fără ID-uri utilizator: %lu\n"
 
-#: g10/import.c:842 sm/import.c:129
+#: g10/import.c:850 sm/import.c:129
 #, c-format
 msgid "              imported: %lu"
 msgstr "               importate: %lu"
 
-#: g10/import.c:846 sm/import.c:133
+#: g10/import.c:854 sm/import.c:133
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             neschimbate: %lu\n"
 
-#: g10/import.c:848
+#: g10/import.c:856
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "   noi ID-uri utilizator: %lu\n"
 
-#: g10/import.c:850
+#: g10/import.c:858
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "             noi subchei: %lu\n"
 
-#: g10/import.c:852
+#: g10/import.c:860
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "           noi semnături: %lu\n"
 
-#: g10/import.c:854
+#: g10/import.c:862
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "    noi revocări de chei: %lu\n"
 
-#: g10/import.c:856 sm/import.c:135
+#: g10/import.c:864 sm/import.c:135
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "     chei secrete citite: %lu\n"
 
-#: g10/import.c:858 sm/import.c:137
+#: g10/import.c:866 sm/import.c:137
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  chei secrete importate: %lu\n"
 
-#: g10/import.c:860 sm/import.c:139
+#: g10/import.c:868 sm/import.c:139
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "chei secrete neschimbate: %lu\n"
 
-#: g10/import.c:862 sm/import.c:141
+#: g10/import.c:870 sm/import.c:141
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "            ne importate: %lu\n"
 
-#: g10/import.c:864
+#: g10/import.c:872
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "semnături create până acum: %lu\n"
 
-#: g10/import.c:866
+#: g10/import.c:874
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "     chei secrete citite: %lu\n"
 
-#: g10/import.c:1291
+#: g10/import.c:1299
 #, fuzzy, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr "AVERTISMENT: cheia %s conţine preferinţe pentru indisponibil\n"
 
-#: g10/import.c:1333
+#: g10/import.c:1341
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": preferinţă pentru algoritm de cifrare %s\n"
 
-#: g10/import.c:1351
+#: g10/import.c:1359
 #, fuzzy, c-format
 #| msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgid "         \"%s\": preference for AEAD algorithm %s\n"
 msgstr "         \"%s\": preferinţă pentru algoritm de cifrare %s\n"
 
-#: g10/import.c:1366
+#: g10/import.c:1374
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": preferinţă pentru algoritm rezumat %s\n"
 
-#: g10/import.c:1378
+#: g10/import.c:1386
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": preferinţă pentru algoritm compresie %s\n"
 
-#: g10/import.c:1391
+#: g10/import.c:1399
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 "este puternic sugerat să vă actualizaţi preferinţele şi re-distribuiţi\n"
 
-#: g10/import.c:1393
+#: g10/import.c:1401
 #, c-format
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "această cheie pentru a avita probleme potenţiale de ne-potrivire de "
 "algoritm\n"
 
-#: g10/import.c:1418
+#: g10/import.c:1426
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "vă puteţi actualiza preferinţele cu: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:1932 g10/import.c:3053
+#: g10/import.c:1940 g10/import.c:3061
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "cheia %s: nici un ID utilizator\n"
 
-#: g10/import.c:1938
+#: g10/import.c:1946
 #, fuzzy, c-format
 #| msgid "skipped \"%s\": %s\n"
 msgid "key %s: %s\n"
 msgstr "sărită \"%s\": %s\n"
 
-#: g10/import.c:1939 g10/import.c:3025
+#: g10/import.c:1947 g10/import.c:3033
 msgid "rejected by import screener"
 msgstr ""
 
-#: g10/import.c:1988
+#: g10/import.c:1996
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "cheia %s: subcheia HPK coruptă a fost reparată\n"
 
-#: g10/import.c:2009
+#: g10/import.c:2017
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "cheia %s: am acceptat ID-ul utilizator ce nu e auto-semnat \"%s\"\n"
 
-#: g10/import.c:2020 g10/import.c:2051
+#: g10/import.c:2028 g10/import.c:2059
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "cheia %s: nici un ID utilizator valid\n"
 
-#: g10/import.c:2022
+#: g10/import.c:2030
 #, c-format
 msgid "this may be caused by a missing self-signature\n"
 msgstr "aceasta poate fi cauzată de o auto-semnătură ce lipseşte\n"
 
-#: g10/import.c:2101 g10/import.c:3439
+#: g10/import.c:2109 g10/import.c:3447
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "cheia %s: cheia publică nu a fost găsită: %s\n"
 
-#: g10/import.c:2107
+#: g10/import.c:2115
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "cheia %s: cheie nouă - sărită\n"
 
-#: g10/import.c:2119
+#: g10/import.c:2127
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "n-am găsit nici un inel de chei ce poate fi scris: %s\n"
 
-#: g10/import.c:2151 g10/import.c:2253 g10/import.c:3514
+#: g10/import.c:2159 g10/import.c:2261 g10/import.c:3522
 #, fuzzy, c-format
 #| msgid "error writing keyring `%s': %s\n"
 msgid "error writing keyring '%s': %s\n"
 msgstr "eroare la scrierea inelului de chei `%s': %s\n"
 
-#: g10/import.c:2174
+#: g10/import.c:2182
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "cheia %s: cheia publică \"%s\" importată\n"
 
-#: g10/import.c:2201
+#: g10/import.c:2209
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "cheia %s: nu se potriveşte cu copia noastră\n"
 
-#: g10/import.c:2269
+#: g10/import.c:2277
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "cheia %s: \"%s\" 1 nou ID utilizator\n"
 
-#: g10/import.c:2272
+#: g10/import.c:2280
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "cheia %s: \"%s\" %d noi ID-uri utilizator\n"
 
-#: g10/import.c:2275
+#: g10/import.c:2283
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "cheia %s: \"%s\" 1 nouă semnătură\n"
 
-#: g10/import.c:2278
+#: g10/import.c:2286
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "cheia %s: \"%s\" %d noi semnături\n"
 
-#: g10/import.c:2281
+#: g10/import.c:2289
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "cheia %s: \"%s\" 1 nouă subcheie\n"
 
-#: g10/import.c:2284
+#: g10/import.c:2292
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "cheia %s: \"%s\" %d noi subchei\n"
 
-#: g10/import.c:2287
+#: g10/import.c:2295
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "cheia %s: \"%s\" %d noi semnături\n"
 
-#: g10/import.c:2290
+#: g10/import.c:2298
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "cheia %s: \"%s\" %d noi semnături\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2301
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "cheia %s: \"%s\" %d noi ID-uri utilizator\n"
 
-#: g10/import.c:2296
+#: g10/import.c:2304
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "cheia %s: \"%s\" %d noi ID-uri utilizator\n"
 
-#: g10/import.c:2332
+#: g10/import.c:2340
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "cheia %s: \"%s\" nu a fost schimbată\n"
 
-#: g10/import.c:2692 g10/import.c:2887
+#: g10/import.c:2700 g10/import.c:2895
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "cheia %s: cheie secretă importată\n"
 
-#: g10/import.c:2700
+#: g10/import.c:2708
 #, fuzzy, c-format
 #| msgid "skipped: secret key already present\n"
 msgid "key %s: secret key already exists\n"
 msgstr "sărită: cheia secretă deja prezentă\n"
 
-#: g10/import.c:2708
+#: g10/import.c:2716
 #, fuzzy, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "eroare trimitere la `%s': %s\n"
@@ -3944,210 +3958,209 @@ msgstr "eroare trimitere la `%s': %s\n"
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2877
+#: g10/import.c:2885
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:3024
+#: g10/import.c:3032
 #, fuzzy, c-format
 #| msgid "secret key \"%s\" not found: %s\n"
 msgid "secret key %s: %s\n"
 msgstr "cheia secretă \"%s\" nu a fost găsită: %s\n"
 
-#: g10/import.c:3045 g10/import.c:3084
+#: g10/import.c:3053 g10/import.c:3092
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "importul de chei secrete nu este permis\n"
 
-#: g10/import.c:3072
+#: g10/import.c:3080
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "cheia %s: cheie secretă cu cifru invalid %d - sărită\n"
 
-#: g10/import.c:3234 g10/pkclist.c:75 g10/revoke.c:774
+#: g10/import.c:3242 g10/pkclist.c:75 g10/revoke.c:775
 msgid "No reason specified"
 msgstr "Nici un motiv specificat"
 
-#: g10/import.c:3235 g10/pkclist.c:77 g10/revoke.c:776
+#: g10/import.c:3243 g10/pkclist.c:77 g10/revoke.c:777
 msgid "Key is superseded"
 msgstr "Cheia este înlocuită"
 
-#: g10/import.c:3236 g10/pkclist.c:79 g10/revoke.c:775
+#: g10/import.c:3244 g10/pkclist.c:79 g10/revoke.c:776
 msgid "Key has been compromised"
 msgstr "Cheia a fost compromisă"
 
-#: g10/import.c:3237 g10/pkclist.c:81 g10/revoke.c:777
+#: g10/import.c:3245 g10/pkclist.c:81 g10/revoke.c:778
 msgid "Key is no longer used"
 msgstr "Cheia nu mai este folosită"
 
-#: g10/import.c:3238 g10/pkclist.c:83 g10/revoke.c:778
+#: g10/import.c:3246 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "ID utilizator nu mai este valid"
 
-#: g10/import.c:3363 g10/keylist.c:1105 g10/pkclist.c:87
+#: g10/import.c:3371 g10/keylist.c:1105 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "motiv pentru revocare: "
 
-#: g10/import.c:3382 g10/keylist.c:1124 g10/pkclist.c:103
+#: g10/import.c:3390 g10/keylist.c:1124 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "comentariu revocare: "
 
-#: g10/import.c:3432
+#: g10/import.c:3440
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "cheia %s: nici o cheie publică - nu pot aplica certificatul de revocare\n"
 
-#: g10/import.c:3461
+#: g10/import.c:3469
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "cheia %s: nu pot găsi keyblock-ul original: %s\n"
 
-#: g10/import.c:3468
+#: g10/import.c:3476
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "cheia %s: nu pot citi keyblock-ul original: %s\n"
 
-#: g10/import.c:3488
+#: g10/import.c:3496
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "cheia %s: certificat de revocare invalid: %s - respins\n"
 
-#: g10/import.c:3523
+#: g10/import.c:3531
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "cheia %s: certificatul de revocare \"%s\" importat\n"
 
-#: g10/import.c:3609
+#: g10/import.c:3617
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "cheia %s: nici un ID utilizator pentru semnătură\n"
 
-#: g10/import.c:3626
+#: g10/import.c:3634
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "cheia %s: algoritm cu cheie publică nesuportat pentru ID-ul utilizator \"%s"
 "\"\n"
 
-#: g10/import.c:3628
+#: g10/import.c:3636
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "cheia %s: auto-semnătură invalidă pentru ID-ul utilizator \"%s\"\n"
 
-#: g10/import.c:3645 g10/import.c:3673 g10/import.c:3729
+#: g10/import.c:3653 g10/import.c:3681 g10/import.c:3737
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "cheia %s: algoritm cu cheie publică nesuportat\n"
 
-#: g10/import.c:3646
+#: g10/import.c:3654
 #, fuzzy, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "cheia %s: am adăugat semnătura de cheie directă\n"
 
-#: g10/import.c:3660
+#: g10/import.c:3668
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "cheia %s: nici o subcheie pentru legarea cheii\n"
 
-#: g10/import.c:3675
+#: g10/import.c:3683
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "cheia %s: legare subcheie invalidă\n"
 
-#: g10/import.c:3694
+#: g10/import.c:3702
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "cheia %s: am şters multiple legături de subchei\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3726
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "cheia %s: nici o subcheie pentru revocare de cheie\n"
 
-#: g10/import.c:3731
+#: g10/import.c:3739
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "cheia %s: revocare de subcheie invalidă\n"
 
-#: g10/import.c:3746
+#: g10/import.c:3754
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "cheia %s: am şters multiple revocări de subcheie\n"
 
-#: g10/import.c:3790
+#: g10/import.c:3798
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "cheia %s: am sărit ID-ul utilizator \"%s\"\n"
 
-#: g10/import.c:3817
+#: g10/import.c:3825
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "cheia %s: am sărit subcheia\n"
 
-#: g10/import.c:3849
+#: g10/import.c:3857
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "cheia %s: semnătura nu poate fi exportată (clasa 0x%02X) - sărită\n"
 
-#: g10/import.c:3860
+#: g10/import.c:3868
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "cheia %s: certificat de revocare într-un loc greşit - sărit\n"
 
-#: g10/import.c:3878
+#: g10/import.c:3886
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "cheia %s: certificat de revocare invalid: %s - sărit\n"
 
-#: g10/import.c:3892
+#: g10/import.c:3900
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "cheia %s: semnătură subcheie într-un loc greşit - sărită\n"
 
-#: g10/import.c:3900
+#: g10/import.c:3908
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "cheia %s: clasă de semnătură neaşteptată (0x%02X) - sărită\n"
 
-#: g10/import.c:4073
+#: g10/import.c:4081
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "cheia %s: am detectat un ID utilizator duplicat - combinate\n"
 
-#: g10/import.c:4180
+#: g10/import.c:4188
 #, fuzzy, c-format
 #| msgid "key %s: duplicated user ID detected - merged\n"
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr "cheia %s: am detectat un ID utilizator duplicat - combinate\n"
 
-#: g10/import.c:4245
+#: g10/import.c:4253
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "AVERTISMENT: cheia %s poate fi revocată: aduc revocarea cheii %s\n"
 
-#: g10/import.c:4261
+#: g10/import.c:4269
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVERTISMENT: cheia %s poate fi revocată: cheia de revocare %s nu este "
 "prezentă.\n"
 
-#: g10/import.c:4327
+#: g10/import.c:4335
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "cheia %s: am adăugat certificatul de revocare \"%s\"\n"
 
-#: g10/import.c:4365
+#: g10/import.c:4373
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "cheia %s: am adăugat semnătura de cheie directă\n"
 
-#: g10/key-check.c:133 dirmngr/dirmngr_ldap.c:650 dirmngr/ldap-wrapper.c:835
-#: dirmngr/ldap-wrapper.c:852
+#: g10/key-check.c:133 dirmngr/ldap-wrapper.c:835 dirmngr/ldap-wrapper.c:852
 #, fuzzy, c-format
 msgid "error allocating memory: %s\n"
 msgstr "eroare la crearea inelului de chei `%s': %s\n"
@@ -4213,7 +4226,7 @@ msgid ""
 "all signatures.\n"
 msgstr ""
 
-#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:284 sm/keydb.c:297
+#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:289 sm/keydb.c:302
 #, fuzzy, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "eroare la crearea inelului de chei `%s': %s\n"
@@ -4224,7 +4237,7 @@ msgstr "eroare la crearea inelului de chei `%s': %s\n"
 msgid "error creating keyring '%s': %s\n"
 msgstr "eroare la crearea inelului de chei `%s': %s\n"
 
-#: g10/keydb.c:388 sm/keydb.c:303
+#: g10/keydb.c:388 sm/keydb.c:308
 #, fuzzy, c-format
 msgid "keybox '%s' created\n"
 msgstr "inelul de chei `%s' creat\n"
@@ -4485,8 +4498,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:6192 g10/keyedit.c:6275 g10/keyedit.c:6404
-#: g10/keyedit.c:6466 g10/sign.c:528
+#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
+#: g10/keyedit.c:6474 g10/sign.c:528
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "semnarea a eÅŸuat: %s\n"
@@ -4886,7 +4899,7 @@ msgstr "Nu există acest ID utilizator.\n"
 msgid "Nothing to sign.\n"
 msgstr "Nimic de semnat cu cheia %s\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6057
+#: g10/keyedit.c:2973 g10/keyedit.c:6065
 #, c-format
 msgid "Not signed by you.\n"
 msgstr ""
@@ -4958,7 +4971,7 @@ msgstr "Această cheie poate fi revocată de %s cheia %s"
 msgid "(sensitive)"
 msgstr " (senzitiv)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:525
+#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "creată: %s"
@@ -4974,7 +4987,7 @@ msgid "expired: %s"
 msgstr "expirată: %s"
 
 #: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2262
-#: g10/keyserver.c:531
+#: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "expiră: %s"
@@ -5011,13 +5024,13 @@ msgstr ""
 "corectă dacă nu reporniţi programul.\n"
 
 #
-#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:535
-#: g10/mainproc.c:2280 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
+#: g10/mainproc.c:2282 g10/tofu.c:1789 g10/trust.c:426 dirmngr/ocsp.c:792
 msgid "revoked"
 msgstr "revocată"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:539
-#: g10/mainproc.c:2282 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
+#: g10/mainproc.c:2284 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "expirată"
 
@@ -5059,7 +5072,7 @@ msgstr "Sunteţi încă sigur(ă) că doriţi să o adăugaţi? (d/N) "
 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:3107
+#: g10/keyedit.c:4273 g10/keygen.c:3111
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
@@ -5215,7 +5228,7 @@ msgstr ""
 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:5357 g10/keyedit.c:5495
+#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
 #, 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"
@@ -5224,133 +5237,133 @@ msgstr "auto-semnătură v3 sărită pentru ID-ul utilizator \"%s\"\n"
 msgid "Enter your preferred keyserver URL: "
 msgstr "Introduceţi URL-ul serverului de chei preferat: "
 
-#: g10/keyedit.c:5380
+#: g10/keyedit.c:5383
 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:5381
+#: g10/keyedit.c:5384
 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:5441
+#: g10/keyedit.c:5449
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notare semnătură: "
 
-#: g10/keyedit.c:5588
+#: g10/keyedit.c:5596
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Suprascriu? (d/N) "
 
-#: g10/keyedit.c:5658
+#: g10/keyedit.c:5666
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nici un ID utilizator cu indicele %d\n"
 
-#: g10/keyedit.c:5720
+#: g10/keyedit.c:5728
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nici un ID utilizator cu hash-ul %s\n"
 
-#: g10/keyedit.c:5821
+#: g10/keyedit.c:5829
 #, 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:5843
+#: g10/keyedit.c:5851
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nici o subcheie cu indicele %d\n"
 
-#: g10/keyedit.c:5984
+#: g10/keyedit.c:5992
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID utilizator: \"%s\"\n"
 
-#: g10/keyedit.c:5987 g10/keyedit.c:6089 g10/keyedit.c:6137
+#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
 #, 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:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
+#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
 msgid " (non-exportable)"
 msgstr " (non-exportabilă)"
 
-#: g10/keyedit.c:5993
+#: g10/keyedit.c:6001
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Această semnătură a expirat pe %s.\n"
 
-#: g10/keyedit.c:5998
+#: g10/keyedit.c:6006
 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:6003
+#: g10/keyedit.c:6011
 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:6063
+#: g10/keyedit.c:6071
 #, 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:6092
+#: g10/keyedit.c:6100
 msgid " (non-revocable)"
 msgstr " (non-revocabilă)"
 
-#: g10/keyedit.c:6099
+#: g10/keyedit.c:6107
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revocată de cheia d-voastră %s pe %s\n"
 
-#: g10/keyedit.c:6124
+#: g10/keyedit.c:6132
 msgid "You are about to revoke these signatures:\n"
 msgstr "Sunteţi pe cale să revocaţi aceste semnături:\n"
 
-#: g10/keyedit.c:6147
+#: g10/keyedit.c:6155
 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:6180
+#: g10/keyedit.c:6188
 #, c-format
 msgid "no secret key\n"
 msgstr "nici o cheie secretă\n"
 
-#: g10/keyedit.c:6228
+#: g10/keyedit.c:6236
 #, 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:6238
+#: g10/keyedit.c:6246
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ID-ul utilizator \"%s\" este deja revocat\n"
 
-#: g10/keyedit.c:6255
+#: g10/keyedit.c:6263
 #, 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:6351
+#: g10/keyedit.c:6359
 #, 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:6389
+#: g10/keyedit.c:6397
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Cheia %s este deja revocată.\n"
 
-#: g10/keyedit.c:6451
+#: g10/keyedit.c:6459
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Subcheia %s este deja revocată.\n"
 
-#: g10/keyedit.c:6548
+#: g10/keyedit.c:6556
 #, 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"
@@ -5360,84 +5373,84 @@ msgstr "AfiÅŸez poza ID %s de dimensiune %ld pentru cheia %s (uid %d)\n"
 msgid "invalid value for option '%s'\n"
 msgstr "opţiuni enumerare invalide\n"
 
-#: g10/keygen.c:338
+#: g10/keygen.c:339
 #, fuzzy, c-format
 #| msgid "preference `%s' duplicated\n"
 msgid "preference '%s' duplicated\n"
 msgstr "preferinţa `%s' duplicată\n"
 
-#: g10/keygen.c:345
+#: g10/keygen.c:346
 #, c-format
 msgid "too many cipher preferences\n"
 msgstr "prea multe preferinţe de cifrare\n"
 
-#: g10/keygen.c:347
+#: g10/keygen.c:348
 #, c-format
 msgid "too many digest preferences\n"
 msgstr "prea multe preferinţe de rezumat\n"
 
-#: g10/keygen.c:349
+#: g10/keygen.c:350
 #, c-format
 msgid "too many compression preferences\n"
 msgstr "prea multe preferinţe de compresie\n"
 
-#: g10/keygen.c:351
+#: g10/keygen.c:352
 #, fuzzy, c-format
 #| msgid "too many cipher preferences\n"
 msgid "too many AEAD preferences\n"
 msgstr "prea multe preferinţe de cifrare\n"
 
-#: g10/keygen.c:521
+#: g10/keygen.c:522
 #, fuzzy, c-format
 #| msgid "invalid item `%s' in preference string\n"
 msgid "invalid item '%s' in preference string\n"
 msgstr "articol invalid `%s' în şirul de preferinţe\n"
 
-#: g10/keygen.c:1130
+#: g10/keygen.c:1131
 #, c-format
 msgid "writing direct signature\n"
 msgstr "scriu semnătură directă\n"
 
-#: g10/keygen.c:1176
+#: g10/keygen.c:1177
 #, c-format
 msgid "writing self signature\n"
 msgstr "scriu auto semnătură\n"
 
-#: g10/keygen.c:1233
+#: g10/keygen.c:1234
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "scriu semnătură legată de cheie\n"
 
-#: g10/keygen.c:1598 g10/keygen.c:1603 g10/keygen.c:1655 g10/keygen.c:1660
-#: g10/keygen.c:1832 g10/keygen.c:1837
+#: g10/keygen.c:1599 g10/keygen.c:1604 g10/keygen.c:1656 g10/keygen.c:1661
+#: g10/keygen.c:1833 g10/keygen.c:1838
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "lungime cheie invalidă; folosesc %u biţi\n"
 
-#: g10/keygen.c:1609 g10/keygen.c:1666 g10/keygen.c:1674 g10/keygen.c:1843
+#: g10/keygen.c:1610 g10/keygen.c:1667 g10/keygen.c:1675 g10/keygen.c:1844
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "lungime cheie rotunjită la %u biţi\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1701
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1899
+#: g10/keygen.c:1900
 msgid "Sign"
 msgstr "Semnează"
 
-#: g10/keygen.c:1902
+#: g10/keygen.c:1903
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1906
 msgid "Encrypt"
 msgstr "Cifrează"
 
-#: g10/keygen.c:1908
+#: g10/keygen.c:1909
 msgid "Authenticate"
 msgstr "Autentifică"
 
@@ -5451,185 +5464,185 @@ msgstr "Autentifică"
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1929
+#: g10/keygen.c:1930
 msgid "SsEeAaQq"
 msgstr "SsCcAaTt"
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1967
 #, fuzzy, c-format
 #| msgid "Possible actions for a %s key: "
 msgid "Possible actions for this %s key: "
 msgstr "Acţiuni posibile pentru o cheie %s: "
 
-#: g10/keygen.c:1973
+#: g10/keygen.c:1974
 msgid "Current allowed actions: "
 msgstr "Acţiuni permise curent: "
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1979
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Comută capabilitatea de semnare\n"
 
-#: g10/keygen.c:1981
+#: g10/keygen.c:1982
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Comută capabilitatea de cifrare\n"
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1985
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Comută capabilitatea de autentificare\n"
 
-#: g10/keygen.c:1987
+#: g10/keygen.c:1988
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Terminat\n"
 
-#: g10/keygen.c:2116
+#: g10/keygen.c:2117
 #, fuzzy, c-format
 msgid "   (%d) RSA and RSA%s\n"
 msgstr "   (%d) DSA ÅŸi Elgamal (implicit)\n"
 
-#: g10/keygen.c:2120
+#: g10/keygen.c:2121
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal%s\n"
 msgstr "   (%d) DSA ÅŸi Elgamal (implicit)\n"
 
-#: g10/keygen.c:2123
+#: g10/keygen.c:2124
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "   (%d) DSA (sign only)%s\n"
 msgstr "   (%d) DSA (numai semnare)\n"
 
-#: g10/keygen.c:2125
+#: g10/keygen.c:2126
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (sign only)\n"
 msgid "   (%d) RSA (sign only)%s\n"
 msgstr "   (%d) RSA (numai semnare)\n"
 
-#: g10/keygen.c:2131
+#: g10/keygen.c:2132
 #, fuzzy, c-format
 #| msgid "   (%d) Elgamal (encrypt only)\n"
 msgid "   (%d) Elgamal (encrypt only)%s\n"
 msgstr "   (%d) Elgamal (numai cifrare)\n"
 
-#: g10/keygen.c:2133
+#: g10/keygen.c:2134
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (encrypt only)\n"
 msgid "   (%d) RSA (encrypt only)%s\n"
 msgstr "   (%d) RSA (numai cifrare)\n"
 
-#: g10/keygen.c:2139
+#: g10/keygen.c:2140
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (set your own capabilities)\n"
 msgid "   (%d) DSA (set your own capabilities)%s\n"
 msgstr "   (%d) DSA (setează singur capabilităţile)\n"
 
-#: g10/keygen.c:2141
+#: g10/keygen.c:2142
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (set your own capabilities)\n"
 msgid "   (%d) RSA (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (setează singur capabilităţile)\n"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2148
 #, fuzzy, c-format
 #| msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgid "   (%d) ECC (sign and encrypt)%s\n"
 msgstr "   (%d) ElGamal (semnare ÅŸi cifrare)\n"
 
-#: g10/keygen.c:2147 g10/keygen.c:2678
+#: g10/keygen.c:2148 g10/keygen.c:2679
 #, fuzzy
 #| msgid " (default)"
 msgid " *default*"
 msgstr "(implicit)"
 
-#: g10/keygen.c:2148
+#: g10/keygen.c:2149
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "  (%d) ECC (sign only)\n"
 msgstr "   (%d) DSA (numai semnare)\n"
 
-#: g10/keygen.c:2150
+#: g10/keygen.c:2151
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (set your own capabilities)\n"
 msgid "  (%d) ECC (set your own capabilities)%s\n"
 msgstr "   (%d) DSA (setează singur capabilităţile)\n"
 
-#: g10/keygen.c:2152
+#: g10/keygen.c:2153
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (encrypt only)\n"
 msgid "  (%d) ECC (encrypt only)%s\n"
 msgstr "   (%d) RSA (numai cifrare)\n"
 
-#: g10/keygen.c:2156
+#: g10/keygen.c:2157
 #, fuzzy, c-format
 msgid "  (%d) Existing key%s\n"
 msgstr "   (2) Cheie de cifrare\n"
 
-#: g10/keygen.c:2158
+#: g10/keygen.c:2159
 #, fuzzy, c-format
 msgid "  (%d) Existing key from card%s\n"
 msgstr "   (2) Cheie de cifrare\n"
 
-#: g10/keygen.c:2254 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2255 sm/certreqgen-ui.c:203
 #, fuzzy
 msgid "Enter the keygrip: "
 msgstr "Notare semnătură: "
 
-#: g10/keygen.c:2267 sm/certreqgen-ui.c:211 tools/gpg-card.c:2280
+#: g10/keygen.c:2268 sm/certreqgen-ui.c:211 tools/gpg-card.c:2297
 #, c-format
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr ""
 
-#: g10/keygen.c:2269 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2270 sm/certreqgen-ui.c:213
 #, fuzzy
 msgid "No key with this keygrip\n"
 msgstr "Nici o subcheie cu indicele %d\n"
 
-#: g10/keygen.c:2288 g10/keygen.c:2298 g10/keygen.c:3440 g10/keygen.c:3451
+#: g10/keygen.c:2289 g10/keygen.c:2299 g10/keygen.c:3444 g10/keygen.c:3455
 #: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
 #, fuzzy, c-format
 msgid "error reading the card: %s\n"
 msgstr "%s: eroare citire înregistrare liberă: %s\n"
 
-#: g10/keygen.c:2292 g10/keygen.c:3444 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2293 g10/keygen.c:3448 sm/certreqgen-ui.c:234
 #, fuzzy, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "eroare la obţinerea numărului serial: %s\n"
 
-#: g10/keygen.c:2311 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2312 sm/certreqgen-ui.c:246
 #, fuzzy
 msgid "Available keys:\n"
 msgstr "deactivează cheia"
 
-#: g10/keygen.c:2504 g10/keygen.c:2518
+#: g10/keygen.c:2505 g10/keygen.c:2519
 #, fuzzy, c-format
 #| msgid "rounded up to %u bits\n"
 msgid "rounded to %u bits\n"
 msgstr "rotunjită prin adaos la %u biţi\n"
 
-#: g10/keygen.c:2559
+#: g10/keygen.c:2560
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "cheile %s pot avea lungimea între %u şi %u biţi.\n"
 
-#: g10/keygen.c:2567
+#: g10/keygen.c:2568
 #, fuzzy, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Ce lungime de cheie doriţi? (%u) "
 
-#: g10/keygen.c:2584 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2585 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Lungimea cheii necesară este %u biţi\n"
 
-#: g10/keygen.c:2630
+#: g10/keygen.c:2631
 #, fuzzy
 #| msgid "Please select what kind of key you want:\n"
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Selectaţi ce fel de cheie doriţi:\n"
 
-#: g10/keygen.c:2819
+#: g10/keygen.c:2820
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5645,7 +5658,7 @@ msgstr ""
 "      <n>m = cheia expiră în n luni\n"
 "      <n>y = cheia expiră în n ani\n"
 
-#: g10/keygen.c:2830
+#: g10/keygen.c:2831
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5661,38 +5674,38 @@ msgstr ""
 "      <n>m = semnătura expiră în n luni\n"
 "      <n>y = semnătura expiră în n ani\n"
 
-#: g10/keygen.c:2853
+#: g10/keygen.c:2854
 msgid "Key is valid for? (0) "
 msgstr "Cheia este validă pentru? (0) "
 
-#: g10/keygen.c:2858
+#: g10/keygen.c:2859
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Semnătura este validă pentru? (%s) "
 
-#: g10/keygen.c:2871 g10/keygen.c:2896
+#: g10/keygen.c:2875 g10/keygen.c:2900
 msgid "invalid value\n"
 msgstr "valoare invalidă\n"
 
-#: g10/keygen.c:2878
+#: g10/keygen.c:2882
 msgid "Key does not expire at all\n"
 msgstr "Cheia nu expiră deloc\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2883
 msgid "Signature does not expire at all\n"
 msgstr "Semnătura nu expiră deloc\n"
 
-#: g10/keygen.c:2884
+#: g10/keygen.c:2888
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Cheia expiră pe %s\n"
 
-#: g10/keygen.c:2885
+#: g10/keygen.c:2889
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Semnătura expiră pe %s\n"
 
-#: g10/keygen.c:2889
+#: g10/keygen.c:2893
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5700,11 +5713,11 @@ msgstr ""
 "Sistemul d-voastră nu poate afişa date după 2038.\n"
 "Totuşi, acestea vor fi corect mânuite până în 2106.\n"
 
-#: g10/keygen.c:2902
+#: g10/keygen.c:2906
 msgid "Is this correct? (y/N) "
 msgstr "Este aceasta corect? (d/N) "
 
-#: g10/keygen.c:2970
+#: g10/keygen.c:2974
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5715,7 +5728,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2985
+#: g10/keygen.c:2989
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5732,50 +5745,50 @@ msgstr ""
 "    \"Popa Ioan (popică) <popa.ioan@compania.ro>\"\n"
 "\n"
 
-#: g10/keygen.c:3004
+#: g10/keygen.c:3008
 msgid "Real name: "
 msgstr "Nume real: "
 
-#: g10/keygen.c:3013
+#: g10/keygen.c:3017
 msgid "Invalid character in name\n"
 msgstr "Caracter invalid în nume\n"
 
-#: g10/keygen.c:3014
+#: g10/keygen.c:3018
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:3018
+#: g10/keygen.c:3022
 msgid "Name may not start with a digit\n"
 msgstr "Numele nu poate începe cu o cifră\n"
 
-#: g10/keygen.c:3021
+#: g10/keygen.c:3025
 msgid "Name must be at least 5 characters long\n"
 msgstr "Numele trebuie să fie de cel puţin 5 caractere\n"
 
-#: g10/keygen.c:3031
+#: g10/keygen.c:3035
 msgid "Email address: "
 msgstr "Adresă de email: "
 
-#: g10/keygen.c:3037
+#: g10/keygen.c:3041
 msgid "Not a valid email address\n"
 msgstr "Nu este o adresă de email validă\n"
 
-#: g10/keygen.c:3046
+#: g10/keygen.c:3050
 msgid "Comment: "
 msgstr "Comentariu: "
 
-#: g10/keygen.c:3052
+#: g10/keygen.c:3056
 msgid "Invalid character in comment\n"
 msgstr "Caracter invalid în comentariu\n"
 
-#: g10/keygen.c:3088
+#: g10/keygen.c:3092
 #, fuzzy, c-format
 #| msgid "You are using the `%s' character set.\n"
 msgid "You are using the '%s' character set.\n"
 msgstr "Folosiţi setul de caractere `%s'\n"
 
-#: g10/keygen.c:3094
+#: g10/keygen.c:3098
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5786,7 +5799,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3099
+#: g10/keygen.c:3103
 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"
 
@@ -5801,35 +5814,35 @@ msgstr "Vă rugăm nu puneţi adresa de email în numele real sau comentariu\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3124
+#: g10/keygen.c:3128
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoTt"
 
-#: g10/keygen.c:3134
+#: g10/keygen.c:3138
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Schimbă (N)ume, (C)omentariu, (E)mail sau (T)Termină? "
 
-#: g10/keygen.c:3135
+#: g10/keygen.c:3139
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Schimbă (N)ume, (C)omentariu, (E)mail sau (O)K/(T)Termină? "
 
-#: g10/keygen.c:3140
+#: g10/keygen.c:3144
 #, fuzzy
 #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Schimbă (N)ume, (C)omentariu, (E)mail sau (T)Termină? "
 
-#: g10/keygen.c:3141
+#: g10/keygen.c:3145
 #, fuzzy
 #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "Schimbă (N)ume, (C)omentariu, (E)mail sau (O)K/(T)Termină? "
 
-#: g10/keygen.c:3160
+#: g10/keygen.c:3164
 msgid "Please correct the error first\n"
 msgstr "Vă rugăm corectaţi mai întâi eroarea\n"
 
-#: g10/keygen.c:3206
+#: g10/keygen.c:3210
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -5841,18 +5854,18 @@ msgstr ""
 "în timpul generării numerelor prime; aceasta dă o şansă generatorului de\n"
 "numere aleatoare o şansă mai bună de a aduna destulă entropie.\n"
 
-#: g10/keygen.c:3591
+#: g10/keygen.c:3595
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4590 g10/keygen.c:4663 g10/keygen.c:4681 g10/keygen.c:4710
-#: g10/keygen.c:5086 g10/keygen.c:5632 g10/keygen.c:5943 g10/keygen.c:6050
+#: g10/keygen.c:4594 g10/keygen.c:4667 g10/keygen.c:4685 g10/keygen.c:4714
+#: g10/keygen.c:5113 g10/keygen.c:5663 g10/keygen.c:5974 g10/keygen.c:6081
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generarea cheii a eÅŸuat: %s\n"
 
-#: g10/keygen.c:4599
+#: g10/keygen.c:4603
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5860,72 +5873,72 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:4601
+#: g10/keygen.c:4605
 msgid "Continue? (Y/n) "
 msgstr ""
 
-#: g10/keygen.c:4622
+#: g10/keygen.c:4626
 #, fuzzy, c-format
 #| msgid "key already exists\n"
 msgid "A key for \"%s\" already exists\n"
 msgstr "cheia există deja\n"
 
-#: g10/keygen.c:4627
+#: g10/keygen.c:4631
 #, fuzzy
 #| msgid "Create anyway? "
 msgid "Create anyway? (y/N) "
 msgstr "Creaţi oricum? "
 
-#: g10/keygen.c:4633
+#: g10/keygen.c:4637
 #, fuzzy, c-format
 #| msgid "Create anyway? "
 msgid "creating anyway\n"
 msgstr "Creaţi oricum? "
 
-#: g10/keygen.c:5069
+#: g10/keygen.c:5096
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 
-#: g10/keygen.c:5118
+#: g10/keygen.c:5145
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Generarea cheii a fost anulată.\n"
 
-#: g10/keygen.c:5178
+#: g10/keygen.c:5205
 #, fuzzy, c-format
 #| msgid "can't create backup file `%s': %s\n"
 msgid "can't create backup file '%s': %s\n"
 msgstr "nu pot crea fişier de rezervă `%s': %s\n"
 
-#: g10/keygen.c:5198
+#: g10/keygen.c:5225
 #, fuzzy, c-format
 #| msgid "NOTE: backup of card key saved to `%s'\n"
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "NOTĂ: copia de siguranţa a cheii cardului salvată la `%s'\n"
 
-#: g10/keygen.c:5359 g10/keygen.c:5561
+#: g10/keygen.c:5389 g10/keygen.c:5591
 #, fuzzy, c-format
 #| msgid "writing public key to `%s'\n"
 msgid "writing public key to '%s'\n"
 msgstr "scriu cheia publică în `%s'\n"
 
-#: g10/keygen.c:5555
+#: g10/keygen.c:5585
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "nu am găsit nici un inel de chei public de scris: %s\n"
 
-#: g10/keygen.c:5569
+#: g10/keygen.c:5599
 #, fuzzy, c-format
 #| msgid "error writing public keyring `%s': %s\n"
 msgid "error writing public keyring '%s': %s\n"
 msgstr "eroare la scrierea inelului de chei public `%s': %s\n"
 
-#: g10/keygen.c:5603
+#: g10/keygen.c:5634
 msgid "public and secret key created and signed.\n"
 msgstr "cheile secretă şi publică au fost create şi semnate.\n"
 
-#: g10/keygen.c:5619
+#: g10/keygen.c:5650
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -5935,7 +5948,7 @@ msgstr ""
 "să folosiţi comanda \"--edit-key\" pentru a genera o subcheie secundară\n"
 "pentru acest scop.\n"
 
-#: g10/keygen.c:5801 g10/keygen.c:6000
+#: g10/keygen.c:5832 g10/keygen.c:6031
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5943,7 +5956,7 @@ msgstr ""
 "cheia a fost creată %lu secundă în viitor (warp în timp sau probleme cu "
 "ceasul)\n"
 
-#: g10/keygen.c:5803 g10/keygen.c:6002
+#: g10/keygen.c:5834 g10/keygen.c:6033
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5951,23 +5964,23 @@ msgstr ""
 "cheia a fost creată %lu secunde în viitor (warp în timp sau probleme cu "
 "ceasul)\n"
 
-#: g10/keygen.c:5814 g10/keygen.c:6013
+#: g10/keygen.c:5845 g10/keygen.c:6044
 #, fuzzy, c-format
 #| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOTÄ‚: crearea de subchei pentru chei v3 nu este conform OpenPGP\n"
 
-#: g10/keygen.c:5826 g10/keygen.c:5828
+#: g10/keygen.c:5857 g10/keygen.c:5859
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Părţile secrete ale cheii primare nu sunt disponibile.\n"
 
-#: g10/keygen.c:5835 g10/keygen.c:5837
+#: g10/keygen.c:5866 g10/keygen.c:5868
 #, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Părţi secrete ale cheii primare sunt stacate pe card.\n"
 
-#: g10/keygen.c:5857 g10/keygen.c:6027
+#: g10/keygen.c:5888 g10/keygen.c:6058
 msgid "Really create? (y/N) "
 msgstr "Creaţi într-adevăr? (d/N) "
 
@@ -6048,13 +6061,13 @@ msgstr "      Amprentă cheie ="
 msgid "      Card serial no. ="
 msgstr "      Card nr. serie ="
 
-#: g10/keyring.c:1467
+#: g10/keyring.c:1477
 #, fuzzy, c-format
 #| msgid "caching keyring `%s'\n"
 msgid "caching keyring '%s'\n"
 msgstr "pun în cache inelul de chei `%s'\n"
 
-#: g10/keyring.c:1541
+#: g10/keyring.c:1551
 #, fuzzy, c-format
 #| msgid "%lu keys cached so far (%lu signatures)\n"
 msgid "%lu keys cached so far (%lu signature)\n"
@@ -6062,14 +6075,14 @@ msgid_plural "%lu keys cached so far (%lu signatures)\n"
 msgstr[0] "%lu chei puse în cache până acum (%lu semnături)\n"
 msgstr[1] "%lu chei puse în cache până acum (%lu semnături)\n"
 
-#: g10/keyring.c:1557
+#: g10/keyring.c:1567
 #, c-format
 msgid "%lu key cached"
 msgid_plural "%lu keys cached"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/keyring.c:1559
+#: g10/keyring.c:1569
 #, fuzzy, c-format
 #| msgid "1 bad signature\n"
 msgid " (%lu signature)\n"
@@ -6077,7 +6090,7 @@ msgid_plural " (%lu signatures)\n"
 msgstr[0] "1 semnătură incorectă\n"
 msgstr[1] "1 semnătură incorectă\n"
 
-#: g10/keyring.c:1636
+#: g10/keyring.c:1646
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: inelul de chei creat\n"
@@ -6107,25 +6120,25 @@ msgstr ""
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "Introduceţi URL-ul serverului de chei preferat: "
 
-#: g10/keyserver.c:537
+#: g10/keyserver.c:360
 msgid "disabled"
 msgstr "deactivat(ă)"
 
-#: g10/keyserver.c:740
+#: g10/keyserver.c:563
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Introduceţi număr/numere, N)ext (următor), sau Q)uit (termină) > "
 
-#: g10/keyserver.c:846
+#: g10/keyserver.c:669
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "protocol server de chei invalid (us %d!=handler %d)\n"
 
-#: g10/keyserver.c:986 g10/keyserver.c:1096
+#: g10/keyserver.c:809 g10/keyserver.c:919
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" nu este un ID de cheie: sărit\n"
 
-#: g10/keyserver.c:1420 g10/keyserver.c:1453
+#: g10/keyserver.c:1217 g10/keyserver.c:1250
 #, fuzzy, c-format
 #| msgid "refreshing %d keys from %s\n"
 msgid "refreshing %d key from %s\n"
@@ -6133,54 +6146,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:1427
+#: g10/keyserver.c:1224
 #, 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:1531
+#: g10/keyserver.c:1316
 #, 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:1534
+#: g10/keyserver.c:1319
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "cheia nu a fost găsită pe serverul de chei\n"
 
-#: g10/keyserver.c:1722
-#, c-format
-msgid "requesting key %s from %s server %s\n"
-msgstr "cer cheia %s de la serverul %s %s\n"
-
-#: g10/keyserver.c:1726
+#: g10/keyserver.c:1481
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "cer cheia %s de la %s\n"
 
-#: g10/keyserver.c:1841 g10/keyserver.c:2020
+#: g10/keyserver.c:1600 g10/keyserver.c:1793
 #, 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:1856 g10/skclist.c:213 g10/skclist.c:241
+#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "sărită \"%s\": %s\n"
 
-#: g10/keyserver.c:1860
+#: g10/keyserver.c:1619
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "trimit cheia %s lui %s\n"
 
-#: g10/keyserver.c:1901
+#: g10/keyserver.c:1662
 #, 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:1917
+#: g10/keyserver.c:1680
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVERTISMENT: nu pot reactualiza cheia %s via %s: %s\n"
@@ -6207,255 +6215,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:472
+#: g10/mainproc.c:473
 #, c-format
 msgid "public key is %s\n"
 msgstr "cheia publică este %s\n"
 
-#: g10/mainproc.c:524
+#: g10/mainproc.c:525
 #, 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:528 g10/pkclist.c:231
+#: g10/mainproc.c:529 g10/pkclist.c:231
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:532
+#: g10/mainproc.c:533
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrat cu cheia %s, ID %s\n"
 
-#: g10/mainproc.c:552 g10/mainproc.c:935
+#: g10/mainproc.c:553 g10/mainproc.c:937
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:560
+#: g10/mainproc.c:561
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "cifrată cu %lu fraze-parolă\n"
 
-#: g10/mainproc.c:562
+#: g10/mainproc.c:563
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "cifrată cu 1 frază-parolă\n"
 
-#: g10/mainproc.c:577 g10/mainproc.c:602
+#: g10/mainproc.c:578 g10/mainproc.c:603
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decriptarea cu cheie publică a eşuat: %s\n"
 
-#: g10/mainproc.c:613
+#: g10/mainproc.c:614
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "date cigrate cu cheie publică: DEK bun\n"
 
-#: g10/mainproc.c:642 g10/mainproc.c:663
+#: g10/mainproc.c:643 g10/mainproc.c:664
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "presupunem date cifrate %s\n"
 
-#: g10/mainproc.c:649
+#: g10/mainproc.c:650
 #, 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:742 g10/mainproc.c:780
+#: g10/mainproc.c:744 g10/mainproc.c:782
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVERTISMENT: mesajul nu a avut integritatea protejată\n"
 
-#: g10/mainproc.c:753
+#: g10/mainproc.c:755
 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:756
+#: g10/mainproc.c:758
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:761
+#: g10/mainproc.c:763
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "decriptarea a eÅŸuat: %s\n"
 
-#: g10/mainproc.c:773
+#: g10/mainproc.c:775
 #, c-format
 msgid "decryption okay\n"
 msgstr "decriptare OK\n"
 
-#: g10/mainproc.c:786
+#: g10/mainproc.c:788
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVERTISMENT: mesajul cifrat a fost manipulat!\n"
 
-#: g10/mainproc.c:804
+#: g10/mainproc.c:806
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decriptarea a eÅŸuat: %s\n"
 
-#: g10/mainproc.c:851
+#: g10/mainproc.c:853
 #, 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:858
+#: g10/mainproc.c:860
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nume fiÅŸier original='%.*s'\n"
 
-#: g10/mainproc.c:1135
+#: g10/mainproc.c:1137
 #, 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:1440 g10/mainproc.c:1483
+#: g10/mainproc.c:1442 g10/mainproc.c:1485
 #, fuzzy, c-format
 msgid "no signature found\n"
 msgstr "Semnătură bună din \"%s\""
 
-#: g10/mainproc.c:1763
+#: g10/mainproc.c:1765
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Semnătură INCORECTĂ din \"%s\""
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1767
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Semnătură expirată din \"%s\""
 
-#: g10/mainproc.c:1767
+#: g10/mainproc.c:1769
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Semnătură bună din \"%s\""
 
-#: g10/mainproc.c:1789
+#: g10/mainproc.c:1791
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "verificare semnătură eliminată\n"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1905
 #, 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:1919 g10/mainproc.c:1926
+#: g10/mainproc.c:1921 g10/mainproc.c:1928
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Semnătură făcută %s\n"
 
-#: g10/mainproc.c:1920 g10/mainproc.c:1927 sm/verify.c:480
+#: g10/mainproc.c:1922 g10/mainproc.c:1929 sm/verify.c:480
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               folosind cheia %s %s\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1933
 #, 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:1937
+#: g10/mainproc.c:1939
 #, fuzzy, c-format
 #| msgid "                aka \"%s\""
 msgid "               issuer \"%s\"\n"
 msgstr "                aka \"%s\""
 
-#: g10/mainproc.c:1992
+#: g10/mainproc.c:1994
 #, c-format
 msgid "Key available at: "
 msgstr "Cheie disponibilă la: "
 
-#: g10/mainproc.c:2034
+#: g10/mainproc.c:2036
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2234
+#: g10/mainproc.c:2236
 msgid "[uncertain]"
 msgstr "[nesigur]"
 
-#: g10/mainproc.c:2272
+#: g10/mainproc.c:2274
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                aka \"%s\""
 
-#: g10/mainproc.c:2347
+#: g10/mainproc.c:2349
 #, 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:2363
+#: g10/mainproc.c:2365
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Semnătură expirată %s\n"
 
-#: g10/mainproc.c:2368
+#: g10/mainproc.c:2370
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Semnătura expiră %s\n"
 
-#: g10/mainproc.c:2379
+#: g10/mainproc.c:2381
 #, 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:2380
+#: g10/mainproc.c:2382
 msgid "binary"
 msgstr "binar"
 
-#: g10/mainproc.c:2381
+#: g10/mainproc.c:2383
 msgid "textmode"
 msgstr "modtext"
 
-#: g10/mainproc.c:2381 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2383 g10/trust.c:112 dirmngr/ocsp.c:793
 msgid "unknown"
 msgstr "necunoscut"
 
-#: g10/mainproc.c:2383
+#: g10/mainproc.c:2385
 #, fuzzy
 #| msgid "unknown pubkey algorithm"
 msgid ", key algorithm "
 msgstr "algoritm pubkey necunoscut"
 
-#: g10/mainproc.c:2418
+#: g10/mainproc.c:2420
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2457
+#: g10/mainproc.c:2459
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nu pot verifica semnătura: %s\n"
 
-#: g10/mainproc.c:2553 g10/mainproc.c:2572 g10/mainproc.c:2696
+#: g10/mainproc.c:2555 g10/mainproc.c:2574 g10/mainproc.c:2698
 #, c-format
 msgid "not a detached signature\n"
 msgstr "nu o semnătură detaşată\n"
 
-#: g10/mainproc.c:2606
+#: g10/mainproc.c:2608
 #, 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:2615
+#: g10/mainproc.c:2617
 #, 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:2700
+#: g10/mainproc.c:2702
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "semnătură de stil vechi (PGP 2.x)\n"
@@ -6647,57 +6655,62 @@ msgstr "Notare semnătură critică: "
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpachetul de tip %d are bitul critic setat\n"
 
-#: g10/passphrase.c:208
+#: g10/passphrase.c:201 sm/decrypt.c:669
+#, fuzzy
+msgid "Please enter the passphrase for decryption."
+msgstr "schimbă fraza-parolă"
+
+#: g10/passphrase.c:203
 msgid "Enter passphrase\n"
 msgstr "Introduceţi fraza-parolă\n"
 
-#: g10/passphrase.c:219
+#: g10/passphrase.c:227
 #, c-format
 msgid "cancelled by user\n"
 msgstr "anulată de utilizator\n"
 
-#: g10/passphrase.c:460
+#: g10/passphrase.c:472
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (ID cheie principală %s)"
 
-#: g10/passphrase.c:467
+#: g10/passphrase.c:479
 #, fuzzy
 msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 msgstr ""
 "Vă rugăm introduceţi fraza-parolă; aceasta este o propoziţie secretă \n"
 
-#: g10/passphrase.c:471
+#: g10/passphrase.c:483
 #, fuzzy
 msgid "Please enter the passphrase to import the OpenPGP secret key:"
 msgstr ""
 "Vă rugăm introduceţi fraza-parolă; aceasta este o propoziţie secretă \n"
 
-#: g10/passphrase.c:476
+#: g10/passphrase.c:488
 #, fuzzy
 msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 msgstr ""
 "Vă rugăm introduceţi fraza-parolă; aceasta este o propoziţie secretă \n"
 
-#: g10/passphrase.c:479
+#: g10/passphrase.c:491
 #, fuzzy
 msgid "Please enter the passphrase to export the OpenPGP secret key:"
 msgstr ""
 "Vă rugăm introduceţi fraza-parolă; aceasta este o propoziţie secretă \n"
 
-#: g10/passphrase.c:484
+#: g10/passphrase.c:496
 #, fuzzy
 #| msgid "Do you really want to delete the selected keys? (y/N) "
 msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 msgstr "Doriţi într-adevăr să ştergeţi cheile selectate? (d/N) "
 
-#: g10/passphrase.c:487
+#: g10/passphrase.c:499
 #, fuzzy
 #| msgid "Do you really want to delete the selected keys? (y/N) "
 msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgstr "Doriţi într-adevăr să ştergeţi cheile selectate? (d/N) "
 
-#: g10/passphrase.c:496
+#: g10/passphrase.c:508
 #, fuzzy, c-format
 #| msgid "%u-bit %s key, ID %s, created %s"
 msgid ""
@@ -6872,7 +6885,7 @@ msgstr ""
 "Nivelul minim de încredere pentru această cheie este: %s\n"
 "\n"
 
-#: g10/pkclist.c:313 g10/revoke.c:803
+#: g10/pkclist.c:313 g10/revoke.c:804
 msgid "Your decision? "
 msgstr "Decizia d-voastră? "
 
@@ -7181,7 +7194,7 @@ msgstr "nu pot deschide date semnate `%s'\n"
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "nu pot deschide date semnate `%s'\n"
 
-#: g10/pubkey-enc.c:99 sm/decrypt.c:879
+#: g10/pubkey-enc.c:99 sm/decrypt.c:1329
 #, fuzzy, c-format
 msgid "key %s is not suitable for decryption in %s mode\n"
 msgstr "cheia %s nu are nici un ID utilizator\n"
@@ -7231,7 +7244,7 @@ msgid "Note: key has been revoked"
 msgstr "NOTĂ: cheia a fost revocată"
 
 #: g10/revoke.c:100 g10/revoke.c:126 g10/revoke.c:172 g10/revoke.c:184
-#: g10/revoke.c:502
+#: g10/revoke.c:503
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet a eÅŸuat: %s\n"
@@ -7259,11 +7272,11 @@ msgstr "Cheia secretă este disponibilă.\n"
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Creaţi un certificat de revocare desemnat pentru această cheie? (d/N) "
 
-#: g10/revoke.c:334 g10/revoke.c:744
+#: g10/revoke.c:334 g10/revoke.c:745
 msgid "ASCII armored output forced.\n"
 msgstr "Ieşire în armură ASCII forţată.\n"
 
-#: g10/revoke.c:350 g10/revoke.c:481
+#: g10/revoke.c:350 g10/revoke.c:482
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet a eÅŸuat: %s\n"
@@ -7277,20 +7290,20 @@ msgstr "Certificat de revocare creat.\n"
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "nici o cheie de revocare găsită pentru \"%s\"\n"
 
-#: g10/revoke.c:567
+#: g10/revoke.c:568
 #, fuzzy
 #| msgid "Create a revocation certificate for this key? (y/N) "
 msgid "This is a revocation certificate for the OpenPGP key:"
 msgstr "Creaţi un certificat de revocare pentru această cheie? (d/N) "
 
-#: g10/revoke.c:583
+#: g10/revoke.c:584
 msgid ""
 "A revocation certificate is a kind of \"kill switch\" to publicly\n"
 "declare that a key shall not anymore be used.  It is not possible\n"
 "to retract such a revocation certificate once it has been published."
 msgstr ""
 
-#: g10/revoke.c:586
+#: g10/revoke.c:587
 msgid ""
 "Use it to revoke this key in case of a compromise or loss of\n"
 "the secret key.  However, if the secret key is still accessible,\n"
@@ -7299,20 +7312,20 @@ msgid ""
 "of the gpg command \"--generate-revocation\" in the GnuPG manual."
 msgstr ""
 
-#: g10/revoke.c:592
+#: g10/revoke.c:593
 msgid ""
 "To avoid an accidental use of this file, a colon has been inserted\n"
 "before the 5 dashes below.  Remove this colon with a text editor\n"
 "before importing and publishing this revocation certificate."
 msgstr ""
 
-#: g10/revoke.c:611
+#: g10/revoke.c:612
 #, fuzzy, c-format
 #| msgid "Revocation certificate created.\n"
 msgid "revocation certificate stored as '%s.rev'\n"
 msgstr "Certificat de revocare creat.\n"
 
-#: g10/revoke.c:655
+#: g10/revoke.c:656
 #, fuzzy, c-format
 #| msgid "secret key \"%s\" not found: %s\n"
 msgid "secret key \"%s\" not found\n"
@@ -7321,22 +7334,22 @@ msgstr "cheia secretă \"%s\" nu a fost găsită: %s\n"
 #. TRANSLATORS: The %s prints a key specification which
 #. for example has been given at the command line.  Several lines
 #. lines with secret key infos are printed after this message.
-#: g10/revoke.c:680
+#: g10/revoke.c:681
 #, c-format
 msgid "'%s' matches multiple secret keys:\n"
 msgstr ""
 
-#: g10/revoke.c:705
+#: g10/revoke.c:706
 #, fuzzy, c-format
 #| msgid "error creating keyring `%s': %s\n"
 msgid "error searching the keyring: %s\n"
 msgstr "eroare la crearea inelului de chei `%s': %s\n"
 
-#: g10/revoke.c:728
+#: g10/revoke.c:729
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Creaţi un certificat de revocare pentru această cheie? (d/N) "
 
-#: g10/revoke.c:752
+#: g10/revoke.c:753
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -7354,33 +7367,33 @@ msgstr ""
 "caz că mediumul este deteriorat.  Dar fiţi atent: sistemul de tipărire al\n"
 "maşinii d-voastră ar putea păstra datele şi să le facă accesibile altora!\n"
 
-#: g10/revoke.c:786
+#: g10/revoke.c:787
 msgid "Please select the reason for the revocation:\n"
 msgstr "Vă rugăm selectaţi motivul pentru revocare:\n"
 
-#: g10/revoke.c:796
+#: g10/revoke.c:797
 msgid "Cancel"
 msgstr "Renunţă"
 
-#: g10/revoke.c:798
+#: g10/revoke.c:799
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Probabil doriţi să selectaţi %d aici)\n"
 
-#: g10/revoke.c:839
+#: g10/revoke.c:843
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Introduceţi o descriere opţională; terminaţi cu o linie goală:\n"
 
-#: g10/revoke.c:867
+#: g10/revoke.c:871
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Motiv pentru revocare: %s\n"
 
-#: g10/revoke.c:869
+#: g10/revoke.c:873
 msgid "(No description given)\n"
 msgstr "(Nici o descriere dată)\n"
 
-#: g10/revoke.c:874
+#: g10/revoke.c:878
 msgid "Is this okay? (y/N) "
 msgstr "Este aceasta OK? (d/N) "
 
@@ -7566,22 +7579,22 @@ msgstr "semnare:"
 msgid "%s.%s encryption will be used\n"
 msgstr "va fi folosită cifrarea %s\n"
 
-#: g10/skclist.c:172 g10/skclist.c:253
+#: g10/skclist.c:173 g10/skclist.c:254
 #, c-format
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr "cheia nu este marcată ca sigură - nu o pot folosi cu GNA falsificat!\n"
 
-#: g10/skclist.c:204
+#: g10/skclist.c:205
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "sărită \"%s\": duplicată\n"
 
-#: g10/skclist.c:223
+#: g10/skclist.c:224
 #, c-format
 msgid "skipped: secret key already present\n"
 msgstr "sărită: cheia secretă deja prezentă\n"
 
-#: g10/skclist.c:242
+#: g10/skclist.c:243
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "aceasta este o cheie ElGamal generată de PGP care nu e sigură pentru "
@@ -7812,10 +7825,10 @@ msgstr ""
 msgid "TOFU DB error"
 msgstr ""
 
-#: g10/tofu.c:687 g10/tofu.c:2073 g10/tofu.c:2354 g10/tofu.c:2373
-#: g10/tofu.c:2386 g10/tofu.c:2398 g10/tofu.c:2413 g10/tofu.c:2425
-#: g10/tofu.c:3021 g10/tofu.c:3038 g10/tofu.c:3075 g10/tofu.c:3092
-#: g10/tofu.c:3404
+#: g10/tofu.c:687 g10/tofu.c:2077 g10/tofu.c:2358 g10/tofu.c:2377
+#: g10/tofu.c:2390 g10/tofu.c:2402 g10/tofu.c:2417 g10/tofu.c:2429
+#: g10/tofu.c:3025 g10/tofu.c:3042 g10/tofu.c:3079 g10/tofu.c:3096
+#: g10/tofu.c:3408
 #, fuzzy, c-format
 msgid "error reading TOFU database: %s\n"
 msgstr "eroare trimitere la `%s': %s\n"
@@ -7837,7 +7850,7 @@ msgstr "%s: eroare scriere înregistrare dir: %s\n"
 msgid "error opening TOFU database '%s': %s\n"
 msgstr "eroare în `%s': %s\n"
 
-#: g10/tofu.c:1148 g10/tofu.c:3458 g10/tofu.c:3604
+#: g10/tofu.c:1148 g10/tofu.c:3462 g10/tofu.c:3608
 #, fuzzy, c-format
 msgid "error updating TOFU database: %s\n"
 msgstr "eroare trimitere la `%s': %s\n"
@@ -7878,43 +7891,43 @@ msgstr "eroare la obţinere noului PIN: %s\n"
 msgid "This key's user IDs:\n"
 msgstr "enumeră chei şi ID-uri utilizator"
 
-#: g10/tofu.c:1634 g10/tofu.c:1799
+#: g10/tofu.c:1634 g10/tofu.c:1801
 #, fuzzy, c-format
 #| msgid "Policy: "
 msgid "policy: %s"
 msgstr "Politica: "
 
-#: g10/tofu.c:1725
+#: g10/tofu.c:1727
 #, fuzzy, c-format
 msgid "error gathering signature stats: %s\n"
 msgstr "eroare la obţinere noului PIN: %s\n"
 
-#: g10/tofu.c:1729
+#: g10/tofu.c:1731
 #, c-format
 msgid "The email address \"%s\" is associated with %d key:\n"
 msgid_plural "The email address \"%s\" is associated with %d keys:\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1747
+#: g10/tofu.c:1749
 #, c-format
 msgid "Statistics for keys with the email address \"%s\":\n"
 msgstr ""
 
-#: g10/tofu.c:1797
+#: g10/tofu.c:1799
 #, fuzzy
 #| msgid "list keys"
 msgid "this key"
 msgstr "enumeră chei"
 
-#: g10/tofu.c:1823
+#: g10/tofu.c:1825
 #, fuzzy, c-format
 msgid "Verified %d message."
 msgid_plural "Verified %d messages."
 msgstr[0] "|algo [fişiere]|afişează rezumate mesaje"
 msgstr[1] "|algo [fişiere]|afişează rezumate mesaje"
 
-#: g10/tofu.c:1827
+#: g10/tofu.c:1829
 #, fuzzy, c-format
 #| msgid "encrypted with %lu passphrases\n"
 msgid "Encrypted %d message."
@@ -7922,68 +7935,68 @@ msgid_plural "Encrypted %d messages."
 msgstr[0] "cifrată cu %lu fraze-parolă\n"
 msgstr[1] "cifrată cu %lu fraze-parolă\n"
 
-#: g10/tofu.c:1834
+#: g10/tofu.c:1836
 #, fuzzy, c-format
 msgid "Verified %d message in the future."
 msgid_plural "Verified %d messages in the future."
 msgstr[0] "|algo [fişiere]|afişează rezumate mesaje"
 msgstr[1] "|algo [fişiere]|afişează rezumate mesaje"
 
-#: g10/tofu.c:1838
+#: g10/tofu.c:1840
 #, fuzzy, c-format
 msgid "Encrypted %d message in the future."
 msgid_plural "Encrypted %d messages in the future."
 msgstr[0] "|algo [fişiere]|afişează rezumate mesaje"
 msgstr[1] "|algo [fişiere]|afişează rezumate mesaje"
 
-#: g10/tofu.c:1852
+#: g10/tofu.c:1854
 #, c-format
 msgid "Messages verified over the past %d day: %d."
 msgid_plural "Messages verified over the past %d days: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1858
+#: g10/tofu.c:1860
 #, c-format
 msgid "Messages encrypted over the past %d day: %d."
 msgid_plural "Messages encrypted over the past %d days: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1868
+#: g10/tofu.c:1870
 #, c-format
 msgid "Messages verified over the past %d month: %d."
 msgid_plural "Messages verified over the past %d months: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1874
+#: g10/tofu.c:1876
 #, c-format
 msgid "Messages encrypted over the past %d month: %d."
 msgid_plural "Messages encrypted over the past %d months: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1884
+#: g10/tofu.c:1886
 #, c-format
 msgid "Messages verified over the past %d year: %d."
 msgid_plural "Messages verified over the past %d years: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1890
+#: g10/tofu.c:1892
 #, c-format
 msgid "Messages encrypted over the past %d year: %d."
 msgid_plural "Messages encrypted over the past %d years: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1898
+#: g10/tofu.c:1900
 #, c-format
 msgid "Messages verified in the past: %d."
 msgstr ""
 
-#: g10/tofu.c:1902
+#: g10/tofu.c:1904
 #, fuzzy, c-format
 msgid "Messages encrypted in the past: %d."
 msgstr "|algo [fişiere]|afişează rezumate mesaje"
@@ -7991,130 +8004,130 @@ msgstr "|algo [fişiere]|afişează rezumate mesaje"
 #. TRANSLATORS: Please translate the text found in the source
 #. * file below.  We don't directly internationalize that text so
 #. * that we can tweak it without breaking translations.
-#: g10/tofu.c:1919
+#: g10/tofu.c:1921
 msgid "TOFU detected a binding conflict"
 msgstr ""
 
 #. TRANSLATORS: Two letters (normally the lower and upper case
 #. * version of the hotkey) for each of the five choices.  If
 #. * there is only one choice in your language, repeat it.
-#: g10/tofu.c:1961
+#: g10/tofu.c:1963
 msgid "gGaAuUrRbB"
 msgstr ""
 
-#: g10/tofu.c:1967
+#: g10/tofu.c:1969
 msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 
-#: g10/tofu.c:1975
+#: g10/tofu.c:1978
 msgid "Defaulting to unknown.\n"
 msgstr ""
 
-#: g10/tofu.c:2093 g10/tofu.c:2228
+#: g10/tofu.c:2097 g10/tofu.c:2232
 #, c-format
 msgid "TOFU db corruption detected.\n"
 msgstr ""
 
-#: g10/tofu.c:2829
+#: g10/tofu.c:2833
 #, fuzzy, c-format
 msgid "error changing TOFU policy: %s\n"
 msgstr "eroare la crearea frazei-parolă: %s\n"
 
-#: g10/tofu.c:2880
+#: g10/tofu.c:2884
 #, c-format
 msgid "%lld~year"
 msgid_plural "%lld~years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2885
+#: g10/tofu.c:2889
 #, c-format
 msgid "%lld~month"
 msgid_plural "%lld~months"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2890
+#: g10/tofu.c:2894
 #, c-format
 msgid "%lld~week"
 msgid_plural "%lld~weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2895
+#: g10/tofu.c:2899
 #, c-format
 msgid "%lld~day"
 msgid_plural "%lld~days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2900
+#: g10/tofu.c:2904
 #, c-format
 msgid "%lld~hour"
 msgid_plural "%lld~hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2905
+#: g10/tofu.c:2909
 #, c-format
 msgid "%lld~minute"
 msgid_plural "%lld~minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2907
+#: g10/tofu.c:2911
 #, c-format
 msgid "%lld~second"
 msgid_plural "%lld~seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:3145
+#: g10/tofu.c:3149
 #, c-format
 msgid "%s: Verified 0~signatures and encrypted 0~messages."
 msgstr ""
 
-#: g10/tofu.c:3151
+#: g10/tofu.c:3155
 #, fuzzy, c-format
 #| msgid "Deleted %d signatures.\n"
 msgid "%s: Verified 0 signatures."
 msgstr "Am şters %d semnături.\n"
 
-#: g10/tofu.c:3165
+#: g10/tofu.c:3169
 #, fuzzy
 #| msgid "encrypted with %lu passphrases\n"
 msgid "Encrypted 0 messages."
 msgstr "cifrată cu %lu fraze-parolă\n"
 
-#: g10/tofu.c:3181
+#: g10/tofu.c:3185
 #, fuzzy, c-format
 #| msgid "Policy: "
 msgid "(policy: %s)"
 msgstr "Politica: "
 
-#: g10/tofu.c:3215
+#: g10/tofu.c:3219
 #, c-format
 msgid ""
 "Warning: we have yet to see a message signed using this key and user id!\n"
 msgstr ""
 
-#: g10/tofu.c:3218
+#: g10/tofu.c:3222
 #, c-format
 msgid ""
 "Warning: we've only seen one message signed using this key and user id!\n"
 msgstr ""
 
-#: g10/tofu.c:3222
+#: g10/tofu.c:3226
 #, c-format
 msgid "Warning: you have yet to encrypt a message to this key!\n"
 msgstr ""
 
-#: g10/tofu.c:3225
+#: g10/tofu.c:3229
 #, c-format
 msgid "Warning: you have only encrypted one message to this key!\n"
 msgstr ""
 
-#: g10/tofu.c:3254
+#: g10/tofu.c:3258
 #, c-format
 msgid ""
 "Warning: if you think you've seen more signatures by this key and user id, "
@@ -8131,13 +8144,13 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:3339 g10/tofu.c:3502 g10/tofu.c:3708 g10/tofu.c:3761
-#: g10/tofu.c:3902 g10/tofu.c:3979 g10/tofu.c:4017
+#: g10/tofu.c:3343 g10/tofu.c:3506 g10/tofu.c:3712 g10/tofu.c:3765
+#: g10/tofu.c:3906 g10/tofu.c:3983 g10/tofu.c:4021
 #, fuzzy, c-format
 msgid "error opening TOFU database: %s\n"
 msgstr "eroare trimitere la `%s': %s\n"
 
-#: g10/tofu.c:3535
+#: g10/tofu.c:3539
 #, c-format
 msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
 msgstr ""
@@ -8204,7 +8217,7 @@ msgstr "folosesc model de încredere %s\n"
 msgid "no need for a trustdb check\n"
 msgstr "nu e nevoie de o verificare trustdb\n"
 
-#: g10/trustdb.c:601 g10/trustdb.c:2272
+#: g10/trustdb.c:601 g10/trustdb.c:2273
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "următoarea verificare trustdb programată pe %s\n"
@@ -8236,7 +8249,7 @@ msgstr "vă rugăm faceţi un --check-trustdb\n"
 msgid "checking the trustdb\n"
 msgstr "verific trustdb\n"
 
-#: g10/trustdb.c:1993
+#: g10/trustdb.c:1994
 #, fuzzy, c-format
 #| msgid "%lu keys processed so far\n"
 msgid "%d key processed"
@@ -8244,7 +8257,7 @@ msgid_plural "%d keys processed"
 msgstr[0] "%lu chei procesate până acum\n"
 msgstr[1] "%lu chei procesate până acum\n"
 
-#: g10/trustdb.c:1996
+#: g10/trustdb.c:1997
 #, fuzzy, c-format
 #| msgid "%d keys processed (%d validity counts cleared)\n"
 msgid " (%d validity count cleared)\n"
@@ -8252,46 +8265,46 @@ msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] "%d chei procesate (%d numărători valide anulate)\n"
 msgstr[1] "%d chei procesate (%d numărători valide anulate)\n"
 
-#: g10/trustdb.c:2066
+#: g10/trustdb.c:2067
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "nu am găsit nici o cheie cu încredere supremă\n"
 
-#: g10/trustdb.c:2080
+#: g10/trustdb.c:2081
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "cheia publică a cheii cu încredere supremă %s nu a fost găsită\n"
 
-#: g10/trustdb.c:2198
+#: g10/trustdb.c:2199
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 "adânc: %d  valid: %3d  semnat: %3d  încredere: %d-, %dq, %dn, %dm, %df, %du\n"
 
-#: g10/trustdb.c:2279
+#: g10/trustdb.c:2280
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
 "nu pot actualiza înregistrare versiunii trustdb: scrierea a eşuat: %s\n"
 
-#: g10/trust.c:125
+#: g10/trust.c:114
 msgid "undefined"
 msgstr "nedefinită"
 
-#: g10/trust.c:126
+#: g10/trust.c:115
 msgid "never"
 msgstr "niciodată"
 
-#: g10/trust.c:127
+#: g10/trust.c:116
 msgid "marginal"
 msgstr "marginal"
 
-#: g10/trust.c:128
+#: g10/trust.c:117
 msgid "full"
 msgstr "deplină"
 
-#: g10/trust.c:129
+#: g10/trust.c:118
 msgid "ultimate"
 msgstr "supremă"
 
@@ -8303,43 +8316,43 @@ msgstr "supremă"
 #. It gets passed to atoi() so everything after the number is
 #. essentially a comment and need not be translated.  Either key and
 #. uid are both NULL, or neither are NULL.
-#: g10/trust.c:166
+#: g10/trust.c:155
 #, fuzzy
 #| msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgid "10 translator see trust.c:uid_trust_string_fixed"
 msgstr "10 traducător vezi trustdb.c:uid_trust_string_fixed"
 
-#: g10/trust.c:169
+#: g10/trust.c:158
 msgid "[ revoked]"
 msgstr "[revocată]"
 
-#: g10/trust.c:171 g10/trust.c:177
+#: g10/trust.c:160 g10/trust.c:166
 msgid "[ expired]"
 msgstr "[expirată] "
 
-#: g10/trust.c:176
+#: g10/trust.c:165
 msgid "[ unknown]"
 msgstr "[necunoscută]"
 
-#: g10/trust.c:178
+#: g10/trust.c:167
 msgid "[  undef ]"
 msgstr "[  nedef ]"
 
-#: g10/trust.c:179
+#: g10/trust.c:168
 #, fuzzy
 #| msgid "never"
 msgid "[  never ]"
 msgstr "niciodată"
 
-#: g10/trust.c:180
+#: g10/trust.c:169
 msgid "[marginal]"
 msgstr "[marginal]"
 
-#: g10/trust.c:181
+#: g10/trust.c:170
 msgid "[  full  ]"
 msgstr "[ deplină]"
 
-#: g10/trust.c:182
+#: g10/trust.c:171
 msgid "[ultimate]"
 msgstr "[ supremă]"
 
@@ -8399,16 +8412,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:4937 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2386
+#: scd/app-piv.c:1770 scd/app-p15.c:5035 scd/app-nks.c:1530
+#: scd/app-openpgp.c:2387
 #, 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:4956 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2402
+#: scd/app-piv.c:1787 scd/app-p15.c:5054 scd/app-nks.c:1549
+#: scd/app-openpgp.c:2403
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
@@ -8443,10 +8456,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:2669
-#: scd/app-openpgp.c:2693 scd/app-openpgp.c:2871 scd/app-openpgp.c:2893
-#: scd/app-openpgp.c:3074 scd/app-openpgp.c:3361 scd/app-openpgp.c:3408
-#: scd/app-openpgp.c:3545 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2670
+#: scd/app-openpgp.c:2694 scd/app-openpgp.c:2872 scd/app-openpgp.c:2894
+#: scd/app-openpgp.c:3075 scd/app-openpgp.c:3362 scd/app-openpgp.c:3409
+#: scd/app-openpgp.c:3547 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "apelul PIN a returnat eroare: %s\n"
@@ -8468,58 +8481,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:3616
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3618
 #, c-format
 msgid "key already exists\n"
 msgstr "cheia există deja\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3620
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3622
 #, 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:3622
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3624
 #, c-format
 msgid "generating new key\n"
 msgstr "generez o nouă cheie\n"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3624
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3626
 #, fuzzy, c-format
 msgid "writing new key\n"
 msgstr "generez o nouă cheie\n"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4484 scd/app-openpgp.c:4767
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4486 scd/app-openpgp.c:4761
 #, 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:1615
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1616
 #, 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:1622
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1623
 #, 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:1732
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1733
 #, 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:4943
+#: scd/app-piv.c:3279 scd/app-openpgp.c:4937
 #, 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:4951
+#: scd/app-piv.c:3294 scd/app-openpgp.c:4945
 #, c-format
 msgid "generating key failed\n"
 msgstr "generarea cheii a eÅŸuat\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4957
+#: scd/app-piv.c:3300 scd/app-openpgp.c:4951
 #, fuzzy, c-format
 #| msgid "key generation completed (%d seconds)\n"
 msgid "key generation completed (%d second)\n"
@@ -8527,38 +8540,38 @@ 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:1842 scd/app-openpgp.c:4966
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1843 scd/app-openpgp.c:4960
 #, 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:5035 scd/app-nks.c:2038
+#: scd/app-p15.c:5133 scd/app-nks.c:2038
 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:5038 scd/app-openpgp.c:2818
+#: scd/app-p15.c:5136 scd/app-openpgp.c:2819
 #, 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:5040 scd/app-nks.c:2028
+#: scd/app-p15.c:5138 scd/app-nks.c:2028
 #, 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:5043 scd/app-nks.c:2019
+#: scd/app-p15.c:5141 scd/app-nks.c:2019
 #, 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:4321
+#: scd/app-nks.c:1468 scd/app-openpgp.c:4323
 #, 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:4333
+#: scd/app-nks.c:1476 scd/app-openpgp.c:4335
 #, 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"
@@ -8600,27 +8613,27 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3442 scd/app-dinsig.c:534
+#: scd/app-nks.c:2221 scd/app-openpgp.c:3443 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:943
+#: scd/app-openpgp.c:944
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "am eşuat să stochez amprenta: %s\n"
 
-#: scd/app-openpgp.c:956
+#: scd/app-openpgp.c:957
 #, 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:1427 scd/app-openpgp.c:3389 scd/app-openpgp.c:5715
+#: scd/app-openpgp.c:1428 scd/app-openpgp.c:3390 scd/app-openpgp.c:5709
 #, 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:1949
+#: scd/app-openpgp.c:1950
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "citirea cheii publice a eÅŸuat: %s\n"
@@ -8628,43 +8641,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:2373
+#: scd/app-openpgp.c:2374
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2621
+#: scd/app-openpgp.c:2622
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2628
+#: scd/app-openpgp.c:2629
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2641
+#: scd/app-openpgp.c:2642
 #, fuzzy
 msgid "||Please unlock the card"
 msgstr "||Vă rugăm introduceţi PIN%%0A[semnături făcute: %lu]"
 
-#: scd/app-openpgp.c:2700 scd/app-openpgp.c:2900 scd/app-openpgp.c:3368
+#: scd/app-openpgp.c:2701 scd/app-openpgp.c:2901 scd/app-openpgp.c:3369
 #, 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:2717 scd/app-openpgp.c:2760 scd/app-openpgp.c:2917
-#: scd/app-openpgp.c:5325
+#: scd/app-openpgp.c:2718 scd/app-openpgp.c:2761 scd/app-openpgp.c:2918
+#: scd/app-openpgp.c:5319
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "verificarea CHV%d a eÅŸuat: %s\n"
 
-#: scd/app-openpgp.c:2804 scd/app-openpgp.c:5724
+#: scd/app-openpgp.c:2805 scd/app-openpgp.c:5718
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "cardul este încuiat permanent!\n"
 
-#: scd/app-openpgp.c:2808
+#: scd/app-openpgp.c:2809
 #, 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"
@@ -8675,22 +8688,22 @@ msgstr[0] ""
 msgstr[1] ""
 "%d încercări PIN Admin rămase înainte de a încuia cardul permanent\n"
 
-#: scd/app-openpgp.c:2841
+#: scd/app-openpgp.c:2842
 #, 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:3355
+#: scd/app-openpgp.c:3356
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "||Vă rugăm introduceţi PIN%%0A[semnături făcute: %lu]"
 
-#: scd/app-openpgp.c:3404
+#: scd/app-openpgp.c:3405
 #, 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:3414 scd/app-openpgp.c:3481
+#: scd/app-openpgp.c:3415 scd/app-openpgp.c:3484
 #, 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"
@@ -8698,82 +8711,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:3437
+#: scd/app-openpgp.c:3438
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3439
 msgid "|AN|New Admin PIN"
 msgstr "|AN|PIN Admin Nou"
 
-#: scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3439
 msgid "|N|New PIN"
 msgstr "|N|PIN Nou"
 
-#: scd/app-openpgp.c:3541
+#: scd/app-openpgp.c:3543
 #, 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:3542
+#: scd/app-openpgp.c:3544
 #, 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:3600 scd/app-openpgp.c:5026
+#: scd/app-openpgp.c:3602 scd/app-openpgp.c:5020
 #, c-format
 msgid "error reading application data\n"
 msgstr "eroare la citirea datelor aplicaţiei\n"
 
-#: scd/app-openpgp.c:3606 scd/app-openpgp.c:5033
+#: scd/app-openpgp.c:3608 scd/app-openpgp.c:5027
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "eroare la citirea amprentei DO\n"
 
-#: scd/app-openpgp.c:4302 scd/app-openpgp.c:4657
+#: scd/app-openpgp.c:4304 scd/app-openpgp.c:4653
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "timestamp-ul de creare lipseÅŸte\n"
 
-#: scd/app-openpgp.c:4343 scd/app-openpgp.c:4351
+#: scd/app-openpgp.c:4345 scd/app-openpgp.c:4353
 #, 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:4651
+#: scd/app-openpgp.c:4647
 #, fuzzy, c-format
 #| msgid "unsupported URI"
 msgid "unsupported curve\n"
 msgstr "URI nesuportat"
 
-#: scd/app-openpgp.c:4991
+#: scd/app-openpgp.c:4985
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "structură invalidă a cardului OpenPGP (DO 0x93)\n"
 
-#: scd/app-openpgp.c:5041
+#: scd/app-openpgp.c:5035
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5240
+#: scd/app-openpgp.c:5234
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "semnătură %s, algoritm rezumat %s\n"
 
-#: scd/app-openpgp.c:5298
+#: scd/app-openpgp.c:5292
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "semnături create până acum: %lu\n"
 
-#: scd/app-openpgp.c:5729
+#: scd/app-openpgp.c:5723
 #, 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:6241 scd/app-openpgp.c:6252
+#: scd/app-openpgp.c:6250 scd/app-openpgp.c:6261
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nu pot accesa %s - card OpenPGP invalid?\n"
@@ -8795,7 +8808,7 @@ msgstr "|N|PIN Nou"
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:274 dirmngr/dirmngr.c:198
+#: scd/scdaemon.c:136 sm/gpgsm.c:274 dirmngr/dirmngr.c:199
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
@@ -8860,12 +8873,12 @@ msgstr ""
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2104
+#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2143
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2112
+#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2151
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -8875,11 +8888,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:199 sm/certchain.c:2172
+#: sm/certchain.c:199 sm/certchain.c:2174
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:200 sm/certchain.c:2172
+#: sm/certchain.c:200 sm/certchain.c:2174
 #, fuzzy
 msgid "shell"
 msgstr "ajutor"
@@ -8913,231 +8926,231 @@ msgstr "exportul cheilor secrete nu este permis\n"
 msgid "certificate policy not allowed"
 msgstr "exportul cheilor secrete nu este permis\n"
 
-#: sm/certchain.c:595 sm/keydb.c:1891 sm/keydb.c:1980
+#: sm/certchain.c:596 sm/keydb.c:1913 sm/keydb.c:2002
 #, fuzzy, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "am eşuat să stochez amprenta: %s\n"
 
-#: sm/certchain.c:624
+#: sm/certchain.c:625
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:644
+#: sm/certchain.c:645
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#: sm/certchain.c:724 dirmngr/ocsp.c:683
 #, fuzzy, c-format
 #| msgid "%s: can't access: %s\n"
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "%s: nu pot accesa: %s\n"
 
-#: sm/certchain.c:791
+#: sm/certchain.c:792
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr ""
 
-#: sm/certchain.c:816
+#: sm/certchain.c:817
 #, fuzzy, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "eroare la obţinerea numărului serial: %s\n"
 
-#: sm/certchain.c:819
+#: sm/certchain.c:820
 #, fuzzy, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "citirea cheii publice a eÅŸuat: %s\n"
 
-#: sm/certchain.c:1046 sm/certchain.c:1561 sm/certchain.c:2200 sm/decrypt.c:643
-#: sm/encrypt.c:620 sm/import.c:414 sm/keydb.c:1898 sm/keydb.c:1987
-#: sm/sign.c:428 sm/verify.c:117
+#: sm/certchain.c:1047 sm/certchain.c:1562 sm/certchain.c:2202
+#: sm/decrypt.c:1084 sm/encrypt.c:621 sm/import.c:414 sm/keydb.c:1920
+#: sm/keydb.c:2009 sm/sign.c:428 sm/verify.c:117
 #, fuzzy, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "am eşuat să stochez cheia: %s\n"
 
-#: sm/certchain.c:1232
+#: sm/certchain.c:1233
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "NOTĂ: cheia a fost revocată"
 
-#: sm/certchain.c:1247
+#: sm/certchain.c:1248
 msgid "the status of the certificate is unknown"
 msgstr ""
 
-#: sm/certchain.c:1254
+#: sm/certchain.c:1255
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:1260
+#: sm/certchain.c:1261
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "verificarea semnăturii create a eşuat: %s\n"
 
-#: sm/certchain.c:1289 sm/certchain.c:1357 dirmngr/validate.c:497
+#: sm/certchain.c:1290 sm/certchain.c:1358 dirmngr/validate.c:497
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:1304 sm/certchain.c:1389 dirmngr/validate.c:515
+#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:515
 #, c-format
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1305 sm/certchain.c:1390
+#: sm/certchain.c:1306 sm/certchain.c:1391
 #, fuzzy
 msgid "root certificate not yet valid"
 msgstr "exportul cheilor secrete nu este permis\n"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1307 sm/certchain.c:1392
 msgid "intermediate certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1319 dirmngr/validate.c:526
+#: sm/certchain.c:1320 dirmngr/validate.c:526
 #, fuzzy, c-format
 msgid "certificate has expired"
 msgstr "Această cheie a expirat!"
 
-#: sm/certchain.c:1320
+#: sm/certchain.c:1321
 #, fuzzy
 msgid "root certificate has expired"
 msgstr "Această cheie a expirat!"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1322
 #, fuzzy
 msgid "intermediate certificate has expired"
 msgstr "Această cheie a expirat!"
 
-#: sm/certchain.c:1363
+#: sm/certchain.c:1364
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:1372
+#: sm/certchain.c:1373
 #, fuzzy
 msgid "certificate with invalid validity"
 msgstr "Această cheie a expirat!"
 
-#: sm/certchain.c:1409
+#: sm/certchain.c:1410
 msgid "signature not created during lifetime of certificate"
 msgstr ""
 
-#: sm/certchain.c:1411
+#: sm/certchain.c:1412
 msgid "certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1413
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1416
+#: sm/certchain.c:1417
 #, fuzzy, c-format
 msgid "  (  signature created at "
 msgstr "semnături create până acum: %lu\n"
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1418
 #, fuzzy, c-format
 msgid "  (certificate created at "
 msgstr "Certificat de revocare creat.\n"
 
-#: sm/certchain.c:1420
+#: sm/certchain.c:1421
 #, fuzzy, c-format
 msgid "  (certificate valid from "
 msgstr "certificat incorect"
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1422
 #, fuzzy, c-format
 msgid "  (     issuer valid from "
 msgstr "      Card nr. serie ="
 
-#: sm/certchain.c:1451 dirmngr/validate.c:577
+#: sm/certchain.c:1452 dirmngr/validate.c:577
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "Amprenta CA: "
 
-#: sm/certchain.c:1460
+#: sm/certchain.c:1461
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:1473
+#: sm/certchain.c:1474
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1479
+#: sm/certchain.c:1480
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1538
+#: sm/certchain.c:1539
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 
-#: sm/certchain.c:1602
+#: sm/certchain.c:1603
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "generează un certificat de revocare"
 
-#: sm/certchain.c:1680
+#: sm/certchain.c:1681
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1749 dirmngr/validate.c:575
+#: sm/certchain.c:1750 dirmngr/validate.c:575
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:1765
+#: sm/certchain.c:1766
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "verificarea semnăturii create a eşuat: %s\n"
 
-#: sm/certchain.c:1796 sm/import.c:175 dirmngr/validate.c:630
+#: sm/certchain.c:1797 sm/import.c:175 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1808 dirmngr/validate.c:642
+#: sm/certchain.c:1809 dirmngr/validate.c:642
 #, c-format
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1842 dirmngr/validate.c:668
+#: sm/certchain.c:1844 dirmngr/validate.c:668
 #, fuzzy, c-format
 msgid "certificate has a BAD signature"
 msgstr "verifică o semnătură"
 
-#: sm/certchain.c:1874 dirmngr/validate.c:692
+#: sm/certchain.c:1876 dirmngr/validate.c:692
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1933 dirmngr/validate.c:717
+#: sm/certchain.c:1935 dirmngr/validate.c:717
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1975 sm/certchain.c:2275 dirmngr/validate.c:747
+#: sm/certchain.c:1977 sm/certchain.c:2278 dirmngr/validate.c:747
 #, fuzzy, c-format
 msgid "certificate is good\n"
 msgstr "preferinţa `%s' duplicată\n"
 
-#: sm/certchain.c:1976
+#: sm/certchain.c:1978
 #, fuzzy, c-format
 msgid "intermediate certificate is good\n"
 msgstr "Certificat de revocare creat.\n"
 
-#: sm/certchain.c:1977
+#: sm/certchain.c:1979
 #, fuzzy, c-format
 msgid "root certificate is good\n"
 msgstr "certificat incorect"
 
-#: sm/certchain.c:2159
+#: sm/certchain.c:2161
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:2168
+#: sm/certchain.c:2170
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -9148,18 +9161,18 @@ 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:1372 dirmngr/validate.c:903
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1411 dirmngr/validate.c:903
 #: dirmngr/validate.c:927
 #, fuzzy, c-format
 msgid "out of core\n"
 msgstr "neforţat(ă)"
 
-#: sm/certcheck.c:389 sm/verify.c:212
+#: sm/certcheck.c:388 sm/verify.c:212
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:793
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:794
 #, fuzzy
 msgid "none"
 msgstr "nu"
@@ -9460,17 +9473,17 @@ msgstr ""
 msgid "resource problem: out of core\n"
 msgstr ""
 
-#: sm/decrypt.c:719
+#: sm/decrypt.c:1159
 #, c-format
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
 
-#: sm/decrypt.c:721
+#: sm/decrypt.c:1161
 #, c-format
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr ""
 
-#: sm/decrypt.c:868
+#: sm/decrypt.c:1318
 #, fuzzy, c-format
 #| msgid "encrypted with %s key, ID %s\n"
 msgid "encrypted to %s key %s\n"
@@ -9481,7 +9494,7 @@ msgstr "cifrat cu cheia %s, ID %s\n"
 msgid "certificate '%s' not found: %s\n"
 msgstr "cheia secretă \"%s\" nu a fost găsită: %s\n"
 
-#: sm/delete.c:120 sm/keydb.c:1999 sm/keydb.c:2098
+#: sm/delete.c:120 sm/keydb.c:2021 sm/keydb.c:2120
 #, fuzzy, c-format
 msgid "error locking keybox: %s\n"
 msgstr "eroare la citire keyblock: %s\n"
@@ -9501,7 +9514,7 @@ msgstr "preferinţa `%s' duplicată\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "stergere keyblock a eÅŸuat: %s\n"
 
-#: sm/encrypt.c:606
+#: sm/encrypt.c:607
 #, fuzzy, c-format
 msgid "no valid recipients given\n"
 msgstr "(Nici o descriere dată)\n"
@@ -9578,68 +9591,68 @@ msgstr "|NUME|foloseşte NUME ca cheie secretă implicită"
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "adaugă acest inel de chei la lista inelelor de chei"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:352 dirmngr/dirmngr.c:265
 #, fuzzy
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|HOST|foloseşte acest server de chei pentru a căuta chei"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:363
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:364
+#: sm/gpgsm.c:365
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NUME|foloseşte algoritm cifrare NUME pentru fraza-parolă"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:386
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:389
+#: sm/gpgsm.c:390
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: sm/gpgsm.c:393
+#: sm/gpgsm.c:394
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:396
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:398
+#: sm/gpgsm.c:399
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NUME|foloseÅŸte algoritm cifrare NUME"
 
-#: sm/gpgsm.c:400
+#: sm/gpgsm.c:401
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NUME|foloseÅŸte algoritm rezumat mesaj NUME"
 
-#: sm/gpgsm.c:410
+#: sm/gpgsm.c:411
 msgid "batch mode: never ask"
 msgstr "modul batch: nu întreba niciodată"
 
-#: sm/gpgsm.c:412
+#: sm/gpgsm.c:413
 msgid "assume yes on most questions"
 msgstr "presupune da la cele mai multe întrebări"
 
-#: sm/gpgsm.c:413
+#: sm/gpgsm.c:414
 msgid "assume no on most questions"
 msgstr "presupune nu la cele mai multe întrebări"
 
-#: sm/gpgsm.c:430
+#: sm/gpgsm.c:431
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FIŞIER|încarcă modulul extensie FIŞIER"
 
-#: sm/gpgsm.c:615
+#: sm/gpgsm.c:616
 #, 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:618
+#: sm/gpgsm.c:619
 #, fuzzy
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
@@ -9650,53 +9663,27 @@ msgstr ""
 "sign, check, encrypt sau decrypt\n"
 "operaţiunea implicită depinde de datele de intrare\n"
 
-#: sm/gpgsm.c:826
+#: sm/gpgsm.c:827
 #, 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:837
+#: sm/gpgsm.c:838
 #, fuzzy, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "opţiune necunoscută `%s'\n"
 
-#: sm/gpgsm.c:896 dirmngr/ldapserver.c:89
-#, fuzzy, c-format
-msgid "%s:%u: no hostname given\n"
-msgstr "(Nici o descriere dată)\n"
-
-#: sm/gpgsm.c:915 dirmngr/ldapserver.c:108
-#, c-format
-msgid "%s:%u: password given without user\n"
-msgstr ""
-
-#: sm/gpgsm.c:946 dirmngr/ldapserver.c:139
-#, c-format
-msgid "%s:%u: ignoring unknown flag '%s'\n"
-msgstr ""
-
-#: sm/gpgsm.c:962 dirmngr/ldapserver.c:155
-#, fuzzy, c-format
-msgid "%s:%u: skipping this line\n"
-msgstr "  s = sări peste cheia asta\n"
-
-#
-#: sm/gpgsm.c:1550
-#, fuzzy, c-format
-msgid "could not parse keyserver\n"
-msgstr "nu am putut interpreta URL-ul serverului de chei\n"
-
-#: sm/gpgsm.c:1858
+#: sm/gpgsm.c:1711
 #, fuzzy, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "eroare la obţinerea numărului serial: %s\n"
 
-#: sm/gpgsm.c:1904
+#: sm/gpgsm.c:1757
 #, fuzzy, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "nu pot accesa `%s': %s\n"
 
-#: sm/gpgsm.c:2273
+#: sm/gpgsm.c:2129
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
@@ -9716,52 +9703,52 @@ msgstr "generează un certificat de revocare"
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:471 sm/keydb.c:2018 sm/keydb.c:2111
+#: sm/import.c:472 sm/keydb.c:2040 sm/keydb.c:2133
 #, fuzzy, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "eroare la obţinere noului PIN: %s\n"
 
-#: sm/import.c:530 sm/import.c:562
+#: sm/import.c:531 sm/import.c:563
 #, fuzzy, c-format
 msgid "error importing certificate: %s\n"
 msgstr "eroare la obţinerea numărului serial: %s\n"
 
-#: sm/import.c:751 tools/gpg-connect-agent.c:1475
+#: sm/import.c:752 tools/gpg-connect-agent.c:1475
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: sm/keydb.c:503
+#: sm/keydb.c:508
 #, fuzzy, c-format
 msgid "no keyboxd running in this session\n"
 msgstr "gpg-agent nu este disponibil în această sesiune\n"
 
-#: sm/keydb.c:595
+#: sm/keydb.c:600
 #, fuzzy, c-format
 msgid "error opening key DB: %s\n"
 msgstr "eroare în `%s': %s\n"
 
-#: sm/keydb.c:1936
+#: sm/keydb.c:1958
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1948
+#: sm/keydb.c:1970
 #, fuzzy, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "eroare la obţinerea numărului serial: %s\n"
 
-#: sm/keydb.c:1956
+#: sm/keydb.c:1978
 #, fuzzy, c-format
 msgid "error storing certificate: %s\n"
 msgstr "eroare la obţinerea numărului serial: %s\n"
 
-#: sm/keydb.c:2009
+#: sm/keydb.c:2031
 #, fuzzy, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "rev? probleme la verificare revocării: %s\n"
 
-#: sm/keydb.c:2030 sm/keydb.c:2122
+#: sm/keydb.c:2052 sm/keydb.c:2144
 #, fuzzy, c-format
 msgid "error storing flags: %s\n"
 msgstr "eroare la citire `%s': %s\n"
@@ -9932,58 +9919,58 @@ msgstr ""
 msgid "error loading certificate '%s': %s\n"
 msgstr "eroare la obţinerea numărului serial: %s\n"
 
-#: dirmngr/certcache.c:819
+#: dirmngr/certcache.c:820
 #, fuzzy, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "certificat incorect"
 
-#: dirmngr/certcache.c:821
+#: dirmngr/certcache.c:822
 #, fuzzy, c-format
 msgid "    runtime cached certificates: %u\n"
 msgstr "eroare la obţinerea numărului serial: %s\n"
 
-#: dirmngr/certcache.c:823
+#: dirmngr/certcache.c:824
 #, fuzzy, c-format
 msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "eroare la obţinerea numărului serial: %s\n"
 
-#: dirmngr/certcache.c:851 dirmngr/dirmngr-client.c:392
+#: dirmngr/certcache.c:852 dirmngr/dirmngr-client.c:392
 #, fuzzy, c-format
 msgid "certificate already cached\n"
 msgstr "Certificat de revocare creat.\n"
 
-#: dirmngr/certcache.c:853
+#: dirmngr/certcache.c:854
 #, fuzzy, c-format
 msgid "certificate cached\n"
 msgstr "preferinţa `%s' duplicată\n"
 
-#: dirmngr/certcache.c:855 dirmngr/certcache.c:875 dirmngr/dirmngr-client.c:396
+#: dirmngr/certcache.c:856 dirmngr/certcache.c:876 dirmngr/dirmngr-client.c:396
 #, fuzzy, c-format
 msgid "error caching certificate: %s\n"
 msgstr "eroare la obţinerea numărului serial: %s\n"
 
-#: dirmngr/certcache.c:938
+#: dirmngr/certcache.c:939
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "amprentă invalidă"
 
-#: dirmngr/certcache.c:1384 dirmngr/certcache.c:1393
+#: dirmngr/certcache.c:1385 dirmngr/certcache.c:1394
 #, fuzzy, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "eroare la obţinerea numărului serial: %s\n"
 
-#: dirmngr/certcache.c:1579 dirmngr/certcache.c:1588
+#: dirmngr/certcache.c:1580 dirmngr/certcache.c:1589
 #, fuzzy, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "eroare la obţinerea numărului serial: %s\n"
 
-#: dirmngr/certcache.c:1694 dirmngr/validate.c:483
+#: dirmngr/certcache.c:1695 dirmngr/validate.c:483
 #, fuzzy, c-format
 msgid "no issuer found in certificate\n"
 msgstr "generează un certificat de revocare"
 
-#: dirmngr/certcache.c:1704
+#: dirmngr/certcache.c:1705
 #, fuzzy, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "eroare la obţinere noului PIN: %s\n"
@@ -10020,7 +10007,7 @@ msgstr "citirea cheii publice a eÅŸuat: %s\n"
 msgid "not removing file '%s'\n"
 msgstr "punerea armurii a eÅŸuat: %s\n"
 
-#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2380
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2383
 #, fuzzy, c-format
 msgid "error closing cache file: %s\n"
 msgstr "eroare în `%s': %s\n"
@@ -10258,14 +10245,14 @@ msgid "error getting data from cache file: %s\n"
 msgstr "eroare la obţinere noului PIN: %s\n"
 
 #: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1672 dirmngr/crlcache.c:1697
-#: dirmngr/crlcache.c:1763
+#: dirmngr/crlcache.c:1766
 #, fuzzy, c-format
 #| msgid "invalid response from agent\n"
 msgid "got an invalid S-expression from libksba\n"
 msgstr "răspuns invalid de la agent\n"
 
 #: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1679 dirmngr/crlcache.c:1705
-#: dirmngr/crlcache.c:1770 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1773 dirmngr/misc.c:176
 #, fuzzy, c-format
 msgid "converting S-expression failed: %s\n"
 msgstr "nu pot deschide fiÅŸierul: %s\n"
@@ -10281,168 +10268,168 @@ msgstr "algoritm hash invalid `%s'\n"
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1797 dirmngr/ocsp.c:478
+#: dirmngr/crlcache.c:1800 dirmngr/ocsp.c:478
 #, fuzzy, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "citirea cheii publice a eÅŸuat: %s\n"
 
-#: dirmngr/crlcache.c:1871
+#: dirmngr/crlcache.c:1874
 #, fuzzy, c-format
 #| msgid "build_packet failed: %s\n"
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "build_packet a eÅŸuat: %s\n"
 
-#: dirmngr/crlcache.c:1886
+#: dirmngr/crlcache.c:1889
 #, fuzzy, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "eroare la obţinerea numărului serial: %s\n"
 
-#: dirmngr/crlcache.c:1893
+#: dirmngr/crlcache.c:1896
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1897
+#: dirmngr/crlcache.c:1900
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1917
+#: dirmngr/crlcache.c:1920
 #, fuzzy, c-format
 #| msgid "error getting new PIN: %s\n"
 msgid "error getting CRL item: %s\n"
 msgstr "eroare la obţinere noului PIN: %s\n"
 
-#: dirmngr/crlcache.c:1932
+#: dirmngr/crlcache.c:1935
 #, fuzzy, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "%s: eroare scriere înregistrare dir: %s\n"
 
-#: dirmngr/crlcache.c:1959
+#: dirmngr/crlcache.c:1962
 #, fuzzy, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "generează un certificat de revocare"
 
-#: dirmngr/crlcache.c:1974
+#: dirmngr/crlcache.c:1977
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2020
+#: dirmngr/crlcache.c:2023
 #, fuzzy, c-format
 #| msgid "signature verification suppressed\n"
 msgid "CRL signature verification failed: %s\n"
 msgstr "verificare semnătură eliminată\n"
 
-#: dirmngr/crlcache.c:2032
+#: dirmngr/crlcache.c:2035
 #, fuzzy, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "verificarea semnăturii create a eşuat: %s\n"
 
-#: dirmngr/crlcache.c:2174
+#: dirmngr/crlcache.c:2177
 #, fuzzy, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "stergere keyblock a eÅŸuat: %s\n"
 
-#: dirmngr/crlcache.c:2181
+#: dirmngr/crlcache.c:2184
 #, fuzzy, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "actualizarea a eÅŸuat: %s\n"
 
-#: dirmngr/crlcache.c:2215
+#: dirmngr/crlcache.c:2218
 #, fuzzy, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "nu pot crea directorul `%s': %s\n"
 
-#: dirmngr/crlcache.c:2219
+#: dirmngr/crlcache.c:2222
 #, fuzzy, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "nu pot crea directorul `%s': %s\n"
 
-#: dirmngr/crlcache.c:2229
+#: dirmngr/crlcache.c:2232
 #, fuzzy, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "eroare la crearea frazei-parolă: %s\n"
 
-#: dirmngr/crlcache.c:2239
+#: dirmngr/crlcache.c:2242
 #, fuzzy, c-format
 #| msgid "update secret failed: %s\n"
 msgid "crl_parse_insert failed: %s\n"
 msgstr "actualizarea secretului a eÅŸuat: %s\n"
 
-#: dirmngr/crlcache.c:2249
+#: dirmngr/crlcache.c:2252
 #, fuzzy, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "%s: eroare scriere înregistrare dir: %s\n"
 
-#: dirmngr/crlcache.c:2256
+#: dirmngr/crlcache.c:2259
 #, fuzzy, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "eroare la crearea frazei-parolă: %s\n"
 
-#: dirmngr/crlcache.c:2281
+#: dirmngr/crlcache.c:2284
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2285
+#: dirmngr/crlcache.c:2288
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2301
+#: dirmngr/crlcache.c:2304
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2311
+#: dirmngr/crlcache.c:2314
 #, fuzzy, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2365
 #, fuzzy, c-format
 msgid "creating cache file '%s'\n"
 msgstr "eroare la crearea frazei-parolă: %s\n"
 
-#: dirmngr/crlcache.c:2394
+#: dirmngr/crlcache.c:2397
 #, fuzzy, c-format
 #| msgid "renaming `%s' to `%s' failed: %s\n"
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "redenumirea `%s' ca `%s' a eÅŸuat: %s\n"
 
-#: dirmngr/crlcache.c:2408
+#: dirmngr/crlcache.c:2411
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
 "program start\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2448
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2468
+#: dirmngr/crlcache.c:2471
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2471
+#: dirmngr/crlcache.c:2474
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2474
+#: dirmngr/crlcache.c:2477
 msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2481
+#: dirmngr/crlcache.c:2484
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2499
+#: dirmngr/crlcache.c:2502
 #, fuzzy, c-format
 #| msgid "WARNING: invalid size of random_seed file - not used\n"
 msgid " WARNING: invalid cache record length\n"
@@ -10450,36 +10437,36 @@ msgstr ""
 "AVERTISMENT: dimensiune invalidă pentru fişierul random_seed - nu va fi "
 "folosită\n"
 
-#: dirmngr/crlcache.c:2506
+#: dirmngr/crlcache.c:2509
 #, fuzzy, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "%s: eroare citire înregistrare liberă: %s\n"
 
-#: dirmngr/crlcache.c:2517
+#: dirmngr/crlcache.c:2520
 #, fuzzy, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "rev? probleme la verificare revocării: %s\n"
 
-#: dirmngr/crlcache.c:2548
+#: dirmngr/crlcache.c:2551
 #, fuzzy, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: dirmngr/crlcache.c:2551
+#: dirmngr/crlcache.c:2554
 msgid "End CRL dump\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2672
+#: dirmngr/crlcache.c:2675
 #, fuzzy, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "actualizarea a eÅŸuat: %s\n"
 
-#: dirmngr/crlcache.c:2683
+#: dirmngr/crlcache.c:2686
 #, fuzzy, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "verificarea semnăturii create a eşuat: %s\n"
 
-#: dirmngr/crlcache.c:2743
+#: dirmngr/crlcache.c:2746
 #, fuzzy, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "citirea cheii publice a eÅŸuat: %s\n"
@@ -10500,7 +10487,7 @@ msgstr ""
 msgid "error retrieving '%s': %s\n"
 msgstr "eroare la creearea `%s': %s\n"
 
-#: dirmngr/crlfetch.c:218 dirmngr/ldap-wrapper.c:881 dirmngr/misc.c:573
+#: dirmngr/crlfetch.c:218 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
 #, fuzzy, c-format
 #| msgid "%s: error writing dir record: %s\n"
 msgid "error initializing reader object: %s\n"
@@ -10669,137 +10656,137 @@ msgstr ""
 msgid "looking up '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:175
+#: dirmngr/dirmngr.c:176
 msgid "list the contents of the CRL cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:176
+#: dirmngr/dirmngr.c:177
 #, fuzzy
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|FIŞIER|încarcă modulul extensie FIŞIER"
 
-#: dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr.c:178
 msgid "|URL|fetch a CRL from URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:178
+#: dirmngr/dirmngr.c:179
 msgid "shutdown the dirmngr"
 msgstr ""
 
-#: dirmngr/dirmngr.c:179
+#: dirmngr/dirmngr.c:180
 msgid "flush the cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:213
 msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:215
+#: dirmngr/dirmngr.c:216
 msgid "|N|do not return more than N items in one query"
 msgstr ""
 
-#: dirmngr/dirmngr.c:221
+#: dirmngr/dirmngr.c:222
 msgid "Network related options"
 msgstr ""
 
-#: dirmngr/dirmngr.c:223
+#: dirmngr/dirmngr.c:224
 msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:235
+#: dirmngr/dirmngr.c:236
 msgid "Configuration for Keyservers"
 msgstr ""
 
 #
-#: dirmngr/dirmngr.c:238
+#: dirmngr/dirmngr.c:239
 #, fuzzy
 msgid "|URL|use keyserver at URL"
 msgstr "nu am putut interpreta URL-ul serverului de chei\n"
 
-#: dirmngr/dirmngr.c:240
+#: dirmngr/dirmngr.c:241
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-#: dirmngr/dirmngr.c:242
+#: dirmngr/dirmngr.c:243
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:244
+#: dirmngr/dirmngr.c:245
 msgid "inhibit the use of HTTP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:246
+#: dirmngr/dirmngr.c:247
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:248
+#: dirmngr/dirmngr.c:249
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:250
+#: dirmngr/dirmngr.c:251
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: dirmngr/dirmngr.c:254
+#: dirmngr/dirmngr.c:255
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: dirmngr/dirmngr.c:256
+#: dirmngr/dirmngr.c:257
 msgid "inhibit the use of LDAP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:258
+#: dirmngr/dirmngr.c:259
 msgid "ignore LDAP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:260
+#: dirmngr/dirmngr.c:261
 msgid "|HOST|use HOST for LDAP queries"
 msgstr ""
 
-#: dirmngr/dirmngr.c:262
+#: dirmngr/dirmngr.c:263
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr ""
 
-#: dirmngr/dirmngr.c:264
+#: dirmngr/dirmngr.c:267
 #, fuzzy
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FIŞIER|încarcă modulul extensie FIŞIER"
 
-#: dirmngr/dirmngr.c:266
+#: dirmngr/dirmngr.c:269
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 
-#: dirmngr/dirmngr.c:269 dirmngr/dirmngr_ldap.c:104
+#: dirmngr/dirmngr.c:272
 msgid "|N|set LDAP timeout to N seconds"
 msgstr ""
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:275
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:274
+#: dirmngr/dirmngr.c:277
 msgid "allow sending OCSP requests"
 msgstr ""
 
-#: dirmngr/dirmngr.c:276
+#: dirmngr/dirmngr.c:279
 msgid "ignore certificate contained OCSP service URLs"
 msgstr ""
 
 #
-#: dirmngr/dirmngr.c:278
+#: dirmngr/dirmngr.c:281
 #, fuzzy
 msgid "|URL|use OCSP responder at URL"
 msgstr "nu am putut interpreta URL-ul serverului de chei\n"
 
-#: dirmngr/dirmngr.c:280
+#: dirmngr/dirmngr.c:283
 msgid "|FPR|OCSP response signed by FPR"
 msgstr ""
 
-#: dirmngr/dirmngr.c:288
+#: dirmngr/dirmngr.c:291
 msgid "force loading of outdated CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:299
+#: dirmngr/dirmngr.c:302
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -10812,318 +10799,120 @@ msgstr ""
 "@\n"
 "(Arată pagina man pentru o listă completă a comenzilor şi opţiunilor)\n"
 
-#: dirmngr/dirmngr.c:441
+#: dirmngr/dirmngr.c:449
 #, fuzzy
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
 
-#: dirmngr/dirmngr.c:443
+#: dirmngr/dirmngr.c:451
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:523
+#: dirmngr/dirmngr.c:531
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:609 tools/gpgconf.c:667 tools/gpgconf.c:702
-#: tools/gpgconf.c:802
+#: dirmngr/dirmngr.c:617 tools/gpgconf.c:701 tools/gpgconf.c:736
+#: tools/gpgconf.c:836
 #, fuzzy, c-format
 msgid "usage: %s [options] "
 msgstr "folosire: gpg [opţiuni] "
 
-#: dirmngr/dirmngr.c:1260
+#: dirmngr/dirmngr.c:1299
 #, 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:1495 dirmngr/server.c:1824
+#: dirmngr/dirmngr.c:1534 dirmngr/server.c:1878
 #, 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:1501 dirmngr/server.c:1830
+#: dirmngr/dirmngr.c:1540 dirmngr/server.c:1884
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "redenumirea `%s' ca `%s' a eÅŸuat: %s\n"
 
-#: dirmngr/dirmngr.c:1643
+#: dirmngr/dirmngr.c:1682
 #, fuzzy, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "linie prea lungă"
 
-#: dirmngr/dirmngr.c:1698 dirmngr/dirmngr.c:1782
+#: dirmngr/dirmngr.c:1737 dirmngr/dirmngr.c:1821
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "amprentă invalidă"
 
-#: dirmngr/dirmngr.c:1734 dirmngr/dirmngr.c:1760 tools/gpgconf-comp.c:3539
+#: dirmngr/dirmngr.c:1773 dirmngr/dirmngr.c:1799 tools/gpgconf-comp.c:3549
 #, 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:1789
+#: dirmngr/dirmngr.c:1828
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1876
+#: dirmngr/dirmngr.c:1915
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1917
+#: dirmngr/dirmngr.c:1956
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1922
+#: dirmngr/dirmngr.c:1961
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1924
+#: dirmngr/dirmngr.c:1963
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1929
+#: dirmngr/dirmngr.c:1968
 #, fuzzy, c-format
 #| msgid "not forced"
 msgid "shutdown forced\n"
 msgstr "neforţat(ă)"
 
-#: dirmngr/dirmngr.c:1937
+#: dirmngr/dirmngr.c:1976
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1944
+#: dirmngr/dirmngr.c:1983
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:105
-msgid "return all values in a record oriented format"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:108
-msgid "|NAME|ignore host part and connect through NAME"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:109
-msgid "force a TLS connection"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:110
-#, fuzzy
-#| msgid "|NAME|set terminal charset to NAME"
-msgid "|NAME|connect to host NAME"
-msgstr "|NUME|setează charset-ul pentru terminal ca NUME"
-
-#: dirmngr/dirmngr_ldap.c:111
-msgid "|N|connect to port N"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:112
-#, fuzzy
-#| msgid "|NAME|use NAME as default recipient"
-msgid "|NAME|use user NAME for authentication"
-msgstr "|NUME|foloseÅŸte NUME ca destinatar implicit"
-
-#: dirmngr/dirmngr_ldap.c:113
-msgid "|PASS|use password PASS for authentication"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:115
-msgid "take password from $DIRMNGR_LDAP_PASS"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:116
-msgid "|STRING|query DN STRING"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:117
-msgid "|STRING|use STRING as filter expression"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:118
-msgid "|STRING|return the attribute STRING"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:179
-#, fuzzy
-#| msgid "Usage: gpg [options] [files] (-h for help)"
-msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
-msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
-
-#: dirmngr/dirmngr_ldap.c:182
-msgid ""
-"Syntax: dirmngr_ldap [options] [URL]\n"
-"Internal LDAP helper for Dirmngr\n"
-"Interface and options may change without notice\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:291
-#, fuzzy, c-format
-#| msgid "invalid import options\n"
-msgid "invalid port number %d\n"
-msgstr "opţiuni import invalide\n"
-
-#: dirmngr/dirmngr_ldap.c:400
-#, c-format
-msgid "scanning result for attribute '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:407 dirmngr/dirmngr_ldap.c:490
-#: dirmngr/dirmngr_ldap.c:514 dirmngr/dirmngr_ldap.c:526
-#: dirmngr/dirmngr_ldap.c:722
-#, fuzzy, c-format
-msgid "error writing to stdout: %s\n"
-msgstr "eroare la scrierea inelului de chei `%s': %s\n"
-
-#: dirmngr/dirmngr_ldap.c:424
-#, c-format
-msgid "          available attribute '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:462
-#, fuzzy, c-format
-msgid "attribute '%s' not found\n"
-msgstr "cheia secretă \"%s\" nu a fost găsită: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:469
-#, c-format
-msgid "found attribute '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:581
-#, fuzzy, c-format
-#| msgid "reading from `%s'\n"
-msgid "processing url '%s'\n"
-msgstr "citesc din `%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:588
-#, fuzzy, c-format
-#| msgid "          w/o user IDs: %lu\n"
-msgid "          user '%s'\n"
-msgstr "  fără ID-uri utilizator: %lu\n"
-
-#: dirmngr/dirmngr_ldap.c:590
-#, fuzzy, c-format
-#| msgid "                aka \"%s\""
-msgid "          pass '%s'\n"
-msgstr "                aka \"%s\""
-
-#: dirmngr/dirmngr_ldap.c:592
-#, fuzzy, c-format
-#| msgid "          w/o user IDs: %lu\n"
-msgid "          host '%s'\n"
-msgstr "  fără ID-uri utilizator: %lu\n"
-
-#: dirmngr/dirmngr_ldap.c:593
-#, fuzzy, c-format
-#| msgid "          not imported: %lu\n"
-msgid "          port %d\n"
-msgstr "            ne importate: %lu\n"
-
-#: dirmngr/dirmngr_ldap.c:595
-#, fuzzy, c-format
-#| msgid "                aka \"%s\""
-msgid "            DN '%s'\n"
-msgstr "                aka \"%s\""
-
-#: dirmngr/dirmngr_ldap.c:597
-#, c-format
-msgid "        filter '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:602 dirmngr/dirmngr_ldap.c:605
-#, fuzzy, c-format
-#| msgid "                aka \"%s\""
-msgid "          attr '%s'\n"
-msgstr "                aka \"%s\""
-
-#: dirmngr/dirmngr_ldap.c:611
-#, fuzzy, c-format
-msgid "no host name in '%s'\n"
-msgstr "(Nici o descriere dată)\n"
-
-#: dirmngr/dirmngr_ldap.c:616
-#, c-format
-msgid "no attribute given for query '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:622
-#, fuzzy, c-format
-#| msgid "WARNING: using insecure memory!\n"
-msgid "WARNING: using first attribute only\n"
-msgstr "AVERTISMENT: este folosită memorie neprotejată (insecure)!\n"
-
-#: dirmngr/dirmngr_ldap.c:637 dirmngr/dirmngr_ldap.c:678
-#, fuzzy, c-format
-#| msgid "renaming `%s' to `%s' failed: %s\n"
-msgid "LDAP init to '%s:%d' failed: %s\n"
-msgstr "redenumirea `%s' ca `%s' a eÅŸuat: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:659
-#, fuzzy, c-format
-#| msgid "renaming `%s' to `%s' failed: %s\n"
-msgid "LDAP init to '%s' failed: %s\n"
-msgstr "redenumirea `%s' ca `%s' a eÅŸuat: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:665
-#, fuzzy, c-format
-#| msgid "renaming `%s' to `%s' failed: %s\n"
-msgid "LDAP init to '%s' done\n"
-msgstr "redenumirea `%s' ca `%s' a eÅŸuat: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:704
-#, fuzzy, c-format
-#| msgid "renaming `%s' to `%s' failed: %s\n"
-msgid "binding to '%s:%d' failed: %s\n"
-msgstr "redenumirea `%s' ca `%s' a eÅŸuat: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:728
-#, fuzzy, c-format
-#| msgid "dearmoring failed: %s\n"
-msgid "searching '%s' failed: %s\n"
-msgstr "eliminarea armurii a eÅŸuat: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:759
-#, fuzzy, c-format
-#| msgid "`%s' is not a JPEG file\n"
-msgid "'%s' is not an LDAP URL\n"
-msgstr "`%s' nu este un fiÅŸier JPEG\n"
-
-#: dirmngr/dirmngr_ldap.c:765
-#, c-format
-msgid "'%s' is an invalid LDAP URL\n"
-msgstr ""
-
-#: dirmngr/http.c:1989 dirmngr/ocsp.c:255
+#: dirmngr/http.c:1998 dirmngr/ocsp.c:255
 #, fuzzy, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: dirmngr/http.c:3630 dirmngr/ocsp.c:229
+#: dirmngr/http.c:3652 dirmngr/ocsp.c:229
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr ""
 
-#: dirmngr/http.c:3636 dirmngr/ocsp.c:246
+#: dirmngr/http.c:3658 dirmngr/ocsp.c:246
 #, fuzzy, c-format
 #| msgid "too many cipher preferences\n"
 msgid "too many redirections\n"
 msgstr "prea multe preferinţe de cifrare\n"
 
-#: dirmngr/http.c:3748
+#: dirmngr/http.c:3768
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "redirection changed to '%s'\n"
@@ -11164,32 +10953,53 @@ msgstr "actualizarea a eÅŸuat: %s\n"
 msgid "ldap wrapper %d stalled - killing\n"
 msgstr ""
 
-#: dirmngr/ldap.c:91
+#: dirmngr/ldap.c:92
 #, c-format
 msgid "invalid char 0x%02x in host name - not added\n"
 msgstr ""
 
-#: dirmngr/ldap.c:95
+#: dirmngr/ldap.c:96
 #, fuzzy, c-format
 #| msgid "sending key %s to %s server %s\n"
 msgid "adding '%s:%d' to the ldap server list\n"
 msgstr "trimit cheia %s serverului %s %s\n"
 
-#: dirmngr/ldap.c:98 dirmngr/misc.c:512
+#: dirmngr/ldap.c:99 dirmngr/misc.c:512
 #, fuzzy, c-format
 msgid "malloc failed: %s\n"
 msgstr "stergere keyblock a eÅŸuat: %s\n"
 
-#: dirmngr/ldap.c:634
+#: dirmngr/ldap.c:221
+#, fuzzy, c-format
+#| msgid "`%s' is not a JPEG file\n"
+msgid "'%s' is not an LDAP URL\n"
+msgstr "`%s' nu este un fiÅŸier JPEG\n"
+
+#: dirmngr/ldap.c:227 dirmngr/ldap.c:233
 #, c-format
-msgid "start_cert_fetch: invalid pattern '%s'\n"
+msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
-#: dirmngr/ldap.c:846
+#: dirmngr/ldap.c:968
 #, c-format
 msgid "ldap_search hit the size limit of the server\n"
 msgstr ""
 
+#: dirmngr/ldapserver.c:119
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr ""
+
+#: dirmngr/ldapserver.c:181
+#, c-format
+msgid "%s:%u: ignoring unknown flag '%s'\n"
+msgstr ""
+
+#: dirmngr/ldapserver.c:203
+#, fuzzy, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr "  s = sări peste cheia asta\n"
+
 #: dirmngr/misc.c:172
 #, fuzzy, c-format
 #| msgid "%s: invalid file version %d\n"
@@ -11283,89 +11093,89 @@ msgstr ""
 msgid "allocating list item failed: %s\n"
 msgstr "citirea cheii publice a eÅŸuat: %s\n"
 
-#: dirmngr/ocsp.c:537 dirmngr/ocsp.c:724
+#: dirmngr/ocsp.c:538 dirmngr/ocsp.c:725
 #, fuzzy, c-format
 #| msgid "error getting new PIN: %s\n"
 msgid "error getting responder ID: %s\n"
 msgstr "eroare la obţinere noului PIN: %s\n"
 
-#: dirmngr/ocsp.c:584
+#: dirmngr/ocsp.c:585
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:623 dirmngr/validate.c:648
+#: dirmngr/ocsp.c:624 dirmngr/validate.c:648
 #, fuzzy, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "cheia secretă \"%s\" nu a fost găsită: %s\n"
 
-#: dirmngr/ocsp.c:633
+#: dirmngr/ocsp.c:634
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:640
+#: dirmngr/ocsp.c:641
 #, fuzzy, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "generează un certificat de revocare"
 
-#: dirmngr/ocsp.c:650
+#: dirmngr/ocsp.c:651
 #, fuzzy, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "am eşuat să stochez cheia: %s\n"
 
-#: dirmngr/ocsp.c:689
+#: dirmngr/ocsp.c:690
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:696
 #, fuzzy, c-format
 #| msgid "no default secret keyring: %s\n"
 msgid "no default OCSP signer defined\n"
 msgstr "nici un inel de chei secrete implicit: %s\n"
 
-#: dirmngr/ocsp.c:702
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:707
+#: dirmngr/ocsp.c:708
 #, fuzzy, c-format
 #| msgid "using cipher %s\n"
 msgid "using OCSP responder '%s'\n"
 msgstr "folosesc cifrul %s\n"
 
-#: dirmngr/ocsp.c:764
+#: dirmngr/ocsp.c:765
 #, fuzzy, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "eroare la obţinerea numărului serial: %s\n"
 
-#: dirmngr/ocsp.c:789
+#: dirmngr/ocsp.c:790
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:790
+#: dirmngr/ocsp.c:791
 msgid "good"
 msgstr ""
 
-#: dirmngr/ocsp.c:796
+#: dirmngr/ocsp.c:797
 #, fuzzy, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "NOTĂ: cheia a fost revocată"
 
-#: dirmngr/ocsp.c:831
+#: dirmngr/ocsp.c:832
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:843
+#: dirmngr/ocsp.c:844
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:858
+#: dirmngr/ocsp.c:859
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr ""
@@ -11375,73 +11185,69 @@ msgstr ""
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "semnarea a eÅŸuat: %s\n"
 
-#: dirmngr/server.c:1158
-msgid "ldapserver missing"
-msgstr ""
-
-#: dirmngr/server.c:1224
+#: dirmngr/server.c:1277
 msgid "serialno missing in cert ID"
 msgstr ""
 
-#: dirmngr/server.c:1387 dirmngr/server.c:1473 dirmngr/server.c:1909
-#: dirmngr/server.c:1980 dirmngr/server.c:2556 dirmngr/server.c:2571
+#: dirmngr/server.c:1440 dirmngr/server.c:1526 dirmngr/server.c:1963
+#: dirmngr/server.c:2034 dirmngr/server.c:2662 dirmngr/server.c:2677
 #, fuzzy, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "semnarea a eÅŸuat: %s\n"
 
-#: dirmngr/server.c:1516
+#: dirmngr/server.c:1569
 #, fuzzy, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "stergere keyblock a eÅŸuat: %s\n"
 
-#: dirmngr/server.c:1528 dirmngr/server.c:1559 dirmngr/server.c:1718
+#: dirmngr/server.c:1581 dirmngr/server.c:1612 dirmngr/server.c:1772
 #, fuzzy, c-format
 msgid "error sending data: %s\n"
 msgstr "eroare trimitere la `%s': %s\n"
 
-#: dirmngr/server.c:1666
+#: dirmngr/server.c:1720
 #, fuzzy, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "stergere keyblock a eÅŸuat: %s\n"
 
-#: dirmngr/server.c:1699
+#: dirmngr/server.c:1753
 #, fuzzy, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "stergere keyblock a eÅŸuat: %s\n"
 
-#: dirmngr/server.c:1726
+#: dirmngr/server.c:1780
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:2860
+#: dirmngr/server.c:2966
 #, fuzzy, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "nu pot crea fişier de rezervă `%s': %s\n"
 
-#: dirmngr/server.c:2871
+#: dirmngr/server.c:2977
 #, fuzzy, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "%s: am eşuat să creez hashtable: %s\n"
 
-#: dirmngr/server.c:2892
+#: dirmngr/server.c:2998
 #, fuzzy, c-format
 #| msgid "failed to initialize the TrustDB: %s\n"
 msgid "failed to initialize the server: %s\n"
 msgstr "am eşuat să iniţializez TrustDB:%s\n"
 
-#: dirmngr/server.c:2900
+#: dirmngr/server.c:3006
 #, fuzzy, c-format
 #| msgid "failed to store the creation date: %s\n"
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "am eşuat să stochez data creării: %s\n"
 
-#: dirmngr/server.c:2933
+#: dirmngr/server.c:3039
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:2952
+#: dirmngr/server.c:3058
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -11590,74 +11396,74 @@ msgstr "gpg-agent nu este disponibil în această sesiune\n"
 msgid "error sending standard options: %s\n"
 msgstr "eroare trimitere la `%s': %s\n"
 
-#: tools/gpgconf-comp.c:649
+#: tools/gpgconf-comp.c:655
 msgid "OpenPGP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:653
+#: tools/gpgconf-comp.c:659
 msgid "S/MIME"
 msgstr ""
 
-#: tools/gpgconf-comp.c:657
+#: tools/gpgconf-comp.c:663
 #, fuzzy
 #| msgid "public key is %s\n"
 msgid "Public Keys"
 msgstr "cheia publică este %s\n"
 
-#: tools/gpgconf-comp.c:661
+#: tools/gpgconf-comp.c:667
 msgid "Private Keys"
 msgstr ""
 
-#: tools/gpgconf-comp.c:665
+#: tools/gpgconf-comp.c:671
 msgid "Smartcards"
 msgstr ""
 
-#: tools/gpgconf-comp.c:669
+#: tools/gpgconf-comp.c:676
 msgid "TPM"
 msgstr ""
 
-#: tools/gpgconf-comp.c:673
+#: tools/gpgconf-comp.c:681
 #, fuzzy
 #| msgid "network error"
 msgid "Network"
 msgstr "eroare reţea"
 
-#: tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:685
 #, fuzzy
 msgid "Passphrase Entry"
 msgstr "frază-parolă incorectă"
 
-#: tools/gpgconf-comp.c:941
+#: tools/gpgconf-comp.c:951
 #, fuzzy
 msgid "Component not suitable for launching"
 msgstr "cheia publică nu a fost găsită"
 
-#: tools/gpgconf-comp.c:947
+#: tools/gpgconf-comp.c:957
 #, c-format
 msgid "Configuration file of component %s is broken\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:950
+#: tools/gpgconf-comp.c:960
 #, fuzzy, c-format
 #| msgid "Please use the command \"toggle\" first.\n"
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr "Vă rugăm folosiţi mai întâi comanda \"toggle\".\n"
 
-#: tools/gpgconf-comp.c:2816
+#: tools/gpgconf-comp.c:2826
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2946
+#: tools/gpgconf-comp.c:2956
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3543
+#: tools/gpgconf-comp.c:3553
 #, fuzzy, c-format
 msgid "error closing '%s'\n"
 msgstr "eroare în `%s': %s\n"
 
-#: tools/gpgconf-comp.c:3545
+#: tools/gpgconf-comp.c:3555
 #, fuzzy, c-format
 #| msgid "error in `%s': %s\n"
 msgid "error parsing '%s'\n"
@@ -11742,16 +11548,16 @@ msgid ""
 "Manage configuration options for tools of the @GNUPG@ system\n"
 msgstr ""
 
-#: tools/gpgconf.c:669 tools/gpgconf.c:704
+#: tools/gpgconf.c:703 tools/gpgconf.c:738
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:678 tools/gpgconf.c:728 tools/gpgconf.c:778
+#: tools/gpgconf.c:712 tools/gpgconf.c:762 tools/gpgconf.c:812
 #, fuzzy
 msgid "Component not found"
 msgstr "cheia publică nu a fost găsită"
 
-#: tools/gpgconf.c:804
+#: tools/gpgconf.c:838
 #, fuzzy
 msgid "No argument allowed"
 msgstr "Nu sunt permise comenzi administrare\n"
@@ -11767,87 +11573,196 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
-#: tools/gpg-card.c:2390
+#: tools/gpg-card.c:2407
 #, fuzzy, c-format
 msgid "Note: key %s is already stored on the card!\n"
 msgstr "cheia secretă deja stocată pe un card\n"
 
-#: tools/gpg-card.c:2393
+#: tools/gpg-card.c:2410
 #, fuzzy, c-format
 msgid "Note: Keys are already stored on the card!\n"
 msgstr "cheia secretă deja stocată pe un card\n"
 
-#: tools/gpg-card.c:2396
+#: tools/gpg-card.c:2413
 #, fuzzy, c-format
 #| msgid "Replace existing keys? (y/N) "
 msgid "Replace existing key %s ? (y/N) "
 msgstr "ÃŽnlocuiesc cheile existente? (d/N) "
 
-#: tools/gpg-card.c:2549 tools/gpg-card.c:2712 tools/gpg-card.c:2935
-#: tools/gpg-card.c:3044
+#: tools/gpg-card.c:2566 tools/gpg-card.c:2729 tools/gpg-card.c:2952
+#: tools/gpg-card.c:3061
 #, fuzzy, c-format
 #| msgid "OpenPGP card no. %s detected\n"
 msgid "%s card no. %s detected\n"
 msgstr "cardul OpenPGP nr. %s detectat\n"
 
-#: tools/gpg-card.c:3396
+#: tools/gpg-card.c:3413
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3406 tools/gpg-card.c:3420
+#: tools/gpg-card.c:3423 tools/gpg-card.c:3437
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
 "         can only be reverted using a factory reset!\n"
 msgstr ""
 
-#: tools/gpg-card.c:3423
+#: tools/gpg-card.c:3440
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3669
+#: tools/gpg-card.c:3686
 #, fuzzy
 msgid "authenticate to the card"
 msgstr "Certificat de revocare creat.\n"
 
-#: tools/gpg-card.c:3671
+#: tools/gpg-card.c:3688
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3673
+#: tools/gpg-card.c:3690
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication"
 msgstr "|NUME|foloseÅŸte NUME ca destinatar implicit"
 
-#: tools/gpg-card.c:3675
+#: tools/gpg-card.c:3692
 msgid "change a private data object"
 msgstr ""
 
-#: tools/gpg-card.c:3676
+#: tools/gpg-card.c:3693
 #, fuzzy
 msgid "read a certificate from a data object"
 msgstr "Certificat de revocare creat.\n"
 
-#: tools/gpg-card.c:3677
+#: tools/gpg-card.c:3694
 #, fuzzy
 msgid "store a certificate to a data object"
 msgstr "Certificat de revocare creat.\n"
 
-#: tools/gpg-card.c:3678
+#: tools/gpg-card.c:3695
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3679
+#: tools/gpg-card.c:3696
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3681
+#: tools/gpg-card.c:3698
 msgid "manage the command history"
 msgstr ""
 
+#~ msgid "requesting key %s from %s server %s\n"
+#~ msgstr "cer cheia %s de la serverul %s %s\n"
+
+#, fuzzy
+#~ msgid "%s:%u: no hostname given\n"
+#~ msgstr "(Nici o descriere dată)\n"
+
+#
+#, fuzzy
+#~ msgid "could not parse keyserver\n"
+#~ msgstr "nu am putut interpreta URL-ul serverului de chei\n"
+
+#, fuzzy
+#~| msgid "|NAME|set terminal charset to NAME"
+#~ msgid "|NAME|connect to host NAME"
+#~ msgstr "|NUME|setează charset-ul pentru terminal ca NUME"
+
+#, fuzzy
+#~| msgid "|NAME|use NAME as default recipient"
+#~ msgid "|NAME|use user NAME for authentication"
+#~ msgstr "|NUME|foloseÅŸte NUME ca destinatar implicit"
+
+#, fuzzy
+#~| msgid "Usage: gpg [options] [files] (-h for help)"
+#~ msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
+#~ msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
+
+#, fuzzy
+#~| msgid "invalid import options\n"
+#~ msgid "invalid port number %d\n"
+#~ msgstr "opţiuni import invalide\n"
+
+#, fuzzy
+#~ msgid "error writing to stdout: %s\n"
+#~ msgstr "eroare la scrierea inelului de chei `%s': %s\n"
+
+#, fuzzy
+#~ msgid "attribute '%s' not found\n"
+#~ msgstr "cheia secretă \"%s\" nu a fost găsită: %s\n"
+
+#, fuzzy
+#~| msgid "reading from `%s'\n"
+#~ msgid "processing url '%s'\n"
+#~ msgstr "citesc din `%s'\n"
+
+#, fuzzy
+#~| msgid "          w/o user IDs: %lu\n"
+#~ msgid "          user '%s'\n"
+#~ msgstr "  fără ID-uri utilizator: %lu\n"
+
+#, fuzzy
+#~| msgid "                aka \"%s\""
+#~ msgid "          pass '%s'\n"
+#~ msgstr "                aka \"%s\""
+
+#, fuzzy
+#~| msgid "          w/o user IDs: %lu\n"
+#~ msgid "          host '%s'\n"
+#~ msgstr "  fără ID-uri utilizator: %lu\n"
+
+#, fuzzy
+#~| msgid "          not imported: %lu\n"
+#~ msgid "          port %d\n"
+#~ msgstr "            ne importate: %lu\n"
+
+#, fuzzy
+#~| msgid "                aka \"%s\""
+#~ msgid "            DN '%s'\n"
+#~ msgstr "                aka \"%s\""
+
+#, fuzzy
+#~| msgid "                aka \"%s\""
+#~ msgid "          attr '%s'\n"
+#~ msgstr "                aka \"%s\""
+
+#, fuzzy
+#~ msgid "no host name in '%s'\n"
+#~ msgstr "(Nici o descriere dată)\n"
+
+#, fuzzy
+#~| msgid "WARNING: using insecure memory!\n"
+#~ msgid "WARNING: using first attribute only\n"
+#~ msgstr "AVERTISMENT: este folosită memorie neprotejată (insecure)!\n"
+
+#, fuzzy
+#~| msgid "renaming `%s' to `%s' failed: %s\n"
+#~ msgid "LDAP init to '%s:%d' failed: %s\n"
+#~ msgstr "redenumirea `%s' ca `%s' a eÅŸuat: %s\n"
+
+#, fuzzy
+#~| msgid "renaming `%s' to `%s' failed: %s\n"
+#~ msgid "LDAP init to '%s' failed: %s\n"
+#~ msgstr "redenumirea `%s' ca `%s' a eÅŸuat: %s\n"
+
+#, fuzzy
+#~| msgid "renaming `%s' to `%s' failed: %s\n"
+#~ msgid "LDAP init to '%s' done\n"
+#~ msgstr "redenumirea `%s' ca `%s' a eÅŸuat: %s\n"
+
+#, fuzzy
+#~| msgid "renaming `%s' to `%s' failed: %s\n"
+#~ msgid "binding to '%s:%d' failed: %s\n"
+#~ msgstr "redenumirea `%s' ca `%s' a eÅŸuat: %s\n"
+
+#, fuzzy
+#~| msgid "dearmoring failed: %s\n"
+#~ msgid "searching '%s' failed: %s\n"
+#~ msgstr "eliminarea armurii a eÅŸuat: %s\n"
+
 #, fuzzy
 #~ msgid "Suggest a random passphrase."
 #~ msgstr "schimbă fraza-parolă"
diff --git a/po/ru.gmo b/po/ru.gmo
index 887158f..9e8fec1 100644
--- a/po/ru.gmo
+++ b/po/ru.gmo
diff --git a/po/ru.po b/po/ru.po
index d89f0fa..4b34280 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: 2021-04-20 12:38+0200\n"
+"POT-Creation-Date: 2021-08-24 18:50+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:328
+#: agent/call-pinentry.c:338
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "�бой при блокировке дл� ввода парол�: %s\n"
@@ -33,45 +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:546
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_OK"
 msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:547
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_Cancel"
 msgstr "|pinentry-label|Отмена (_C)"
 
-#: agent/call-pinentry.c:548
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|_Yes"
 msgstr "|pinentry-label|Да (_Y)"
 
-#: agent/call-pinentry.c:549
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_No"
 msgstr "|pinentry-label|�ет (_N)"
 
-#: agent/call-pinentry.c:550
+#: agent/call-pinentry.c:560
 msgid "|pinentry-label|PIN:"
 msgstr "|pinentry-label|PIN:"
 
-#: agent/call-pinentry.c:551
+#: agent/call-pinentry.c:561
 msgid "|pinentry-label|_Save in password manager"
 msgstr "|pinentry-label|Сохранить в ди�петчере паролей (_S)"
 
-#: agent/call-pinentry.c:552
+#: agent/call-pinentry.c:562
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "Вы дей�твительно хотите, чтобы фраза-пароль была видна на �кране?"
 
-#: agent/call-pinentry.c:554
+#: agent/call-pinentry.c:564
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr "|pinentry-tt|Показывать фразу-пароль"
 
-#: agent/call-pinentry.c:555
+#: agent/call-pinentry.c:565
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "|pinentry-tt|Скрывать фразу-пароль"
 
+#: agent/call-pinentry.c:566
+msgid "Caps Lock is on"
+msgstr ""
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:944
+#: agent/call-pinentry.c:1022
 msgid "Suggest"
 msgstr ""
 
@@ -82,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:966
+#: agent/call-pinentry.c:1044
 #, fuzzy
 #| msgid "pinentry.qualitybar.tooltip"
 msgid "pinentry.genpin.tooltip"
@@ -90,9 +94,22 @@ msgstr ""
 "Стойко�ть введенного выше тек�та. Прокон�ультируйте�ь у админи�тратора о "
 "критери�х оценки �тойко�ти."
 
+#: agent/call-pinentry.c:1072
+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
+#, fuzzy
+#| msgid "Passphrase too long"
+msgid "Passphrase Not Allowed"
+msgstr "Слишком длинна� фраза-пароль"
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:998
+#: agent/call-pinentry.c:1198
 msgid "Quality:"
 msgstr "Стойко�ть:"
 
@@ -102,95 +119,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:1019
+#: agent/call-pinentry.c:1219
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 "Стойко�ть введенного выше тек�та. Прокон�ультируйте�ь у админи�тратора о "
 "критери�х оценки �тойко�ти."
 
-#: agent/call-pinentry.c:1263
+#: agent/call-pinentry.c:1477
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr "Введите PIN, чтобы �делать �екретный ключ до�тупным в �том �еан�е"
 
-#: agent/call-pinentry.c:1266
+#: agent/call-pinentry.c:1480
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr ""
 "Введите фразу-пароль, чтобы �делать �екретный ключ до�тупным в �том �еан�е"
 
-#: agent/call-pinentry.c:1303 agent/call-pinentry.c:1506
+#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
 msgid "PIN:"
 msgstr "PIN:"
 
-#: agent/call-pinentry.c:1303 agent/call-pinentry.c:1506
-#: agent/protect-tool.c:728
+#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/protect-tool.c:729
 msgid "Passphrase:"
 msgstr "Фраза-пароль:"
 
-#: agent/call-pinentry.c:1330 agent/call-pinentry.c:1580 agent/command.c:1799
-#: agent/command.c:1852 agent/command-ssh.c:3046 agent/genkey.c:398
+#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
+#: agent/command.c:1988 agent/command-ssh.c:3046 agent/genkey.c:442
 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:1351 agent/call-pinentry.c:1603
+#: agent/call-pinentry.c:1566 agent/call-pinentry.c:1830
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (попытка %d из %d)"
 
-#: agent/call-pinentry.c:1362 agent/call-pinentry.c:1614
+#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
 msgid "Repeat:"
 msgstr "Повторите:"
 
-#: agent/call-pinentry.c:1372 agent/call-pinentry.c:1384
-#: agent/call-pinentry.c:1624 agent/call-pinentry.c:1636
+#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
+#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
 msgid "PIN too long"
 msgstr "Слишком длинный PIN"
 
-#: agent/call-pinentry.c:1373 agent/call-pinentry.c:1625
+#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
 msgid "Passphrase too long"
 msgstr "Слишком длинна� фраза-пароль"
 
-#: agent/call-pinentry.c:1381 agent/call-pinentry.c:1633
+#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
 msgid "Invalid characters in PIN"
 msgstr "�едопу�тимые �имволы в PIN"
 
-#: agent/call-pinentry.c:1386 agent/call-pinentry.c:1638
+#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
 msgid "PIN too short"
 msgstr "Слишком короткий PIN"
 
-#: agent/call-pinentry.c:1405 agent/call-pinentry.c:1656
+#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
 msgid "Bad PIN"
 msgstr "�еверный PIN"
 
-#: agent/call-pinentry.c:1405 agent/call-pinentry.c:1656
+#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
 msgid "Bad Passphrase"
 msgstr "�еверна� фраза-пароль"
 
-#: agent/command.c:697
+#: agent/command.c:823
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:698
+#: agent/command.c:824
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1106 g10/card-util.c:708 g10/card-util.c:729
+#: agent/command.c:1235 g10/card-util.c:713 g10/card-util.c:734
 #, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "ошибка получени� �ерийного номера карты: %s\n"
 
-#: agent/command.c:1634 agent/command.c:1791 agent/command-ssh.c:2974
-#: agent/genkey.c:333
+#: agent/command.c:1756 agent/command.c:1921 agent/command-ssh.c:2974
+#: agent/genkey.c:377
 msgid "Please re-enter this passphrase"
 msgstr "Повторите фразу-пароль:"
 
-#: agent/command.c:2567
+#: agent/command.c:2703
 #, fuzzy, c-format
 #| msgid ""
 #| "Please enter the passphrase to protect the imported object within the "
@@ -201,7 +218,7 @@ msgid ""
 msgstr ""
 "Введите фразу-пароль дл� защиты импортированных объектов в �и�теме GnuPG."
 
-#: agent/command.c:2697
+#: agent/command.c:2833
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -212,25 +229,25 @@ msgstr ""
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ключи ssh длиннее %d бит не поддерживают��\n"
 
-#: agent/command-ssh.c:872 common/dotlock.c:852 g10/card-util.c:953
-#: g10/export.c:1329 g10/gpg.c:1431 g10/keygen.c:5347 g10/keyring.c:1319
-#: g10/keyring.c:1632 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
+#: agent/command-ssh.c:872 common/dotlock.c:852 g10/card-util.c:963
+#: g10/export.c:1329 g10/gpg.c:1431 g10/keygen.c:5377 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
 #: g10/sign.c:1106 g10/sign.c:1443 g10/tdbio.c:753 tools/gpg-card.c:479
 #, c-format
 msgid "can't create '%s': %s\n"
 msgstr "не могу �оздать '%s': %s\n"
 
-#: agent/command-ssh.c:884 common/helpfile.c:57 g10/card-util.c:910
+#: agent/command-ssh.c:884 common/helpfile.c:57 g10/card-util.c:920
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
 #: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:721 g10/gpg.c:1432
-#: g10/import.c:371 g10/import.c:558 g10/import.c:793 g10/keygen.c:4322
-#: g10/keyring.c:1658 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
+#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4326
+#: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
 #: g10/plaintext.c:610 g10/sign.c:1086 g10/sign.c:1311 g10/sign.c:1424
 #: g10/sign.c:1596 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2380
-#: sm/gpgsm.c:2410 sm/gpgsm.c:2448 sm/keylist.c:1737 sm/qualified.c:65
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2236
+#: sm/gpgsm.c:2266 sm/gpgsm.c:2304 sm/keylist.c:1775 sm/qualified.c:65
 #: dirmngr/certcache.c:396 dirmngr/certcache.c:476 dirmngr/certcache.c:478
-#: dirmngr/crlcache.c:2588 dirmngr/dirmngr.c:1720 tools/gpg-card.c:408
+#: dirmngr/crlcache.c:2591 dirmngr/dirmngr.c:1759 tools/gpg-card.c:408
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "не могу открыть '%s': %s\n"
@@ -336,27 +353,27 @@ msgstr "PIN повторен неверно; попробуйте еще раз"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Введите PIN%s%s%s дл� до�тупа к карте"
 
-#: agent/genkey.c:109 sm/certreqgen-ui.c:433
+#: agent/genkey.c:142 sm/certreqgen-ui.c:433
 #, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "ошибка �оздани� временного файла: %s\n"
 
-#: agent/genkey.c:116
+#: agent/genkey.c:150
 #, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "ошибка запи�и во временный файл: %s\n"
 
-#: agent/genkey.c:154
+#: agent/genkey.c:191
 msgid "Enter new passphrase"
 msgstr "Введите новую фразу-пароль"
 
-#: agent/genkey.c:184
+#: agent/genkey.c:227
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr "Вы не ввели фразу-пароль!%0AПу�та� фраза-пароль недопу�тима."
 
-#: agent/genkey.c:186
+#: agent/genkey.c:229
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -365,11 +382,11 @@ msgstr ""
 "Вы не ввели фразу-пароль - �то, как правило, плоха� мы�ль!%0AПодтвердите, "
 "что Вы дей�твительно не хотите защищать �вой ключ."
 
-#: agent/genkey.c:198
+#: agent/genkey.c:241
 msgid "Yes, protection is not needed"
 msgstr "Да, защита не нужна"
 
-#: agent/genkey.c:215
+#: agent/genkey.c:258
 #, c-format
 msgid "A passphrase should be at least %u character long."
 msgid_plural "A passphrase should be at least %u characters long."
@@ -377,7 +394,7 @@ msgstr[0] "Фраза-пароль не должна быть короче %u �
 msgstr[1] "Фраза-пароль не должна быть короче %u �имволов."
 msgstr[2] "Фраза-пароль не должна быть короче %u �имволов."
 
-#: agent/genkey.c:234
+#: agent/genkey.c:277
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -392,243 +409,242 @@ msgstr[2] ""
 "Фраза-пароль должна �одержать по меньшей мере %u цифр или%%0A�пециальных "
 "�имволов."
 
-#: agent/genkey.c:260
+#: agent/genkey.c:304
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 "Фраза-пароль не должна быть изве�тным выражением и не должна быть �о�тавлена"
 "%%0Aпо определенному образцу."
 
-#: agent/genkey.c:275
+#: agent/genkey.c:319
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "Внимание: Вы ввели небезопа�ную фразу-пароль."
 
-#: agent/genkey.c:296
+#: agent/genkey.c:340
 msgid "Take this one anyway"
 msgstr "В�е равно прин�ть"
 
-#: agent/genkey.c:464
+#: agent/genkey.c:508
 #, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "Введите фразу-пароль%0Aдл� защиты нового ключа"
 
-#: agent/genkey.c:590
+#: agent/genkey.c:637
 msgid "Please enter the new passphrase"
 msgstr "Введите новую фразу-пароль"
 
-#: agent/gpg-agent.c:162 scd/scdaemon.c:115 dirmngr/dirmngr.c:182
+#: agent/gpg-agent.c:164 scd/scdaemon.c:115 dirmngr/dirmngr.c:183
 #, fuzzy
 #| msgid "Options useful for debugging"
 msgid "Options used for startup"
 msgstr "Параметры, полезные дл� отладки"
 
-#: agent/gpg-agent.c:164 scd/scdaemon.c:120 dirmngr/dirmngr.c:171
+#: agent/gpg-agent.c:166 scd/scdaemon.c:120 dirmngr/dirmngr.c:172
 msgid "run in daemon mode (background)"
 msgstr "запу�к в режиме демона (фоновый режим)"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:117 dirmngr/dirmngr.c:170
+#: agent/gpg-agent.c:167 scd/scdaemon.c:117 dirmngr/dirmngr.c:171
 msgid "run in server mode (foreground)"
 msgstr "запу�к в режиме �ервера (нефоновый режим)"
 
-#: agent/gpg-agent.c:167 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:169 dirmngr/dirmngr.c:174
 msgid "run in supervised mode"
 msgstr "запу�к в подконтрольном режиме"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:121 dirmngr/dirmngr.c:184
+#: agent/gpg-agent.c:171 scd/scdaemon.c:121 dirmngr/dirmngr.c:185
 msgid "do not detach from the console"
 msgstr "не от�оедин�ть�� от кон�оли"
 
-#: agent/gpg-agent.c:170 scd/scdaemon.c:122 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:172 scd/scdaemon.c:122 dirmngr/dirmngr.c:186
 msgid "sh-style command output"
 msgstr "вывод команд в �тиле sh"
 
-#: agent/gpg-agent.c:171 scd/scdaemon.c:123 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:173 scd/scdaemon.c:123 dirmngr/dirmngr.c:187
 msgid "csh-style command output"
 msgstr "вывод команд в �тиле csh"
 
-#: agent/gpg-agent.c:179 g10/gpg.c:589 scd/scdaemon.c:125 sm/gpgsm.c:422
-#: dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:181 g10/gpg.c:589 scd/scdaemon.c:125 sm/gpgsm.c:423
+#: dirmngr/dirmngr.c:189
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|вз�ть параметры из файла FILE"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:574 scd/scdaemon.c:129 sm/gpgsm.c:265
-#: dirmngr/dirmngr.c:192
+#: agent/gpg-agent.c:185 g10/gpg.c:574 scd/scdaemon.c:129 sm/gpgsm.c:265
+#: dirmngr/dirmngr.c:193
 msgid "Options controlling the diagnostic output"
 msgstr "Параметры, управл�ющие выводом диагно�тики"
 
-#: agent/gpg-agent.c:185 g10/gpg.c:576 g10/gpgv.c:78 kbx/kbxutil.c:89
+#: agent/gpg-agent.c:187 g10/gpg.c:576 g10/gpgv.c:78 kbx/kbxutil.c:89
 #: scd/scdaemon.c:131 sm/gpgsm.c:267 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:194 dirmngr/dirmngr_ldap.c:102
-#: tools/gpg-connect-agent.c:85 tools/gpgconf.c:111
+#: dirmngr/dirmngr.c:195 tools/gpg-connect-agent.c:85 tools/gpgconf.c:111
 msgid "verbose"
 msgstr "подробно"
 
-#: agent/gpg-agent.c:186 g10/gpg.c:578 g10/gpgv.c:79 kbx/kbxutil.c:90
+#: agent/gpg-agent.c:188 g10/gpg.c:578 g10/gpgv.c:79 kbx/kbxutil.c:90
 #: scd/scdaemon.c:132 sm/gpgsm.c:269 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:195 dirmngr/dirmngr_ldap.c:103
+#: dirmngr/dirmngr.c:196
 msgid "be somewhat more quiet"
 msgstr "�ократить подробно�ти"
 
-#: agent/gpg-agent.c:194 g10/gpg.c:593 sm/gpgsm.c:283 dirmngr/dirmngr.c:205
+#: agent/gpg-agent.c:196 g10/gpg.c:593 sm/gpgsm.c:283 dirmngr/dirmngr.c:206
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FILE|�охран�ть журнал режима �ервера в файле FILE"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 scd/scdaemon.c:146 sm/gpgsm.c:290
-#: dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:599 scd/scdaemon.c:146 sm/gpgsm.c:290
+#: dirmngr/dirmngr.c:210
 msgid "Options controlling the configuration"
 msgstr "Параметры, управл�ющие на�тройками"
 
-#: agent/gpg-agent.c:201
+#: agent/gpg-agent.c:203
 msgid "do not use the SCdaemon"
 msgstr "не и�пользовать демон криптографиче�ких карт"
 
-#: agent/gpg-agent.c:203
+#: agent/gpg-agent.c:205
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|и�пользовать программу PGM как демон криптографиче�ких карт"
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 #, fuzzy
 #| msgid "|PGM|use PGM as the SCdaemon program"
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr "|PGM|и�пользовать программу PGM как демон криптографиче�ких карт"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|принимать некоторые команды по NAME"
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 msgid "ignore requests to change the TTY"
 msgstr "игнорировать запро�ы �мены терминала"
 
-#: agent/gpg-agent.c:215
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the X display"
 msgstr "игнорировать запро�ы �мены ди�пле� XWindow"
 
-#: agent/gpg-agent.c:216
+#: agent/gpg-agent.c:218
 msgid "enable ssh support"
 msgstr "включить поддержку ssh"
 
-#: agent/gpg-agent.c:218
+#: agent/gpg-agent.c:220
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "|ALGO|и�пользовать дл� отображени� отпечатков алгоритм ALGO"
 
-#: agent/gpg-agent.c:221
+#: agent/gpg-agent.c:223
 msgid "enable putty support"
 msgstr "включить поддержку putty"
 
-#: agent/gpg-agent.c:233 g10/gpg.c:844 scd/scdaemon.c:176 sm/gpgsm.c:382
+#: agent/gpg-agent.c:235 g10/gpg.c:844 scd/scdaemon.c:176 sm/gpgsm.c:383
 msgid "Options controlling the security"
 msgstr "Параметры, управл�ющие безопа�но�тью"
 
-#: agent/gpg-agent.c:236
+#: agent/gpg-agent.c:238
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|�бра�ывать запомненный PIN через N �екунд"
 
-#: agent/gpg-agent.c:238
+#: agent/gpg-agent.c:240
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|�бра�ывать ключи SSH по и�течении N �екунд"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:242
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|у�тановить мак�имальный �рок запоминани� PIN N �екунд"
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:244
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr "|N|у�тановить мак�имальный �рок дей�тви� ключа SSH N �екунд"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:246
 msgid "do not use the PIN cache when signing"
 msgstr "не и�пользовать запомненный PIN при подпи�ывании"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:248
 msgid "disallow the use of an external password cache"
 msgstr "не позвол�ть пользовать�� внешней пам�тью паролей"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:250
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "не позвол�ть клиентам помечать ключи как \"доверенные\""
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:253
 msgid "allow presetting passphrase"
 msgstr "разрешить преду�танавливать фразу-пароль"
 
-#: agent/gpg-agent.c:256
+#: agent/gpg-agent.c:258
 msgid "Options enforcing a passphrase policy"
 msgstr "Параметры, обе�печивающие правила дл� фраз-паролей"
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:261
 msgid "do not allow bypassing the passphrase policy"
 msgstr "не позвол�ть обходить правила дл� фраз-паролей"
 
-#: agent/gpg-agent.c:261
+#: agent/gpg-agent.c:263
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr "|N|у�тановить минимальную длину фразы-парол� равной N"
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:265
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr "|n|требовать дл� новой фразы-парол� не менее N неалфавитных �имволов"
 
-#: agent/gpg-agent.c:266
+#: agent/gpg-agent.c:268
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr "|FILE|провер�ть новую фразу-пароль по файлу образцов FILE"
 
-#: agent/gpg-agent.c:268
+#: agent/gpg-agent.c:272
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|�читать фразу-пароль у�таревшей через N дней"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:274
 msgid "do not allow the reuse of old passphrases"
 msgstr "не разрешать повторное и�пользование �тарых фраз-паролей"
 
-#: agent/gpg-agent.c:273
+#: agent/gpg-agent.c:277
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the PIN-Entry"
 msgstr "Параметры, управл�ющие безопа�но�тью"
 
-#: agent/gpg-agent.c:275
+#: agent/gpg-agent.c:279
 msgid "never use the PIN-entry"
 msgstr ""
 
-#: agent/gpg-agent.c:277
+#: agent/gpg-agent.c:281
 msgid "disallow caller to override the pinentry"
 msgstr ""
 "не позвол�ть вызывающей программе замещать �обой программу ввода парол�"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:283
 #, fuzzy
 #| msgid "do not grab keyboard and mouse"
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr "не захватывать клавиатуру и мышь"
 
-#: agent/gpg-agent.c:282
+#: agent/gpg-agent.c:286
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|и�пользовать программу PGM дл� ввода паролей"
 
-#: agent/gpg-agent.c:286
+#: agent/gpg-agent.c:290
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|у�тановить врем� ожидани� ввода парол� N �екунд"
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:294
 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:551 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: agent/gpg-agent.c:557 agent/preset-passphrase.c:99 agent/protect-tool.c:154
 #: g10/gpg.c:1132 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:612 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:438
-#: dirmngr/dirmngr_ldap.c:175 tools/gpg-connect-agent.c:220 tools/gpgconf.c:151
+#: sm/gpgsm.c:613 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:446
+#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:151
 #: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Об ошибках в программе �ообщайте по адре�у <@EMAIL@>.\n"
 
-#: agent/gpg-agent.c:560
+#: agent/gpg-agent.c:566
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Вызов: @GPG_AGENT@ [параметры] (-h - под�казка)"
 
-#: agent/gpg-agent.c:562
+#: agent/gpg-agent.c:568
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -636,131 +652,131 @@ msgstr ""
 "Синтак�и�: @GPG_AGENT@ [параметры] [команда [аргументы]]\n"
 "Управление �екретными ключами дл� @GNUPG@\n"
 
-#: agent/gpg-agent.c:607 g10/gpg.c:1337 scd/scdaemon.c:384 sm/gpgsm.c:760
-#: dirmngr/dirmngr.c:522
+#: agent/gpg-agent.c:613 g10/gpg.c:1337 scd/scdaemon.c:384 sm/gpgsm.c:761
+#: dirmngr/dirmngr.c:530
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "запрошен недопу�тимый уровень отладки '%s'\n"
 
-#: agent/gpg-agent.c:972 g10/gpg.c:3910 g10/gpg.c:3934 sm/gpgsm.c:1769
-#: sm/gpgsm.c:1775
+#: agent/gpg-agent.c:986 g10/gpg.c:3907 g10/gpg.c:3931 sm/gpgsm.c:1622
+#: sm/gpgsm.c:1628
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "выбрана недопу�тима� хеш-функци�\n"
 
-#: agent/gpg-agent.c:1196 agent/gpg-agent.c:2019 common/comopt.c:93
-#: g10/gpg.c:2591 scd/scdaemon.c:549 sm/gpgsm.c:1155 dirmngr/dirmngr.c:989
-#: dirmngr/dirmngr.c:1840
+#: agent/gpg-agent.c:1210 agent/gpg-agent.c:2035 common/comopt.c:93
+#: g10/gpg.c:2594 scd/scdaemon.c:549 sm/gpgsm.c:1028 dirmngr/dirmngr.c:1029
+#: dirmngr/dirmngr.c:1879
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "чтение параметров из '%s'\n"
 
-#: agent/gpg-agent.c:1335 g10/gpg.c:3861 scd/scdaemon.c:687 sm/gpgsm.c:1709
-#: dirmngr/dirmngr.c:1108 tools/gpg-connect-agent.c:1270 tools/gpgconf.c:634
+#: agent/gpg-agent.c:1349 g10/gpg.c:3858 scd/scdaemon.c:687 sm/gpgsm.c:1562
+#: dirmngr/dirmngr.c:1145 tools/gpg-connect-agent.c:1270 tools/gpgconf.c:668
 #, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr "Замечание: '%s' не �читает�� параметром\n"
 
-#: agent/gpg-agent.c:2172 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1267
+#: agent/gpg-agent.c:2188 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1306
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "не могу �оздать �окет: %s\n"
 
-#: agent/gpg-agent.c:2189 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1280
+#: agent/gpg-agent.c:2205 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1319
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "�лишком длинное им� �окета '%s'\n"
 
-#: agent/gpg-agent.c:2228
+#: agent/gpg-agent.c:2244
 #, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "агент gpg уже запущен - еще один, новый, запущен не будет\n"
 
-#: agent/gpg-agent.c:2239 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1312
+#: agent/gpg-agent.c:2255 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1351
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "ошибка получени� разового кода дл� �окета\n"
 
-#: agent/gpg-agent.c:2244 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1315
+#: agent/gpg-agent.c:2260 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1354
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "ошибка �в�зывани� �окета � '%s': %s\n"
 
-#: agent/gpg-agent.c:2255 agent/gpg-agent.c:2295 agent/gpg-agent.c:2304
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1324
+#: agent/gpg-agent.c:2271 agent/gpg-agent.c:2311 agent/gpg-agent.c:2320
+#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1363
 #, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "не удало�ь задать права до�тупа дл� '%s': %s\n"
 
-#: agent/gpg-agent.c:2269 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1336
+#: agent/gpg-agent.c:2285 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1375
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "�лушаем �окет '%s'\n"
 
-#: agent/gpg-agent.c:2289 agent/gpg-agent.c:2342 common/homedir.c:517
+#: agent/gpg-agent.c:2305 agent/gpg-agent.c:2358 common/homedir.c:537
 #: 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:2292 agent/gpg-agent.c:2347 common/homedir.c:520
+#: agent/gpg-agent.c:2308 agent/gpg-agent.c:2363 common/homedir.c:540
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "�оздан каталог '%s'\n"
 
-#: agent/gpg-agent.c:2353
+#: agent/gpg-agent.c:2369
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "�бой stat() дл� '%s': %s\n"
 
-#: agent/gpg-agent.c:2357
+#: agent/gpg-agent.c:2373
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "невозможно и�пользовать '%s' как домашний каталог\n"
 
-#: agent/gpg-agent.c:2512 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2069
+#: agent/gpg-agent.c:2528 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2108
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "ошибка чтени� разового кода из файлового де�криптора %d: %s\n"
 
-#: agent/gpg-agent.c:2719
+#: agent/gpg-agent.c:2735
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "обработчик 0x%lx дл� файлового де�криптора %d запущен\n"
 
-#: agent/gpg-agent.c:2724
+#: agent/gpg-agent.c:2740
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "обработчик 0x%lx дл� файлового де�криптора %d завершил��\n"
 
-#: agent/gpg-agent.c:2799
+#: agent/gpg-agent.c:2815
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "обработчик ssh 0x%lx дл� файлового де�криптора %d запущен\n"
 
-#: agent/gpg-agent.c:2804
+#: agent/gpg-agent.c:2820
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "обработчик ssh 0x%lx дл� файлового де�криптора %d завершил��\n"
 
-#: agent/gpg-agent.c:3026 scd/scdaemon.c:1374 dirmngr/dirmngr.c:2283
+#: agent/gpg-agent.c:3042 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2322
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "�бой npth_pselect: %s - жду 1 �екунду\n"
 
-#: agent/gpg-agent.c:3114 scd/scdaemon.c:1439
+#: agent/gpg-agent.c:3130 scd/scdaemon.c:1441
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s о�тановлен\n"
 
-#: agent/gpg-agent.c:3252 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3271 common/simple-pwquery.c:247 g10/call-agent.c:260
 #: sm/call-agent.c:131 tools/gpg-connect-agent.c:2319 tools/card-call-scd.c:311
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "в �том �еан�е агент gpg не работает\n"
 
-#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:70
+#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:66
 msgid ""
 "@Options:\n"
 " "
@@ -781,7 +797,7 @@ msgstr ""
 "Работа � буфером паролей\n"
 
 #: agent/protect-tool.c:107 g10/gpg.c:448 kbx/kbxutil.c:72 sm/gpgsm.c:215
-#: dirmngr/dirmngr.c:168 tools/gpgconf.c:81
+#: dirmngr/dirmngr.c:169 tools/gpgconf.c:81
 msgid ""
 "@Commands:\n"
 " "
@@ -812,22 +828,22 @@ msgstr ""
 "Синтак�и�: gpg-protect-tool [параметры] [аргументы]\n"
 "Сред�тво работы � �екретными ключами\n"
 
-#: agent/protect-tool.c:707
+#: agent/protect-tool.c:708 sm/import.c:775
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Введите фразу-пароль дл� �н�ти� защиты � объекта PKCS#12."
 
-#: agent/protect-tool.c:712
+#: agent/protect-tool.c:713 sm/export.c:727
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Введите фразу-пароль дл� защиты нового объекта PKCS#12."
 
-#: agent/protect-tool.c:718
+#: agent/protect-tool.c:719
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 "Введите фразу-пароль дл� защиты импортированных объектов в �и�теме GnuPG."
 
-#: agent/protect-tool.c:723
+#: agent/protect-tool.c:724
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -835,17 +851,17 @@ msgstr ""
 "Введите фразу-пароль или PIN,\n"
 "необходимые дл� выполнени� данной операции."
 
-#: agent/protect-tool.c:734
+#: agent/protect-tool.c:735
 #, c-format
 msgid "cancelled\n"
 msgstr "отменено\n"
 
-#: agent/protect-tool.c:736
+#: agent/protect-tool.c:737
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "ошибка запро�а ввода фразы-парол�: %s\n"
 
-#: agent/trustlist.c:153 agent/trustlist.c:363 tools/gpgconf.c:424
+#: agent/trustlist.c:153 agent/trustlist.c:363 tools/gpgconf.c:458
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "ошибка открыти� '%s': %s\n"
@@ -1004,7 +1020,7 @@ msgstr "�бой проверки �озданной подпи�и: %s\n"
 msgid "secret key parts are not available\n"
 msgstr "�екретна� ча�ть ключа недо�тупна\n"
 
-#: agent/cvt-openpgp.c:343 g10/card-util.c:1562
+#: agent/cvt-openpgp.c:343 g10/card-util.c:1575
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr "алгоритм шифровани� � открытым ключом %d (%s) не поддерживает��\n"
@@ -1033,7 +1049,7 @@ msgid "error creating a stream for a pipe: %s\n"
 msgstr "ошибка при �оздании потока дл� канала конвейера: %s\n"
 
 #: common/exechelp-posix.c:505 common/exechelp-posix.c:580
-#: common/exechelp-posix.c:866 dirmngr/dirmngr.c:1354
+#: common/exechelp-posix.c:866 dirmngr/dirmngr.c:1393
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "ошибка при дублировании проце��а: %s\n"
@@ -1105,7 +1121,7 @@ msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "�бой при переименовании '%s' в '%s': %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3082
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3099
 msgid "yes"
 msgstr "да|yes"
 
@@ -1159,7 +1175,7 @@ msgstr "выход за предел безопа�ной пам�ти при р
 msgid "out of core while allocating %lu bytes"
 msgstr "выход за границы при размещении %lu байтов"
 
-#: common/miscellaneous.c:115 g10/card-util.c:917 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:927 tools/no-libgcrypt.c:30
 #: tools/gpg-card.c:416
 #, c-format
 msgid "error allocating enough memory: %s\n"
@@ -1238,7 +1254,7 @@ msgstr "ошибка получени� вер�ии из '%s': %s\n"
 msgid "server '%s' is older than us (%s < %s)"
 msgstr "�ервер '%s' �тарше на� (%s < %s)"
 
-#: common/asshelp.c:737 g10/call-dirmngr.c:408
+#: common/asshelp.c:737 g10/call-dirmngr.c:407
 #, c-format
 msgid "WARNING: %s\n"
 msgstr "Внимание: %s\n"
@@ -1323,7 +1339,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:4212
+#: scd/app-openpgp.c:4214
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "алгоритм (не поддерживает��): %s"
@@ -1398,11 +1414,11 @@ msgstr "Цепочка �ертификатов до�товерна"
 msgid "Root certificate trustworthy"
 msgstr "Корневой �ертификат до�товерен"
 
-#: common/audit.c:1112 sm/certchain.c:1242
+#: common/audit.c:1112 sm/certchain.c:1243
 msgid "no CRL found for certificate"
 msgstr "дл� �ертификата не найден �пи�ок отозванных �ертификатов"
 
-#: common/audit.c:1115 sm/certchain.c:1252
+#: common/audit.c:1115 sm/certchain.c:1253
 msgid "the available CRL is too old"
 msgstr "до�тупный �пи�ок отозванных �ертификатов �лишком �тар"
 
@@ -1448,22 +1464,22 @@ msgstr "[от�ут�твует]"
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "недопу�тимый �имвол radix64 %02x пропущен\n"
 
-#: common/ttyio.c:433
+#: common/ttyio.c:447
 #, c-format
 msgid "Sorry, we are in batchmode - can't get input\n"
 msgstr ""
 
-#: common/ttyio.c:439
+#: common/ttyio.c:453
 #, c-format
 msgid "Sorry, no terminal at all requested - can't get input\n"
 msgstr ""
 
-#: common/ttyio.c:474 common/ttyio.c:484
+#: common/ttyio.c:488 common/ttyio.c:498
 #, c-format
 msgid "too many errors; giving up\n"
 msgstr ""
 
-#: common/ttyio.c:536
+#: common/ttyio.c:550
 #, c-format
 msgid "Control-D detected\n"
 msgstr ""
@@ -1517,8 +1533,7 @@ msgstr "блокировка '%s' не выполнена: %s\n"
 msgid "waiting for lock %s...\n"
 msgstr "ожидаю �н�ти� блокировки %s...\n"
 
-#: common/init.c:191 sm/gpgsm.c:1036 dirmngr/dirmngr.c:895
-#: dirmngr/dirmngr.c:904
+#: common/init.c:191 sm/gpgsm.c:909 dirmngr/dirmngr.c:935 dirmngr/dirmngr.c:944
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "�лишком �тара� вер�и� %s (нужно %s, е�ть %s)\n"
@@ -1670,7 +1685,7 @@ msgid "Enter passphrase: "
 msgstr "Введите фразу-пароль:"
 
 #: g10/call-agent.c:318 g10/encrypt.c:282 g10/encrypt.c:818 g10/sign.c:473
-#: sm/call-agent.c:180 sm/encrypt.c:701 sm/sign.c:436
+#: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
 #, c-format
 msgid "%s is not compliant with %s mode\n"
 msgstr "%s не �овме�тим � режимом %s\n"
@@ -1681,213 +1696,213 @@ msgstr "%s не �овме�тим � режимом %s\n"
 msgid "error from TPM: %s\n"
 msgstr "ошибка чтени� из %s: %s\n"
 
-#: g10/call-agent.c:2123 g10/passphrase.c:225 g10/passphrase.c:258
-#: tools/card-call-scd.c:1751
+#: g10/call-agent.c:2135 g10/passphrase.c:233 g10/passphrase.c:266
+#: tools/card-call-scd.c:1755
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "проблема � агентом: %s\n"
 
-#: g10/call-dirmngr.c:179 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2316
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2316
 #, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "в �том �еан�е dirmngr не работает\n"
 
-#: g10/call-dirmngr.c:213
+#: g10/call-dirmngr.c:212
 #, fuzzy, c-format
 #| msgid "keyserver option \"%s\" may not be used in %s mode\n"
 msgid "keyserver option \"honor-keyserver-url\" may not be used in Tor mode\n"
 msgstr "параметр �ервера ключей \"%s\" нельз� и�пользовать в режиме %s\n"
 
-#: g10/call-dirmngr.c:386
+#: g10/call-dirmngr.c:385
 msgid "WKD uses a cached result"
 msgstr "WKD пользует�� �охраненным результатом"
 
-#: g10/call-dirmngr.c:389
+#: g10/call-dirmngr.c:388
 msgid "Tor is not running"
 msgstr "Tor не работает"
 
-#: g10/call-dirmngr.c:391
+#: g10/call-dirmngr.c:390
 msgid "Tor is not properly configured"
 msgstr "Tor не на�троен должным образом"
 
-#: g10/call-dirmngr.c:393
+#: g10/call-dirmngr.c:392
 msgid "DNS is not properly configured"
 msgstr "DNS не на�троен должным образом"
 
-#: g10/call-dirmngr.c:395
+#: g10/call-dirmngr.c:394
 msgid "unacceptable HTTP redirect from server"
 msgstr "недопу�тимое перенаправление HTTP � �ервера"
 
-#: g10/call-dirmngr.c:397
+#: g10/call-dirmngr.c:396
 msgid "unacceptable HTTP redirect from server was cleaned up"
 msgstr "недопу�тимое перенаправление HTTP � �ервера �брошено"
 
-#: g10/call-dirmngr.c:399
+#: g10/call-dirmngr.c:398
 msgid "server uses an invalid certificate"
 msgstr "на �ервере примен�ет�� непригодный �ертификат"
 
-#: g10/call-dirmngr.c:406 g10/gpg.c:4599
+#: g10/call-dirmngr.c:405 g10/gpg.c:4596
 #, c-format
 msgid "Note: %s\n"
 msgstr "Замечание: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:369 g10/card-util.c:1924
-#: tools/gpg-card.c:3039
+#: g10/card-util.c:86 g10/card-util.c:374 g10/card-util.c:1937
+#: tools/gpg-card.c:3056
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "Карта OpenPGP недо�тупна: %s\n"
 
-#: g10/card-util.c:91 g10/card-util.c:1930
+#: g10/card-util.c:91 g10/card-util.c:1943
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "Обнаружена карта OpenPGP номер %s\n"
 
-#: g10/card-util.c:97 g10/card-util.c:2309 g10/delkey.c:164 g10/keyedit.c:1428
-#: g10/keygen.c:4791 g10/revoke.c:214 g10/revoke.c:638
+#: g10/card-util.c:97 g10/card-util.c:2322 g10/delkey.c:164 g10/keyedit.c:1428
+#: g10/keygen.c:4795 g10/revoke.c:214 g10/revoke.c:639
 #, c-format
 msgid "can't do this in batch mode\n"
 msgstr "в пакетном режиме �то дей�твие невозможно\n"
 
-#: g10/card-util.c:105 tools/gpg-card.c:2943
+#: g10/card-util.c:105 tools/gpg-card.c:2960
 #, c-format
 msgid "This command is only available for version 2 cards\n"
 msgstr "Эта команда до�тупна только дл� карт вер�ии 2\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3398 tools/gpg-card.c:2948
+#: g10/card-util.c:107 scd/app-openpgp.c:3399 tools/gpg-card.c:2965
 #, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "Код �бро�а (больше) не до�тупен\n"
 
-#: g10/card-util.c:140 g10/card-util.c:1448 g10/card-util.c:1710
-#: g10/card-util.c:1802 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1991 g10/keygen.c:2165 g10/keygen.c:2385 g10/keygen.c:2685
+#: g10/card-util.c:140 g10/card-util.c:1458 g10/card-util.c:1723
+#: g10/card-util.c:1815 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/keygen.c:1992 g10/keygen.c:2166 g10/keygen.c:2386 g10/keygen.c:2686
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
 #: tools/gpg-card.c:510
 msgid "Your selection? "
 msgstr "Ваш выбор? "
 
-#: g10/card-util.c:262 g10/card-util.c:313 tools/gpg-card.c:596
+#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:596
 #: tools/gpg-card.c:636
 msgid "[not set]"
 msgstr "[не у�тановлено]"
 
-#: g10/card-util.c:558 tools/gpg-card.c:903
+#: g10/card-util.c:563 tools/gpg-card.c:905
 msgid "Mr."
 msgstr "Уважаемый"
 
-#: g10/card-util.c:559 tools/gpg-card.c:904
+#: g10/card-util.c:564 tools/gpg-card.c:906
 msgid "Ms."
 msgstr "Уважаема�"
 
-#: g10/card-util.c:586 tools/gpg-card.c:931
+#: g10/card-util.c:591 tools/gpg-card.c:933
 msgid "not forced"
 msgstr "не требует��"
 
-#: g10/card-util.c:586 tools/gpg-card.c:931
+#: g10/card-util.c:591 tools/gpg-card.c:933
 msgid "forced"
 msgstr "требует��"
 
-#: g10/card-util.c:768 tools/gpg-card.c:1468
+#: g10/card-util.c:773 tools/gpg-card.c:1484
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Ошибка: Допу�тим только про�той тек�т ASCII.\n"
 
-#: g10/card-util.c:770 tools/gpg-card.c:1470
+#: g10/card-util.c:775 tools/gpg-card.c:1486
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Ошибка: �ельз� и�пользовать �имвол \"<\".\n"
 
-#: g10/card-util.c:772 tools/gpg-card.c:1472
+#: g10/card-util.c:777 tools/gpg-card.c:1488
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Ошибка: Двойные пробелы недопу�тимы.\n"
 
-#: g10/card-util.c:789 tools/gpg-card.c:1505
+#: g10/card-util.c:795 tools/gpg-card.c:1521
 msgid "Cardholder's surname: "
 msgstr "Фамили� держател� карты: "
 
-#: g10/card-util.c:791 tools/gpg-card.c:1506
+#: g10/card-util.c:797 tools/gpg-card.c:1522
 msgid "Cardholder's given name: "
 msgstr "Им� держател� карты: "
 
-#: g10/card-util.c:809 tools/gpg-card.c:1523
+#: g10/card-util.c:816 tools/gpg-card.c:1539
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Ошибка: Слишком длинное полное им� (предел - %d �имволов).\n"
 
-#: g10/card-util.c:830 tools/gpg-card.c:1561
+#: g10/card-util.c:840 tools/gpg-card.c:1577
 msgid "URL to retrieve public key: "
 msgstr "URL дл� получени� открытого ключа: "
 
-#: g10/card-util.c:926 g10/decrypt-data.c:495 g10/import.c:406 g10/import.c:756
-#: g10/import.c:815 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1666
-#: tools/gpgconf.c:437 tools/gpgconf.c:483 tools/gpg-card.c:426
+#: g10/card-util.c:936 g10/decrypt-data.c:495 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:1705
+#: tools/gpgconf.c:471 tools/gpgconf.c:517 tools/gpg-card.c:426
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "ошибка чтени� '%s': %s\n"
 
-#: g10/card-util.c:959 g10/decrypt-data.c:498 g10/export.c:2496
+#: g10/card-util.c:969 g10/decrypt-data.c:498 g10/export.c:2496
 #: dirmngr/crlcache.c:925 tools/gpg-card.c:486 tools/gpg-card.c:493
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr "ошибка запи�и '%s': %s\n"
 
-#: g10/card-util.c:986 tools/gpg-card.c:1650
+#: g10/card-util.c:996 tools/gpg-card.c:1666
 msgid "Login data (account name): "
 msgstr "Учетна� запи�ь (им�): "
 
-#: g10/card-util.c:1024 tools/gpg-card.c:1945
+#: g10/card-util.c:1034 tools/gpg-card.c:1962
 msgid "Private DO data: "
 msgstr "Секретные данные DO:"
 
-#: g10/card-util.c:1109 tools/gpg-card.c:1699
+#: g10/card-util.c:1119 tools/gpg-card.c:1715
 msgid "Language preferences: "
 msgstr "Предпочтительный �зык: "
 
-#: g10/card-util.c:1117 tools/gpg-card.c:1710
+#: g10/card-util.c:1127 tools/gpg-card.c:1726
 #, c-format
 msgid "Error: invalid length of preference string.\n"
 msgstr "Ошибка: недопу�тима� длина �троки предпочтений.\n"
 
-#: g10/card-util.c:1126 tools/gpg-card.c:1719
+#: g10/card-util.c:1136 tools/gpg-card.c:1735
 #, c-format
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Ошибка: недопу�тимые �имволы в �троке предпочтений.\n"
 
-#: g10/card-util.c:1148 tools/gpg-card.c:1753
+#: g10/card-util.c:1158 tools/gpg-card.c:1769
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr "Привет�твие (M = Уважаемый, F = Уважаема�, пробел - не задано): "
 
-#: g10/card-util.c:1162 tools/gpg-card.c:1770
+#: g10/card-util.c:1172 tools/gpg-card.c:1786
 msgid "Error: invalid response.\n"
 msgstr "Ошибка: недопу�тимый ответ.\n"
 
-#: g10/card-util.c:1185 tools/gpg-card.c:1835
+#: g10/card-util.c:1195 tools/gpg-card.c:1852
 msgid "CA fingerprint: "
 msgstr "отпечаток удо�товер�ющего центра: "
 
-#: g10/card-util.c:1209 tools/gpg-card.c:1861
+#: g10/card-util.c:1219 tools/gpg-card.c:1878
 #, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Ошибка: недопу�тимый формат отпечатка.\n"
 
-#: g10/card-util.c:1259
+#: g10/card-util.c:1269
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "операци� � ключом невозможна: %s\n"
 
-#: g10/card-util.c:1260
+#: g10/card-util.c:1270
 msgid "not an OpenPGP card"
 msgstr "�то не карта OpenPGP"
 
-#: g10/card-util.c:1273 g10/keygen.c:4811 g10/keygen.c:5972
+#: g10/card-util.c:1283 g10/keygen.c:4815 g10/keygen.c:6003
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "ошибка при �читывании информации ключа: %s\n"
 
-#: g10/card-util.c:1358
+#: g10/card-util.c:1368
 msgid "Replace existing key? (y/N) "
 msgstr "Заменить �уще�твующий ключ? (y/N) "
 
-#: g10/card-util.c:1375 tools/gpg-card.c:3328
+#: g10/card-util.c:1385 tools/gpg-card.c:3345
 #, fuzzy
 #| msgid ""
 #| "Note: There is no guarantee that the card supports the requested size.\n"
@@ -1903,99 +1918,99 @@ msgstr ""
 "           Е�ли �оздать ключ не уда�т��, �верьте�ь � документацией\n"
 "           на карту и вы��ните, какие размеры допу�тимы.\n"
 
-#: g10/card-util.c:1396 g10/keygen.c:2570 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1406 g10/keygen.c:2571 sm/certreqgen-ui.c:180
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Какой размер ключа Вам необходим? (%u) "
 
-#: g10/card-util.c:1406 g10/keygen.c:2493 g10/keygen.c:2525
+#: g10/card-util.c:1416 g10/keygen.c:2494 g10/keygen.c:2526
 #: sm/certreqgen-ui.c:195
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "округлен до %u бит\n"
 
-#: g10/card-util.c:1414 g10/keygen.c:2578 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1424 g10/keygen.c:2579 sm/certreqgen-ui.c:185
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "размер ключей %s должен быть в пределах %u-%u\n"
 
-#: g10/card-util.c:1433
+#: g10/card-util.c:1443
 msgid "Changing card key attribute for: "
 msgstr "Изменение атрибутов ключа на карте:"
 
-#: g10/card-util.c:1435
+#: g10/card-util.c:1445
 msgid "Signature key\n"
 msgstr "Ключа дл� подпи�и\n"
 
-#: g10/card-util.c:1437
+#: g10/card-util.c:1447
 msgid "Encryption key\n"
 msgstr "Ключа дл� шифровани�\n"
 
-#: g10/card-util.c:1439
+#: g10/card-util.c:1449
 msgid "Authentication key\n"
 msgstr "Ключа дл� удо�товерени� лично�ти\n"
 
-#: g10/card-util.c:1441 g10/keygen.c:2112 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1451 g10/keygen.c:2113 sm/certreqgen-ui.c:158
 msgid "Please select what kind of key you want:\n"
 msgstr "Выберите тип ключа:\n"
 
-#: g10/card-util.c:1442 sm/certreqgen-ui.c:159
+#: g10/card-util.c:1452 sm/certreqgen-ui.c:159
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1443
+#: g10/card-util.c:1453
 #, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) ECC\n"
 
-#: g10/card-util.c:1455 g10/card-util.c:1722 g10/card-util.c:1822
-#: g10/keyedit.c:900 g10/keygen.c:2017 g10/keygen.c:2045 g10/keygen.c:2172
-#: g10/keygen.c:2425 g10/keygen.c:2713 g10/revoke.c:836
+#: g10/card-util.c:1468 g10/card-util.c:1735 g10/card-util.c:1835
+#: g10/keyedit.c:900 g10/keygen.c:2018 g10/keygen.c:2046 g10/keygen.c:2173
+#: g10/keygen.c:2426 g10/keygen.c:2714 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "�еправильный выбор.\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1541
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr "Теперь карта будет перена�троена на генерацию ключа длиной %u бит\n"
 
-#: g10/card-util.c:1533
+#: g10/card-util.c:1546
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr "Теперь карта будет перена�троена на генерацию ключа типа %s\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1582
 #, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "ошибка изменени� атрибута ключа %d: %s\n"
 
-#: g10/card-util.c:1585 g10/card-util.c:2106 g10/card-util.c:2162
+#: g10/card-util.c:1598 g10/card-util.c:2119 g10/card-util.c:2175
 #, c-format
 msgid "error getting card info: %s\n"
 msgstr "ошибка при �читывании информации карты: %s\n"
 
-#: g10/card-util.c:1591 g10/card-util.c:1936 g10/card-util.c:2112
-#: g10/card-util.c:2171 tools/gpg-card.c:3057 tools/gpg-card.c:3296
-#: tools/gpg-card.c:3354
+#: g10/card-util.c:1604 g10/card-util.c:1949 g10/card-util.c:2125
+#: g10/card-util.c:2184 tools/gpg-card.c:3074 tools/gpg-card.c:3313
+#: tools/gpg-card.c:3371
 #, c-format
 msgid "This command is not supported by this card\n"
 msgstr "Данна� команда �той картой не поддерживает��\n"
 
-#: g10/card-util.c:1637 tools/gpg-card.c:2426
+#: g10/card-util.c:1650 tools/gpg-card.c:2443
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Сделать вне карты архивную копию ключа шифровани�? (Y/n) "
 
-#: g10/card-util.c:1651
+#: g10/card-util.c:1664
 #, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "Замечание: ключи уже хран�т�� на карте!\n"
 
-#: g10/card-util.c:1654 tools/gpg-card.c:2398
+#: g10/card-util.c:1667 tools/gpg-card.c:2415
 msgid "Replace existing keys? (y/N) "
 msgstr "Заменить �уще�твующие ключи? (y/N) "
 
-#: g10/card-util.c:1666 tools/gpg-card.c:2457
+#: g10/card-util.c:1679 tools/gpg-card.c:2474
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2006,157 +2021,157 @@ msgstr ""
 "   PIN = '%s'    �дмин. PIN = '%s'\n"
 "Вам �ледует изменить их командой --change-pin\n"
 
-#: g10/card-util.c:1701
+#: g10/card-util.c:1714
 msgid "Please select the type of key to generate:\n"
 msgstr "Выберите тип �оздаваемого ключа:\n"
 
-#: g10/card-util.c:1703 g10/card-util.c:1793
+#: g10/card-util.c:1716 g10/card-util.c:1806
 msgid "   (1) Signature key\n"
 msgstr "   (1) Ключ подпи�и\n"
 
-#: g10/card-util.c:1704 g10/card-util.c:1795
+#: g10/card-util.c:1717 g10/card-util.c:1808
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Ключ шифровани�\n"
 
-#: g10/card-util.c:1705 g10/card-util.c:1797
+#: g10/card-util.c:1718 g10/card-util.c:1810
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Ключ удо�товерени� лично�ти\n"
 
-#: g10/card-util.c:1790
+#: g10/card-util.c:1803
 msgid "Please select where to store the key:\n"
 msgstr "Выберите, где хранить ключ:\n"
 
-#: g10/card-util.c:1836
+#: g10/card-util.c:1849
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "�бой запи�и ключа на карту: %s\n"
 
-#: g10/card-util.c:1941 tools/gpg-card.c:3065
+#: g10/card-util.c:1954 tools/gpg-card.c:3082
 #, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr "Замечание: �та команда �отрет � карты в�е ключи!\n"
 
-#: g10/card-util.c:1944 tools/gpg-card.c:3068 tools/gpg-card.c:3409
+#: g10/card-util.c:1957 tools/gpg-card.c:3085 tools/gpg-card.c:3426
 msgid "Continue? (y/N) "
 msgstr "Продолжить? (y/N) "
 
-#: g10/card-util.c:1949 tools/gpg-card.c:3079
+#: g10/card-util.c:1962 tools/gpg-card.c:3096
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr "Подтвердите �бро� к завод�ким у�тановкам (введите \"yes\") "
 
-#: g10/card-util.c:2142
+#: g10/card-util.c:2155
 #, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "ошибка при на�тройке KDF: %s\n"
 
-#: g10/card-util.c:2188
+#: g10/card-util.c:2201
 #, fuzzy, c-format
 #| msgid "error for setup KDF: %s\n"
 msgid "error for setup UIF: %s\n"
 msgstr "ошибка при на�тройке KDF: %s\n"
 
-#: g10/card-util.c:2212 g10/keyedit.c:1263 tools/gpg-card.c:3649
+#: g10/card-util.c:2225 g10/keyedit.c:1263 tools/gpg-card.c:3666
 msgid "quit this menu"
 msgstr "выйти из �того меню"
 
-#: g10/card-util.c:2214
+#: g10/card-util.c:2227
 msgid "show admin commands"
 msgstr "показать админи�тративные команды"
 
-#: g10/card-util.c:2215 g10/keyedit.c:1266 tools/gpg-card.c:3652
+#: g10/card-util.c:2228 g10/keyedit.c:1266 tools/gpg-card.c:3669
 msgid "show this help"
 msgstr "показать данную �правку"
 
-#: g10/card-util.c:2217 tools/gpg-card.c:3654
+#: g10/card-util.c:2230 tools/gpg-card.c:3671
 msgid "list all available data"
 msgstr "выве�ти в�е до�тупные данные"
 
-#: g10/card-util.c:2220 tools/gpg-card.c:3656
+#: g10/card-util.c:2233 tools/gpg-card.c:3673
 msgid "change card holder's name"
 msgstr "изменить им� держател� карты"
 
-#: g10/card-util.c:2221 tools/gpg-card.c:3657
+#: g10/card-util.c:2234 tools/gpg-card.c:3674
 msgid "change URL to retrieve key"
 msgstr "изменить URL получени� ключа"
 
-#: g10/card-util.c:2222 tools/gpg-card.c:3658
+#: g10/card-util.c:2235 tools/gpg-card.c:3675
 msgid "fetch the key specified in the card URL"
 msgstr "запро�ить ключ по заданному картой URL"
 
-#: g10/card-util.c:2223 tools/gpg-card.c:3659
+#: g10/card-util.c:2236 tools/gpg-card.c:3676
 msgid "change the login name"
 msgstr "изменить им� учетной запи�и"
 
-#: g10/card-util.c:2224 tools/gpg-card.c:3660
+#: g10/card-util.c:2237 tools/gpg-card.c:3677
 msgid "change the language preferences"
 msgstr "изменить �зыковые предпочтени�"
 
-#: g10/card-util.c:2225 tools/gpg-card.c:3661
+#: g10/card-util.c:2238 tools/gpg-card.c:3678
 msgid "change card holder's salutation"
 msgstr "изменить привет�твие дл� держател� карты"
 
-#: g10/card-util.c:2227 tools/gpg-card.c:3663
+#: g10/card-util.c:2240 tools/gpg-card.c:3680
 msgid "change a CA fingerprint"
 msgstr "�менить отпечаток удо�товер�ющего центра"
 
-#: g10/card-util.c:2228 tools/gpg-card.c:3664
+#: g10/card-util.c:2241 tools/gpg-card.c:3681
 msgid "toggle the signature force PIN flag"
 msgstr "переключить признак 'подпи�ь требует PIN'"
 
-#: g10/card-util.c:2229 tools/gpg-card.c:3665
+#: g10/card-util.c:2242 tools/gpg-card.c:3682
 msgid "generate new keys"
 msgstr "�оздать новые ключи"
 
-#: g10/card-util.c:2230 tools/gpg-card.c:3666
+#: g10/card-util.c:2243 tools/gpg-card.c:3683
 msgid "menu to change or unblock the PIN"
 msgstr "меню изменени� или разблокировки PIN"
 
-#: g10/card-util.c:2231 tools/gpg-card.c:3667
+#: g10/card-util.c:2244 tools/gpg-card.c:3684
 msgid "verify the PIN and list all data"
 msgstr "проверить PIN и показать в�е данные"
 
-#: g10/card-util.c:2232 tools/gpg-card.c:3668
+#: g10/card-util.c:2245 tools/gpg-card.c:3685
 msgid "unblock the PIN using a Reset Code"
 msgstr "разблокировать PIN � помощью кода �бро�а"
 
-#: g10/card-util.c:2233 tools/gpg-card.c:3672
+#: g10/card-util.c:2246 tools/gpg-card.c:3689
 msgid "destroy all keys and data"
 msgstr "уничтожить в�е ключи и данные"
 
-#: g10/card-util.c:2235
+#: g10/card-util.c:2248
 #, fuzzy
 #| msgid "setup KDF for PIN authentication"
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr "на�троить KDF дл� проверки по PIN"
 
-#: g10/card-util.c:2236
+#: g10/card-util.c:2249
 msgid "change the key attribute"
 msgstr "изменить атрибут ключа"
 
-#: g10/card-util.c:2237 tools/gpg-card.c:3674
+#: g10/card-util.c:2250 tools/gpg-card.c:3691
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the User Interaction Flag"
 msgstr "изменить уровень довери� владельцу"
 
-#: g10/card-util.c:2361 tools/gpg-card.c:3924
+#: g10/card-util.c:2374 tools/gpg-card.c:3941
 msgid "gpg/card> "
 msgstr "gpg/card> "
 
-#: g10/card-util.c:2402
+#: g10/card-util.c:2415
 msgid "Admin-only command\n"
 msgstr "Команды админи�трировани�\n"
 
-#: g10/card-util.c:2433
+#: g10/card-util.c:2446
 msgid "Admin commands are allowed\n"
 msgstr "Команды админи�трировани� разрешены\n"
 
-#: g10/card-util.c:2435
+#: g10/card-util.c:2448
 msgid "Admin commands are not allowed\n"
 msgstr "Команды админи�трировани� не разрешены\n"
 
-#: g10/card-util.c:2546 g10/keyedit.c:2275 tools/gpg-card.c:3814
-#: tools/gpg-card.c:4072
+#: g10/card-util.c:2559 g10/keyedit.c:2275 tools/gpg-card.c:3831
+#: tools/gpg-card.c:4089
 #, c-format
 msgid "Invalid command  (try \"help\")\n"
 msgstr "�едопу�тима� команда (�пи�ок команд: \"help\")\n"
@@ -2166,22 +2181,22 @@ msgstr "�едопу�тима� команда (�пи�ок команд: \"he
 msgid "--output doesn't work for this command\n"
 msgstr "--output дл� данной команды не работает\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5293 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5292 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:1934 g10/export.c:2342 g10/export.c:2463
-#: g10/getkey.c:1907 g10/gpg.c:5238 g10/keyedit.c:1450 g10/keyedit.c:2382
-#: g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:703 g10/keyserver.c:1240
-#: g10/revoke.c:230 g10/tofu.c:2168
+#: g10/getkey.c:2032 g10/gpg.c:5237 g10/keyedit.c:1450 g10/keyedit.c:2382
+#: g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:703 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:2002 g10/getkey.c:1915 g10/getkey.c:4330
-#: g10/gpg.c:5247 g10/keyedit.c:2354 g10/keyserver.c:1258 g10/revoke.c:236
-#: g10/revoke.c:665 g10/tofu.c:2176
+#: g10/delkey.c:90 g10/export.c:2002 g10/getkey.c:2040 g10/getkey.c:4455
+#: g10/gpg.c:5246 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"
 msgstr "ошибка чтени� блока ключей: %s\n"
@@ -2305,14 +2320,14 @@ msgstr "алгоритм шифровани� '%s' нельз� и�пользо
 msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:555 g10/encrypt.c:808 g10/decrypt-data.c:261 g10/gpg.c:4083
-#: g10/gpg.c:4130 sm/decrypt.c:742 sm/encrypt.c:691 sm/gpgsm.c:1793
+#: g10/encrypt.c:555 g10/encrypt.c:808 g10/decrypt-data.c:261 g10/gpg.c:4080
+#: g10/gpg.c:4127 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1646
 #, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "алгоритм шифровани� '%s' нельз� и�пользовать в режиме %s\n"
 
-#: g10/encrypt.c:564 g10/gpg.c:4095 g10/gpg.c:4142 g10/sig-check.c:155
-#: g10/sign.c:452 sm/gpgsm.c:1803 sm/gpgsm.c:1813 sm/sign.c:596 sm/verify.c:510
+#: g10/encrypt.c:564 g10/gpg.c:4092 g10/gpg.c:4139 g10/sig-check.c:155
+#: g10/sign.c:452 sm/gpgsm.c:1656 sm/gpgsm.c:1666 sm/sign.c:596 sm/verify.c:510
 #, c-format
 msgid "digest algorithm '%s' may not be used in %s mode\n"
 msgstr "хеш-функцию '%s' нельз� и�пользовать в режиме %s\n"
@@ -2330,7 +2345,7 @@ msgstr ""
 "Внимание: принудительное и�пользование �имметричного шифра %s (%d)\n"
 "          нарушает предпочтени� получател�\n"
 
-#: g10/encrypt.c:838 sm/encrypt.c:766
+#: g10/encrypt.c:838 sm/encrypt.c:767
 #, c-format
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "Внимание: ключ %s не подходит дл� шифровани� в режиме %s\n"
@@ -2360,7 +2375,7 @@ msgstr "%s/%s зашифровано дл� пользовател� \"%s\"\n"
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "параметр '%s' нельз� и�пользовать в режиме %s\n"
 
-#: g10/decrypt-data.c:239 g10/mainproc.c:380 sm/decrypt.c:494
+#: g10/decrypt-data.c:239 g10/mainproc.c:380 sm/decrypt.c:892
 #, fuzzy, c-format
 #| msgid "%s encrypted data\n"
 msgid "%s.%s encrypted data\n"
@@ -2371,7 +2386,7 @@ msgstr "данные зашифрованы алгоритмом %s\n"
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "зашифровано неизве�тным алгоритмом %d\n"
 
-#: g10/decrypt-data.c:361 g10/decrypt-data.c:414 sm/decrypt.c:508
+#: g10/decrypt-data.c:361 g10/decrypt-data.c:414 sm/decrypt.c:906
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2413,7 +2428,7 @@ msgstr "пользовать�� архивным форматом ключей
 msgid " - skipped"
 msgstr " - пропущено"
 
-#: g10/export.c:1333 g10/import.c:2124 g10/openfile.c:202 g10/openfile.c:296
+#: g10/export.c:1333 g10/import.c:2132 g10/openfile.c:202 g10/openfile.c:296
 #: g10/sign.c:1110 g10/sign.c:1447
 #, c-format
 msgid "writing to '%s'\n"
@@ -2449,64 +2464,64 @@ msgstr "ошибка �оздани� '%s': %s\n"
 msgid "[User ID not found]"
 msgstr "[Идентификатор пользовател� не найден]"
 
-#: g10/getkey.c:1199
+#: g10/getkey.c:1324
 #, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "автоматиче�ки получили '%s' через %s\n"
 
-#: g10/getkey.c:1205
+#: g10/getkey.c:1330
 #, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "ошибка получени� '%s' через %s: %s\n"
 
-#: g10/getkey.c:1207
+#: g10/getkey.c:1332
 msgid "No fingerprint"
 msgstr "�ет отпечатка"
 
-#: g10/getkey.c:1449
+#: g10/getkey.c:1574
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr "пои�к обновленной копии про�роченного ключа по %s\n"
 
-#: g10/getkey.c:1884 g10/revoke.c:657 g10/revoke.c:718
+#: g10/getkey.c:2009 g10/revoke.c:658 g10/revoke.c:719
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "�екретный ключ \"%s\" не найден: %s\n"
 
-#: g10/getkey.c:1887 g10/pkclist.c:1012
+#: g10/getkey.c:2012 g10/pkclist.c:1012
 #, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "(проверьте аргумент параметра '%s')\n"
 
-#: g10/getkey.c:1965
+#: g10/getkey.c:2090
 #, c-format
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "Внимание: '%s' не и�пользует�� в каче�тве о�новного ключа: %s\n"
 
-#: g10/getkey.c:1973
+#: g10/getkey.c:2098
 #, c-format
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr ""
 "\"%s\" и�пользует�� в каче�тве о�новного �екретного ключа дл� подпи�и\n"
 
-#: g10/getkey.c:1980
+#: g10/getkey.c:2105
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr "в�е значени�, переданные в '%s', игнорируют��\n"
 
-#: g10/getkey.c:2837
+#: g10/getkey.c:2962
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Параметр --allow-non-selfsigned-uid �делал недо�товерный ключ %s "
 "до�товерным\n"
 
-#: g10/getkey.c:3703
+#: g10/getkey.c:3828
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "и�пользую подключ %s вме�то первичного ключа %s\n"
 
-#: g10/getkey.c:4259 g10/gpg.c:2167
+#: g10/getkey.c:4384 g10/gpg.c:2168
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "недопу�тимые значени� дл� параметра \"%s\"\n"
@@ -2693,7 +2708,7 @@ msgstr "|SPEC|уÑ�тановить Ñ�инонимы Ñ�лектронной поÑ
 msgid "use strict OpenPGP behavior"
 msgstr "�трого �ледовать �тандарту OpenPGP"
 
-#: g10/gpg.c:651 kbx/kbxutil.c:91 sm/gpgsm.c:424 tools/gpgconf.c:113
+#: g10/gpg.c:651 kbx/kbxutil.c:91 sm/gpgsm.c:425 tools/gpgconf.c:113
 msgid "do not make any changes"
 msgstr "не делать никаких изменений"
 
@@ -2729,7 +2744,7 @@ msgstr "иÑ�пользовать каноничеÑ�кий текÑ�товый Ñ€Ð
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|у�тановить уровень �жати� N (0 - без �жати�)"
 
-#: g10/gpg.c:762 sm/gpgsm.c:357
+#: g10/gpg.c:762 sm/gpgsm.c:358
 #, fuzzy
 #| msgid "Options controlling the interactivity and enforcement"
 msgid "Options controlling key import and export"
@@ -2749,11 +2764,11 @@ msgstr "импортировать недо�тающий ключ из подп
 msgid "include the public key in signatures"
 msgstr "вно�ить открытый ключ в подпи�и"
 
-#: g10/gpg.c:776 sm/gpgsm.c:360
+#: g10/gpg.c:776 sm/gpgsm.c:361
 msgid "disable all access to the dirmngr"
 msgstr "полно�тью запретить до�туп к dirmngr"
 
-#: g10/gpg.c:788 sm/gpgsm.c:367
+#: g10/gpg.c:788 sm/gpgsm.c:368
 #, fuzzy
 #| msgid "Options controlling the configuration"
 msgid "Options controlling key listings"
@@ -2773,15 +2788,15 @@ msgstr "|USER-ID|зашифровать дл� пользовател� USER-ID"
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|USER-ID|и�пользовать ключ USER-ID дл� подпи�и и ра�шифровки"
 
-#: g10/gpg.c:876 sm/gpgsm.c:408
+#: g10/gpg.c:876 sm/gpgsm.c:409
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:895 sm/gpgsm.c:420 dirmngr/dirmngr.c:286
+#: g10/gpg.c:895 sm/gpgsm.c:421 dirmngr/dirmngr.c:289
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:966 sm/gpgsm.c:453
+#: g10/gpg.c:966 sm/gpgsm.c:454
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2823,7 +2838,7 @@ msgstr ""
 "Подпи�и и их проверка, шифрование и ра�шифровка\n"
 "Дей�твие по умолчанию зави�ит от входных данных\n"
 
-#: g10/gpg.c:1168 sm/gpgsm.c:636
+#: g10/gpg.c:1168 sm/gpgsm.c:637
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2847,12 +2862,12 @@ msgstr "Хеш-функции: "
 msgid "Compression: "
 msgstr "�лгоритмы �жати�: "
 
-#: g10/gpg.c:1274 sm/gpgsm.c:710
+#: g10/gpg.c:1274 sm/gpgsm.c:711
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "вызов: %s [параметры] %s\n"
 
-#: g10/gpg.c:1467 sm/gpgsm.c:803
+#: g10/gpg.c:1467 sm/gpgsm.c:804
 #, c-format
 msgid "conflicting commands\n"
 msgstr "не�овме�тимые команды\n"
@@ -2862,64 +2877,64 @@ msgstr "не�овме�тимые команды\n"
 msgid "no = sign found in group definition '%s'\n"
 msgstr "в определении группы '%s' от�ут�твует знак =\n"
 
-#: g10/gpg.c:1683
+#: g10/gpg.c:1684
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "Внимание: небезопа�ный владелец домашнего каталога '%s'\n"
 
-#: g10/gpg.c:1686
+#: g10/gpg.c:1687
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "Внимание: небезопа�ный владелец файла на�троек '%s'\n"
 
-#: g10/gpg.c:1689
+#: g10/gpg.c:1690
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "Внимание: небезопа�ный владелец файла модул� ра�ширени� '%s'\n"
 
-#: g10/gpg.c:1695
+#: g10/gpg.c:1696
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "Внимание: небезопа�ные права до�тупа к домашнему каталогу '%s'\n"
 
-#: g10/gpg.c:1698
+#: g10/gpg.c:1699
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "Внимание: небезопа�ные права до�тупа к файлу на�троек '%s'\n"
 
-#: g10/gpg.c:1701
+#: g10/gpg.c:1702
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "Внимание: небезопа�ные права до�тупа к файлу модул� ра�ширени� '%s'\n"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1708
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr ""
 "Внимание: небезопа�ный владелец каталога, �одержащего домашний каталог '%s'\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1711
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr ""
 "Внимание: небезопа�ный владелец каталога, �одержащего файл на�троек '%s'\n"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1714
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr ""
 "Внимание: небезопа�ный владелец каталога,\n"
 "          �одержащего модуль ра�ширени� '%s'\n"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1720
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr ""
 "Внимание: небезопа�ные права до�тупа к каталогу,\n"
 "          �одержащему домашний каталог '%s'\n"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1723
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@ -2927,477 +2942,477 @@ msgstr ""
 "В�ИМ��ИЕ: небезопа�ные права до�тупа к каталогу,\n"
 "          �одержащему файл на�троек '%s'\n"
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1726
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr ""
 "Внимание: небезопа�ные права до�тупа к каталогу,\n"
 "          �одержащему файл модул� ра�ширени� '%s'\n"
 
-#: g10/gpg.c:1941
+#: g10/gpg.c:1942
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "неизве�тный �лемент в файле на�троек '%s'\n"
 
-#: g10/gpg.c:2037
+#: g10/gpg.c:2038
 msgid "display photo IDs during key listings"
 msgstr "показывать в �пи�ке ключей фотоидентификаторы"
 
-#: g10/gpg.c:2039
+#: g10/gpg.c:2040
 msgid "show key usage information during key listings"
 msgstr "показывать в �пи�ке ключей �ведени� о назначении ключа"
 
-#: g10/gpg.c:2041
+#: g10/gpg.c:2042
 msgid "show policy URLs during signature listings"
 msgstr "показывать в �пи�ке подпи�ей URL правил"
 
-#: g10/gpg.c:2043
+#: g10/gpg.c:2044
 msgid "show all notations during signature listings"
 msgstr "показывать в �пи�ке подпи�ей в�е замечани�"
 
-#: g10/gpg.c:2045
+#: g10/gpg.c:2046
 msgid "show IETF standard notations during signature listings"
 msgstr "показывать в �пи�ке подпи�ей замечани� �тандарта IETF"
 
-#: g10/gpg.c:2049
+#: g10/gpg.c:2050
 msgid "show user-supplied notations during signature listings"
 msgstr "показывать в �пи�ке подпи�ей пользователь�кие замечани�"
 
-#: g10/gpg.c:2051
+#: g10/gpg.c:2052
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "показывать в �пи�ке подпи�ей URL предпочтительных �ерверов ключей"
 
-#: g10/gpg.c:2053
+#: g10/gpg.c:2054
 msgid "show user ID validity during key listings"
 msgstr ""
 "показывать в �пи�ке ключей дей�твительно�ть идентификаторов пользователей"
 
-#: g10/gpg.c:2055
+#: g10/gpg.c:2056
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 "показывать в �пи�ке ключей отозванные и про�роченные идентификаторы "
 "пользователей"
 
-#: g10/gpg.c:2057
+#: g10/gpg.c:2058
 msgid "show revoked and expired subkeys in key listings"
 msgstr "показывать в �пи�ке ключей отозванные и про�роченные подключи"
 
-#: g10/gpg.c:2059
+#: g10/gpg.c:2060
 msgid "show the keyring name in key listings"
 msgstr "показывать в �пи�ке ключей название таблицы ключей"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2062
 msgid "show expiration dates during signature listings"
 msgstr "показывать в �пи�ке подпи�ей �роки дей�тви�"
 
-#: g10/gpg.c:2178
+#: g10/gpg.c:2179
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "неизве�тные правила TOFU '%s'\n"
 
-#: g10/gpg.c:2180
+#: g10/gpg.c:2181
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(\"help\" выведет �пи�ок вариантов)\n"
 
-#: g10/gpg.c:2975 g10/gpg.c:3828 g10/gpg.c:3840
+#: g10/gpg.c:2978 g10/gpg.c:3825 g10/gpg.c:3837
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "Замечание: %s не предназначен дл� нормального применени�!\n"
 
-#: g10/gpg.c:3151 g10/gpg.c:3163
+#: g10/gpg.c:3154 g10/gpg.c:3166
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "'%s' - не допу�тимый �рок дей�тви� подпи�и\n"
 
-#: g10/gpg.c:3185
+#: g10/gpg.c:3188
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "\"%s\" не �вл�ет�� адре�ом �лектронной почты\n"
 
-#: g10/gpg.c:3217 sm/gpgsm.c:1270
+#: g10/gpg.c:3220 sm/gpgsm.c:1143
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "недопу�тимый режим ввода парол� '%s'\n"
 
-#: g10/gpg.c:3223 sm/gpgsm.c:1276
+#: g10/gpg.c:3226 sm/gpgsm.c:1149
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "недопу�тимый и�точник запро�а '%s'\n"
 
-#: g10/gpg.c:3280
+#: g10/gpg.c:3283
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "'%s' - не допу�тима� таблица �имволов\n"
 
-#: g10/gpg.c:3302 g10/gpg.c:3511 g10/keyedit.c:5319
+#: g10/gpg.c:3305 g10/gpg.c:3514 g10/keyedit.c:5322
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "не могу интерпретировать URL �ервера ключей\n"
 
-#: g10/gpg.c:3320
+#: g10/gpg.c:3323
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: недопу�тимые параметры �ервера ключей\n"
 
-#: g10/gpg.c:3323
+#: g10/gpg.c:3326
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "недопу�тимые параметры �ервера ключей\n"
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3333
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: недопу�тимые параметры импорта\n"
 
-#: g10/gpg.c:3333
+#: g10/gpg.c:3336
 #, c-format
 msgid "invalid import options\n"
 msgstr "недопу�тимые параметры импорта\n"
 
-#: g10/gpg.c:3339 g10/gpg.c:3354
+#: g10/gpg.c:3342 g10/gpg.c:3357
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "недопу�тимый параметр фильтра: %s\n"
 
-#: g10/gpg.c:3345
+#: g10/gpg.c:3348
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: недопу�тимые параметры �к�порта\n"
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3351
 #, c-format
 msgid "invalid export options\n"
 msgstr "недопу�тимые параметры �к�порта\n"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3363
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: недопу�тимые параметры �пи�ка\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3366
 #, c-format
 msgid "invalid list options\n"
 msgstr "недопу�тимые параметры �пи�ка\n"
 
-#: g10/gpg.c:3371
+#: g10/gpg.c:3374
 msgid "display photo IDs during signature verification"
 msgstr "показать при проверке подпи�и фотоидентификаторы"
 
-#: g10/gpg.c:3373
+#: g10/gpg.c:3376
 msgid "show policy URLs during signature verification"
 msgstr "показать при проверке подпи�и URL правил"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3378
 msgid "show all notations during signature verification"
 msgstr "показать при проверке подпи�ей в�е замечани�"
 
-#: g10/gpg.c:3377
+#: g10/gpg.c:3380
 msgid "show IETF standard notations during signature verification"
 msgstr "показать при проверке подпи�ей замечани� �тандарта IETF"
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3384
 msgid "show user-supplied notations during signature verification"
 msgstr "показать при проверке подпи�ей пользователь�кие замечани�"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3386
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "показать при проверке подпи�ей URL предпочтительных �ерверов ключей"
 
-#: g10/gpg.c:3385
+#: g10/gpg.c:3388
 msgid "show user ID validity during signature verification"
 msgstr ""
 "показать при проверке подпи�ей дей�твительно�ть идентификаторов пользователей"
 
-#: g10/gpg.c:3387
+#: g10/gpg.c:3390
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 "показать при проверке подпи�ей отозванные и про�роченные идентификаторы "
 "пользовател�"
 
-#: g10/gpg.c:3389
+#: g10/gpg.c:3392
 msgid "show only the primary user ID in signature verification"
 msgstr ""
 "показать при проверке подпи�ей только первичный идентификатор пользовател�"
 
-#: g10/gpg.c:3396
+#: g10/gpg.c:3399
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: недопу�тимые параметры проверки\n"
 
-#: g10/gpg.c:3399
+#: g10/gpg.c:3402
 #, c-format
 msgid "invalid verify options\n"
 msgstr "недопу�тимые параметры проверки\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3409
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "не могу определить путь запу�ка дл� %s\n"
 
-#: g10/gpg.c:3613
+#: g10/gpg.c:3616
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: недопу�тимый �пи�ок auto-key-locate\n"
 
-#: g10/gpg.c:3616
+#: g10/gpg.c:3619
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "недопу�тимый �пи�ок auto-key-locate\n"
 
-#: g10/gpg.c:3625
+#: g10/gpg.c:3628
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "недопу�тимый аргумент дл� параметра \"%.50s\"\n"
 
-#: g10/gpg.c:3807 sm/gpgsm.c:1675
+#: g10/gpg.c:3804 sm/gpgsm.c:1528
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "Внимание: возможно �оздание файла образа пам�ти!\n"
 
-#: g10/gpg.c:3821
+#: g10/gpg.c:3818
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "Внимание: %s отмен�ет %s\n"
 
-#: g10/gpg.c:3830
+#: g10/gpg.c:3827
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s � %s недопу�тимо!\n"
 
-#: g10/gpg.c:3833
+#: g10/gpg.c:3830
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s � %s не имеет �мы�ла!\n"
 
-#: g10/gpg.c:3848 sm/gpgsm.c:1696 dirmngr/dirmngr.c:1123
+#: g10/gpg.c:3845 sm/gpgsm.c:1549 dirmngr/dirmngr.c:1160
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "Внимание: работаем � фальшивым �и�темным временем: "
 
-#: g10/gpg.c:3869
+#: g10/gpg.c:3866
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "отказываю�ь работать � небезопа�ной пам�тью из-за %s\n"
 
-#: g10/gpg.c:3897 g10/gpg.c:3928 sm/gpgsm.c:1763
+#: g10/gpg.c:3894 g10/gpg.c:3925 sm/gpgsm.c:1616
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "выбран недопу�тимый алгоритм шифровани�\n"
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3901
 #, fuzzy, c-format
 #| msgid "selected digest algorithm is invalid\n"
 msgid "selected AEAD algorithm is invalid\n"
 msgstr "выбрана недопу�тима� хеш-функци�\n"
 
-#: g10/gpg.c:3916
+#: g10/gpg.c:3913
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "выбран недопу�тимый алгоритм �жати�\n"
 
-#: g10/gpg.c:3922
+#: g10/gpg.c:3919
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "выбрана недопу�тима� хеш-функци� дл� �ертификации\n"
 
-#: g10/gpg.c:3937
+#: g10/gpg.c:3934
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed должен быть больше 0\n"
 
-#: g10/gpg.c:3939
+#: g10/gpg.c:3936
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed должен быть больше 1\n"
 
-#: g10/gpg.c:3941
+#: g10/gpg.c:3938
 #, 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:3943
+#: g10/gpg.c:3940
 #, 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:3945
+#: g10/gpg.c:3942
 #, 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:3949
+#: g10/gpg.c:3946
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Замечание: про�той режим S2K (0) �трого противопоказан\n"
 
-#: g10/gpg.c:3953
+#: g10/gpg.c:3950
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "недопу�тимый режим S2K; должно быть 0, 1 или 3\n"
 
-#: g10/gpg.c:3960
+#: g10/gpg.c:3957
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "недопу�тимые предпочтени� по умолчанию\n"
 
-#: g10/gpg.c:3964
+#: g10/gpg.c:3961
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "недопу�тимые личные предпочтени� шифра\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3964
 #, fuzzy, c-format
 #| msgid "invalid personal cipher preferences\n"
 msgid "invalid personal AEAD preferences\n"
 msgstr "недопу�тимые личные предпочтени� шифра\n"
 
-#: g10/gpg.c:3971
+#: g10/gpg.c:3968
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "недопу�тимые личные предпочтени� хеш-функции\n"
 
-#: g10/gpg.c:3975
+#: g10/gpg.c:3972
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "недопу�тимые личные предпочтени� алгоритмов �жати�\n"
 
-#: g10/gpg.c:3984 g10/gpg.c:3989
+#: g10/gpg.c:3981 g10/gpg.c:3986
 #, fuzzy, c-format
 #| msgid "keysize invalid; using %u bits\n"
 msgid "chunk size invalid - using %d\n"
 msgstr "неверный размер ключа; и�пользую %u бит\n"
 
-#: g10/gpg.c:4026
+#: g10/gpg.c:4023
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s пока не работает �овме�тно � %s!\n"
 
-#: g10/gpg.c:4089
+#: g10/gpg.c:4086
 #, 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:4101
+#: g10/gpg.c:4098
 #, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "алгоритм �жати� '%s' нельз� и�пользовать в режиме %s\n"
 
-#: g10/gpg.c:4256
+#: g10/gpg.c:4253
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "�бой инициализации таблицы довери�: %s\n"
 
-#: g10/gpg.c:4268
+#: g10/gpg.c:4265
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "В�ИМ��ИЕ: получатели (-r) заданы без и�пользовани� шифровани� � открытым "
 "ключом\n"
 
-#: g10/gpg.c:4340
+#: g10/gpg.c:4337
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "�бой �имметричного шифровани� '%s': %s\n"
 
-#: g10/gpg.c:4369
+#: g10/gpg.c:4366
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --encrypt нельз� и�пользовать �овме�тно � --s2k-mode 0\n"
 
-#: g10/gpg.c:4372
+#: g10/gpg.c:4369
 #, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "в режиме %s нельз� и�пользовать --symmetric --encrypt\n"
 
-#: g10/gpg.c:4430
+#: g10/gpg.c:4427
 #, 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:4433
+#: g10/gpg.c:4430
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "в режиме %s нельз� и�пользовать --symmetric --sign --encrypt\n"
 
-#: g10/gpg.c:4821 g10/keyserver.c:1870
+#: g10/gpg.c:4818 g10/keyserver.c:1629
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "�бой при отправке на �ервер ключей: %s\n"
 
-#: g10/gpg.c:4826
+#: g10/gpg.c:4823
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "�бой при получении � �ервера ключей: %s\n"
 
-#: g10/gpg.c:4832
+#: g10/gpg.c:4829
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "�бой при �к�порте ключа: %s\n"
 
-#: g10/gpg.c:4845
+#: g10/gpg.c:4842
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "�бой при �к�порте в виде ключа ssh: %s\n"
 
-#: g10/gpg.c:4857
+#: g10/gpg.c:4854
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "�бой при пои�ке на �ервере ключей: %s\n"
 
-#: g10/gpg.c:4870
+#: g10/gpg.c:4867
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "�бой при обновлении � �ервера ключей: %s\n"
 
-#: g10/gpg.c:4937
+#: g10/gpg.c:4936
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ошибка преобразовани� из тек�тового формата: %s\n"
 
-#: g10/gpg.c:4948
+#: g10/gpg.c:4947
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ошибка преобразовани� в тек�товый формат: %s\n"
 
-#: g10/gpg.c:5053
+#: g10/gpg.c:5052
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "недопу�тима� хеш-функци� '%s'\n"
 
-#: g10/gpg.c:5205 g10/tofu.c:2156
+#: g10/gpg.c:5204 g10/tofu.c:2160
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "ошибка �интак�иче�кого анализа �пецификации ключа '%s': %s\n"
 
-#: g10/gpg.c:5216
+#: g10/gpg.c:5215
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr "'%s' не �вл�ет�� идентификатором, отпечатком или кодом ключа\n"
 
-#: g10/gpg.c:5272
+#: g10/gpg.c:5271
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr "Внимание: команда не отдана. Пытаю�ь угадать, что имело�ь в виду ...\n"
 
-#: g10/gpg.c:5283
+#: g10/gpg.c:5282
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Пишите �ообщение ...\n"
 
-#: g10/gpg.c:5630
+#: g10/gpg.c:5629
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "заданный URL правил �ертификации неверен\n"
 
-#: g10/gpg.c:5632
+#: g10/gpg.c:5631
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "заданный URL правил подпи�и неверен\n"
 
-#: g10/gpg.c:5665
+#: g10/gpg.c:5664
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "заданный URL предпочтительного �ервера ключей неверен\n"
@@ -3410,7 +3425,7 @@ msgstr "|FILE|вз�ть ключи из файла таблицы ключей
 msgid "make timestamp conflicts only a warning"
 msgstr "при не�оответ�твии метки времени - только предупреждение"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:414 tools/gpgconf.c:116 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:415 tools/gpgconf.c:116 tools/gpg-card.c:95
 msgid "|FD|write status info to this FD"
 msgstr "|FD|выводить информацию в файл � де�криптором FD"
 
@@ -3499,97 +3514,97 @@ msgstr "ожидать ключи в архивном формате GnuPG"
 msgid "repair keys on import"
 msgstr "и�правл�ть ключи при импорте"
 
-#: g10/import.c:399 g10/import.c:721
+#: g10/import.c:407 g10/import.c:729
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "пропущен блок типа %d\n"
 
-#: g10/import.c:738
+#: g10/import.c:746
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "обработано %lu ключей\n"
 
-#: g10/import.c:831
+#: g10/import.c:839
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "В�его обработано: %lu\n"
 
-#: g10/import.c:834
+#: g10/import.c:842
 #, c-format
 msgid "    skipped PGP-2 keys: %lu\n"
 msgstr "        пропущено ключей PGP-2: %lu\n"
 
-#: g10/import.c:836
+#: g10/import.c:844
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "        пропущено новых ключей: %lu\n"
 
-#: g10/import.c:839
+#: g10/import.c:847
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "           без идентификатора пользовател�: %lu\n"
 
-#: g10/import.c:842 sm/import.c:129
+#: g10/import.c:850 sm/import.c:129
 #, c-format
 msgid "              imported: %lu"
 msgstr "                 импортировано: %lu"
 
-#: g10/import.c:846 sm/import.c:133
+#: g10/import.c:854 sm/import.c:133
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                  неизмененных: %lu\n"
 
-#: g10/import.c:848
+#: g10/import.c:856
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "         новых идентификаторов пользовател�: %lu\n"
 
-#: g10/import.c:850
+#: g10/import.c:858
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "               новых подключей: %lu\n"
 
-#: g10/import.c:852
+#: g10/import.c:860
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "                новых подпи�ей: %lu\n"
 
-#: g10/import.c:854
+#: g10/import.c:862
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "          новых отзывов ключей: %lu\n"
 
-#: g10/import.c:856 sm/import.c:135
+#: g10/import.c:864 sm/import.c:135
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "    прочитано �екретных ключей: %lu\n"
 
-#: g10/import.c:858 sm/import.c:137
+#: g10/import.c:866 sm/import.c:137
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "импортировано �екретных ключей: %lu\n"
 
-#: g10/import.c:860 sm/import.c:139
+#: g10/import.c:868 sm/import.c:139
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " неизмененных �екретных ключей: %lu\n"
 
-#: g10/import.c:862 sm/import.c:141
+#: g10/import.c:870 sm/import.c:141
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "             не импортировано: %lu\n"
 
-#: g10/import.c:864
+#: g10/import.c:872
 #, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "             очищено подпи�ей: %lu\n"
 
-#: g10/import.c:866
+#: g10/import.c:874
 #, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "     очищено идентификаторов пользователей: %lu\n"
 
-#: g10/import.c:1291
+#: g10/import.c:1299
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
@@ -3598,175 +3613,175 @@ msgstr ""
 "Внимание: ключ %s �одержит предпочтени� дл� недо�тупных\n"
 "алгоритмов дл� �ледующих идентификаторов пользователей:\n"
 
-#: g10/import.c:1333
+#: g10/import.c:1341
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": предпочитает шифр %s\n"
 
-#: g10/import.c:1351
+#: g10/import.c:1359
 #, fuzzy, c-format
 #| msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgid "         \"%s\": preference for AEAD algorithm %s\n"
 msgstr "         \"%s\": предпочитает шифр %s\n"
 
-#: g10/import.c:1366
+#: g10/import.c:1374
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": предпочитает хеш-функцию %s\n"
 
-#: g10/import.c:1378
+#: g10/import.c:1386
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": предпочитает алгоритм �жати� %s\n"
 
-#: g10/import.c:1391
+#: g10/import.c:1399
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "крайне желательно, чтобы Вы обновили �вои предпочтени� и\n"
 
-#: g10/import.c:1393
+#: g10/import.c:1401
 #, c-format
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "ра�про�транили �тот ключ во избежание возможных не�тыковок алгоритмов\n"
 
-#: g10/import.c:1418
+#: g10/import.c:1426
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 "�вои предпочтени� можно обновить командой gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:1932 g10/import.c:3053
+#: g10/import.c:1940 g10/import.c:3061
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "ключ %s: нет идентификатора пользовател�\n"
 
-#: g10/import.c:1938
+#: g10/import.c:1946
 #, c-format
 msgid "key %s: %s\n"
 msgstr "ключ %s: %s\n"
 
-#: g10/import.c:1939 g10/import.c:3025
+#: g10/import.c:1947 g10/import.c:3033
 msgid "rejected by import screener"
 msgstr "и�ключен фильтром импорта"
 
-#: g10/import.c:1988
+#: g10/import.c:1996
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "ключ %s: повреждение подключа PKS и�правлено\n"
 
-#: g10/import.c:2009
+#: g10/import.c:2017
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr ""
 "ключ %s: прин�т без �амозаверенного идентификатора пользовател� \"%s\"\n"
 
-#: g10/import.c:2020 g10/import.c:2051
+#: g10/import.c:2028 g10/import.c:2059
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "ключ %s: нет дей�твительных идентификаторов пользовател�\n"
 
-#: g10/import.c:2022
+#: g10/import.c:2030
 #, c-format
 msgid "this may be caused by a missing self-signature\n"
 msgstr "может быть, из-за от�ут�тви� �амоподпи�и\n"
 
-#: g10/import.c:2101 g10/import.c:3439
+#: g10/import.c:2109 g10/import.c:3447
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "ключ %s: не найден открытый ключ: %s\n"
 
-#: g10/import.c:2107
+#: g10/import.c:2115
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "ключ %s: новый ключ - пропущен\n"
 
-#: g10/import.c:2119
+#: g10/import.c:2127
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "нет до�тупной дл� запи�и таблицы ключей: %s\n"
 
-#: g10/import.c:2151 g10/import.c:2253 g10/import.c:3514
+#: g10/import.c:2159 g10/import.c:2261 g10/import.c:3522
 #, c-format
 msgid "error writing keyring '%s': %s\n"
 msgstr "ошибка запи�и таблицы ключей '%s': %s\n"
 
-#: g10/import.c:2174
+#: g10/import.c:2182
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "ключ %s: импортирован открытый ключ \"%s\"\n"
 
-#: g10/import.c:2201
+#: g10/import.c:2209
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "ключ %s: не �овпадает � нашей копией\n"
 
-#: g10/import.c:2269
+#: g10/import.c:2277
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "ключ %s: \"%s\" 1 новый идентификатор пользовател�\n"
 
-#: g10/import.c:2272
+#: g10/import.c:2280
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "ключ %s: \"%s\" %d новых идентификаторов пользовател�\n"
 
-#: g10/import.c:2275
+#: g10/import.c:2283
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "ключ %s: \"%s\" 1 нова� подпи�ь\n"
 
-#: g10/import.c:2278
+#: g10/import.c:2286
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "ключ %s: \"%s\" %d новых подпи�ей\n"
 
-#: g10/import.c:2281
+#: g10/import.c:2289
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "ключ %s: \"%s\" 1 новый подключ\n"
 
-#: g10/import.c:2284
+#: g10/import.c:2292
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "ключ %s: \"%s\" %d новых подключей\n"
 
-#: g10/import.c:2287
+#: g10/import.c:2295
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "ключ %s: \"%s\" %d подпи�ь очищена\n"
 
-#: g10/import.c:2290
+#: g10/import.c:2298
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "ключ %s: \"%s\" %d подпи�ей очищено\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2301
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "ключ %s: \"%s\" %d идентификатор пользовател� очищен\n"
 
-#: g10/import.c:2296
+#: g10/import.c:2304
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "ключ %s: \"%s\" %d идентификаторов пользовател� очищено\n"
 
-#: g10/import.c:2332
+#: g10/import.c:2340
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "ключ %s: \"%s\" не изменен\n"
 
-#: g10/import.c:2692 g10/import.c:2887
+#: g10/import.c:2700 g10/import.c:2895
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "ключ %s: импортирован �екретный ключ\n"
 
-#: g10/import.c:2700
+#: g10/import.c:2708
 #, c-format
 msgid "key %s: secret key already exists\n"
 msgstr "ключ %s: �екретный ключ уже имеет��\n"
 
-#: g10/import.c:2708
+#: g10/import.c:2716
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "ключ %s: ошибка отправки в агент: %s\n"
@@ -3779,209 +3794,208 @@ msgstr "ключ %s: ошибка отправки в агент: %s\n"
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2877
+#: g10/import.c:2885
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr "Дл� перено�а '%s' выполните на каждой криптографиче�кой карте: %s\n"
 
-#: g10/import.c:3024
+#: g10/import.c:3032
 #, c-format
 msgid "secret key %s: %s\n"
 msgstr "�екретный ключ %s: %s\n"
 
-#: g10/import.c:3045 g10/import.c:3084
+#: g10/import.c:3053 g10/import.c:3092
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "импорт �екретного ключа не допу�кает��\n"
 
-#: g10/import.c:3072
+#: g10/import.c:3080
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "ключ %s: �екретный ключ � недопу�тимым шифром %d - пропущен\n"
 
-#: g10/import.c:3234 g10/pkclist.c:75 g10/revoke.c:774
+#: g10/import.c:3242 g10/pkclist.c:75 g10/revoke.c:775
 msgid "No reason specified"
 msgstr "Причина не указана"
 
-#: g10/import.c:3235 g10/pkclist.c:77 g10/revoke.c:776
+#: g10/import.c:3243 g10/pkclist.c:77 g10/revoke.c:777
 msgid "Key is superseded"
 msgstr "Ключ заменен другим"
 
-#: g10/import.c:3236 g10/pkclist.c:79 g10/revoke.c:775
+#: g10/import.c:3244 g10/pkclist.c:79 g10/revoke.c:776
 msgid "Key has been compromised"
 msgstr "Ключ был ра�крыт"
 
-#: g10/import.c:3237 g10/pkclist.c:81 g10/revoke.c:777
+#: g10/import.c:3245 g10/pkclist.c:81 g10/revoke.c:778
 msgid "Key is no longer used"
 msgstr "Ключ больше не и�пользует��"
 
-#: g10/import.c:3238 g10/pkclist.c:83 g10/revoke.c:778
+#: g10/import.c:3246 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "Идентификатор пользовател� больше не дей�твителен"
 
-#: g10/import.c:3363 g10/keylist.c:1105 g10/pkclist.c:87
+#: g10/import.c:3371 g10/keylist.c:1105 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "причина отзыва: "
 
-#: g10/import.c:3382 g10/keylist.c:1124 g10/pkclist.c:103
+#: g10/import.c:3390 g10/keylist.c:1124 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "по��нение к отзыву: "
 
-#: g10/import.c:3432
+#: g10/import.c:3440
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "ключ %s: нет открытого ключа - не могу применить �ертификат отзыва\n"
 
-#: g10/import.c:3461
+#: g10/import.c:3469
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "ключ %s: оригинальный блок ключей не найден: %s\n"
 
-#: g10/import.c:3468
+#: g10/import.c:3476
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "ключ %s: оригинальный блок ключей не читает��: %s\n"
 
-#: g10/import.c:3488
+#: g10/import.c:3496
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "ключ %s: недей�твительный �ертификат отзыва: %s - отвергнут\n"
 
-#: g10/import.c:3523
+#: g10/import.c:3531
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "ключ %s: �ертификат отзыва \"%s\" импортирован\n"
 
-#: g10/import.c:3609
+#: g10/import.c:3617
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "ключ %s: нет идентификатора пользовател� дл� подпи�и\n"
 
-#: g10/import.c:3626
+#: g10/import.c:3634
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "ключ %s: алгоритм � открытым ключом у идентификатора пользовател� \"%s\" не "
 "поддерживает��\n"
 
-#: g10/import.c:3628
+#: g10/import.c:3636
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr ""
 "ключ %s: неправильна� �амоподпи�ь на идентификаторе пользовател� \"%s\"\n"
 
-#: g10/import.c:3645 g10/import.c:3673 g10/import.c:3729
+#: g10/import.c:3653 g10/import.c:3681 g10/import.c:3737
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "ключ %s: алгоритм � открытым ключом не поддерживает��\n"
 
-#: g10/import.c:3646
+#: g10/import.c:3654
 #, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "ключ %s: недей�твительна� пр�ма� подпи�ь ключа\n"
 
-#: g10/import.c:3660
+#: g10/import.c:3668
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "ключ %s: нет подключа дл� �в�зывани� ключей\n"
 
-#: g10/import.c:3675
+#: g10/import.c:3683
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "ключ %s: недопу�тима� �в�зь подключей\n"
 
-#: g10/import.c:3694
+#: g10/import.c:3702
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "ключ %s: удалена многократна� �в�зь подключей\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3726
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "ключ %s: нет подключа дл� отзыва ключа\n"
 
-#: g10/import.c:3731
+#: g10/import.c:3739
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "ключ %s: неверный отзыв подключа\n"
 
-#: g10/import.c:3746
+#: g10/import.c:3754
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "ключ %s: удален многократный отзыв подключей\n"
 
-#: g10/import.c:3790
+#: g10/import.c:3798
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "ключ %s: пропущен идентификатор пользовател� \"%s\"\n"
 
-#: g10/import.c:3817
+#: g10/import.c:3825
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "ключ %s: пропущен подключ\n"
 
-#: g10/import.c:3849
+#: g10/import.c:3857
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "ключ %s: не�к�портируема� подпи�ь (кла�� 0x%02X) - пропущена\n"
 
-#: g10/import.c:3860
+#: g10/import.c:3868
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "ключ %s: �ертификат отзыва в неправильном ме�те - пропущен\n"
 
-#: g10/import.c:3878
+#: g10/import.c:3886
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "ключ %s: недей�твительный �ертификат отзыва: %s - пропущен\n"
 
-#: g10/import.c:3892
+#: g10/import.c:3900
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "ключ %s: подпи�ь подключа в неправильном ме�те - пропущена\n"
 
-#: g10/import.c:3900
+#: g10/import.c:3908
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "ключ %s: неожиданный кла�� подпи�и (0x%02X) - пропущена\n"
 
-#: g10/import.c:4073
+#: g10/import.c:4081
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr ""
 "ключ %s: обнаружено дублирование идентификатора пользовател� - объединены\n"
 
-#: g10/import.c:4180
+#: g10/import.c:4188
 #, fuzzy, c-format
 #| msgid "key %s: duplicated user ID detected - merged\n"
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr ""
 "ключ %s: обнаружено дублирование идентификатора пользовател� - объединены\n"
 
-#: g10/import.c:4245
+#: g10/import.c:4253
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "Внимание: ключ %s, возможно, отозван: запрашиваю ключ отзыва %s\n"
 
-#: g10/import.c:4261
+#: g10/import.c:4269
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "Внимание: ключ %s, возможно, отозван: ключ отзыва %s от�ут�твует.\n"
 
-#: g10/import.c:4327
+#: g10/import.c:4335
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "ключ %s: добавлен �ертификат отзыва \"%s\"\n"
 
-#: g10/import.c:4365
+#: g10/import.c:4373
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "ключ %s: добавлена пр�ма� подпи�ь ключа\n"
 
-#: g10/key-check.c:133 dirmngr/dirmngr_ldap.c:650 dirmngr/ldap-wrapper.c:835
-#: dirmngr/ldap-wrapper.c:852
+#: g10/key-check.c:133 dirmngr/ldap-wrapper.c:835 dirmngr/ldap-wrapper.c:852
 #, c-format
 msgid "error allocating memory: %s\n"
 msgstr "ошибка выделени� пам�ти: %s\n"
@@ -4049,7 +4063,7 @@ msgstr ""
 "Внимание: обнаружены ошибки, провер�ли�ь только �амоподпи�и; дл� проверки "
 "в�ех подпи�ей выполните '%s'.\n"
 
-#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:284 sm/keydb.c:297
+#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:289 sm/keydb.c:302
 #, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "ошибка �оздани� щита � ключами '%s': %s\n"
@@ -4059,7 +4073,7 @@ msgstr "ошибка �оздани� щита � ключами '%s': %s\n"
 msgid "error creating keyring '%s': %s\n"
 msgstr "ошибка �оздани� таблицы ключей '%s': %s\n"
 
-#: g10/keydb.c:388 sm/keydb.c:303
+#: g10/keydb.c:388 sm/keydb.c:308
 #, c-format
 msgid "keybox '%s' created\n"
 msgstr "�оздан щит � ключами '%s'\n"
@@ -4314,8 +4328,8 @@ msgstr "Этот ключ проверен мной очень тщательнÐ
 msgid "Really sign? (y/N) "
 msgstr "Дей�твительно подпи�ать? (y/N) "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6192 g10/keyedit.c:6275 g10/keyedit.c:6404
-#: g10/keyedit.c:6466 g10/sign.c:528
+#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
+#: g10/keyedit.c:6474 g10/sign.c:528
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "подпи�ать не удало�ь: %s\n"
@@ -4695,7 +4709,7 @@ msgstr "Ð�ет подходÑ�щих идентификаторов пользоÐ
 msgid "Nothing to sign.\n"
 msgstr "Подпи�ывать нечего.\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6057
+#: g10/keyedit.c:2973 g10/keyedit.c:6065
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "Вами не подпи�ано.\n"
@@ -4764,7 +4778,7 @@ msgstr "Данный ключ может быть отозван пользовÐ
 msgid "(sensitive)"
 msgstr "(о�обо важный)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:525
+#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "     �оздан: %s"
@@ -4780,7 +4794,7 @@ msgid "expired: %s"
 msgstr "про�рочен �: %s"
 
 #: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2262
-#: g10/keyserver.c:531
+#: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "   годен до: %s"
@@ -4819,13 +4833,13 @@ msgstr ""
 "Учтите, что показанна� до�товерно�ть ключа может быть неверной,\n"
 "пока Вы не перезапу�тите программу.\n"
 
-#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:535
-#: g10/mainproc.c:2280 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
+#: g10/mainproc.c:2282 g10/tofu.c:1789 g10/trust.c:426 dirmngr/ocsp.c:792
 msgid "revoked"
 msgstr "отозван"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:539
-#: g10/mainproc.c:2282 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
+#: g10/mainproc.c:2284 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "про�рочен"
 
@@ -4867,7 +4881,7 @@ msgstr "Вы уверены, что хотите добавить �то? (y/N)
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "�ельз� добавить фотоидентификатор в ключ типа PGP2.\n"
 
-#: g10/keyedit.c:4273 g10/keygen.c:3107
+#: g10/keyedit.c:4273 g10/keygen.c:3111
 msgid "Such a user ID already exists on this key!\n"
 msgstr "Такой идентификатор пользовател� на �том ключе уже е�ть!\n"
 
@@ -5010,7 +5024,7 @@ msgstr "подключ %s не дл� подпи�ей, он не нуждает
 msgid "Please select exactly one user ID.\n"
 msgstr "Выберите ровно один идентификатор пользовател�.\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5357 g10/keyedit.c:5495
+#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "пропу�к �амоподпи�и v3 на идентификаторе пользовател� \"%s\"\n"
@@ -5019,129 +5033,129 @@ msgstr "пропу�к �амоподпи�и v3 на идентификатор
 msgid "Enter your preferred keyserver URL: "
 msgstr "Введите URL предпочтительного �ервера ключей: "
 
-#: g10/keyedit.c:5380
+#: g10/keyedit.c:5383
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Вы дей�твительно хотите заменить его? (y/N) "
 
-#: g10/keyedit.c:5381
+#: g10/keyedit.c:5384
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Вы дей�твительно хотите удалить его? (y/N) "
 
-#: g10/keyedit.c:5441
+#: g10/keyedit.c:5449
 msgid "Enter the notation: "
 msgstr "Введите замечание: "
 
-#: g10/keyedit.c:5588
+#: g10/keyedit.c:5596
 msgid "Proceed? (y/N) "
 msgstr "Продолжить? (y/N) "
 
-#: g10/keyedit.c:5658
+#: g10/keyedit.c:5666
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "�ет идентификатора пользовател� � индек�ом %d\n"
 
-#: g10/keyedit.c:5720
+#: g10/keyedit.c:5728
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "�ет идентификатора пользовател� � хешем %s\n"
 
-#: g10/keyedit.c:5821
+#: g10/keyedit.c:5829
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "�ет подключа � идентификатором ключа '%s'.\n"
 
-#: g10/keyedit.c:5843
+#: g10/keyedit.c:5851
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "�ет подключа � индек�ом %d\n"
 
-#: g10/keyedit.c:5984
+#: g10/keyedit.c:5992
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Идентификатор пользовател�: \"%s\"\n"
 
-#: g10/keyedit.c:5987 g10/keyedit.c:6089 g10/keyedit.c:6137
+#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "подпи�ано Вашим ключом %s %s%s%s\n"
 
-#: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
+#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
 msgid " (non-exportable)"
 msgstr " (не�к�портируема�)"
 
-#: g10/keyedit.c:5993
+#: g10/keyedit.c:6001
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Срок дей�тви� подпи�и и�тек %s.\n"
 
-#: g10/keyedit.c:5998
+#: g10/keyedit.c:6006
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Вы уверены, что хотите отозвать? (y/N) "
 
-#: g10/keyedit.c:6003
+#: g10/keyedit.c:6011
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Создать �ертификат отзыва дл� данной подпи�и? (y/N) "
 
-#: g10/keyedit.c:6063
+#: g10/keyedit.c:6071
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Вы подпи�али �ти идентификаторы пользователей на ключе %s:\n"
 
-#: g10/keyedit.c:6092
+#: g10/keyedit.c:6100
 msgid " (non-revocable)"
 msgstr " (неотзываема�)"
 
-#: g10/keyedit.c:6099
+#: g10/keyedit.c:6107
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "отозвано Вашим ключом %s %s\n"
 
-#: g10/keyedit.c:6124
+#: g10/keyedit.c:6132
 msgid "You are about to revoke these signatures:\n"
 msgstr "Вы отзываете �ледующие подпи�и:\n"
 
-#: g10/keyedit.c:6147
+#: g10/keyedit.c:6155
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Дей�твительно �оздать �ертификат отзыва? (y/N) "
 
-#: g10/keyedit.c:6180
+#: g10/keyedit.c:6188
 #, c-format
 msgid "no secret key\n"
 msgstr "нет �екретного ключа\n"
 
-#: g10/keyedit.c:6228
+#: g10/keyedit.c:6236
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr "попытка отзыва непользователь�кого идентификатора: %s\n"
 
-#: g10/keyedit.c:6238
+#: g10/keyedit.c:6246
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "Идентификатор пользовател� \"%s\" уже отозван\n"
 
-#: g10/keyedit.c:6255
+#: g10/keyedit.c:6263
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "Внимание: подпи�ь идентификатора пользовател� датирована %d �екундами в "
 "будущем\n"
 
-#: g10/keyedit.c:6351
+#: g10/keyedit.c:6359
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "�ельз� удал�ть по�ледний дей�твительный идентификатор пользовател�.\n"
 
-#: g10/keyedit.c:6389
+#: g10/keyedit.c:6397
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Ключ %s уже отозван.\n"
 
-#: g10/keyedit.c:6451
+#: g10/keyedit.c:6459
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Подключ %s уже отозван.\n"
 
-#: g10/keyedit.c:6548
+#: g10/keyedit.c:6556
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -5153,64 +5167,64 @@ msgstr ""
 msgid "invalid value for option '%s'\n"
 msgstr "недопу�тимое значени� параметра \"%s\"\n"
 
-#: g10/keygen.c:338
+#: g10/keygen.c:339
 #, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "предпочтение '%s' дублирует��\n"
 
-#: g10/keygen.c:345
+#: g10/keygen.c:346
 #, c-format
 msgid "too many cipher preferences\n"
 msgstr "�лишком много предпочтений шифров\n"
 
-#: g10/keygen.c:347
+#: g10/keygen.c:348
 #, c-format
 msgid "too many digest preferences\n"
 msgstr "�лишком много предпочтений хеш-функций\n"
 
-#: g10/keygen.c:349
+#: g10/keygen.c:350
 #, c-format
 msgid "too many compression preferences\n"
 msgstr "�лишком много предпочтений методов �жати�\n"
 
-#: g10/keygen.c:351
+#: g10/keygen.c:352
 #, fuzzy, c-format
 #| msgid "too many cipher preferences\n"
 msgid "too many AEAD preferences\n"
 msgstr "�лишком много предпочтений шифров\n"
 
-#: g10/keygen.c:521
+#: g10/keygen.c:522
 #, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "недопу�тимый �лемент '%s' в �троке предпочтений\n"
 
-#: g10/keygen.c:1130
+#: g10/keygen.c:1131
 #, c-format
 msgid "writing direct signature\n"
 msgstr "запи�ь пр�мой подпи�и\n"
 
-#: g10/keygen.c:1176
+#: g10/keygen.c:1177
 #, c-format
 msgid "writing self signature\n"
 msgstr "запи�ь �амоподпи�и\n"
 
-#: g10/keygen.c:1233
+#: g10/keygen.c:1234
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "запи�ь �в�зующей подпи�и\n"
 
-#: g10/keygen.c:1598 g10/keygen.c:1603 g10/keygen.c:1655 g10/keygen.c:1660
-#: g10/keygen.c:1832 g10/keygen.c:1837
+#: g10/keygen.c:1599 g10/keygen.c:1604 g10/keygen.c:1656 g10/keygen.c:1661
+#: g10/keygen.c:1833 g10/keygen.c:1838
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "неверный размер ключа; и�пользую %u бит\n"
 
-#: g10/keygen.c:1609 g10/keygen.c:1666 g10/keygen.c:1674 g10/keygen.c:1843
+#: g10/keygen.c:1610 g10/keygen.c:1667 g10/keygen.c:1675 g10/keygen.c:1844
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "размер ключа округлен вверх до %u бит\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1701
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
@@ -5218,19 +5232,19 @@ msgstr ""
 "Внимание: некоторые реализации OpenPGP не могут обрабатывать ключи DSA � "
 "такой длиной хеша\n"
 
-#: g10/keygen.c:1899
+#: g10/keygen.c:1900
 msgid "Sign"
 msgstr "Подпи�ать"
 
-#: g10/keygen.c:1902
+#: g10/keygen.c:1903
 msgid "Certify"
 msgstr "Заверить"
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1906
 msgid "Encrypt"
 msgstr "Зашифровать"
 
-#: g10/keygen.c:1908
+#: g10/keygen.c:1909
 msgid "Authenticate"
 msgstr "Удо�товерить лично�ть"
 
@@ -5244,180 +5258,180 @@ msgstr "Удо�товерить лично�ть"
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1929
+#: g10/keygen.c:1930
 msgid "SsEeAaQq"
 msgstr "11223300"
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1967
 #, fuzzy, c-format
 #| msgid "Possible actions for a %s key: "
 msgid "Possible actions for this %s key: "
 msgstr "Возможные дей�тви� дл� ключа %s: "
 
-#: g10/keygen.c:1973
+#: g10/keygen.c:1974
 msgid "Current allowed actions: "
 msgstr "Допу�тимы дей�тви�: "
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1979
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Переключить возможно�ть подпи�и\n"
 
-#: g10/keygen.c:1981
+#: g10/keygen.c:1982
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Переключить возможно�ть шифровани�\n"
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1985
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Переключить возможно�ть удо�товерени� лично�ти\n"
 
-#: g10/keygen.c:1987
+#: g10/keygen.c:1988
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Завершено\n"
 
-#: g10/keygen.c:2116
+#: g10/keygen.c:2117
 #, fuzzy, c-format
 #| msgid "   (%d) RSA and RSA (default)\n"
 msgid "   (%d) RSA and RSA%s\n"
 msgstr "   (%d) RSA и RSA (по умолчанию)\n"
 
-#: g10/keygen.c:2120
+#: g10/keygen.c:2121
 #, fuzzy, c-format
 #| msgid "   (%d) DSA and Elgamal\n"
 msgid "   (%d) DSA and Elgamal%s\n"
 msgstr "   (%d) DSA и Elgamal\n"
 
-#: g10/keygen.c:2123
+#: g10/keygen.c:2124
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "   (%d) DSA (sign only)%s\n"
 msgstr "   (%d) DSA (только дл� подпи�и)\n"
 
-#: g10/keygen.c:2125
+#: g10/keygen.c:2126
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (sign only)\n"
 msgid "   (%d) RSA (sign only)%s\n"
 msgstr "   (%d) RSA (только дл� подпи�и)\n"
 
-#: g10/keygen.c:2131
+#: g10/keygen.c:2132
 #, fuzzy, c-format
 #| msgid "   (%d) Elgamal (encrypt only)\n"
 msgid "   (%d) Elgamal (encrypt only)%s\n"
 msgstr "   (%d) Elgamal (только дл� шифровани�)\n"
 
-#: g10/keygen.c:2133
+#: g10/keygen.c:2134
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (encrypt only)\n"
 msgid "   (%d) RSA (encrypt only)%s\n"
 msgstr "   (%d) RSA (только дл� шифровани�)\n"
 
-#: g10/keygen.c:2139
+#: g10/keygen.c:2140
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (set your own capabilities)\n"
 msgid "   (%d) DSA (set your own capabilities)%s\n"
 msgstr "   (%d) DSA (задать возможно�ти)\n"
 
-#: g10/keygen.c:2141
+#: g10/keygen.c:2142
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (set your own capabilities)\n"
 msgid "   (%d) RSA (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (задать возможно�ти)\n"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2148
 #, fuzzy, c-format
 #| msgid "   (%d) sign, encrypt\n"
 msgid "   (%d) ECC (sign and encrypt)%s\n"
 msgstr "   (%d) подпи�ь, шифрование\n"
 
-#: g10/keygen.c:2147 g10/keygen.c:2678
+#: g10/keygen.c:2148 g10/keygen.c:2679
 msgid " *default*"
 msgstr ""
 
-#: g10/keygen.c:2148
+#: g10/keygen.c:2149
 #, c-format
 msgid "  (%d) ECC (sign only)\n"
 msgstr "  (%d) ECC (только дл� подпи�и)\n"
 
-#: g10/keygen.c:2150
+#: g10/keygen.c:2151
 #, fuzzy, c-format
 #| msgid "  (%d) ECC (set your own capabilities)\n"
 msgid "  (%d) ECC (set your own capabilities)%s\n"
 msgstr "  (%d) ECC (задать возможно�ти)\n"
 
-#: g10/keygen.c:2152
+#: g10/keygen.c:2153
 #, fuzzy, c-format
 #| msgid "  (%d) ECC (encrypt only)\n"
 msgid "  (%d) ECC (encrypt only)%s\n"
 msgstr "  (%d) ECC (только дл� шифровани�)\n"
 
-#: g10/keygen.c:2156
+#: g10/keygen.c:2157
 #, fuzzy, c-format
 #| msgid "  (%d) Existing key\n"
 msgid "  (%d) Existing key%s\n"
 msgstr "  (%d) Имеющий�� ключ\n"
 
-#: g10/keygen.c:2158
+#: g10/keygen.c:2159
 #, fuzzy, c-format
 #| msgid "  (%d) Existing key from card\n"
 msgid "  (%d) Existing key from card%s\n"
 msgstr "  (%d) Имеющий�� на карте ключ\n"
 
-#: g10/keygen.c:2254 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2255 sm/certreqgen-ui.c:203
 msgid "Enter the keygrip: "
 msgstr "Введите код ключа:"
 
-#: g10/keygen.c:2267 sm/certreqgen-ui.c:211 tools/gpg-card.c:2280
+#: g10/keygen.c:2268 sm/certreqgen-ui.c:211 tools/gpg-card.c:2297
 #, c-format
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr "�едопу�тимый код ключа (ожидает�� 40 ше�тнадцатеричных цифр)\n"
 
-#: g10/keygen.c:2269 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2270 sm/certreqgen-ui.c:213
 msgid "No key with this keygrip\n"
 msgstr "�ет ключа � таким кодом\n"
 
-#: g10/keygen.c:2288 g10/keygen.c:2298 g10/keygen.c:3440 g10/keygen.c:3451
+#: g10/keygen.c:2289 g10/keygen.c:2299 g10/keygen.c:3444 g10/keygen.c:3455
 #: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
 #, c-format
 msgid "error reading the card: %s\n"
 msgstr "ошибка чтени� карты: %s\n"
 
-#: g10/keygen.c:2292 g10/keygen.c:3444 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2293 g10/keygen.c:3448 sm/certreqgen-ui.c:234
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "Серийный номер карты: %s\n"
 
-#: g10/keygen.c:2311 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2312 sm/certreqgen-ui.c:246
 msgid "Available keys:\n"
 msgstr "До�тупные ключи:\n"
 
-#: g10/keygen.c:2504 g10/keygen.c:2518
+#: g10/keygen.c:2505 g10/keygen.c:2519
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr "округлен до %u бит\n"
 
-#: g10/keygen.c:2559
+#: g10/keygen.c:2560
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "длина ключей %s может быть от %u до %u.\n"
 
-#: g10/keygen.c:2567
+#: g10/keygen.c:2568
 #, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Какой размер подключа необходим? (%u) "
 
-#: g10/keygen.c:2584 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2585 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Запрошенный размер ключа - %u бит\n"
 
-#: g10/keygen.c:2630
+#: g10/keygen.c:2631
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Выберите �ллиптиче�кую кривую:\n"
 
-#: g10/keygen.c:2819
+#: g10/keygen.c:2820
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5433,7 +5447,7 @@ msgstr ""
 "      <n>m = �рок дей�тви� ключа - n ме��цев\n"
 "      <n>y = �рок дей�тви� ключа - n лет\n"
 
-#: g10/keygen.c:2830
+#: g10/keygen.c:2831
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5449,38 +5463,38 @@ msgstr ""
 "      <n>m = �рок дей�тви� подпи�и - n ме��цев\n"
 "      <n>y = �рок дей�тви� подпи�и - n лет\n"
 
-#: g10/keygen.c:2853
+#: g10/keygen.c:2854
 msgid "Key is valid for? (0) "
 msgstr "Срок дей�тви� ключа? (0) "
 
-#: g10/keygen.c:2858
+#: g10/keygen.c:2859
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Срок дей�тви� подпи�и? (%s) "
 
-#: g10/keygen.c:2871 g10/keygen.c:2896
+#: g10/keygen.c:2875 g10/keygen.c:2900
 msgid "invalid value\n"
 msgstr "недопу�тимое значение\n"
 
-#: g10/keygen.c:2878
+#: g10/keygen.c:2882
 msgid "Key does not expire at all\n"
 msgstr "Срок дей�тви� ключа не ограничен\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2883
 msgid "Signature does not expire at all\n"
 msgstr "Срок дей�тви� подпи�и не ограничен\n"
 
-#: g10/keygen.c:2884
+#: g10/keygen.c:2888
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Ключ дей�твителен до %s\n"
 
-#: g10/keygen.c:2885
+#: g10/keygen.c:2889
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Подпи�ь дей�твительна до %s\n"
 
-#: g10/keygen.c:2889
+#: g10/keygen.c:2893
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5488,11 +5502,11 @@ msgstr ""
 "Ваша �и�тема не может отображать даты по�ле 2038 года.\n"
 "Однако даты до 2106 года будут обрабатывать�� верно.\n"
 
-#: g10/keygen.c:2902
+#: g10/keygen.c:2906
 msgid "Is this correct? (y/N) "
 msgstr "В�е верно? (y/N) "
 
-#: g10/keygen.c:2970
+#: g10/keygen.c:2974
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5506,7 +5520,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2985
+#: g10/keygen.c:2989
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5522,49 +5536,49 @@ msgstr ""
 "    \"Ва�� Пушкин (пер�онаж) <vp@test.ru>\"\n"
 "\n"
 
-#: g10/keygen.c:3004
+#: g10/keygen.c:3008
 msgid "Real name: "
 msgstr "Ваше полное им�: "
 
-#: g10/keygen.c:3013
+#: g10/keygen.c:3017
 msgid "Invalid character in name\n"
 msgstr "�едопу�тимый �имвол в имени\n"
 
-#: g10/keygen.c:3014
+#: g10/keygen.c:3018
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr "Символы '%s' и '%s' в имени по�вл�ть�� не могут\n"
 
-#: g10/keygen.c:3018
+#: g10/keygen.c:3022
 msgid "Name may not start with a digit\n"
 msgstr "Им� не должно начинать�� � цифры\n"
 
-#: g10/keygen.c:3021
+#: g10/keygen.c:3025
 msgid "Name must be at least 5 characters long\n"
 msgstr "Им� не должно быть короче 5 �имволов\n"
 
-#: g10/keygen.c:3031
+#: g10/keygen.c:3035
 msgid "Email address: "
 msgstr "�дре� �лектронной почты: "
 
-#: g10/keygen.c:3037
+#: g10/keygen.c:3041
 msgid "Not a valid email address\n"
 msgstr "�еправильный адре� �лектронной почты\n"
 
-#: g10/keygen.c:3046
+#: g10/keygen.c:3050
 msgid "Comment: "
 msgstr "Примечание: "
 
-#: g10/keygen.c:3052
+#: g10/keygen.c:3056
 msgid "Invalid character in comment\n"
 msgstr "�едопу�тимый �имвол в примечании\n"
 
-#: g10/keygen.c:3088
+#: g10/keygen.c:3092
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr "И�пользует�� таблица �имволов '%s'.\n"
 
-#: g10/keygen.c:3094
+#: g10/keygen.c:3098
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5575,7 +5589,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3099
+#: g10/keygen.c:3103
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "�е в�тавл�йте адре� �лектронной почты в им� пользовател� или примечание\n"
@@ -5591,31 +5605,31 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3124
+#: g10/keygen.c:3128
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:3134
+#: g10/keygen.c:3138
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Сменить (N)Им�, (C)Примечание, (E)�дре�; (Q)Выход? "
 
-#: g10/keygen.c:3135
+#: g10/keygen.c:3139
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Сменить (N)Им�, (C)Примечание, (E)�дре�; (O)Прин�ть/(Q)Выход? "
 
-#: g10/keygen.c:3140
+#: g10/keygen.c:3144
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Сменить (N)Им�, (E)�дре�; (Q)Выход? "
 
-#: g10/keygen.c:3141
+#: g10/keygen.c:3145
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "Сменить (N)Им�, (E)�дре�; (O)Прин�ть/(Q)Выход? "
 
-#: g10/keygen.c:3160
+#: g10/keygen.c:3164
 msgid "Please correct the error first\n"
 msgstr "Сначала и�правьте ошибку\n"
 
-#: g10/keygen.c:3206
+#: g10/keygen.c:3210
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -5628,18 +5642,18 @@ msgstr ""
 "�лучайных чи�ел больше возможно�тей получить до�таточное количе�тво "
 "�нтропии.\n"
 
-#: g10/keygen.c:3591
+#: g10/keygen.c:3595
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4590 g10/keygen.c:4663 g10/keygen.c:4681 g10/keygen.c:4710
-#: g10/keygen.c:5086 g10/keygen.c:5632 g10/keygen.c:5943 g10/keygen.c:6050
+#: g10/keygen.c:4594 g10/keygen.c:4667 g10/keygen.c:4685 g10/keygen.c:4714
+#: g10/keygen.c:5113 g10/keygen.c:5663 g10/keygen.c:5974 g10/keygen.c:6081
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Сбой при �оздании ключа: %s\n"
 
-#: g10/keygen.c:4599
+#: g10/keygen.c:4603
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5650,65 +5664,65 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:4601
+#: g10/keygen.c:4605
 msgid "Continue? (Y/n) "
 msgstr "Продолжить? (Y/n) "
 
-#: g10/keygen.c:4622
+#: g10/keygen.c:4626
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "Ключ пользовател� \"%s\" уже �уще�твует\n"
 
-#: g10/keygen.c:4627
+#: g10/keygen.c:4631
 msgid "Create anyway? (y/N) "
 msgstr "В�е равно �оздать новый? (y/N) "
 
-#: g10/keygen.c:4633
+#: g10/keygen.c:4637
 #, c-format
 msgid "creating anyway\n"
 msgstr "принудительное �оздание\n"
 
-#: g10/keygen.c:5069
+#: g10/keygen.c:5096
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 "Замечание: \"%s %s\" вызывает полнофункциональный диалог �оздани� ключа.\n"
 
-#: g10/keygen.c:5118
+#: g10/keygen.c:5145
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Создание ключа прервано.\n"
 
-#: g10/keygen.c:5178
+#: g10/keygen.c:5205
 #, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "не могу �оздать архивную копию, файл '%s': %s\n"
 
-#: g10/keygen.c:5198
+#: g10/keygen.c:5225
 #, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "Замечание: архивна� копи� ключа � карты �охранена в '%s'\n"
 
-#: g10/keygen.c:5359 g10/keygen.c:5561
+#: g10/keygen.c:5389 g10/keygen.c:5591
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr "�охранение открытого ключа в '%s'\n"
 
-#: g10/keygen.c:5555
+#: g10/keygen.c:5585
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "нет до�тупной дл� запи�и таблицы открытых ключей: %s\n"
 
-#: g10/keygen.c:5569
+#: g10/keygen.c:5599
 #, c-format
 msgid "error writing public keyring '%s': %s\n"
 msgstr "ошибка запи�и таблицы открытых ключей '%s': %s\n"
 
-#: g10/keygen.c:5603
+#: g10/keygen.c:5634
 msgid "public and secret key created and signed.\n"
 msgstr "открытый и �екретный ключи �озданы и подпи�аны.\n"
 
-#: g10/keygen.c:5619
+#: g10/keygen.c:5650
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -5716,7 +5730,7 @@ msgstr ""
 "Учтите, что данный ключ не может и�пользовать�� дл� шифровани�. Можно\n"
 "во�пользовать�� командой \"--edit-key\" и �оздать подключ дл� �тих целей.\n"
 
-#: g10/keygen.c:5801 g10/keygen.c:6000
+#: g10/keygen.c:5832 g10/keygen.c:6031
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5724,7 +5738,7 @@ msgstr ""
 "ключ �оздан на %lu �екунду в будущем (петл� во времени или проблемы � "
 "ча�ами)\n"
 
-#: g10/keygen.c:5803 g10/keygen.c:6002
+#: g10/keygen.c:5834 g10/keygen.c:6033
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5732,22 +5746,22 @@ msgstr ""
 "ключ �оздан на %lu �екунд в будущем (петл� во времени или проблемы � "
 "ча�ами)\n"
 
-#: g10/keygen.c:5814 g10/keygen.c:6013
+#: g10/keygen.c:5845 g10/keygen.c:6044
 #, c-format
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "Замечание: �оздание подключей дл� ключей v3 не �овме�тимо � OpenPGP\n"
 
-#: g10/keygen.c:5826 g10/keygen.c:5828
+#: g10/keygen.c:5857 g10/keygen.c:5859
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Секретные ча�ти первичного ключа от�ут�твуют.\n"
 
-#: g10/keygen.c:5835 g10/keygen.c:5837
+#: g10/keygen.c:5866 g10/keygen.c:5868
 #, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Секретные ча�ти первичного ключа хран�т�� на карте.\n"
 
-#: g10/keygen.c:5857 g10/keygen.c:6027
+#: g10/keygen.c:5888 g10/keygen.c:6058
 msgid "Really create? (y/N) "
 msgstr "Дей�твительно �оздать? (y/N) "
 
@@ -5829,12 +5843,12 @@ msgstr "      Отпечаток ключа ="
 msgid "      Card serial no. ="
 msgstr " �ерийный номер карты ="
 
-#: g10/keyring.c:1467
+#: g10/keyring.c:1477
 #, c-format
 msgid "caching keyring '%s'\n"
 msgstr "зане�ение таблицы ключей '%s' в буфер\n"
 
-#: g10/keyring.c:1541
+#: g10/keyring.c:1551
 #, c-format
 msgid "%lu keys cached so far (%lu signature)\n"
 msgid_plural "%lu keys cached so far (%lu signatures)\n"
@@ -5842,7 +5856,7 @@ msgstr[0] "пока в буфер помещено %lu ключей (%lu подÐ
 msgstr[1] "пока в буфер помещено %lu ключей (%lu подпи�и)\n"
 msgstr[2] "пока в буфер помещено %lu ключей (%lu подпи�ей)\n"
 
-#: g10/keyring.c:1557
+#: g10/keyring.c:1567
 #, c-format
 msgid "%lu key cached"
 msgid_plural "%lu keys cached"
@@ -5850,7 +5864,7 @@ msgstr[0] "в буфер запи�ан %lu ключ"
 msgstr[1] "в буфер запи�аны %lu ключа"
 msgstr[2] "в буфер запи�ано %lu ключей"
 
-#: g10/keyring.c:1559
+#: g10/keyring.c:1569
 #, c-format
 msgid " (%lu signature)\n"
 msgid_plural " (%lu signatures)\n"
@@ -5858,7 +5872,7 @@ msgstr[0] "(%lu подпи�ь)\n"
 msgstr[1] "(%lu подпи�и)\n"
 msgstr[2] "(%lu подпи�ей)\n"
 
-#: g10/keyring.c:1636
+#: g10/keyring.c:1646
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: таблица ключей �оздана\n"
@@ -5887,25 +5901,25 @@ msgstr "автоматиче�ки получать ключи при прове
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "учитывать набор URL предпочтительных �ерверов ключей дл� �того ключа"
 
-#: g10/keyserver.c:537
+#: g10/keyserver.c:360
 msgid "disabled"
 msgstr "отключен"
 
-#: g10/keyserver.c:740
+#: g10/keyserver.c:563
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Введите чи�ла, N) Следующее; Q) Выход > "
 
-#: g10/keyserver.c:846
+#: g10/keyserver.c:669
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "недопу�тимый протокол �ервера ключей (ожидает�� %d, получено %d)\n"
 
-#: g10/keyserver.c:986 g10/keyserver.c:1096
+#: g10/keyserver.c:809 g10/keyserver.c:919
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" - не идентификатор ключа: пропущен\n"
 
-#: g10/keyserver.c:1420 g10/keyserver.c:1453
+#: g10/keyserver.c:1217 g10/keyserver.c:1250
 #, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
@@ -5913,52 +5927,47 @@ msgstr[0] "обновление %d ключа из %s\n"
 msgstr[1] "обновление %d ключей из %s\n"
 msgstr[2] "обновление %d ключей из %s\n"
 
-#: g10/keyserver.c:1427
+#: g10/keyserver.c:1224
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "Внимание: невозможно обновить ключ %s � %s: %s\n"
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1316
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "ключ \"%s\" на �ервере ключей не найден\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1319
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "ключ не найден на �ервере ключей\n"
 
-#: g10/keyserver.c:1722
-#, c-format
-msgid "requesting key %s from %s server %s\n"
-msgstr "запрашиваю ключ %s � �ервера %s %s\n"
-
-#: g10/keyserver.c:1726
+#: g10/keyserver.c:1481
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "получение ключа %s � %s\n"
 
-#: g10/keyserver.c:1841 g10/keyserver.c:2020
+#: g10/keyserver.c:1600 g10/keyserver.c:1793
 #, c-format
 msgid "no keyserver known\n"
 msgstr "не изве�тно ни одного �ервера ключей\n"
 
-#: g10/keyserver.c:1856 g10/skclist.c:213 g10/skclist.c:241
+#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "пропущено \"%s\": %s\n"
 
-#: g10/keyserver.c:1860
+#: g10/keyserver.c:1619
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "отправка ключа %s на %s\n"
 
-#: g10/keyserver.c:1901
+#: g10/keyserver.c:1662
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr "запро� ключа из '%s'\n"
 
-#: g10/keyserver.c:1917
+#: g10/keyserver.c:1680
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "Внимание: невозможно получить URI %s: %s\n"
@@ -5985,68 +5994,68 @@ msgstr "зашифровано неизве�тным алгоритмом %d\n"
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "фраза-пароль �оздана � незнакомой хеш-функцией %d\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:473
 #, c-format
 msgid "public key is %s\n"
 msgstr "открытый ключ - %s\n"
 
-#: g10/mainproc.c:524
+#: g10/mainproc.c:525
 #, 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:528 g10/pkclist.c:231
+#: g10/mainproc.c:529 g10/pkclist.c:231
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:532
+#: g10/mainproc.c:533
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "зашифровано ключом %s � идентификатором %s\n"
 
-#: g10/mainproc.c:552 g10/mainproc.c:935
+#: g10/mainproc.c:553 g10/mainproc.c:937
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "Внимание: наблюдает�� не�колько тек�тов\n"
 
-#: g10/mainproc.c:560
+#: g10/mainproc.c:561
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "зашифровано %lu фразами-парол�ми\n"
 
-#: g10/mainproc.c:562
+#: g10/mainproc.c:563
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "зашифровано одной фразой-паролем\n"
 
-#: g10/mainproc.c:577 g10/mainproc.c:602
+#: g10/mainproc.c:578 g10/mainproc.c:603
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "�бой ра�шифровки � открытым ключом: %s\n"
 
-#: g10/mainproc.c:613
+#: g10/mainproc.c:614
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "данные зашифрованы открытым ключом: хороший DEK\n"
 
-#: g10/mainproc.c:642 g10/mainproc.c:663
+#: g10/mainproc.c:643 g10/mainproc.c:664
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "предполагают�� данные, зашифрованные по %s\n"
 
-#: g10/mainproc.c:649
+#: g10/mainproc.c:650
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "шифр IDEA недо�тупен, попробую вме�то него %s\n"
 
-#: g10/mainproc.c:742 g10/mainproc.c:780
+#: g10/mainproc.c:744 g10/mainproc.c:782
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "Внимание: цело�тно�ть �ообщени� не защищена\n"
 
-#: g10/mainproc.c:753
+#: g10/mainproc.c:755
 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"
@@ -6056,179 +6065,179 @@ msgstr ""
 "оно правомерно, по�кольку в те времена защита цело�тно�ти широко\n"
 "не примен�ла�ь.\n"
 
-#: g10/mainproc.c:756
+#: g10/mainproc.c:758
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr "Во�пользуйте�ь параметром '%s', чтобы тем не менее ра�шифровать.\n"
 
-#: g10/mainproc.c:761
+#: g10/mainproc.c:763
 #, c-format
 msgid "decryption forced to fail!\n"
 msgstr "принудительный �бой ра�шифровки!\n"
 
-#: g10/mainproc.c:773
+#: g10/mainproc.c:775
 #, c-format
 msgid "decryption okay\n"
 msgstr "ра�шифровано нормально\n"
 
-#: g10/mainproc.c:786
+#: g10/mainproc.c:788
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "Внимание: зашифрованное �ообщение было изменено!\n"
 
-#: g10/mainproc.c:804
+#: g10/mainproc.c:806
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "�бой ра�шифровки: %s\n"
 
-#: g10/mainproc.c:851
+#: g10/mainproc.c:853
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "Замечание: отправитель запро�ил \"только между нами\"\n"
 
-#: g10/mainproc.c:858
+#: g10/mainproc.c:860
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "первоначальное им� файла='%.*s'\n"
 
-#: g10/mainproc.c:1135
+#: g10/mainproc.c:1137
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "отдельный �ертификат отзыва: задей�твует�� командой \"gpg --import\"\n"
 
-#: g10/mainproc.c:1440 g10/mainproc.c:1483
+#: g10/mainproc.c:1442 g10/mainproc.c:1485
 #, c-format
 msgid "no signature found\n"
 msgstr "подпи�ь не найдена\n"
 
-#: g10/mainproc.c:1763
+#: g10/mainproc.c:1765
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ПЛОХ�Я подпи�ь пользовател� \"%s\""
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1767
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Про�роченна� подпи�ь пользовател� \"%s\""
 
-#: g10/mainproc.c:1767
+#: g10/mainproc.c:1769
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Дей�твительна� подпи�ь пользовател� \"%s\""
 
-#: g10/mainproc.c:1789
+#: g10/mainproc.c:1791
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "проверка подпи�и подавлена\n"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1905
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "не могу обработать �ти неоднозначные данные подпи�и\n"
 
-#: g10/mainproc.c:1919 g10/mainproc.c:1926
+#: g10/mainproc.c:1921 g10/mainproc.c:1928
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Подпи�ь �делана %s\n"
 
-#: g10/mainproc.c:1920 g10/mainproc.c:1927 sm/verify.c:480
+#: g10/mainproc.c:1922 g10/mainproc.c:1929 sm/verify.c:480
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               ключом %s � идентификатором %s\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1933
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Подпи�ь �делана %s ключом %s � идентификатором %s\n"
 
-#: g10/mainproc.c:1937
+#: g10/mainproc.c:1939
 #, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "                издатель \"%s\"\n"
 
-#: g10/mainproc.c:1992
+#: g10/mainproc.c:1994
 #, c-format
 msgid "Key available at: "
 msgstr "Ключ до�тупен на: "
 
-#: g10/mainproc.c:2034
+#: g10/mainproc.c:2036
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr "Замечание: Параметр '%s' включает и�пользование �той информации\n"
 
-#: g10/mainproc.c:2234
+#: g10/mainproc.c:2236
 msgid "[uncertain]"
 msgstr "[�омнительно]"
 
-#: g10/mainproc.c:2272
+#: g10/mainproc.c:2274
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                или \"%s\""
 
-#: g10/mainproc.c:2347
+#: g10/mainproc.c:2349
 #, c-format
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr "Внимание: Данный ключ не подходит дл� подпи�и в режиме %s\n"
 
-#: g10/mainproc.c:2363
+#: g10/mainproc.c:2365
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Подпи�ь про�рочена %s\n"
 
-#: g10/mainproc.c:2368
+#: g10/mainproc.c:2370
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Подпи�ь дей�твительна до %s\n"
 
-#: g10/mainproc.c:2379
+#: g10/mainproc.c:2381
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "формат подпи�и: %s, хеш-функци� %s%s%s\n"
 
-#: g10/mainproc.c:2380
+#: g10/mainproc.c:2382
 msgid "binary"
 msgstr "двоичный"
 
-#: g10/mainproc.c:2381
+#: g10/mainproc.c:2383
 msgid "textmode"
 msgstr "тек�товый"
 
-#: g10/mainproc.c:2381 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2383 g10/trust.c:112 dirmngr/ocsp.c:793
 msgid "unknown"
 msgstr "неизве�тно"
 
-#: g10/mainproc.c:2383
+#: g10/mainproc.c:2385
 msgid ", key algorithm "
 msgstr ", алгоритм ключа "
 
-#: g10/mainproc.c:2418
+#: g10/mainproc.c:2420
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr "Внимание: не отделенна� подпи�ь; файл '%s' �Е был проверен!\n"
 
-#: g10/mainproc.c:2457
+#: g10/mainproc.c:2459
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "�е могу проверить подпи�ь: %s\n"
 
-#: g10/mainproc.c:2553 g10/mainproc.c:2572 g10/mainproc.c:2696
+#: g10/mainproc.c:2555 g10/mainproc.c:2574 g10/mainproc.c:2698
 #, c-format
 msgid "not a detached signature\n"
 msgstr "не отделенна� подпи�ь\n"
 
-#: g10/mainproc.c:2606
+#: g10/mainproc.c:2608
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "Внимание: обнаружено не�колько подпи�ей. Проверена будет только перва�.\n"
 
-#: g10/mainproc.c:2615
+#: g10/mainproc.c:2617
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "отдельна� подпи�ь кла��а 0x%02x\n"
 
-#: g10/mainproc.c:2700
+#: g10/mainproc.c:2702
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "подпи�ь �тарого типа (PGP 2.x)\n"
@@ -6413,45 +6422,51 @@ msgstr "�еизве�тное критиче�кое замечание к по
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "в подпакете типа %d у�тановлен критиче�кий бит\n"
 
-#: g10/passphrase.c:208
+#: g10/passphrase.c:201 sm/decrypt.c:669
+#, fuzzy
+#| msgid "Please enter the new passphrase"
+msgid "Please enter the passphrase for decryption."
+msgstr "Введите новую фразу-пароль"
+
+#: g10/passphrase.c:203
 msgid "Enter passphrase\n"
 msgstr "Введите фразу-пароль\n"
 
-#: g10/passphrase.c:219
+#: g10/passphrase.c:227
 #, c-format
 msgid "cancelled by user\n"
 msgstr "прервано пользователем\n"
 
-#: g10/passphrase.c:460
+#: g10/passphrase.c:472
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (идентификатор главного ключа %s)"
 
-#: g10/passphrase.c:467
+#: g10/passphrase.c:479
 msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 msgstr "Введите фразу-пароль дл� разблокировки �екретного ключа OpenPGP:"
 
-#: g10/passphrase.c:471
+#: g10/passphrase.c:483
 msgid "Please enter the passphrase to import the OpenPGP secret key:"
 msgstr "Введите фразу-пароль дл� импорта �екретного ключа OpenPGP:"
 
-#: g10/passphrase.c:476
+#: g10/passphrase.c:488
 msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 msgstr "Введите фразу-пароль дл� �к�порта �екретного подключа OpenPGP:"
 
-#: g10/passphrase.c:479
+#: g10/passphrase.c:491
 msgid "Please enter the passphrase to export the OpenPGP secret key:"
 msgstr "Введите фразу-пароль дл� �к�порта �екретного ключа OpenPGP:"
 
-#: g10/passphrase.c:484
+#: g10/passphrase.c:496
 msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 msgstr "Вы дей�твительно хотите нав�егда удалить �екретный подключ OpenPGP:"
 
-#: g10/passphrase.c:487
+#: g10/passphrase.c:499
 msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgstr "Вы дей�твительно хотите нав�егда удалить �екретный ключ OpenPGP:"
 
-#: g10/passphrase.c:496
+#: g10/passphrase.c:508
 #, c-format
 msgid ""
 "%s\n"
@@ -6621,7 +6636,7 @@ msgstr ""
 "Минимальный уровень довери� данному ключу: %s\n"
 "\n"
 
-#: g10/pkclist.c:313 g10/revoke.c:803
+#: g10/pkclist.c:313 g10/revoke.c:804
 msgid "Your decision? "
 msgstr "Ваше решение? "
 
@@ -6915,7 +6930,7 @@ msgstr "не могу открыть подпи�анные данные '%s'\n"
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "не могу открыть подпи�анные данные fd=%d: %s\n"
 
-#: g10/pubkey-enc.c:99 sm/decrypt.c:879
+#: g10/pubkey-enc.c:99 sm/decrypt.c:1329
 #, c-format
 msgid "key %s is not suitable for decryption in %s mode\n"
 msgstr "ключ %s не пригоден дл� ра�шифровани� в режиме %s\n"
@@ -6963,7 +6978,7 @@ msgid "Note: key has been revoked"
 msgstr "Замечание: ключ был отозван"
 
 #: g10/revoke.c:100 g10/revoke.c:126 g10/revoke.c:172 g10/revoke.c:184
-#: g10/revoke.c:502
+#: g10/revoke.c:503
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "�бой build_packet: %s\n"
@@ -6989,11 +7004,11 @@ msgstr "Секретный ключ недо�тупен.\n"
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Создать �ертификат отзыва данного ключа? (y/N) "
 
-#: g10/revoke.c:334 g10/revoke.c:744
+#: g10/revoke.c:334 g10/revoke.c:745
 msgid "ASCII armored output forced.\n"
 msgstr "Дл� вывода и�пользован тек�товый формат ASCII.\n"
 
-#: g10/revoke.c:350 g10/revoke.c:481
+#: g10/revoke.c:350 g10/revoke.c:482
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "�бой make_keysig_packet: %s\n"
@@ -7007,11 +7022,11 @@ msgstr "Сертификат отзыва �оздан.\n"
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "ключи отзыва дл� \"%s\" не найдены\n"
 
-#: g10/revoke.c:567
+#: g10/revoke.c:568
 msgid "This is a revocation certificate for the OpenPGP key:"
 msgstr "Это �ертификат отзыва ключа OpenPGP:"
 
-#: g10/revoke.c:583
+#: g10/revoke.c:584
 msgid ""
 "A revocation certificate is a kind of \"kill switch\" to publicly\n"
 "declare that a key shall not anymore be used.  It is not possible\n"
@@ -7021,7 +7036,7 @@ msgstr ""
 "публично объ�вить, что ключ больше не должен примен�ть��. По�ле публикации\n"
 "такой �ертификат вз�ть назад невозможно."
 
-#: g10/revoke.c:586
+#: g10/revoke.c:587
 msgid ""
 "Use it to revoke this key in case of a compromise or loss of\n"
 "the secret key.  However, if the secret key is still accessible,\n"
@@ -7034,7 +7049,7 @@ msgstr ""
 "новый �ертификат � указанием причины отзыва. Подробно�ти �м. в опи�ании\n"
 "команды gpg \"--generate-revocation\" в руковод�тве по GnuPG."
 
-#: g10/revoke.c:592
+#: g10/revoke.c:593
 msgid ""
 "To avoid an accidental use of this file, a colon has been inserted\n"
 "before the 5 dashes below.  Remove this colon with a text editor\n"
@@ -7044,12 +7059,12 @@ msgstr ""
 "в�тавлено двоеточие. Удалите �то двоеточие в тек�товом редакторе\n"
 "перед импортированием и публикацией �того �ертификата отзыва."
 
-#: g10/revoke.c:611
+#: g10/revoke.c:612
 #, c-format
 msgid "revocation certificate stored as '%s.rev'\n"
 msgstr "�ертификат отзыва запи�ан в '%s.rev'.\n"
 
-#: g10/revoke.c:655
+#: g10/revoke.c:656
 #, c-format
 msgid "secret key \"%s\" not found\n"
 msgstr "�екретный ключ \"%s\" не найден\n"
@@ -7057,21 +7072,21 @@ msgstr "�екретный ключ \"%s\" не найден\n"
 #. TRANSLATORS: The %s prints a key specification which
 #. for example has been given at the command line.  Several lines
 #. lines with secret key infos are printed after this message.
-#: g10/revoke.c:680
+#: g10/revoke.c:681
 #, c-format
 msgid "'%s' matches multiple secret keys:\n"
 msgstr "'%s' �оответ�твует не�кольким �екретным ключам:\n"
 
-#: g10/revoke.c:705
+#: g10/revoke.c:706
 #, c-format
 msgid "error searching the keyring: %s\n"
 msgstr "ошибка пои�ка в таблице ключей %s\n"
 
-#: g10/revoke.c:728
+#: g10/revoke.c:729
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Создать �ертификат отзыва данного ключа? (y/N) "
 
-#: g10/revoke.c:752
+#: g10/revoke.c:753
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -7090,33 +7105,33 @@ msgstr ""
 "но�итель будет поврежден, но будьте о�торожны: �и�тема печати\n"
 "Вашей машины может �охранить данные и �делать их до�тупными дл� других!\n"
 
-#: g10/revoke.c:786
+#: g10/revoke.c:787
 msgid "Please select the reason for the revocation:\n"
 msgstr "Укажите причину отзыва:\n"
 
-#: g10/revoke.c:796
+#: g10/revoke.c:797
 msgid "Cancel"
 msgstr "Отмена"
 
-#: g10/revoke.c:798
+#: g10/revoke.c:799
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Скорее в�его, Вы зде�ь выберете %d)\n"
 
-#: g10/revoke.c:839
+#: g10/revoke.c:843
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Введите необ�зательное по��нение; завершите пу�той �трокой:\n"
 
-#: g10/revoke.c:867
+#: g10/revoke.c:871
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Причина отзыва: %s\n"
 
-#: g10/revoke.c:869
+#: g10/revoke.c:873
 msgid "(No description given)\n"
 msgstr "(По��нени� от�ут�твуют)\n"
 
-#: g10/revoke.c:874
+#: g10/revoke.c:878
 msgid "Is this okay? (y/N) "
 msgstr "В�е правильно? (y/N) "
 
@@ -7297,24 +7312,24 @@ msgstr "подпи�ь:"
 msgid "%s.%s encryption will be used\n"
 msgstr "будет и�пользовано шифрование по %s\n"
 
-#: g10/skclist.c:172 g10/skclist.c:253
+#: g10/skclist.c:173 g10/skclist.c:254
 #, c-format
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "ключ не помечен как небезопа�ный - не могу и�пользовать его � фальшивым "
 "генератором �лучайных чи�ел!\n"
 
-#: g10/skclist.c:204
+#: g10/skclist.c:205
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "пропущено \"%s\": дубликат\n"
 
-#: g10/skclist.c:223
+#: g10/skclist.c:224
 #, c-format
 msgid "skipped: secret key already present\n"
 msgstr "пропущено: �екретный ключ уже имеет��\n"
 
-#: g10/skclist.c:242
+#: g10/skclist.c:243
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "�то ключ Elgamal, �озданный PGP, он не обе�печивает безопа�но�ть подпи�и!"
@@ -7535,10 +7550,10 @@ msgstr "вер�и� базы данных TOFU (не поддерживает�
 msgid "TOFU DB error"
 msgstr "ошибка базы данных TOFU"
 
-#: g10/tofu.c:687 g10/tofu.c:2073 g10/tofu.c:2354 g10/tofu.c:2373
-#: g10/tofu.c:2386 g10/tofu.c:2398 g10/tofu.c:2413 g10/tofu.c:2425
-#: g10/tofu.c:3021 g10/tofu.c:3038 g10/tofu.c:3075 g10/tofu.c:3092
-#: g10/tofu.c:3404
+#: g10/tofu.c:687 g10/tofu.c:2077 g10/tofu.c:2358 g10/tofu.c:2377
+#: g10/tofu.c:2390 g10/tofu.c:2402 g10/tofu.c:2417 g10/tofu.c:2429
+#: g10/tofu.c:3025 g10/tofu.c:3042 g10/tofu.c:3079 g10/tofu.c:3096
+#: g10/tofu.c:3408
 #, c-format
 msgid "error reading TOFU database: %s\n"
 msgstr "ошибка чтени� базы данных TOFU: %s\n"
@@ -7558,7 +7573,7 @@ msgstr "ошибка инициализации базы данных TOFU: %s\n
 msgid "error opening TOFU database '%s': %s\n"
 msgstr "ошибка открыти� базы данных TOFU '%s': %s\n"
 
-#: g10/tofu.c:1148 g10/tofu.c:3458 g10/tofu.c:3604
+#: g10/tofu.c:1148 g10/tofu.c:3462 g10/tofu.c:3608
 #, c-format
 msgid "error updating TOFU database: %s\n"
 msgstr "ошибка обновлени� базы данных TOFU: %s\n"
@@ -7601,17 +7616,17 @@ msgstr "ошибка при �боре идентификаторов други
 msgid "This key's user IDs:\n"
 msgstr "Идентификаторы пользовател� �того ключа:\n"
 
-#: g10/tofu.c:1634 g10/tofu.c:1799
+#: g10/tofu.c:1634 g10/tofu.c:1801
 #, c-format
 msgid "policy: %s"
 msgstr "правило: %s"
 
-#: g10/tofu.c:1725
+#: g10/tofu.c:1727
 #, c-format
 msgid "error gathering signature stats: %s\n"
 msgstr "ошибка �бора �тати�тики подпи�ей: %s\n"
 
-#: g10/tofu.c:1729
+#: g10/tofu.c:1731
 #, c-format
 msgid "The email address \"%s\" is associated with %d key:\n"
 msgid_plural "The email address \"%s\" is associated with %d keys:\n"
@@ -7619,16 +7634,16 @@ msgstr[0] "�дре� �лектронной почты \"%s\" �в�зан � %
 msgstr[1] "�дре� �лектронной почты \"%s\" �в�зан � %d ключами:\n"
 msgstr[2] "�дре� �лектронной почты \"%s\" �в�зан � %d ключами:\n"
 
-#: g10/tofu.c:1747
+#: g10/tofu.c:1749
 #, c-format
 msgid "Statistics for keys with the email address \"%s\":\n"
 msgstr "Стати�тика ключей � адре�ом �лектронной почты \"%s\":\n"
 
-#: g10/tofu.c:1797
+#: g10/tofu.c:1799
 msgid "this key"
 msgstr "�тот ключ"
 
-#: g10/tofu.c:1823
+#: g10/tofu.c:1825
 #, c-format
 msgid "Verified %d message."
 msgid_plural "Verified %d messages."
@@ -7636,7 +7651,7 @@ msgstr[0] "Проверено %d �ообщение."
 msgstr[1] "Проверены %d �ообщени�."
 msgstr[2] "Проверено %d �ообщений."
 
-#: g10/tofu.c:1827
+#: g10/tofu.c:1829
 #, c-format
 msgid "Encrypted %d message."
 msgid_plural "Encrypted %d messages."
@@ -7644,7 +7659,7 @@ msgstr[0] "Зашифровано %d �ообщение."
 msgstr[1] "Зашифрованы %d �ообщени�."
 msgstr[2] "Зашифровано %d �ообщений."
 
-#: g10/tofu.c:1834
+#: g10/tofu.c:1836
 #, c-format
 msgid "Verified %d message in the future."
 msgid_plural "Verified %d messages in the future."
@@ -7652,7 +7667,7 @@ msgstr[0] "Проверено %d �ообщение в будущем."
 msgstr[1] "Проверены %d �ообщени� в будущем."
 msgstr[2] "Проверено %d �ообщений в будущем."
 
-#: g10/tofu.c:1838
+#: g10/tofu.c:1840
 #, c-format
 msgid "Encrypted %d message in the future."
 msgid_plural "Encrypted %d messages in the future."
@@ -7660,7 +7675,7 @@ msgstr[0] "Зашифровано %d �ообщение в будущем."
 msgstr[1] "Зашифрованы %d �ообщени� в будущем."
 msgstr[2] "Зашифровано %d �ообщений в будущем."
 
-#: g10/tofu.c:1852
+#: g10/tofu.c:1854
 #, c-format
 msgid "Messages verified over the past %d day: %d."
 msgid_plural "Messages verified over the past %d days: %d."
@@ -7668,7 +7683,7 @@ msgstr[0] "Проверено �ообщений за %d прошедший де
 msgstr[1] "Проверено �ообщений за %d прошедших дн�: %d."
 msgstr[2] "Проверено �ообщений за %d прошедших дней: %d."
 
-#: g10/tofu.c:1858
+#: g10/tofu.c:1860
 #, c-format
 msgid "Messages encrypted over the past %d day: %d."
 msgid_plural "Messages encrypted over the past %d days: %d."
@@ -7676,7 +7691,7 @@ msgstr[0] "Зашифровано �ообщений за %d прошедший
 msgstr[1] "Зашифровано �ообщений за %d прошедших дн�: %d."
 msgstr[2] "Зашифровано �ообщений за %d прошедших дней: %d."
 
-#: g10/tofu.c:1868
+#: g10/tofu.c:1870
 #, c-format
 msgid "Messages verified over the past %d month: %d."
 msgid_plural "Messages verified over the past %d months: %d."
@@ -7684,7 +7699,7 @@ msgstr[0] "Проверено �ообщений за %d прошедший ме
 msgstr[1] "Проверено �ообщений за %d прошедших ме��ца: %d."
 msgstr[2] "Проверено �ообщений за %d прошедших ме��цев: %d."
 
-#: g10/tofu.c:1874
+#: g10/tofu.c:1876
 #, c-format
 msgid "Messages encrypted over the past %d month: %d."
 msgid_plural "Messages encrypted over the past %d months: %d."
@@ -7692,7 +7707,7 @@ msgstr[0] "Зашифровано �ообщений за %d прошедший
 msgstr[1] "Зашифровано �ообщений за %d прошедших ме��ца: %d."
 msgstr[2] "Зашифровано �ообщений за %d прошедших ме��цев: %d."
 
-#: g10/tofu.c:1884
+#: g10/tofu.c:1886
 #, c-format
 msgid "Messages verified over the past %d year: %d."
 msgid_plural "Messages verified over the past %d years: %d."
@@ -7700,7 +7715,7 @@ msgstr[0] "Проверено �ообщений за %d прошедший го
 msgstr[1] "Проверено �ообщений за %d прошедших года: %d."
 msgstr[2] "Проверено �ообщений за %d прошедших лет: %d."
 
-#: g10/tofu.c:1890
+#: g10/tofu.c:1892
 #, c-format
 msgid "Messages encrypted over the past %d year: %d."
 msgid_plural "Messages encrypted over the past %d years: %d."
@@ -7708,12 +7723,12 @@ msgstr[0] "Зашифровано �ообщений за %d прошедший
 msgstr[1] "Зашифровано �ообщений за %d прошедших года: %d."
 msgstr[2] "Зашифровано �ообщений за %d прошедших лет: %d."
 
-#: g10/tofu.c:1898
+#: g10/tofu.c:1900
 #, c-format
 msgid "Messages verified in the past: %d."
 msgstr "Проверено �ообщений в прошлом: %d."
 
-#: g10/tofu.c:1902
+#: g10/tofu.c:1904
 #, c-format
 msgid "Messages encrypted in the past: %d."
 msgstr "Зашифровавно �ообщений в прошлом: %d."
@@ -7721,7 +7736,7 @@ msgstr "Зашифровавно �ообщений в прошлом: %d."
 #. TRANSLATORS: Please translate the text found in the source
 #. * file below.  We don't directly internationalize that text so
 #. * that we can tweak it without breaking translations.
-#: g10/tofu.c:1919
+#: g10/tofu.c:1921
 msgid "TOFU detected a binding conflict"
 msgstr ""
 "Обычно � конкретным адре�ом �лектронной почты �в�зан только один ключ. "
@@ -7733,30 +7748,30 @@ msgstr ""
 #. TRANSLATORS: Two letters (normally the lower and upper case
 #. * version of the hotkey) for each of the five choices.  If
 #. * there is only one choice in your language, repeat it.
-#: g10/tofu.c:1961
+#: g10/tofu.c:1963
 msgid "gGaAuUrRbB"
 msgstr "gGaAuUrRbB"
 
-#: g10/tofu.c:1967
+#: g10/tofu.c:1969
 msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 "(G)Хороший, (A)Пока прин�ть, (U)�е��но, (R)Пока отвергнуть, (B)Плохой? "
 
-#: g10/tofu.c:1975
+#: g10/tofu.c:1978
 msgid "Defaulting to unknown.\n"
 msgstr "Принимает�� и�ходное значение (\"неизве�тно\").\n"
 
-#: g10/tofu.c:2093 g10/tofu.c:2228
+#: g10/tofu.c:2097 g10/tofu.c:2232
 #, c-format
 msgid "TOFU db corruption detected.\n"
 msgstr "Обнаружено повреждение базы данных TOFU.\n"
 
-#: g10/tofu.c:2829
+#: g10/tofu.c:2833
 #, c-format
 msgid "error changing TOFU policy: %s\n"
 msgstr "ошибка при �мене правила TOFU: %s\n"
 
-#: g10/tofu.c:2880
+#: g10/tofu.c:2884
 #, c-format
 msgid "%lld~year"
 msgid_plural "%lld~years"
@@ -7764,7 +7779,7 @@ msgstr[0] "%lld~прошедший~год"
 msgstr[1] "%lld~прошедших~года"
 msgstr[2] "%lld~прошедших~лет"
 
-#: g10/tofu.c:2885
+#: g10/tofu.c:2889
 #, c-format
 msgid "%lld~month"
 msgid_plural "%lld~months"
@@ -7772,7 +7787,7 @@ msgstr[0] "%lld~прошедший~ме��ц"
 msgstr[1] "%lld~прошедших~ме��ца"
 msgstr[2] "%lld~прошедших~ме��цев"
 
-#: g10/tofu.c:2890
+#: g10/tofu.c:2894
 #, c-format
 msgid "%lld~week"
 msgid_plural "%lld~weeks"
@@ -7780,7 +7795,7 @@ msgstr[0] "%lld~прошедшую~неделю"
 msgstr[1] "%lld~прошедшие~недели"
 msgstr[2] "%lld~прошедших~недель"
 
-#: g10/tofu.c:2895
+#: g10/tofu.c:2899
 #, c-format
 msgid "%lld~day"
 msgid_plural "%lld~days"
@@ -7788,7 +7803,7 @@ msgstr[0] "%lld~прошедший~день"
 msgstr[1] "%lld~прошедших~дн�"
 msgstr[2] "%lld~прошедших~дней"
 
-#: g10/tofu.c:2900
+#: g10/tofu.c:2904
 #, c-format
 msgid "%lld~hour"
 msgid_plural "%lld~hours"
@@ -7796,7 +7811,7 @@ msgstr[0] "%lld~прошедший~ча�"
 msgstr[1] "%lld~прошедших~ча�а"
 msgstr[2] "%lld~прошедших~ча�ов"
 
-#: g10/tofu.c:2905
+#: g10/tofu.c:2909
 #, c-format
 msgid "%lld~minute"
 msgid_plural "%lld~minutes"
@@ -7804,7 +7819,7 @@ msgstr[0] "%lld~прошедшую~минуту"
 msgstr[1] "%lld~прошедшие~минуты"
 msgstr[2] "%lld~прошедших~минут"
 
-#: g10/tofu.c:2907
+#: g10/tofu.c:2911
 #, c-format
 msgid "%lld~second"
 msgid_plural "%lld~seconds"
@@ -7812,26 +7827,26 @@ msgstr[0] "%lld~прошедшую~�екунду"
 msgstr[1] "%lld~прошедшие~�екунды"
 msgstr[2] "%lld~прошедших~�екунд"
 
-#: g10/tofu.c:3145
+#: g10/tofu.c:3149
 #, c-format
 msgid "%s: Verified 0~signatures and encrypted 0~messages."
 msgstr "%s: Проверено 0~подпи�ей, зашифровано 0~�ообщений."
 
-#: g10/tofu.c:3151
+#: g10/tofu.c:3155
 #, c-format
 msgid "%s: Verified 0 signatures."
 msgstr "%s: Проверено 0 подпи�ей."
 
-#: g10/tofu.c:3165
+#: g10/tofu.c:3169
 msgid "Encrypted 0 messages."
 msgstr "Зашифровано 0 �ообщений."
 
-#: g10/tofu.c:3181
+#: g10/tofu.c:3185
 #, c-format
 msgid "(policy: %s)"
 msgstr "правило: %s"
 
-#: g10/tofu.c:3215
+#: g10/tofu.c:3219
 #, c-format
 msgid ""
 "Warning: we have yet to see a message signed using this key and user id!\n"
@@ -7839,7 +7854,7 @@ msgstr ""
 "Внимание: мы до �их пор не видели ни одного �ообщени�, подпи�анного �тим "
 "ключом и �тим идентификатором пользовател�!\n"
 
-#: g10/tofu.c:3218
+#: g10/tofu.c:3222
 #, c-format
 msgid ""
 "Warning: we've only seen one message signed using this key and user id!\n"
@@ -7847,19 +7862,19 @@ msgstr ""
 "Внимание: мы до �их пор видели только одно �ообщение, подпи�анное �тим "
 "ключом и �тим идентификатором пользовател�!\n"
 
-#: g10/tofu.c:3222
+#: g10/tofu.c:3226
 #, c-format
 msgid "Warning: you have yet to encrypt a message to this key!\n"
 msgstr ""
 "Внимание: мы до �их пор не зашифровали �тим ключом ни одного �ообщени�!\n"
 
-#: g10/tofu.c:3225
+#: g10/tofu.c:3229
 #, c-format
 msgid "Warning: you have only encrypted one message to this key!\n"
 msgstr ""
 "Внимание: мы до �их пор зашифровали �тим ключом только одно �ообщение!\n"
 
-#: g10/tofu.c:3254
+#: g10/tofu.c:3258
 #, c-format
 msgid ""
 "Warning: if you think you've seen more signatures by this key and user id, "
@@ -7892,13 +7907,13 @@ msgstr[2] ""
 "некаче�твенный командой\n"
 "  %s\n"
 
-#: g10/tofu.c:3339 g10/tofu.c:3502 g10/tofu.c:3708 g10/tofu.c:3761
-#: g10/tofu.c:3902 g10/tofu.c:3979 g10/tofu.c:4017
+#: g10/tofu.c:3343 g10/tofu.c:3506 g10/tofu.c:3712 g10/tofu.c:3765
+#: g10/tofu.c:3906 g10/tofu.c:3983 g10/tofu.c:4021
 #, c-format
 msgid "error opening TOFU database: %s\n"
 msgstr "ошибка при открытии базы данных TOFU: %s\n"
 
-#: g10/tofu.c:3535
+#: g10/tofu.c:3539
 #, c-format
 msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
 msgstr ""
@@ -7966,7 +7981,7 @@ msgstr "и�пользую модель довери� %s\n"
 msgid "no need for a trustdb check\n"
 msgstr "проверка таблицы довери� не нужна\n"
 
-#: g10/trustdb.c:601 g10/trustdb.c:2272
+#: g10/trustdb.c:601 g10/trustdb.c:2273
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "�рок �ледующей проверки таблицы довери� %s\n"
@@ -7996,7 +8011,7 @@ msgstr "выполните --check-trustdb, пожалуй�та\n"
 msgid "checking the trustdb\n"
 msgstr "проверка таблицы довери�\n"
 
-#: g10/trustdb.c:1993
+#: g10/trustdb.c:1994
 #, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
@@ -8004,7 +8019,7 @@ msgstr[0] "обработан %d ключ"
 msgstr[1] "обработаны %d ключа"
 msgstr[2] "обработано %d ключей"
 
-#: g10/trustdb.c:1996
+#: g10/trustdb.c:1997
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
@@ -8012,17 +8027,17 @@ msgstr[0] " (�брошен %d �четчик до�товерно�ти)\n"
 msgstr[1] " (�брошены %d �четчика до�товерно�ти)\n"
 msgstr[2] " (�брошено %d �четчиков до�товерно�ти)\n"
 
-#: g10/trustdb.c:2066
+#: g10/trustdb.c:2067
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "аб�олютно доверенных ключей не найдено\n"
 
-#: g10/trustdb.c:2080
+#: g10/trustdb.c:2081
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "открытый ключ дл� аб�олютно доверенного ключа %s не найден\n"
 
-#: g10/trustdb.c:2198
+#: g10/trustdb.c:2199
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -8030,29 +8045,29 @@ msgstr ""
 "глубина: %d  до�товерных: %3d  подпи�анных: %3d  доверие: %d-, %dq, %dn, "
 "%dm, %df, %du\n"
 
-#: g10/trustdb.c:2279
+#: g10/trustdb.c:2280
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
 "невозможно обновить запи�ь о вер�ии таблицы довери�: ошибка запи�и: %s\n"
 
-#: g10/trust.c:125
+#: g10/trust.c:114
 msgid "undefined"
 msgstr "неопределено"
 
-#: g10/trust.c:126
+#: g10/trust.c:115
 msgid "never"
 msgstr "никогда"
 
-#: g10/trust.c:127
+#: g10/trust.c:116
 msgid "marginal"
 msgstr "ограничено"
 
-#: g10/trust.c:128
+#: g10/trust.c:117
 msgid "full"
 msgstr "полное"
 
-#: g10/trust.c:129
+#: g10/trust.c:118
 msgid "ultimate"
 msgstr "аб�олютное"
 
@@ -8064,39 +8079,39 @@ msgstr "аб�олютное"
 #. It gets passed to atoi() so everything after the number is
 #. essentially a comment and need not be translated.  Either key and
 #. uid are both NULL, or neither are NULL.
-#: g10/trust.c:166
+#: g10/trust.c:155
 msgid "10 translator see trust.c:uid_trust_string_fixed"
 msgstr "12 translator see trust.c:uid_trust_string_fixed"
 
-#: g10/trust.c:169
+#: g10/trust.c:158
 msgid "[ revoked]"
 msgstr "[   отозван  ]"
 
-#: g10/trust.c:171 g10/trust.c:177
+#: g10/trust.c:160 g10/trust.c:166
 msgid "[ expired]"
 msgstr "[  про�рочен ]"
 
-#: g10/trust.c:176
+#: g10/trust.c:165
 msgid "[ unknown]"
 msgstr "[ неизве�тно ]"
 
-#: g10/trust.c:178
+#: g10/trust.c:167
 msgid "[  undef ]"
 msgstr "[неопределено]"
 
-#: g10/trust.c:179
+#: g10/trust.c:168
 msgid "[  never ]"
 msgstr "[   никогда  ]"
 
-#: g10/trust.c:180
+#: g10/trust.c:169
 msgid "[marginal]"
 msgstr "[ ограничено ]"
 
-#: g10/trust.c:181
+#: g10/trust.c:170
 msgid "[  full  ]"
 msgstr "[   полное   ]"
 
-#: g10/trust.c:182
+#: g10/trust.c:171
 msgid "[ultimate]"
 msgstr "[  аб�олютно ]"
 
@@ -8156,16 +8171,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:4937 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2386
+#: scd/app-piv.c:1770 scd/app-p15.c:5035 scd/app-nks.c:1530
+#: scd/app-openpgp.c:2387
 #, 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:4956 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2402
+#: scd/app-piv.c:1787 scd/app-p15.c:5054 scd/app-nks.c:1549
+#: scd/app-openpgp.c:2403
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr "О�тало�ь попыток: %d"
@@ -8206,10 +8221,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:2669
-#: scd/app-openpgp.c:2693 scd/app-openpgp.c:2871 scd/app-openpgp.c:2893
-#: scd/app-openpgp.c:3074 scd/app-openpgp.c:3361 scd/app-openpgp.c:3408
-#: scd/app-openpgp.c:3545 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2670
+#: scd/app-openpgp.c:2694 scd/app-openpgp.c:2872 scd/app-openpgp.c:2894
+#: scd/app-openpgp.c:3075 scd/app-openpgp.c:3362 scd/app-openpgp.c:3409
+#: scd/app-openpgp.c:3547 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "Функци� обработки PIN возвратила ошибку: %s\n"
@@ -8231,57 +8246,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:3616
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3618
 #, c-format
 msgid "key already exists\n"
 msgstr "ключ уже �уще�твует\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3620
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3622
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "�уще�твующий ключ будет заменен\n"
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3622
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3624
 #, c-format
 msgid "generating new key\n"
 msgstr "генераци� нового ключа\n"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3624
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3626
 #, c-format
 msgid "writing new key\n"
 msgstr "запи�ь нового ключа\n"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4484 scd/app-openpgp.c:4767
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4486 scd/app-openpgp.c:4761
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "�бой �охранени� ключа: %s\n"
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1615
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1616
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr "в ответе от�ут�твует модуль RSA\n"
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1622
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1623
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr "в ответе от�ут�твует открыта� �к�понента RSA\n"
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1732
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1733
 #, c-format
 msgid "response does not contain the EC public key\n"
 msgstr "в ответе от�ут�твует открытый ключ �ллиптиче�кой кривой\n"
 
-#: scd/app-piv.c:3279 scd/app-openpgp.c:4943
+#: scd/app-piv.c:3279 scd/app-openpgp.c:4937
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr "пожалуй�та, подождите, пока будет генерировать�� ключ ...\n"
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4951
+#: scd/app-piv.c:3294 scd/app-openpgp.c:4945
 #, c-format
 msgid "generating key failed\n"
 msgstr "�бой при генерации ключа\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4957
+#: scd/app-piv.c:3300 scd/app-openpgp.c:4951
 #, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
@@ -8289,35 +8304,35 @@ msgstr[0] "�оздание ключа завершено (%d �екунда)\n"
 msgstr[1] "�оздание ключа завершено (%d �екунды)\n"
 msgstr[2] "�оздание ключа завершено (%d �екунд)\n"
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1842 scd/app-openpgp.c:4966
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1843 scd/app-openpgp.c:4960
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr "ответ не �одержит данных открытого ключа\n"
 
-#: scd/app-p15.c:5035 scd/app-nks.c:2038
+#: scd/app-p15.c:5133 scd/app-nks.c:2038
 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:5038 scd/app-openpgp.c:2818
+#: scd/app-p15.c:5136 scd/app-openpgp.c:2819
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Введите админи�тративный PIN"
 
-#: scd/app-p15.c:5040 scd/app-nks.c:2028
+#: scd/app-p15.c:5138 scd/app-nks.c:2028
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "|P|Введите код разблокировки PIN (PUK) дл� �тандартных ключей."
 
-#: scd/app-p15.c:5043 scd/app-nks.c:2019
+#: scd/app-p15.c:5141 scd/app-nks.c:2019
 msgid "||Please enter the PIN for the standard keys."
 msgstr "|A|Введите PIN дл� �тандартных ключей."
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4321
+#: scd/app-nks.c:1468 scd/app-openpgp.c:4323
 #, 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:4333
+#: scd/app-nks.c:1476 scd/app-openpgp.c:4335
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "от�ут�твует открыта� �к�понента RSA, или ее размер превышает %d бит\n"
@@ -8361,27 +8376,27 @@ msgstr ""
 "|P|Введите код разблокировки PIN (PUK) ключа дл� �оздани� квалифицированных "
 "подпи�ей."
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3442 scd/app-dinsig.c:534
+#: scd/app-nks.c:2221 scd/app-openpgp.c:3443 scd/app-dinsig.c:534
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "ошибка при получении нового PIN: %s\n"
 
-#: scd/app-openpgp.c:943
+#: scd/app-openpgp.c:944
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "�бой при �охранении отпечатка: %s\n"
 
-#: scd/app-openpgp.c:956
+#: scd/app-openpgp.c:957
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "�бой при �охранении даты �оздани�: %s\n"
 
-#: scd/app-openpgp.c:1427 scd/app-openpgp.c:3389 scd/app-openpgp.c:5715
+#: scd/app-openpgp.c:1428 scd/app-openpgp.c:3390 scd/app-openpgp.c:5709
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "ошибка получени� �тату�а CHV � карты\n"
 
-#: scd/app-openpgp.c:1949
+#: scd/app-openpgp.c:1950
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "�бой при чтении открытого ключа: %s\n"
@@ -8389,44 +8404,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:2373
+#: scd/app-openpgp.c:2374
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr "%s�омер: %s%%0AДержатель: %s%%0AСчетчик: %lu%s"
 
-#: scd/app-openpgp.c:2621
+#: scd/app-openpgp.c:2622
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "о�новной PIN примен�ет�� как %s\n"
 
-#: scd/app-openpgp.c:2628
+#: scd/app-openpgp.c:2629
 #, 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:2641
+#: scd/app-openpgp.c:2642
 msgid "||Please unlock the card"
 msgstr "||Разблокируйте карту"
 
-#: scd/app-openpgp.c:2700 scd/app-openpgp.c:2900 scd/app-openpgp.c:3368
+#: scd/app-openpgp.c:2701 scd/app-openpgp.c:2901 scd/app-openpgp.c:3369
 #, 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:2717 scd/app-openpgp.c:2760 scd/app-openpgp.c:2917
-#: scd/app-openpgp.c:5325
+#: scd/app-openpgp.c:2718 scd/app-openpgp.c:2761 scd/app-openpgp.c:2918
+#: scd/app-openpgp.c:5319
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "�бой при проверке CHV%d: %s\n"
 
-#: scd/app-openpgp.c:2804 scd/app-openpgp.c:5724
+#: scd/app-openpgp.c:2805 scd/app-openpgp.c:5718
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "карта окончательно заблокирована!\n"
 
-#: scd/app-openpgp.c:2808
+#: scd/app-openpgp.c:2809
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8438,20 +8453,20 @@ msgstr[1] ""
 msgstr[2] ""
 "о�тало�ь %d попыток ввода админи�тративного PIN перед блокировкой карты\n"
 
-#: scd/app-openpgp.c:2841
+#: scd/app-openpgp.c:2842
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr "до�туп к командам управлени� не на�троен\n"
 
-#: scd/app-openpgp.c:3355
+#: scd/app-openpgp.c:3356
 msgid "||Please enter the PIN"
 msgstr "||Введите PIN"
 
-#: scd/app-openpgp.c:3404
+#: scd/app-openpgp.c:3405
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Введите код �бро�а дл� карты"
 
-#: scd/app-openpgp.c:3414 scd/app-openpgp.c:3481
+#: scd/app-openpgp.c:3415 scd/app-openpgp.c:3484
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "Код �бро�а �лишком короток; минимальна� длина %d\n"
@@ -8459,79 +8474,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:3437
+#: scd/app-openpgp.c:3438
 msgid "|RN|New Reset Code"
 msgstr "|RN|�овый код �бро�а"
 
-#: scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3439
 msgid "|AN|New Admin PIN"
 msgstr "|AN|�овый админи�тративный PIN"
 
-#: scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3439
 msgid "|N|New PIN"
 msgstr "|N|�овый PIN"
 
-#: scd/app-openpgp.c:3541
+#: scd/app-openpgp.c:3543
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "|A|Введите админи�тративный PIN и новый админи�тративный PIN"
 
-#: scd/app-openpgp.c:3542
+#: scd/app-openpgp.c:3544
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Введите PIN и новый PIN"
 
-#: scd/app-openpgp.c:3600 scd/app-openpgp.c:5026
+#: scd/app-openpgp.c:3602 scd/app-openpgp.c:5020
 #, c-format
 msgid "error reading application data\n"
 msgstr "ошибка чтени� данных приложени�\n"
 
-#: scd/app-openpgp.c:3606 scd/app-openpgp.c:5033
+#: scd/app-openpgp.c:3608 scd/app-openpgp.c:5027
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "ошибка чтени� отпечатка DO\n"
 
-#: scd/app-openpgp.c:4302 scd/app-openpgp.c:4657
+#: scd/app-openpgp.c:4304 scd/app-openpgp.c:4653
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "пропущена метка времени �оздани�\n"
 
-#: scd/app-openpgp.c:4343 scd/app-openpgp.c:4351
+#: scd/app-openpgp.c:4345 scd/app-openpgp.c:4353
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "Про�тое чи�ло RSA %s пропущено или его размер не равен %d\n"
 
-#: scd/app-openpgp.c:4651
+#: scd/app-openpgp.c:4647
 #, c-format
 msgid "unsupported curve\n"
 msgstr "крива� не поддерживает��\n"
 
-#: scd/app-openpgp.c:4991
+#: scd/app-openpgp.c:4985
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "недопу�тима� �труктура карты OpenPGP (DO 0x93)\n"
 
-#: scd/app-openpgp.c:5041
+#: scd/app-openpgp.c:5035
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr "отпечаток на карте не �овпадает � запрошенным\n"
 
-#: scd/app-openpgp.c:5240
+#: scd/app-openpgp.c:5234
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "карта не поддерживает хеш-функцию %s\n"
 
-#: scd/app-openpgp.c:5298
+#: scd/app-openpgp.c:5292
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "�оздано подпи�ей: %lu\n"
 
-#: scd/app-openpgp.c:5729
+#: scd/app-openpgp.c:5723
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "проверка админи�тративного PIN в данный момент запрещена �той командой\n"
 
-#: scd/app-openpgp.c:6241 scd/app-openpgp.c:6252
+#: scd/app-openpgp.c:6250 scd/app-openpgp.c:6261
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "нет до�тупа к %s - непригодна� карта OpenPGP?\n"
@@ -8551,7 +8566,7 @@ msgstr "|N|Первоначальный новый PIN"
 msgid "run in multi server mode (foreground)"
 msgstr "работать в много�ерверном режиме (нефоновый режим)"
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:274 dirmngr/dirmngr.c:198
+#: scd/scdaemon.c:136 sm/gpgsm.c:274 dirmngr/dirmngr.c:199
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LEVEL|у�тановить уровень отладки, равный LEVEL"
 
@@ -8613,12 +8628,12 @@ msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 "и�пользуйте параметр '--daemon' дл� запу�ка приложени� в фоновом режиме\n"
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2104
+#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2143
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "обработчик fd %d запущен\n"
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2112
+#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2151
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "обработчик fd %d о�тановлен\n"
@@ -8628,11 +8643,11 @@ msgstr "обработчик fd %d о�тановлен\n"
 msgid "validation model requested by certificate: %s"
 msgstr "�хема проверки, запрошенна� �ертификатом: %s"
 
-#: sm/certchain.c:199 sm/certchain.c:2172
+#: sm/certchain.c:199 sm/certchain.c:2174
 msgid "chain"
 msgstr "цепь"
 
-#: sm/certchain.c:200 sm/certchain.c:2172
+#: sm/certchain.c:200 sm/certchain.c:2174
 msgid "shell"
 msgstr "оболочка"
 
@@ -8665,228 +8680,228 @@ msgstr "Замечание: некритичные правила �ертифи
 msgid "certificate policy not allowed"
 msgstr "правила �ертификата недопу�тимы"
 
-#: sm/certchain.c:595 sm/keydb.c:1891 sm/keydb.c:1980
+#: sm/certchain.c:596 sm/keydb.c:1913 sm/keydb.c:2002
 #, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "�бой получени� отпечатка\n"
 
-#: sm/certchain.c:624
+#: sm/certchain.c:625
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr "внешний пои�к издател�\n"
 
-#: sm/certchain.c:644
+#: sm/certchain.c:645
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "чи�ло �оответ�твующих издателей: %d\n"
 
-#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#: sm/certchain.c:724 dirmngr/ocsp.c:683
 #, c-format
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "не могу получить authorityInfoAccess: %s\n"
 
-#: sm/certchain.c:791
+#: sm/certchain.c:792
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr "пои�к издател� в буфере Dirmngr\n"
 
-#: sm/certchain.c:816
+#: sm/certchain.c:817
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "чи�ло �оответ�твующих �ертификатов: %d\n"
 
-#: sm/certchain.c:819
+#: sm/certchain.c:820
 #, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "ключ в буфере dirmngr не найден: %s\n"
 
-#: sm/certchain.c:1046 sm/certchain.c:1561 sm/certchain.c:2200 sm/decrypt.c:643
-#: sm/encrypt.c:620 sm/import.c:414 sm/keydb.c:1898 sm/keydb.c:1987
-#: sm/sign.c:428 sm/verify.c:117
+#: sm/certchain.c:1047 sm/certchain.c:1562 sm/certchain.c:2202
+#: sm/decrypt.c:1084 sm/encrypt.c:621 sm/import.c:414 sm/keydb.c:1920
+#: sm/keydb.c:2009 sm/sign.c:428 sm/verify.c:117
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "�бой при выделении пам�ти под указатель на базу данных\n"
 
-#: sm/certchain.c:1232
+#: sm/certchain.c:1233
 msgid "certificate has been revoked"
 msgstr "�ертификат был отозван"
 
-#: sm/certchain.c:1247
+#: sm/certchain.c:1248
 msgid "the status of the certificate is unknown"
 msgstr "�тату� �ертификата неизве�тен"
 
-#: sm/certchain.c:1254
+#: sm/certchain.c:1255
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr "проверьте, что \"dirmngr\" у�тановлен корректно\n"
 
-#: sm/certchain.c:1260
+#: sm/certchain.c:1261
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "�бой проверки �пи�ка отозванных �ертификатов: %s"
 
-#: sm/certchain.c:1289 sm/certchain.c:1357 dirmngr/validate.c:497
+#: sm/certchain.c:1290 sm/certchain.c:1358 dirmngr/validate.c:497
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "�ертификат � недей�твительной до�товерно�тью: %s"
 
-#: sm/certchain.c:1304 sm/certchain.c:1389 dirmngr/validate.c:515
+#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:515
 #, c-format
 msgid "certificate not yet valid"
 msgstr "�ертификат еще не до�товерен"
 
-#: sm/certchain.c:1305 sm/certchain.c:1390
+#: sm/certchain.c:1306 sm/certchain.c:1391
 msgid "root certificate not yet valid"
 msgstr "корневой �ертификат еще не до�товерен"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1307 sm/certchain.c:1392
 msgid "intermediate certificate not yet valid"
 msgstr "промежуточный �ертификат еще не до�товерен"
 
-#: sm/certchain.c:1319 dirmngr/validate.c:526
+#: sm/certchain.c:1320 dirmngr/validate.c:526
 #, c-format
 msgid "certificate has expired"
 msgstr "�ертификат про�рочен"
 
-#: sm/certchain.c:1320
+#: sm/certchain.c:1321
 msgid "root certificate has expired"
 msgstr "корневой �ертификат про�рочен"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1322
 msgid "intermediate certificate has expired"
 msgstr "промежуточный �ертификат про�рочен"
 
-#: sm/certchain.c:1363
+#: sm/certchain.c:1364
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr "�ертификат не имеет требуемых атрибутов: %s%s%s"
 
-#: sm/certchain.c:1372
+#: sm/certchain.c:1373
 msgid "certificate with invalid validity"
 msgstr "�ертификат � недей�твительной до�товерно�тью"
 
-#: sm/certchain.c:1409
+#: sm/certchain.c:1410
 msgid "signature not created during lifetime of certificate"
 msgstr "подпи�ь �оздана вне времени дей�тви� �ертификата"
 
-#: sm/certchain.c:1411
+#: sm/certchain.c:1412
 msgid "certificate not created during lifetime of issuer"
 msgstr "�ертификат �оздан вне времени дей�тви� издател�"
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1413
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr "промежуточный �ертификат �оздан вне времени дей�тви� издател�"
 
-#: sm/certchain.c:1416
+#: sm/certchain.c:1417
 #, c-format
 msgid "  (  signature created at "
 msgstr "  (          подпи�ь �оздана "
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1418
 #, c-format
 msgid "  (certificate created at "
 msgstr "  (        �ертификат �оздан "
 
-#: sm/certchain.c:1420
+#: sm/certchain.c:1421
 #, c-format
 msgid "  (certificate valid from "
 msgstr "  (�ертификат дей�твителен � "
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1422
 #, c-format
 msgid "  (     issuer valid from "
 msgstr "  (  издатель дей�твителен � "
 
-#: sm/certchain.c:1451 dirmngr/validate.c:577
+#: sm/certchain.c:1452 dirmngr/validate.c:577
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "отпечаток=%s\n"
 
-#: sm/certchain.c:1460
+#: sm/certchain.c:1461
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr "корневой �ертификат теперь помечен как доверенный\n"
 
-#: sm/certchain.c:1473
+#: sm/certchain.c:1474
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr "в агенте gpg нельз� интерактивно �делать �ертификат доверенным\n"
 
-#: sm/certchain.c:1479
+#: sm/certchain.c:1480
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 "дл� данного �еан�а запрещено интерактивно делать �ертификат доверенным\n"
 
-#: sm/certchain.c:1538
+#: sm/certchain.c:1539
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 "Внимание: врем� �оздани� подпи�и неизве�тно - предполагает�� текущий момент"
 
-#: sm/certchain.c:1602
+#: sm/certchain.c:1603
 msgid "no issuer found in certificate"
 msgstr "в �ертификате не найден издатель"
 
-#: sm/certchain.c:1680
+#: sm/certchain.c:1681
 msgid "self-signed certificate has a BAD signature"
 msgstr "у �амозаверенного �ертификата ПЛОХ�Я подпи�ь"
 
-#: sm/certchain.c:1749 dirmngr/validate.c:575
+#: sm/certchain.c:1750 dirmngr/validate.c:575
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "корневой �ертификат не помечен как доверенный"
 
-#: sm/certchain.c:1765
+#: sm/certchain.c:1766
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "�бой проверки �пи�ка довери�: %s\n"
 
-#: sm/certchain.c:1796 sm/import.c:175 dirmngr/validate.c:630
+#: sm/certchain.c:1797 sm/import.c:175 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "�лишком длинна� цепочка �ертификатов\n"
 
-#: sm/certchain.c:1808 dirmngr/validate.c:642
+#: sm/certchain.c:1809 dirmngr/validate.c:642
 #, c-format
 msgid "issuer certificate not found"
 msgstr "не найден издатель �ертификата"
 
-#: sm/certchain.c:1842 dirmngr/validate.c:668
+#: sm/certchain.c:1844 dirmngr/validate.c:668
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr "�ертификат имеет ПЛОХУЮ подпи�ь"
 
-#: sm/certchain.c:1874 dirmngr/validate.c:692
+#: sm/certchain.c:1876 dirmngr/validate.c:692
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 "найден еще один возможный �ертификат удо�товер�ющего центра - повторна� "
 "попытка"
 
-#: sm/certchain.c:1933 dirmngr/validate.c:717
+#: sm/certchain.c:1935 dirmngr/validate.c:717
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "цепочка �ертификатов длиннее допу�каемой удо�товер�ющим центром (%d)"
 
-#: sm/certchain.c:1975 sm/certchain.c:2275 dirmngr/validate.c:747
+#: sm/certchain.c:1977 sm/certchain.c:2278 dirmngr/validate.c:747
 #, c-format
 msgid "certificate is good\n"
 msgstr "хороший �ертификат\n"
 
-#: sm/certchain.c:1976
+#: sm/certchain.c:1978
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "хороший промежуточный �ертификат\n"
 
-#: sm/certchain.c:1977
+#: sm/certchain.c:1979
 #, c-format
 msgid "root certificate is good\n"
 msgstr "хороший корневой �ертификат\n"
 
-#: sm/certchain.c:2159
+#: sm/certchain.c:2161
 msgid "switching to chain model"
 msgstr "переключение на цепную �хему"
 
-#: sm/certchain.c:2168
+#: sm/certchain.c:2170
 #, c-format
 msgid "validation model used: %s"
 msgstr "и�пользует�� �хема проверки: %s"
@@ -8897,18 +8912,18 @@ 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:1372 dirmngr/validate.c:903
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1411 dirmngr/validate.c:903
 #: dirmngr/validate.c:927
 #, c-format
 msgid "out of core\n"
 msgstr "нехватка выделенной пам�ти\n"
 
-#: sm/certcheck.c:389 sm/verify.c:212
+#: sm/certcheck.c:388 sm/verify.c:212
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(�то алгоритм MD2)\n"
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:793
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:794
 msgid "none"
 msgstr "нет"
 
@@ -9197,17 +9212,17 @@ msgstr ""
 msgid "resource problem: out of core\n"
 msgstr "проблема ре�ур�ов: нехватка выделенной пам�ти\n"
 
-#: sm/decrypt.c:719
+#: sm/decrypt.c:1159
 #, c-format
 msgid "(this is the RC2 algorithm)\n"
 msgstr "(�то алгоритм RC2)\n"
 
-#: sm/decrypt.c:721
+#: sm/decrypt.c:1161
 #, c-format
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr "(�то не похоже на зашифрованное �ообщение)\n"
 
-#: sm/decrypt.c:868
+#: sm/decrypt.c:1318
 #, fuzzy, c-format
 #| msgid "encrypted with %s key, ID %s\n"
 msgid "encrypted to %s key %s\n"
@@ -9218,7 +9233,7 @@ msgstr "зашифровано ключом %s � идентификатором
 msgid "certificate '%s' not found: %s\n"
 msgstr "�ертификат '%s' не найден: %s\n"
 
-#: sm/delete.c:120 sm/keydb.c:1999 sm/keydb.c:2098
+#: sm/delete.c:120 sm/keydb.c:2021 sm/keydb.c:2120
 #, c-format
 msgid "error locking keybox: %s\n"
 msgstr "ошибка блокировки щита � ключами: %s\n"
@@ -9238,7 +9253,7 @@ msgstr "�ертификат '%s' удален\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "�бой при удалении �ертификата \"%s\": %s\n"
 
-#: sm/encrypt.c:606
+#: sm/encrypt.c:607
 #, c-format
 msgid "no valid recipients given\n"
 msgstr "не заданы получатели\n"
@@ -9307,63 +9322,63 @@ msgstr "|USER-ID|и�пользовать USER-ID как о�новной �ек
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|FILE|добавить таблицу ключей в �пи�ок таблиц ключей"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:352 dirmngr/dirmngr.c:265
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|SPEC|и�кать ключи на данном �ервере ключей"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:363
 msgid "fetch missing issuer certificates"
 msgstr "запро�ить недо�тающих издателей �ертификатов"
 
-#: sm/gpgsm.c:364
+#: sm/gpgsm.c:365
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NAME|и�пользовать кодировку NAME дл� фраз-паролей PKCS#12"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:386
 msgid "never consult a CRL"
 msgstr "не �вер�ть �о �пи�ком отозванных �ертификатов"
 
-#: sm/gpgsm.c:389
+#: sm/gpgsm.c:390
 msgid "do not check CRLs for root certificates"
 msgstr "не провер�ть �пи�ки отозванных �ертификатов дл� корневых �ертификатов"
 
-#: sm/gpgsm.c:393
+#: sm/gpgsm.c:394
 msgid "check validity using OCSP"
 msgstr "проверка до�товерно�ти � помощью OCSP"
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:396
 msgid "do not check certificate policies"
 msgstr "не провер�ть правила �ертификата"
 
-#: sm/gpgsm.c:398
+#: sm/gpgsm.c:399
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|и�пользовать алгоритм шифровани� NAME"
 
-#: sm/gpgsm.c:400
+#: sm/gpgsm.c:401
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|и�пользовать хеш-функцию NAME"
 
-#: sm/gpgsm.c:410
+#: sm/gpgsm.c:411
 msgid "batch mode: never ask"
 msgstr "пакетный режим: ничего не �прашивать"
 
-#: sm/gpgsm.c:412
+#: sm/gpgsm.c:413
 msgid "assume yes on most questions"
 msgstr "прин�ть 'да' как ответ на большин�тво вопро�ов"
 
-#: sm/gpgsm.c:413
+#: sm/gpgsm.c:414
 msgid "assume no on most questions"
 msgstr "прин�ть 'нет' как ответ на большин�тво вопро�ов"
 
-#: sm/gpgsm.c:430
+#: sm/gpgsm.c:431
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FILE|�охран�ть журнал аудита в файле FILE"
 
-#: sm/gpgsm.c:615
+#: sm/gpgsm.c:616
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Вызов: @GPGSM@ [параметры] [файлы] (-h - под�казка)"
 
-#: sm/gpgsm.c:618
+#: sm/gpgsm.c:619
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -9373,52 +9388,27 @@ msgstr ""
 "Подпи�ать, проверить, зашифровать или ра�шифровать по протоколу S/MIME\n"
 "Операци� по умолчанию зави�ит от входных данных\n"
 
-#: sm/gpgsm.c:826
+#: sm/gpgsm.c:827
 #, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "Замечание: не могу зашифровать дл� '%s': %s\n"
 
-#: sm/gpgsm.c:837
+#: sm/gpgsm.c:838
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "неизве�тна� �хема проверки '%s'\n"
 
-#: sm/gpgsm.c:896 dirmngr/ldapserver.c:89
-#, c-format
-msgid "%s:%u: no hostname given\n"
-msgstr "%s:%u: не задано им� хо�та\n"
-
-#: sm/gpgsm.c:915 dirmngr/ldapserver.c:108
-#, c-format
-msgid "%s:%u: password given without user\n"
-msgstr "%s:%u: задан пароль, но не задан пользователь\n"
-
-#: sm/gpgsm.c:946 dirmngr/ldapserver.c:139
-#, c-format
-msgid "%s:%u: ignoring unknown flag '%s'\n"
-msgstr ""
-
-#: sm/gpgsm.c:962 dirmngr/ldapserver.c:155
-#, c-format
-msgid "%s:%u: skipping this line\n"
-msgstr "%s:%u: пропу�каю �ту �троку\n"
-
-#: sm/gpgsm.c:1550
-#, c-format
-msgid "could not parse keyserver\n"
-msgstr "не удало�ь определить �ервер ключей\n"
-
-#: sm/gpgsm.c:1858
+#: sm/gpgsm.c:1711
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "импорт общих �ертификатов '%s'\n"
 
-#: sm/gpgsm.c:1904
+#: sm/gpgsm.c:1757
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "невозможно подпи�ать � помощью '%s': %s\n"
 
-#: sm/gpgsm.c:2273
+#: sm/gpgsm.c:2129
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "недопу�тима� команда (не�вной команды нет)\n"
@@ -9438,53 +9428,53 @@ msgstr "ошибка �охранени� �ертификата\n"
 msgid "basic certificate checks failed - not imported\n"
 msgstr "ошибка базовой проверки �ертификата - не импортирован\n"
 
-#: sm/import.c:471 sm/keydb.c:2018 sm/keydb.c:2111
+#: sm/import.c:472 sm/keydb.c:2040 sm/keydb.c:2133
 #, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "ошибка получени� �охраненных признаков: %s\n"
 
-#: sm/import.c:530 sm/import.c:562
+#: sm/import.c:531 sm/import.c:563
 #, c-format
 msgid "error importing certificate: %s\n"
 msgstr "ошибка импорта �ертификата: %s\n"
 
-#: sm/import.c:751 tools/gpg-connect-agent.c:1475
+#: sm/import.c:752 tools/gpg-connect-agent.c:1475
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "ошибка чтени� ввода: %s\n"
 
-#: sm/keydb.c:503
+#: sm/keydb.c:508
 #, fuzzy, c-format
 #| msgid "no dirmngr running in this session\n"
 msgid "no keyboxd running in this session\n"
 msgstr "в �том �еан�е dirmngr не работает\n"
 
-#: sm/keydb.c:595
+#: sm/keydb.c:600
 #, c-format
 msgid "error opening key DB: %s\n"
 msgstr "ошибка открыти� базы данных ключей: %s\n"
 
-#: sm/keydb.c:1936
+#: sm/keydb.c:1958
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr "проблема пои�ка �уще�твующего �ертификата: %s\n"
 
-#: sm/keydb.c:1948
+#: sm/keydb.c:1970
 #, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "ошибка при пои�ке базы данных ключей дл� запи�и: %s\n"
 
-#: sm/keydb.c:1956
+#: sm/keydb.c:1978
 #, c-format
 msgid "error storing certificate: %s\n"
 msgstr "ошибка �охранени� �ертификата: %s\n"
 
-#: sm/keydb.c:2009
+#: sm/keydb.c:2031
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "проблема повторного пои�ка �ертификата: %s\n"
 
-#: sm/keydb.c:2030 sm/keydb.c:2122
+#: sm/keydb.c:2052 sm/keydb.c:2144
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr "ошибка �охранени� признаков: %s\n"
@@ -9670,57 +9660,57 @@ msgstr "   �убъект ="
 msgid "error loading certificate '%s': %s\n"
 msgstr "ошибка загрузки �ертификата '%s': %s\n"
 
-#: dirmngr/certcache.c:819
+#: dirmngr/certcache.c:820
 #, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "      по�то�нно загруженных �ертификатов: %u\n"
 
-#: dirmngr/certcache.c:821
+#: dirmngr/certcache.c:822
 #, c-format
 msgid "    runtime cached certificates: %u\n"
 msgstr "�ертификатов в буфере времени и�полнени�: %u\n"
 
-#: dirmngr/certcache.c:823
+#: dirmngr/certcache.c:824
 #, c-format
 msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "                до�товерных �ертификатов: %u (%u,%u,%u,%u)\n"
 
-#: dirmngr/certcache.c:851 dirmngr/dirmngr-client.c:392
+#: dirmngr/certcache.c:852 dirmngr/dirmngr-client.c:392
 #, c-format
 msgid "certificate already cached\n"
 msgstr "�ертификат уже в буфере\n"
 
-#: dirmngr/certcache.c:853
+#: dirmngr/certcache.c:854
 #, c-format
 msgid "certificate cached\n"
 msgstr "�ертификат в буфере\n"
 
-#: dirmngr/certcache.c:855 dirmngr/certcache.c:875 dirmngr/dirmngr-client.c:396
+#: dirmngr/certcache.c:856 dirmngr/certcache.c:876 dirmngr/dirmngr-client.c:396
 #, c-format
 msgid "error caching certificate: %s\n"
 msgstr "ошибка помещени� �ертификата в буфер: %s\n"
 
-#: dirmngr/certcache.c:938
+#: dirmngr/certcache.c:939
 #, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "неверна� �трока отпечатока SHA1 '%s'\n"
 
-#: dirmngr/certcache.c:1384 dirmngr/certcache.c:1393
+#: dirmngr/certcache.c:1385 dirmngr/certcache.c:1394
 #, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "ошибка получени� �ертификата по �ерийному номеру: %s\n"
 
-#: dirmngr/certcache.c:1579 dirmngr/certcache.c:1588
+#: dirmngr/certcache.c:1580 dirmngr/certcache.c:1589
 #, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "ошибка получени� �ертификата по �убъекту: %s\n"
 
-#: dirmngr/certcache.c:1694 dirmngr/validate.c:483
+#: dirmngr/certcache.c:1695 dirmngr/validate.c:483
 #, c-format
 msgid "no issuer found in certificate\n"
 msgstr "в �ертификате не найден издатель\n"
 
-#: dirmngr/certcache.c:1704
+#: dirmngr/certcache.c:1705
 #, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "ошибка получени� authorityKeyIdentifier: %s\n"
@@ -9755,7 +9745,7 @@ msgstr "удаление файла буфера '%s'\n"
 msgid "not removing file '%s'\n"
 msgstr "не удал�ю файл '%s'\n"
 
-#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2380
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2383
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr "ошибка закрыти� файла буфера: %s\n"
@@ -9997,13 +9987,13 @@ msgid "error getting data from cache file: %s\n"
 msgstr "ошибка получени� данных из файла буфера: %s\n"
 
 #: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1672 dirmngr/crlcache.c:1697
-#: dirmngr/crlcache.c:1763
+#: dirmngr/crlcache.c:1766
 #, c-format
 msgid "got an invalid S-expression from libksba\n"
 msgstr "из libksba получено недопу�тимое S-выражение\n"
 
 #: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1679 dirmngr/crlcache.c:1705
-#: dirmngr/crlcache.c:1770 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1773 dirmngr/misc.c:176
 #, c-format
 msgid "converting S-expression failed: %s\n"
 msgstr "�бой преобразовани� S-выражени�: %s\n"
@@ -10018,143 +10008,143 @@ msgstr "недопу�тима� хеш-функци� '%s'\n"
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr "�бой gcry_md_open дл� алгоритма %d: %s\n"
 
-#: dirmngr/crlcache.c:1797 dirmngr/ocsp.c:478
+#: dirmngr/crlcache.c:1800 dirmngr/ocsp.c:478
 #, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "�бой �оздани� S-выражени�: %s\n"
 
-#: dirmngr/crlcache.c:1871
+#: dirmngr/crlcache.c:1874
 #, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "�бой ksba_crl_parse: %s\n"
 
-#: dirmngr/crlcache.c:1886
+#: dirmngr/crlcache.c:1889
 #, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr ""
 "ошибка получени� времен обновлени� �пи�ка отозванных �ертификатов: %s\n"
 
-#: dirmngr/crlcache.c:1893
+#: dirmngr/crlcache.c:1896
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 "времена обновлени� �того �пи�ка отозванных �ертификатов: текущее=%s, "
 "�ледующее=%s\n"
 
-#: dirmngr/crlcache.c:1897
+#: dirmngr/crlcache.c:1900
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr "не задано nextUpdate; предполагаю �рок дей�тви� в один день\n"
 
-#: dirmngr/crlcache.c:1917
+#: dirmngr/crlcache.c:1920
 #, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "ошибка получени� �лемента �пи�ка отозванных �ертификатов: %s\n"
 
-#: dirmngr/crlcache.c:1932
+#: dirmngr/crlcache.c:1935
 #, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "ошибка в�тавки �лемента во временный файл буфера: %s\n"
 
-#: dirmngr/crlcache.c:1959
+#: dirmngr/crlcache.c:1962
 #, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "в �пи�ке отозванных �ертификатов не найден издатель �пи�ка: %s\n"
 
-#: dirmngr/crlcache.c:1974
+#: dirmngr/crlcache.c:1977
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 "пои�к �ертификата издател� �пи�ка отозванных �ертификатов по "
 "authorityKeyIdentifier\n"
 
-#: dirmngr/crlcache.c:2020
+#: dirmngr/crlcache.c:2023
 #, c-format
 msgid "CRL signature verification failed: %s\n"
 msgstr "�бой проверки подпи�и �пи�ка отозванных �ертификатов: %s\n"
 
-#: dirmngr/crlcache.c:2032
+#: dirmngr/crlcache.c:2035
 #, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr ""
 "ошибка проверки до�товерно�ти �ертификата издател� �пи�ка отозванных "
 "�ертификатов: %s\n"
 
-#: dirmngr/crlcache.c:2174
+#: dirmngr/crlcache.c:2177
 #, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "�бой ksba_crl_new: %s\n"
 
-#: dirmngr/crlcache.c:2181
+#: dirmngr/crlcache.c:2184
 #, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "�бой ksba_crl_set_reader: %s\n"
 
-#: dirmngr/crlcache.c:2215
+#: dirmngr/crlcache.c:2218
 #, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "удален залипший временный файл буфера '%s'\n"
 
-#: dirmngr/crlcache.c:2219
+#: dirmngr/crlcache.c:2222
 #, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "проблема удалени� залипшего временного файла буфера '%s': %s\n"
 
-#: dirmngr/crlcache.c:2229
+#: dirmngr/crlcache.c:2232
 #, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "ошибка �оздани� временного файла буфера '%s': %s\n"
 
-#: dirmngr/crlcache.c:2239
+#: dirmngr/crlcache.c:2242
 #, c-format
 msgid "crl_parse_insert failed: %s\n"
 msgstr "�бой crl_parse_insert: %s\n"
 
-#: dirmngr/crlcache.c:2249
+#: dirmngr/crlcache.c:2252
 #, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "ошибка завершени� временного файла буфера '%s': %s\n"
 
-#: dirmngr/crlcache.c:2256
+#: dirmngr/crlcache.c:2259
 #, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "ошибка закрыти� временного файла буфера '%s': %s\n"
 
-#: dirmngr/crlcache.c:2281
+#: dirmngr/crlcache.c:2284
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 "Внимание: новый �пи�ок отозванных �ертификатов тоже �лишком �тар; �рок "
 "дей�тви� и�тек %s - тем не менее загружаю\n"
 
-#: dirmngr/crlcache.c:2285
+#: dirmngr/crlcache.c:2288
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 "новый �пи�ок отозванных �ертификатов тоже �лишком �тар; �рок дей�тви� и�тек "
 "%s\n"
 
-#: dirmngr/crlcache.c:2301
+#: dirmngr/crlcache.c:2304
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr "неизве�тное критиче�кое ра�ширение �пи�ка отозванных �ертификатов %s\n"
 
-#: dirmngr/crlcache.c:2311
+#: dirmngr/crlcache.c:2314
 #, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "ошибка чтени� ра�ширений �пи�ка отозванных �ертификатов: %s\n"
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2365
 #, c-format
 msgid "creating cache file '%s'\n"
 msgstr "�оздание файла буфера '%s'\n"
 
-#: dirmngr/crlcache.c:2394
+#: dirmngr/crlcache.c:2397
 #, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "проблема при переименовании '%s' в '%s': %s\n"
 
-#: dirmngr/crlcache.c:2408
+#: dirmngr/crlcache.c:2411
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
@@ -10163,12 +10153,12 @@ msgstr ""
 "�бой обновлени� файла каталога - запи�ь буфера будет утер�на при �ледующем "
 "запу�ке программы\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2448
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr "�ачало вывода �пи�ка отозванных �ертификатов (полученного через %s)\n"
 
-#: dirmngr/crlcache.c:2468
+#: dirmngr/crlcache.c:2471
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
@@ -10176,57 +10166,57 @@ msgstr ""
 " Ошибка: Спи�ок отозванных �ертификатов и�пользован не будет, потому что "
 "по�ле обновлени� он в�е равно �лишком �тар!\n"
 
-#: dirmngr/crlcache.c:2471
+#: dirmngr/crlcache.c:2474
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 " Ошибка: Спи�ок отозванных �ертификатов не будет и�пользован из-за "
 "неизве�тного критиче�кого ра�ширени�!\n"
 
-#: dirmngr/crlcache.c:2474
+#: dirmngr/crlcache.c:2477
 msgid " ERROR: The CRL will not be used\n"
 msgstr " Ошибка: Спи�ок отозванных �ертификатов и�пользован не будет\n"
 
-#: dirmngr/crlcache.c:2481
+#: dirmngr/crlcache.c:2484
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 " Ошибка: Этот �пи�ок отозванных �ертификатов в буфере, возможно, подменен!\n"
 
-#: dirmngr/crlcache.c:2499
+#: dirmngr/crlcache.c:2502
 #, c-format
 msgid " WARNING: invalid cache record length\n"
 msgstr "Внимание: найдена недопу�тима� длина буферной запи�и\n"
 
-#: dirmngr/crlcache.c:2506
+#: dirmngr/crlcache.c:2509
 #, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "проблема при чтении буферной запи�и: %s\n"
 
-#: dirmngr/crlcache.c:2517
+#: dirmngr/crlcache.c:2520
 #, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "проблема при чтении ключа буфера: %s\n"
 
-#: dirmngr/crlcache.c:2548
+#: dirmngr/crlcache.c:2551
 #, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "ошибка чтени� запи�и буфера из базы данных: %s\n"
 
-#: dirmngr/crlcache.c:2551
+#: dirmngr/crlcache.c:2554
 msgid "End CRL dump\n"
 msgstr "Конец вывода �пи�ка отозванных �ертификатов\n"
 
-#: dirmngr/crlcache.c:2672
+#: dirmngr/crlcache.c:2675
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "�бой crl_fetch через DP: %s\n"
 
-#: dirmngr/crlcache.c:2683
+#: dirmngr/crlcache.c:2686
 #, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "�бой crl_cache_insert через DP: %s\n"
 
-#: dirmngr/crlcache.c:2743
+#: dirmngr/crlcache.c:2746
 #, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "�бой crl_cache_insert через издател�: %s\n"
@@ -10249,7 +10239,7 @@ msgstr ""
 msgid "error retrieving '%s': %s\n"
 msgstr "ошибка получени� '%s': %s\n"
 
-#: dirmngr/crlfetch.c:218 dirmngr/ldap-wrapper.c:881 dirmngr/misc.c:573
+#: dirmngr/crlfetch.c:218 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
 #, c-format
 msgid "error initializing reader object: %s\n"
 msgstr "ошибка инициализации объекта у�трой�тва чтени�: %s\n"
@@ -10409,137 +10399,137 @@ msgstr "нужно аб�олютное им� файла\n"
 msgid "looking up '%s'\n"
 msgstr "пои�к '%s'\n"
 
-#: dirmngr/dirmngr.c:175
+#: dirmngr/dirmngr.c:176
 msgid "list the contents of the CRL cache"
 msgstr "выве�ти �одержание буфера �пи�ков отозванных �ертификатов"
 
-#: dirmngr/dirmngr.c:176
+#: dirmngr/dirmngr.c:177
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|FILE|загрузить �пи�ок отозванных �ертификатов из файла FILE в буфер"
 
-#: dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr.c:178
 msgid "|URL|fetch a CRL from URL"
 msgstr "|URL|получить �пи�ок отозванных �ертификатов из URL"
 
-#: dirmngr/dirmngr.c:178
+#: dirmngr/dirmngr.c:179
 msgid "shutdown the dirmngr"
 msgstr "выключить dirmngr"
 
-#: dirmngr/dirmngr.c:179
+#: dirmngr/dirmngr.c:180
 msgid "flush the cache"
 msgstr "запи�ать буфер на ди�к"
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:213
 msgid "allow online software version check"
 msgstr "разрешить проверку вер�ий программ по �ети"
 
-#: dirmngr/dirmngr.c:215
+#: dirmngr/dirmngr.c:216
 msgid "|N|do not return more than N items in one query"
 msgstr "|N|не возвращать более чем N результатов одного пои�ка"
 
-#: dirmngr/dirmngr.c:221
+#: dirmngr/dirmngr.c:222
 msgid "Network related options"
 msgstr ""
 
-#: dirmngr/dirmngr.c:223
+#: dirmngr/dirmngr.c:224
 msgid "route all network traffic via Tor"
 msgstr "проводить ве�ь �етевой обмен через Tor"
 
-#: dirmngr/dirmngr.c:235
+#: dirmngr/dirmngr.c:236
 msgid "Configuration for Keyservers"
 msgstr "�а�тройки �ерверов ключей"
 
-#: dirmngr/dirmngr.c:238
+#: dirmngr/dirmngr.c:239
 msgid "|URL|use keyserver at URL"
 msgstr "|URL|и�пользовать �евер ключей по URL"
 
-#: dirmngr/dirmngr.c:240
+#: dirmngr/dirmngr.c:241
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 "|FILE|и�пользовать �ертификаты удо�товер�ющего центра из файла FILE дл� HKP "
 "по TLS"
 
-#: dirmngr/dirmngr.c:242
+#: dirmngr/dirmngr.c:243
 msgid "Configuration for HTTP servers"
 msgstr "�а�тройки �ерверов HTTP"
 
-#: dirmngr/dirmngr.c:244
+#: dirmngr/dirmngr.c:245
 msgid "inhibit the use of HTTP"
 msgstr "запретить и�пользование HTTP"
 
-#: dirmngr/dirmngr.c:246
+#: dirmngr/dirmngr.c:247
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 "игнорировать точки ра�про�транени� �пи�ков отозванных �ертификатов по HTTP"
 
-#: dirmngr/dirmngr.c:248
+#: dirmngr/dirmngr.c:249
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr "|URL|перенаправл�ть в�е запро�ы HTTP на URL"
 
-#: dirmngr/dirmngr.c:250
+#: dirmngr/dirmngr.c:251
 msgid "use system's HTTP proxy setting"
 msgstr "и�пользовать �и�темные на�тройки промежуточного �ервера HTTP"
 
-#: dirmngr/dirmngr.c:254
+#: dirmngr/dirmngr.c:255
 msgid "Configuration of LDAP servers to use"
 msgstr "�а�тройки �ерверов LDAP"
 
-#: dirmngr/dirmngr.c:256
+#: dirmngr/dirmngr.c:257
 msgid "inhibit the use of LDAP"
 msgstr "запретить и�пользование LDAP"
 
-#: dirmngr/dirmngr.c:258
+#: dirmngr/dirmngr.c:259
 msgid "ignore LDAP CRL distribution points"
 msgstr ""
 "игнорировать точки ра�про�транени� �пи�ков отозванных �ертификатов по LDAP"
 
-#: dirmngr/dirmngr.c:260
+#: dirmngr/dirmngr.c:261
 msgid "|HOST|use HOST for LDAP queries"
 msgstr "|HOST|и�пользовать хо�т HOST дл� пои�ка LDAP"
 
-#: dirmngr/dirmngr.c:262
+#: dirmngr/dirmngr.c:263
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr "не пользовать�� запа�ными хо�тами � --ldap-proxy"
 
-#: dirmngr/dirmngr.c:264
+#: dirmngr/dirmngr.c:267
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FILE|вз�ть �пи�ок �ерверов LDAP из файла FILE"
 
-#: dirmngr/dirmngr.c:266
+#: dirmngr/dirmngr.c:269
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 "добавл�ть новые �ерверы, обнаруженные в точках ра�про�транени� �пи�ков "
 "отозванных �ертификатов, в �пи�ок �ерверов"
 
-#: dirmngr/dirmngr.c:269 dirmngr/dirmngr_ldap.c:104
+#: dirmngr/dirmngr.c:272
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|у�тановить врем� ожидани� LDAP N �екунд"
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:275
 msgid "Configuration for OCSP"
 msgstr "�а�тройки OCSP"
 
-#: dirmngr/dirmngr.c:274
+#: dirmngr/dirmngr.c:277
 msgid "allow sending OCSP requests"
 msgstr "разрешить по�ылку запро�ов OCSP"
 
-#: dirmngr/dirmngr.c:276
+#: dirmngr/dirmngr.c:279
 msgid "ignore certificate contained OCSP service URLs"
 msgstr "игнорировать URL �лужб OCSP из �ертификата"
 
-#: dirmngr/dirmngr.c:278
+#: dirmngr/dirmngr.c:281
 msgid "|URL|use OCSP responder at URL"
 msgstr "|URL|и�пользовать ответчик OCSP по URL"
 
-#: dirmngr/dirmngr.c:280
+#: dirmngr/dirmngr.c:283
 msgid "|FPR|OCSP response signed by FPR"
 msgstr "|FPR|ответ OCSP подпи�ан �ертификатом � отпечатком FPR"
 
-#: dirmngr/dirmngr.c:288
+#: dirmngr/dirmngr.c:291
 msgid "force loading of outdated CRLs"
 msgstr "принудительна� загрузка у�таревших �пи�ков отозванных �ертификатов"
 
-#: dirmngr/dirmngr.c:299
+#: dirmngr/dirmngr.c:302
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
@@ -10548,11 +10538,11 @@ msgstr ""
 "@\n"
 "(Полный �пи�ок команд и параметров �м. в руковод�тве \"info\")\n"
 
-#: dirmngr/dirmngr.c:441
+#: dirmngr/dirmngr.c:449
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Вызов: @DIRMNGR@ [параметры] (-h - под�казка)"
 
-#: dirmngr/dirmngr.c:443
+#: dirmngr/dirmngr.c:451
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@ -10560,285 +10550,103 @@ msgstr ""
 "Синтак�и�: @DIRMNGR@ [параметры] [команда [аргументы]]\n"
 "До�туп к OCSP, �ерверам ключей, �пи�кам отозванных �ертификатов дл� @GNUPG@\n"
 
-#: dirmngr/dirmngr.c:523
+#: dirmngr/dirmngr.c:531
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr "допу�тимые уровни отладки: %s\n"
 
-#: dirmngr/dirmngr.c:609 tools/gpgconf.c:667 tools/gpgconf.c:702
-#: tools/gpgconf.c:802
+#: dirmngr/dirmngr.c:617 tools/gpgconf.c:701 tools/gpgconf.c:736
+#: tools/gpgconf.c:836
 #, c-format
 msgid "usage: %s [options] "
 msgstr "вызов: %s [параметры] "
 
-#: dirmngr/dirmngr.c:1260
+#: dirmngr/dirmngr.c:1299
 #, c-format
 msgid "colons are not allowed in the socket name\n"
 msgstr "двоеточи� в имени �окета недопу�тимы\n"
 
-#: dirmngr/dirmngr.c:1495 dirmngr/server.c:1824
+#: dirmngr/dirmngr.c:1534 dirmngr/server.c:1878
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "�бой при получении �пи�ка отозванных �ертификатов из '%s': %s\n"
 
-#: dirmngr/dirmngr.c:1501 dirmngr/server.c:1830
+#: dirmngr/dirmngr.c:1540 dirmngr/server.c:1884
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "�бой обработки �пи�ка отозванных �ертификатов из '%s': %s\n"
 
-#: dirmngr/dirmngr.c:1643
+#: dirmngr/dirmngr.c:1682
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: �лишком длинна� �трока - пропущена\n"
 
-#: dirmngr/dirmngr.c:1698 dirmngr/dirmngr.c:1782
+#: dirmngr/dirmngr.c:1737 dirmngr/dirmngr.c:1821
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: обнаружен неверный отпечаток\n"
 
-#: dirmngr/dirmngr.c:1734 dirmngr/dirmngr.c:1760 tools/gpgconf-comp.c:3539
+#: dirmngr/dirmngr.c:1773 dirmngr/dirmngr.c:1799 tools/gpgconf-comp.c:3549
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: ошибка чтени�: %s\n"
 
-#: dirmngr/dirmngr.c:1789
+#: dirmngr/dirmngr.c:1828
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr "%s:%u: му�ор в конце �троки игнорирует��\n"
 
-#: dirmngr/dirmngr.c:1876
+#: dirmngr/dirmngr.c:1915
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr "получен SIGHUP - повторное чтение на�троек и запи�ь буферов на ди�к\n"
 
-#: dirmngr/dirmngr.c:1917
+#: dirmngr/dirmngr.c:1956
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "получен SIGUSR2 - дей�твие не определено\n"
 
-#: dirmngr/dirmngr.c:1922
+#: dirmngr/dirmngr.c:1961
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "получен SIGTERM - завершение работы ...\n"
 
-#: dirmngr/dirmngr.c:1924
+#: dirmngr/dirmngr.c:1963
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "получен SIGTERM - о�тало�ь %d активных �оединений\n"
 
-#: dirmngr/dirmngr.c:1929
+#: dirmngr/dirmngr.c:1968
 #, c-format
 msgid "shutdown forced\n"
 msgstr "принудительное выключение\n"
 
-#: dirmngr/dirmngr.c:1937
+#: dirmngr/dirmngr.c:1976
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "получен SIGINT - немедленное завершение работы\n"
 
-#: dirmngr/dirmngr.c:1944
+#: dirmngr/dirmngr.c:1983
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "получен �игнал %d - дей�твие не определено\n"
 
-#: dirmngr/dirmngr_ldap.c:105
-msgid "return all values in a record oriented format"
-msgstr "возвращать в�е значени� в формате, ориентированном на запи�и"
-
-#: dirmngr/dirmngr_ldap.c:108
-msgid "|NAME|ignore host part and connect through NAME"
-msgstr "|NAME|игнорировать хо�т и подключать�� через NAME"
-
-#: dirmngr/dirmngr_ldap.c:109
-msgid "force a TLS connection"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:110
-msgid "|NAME|connect to host NAME"
-msgstr "|NAME|подключить�� к хо�ту NAME"
-
-#: dirmngr/dirmngr_ldap.c:111
-msgid "|N|connect to port N"
-msgstr "|N|подключить�� к порту N"
-
-#: dirmngr/dirmngr_ldap.c:112
-msgid "|NAME|use user NAME for authentication"
-msgstr "|NAME|и�пользовать им� пользовател� NAME дл� удо�товерени� лично�ти"
-
-#: dirmngr/dirmngr_ldap.c:113
-msgid "|PASS|use password PASS for authentication"
-msgstr "|PASS|и�пользовать дл� удо�товерени� лично�ти пароль PASS"
-
-#: dirmngr/dirmngr_ldap.c:115
-msgid "take password from $DIRMNGR_LDAP_PASS"
-msgstr "вз�ть пароль из $DIRMNGR_LDAP_PASS"
-
-#: dirmngr/dirmngr_ldap.c:116
-msgid "|STRING|query DN STRING"
-msgstr "|STRING|и�кать �троку DN STRING"
-
-#: dirmngr/dirmngr_ldap.c:117
-msgid "|STRING|use STRING as filter expression"
-msgstr "|STRING|и�пользовать �троку STRING как выражение дл� фильтра"
-
-#: dirmngr/dirmngr_ldap.c:118
-msgid "|STRING|return the attribute STRING"
-msgstr "|STRING|вернуть атрибут STRING"
-
-#: dirmngr/dirmngr_ldap.c:179
-msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
-msgstr "Вызов: dirmngr_ldap [параметры] [URL] (-h - под�казка)\n"
-
-#: dirmngr/dirmngr_ldap.c:182
-msgid ""
-"Syntax: dirmngr_ldap [options] [URL]\n"
-"Internal LDAP helper for Dirmngr\n"
-"Interface and options may change without notice\n"
-msgstr ""
-"Синтак�и�: dirmngr_ldap [параметры] [URL]\n"
-"Внутренний помощник LDAP дл� Dirmngr\n"
-"Протокол и параметры могут измен�ть�� без предупреждени�\n"
-
-#: dirmngr/dirmngr_ldap.c:291
-#, c-format
-msgid "invalid port number %d\n"
-msgstr "недопу�тимый номер порта %d\n"
-
-#: dirmngr/dirmngr_ldap.c:400
-#, c-format
-msgid "scanning result for attribute '%s'\n"
-msgstr "пои�к атрибута '%s' в результатах\n"
-
-#: dirmngr/dirmngr_ldap.c:407 dirmngr/dirmngr_ldap.c:490
-#: dirmngr/dirmngr_ldap.c:514 dirmngr/dirmngr_ldap.c:526
-#: dirmngr/dirmngr_ldap.c:722
-#, c-format
-msgid "error writing to stdout: %s\n"
-msgstr "ошибка запи�и в stdout: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:424
-#, c-format
-msgid "          available attribute '%s'\n"
-msgstr "           до�тупный атрибут '%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:462
-#, c-format
-msgid "attribute '%s' not found\n"
-msgstr "атрибут '%s' не найден\n"
-
-#: dirmngr/dirmngr_ldap.c:469
-#, c-format
-msgid "found attribute '%s'\n"
-msgstr "найден атрибут '%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:581
-#, c-format
-msgid "processing url '%s'\n"
-msgstr "обработка URL '%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:588
-#, c-format
-msgid "          user '%s'\n"
-msgstr " пользователь '%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:590
-#, c-format
-msgid "          pass '%s'\n"
-msgstr "       проход '%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:592
-#, c-format
-msgid "          host '%s'\n"
-msgstr "         хо�т '%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:593
-#, c-format
-msgid "          port %d\n"
-msgstr "         порт %d\n"
-
-#: dirmngr/dirmngr_ldap.c:595
-#, c-format
-msgid "            DN '%s'\n"
-msgstr "           DN '%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:597
-#, c-format
-msgid "        filter '%s'\n"
-msgstr "       фильтр '%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:602 dirmngr/dirmngr_ldap.c:605
-#, c-format
-msgid "          attr '%s'\n"
-msgstr "      атрибут '%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:611
-#, c-format
-msgid "no host name in '%s'\n"
-msgstr "в '%s' нет имени хо�та\n"
-
-#: dirmngr/dirmngr_ldap.c:616
-#, c-format
-msgid "no attribute given for query '%s'\n"
-msgstr "дл� запро�а '%s' не задано атрибута\n"
-
-#: dirmngr/dirmngr_ldap.c:622
-#, c-format
-msgid "WARNING: using first attribute only\n"
-msgstr "Внимание: И�пользует�� только первый атрибут\n"
-
-#: dirmngr/dirmngr_ldap.c:637 dirmngr/dirmngr_ldap.c:678
-#, c-format
-msgid "LDAP init to '%s:%d' failed: %s\n"
-msgstr "�бой при инициализации LDAP в '%s:%d': %s\n"
-
-#: dirmngr/dirmngr_ldap.c:659
-#, fuzzy, c-format
-#| msgid "LDAP init to '%s:%d' failed: %s\n"
-msgid "LDAP init to '%s' failed: %s\n"
-msgstr "�бой при инициализации LDAP в '%s:%d': %s\n"
-
-#: dirmngr/dirmngr_ldap.c:665
-#, fuzzy, c-format
-#| msgid "LDAP init to '%s:%d' failed: %s\n"
-msgid "LDAP init to '%s' done\n"
-msgstr "�бой при инициализации LDAP в '%s:%d': %s\n"
-
-#: dirmngr/dirmngr_ldap.c:704
-#, c-format
-msgid "binding to '%s:%d' failed: %s\n"
-msgstr "�бой при прив�зке к '%s:%d': %s\n"
-
-#: dirmngr/dirmngr_ldap.c:728
-#, c-format
-msgid "searching '%s' failed: %s\n"
-msgstr "ошибка пои�ка '%s': %s\n"
-
-#: dirmngr/dirmngr_ldap.c:759
-#, c-format
-msgid "'%s' is not an LDAP URL\n"
-msgstr "'%s' - не URL LDAP\n"
-
-#: dirmngr/dirmngr_ldap.c:765
-#, c-format
-msgid "'%s' is an invalid LDAP URL\n"
-msgstr "'%s' - недопу�тимый URL LDAP\n"
-
-#: dirmngr/http.c:1989 dirmngr/ocsp.c:255
+#: dirmngr/http.c:1998 dirmngr/ocsp.c:255
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "ошибка чтени� '%s': �тату� HTTP %u\n"
 
-#: dirmngr/http.c:3630 dirmngr/ocsp.c:229
+#: dirmngr/http.c:3652 dirmngr/ocsp.c:229
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr "URL '%s' перенаправлен на '%s' (%u)\n"
 
-#: dirmngr/http.c:3636 dirmngr/ocsp.c:246
+#: dirmngr/http.c:3658 dirmngr/ocsp.c:246
 #, c-format
 msgid "too many redirections\n"
 msgstr "�лишком много перенаправлений\n"
 
-#: dirmngr/http.c:3748
+#: dirmngr/http.c:3768
 #, c-format
 msgid "redirection changed to '%s'\n"
 msgstr "перенаправление изменило�ь на '%s'\n"
@@ -10878,31 +10686,51 @@ msgstr "�бой при ожидании обертки LDAP %d: %s\n"
 msgid "ldap wrapper %d stalled - killing\n"
 msgstr "обертка LDAP %d зави�ла - будет удалена\n"
 
-#: dirmngr/ldap.c:91
+#: dirmngr/ldap.c:92
 #, c-format
 msgid "invalid char 0x%02x in host name - not added\n"
 msgstr "недопу�тимый �имвол 0x%02x в имени хо�та - не добавл�ет��\n"
 
-#: dirmngr/ldap.c:95
+#: dirmngr/ldap.c:96
 #, c-format
 msgid "adding '%s:%d' to the ldap server list\n"
 msgstr "добавление '%s:%d' к �пи�ку �ерверов LDAP\n"
 
-#: dirmngr/ldap.c:98 dirmngr/misc.c:512
+#: dirmngr/ldap.c:99 dirmngr/misc.c:512
 #, c-format
 msgid "malloc failed: %s\n"
 msgstr "�бой malloc: %s\n"
 
-#: dirmngr/ldap.c:634
+#: dirmngr/ldap.c:221
 #, c-format
-msgid "start_cert_fetch: invalid pattern '%s'\n"
-msgstr "start_cert_fetch: недопу�тимый шаблон '%s'\n"
+msgid "'%s' is not an LDAP URL\n"
+msgstr "'%s' - не URL LDAP\n"
 
-#: dirmngr/ldap.c:846
+#: dirmngr/ldap.c:227 dirmngr/ldap.c:233
+#, c-format
+msgid "'%s' is an invalid LDAP URL\n"
+msgstr "'%s' - недопу�тимый URL LDAP\n"
+
+#: dirmngr/ldap.c:968
 #, c-format
 msgid "ldap_search hit the size limit of the server\n"
 msgstr "ldap_search до�тиг предела �ервера по размеру\n"
 
+#: dirmngr/ldapserver.c:119
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr "%s:%u: задан пароль, но не задан пользователь\n"
+
+#: dirmngr/ldapserver.c:181
+#, c-format
+msgid "%s:%u: ignoring unknown flag '%s'\n"
+msgstr ""
+
+#: dirmngr/ldapserver.c:203
+#, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr "%s:%u: пропу�каю �ту �троку\n"
+
 #: dirmngr/misc.c:172
 #, c-format
 msgid "invalid canonical S-expression found\n"
@@ -10993,86 +10821,86 @@ msgstr "не подпи�ано о�новным �ертификатом под
 msgid "allocating list item failed: %s\n"
 msgstr "�бой размещени� �лемента �пи�ка: %s\n"
 
-#: dirmngr/ocsp.c:537 dirmngr/ocsp.c:724
+#: dirmngr/ocsp.c:538 dirmngr/ocsp.c:725
 #, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "ошибка при получении идентификатора ответчика: %s\n"
 
-#: dirmngr/ocsp.c:584
+#: dirmngr/ocsp.c:585
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr "не найдено подход�щего �ертификата дл� проверки ответа OCSP\n"
 
-#: dirmngr/ocsp.c:623 dirmngr/validate.c:648
+#: dirmngr/ocsp.c:624 dirmngr/validate.c:648
 #, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "не найден �ертификат издател�: %s\n"
 
-#: dirmngr/ocsp.c:633
+#: dirmngr/ocsp.c:634
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr "вызывавший не вернул целевой �ертификат\n"
 
-#: dirmngr/ocsp.c:640
+#: dirmngr/ocsp.c:641
 #, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "вызывавший не вернул издающий �ертификат\n"
 
-#: dirmngr/ocsp.c:650
+#: dirmngr/ocsp.c:651
 #, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "�бой при выделении пам�ти под контек�т OCSP: %s\n"
 
-#: dirmngr/ocsp.c:689
+#: dirmngr/ocsp.c:690
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr "не определен о�новной ответчик OCSP\n"
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:696
 #, c-format
 msgid "no default OCSP signer defined\n"
 msgstr "не определен о�новной подпи�ывающий в OCSP\n"
 
-#: dirmngr/ocsp.c:702
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr "и�пользует�� о�новной ответчик OCSP '%s'\n"
 
-#: dirmngr/ocsp.c:707
+#: dirmngr/ocsp.c:708
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "и�пользует�� ответчик OCSP '%s'\n"
 
-#: dirmngr/ocsp.c:764
+#: dirmngr/ocsp.c:765
 #, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "ошибка получени� �тату�а OCSP дл� целевого �ертификата: %s\n"
 
-#: dirmngr/ocsp.c:789
+#: dirmngr/ocsp.c:790
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr "�тату� �ертификата: %s (�тот=%s, �ледующий=%s)\n"
 
-#: dirmngr/ocsp.c:790
+#: dirmngr/ocsp.c:791
 msgid "good"
 msgstr "хороший"
 
-#: dirmngr/ocsp.c:796
+#: dirmngr/ocsp.c:797
 #, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "�ертификат был отозван %s по причине: %s\n"
 
-#: dirmngr/ocsp.c:831
+#: dirmngr/ocsp.c:832
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr "ответчик OCSP возвратил �тату� в будущем\n"
 
-#: dirmngr/ocsp.c:843
+#: dirmngr/ocsp.c:844
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr "ответчик OCSP возвратил нетекущий �тату�\n"
 
-#: dirmngr/ocsp.c:858
+#: dirmngr/ocsp.c:859
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr "ответчик OCSP возвратил �лишком �тарый �тату�\n"
@@ -11082,71 +10910,67 @@ msgstr "ответчик OCSP возвратил Ñ�лишком Ñ�тарый Ñ�Ñ
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "�бой assuan_inquire(%s): %s\n"
 
-#: dirmngr/server.c:1158
-msgid "ldapserver missing"
-msgstr "нет �ервера LDAP"
-
-#: dirmngr/server.c:1224
+#: dirmngr/server.c:1277
 msgid "serialno missing in cert ID"
 msgstr "в идентификаторе �ертификата нет �ерийного номера"
 
-#: dirmngr/server.c:1387 dirmngr/server.c:1473 dirmngr/server.c:1909
-#: dirmngr/server.c:1980 dirmngr/server.c:2556 dirmngr/server.c:2571
+#: dirmngr/server.c:1440 dirmngr/server.c:1526 dirmngr/server.c:1963
+#: dirmngr/server.c:2034 dirmngr/server.c:2662 dirmngr/server.c:2677
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "�бой assuan_inquire: %s\n"
 
-#: dirmngr/server.c:1516
+#: dirmngr/server.c:1569
 #, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "�бой fetch_cert_by_url: %s\n"
 
-#: dirmngr/server.c:1528 dirmngr/server.c:1559 dirmngr/server.c:1718
+#: dirmngr/server.c:1581 dirmngr/server.c:1612 dirmngr/server.c:1772
 #, c-format
 msgid "error sending data: %s\n"
 msgstr "ошибка отправки данных: %s\n"
 
-#: dirmngr/server.c:1666
+#: dirmngr/server.c:1720
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "�бой start_cert_fetch: %s\n"
 
-#: dirmngr/server.c:1699
+#: dirmngr/server.c:1753
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "�бой fetch_next_cert: %s\n"
 
-#: dirmngr/server.c:1726
+#: dirmngr/server.c:1780
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr "превышено max_replies %d\n"
 
-#: dirmngr/server.c:2860
+#: dirmngr/server.c:2966
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "�бой при выделении пам�ти под управл�ющую �труктуру: %s\n"
 
-#: dirmngr/server.c:2871
+#: dirmngr/server.c:2977
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "�бой размещени� контек�та Assuan: %s\n"
 
-#: dirmngr/server.c:2892
+#: dirmngr/server.c:2998
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "�бой инициализации �ервера: %s\n"
 
-#: dirmngr/server.c:2900
+#: dirmngr/server.c:3006
 #, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "�бой реги�трации команд � помощью Assuan: %s\n"
 
-#: dirmngr/server.c:2933
+#: dirmngr/server.c:3039
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "проблема � приемом Assuan: %s\n"
 
-#: dirmngr/server.c:2952
+#: dirmngr/server.c:3058
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "�бой обработки Assuan: %s\n"
@@ -11297,69 +11121,69 @@ msgstr "в �том �еан�е dirmngr не работает\n"
 msgid "error sending standard options: %s\n"
 msgstr "ошибка отправки �тандартных параметров: %s\n"
 
-#: tools/gpgconf-comp.c:649
+#: tools/gpgconf-comp.c:655
 msgid "OpenPGP"
 msgstr "OpenPGP"
 
-#: tools/gpgconf-comp.c:653
+#: tools/gpgconf-comp.c:659
 msgid "S/MIME"
 msgstr "S/MIME"
 
-#: tools/gpgconf-comp.c:657
+#: tools/gpgconf-comp.c:663
 #, fuzzy
 #| msgid "public key is %s\n"
 msgid "Public Keys"
 msgstr "открытый ключ - %s\n"
 
-#: tools/gpgconf-comp.c:661
+#: tools/gpgconf-comp.c:667
 msgid "Private Keys"
 msgstr "Закрытые ключи"
 
-#: tools/gpgconf-comp.c:665
+#: tools/gpgconf-comp.c:671
 msgid "Smartcards"
 msgstr "Криптографиче�кие карты"
 
-#: tools/gpgconf-comp.c:669
+#: tools/gpgconf-comp.c:676
 msgid "TPM"
 msgstr ""
 
-#: tools/gpgconf-comp.c:673
+#: tools/gpgconf-comp.c:681
 msgid "Network"
 msgstr "Сеть"
 
-#: tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:685
 msgid "Passphrase Entry"
 msgstr "Ввод фраз-паролей"
 
-#: tools/gpgconf-comp.c:941
+#: tools/gpgconf-comp.c:951
 msgid "Component not suitable for launching"
 msgstr "Компонент не подходит дл� запу�ка"
 
-#: tools/gpgconf-comp.c:947
+#: tools/gpgconf-comp.c:957
 #, c-format
 msgid "Configuration file of component %s is broken\n"
 msgstr "Файл конфигурации компонента %s неи�правен\n"
 
-#: tools/gpgconf-comp.c:950
+#: tools/gpgconf-comp.c:960
 #, c-format
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr "Замечание: Подробно�ти можно выве�ти командой \"%s%s\".\n"
 
-#: tools/gpgconf-comp.c:2816
+#: tools/gpgconf-comp.c:2826
 #, c-format
 msgid "External verification of component %s failed"
 msgstr "Внешн�� проверка компонента %s не прошла"
 
-#: tools/gpgconf-comp.c:2946
+#: tools/gpgconf-comp.c:2956
 msgid "Note that group specifications are ignored\n"
 msgstr "Обратите внимание, что �пецификации групп игнорируют��\n"
 
-#: tools/gpgconf-comp.c:3543
+#: tools/gpgconf-comp.c:3553
 #, c-format
 msgid "error closing '%s'\n"
 msgstr "ошибка закрыти� '%s'\n"
 
-#: tools/gpgconf-comp.c:3545
+#: tools/gpgconf-comp.c:3555
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr "ошибка при интерпретации '%s'\n"
@@ -11440,15 +11264,15 @@ msgstr ""
 "Синтак�и�: @GPGCONF@ [параметры]\n"
 "Управл�ет параметрами на�троек ин�трументари� @GNUPG@\n"
 
-#: tools/gpgconf.c:669 tools/gpgconf.c:704
+#: tools/gpgconf.c:703 tools/gpgconf.c:738
 msgid "Need one component argument"
 msgstr "Требует�� однокомпонентный аргумент"
 
-#: tools/gpgconf.c:678 tools/gpgconf.c:728 tools/gpgconf.c:778
+#: tools/gpgconf.c:712 tools/gpgconf.c:762 tools/gpgconf.c:812
 msgid "Component not found"
 msgstr "Компонент не найден"
 
-#: tools/gpgconf.c:804
+#: tools/gpgconf.c:838
 msgid "No argument allowed"
 msgstr "�ргументы не разрешены"
 
@@ -11464,90 +11288,217 @@ msgstr ""
 "Синтак�и�: gpg-check-pattern [параметры] файл_образцов\n"
 "Проверить фразу-пароль, по�тупающую из stdin, по файлу образцов\n"
 
-#: tools/gpg-card.c:2390
+#: tools/gpg-card.c:2407
 #, fuzzy, c-format
 #| msgid "Note: keys are already stored on the card!\n"
 msgid "Note: key %s is already stored on the card!\n"
 msgstr "Замечание: ключи уже хран�т�� на карте!\n"
 
-#: tools/gpg-card.c:2393
+#: tools/gpg-card.c:2410
 #, fuzzy, c-format
 #| msgid "Note: keys are already stored on the card!\n"
 msgid "Note: Keys are already stored on the card!\n"
 msgstr "Замечание: ключи уже хран�т�� на карте!\n"
 
-#: tools/gpg-card.c:2396
+#: tools/gpg-card.c:2413
 #, fuzzy, c-format
 #| msgid "Replace existing keys? (y/N) "
 msgid "Replace existing key %s ? (y/N) "
 msgstr "Заменить �уще�твующие ключи? (y/N) "
 
-#: tools/gpg-card.c:2549 tools/gpg-card.c:2712 tools/gpg-card.c:2935
-#: tools/gpg-card.c:3044
+#: tools/gpg-card.c:2566 tools/gpg-card.c:2729 tools/gpg-card.c:2952
+#: tools/gpg-card.c:3061
 #, fuzzy, c-format
 #| msgid "OpenPGP card no. %s detected\n"
 msgid "%s card no. %s detected\n"
 msgstr "Обнаружена карта OpenPGP номер %s\n"
 
-#: tools/gpg-card.c:3396
+#: tools/gpg-card.c:3413
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3406 tools/gpg-card.c:3420
+#: tools/gpg-card.c:3423 tools/gpg-card.c:3437
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
 "         can only be reverted using a factory reset!\n"
 msgstr ""
 
-#: tools/gpg-card.c:3423
+#: tools/gpg-card.c:3440
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3669
+#: tools/gpg-card.c:3686
 #, fuzzy
 #| msgid "add a certificate to the cache"
 msgid "authenticate to the card"
 msgstr "добавить �ертификат в буфер"
 
-#: tools/gpg-card.c:3671
+#: tools/gpg-card.c:3688
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3673
+#: tools/gpg-card.c:3690
 msgid "setup KDF for PIN authentication"
 msgstr "на�троить KDF дл� проверки по PIN"
 
-#: tools/gpg-card.c:3675
+#: tools/gpg-card.c:3692
 msgid "change a private data object"
 msgstr ""
 
-#: tools/gpg-card.c:3676
+#: tools/gpg-card.c:3693
 #, fuzzy
 #| msgid "add a certificate to the cache"
 msgid "read a certificate from a data object"
 msgstr "добавить �ертификат в буфер"
 
-#: tools/gpg-card.c:3677
+#: tools/gpg-card.c:3694
 #, fuzzy
 #| msgid "add a certificate to the cache"
 msgid "store a certificate to a data object"
 msgstr "добавить �ертификат в буфер"
 
-#: tools/gpg-card.c:3678
+#: tools/gpg-card.c:3695
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3679
+#: tools/gpg-card.c:3696
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3681
+#: tools/gpg-card.c:3698
 msgid "manage the command history"
 msgstr ""
 
+#~ msgid "requesting key %s from %s server %s\n"
+#~ msgstr "запрашиваю ключ %s � �ервера %s %s\n"
+
+#~ msgid "%s:%u: no hostname given\n"
+#~ msgstr "%s:%u: не задано им� хо�та\n"
+
+#~ msgid "could not parse keyserver\n"
+#~ msgstr "не удало�ь определить �ервер ключей\n"
+
+#~ msgid "return all values in a record oriented format"
+#~ msgstr "возвращать в�е значени� в формате, ориентированном на запи�и"
+
+#~ msgid "|NAME|ignore host part and connect through NAME"
+#~ msgstr "|NAME|игнорировать хо�т и подключать�� через NAME"
+
+#~ msgid "|NAME|connect to host NAME"
+#~ msgstr "|NAME|подключить�� к хо�ту NAME"
+
+#~ msgid "|N|connect to port N"
+#~ msgstr "|N|подключить�� к порту N"
+
+#~ msgid "|NAME|use user NAME for authentication"
+#~ msgstr "|NAME|и�пользовать им� пользовател� NAME дл� удо�товерени� лично�ти"
+
+#~ msgid "|PASS|use password PASS for authentication"
+#~ msgstr "|PASS|и�пользовать дл� удо�товерени� лично�ти пароль PASS"
+
+#~ msgid "take password from $DIRMNGR_LDAP_PASS"
+#~ msgstr "вз�ть пароль из $DIRMNGR_LDAP_PASS"
+
+#~ msgid "|STRING|query DN STRING"
+#~ msgstr "|STRING|и�кать �троку DN STRING"
+
+#~ msgid "|STRING|use STRING as filter expression"
+#~ msgstr "|STRING|и�пользовать �троку STRING как выражение дл� фильтра"
+
+#~ msgid "|STRING|return the attribute STRING"
+#~ msgstr "|STRING|вернуть атрибут STRING"
+
+#~ msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
+#~ msgstr "Вызов: dirmngr_ldap [параметры] [URL] (-h - под�казка)\n"
+
+#~ msgid ""
+#~ "Syntax: dirmngr_ldap [options] [URL]\n"
+#~ "Internal LDAP helper for Dirmngr\n"
+#~ "Interface and options may change without notice\n"
+#~ msgstr ""
+#~ "Синтак�и�: dirmngr_ldap [параметры] [URL]\n"
+#~ "Внутренний помощник LDAP дл� Dirmngr\n"
+#~ "Протокол и параметры могут измен�ть�� без предупреждени�\n"
+
+#~ msgid "invalid port number %d\n"
+#~ msgstr "недопу�тимый номер порта %d\n"
+
+#~ msgid "scanning result for attribute '%s'\n"
+#~ msgstr "пои�к атрибута '%s' в результатах\n"
+
+#~ msgid "error writing to stdout: %s\n"
+#~ msgstr "ошибка запи�и в stdout: %s\n"
+
+#~ msgid "          available attribute '%s'\n"
+#~ msgstr "           до�тупный атрибут '%s'\n"
+
+#~ msgid "attribute '%s' not found\n"
+#~ msgstr "атрибут '%s' не найден\n"
+
+#~ msgid "found attribute '%s'\n"
+#~ msgstr "найден атрибут '%s'\n"
+
+#~ msgid "processing url '%s'\n"
+#~ msgstr "обработка URL '%s'\n"
+
+#~ msgid "          user '%s'\n"
+#~ msgstr " пользователь '%s'\n"
+
+#~ msgid "          pass '%s'\n"
+#~ msgstr "       проход '%s'\n"
+
+#~ msgid "          host '%s'\n"
+#~ msgstr "         хо�т '%s'\n"
+
+#~ msgid "          port %d\n"
+#~ msgstr "         порт %d\n"
+
+#~ msgid "            DN '%s'\n"
+#~ msgstr "           DN '%s'\n"
+
+#~ msgid "        filter '%s'\n"
+#~ msgstr "       фильтр '%s'\n"
+
+#~ msgid "          attr '%s'\n"
+#~ msgstr "      атрибут '%s'\n"
+
+#~ msgid "no host name in '%s'\n"
+#~ msgstr "в '%s' нет имени хо�та\n"
+
+#~ msgid "no attribute given for query '%s'\n"
+#~ msgstr "дл� запро�а '%s' не задано атрибута\n"
+
+#~ msgid "WARNING: using first attribute only\n"
+#~ msgstr "Внимание: И�пользует�� только первый атрибут\n"
+
+#~ msgid "LDAP init to '%s:%d' failed: %s\n"
+#~ msgstr "�бой при инициализации LDAP в '%s:%d': %s\n"
+
+#, fuzzy
+#~| msgid "LDAP init to '%s:%d' failed: %s\n"
+#~ msgid "LDAP init to '%s' failed: %s\n"
+#~ msgstr "�бой при инициализации LDAP в '%s:%d': %s\n"
+
+#, fuzzy
+#~| msgid "LDAP init to '%s:%d' failed: %s\n"
+#~ msgid "LDAP init to '%s' done\n"
+#~ msgstr "�бой при инициализации LDAP в '%s:%d': %s\n"
+
+#~ msgid "binding to '%s:%d' failed: %s\n"
+#~ msgstr "�бой при прив�зке к '%s:%d': %s\n"
+
+#~ msgid "searching '%s' failed: %s\n"
+#~ msgstr "ошибка пои�ка '%s': %s\n"
+
+#~ msgid "start_cert_fetch: invalid pattern '%s'\n"
+#~ msgstr "start_cert_fetch: недопу�тимый шаблон '%s'\n"
+
+#~ msgid "ldapserver missing"
+#~ msgstr "нет �ервера LDAP"
+
 #, fuzzy
 #~| msgid "change a passphrase"
 #~ msgid "Suggest a random passphrase."
diff --git a/po/sk.po b/po/sk.po
index 41763ed..bf96ad1 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: 2021-04-20 12:38+0200\n"
+"POT-Creation-Date: 2021-08-24 18:50+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:328
+#: agent/call-pinentry.c:338
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "nemôžem inicializovať databázu dôvery: %s\n"
@@ -29,48 +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:546
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_OK"
 msgstr ""
 
-#: agent/call-pinentry.c:547
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
-#: agent/call-pinentry.c:548
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|_Yes"
 msgstr ""
 
-#: agent/call-pinentry.c:549
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_No"
 msgstr ""
 
-#: agent/call-pinentry.c:550
+#: agent/call-pinentry.c:560
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:551
+#: agent/call-pinentry.c:561
 msgid "|pinentry-label|_Save in password manager"
 msgstr ""
 
-#: agent/call-pinentry.c:552
+#: agent/call-pinentry.c:562
 #, 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:554
+#: agent/call-pinentry.c:564
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:555
+#: agent/call-pinentry.c:565
 #, fuzzy
 #| msgid "invalid passphrase"
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "nesprávne heslo"
 
+#: agent/call-pinentry.c:566
+msgid "Caps Lock is on"
+msgstr ""
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:944
+#: agent/call-pinentry.c:1022
 msgid "Suggest"
 msgstr ""
 
@@ -81,13 +85,25 @@ 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:966
+#: agent/call-pinentry.c:1044
 msgid "pinentry.genpin.tooltip"
 msgstr ""
 
+#: agent/call-pinentry.c:1072
+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
+#, 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:998
+#: agent/call-pinentry.c:1198
 msgid "Quality:"
 msgstr ""
 
@@ -97,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:1019
+#: agent/call-pinentry.c:1219
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:1263
+#: agent/call-pinentry.c:1477
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:1266
+#: agent/call-pinentry.c:1480
 #, 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:1303 agent/call-pinentry.c:1506
+#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1303 agent/call-pinentry.c:1506
-#: agent/protect-tool.c:728
+#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/protect-tool.c:729
 #, fuzzy
 msgid "Passphrase:"
 msgstr "nesprávne heslo"
 
-#: agent/call-pinentry.c:1330 agent/call-pinentry.c:1580 agent/command.c:1799
-#: agent/command.c:1852 agent/command-ssh.c:3046 agent/genkey.c:398
+#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
+#: agent/command.c:1988 agent/command-ssh.c:3046 agent/genkey.c:442
 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:1351 agent/call-pinentry.c:1603
+#: agent/call-pinentry.c:1566 agent/call-pinentry.c:1830
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:1362 agent/call-pinentry.c:1614
+#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
 msgid "Repeat:"
 msgstr ""
 
-#: agent/call-pinentry.c:1372 agent/call-pinentry.c:1384
-#: agent/call-pinentry.c:1624 agent/call-pinentry.c:1636
+#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
+#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
 #, fuzzy
 msgid "PIN too long"
 msgstr "riadok je príliš dlhý\n"
 
-#: agent/call-pinentry.c:1373 agent/call-pinentry.c:1625
+#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "heslo je príliš dlhé\n"
 
-#: agent/call-pinentry.c:1381 agent/call-pinentry.c:1633
+#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Neplatný znak ve mene\n"
 
-#: agent/call-pinentry.c:1386 agent/call-pinentry.c:1638
+#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:1405 agent/call-pinentry.c:1656
+#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
 #, fuzzy
 msgid "Bad PIN"
 msgstr "nesprávne MPI"
 
-#: agent/call-pinentry.c:1405 agent/call-pinentry.c:1656
+#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "nesprávne heslo"
 
-#: agent/command.c:697
+#: agent/command.c:823
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:698
+#: agent/command.c:824
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1106 g10/card-util.c:708 g10/card-util.c:729
+#: agent/command.c:1235 g10/card-util.c:713 g10/card-util.c:734
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: agent/command.c:1634 agent/command.c:1791 agent/command-ssh.c:2974
-#: agent/genkey.c:333
+#: agent/command.c:1756 agent/command.c:1921 agent/command-ssh.c:2974
+#: agent/genkey.c:377
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "zmeniť heslo"
 
-#: agent/command.c:2567
+#: agent/command.c:2703
 #, 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:2697
+#: agent/command.c:2833
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -208,26 +224,26 @@ msgstr ""
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ochranný algoritmus %d%s nie je podporováný\n"
 
-#: agent/command-ssh.c:872 common/dotlock.c:852 g10/card-util.c:953
-#: g10/export.c:1329 g10/gpg.c:1431 g10/keygen.c:5347 g10/keyring.c:1319
-#: g10/keyring.c:1632 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
+#: agent/command-ssh.c:872 common/dotlock.c:852 g10/card-util.c:963
+#: g10/export.c:1329 g10/gpg.c:1431 g10/keygen.c:5377 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
 #: g10/sign.c:1106 g10/sign.c:1443 g10/tdbio.c:753 tools/gpg-card.c:479
 #, fuzzy, c-format
 #| msgid "can't create `%s': %s\n"
 msgid "can't create '%s': %s\n"
 msgstr "nemôžem vytvoriť `%s': %s\n"
 
-#: agent/command-ssh.c:884 common/helpfile.c:57 g10/card-util.c:910
+#: agent/command-ssh.c:884 common/helpfile.c:57 g10/card-util.c:920
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
 #: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:721 g10/gpg.c:1432
-#: g10/import.c:371 g10/import.c:558 g10/import.c:793 g10/keygen.c:4322
-#: g10/keyring.c:1658 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
+#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4326
+#: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
 #: g10/plaintext.c:610 g10/sign.c:1086 g10/sign.c:1311 g10/sign.c:1424
 #: g10/sign.c:1596 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2380
-#: sm/gpgsm.c:2410 sm/gpgsm.c:2448 sm/keylist.c:1737 sm/qualified.c:65
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2236
+#: sm/gpgsm.c:2266 sm/gpgsm.c:2304 sm/keylist.c:1775 sm/qualified.c:65
 #: dirmngr/certcache.c:396 dirmngr/certcache.c:476 dirmngr/certcache.c:478
-#: dirmngr/crlcache.c:2588 dirmngr/dirmngr.c:1720 tools/gpg-card.c:408
+#: dirmngr/crlcache.c:2591 dirmngr/dirmngr.c:1759 tools/gpg-card.c:408
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
@@ -336,39 +352,39 @@ msgstr "heslo nie je zopakované správne; skúste to znovu"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:109 sm/certreqgen-ui.c:433
+#: 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:116
+#: agent/genkey.c:150
 #, fuzzy, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "zapisujem do '%s'\n"
 
-#: agent/genkey.c:154
+#: agent/genkey.c:191
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Vložiť heslo\n"
 
-#: agent/genkey.c:184
+#: agent/genkey.c:227
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:186
+#: agent/genkey.c:229
 #, 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:198
+#: agent/genkey.c:241
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:215
+#: agent/genkey.c:258
 #, fuzzy, c-format
 #| msgid "Name must be at least 5 characters long\n"
 msgid "A passphrase should be at least %u character long."
@@ -376,7 +392,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:234
+#: agent/genkey.c:277
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -384,243 +400,242 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:260
+#: agent/genkey.c:304
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:275
+#: agent/genkey.c:319
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
-#: agent/genkey.c:296
+#: agent/genkey.c:340
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "Použiť napriek tomu tento kľú�? "
 
-#: agent/genkey.c:464
+#: agent/genkey.c:508
 #, 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:590
+#: agent/genkey.c:637
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "zmeniť heslo"
 
-#: agent/gpg-agent.c:162 scd/scdaemon.c:115 dirmngr/dirmngr.c:182
+#: agent/gpg-agent.c:164 scd/scdaemon.c:115 dirmngr/dirmngr.c:183
 msgid "Options used for startup"
 msgstr ""
 
-#: agent/gpg-agent.c:164 scd/scdaemon.c:120 dirmngr/dirmngr.c:171
+#: agent/gpg-agent.c:166 scd/scdaemon.c:120 dirmngr/dirmngr.c:172
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:117 dirmngr/dirmngr.c:170
+#: agent/gpg-agent.c:167 scd/scdaemon.c:117 dirmngr/dirmngr.c:171
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:167 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:169 dirmngr/dirmngr.c:174
 #, fuzzy
 #| msgid "Key is superseded"
 msgid "run in supervised mode"
 msgstr "Kľú� je nahradený"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:121 dirmngr/dirmngr.c:184
+#: agent/gpg-agent.c:171 scd/scdaemon.c:121 dirmngr/dirmngr.c:185
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:170 scd/scdaemon.c:122 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:172 scd/scdaemon.c:122 dirmngr/dirmngr.c:186
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:171 scd/scdaemon.c:123 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:173 scd/scdaemon.c:123 dirmngr/dirmngr.c:187
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:179 g10/gpg.c:589 scd/scdaemon.c:125 sm/gpgsm.c:422
-#: dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:181 g10/gpg.c:589 scd/scdaemon.c:125 sm/gpgsm.c:423
+#: dirmngr/dirmngr.c:189
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|SÚBOR|nahrať rozširujúci modul SÚBOR"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:574 scd/scdaemon.c:129 sm/gpgsm.c:265
-#: dirmngr/dirmngr.c:192
+#: agent/gpg-agent.c:185 g10/gpg.c:574 scd/scdaemon.c:129 sm/gpgsm.c:265
+#: dirmngr/dirmngr.c:193
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: agent/gpg-agent.c:185 g10/gpg.c:576 g10/gpgv.c:78 kbx/kbxutil.c:89
+#: agent/gpg-agent.c:187 g10/gpg.c:576 g10/gpgv.c:78 kbx/kbxutil.c:89
 #: scd/scdaemon.c:131 sm/gpgsm.c:267 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:194 dirmngr/dirmngr_ldap.c:102
-#: tools/gpg-connect-agent.c:85 tools/gpgconf.c:111
+#: dirmngr/dirmngr.c:195 tools/gpg-connect-agent.c:85 tools/gpgconf.c:111
 msgid "verbose"
 msgstr "s dodato�nými informáciami"
 
-#: agent/gpg-agent.c:186 g10/gpg.c:578 g10/gpgv.c:79 kbx/kbxutil.c:90
+#: agent/gpg-agent.c:188 g10/gpg.c:578 g10/gpgv.c:79 kbx/kbxutil.c:90
 #: scd/scdaemon.c:132 sm/gpgsm.c:269 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:195 dirmngr/dirmngr_ldap.c:103
+#: dirmngr/dirmngr.c:196
 msgid "be somewhat more quiet"
 msgstr "byť o trochu tichší"
 
-#: agent/gpg-agent.c:194 g10/gpg.c:593 sm/gpgsm.c:283 dirmngr/dirmngr.c:205
+#: agent/gpg-agent.c:196 g10/gpg.c:593 sm/gpgsm.c:283 dirmngr/dirmngr.c:206
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 scd/scdaemon.c:146 sm/gpgsm.c:290
-#: dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:599 scd/scdaemon.c:146 sm/gpgsm.c:290
+#: dirmngr/dirmngr.c:210
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: agent/gpg-agent.c:201
+#: agent/gpg-agent.c:203
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "aktualizovať databázu dôvery"
 
-#: agent/gpg-agent.c:203
+#: agent/gpg-agent.c:205
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 #, 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:213
+#: agent/gpg-agent.c:215
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:215
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:216
+#: agent/gpg-agent.c:218
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
 msgstr "nepodporované"
 
-#: agent/gpg-agent.c:218
+#: agent/gpg-agent.c:220
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:221
+#: agent/gpg-agent.c:223
 #, fuzzy
 #| msgid "not supported"
 msgid "enable putty support"
 msgstr "nepodporované"
 
-#: agent/gpg-agent.c:233 g10/gpg.c:844 scd/scdaemon.c:176 sm/gpgsm.c:382
+#: agent/gpg-agent.c:235 g10/gpg.c:844 scd/scdaemon.c:176 sm/gpgsm.c:383
 msgid "Options controlling the security"
 msgstr ""
 
-#: agent/gpg-agent.c:236
+#: agent/gpg-agent.c:238
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:238
+#: agent/gpg-agent.c:240
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:242
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:244
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:246
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:248
 #, fuzzy
 msgid "disallow the use of an external password cache"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:250
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:253
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: agent/gpg-agent.c:256
+#: agent/gpg-agent.c:258
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:261
 msgid "do not allow bypassing the passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:261
+#: agent/gpg-agent.c:263
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:265
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:266
+#: agent/gpg-agent.c:268
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:268
+#: agent/gpg-agent.c:272
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|použiť mód hesla N"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:274
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: agent/gpg-agent.c:273
+#: agent/gpg-agent.c:277
 msgid "Options controlling the PIN-Entry"
 msgstr ""
 
-#: agent/gpg-agent.c:275
+#: agent/gpg-agent.c:279
 #, fuzzy
 #| msgid "use the gpg-agent"
 msgid "never use the PIN-entry"
 msgstr "použite gpg-agenta"
 
-#: agent/gpg-agent.c:277
+#: agent/gpg-agent.c:281
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:283
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:282
+#: agent/gpg-agent.c:286
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:286
+#: agent/gpg-agent.c:290
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:294
 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:551 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: agent/gpg-agent.c:557 agent/preset-passphrase.c:99 agent/protect-tool.c:154
 #: g10/gpg.c:1132 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:612 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:438
-#: dirmngr/dirmngr_ldap.c:175 tools/gpg-connect-agent.c:220 tools/gpgconf.c:151
+#: sm/gpgsm.c:613 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:446
+#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:151
 #: tools/gpg-check-pattern.c:143
 #, fuzzy
 msgid "Please report bugs to <@EMAIL@>.\n"
@@ -628,145 +643,145 @@ 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:560
+#: agent/gpg-agent.c:566
 #, fuzzy
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
 
-#: agent/gpg-agent.c:562
+#: agent/gpg-agent.c:568
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:607 g10/gpg.c:1337 scd/scdaemon.c:384 sm/gpgsm.c:760
-#: dirmngr/dirmngr.c:522
+#: agent/gpg-agent.c:613 g10/gpg.c:1337 scd/scdaemon.c:384 sm/gpgsm.c:761
+#: dirmngr/dirmngr.c:530
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:972 g10/gpg.c:3910 g10/gpg.c:3934 sm/gpgsm.c:1769
-#: sm/gpgsm.c:1775
+#: agent/gpg-agent.c:986 g10/gpg.c:3907 g10/gpg.c:3931 sm/gpgsm.c:1622
+#: sm/gpgsm.c:1628
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybraný hashovací algoritmus je neplatný\n"
 
-#: agent/gpg-agent.c:1196 agent/gpg-agent.c:2019 common/comopt.c:93
-#: g10/gpg.c:2591 scd/scdaemon.c:549 sm/gpgsm.c:1155 dirmngr/dirmngr.c:989
-#: dirmngr/dirmngr.c:1840
+#: agent/gpg-agent.c:1210 agent/gpg-agent.c:2035 common/comopt.c:93
+#: g10/gpg.c:2594 scd/scdaemon.c:549 sm/gpgsm.c:1028 dirmngr/dirmngr.c:1029
+#: dirmngr/dirmngr.c:1879
 #, 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:1335 g10/gpg.c:3861 scd/scdaemon.c:687 sm/gpgsm.c:1709
-#: dirmngr/dirmngr.c:1108 tools/gpg-connect-agent.c:1270 tools/gpgconf.c:634
+#: agent/gpg-agent.c:1349 g10/gpg.c:3858 scd/scdaemon.c:687 sm/gpgsm.c:1562
+#: dirmngr/dirmngr.c:1145 tools/gpg-connect-agent.c:1270 tools/gpgconf.c:668
 #, 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:2172 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1267
+#: agent/gpg-agent.c:2188 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1306
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s: nemôžem vytvoriť: %s\n"
 
-#: agent/gpg-agent.c:2189 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1280
+#: agent/gpg-agent.c:2205 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1319
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2228
+#: agent/gpg-agent.c:2244
 #, 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:2239 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1312
+#: agent/gpg-agent.c:2255 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1351
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: agent/gpg-agent.c:2244 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1315
+#: agent/gpg-agent.c:2260 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1354
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "chyba pri posielaní na `%s': %s\n"
 
-#: agent/gpg-agent.c:2255 agent/gpg-agent.c:2295 agent/gpg-agent.c:2304
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1324
+#: agent/gpg-agent.c:2271 agent/gpg-agent.c:2311 agent/gpg-agent.c:2320
+#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1363
 #, 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:2269 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1336
+#: agent/gpg-agent.c:2285 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1375
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "zapisujem tajný kľú� do `%s'\n"
 
-#: agent/gpg-agent.c:2289 agent/gpg-agent.c:2342 common/homedir.c:517
+#: agent/gpg-agent.c:2305 agent/gpg-agent.c:2358 common/homedir.c:537
 #: 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:2292 agent/gpg-agent.c:2347 common/homedir.c:520
+#: agent/gpg-agent.c:2308 agent/gpg-agent.c:2363 common/homedir.c:540
 #: g10/openfile.c:402
 #, fuzzy, c-format
 msgid "directory '%s' created\n"
 msgstr "%s: adresár vytvorený\n"
 
-#: agent/gpg-agent.c:2353
+#: agent/gpg-agent.c:2369
 #, 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:2357
+#: agent/gpg-agent.c:2373
 #, 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:2512 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2069
+#: agent/gpg-agent.c:2528 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2108
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "chyba pri �ítaní `%s': %s\n"
 
-#: agent/gpg-agent.c:2719
+#: agent/gpg-agent.c:2735
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2724
+#: agent/gpg-agent.c:2740
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2799
+#: agent/gpg-agent.c:2815
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2804
+#: agent/gpg-agent.c:2820
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3026 scd/scdaemon.c:1374 dirmngr/dirmngr.c:2283
+#: agent/gpg-agent.c:3042 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2322
 #, 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:3114 scd/scdaemon.c:1439
+#: agent/gpg-agent.c:3130 scd/scdaemon.c:1441
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: presko�ené: %s\n"
 
-#: agent/gpg-agent.c:3252 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3271 common/simple-pwquery.c:247 g10/call-agent.c:260
 #: sm/call-agent.c:131 tools/gpg-connect-agent.c:2319 tools/card-call-scd.c:311
 #, fuzzy, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent nie je v tomto sedení dostupný\n"
 
-#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:70
+#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:66
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -788,7 +803,7 @@ msgid ""
 msgstr ""
 
 #: agent/protect-tool.c:107 g10/gpg.c:448 kbx/kbxutil.c:72 sm/gpgsm.c:215
-#: dirmngr/dirmngr.c:168 tools/gpgconf.c:81
+#: dirmngr/dirmngr.c:169 tools/gpgconf.c:81
 msgid ""
 "@Commands:\n"
 " "
@@ -818,40 +833,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:707
+#: agent/protect-tool.c:708 sm/import.c:775
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Prosím, vložte heslo; toto je tajná veta \n"
 
-#: agent/protect-tool.c:712
+#: agent/protect-tool.c:713 sm/export.c:727
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Prosím, vložte heslo; toto je tajná veta \n"
 
-#: agent/protect-tool.c:718
+#: agent/protect-tool.c:719
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:723
+#: agent/protect-tool.c:724
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Prosím, vložte heslo; toto je tajná veta \n"
 
-#: agent/protect-tool.c:734
+#: agent/protect-tool.c:735
 #, fuzzy, c-format
 msgid "cancelled\n"
 msgstr "Zrušiť"
 
-#: agent/protect-tool.c:736
+#: agent/protect-tool.c:737
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: agent/trustlist.c:153 agent/trustlist.c:363 tools/gpgconf.c:424
+#: agent/trustlist.c:153 agent/trustlist.c:363 tools/gpgconf.c:458
 #, fuzzy, c-format
 msgid "error opening '%s': %s\n"
 msgstr "chyba pri �ítaní `%s': %s\n"
@@ -1006,7 +1021,7 @@ msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
 msgid "secret key parts are not available\n"
 msgstr "tajné �asti kľú�a nie sú dostupné\n"
 
-#: agent/cvt-openpgp.c:343 g10/card-util.c:1562
+#: agent/cvt-openpgp.c:343 g10/card-util.c:1575
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -1038,7 +1053,7 @@ msgid "error creating a stream for a pipe: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
 #: common/exechelp-posix.c:505 common/exechelp-posix.c:580
-#: common/exechelp-posix.c:866 dirmngr/dirmngr.c:1354
+#: common/exechelp-posix.c:866 dirmngr/dirmngr.c:1393
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "chyba pri �ítaní `%s': %s\n"
@@ -1111,7 +1126,7 @@ msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3082
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3099
 msgid "yes"
 msgstr "ano"
 
@@ -1166,7 +1181,7 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:115 g10/card-util.c:917 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:927 tools/no-libgcrypt.c:30
 #: tools/gpg-card.c:416
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
@@ -1238,7 +1253,7 @@ msgstr "chyba pri vytváraní súboru kľú�ov (keyring)`%s': %s\n"
 msgid "server '%s' is older than us (%s < %s)"
 msgstr ""
 
-#: common/asshelp.c:737 g10/call-dirmngr.c:408
+#: common/asshelp.c:737 g10/call-dirmngr.c:407
 #, fuzzy, c-format
 #| msgid "WARNING: %s overrides %s\n"
 msgid "WARNING: %s\n"
@@ -1333,7 +1348,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:4212
+#: scd/app-openpgp.c:4214
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
@@ -1417,12 +1432,12 @@ msgstr "Platnosť kľú�a vypršala!"
 msgid "Root certificate trustworthy"
 msgstr "nesprávny certifikát"
 
-#: common/audit.c:1112 sm/certchain.c:1242
+#: common/audit.c:1112 sm/certchain.c:1243
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "nesprávny certifikát"
 
-#: common/audit.c:1115 sm/certchain.c:1252
+#: common/audit.c:1115 sm/certchain.c:1253
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Kľú� k dispozícii na: "
@@ -1474,22 +1489,22 @@ msgstr "neznáme"
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "neplatný znak vo formáte radix64 %02x bol presko�ený\n"
 
-#: common/ttyio.c:433
+#: common/ttyio.c:447
 #, c-format
 msgid "Sorry, we are in batchmode - can't get input\n"
 msgstr ""
 
-#: common/ttyio.c:439
+#: common/ttyio.c:453
 #, c-format
 msgid "Sorry, no terminal at all requested - can't get input\n"
 msgstr ""
 
-#: common/ttyio.c:474 common/ttyio.c:484
+#: common/ttyio.c:488 common/ttyio.c:498
 #, c-format
 msgid "too many errors; giving up\n"
 msgstr ""
 
-#: common/ttyio.c:536
+#: common/ttyio.c:550
 #, c-format
 msgid "Control-D detected\n"
 msgstr ""
@@ -1543,8 +1558,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:1036 dirmngr/dirmngr.c:895
-#: dirmngr/dirmngr.c:904
+#: common/init.c:191 sm/gpgsm.c:909 dirmngr/dirmngr.c:935 dirmngr/dirmngr.c:944
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
@@ -1702,7 +1716,7 @@ msgid "Enter passphrase: "
 msgstr "Vložte heslo: "
 
 #: g10/call-agent.c:318 g10/encrypt.c:282 g10/encrypt.c:818 g10/sign.c:473
-#: sm/call-agent.c:180 sm/encrypt.c:701 sm/sign.c:436
+#: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
 #, fuzzy, c-format
 #| msgid "%s does not yet work with %s\n"
 msgid "%s is not compliant with %s mode\n"
@@ -1713,18 +1727,18 @@ msgstr "%s ešte nepracuje s %s\n"
 msgid "error from TPM: %s\n"
 msgstr "chyba pri �ítaní `%s': %s\n"
 
-#: g10/call-agent.c:2123 g10/passphrase.c:225 g10/passphrase.c:258
-#: tools/card-call-scd.c:1751
+#: g10/call-agent.c:2135 g10/passphrase.c:233 g10/passphrase.c:266
+#: tools/card-call-scd.c:1755
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problém s agentom: agent vracia 0x%lx\n"
 
-#: g10/call-dirmngr.c:179 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2316
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2316
 #, fuzzy, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "gpg-agent nie je v tomto sedení dostupný\n"
 
-#: g10/call-dirmngr.c:213
+#: g10/call-dirmngr.c:212
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "keyserver option \"honor-keyserver-url\" may not be used in Tor mode\n"
@@ -1732,208 +1746,208 @@ msgstr ""
 "použitie %s nie je v móde %s dovolené\n"
 "\n"
 
-#: g10/call-dirmngr.c:386
+#: g10/call-dirmngr.c:385
 msgid "WKD uses a cached result"
 msgstr ""
 
-#: g10/call-dirmngr.c:389
+#: g10/call-dirmngr.c:388
 msgid "Tor is not running"
 msgstr ""
 
-#: g10/call-dirmngr.c:391
+#: g10/call-dirmngr.c:390
 #, fuzzy
 msgid "Tor is not properly configured"
 msgstr "chyba: neplatný odtla�ok\n"
 
-#: g10/call-dirmngr.c:393
+#: g10/call-dirmngr.c:392
 #, fuzzy
 msgid "DNS is not properly configured"
 msgstr "chyba: neplatný odtla�ok\n"
 
-#: g10/call-dirmngr.c:395
+#: g10/call-dirmngr.c:394
 msgid "unacceptable HTTP redirect from server"
 msgstr ""
 
-#: g10/call-dirmngr.c:397
+#: g10/call-dirmngr.c:396
 msgid "unacceptable HTTP redirect from server was cleaned up"
 msgstr ""
 
-#: g10/call-dirmngr.c:399
+#: g10/call-dirmngr.c:398
 #, fuzzy
 #| msgid "generate a revocation certificate"
 msgid "server uses an invalid certificate"
 msgstr "vytvoriť revoka�ný certifikát"
 
-#: g10/call-dirmngr.c:406 g10/gpg.c:4599
+#: g10/call-dirmngr.c:405 g10/gpg.c:4596
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "ASCII kódovanie: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:369 g10/card-util.c:1924
-#: tools/gpg-card.c:3039
+#: g10/card-util.c:86 g10/card-util.c:374 g10/card-util.c:1937
+#: tools/gpg-card.c:3056
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "tajný kľú� nie je dostupný"
 
-#: g10/card-util.c:91 g10/card-util.c:1930
+#: g10/card-util.c:91 g10/card-util.c:1943
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:97 g10/card-util.c:2309 g10/delkey.c:164 g10/keyedit.c:1428
-#: g10/keygen.c:4791 g10/revoke.c:214 g10/revoke.c:638
+#: g10/card-util.c:97 g10/card-util.c:2322 g10/delkey.c:164 g10/keyedit.c:1428
+#: g10/keygen.c:4795 g10/revoke.c:214 g10/revoke.c:639
 #, fuzzy, c-format
 msgid "can't do this in batch mode\n"
 msgstr "nemožno previesť v dávkovom móde\n"
 
-#: g10/card-util.c:105 tools/gpg-card.c:2943
+#: g10/card-util.c:105 tools/gpg-card.c:2960
 #, fuzzy, c-format
 msgid "This command is only available for version 2 cards\n"
 msgstr "Tento príkaz nie je v módoch %s dovolený.\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3398 tools/gpg-card.c:2948
+#: g10/card-util.c:107 scd/app-openpgp.c:3399 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"
 
-#: g10/card-util.c:140 g10/card-util.c:1448 g10/card-util.c:1710
-#: g10/card-util.c:1802 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1991 g10/keygen.c:2165 g10/keygen.c:2385 g10/keygen.c:2685
+#: g10/card-util.c:140 g10/card-util.c:1458 g10/card-util.c:1723
+#: g10/card-util.c:1815 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/keygen.c:1992 g10/keygen.c:2166 g10/keygen.c:2386 g10/keygen.c:2686
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
 #: tools/gpg-card.c:510
 msgid "Your selection? "
 msgstr "Váš výber? "
 
-#: g10/card-util.c:262 g10/card-util.c:313 tools/gpg-card.c:596
+#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:596
 #: tools/gpg-card.c:636
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:558 tools/gpg-card.c:903
+#: g10/card-util.c:563 tools/gpg-card.c:905
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:559 tools/gpg-card.c:904
+#: g10/card-util.c:564 tools/gpg-card.c:906
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:586 tools/gpg-card.c:931
+#: g10/card-util.c:591 tools/gpg-card.c:933
 #, fuzzy
 msgid "not forced"
 msgstr "nespracované"
 
-#: g10/card-util.c:586 tools/gpg-card.c:931
+#: g10/card-util.c:591 tools/gpg-card.c:933
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:768 tools/gpg-card.c:1468
+#: g10/card-util.c:773 tools/gpg-card.c:1484
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:770 tools/gpg-card.c:1470
+#: g10/card-util.c:775 tools/gpg-card.c:1486
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:772 tools/gpg-card.c:1472
+#: g10/card-util.c:777 tools/gpg-card.c:1488
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:789 tools/gpg-card.c:1505
+#: g10/card-util.c:795 tools/gpg-card.c:1521
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:791 tools/gpg-card.c:1506
+#: g10/card-util.c:797 tools/gpg-card.c:1522
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:809 tools/gpg-card.c:1523
+#: g10/card-util.c:816 tools/gpg-card.c:1539
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:830 tools/gpg-card.c:1561
+#: g10/card-util.c:840 tools/gpg-card.c:1577
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "žiadny zodpovedajúci verejný kľú�: %s\n"
 
-#: g10/card-util.c:926 g10/decrypt-data.c:495 g10/import.c:406 g10/import.c:756
-#: g10/import.c:815 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1666
-#: tools/gpgconf.c:437 tools/gpgconf.c:483 tools/gpg-card.c:426
+#: g10/card-util.c:936 g10/decrypt-data.c:495 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:1705
+#: tools/gpgconf.c:471 tools/gpgconf.c:517 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:959 g10/decrypt-data.c:498 g10/export.c:2496
+#: g10/card-util.c:969 g10/decrypt-data.c:498 g10/export.c:2496
 #: dirmngr/crlcache.c:925 tools/gpg-card.c:486 tools/gpg-card.c:493
 #, fuzzy, c-format
 msgid "error writing '%s': %s\n"
 msgstr "chyba pri zápise súboru kľú�ov (keyring)  `%s': %s\n"
 
-#: g10/card-util.c:986 tools/gpg-card.c:1650
+#: g10/card-util.c:996 tools/gpg-card.c:1666
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:1024 tools/gpg-card.c:1945
+#: g10/card-util.c:1034 tools/gpg-card.c:1962
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:1109 tools/gpg-card.c:1699
+#: g10/card-util.c:1119 tools/gpg-card.c:1715
 #, fuzzy
 msgid "Language preferences: "
 msgstr "aktualizovať predvoľby"
 
-#: g10/card-util.c:1117 tools/gpg-card.c:1710
+#: g10/card-util.c:1127 tools/gpg-card.c:1726
 #, fuzzy, c-format
 msgid "Error: invalid length of preference string.\n"
 msgstr "neplatný znak v reťazci s predvoľbami\n"
 
-#: g10/card-util.c:1126 tools/gpg-card.c:1719
+#: g10/card-util.c:1136 tools/gpg-card.c:1735
 #, fuzzy, c-format
 msgid "Error: invalid characters in preference string.\n"
 msgstr "neplatný znak v reťazci s predvoľbami\n"
 
-#: g10/card-util.c:1148 tools/gpg-card.c:1753
+#: g10/card-util.c:1158 tools/gpg-card.c:1769
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1162 tools/gpg-card.c:1770
+#: g10/card-util.c:1172 tools/gpg-card.c:1786
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "chyba: neplatný odtla�ok\n"
 
-#: g10/card-util.c:1185 tools/gpg-card.c:1835
+#: g10/card-util.c:1195 tools/gpg-card.c:1852
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "vypísať fingerprint"
 
-#: g10/card-util.c:1209 tools/gpg-card.c:1861
+#: g10/card-util.c:1219 tools/gpg-card.c:1878
 #, fuzzy, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "chyba: neplatný odtla�ok\n"
 
-#: g10/card-util.c:1259
+#: g10/card-util.c:1269
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Vytvorenie kľú�a sa nepodarilo: %s\n"
 
-#: g10/card-util.c:1260
+#: g10/card-util.c:1270
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "nenájdené žiadne platné dáta vo formáte OpenPGP.\n"
 
-#: g10/card-util.c:1273 g10/keygen.c:4811 g10/keygen.c:5972
+#: g10/card-util.c:1283 g10/keygen.c:4815 g10/keygen.c:6003
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "chyba pri zápise do súboru tajných kľú�ov `%s': %s\n"
 
-#: g10/card-util.c:1358
+#: g10/card-util.c:1368
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1375 tools/gpg-card.c:3328
+#: g10/card-util.c:1385 tools/gpg-card.c:3345
 msgid ""
 "Note: There is no guarantee that the card supports the requested\n"
 "      key type or size.  If the key generation does not succeed,\n"
@@ -1941,102 +1955,102 @@ msgid ""
 "      key types and sizes are supported.\n"
 msgstr ""
 
-#: g10/card-util.c:1396 g10/keygen.c:2570 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1406 g10/keygen.c:2571 sm/certreqgen-ui.c:180
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Akú veľkosť kľú�a si prajete? (1024) "
 
-#: g10/card-util.c:1406 g10/keygen.c:2493 g10/keygen.c:2525
+#: g10/card-util.c:1416 g10/keygen.c:2494 g10/keygen.c:2526
 #: sm/certreqgen-ui.c:195
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokrúhlené na %u bitov\n"
 
-#: g10/card-util.c:1414 g10/keygen.c:2578 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1424 g10/keygen.c:2579 sm/certreqgen-ui.c:185
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/card-util.c:1433
+#: g10/card-util.c:1443
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1435
+#: g10/card-util.c:1445
 #, fuzzy
 msgid "Signature key\n"
 msgstr "Platnosť podpisu vypršala %s\n"
 
-#: g10/card-util.c:1437
+#: g10/card-util.c:1447
 #, fuzzy
 msgid "Encryption key\n"
 msgstr "   (%d) RSA (len na Å¡ifrovanie)\n"
 
-#: g10/card-util.c:1439
+#: g10/card-util.c:1449
 msgid "Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1441 g10/keygen.c:2112 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1451 g10/keygen.c:2113 sm/certreqgen-ui.c:158
 msgid "Please select what kind of key you want:\n"
 msgstr "Prosím, vyberte druh kľú�a, ktorý chcete:\n"
 
-#: g10/card-util.c:1442 sm/certreqgen-ui.c:159
+#: g10/card-util.c:1452 sm/certreqgen-ui.c:159
 #, fuzzy, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA (len na podpis)\n"
 
-#: g10/card-util.c:1443
+#: g10/card-util.c:1453
 #, fuzzy, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) DSA a ElGamal (implicitný)\n"
 
-#: g10/card-util.c:1455 g10/card-util.c:1722 g10/card-util.c:1822
-#: g10/keyedit.c:900 g10/keygen.c:2017 g10/keygen.c:2045 g10/keygen.c:2172
-#: g10/keygen.c:2425 g10/keygen.c:2713 g10/revoke.c:836
+#: g10/card-util.c:1468 g10/card-util.c:1735 g10/card-util.c:1835
+#: g10/keyedit.c:900 g10/keygen.c:2018 g10/keygen.c:2046 g10/keygen.c:2173
+#: g10/keygen.c:2426 g10/keygen.c:2714 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Neplatný výber.\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1541
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 
-#: g10/card-util.c:1533
+#: g10/card-util.c:1546
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1582
 #, fuzzy, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "chyba pri posielaní na `%s': %s\n"
 
-#: g10/card-util.c:1585 g10/card-util.c:2106 g10/card-util.c:2162
+#: g10/card-util.c:1598 g10/card-util.c:2119 g10/card-util.c:2175
 #, fuzzy, c-format
 msgid "error getting card info: %s\n"
 msgstr "chyba pri zápise do súboru tajných kľú�ov `%s': %s\n"
 
-#: g10/card-util.c:1591 g10/card-util.c:1936 g10/card-util.c:2112
-#: g10/card-util.c:2171 tools/gpg-card.c:3057 tools/gpg-card.c:3296
-#: tools/gpg-card.c:3354
+#: g10/card-util.c:1604 g10/card-util.c:1949 g10/card-util.c:2125
+#: g10/card-util.c:2184 tools/gpg-card.c:3074 tools/gpg-card.c:3313
+#: tools/gpg-card.c:3371
 #, fuzzy, c-format
 #| msgid "This command is not allowed while in %s mode.\n"
 msgid "This command is not supported by this card\n"
 msgstr "Tento príkaz nie je v módoch %s dovolený.\n"
 
-#: g10/card-util.c:1637 tools/gpg-card.c:2426
+#: g10/card-util.c:1650 tools/gpg-card.c:2443
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1651
+#: g10/card-util.c:1664
 #, fuzzy, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "presko�ené: tajný kľú� je už v databáze\n"
 
-#: g10/card-util.c:1654 tools/gpg-card.c:2398
+#: g10/card-util.c:1667 tools/gpg-card.c:2415
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1666 tools/gpg-card.c:2457
+#: g10/card-util.c:1679 tools/gpg-card.c:2474
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2044,172 +2058,172 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1701
+#: g10/card-util.c:1714
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Prosím, vyberte druh kľú�a, ktorý chcete:\n"
 
-#: g10/card-util.c:1703 g10/card-util.c:1793
+#: g10/card-util.c:1716 g10/card-util.c:1806
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Platnosť podpisu vypršala %s\n"
 
-#: g10/card-util.c:1704 g10/card-util.c:1795
+#: g10/card-util.c:1717 g10/card-util.c:1808
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (len na Å¡ifrovanie)\n"
 
-#: g10/card-util.c:1705 g10/card-util.c:1797
+#: g10/card-util.c:1718 g10/card-util.c:1810
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1790
+#: g10/card-util.c:1803
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Prosím výberte dôvod na revokáciu:\n"
 
-#: g10/card-util.c:1836
+#: g10/card-util.c:1849
 #, fuzzy, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "aktualizácia zlyhala: %s\n"
 
-#: g10/card-util.c:1941 tools/gpg-card.c:3065
+#: g10/card-util.c:1954 tools/gpg-card.c:3082
 #, fuzzy, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr "presko�ené: tajný kľú� je už v databáze\n"
 
-#: g10/card-util.c:1944 tools/gpg-card.c:3068 tools/gpg-card.c:3409
+#: g10/card-util.c:1957 tools/gpg-card.c:3085 tools/gpg-card.c:3426
 #, fuzzy
 msgid "Continue? (y/N) "
 msgstr "Skuto�ne podpísať? "
 
-#: g10/card-util.c:1949 tools/gpg-card.c:3079
+#: g10/card-util.c:1962 tools/gpg-card.c:3096
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2142
+#: g10/card-util.c:2155
 #, fuzzy, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "chyba pri �ítaní `%s': %s\n"
 
-#: g10/card-util.c:2188
+#: g10/card-util.c:2201
 #, fuzzy, c-format
 msgid "error for setup UIF: %s\n"
 msgstr "chyba pri �ítaní `%s': %s\n"
 
-#: g10/card-util.c:2212 g10/keyedit.c:1263 tools/gpg-card.c:3649
+#: g10/card-util.c:2225 g10/keyedit.c:1263 tools/gpg-card.c:3666
 msgid "quit this menu"
 msgstr "ukon�iť toto menu"
 
-#: g10/card-util.c:2214
+#: g10/card-util.c:2227
 #, fuzzy
 msgid "show admin commands"
 msgstr "konfliktné príkazy\n"
 
-#: g10/card-util.c:2215 g10/keyedit.c:1266 tools/gpg-card.c:3652
+#: g10/card-util.c:2228 g10/keyedit.c:1266 tools/gpg-card.c:3669
 msgid "show this help"
 msgstr "ukázať túto pomoc"
 
-#: g10/card-util.c:2217 tools/gpg-card.c:3654
+#: g10/card-util.c:2230 tools/gpg-card.c:3671
 #, fuzzy
 msgid "list all available data"
 msgstr "Kľú� k dispozícii na: "
 
-#: g10/card-util.c:2220 tools/gpg-card.c:3656
+#: g10/card-util.c:2233 tools/gpg-card.c:3673
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:2221 tools/gpg-card.c:3657
+#: g10/card-util.c:2234 tools/gpg-card.c:3674
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:2222 tools/gpg-card.c:3658
+#: g10/card-util.c:2235 tools/gpg-card.c:3675
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:2223 tools/gpg-card.c:3659
+#: g10/card-util.c:2236 tools/gpg-card.c:3676
 #, fuzzy
 msgid "change the login name"
 msgstr "zmeniť dobu platnosti"
 
-#: g10/card-util.c:2224 tools/gpg-card.c:3660
+#: g10/card-util.c:2237 tools/gpg-card.c:3677
 #, fuzzy
 msgid "change the language preferences"
 msgstr "zmeniť dôveryhodnosť vlastníka kľú�a"
 
-#: g10/card-util.c:2225 tools/gpg-card.c:3661
+#: g10/card-util.c:2238 tools/gpg-card.c:3678
 msgid "change card holder's salutation"
 msgstr ""
 
-#: g10/card-util.c:2227 tools/gpg-card.c:3663
+#: g10/card-util.c:2240 tools/gpg-card.c:3680
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "vypísať fingerprint"
 
-#: g10/card-util.c:2228 tools/gpg-card.c:3664
+#: g10/card-util.c:2241 tools/gpg-card.c:3681
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:2229 tools/gpg-card.c:3665
+#: g10/card-util.c:2242 tools/gpg-card.c:3682
 #, fuzzy
 msgid "generate new keys"
 msgstr "vytvoriť nový pár kľú�ov"
 
-#: g10/card-util.c:2230 tools/gpg-card.c:3666
+#: g10/card-util.c:2243 tools/gpg-card.c:3683
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:2231 tools/gpg-card.c:3667
+#: g10/card-util.c:2244 tools/gpg-card.c:3684
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:2232 tools/gpg-card.c:3668
+#: g10/card-util.c:2245 tools/gpg-card.c:3685
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:2233 tools/gpg-card.c:3672
+#: g10/card-util.c:2246 tools/gpg-card.c:3689
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2235
+#: g10/card-util.c:2248
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr "|MENO|použiť MENO ako implicitného adresáta"
 
-#: g10/card-util.c:2236
+#: g10/card-util.c:2249
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "zmeniť dôveryhodnosť vlastníka kľú�a"
 
-#: g10/card-util.c:2237 tools/gpg-card.c:3674
+#: g10/card-util.c:2250 tools/gpg-card.c:3691
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the User Interaction Flag"
 msgstr "zmeniť dôveryhodnosť vlastníka kľú�a"
 
-#: g10/card-util.c:2361 tools/gpg-card.c:3924
+#: g10/card-util.c:2374 tools/gpg-card.c:3941
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2402
+#: g10/card-util.c:2415
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "konfliktné príkazy\n"
 
-#: g10/card-util.c:2433
+#: g10/card-util.c:2446
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "konfliktné príkazy\n"
 
-#: g10/card-util.c:2435
+#: g10/card-util.c:2448
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "zapisujem tajný kľú� do `%s'\n"
 
-#: g10/card-util.c:2546 g10/keyedit.c:2275 tools/gpg-card.c:3814
-#: tools/gpg-card.c:4072
+#: g10/card-util.c:2559 g10/keyedit.c:2275 tools/gpg-card.c:3831
+#: tools/gpg-card.c:4089
 #, c-format
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Neplatný príkaz (skúste \"help\")\n"
@@ -2219,23 +2233,23 @@ msgstr "Neplatný príkaz (skúste \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output pre tento príkaz nefunguje\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5293 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5292 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:1934 g10/export.c:2342 g10/export.c:2463
-#: g10/getkey.c:1907 g10/gpg.c:5238 g10/keyedit.c:1450 g10/keyedit.c:2382
-#: g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:703 g10/keyserver.c:1240
-#: g10/revoke.c:230 g10/tofu.c:2168
+#: g10/getkey.c:2032 g10/gpg.c:5237 g10/keyedit.c:1450 g10/keyedit.c:2382
+#: g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:703 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:2002 g10/getkey.c:1915 g10/getkey.c:4330
-#: g10/gpg.c:5247 g10/keyedit.c:2354 g10/keyserver.c:1258 g10/revoke.c:236
-#: g10/revoke.c:665 g10/tofu.c:2176
+#: g10/delkey.c:90 g10/export.c:2002 g10/getkey.c:2040 g10/getkey.c:4455
+#: g10/gpg.c:5246 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"
 msgstr "chyba pri �ítaní bloku kľú�a: %s\n"
@@ -2361,14 +2375,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:555 g10/encrypt.c:808 g10/decrypt-data.c:261 g10/gpg.c:4083
-#: g10/gpg.c:4130 sm/decrypt.c:742 sm/encrypt.c:691 sm/gpgsm.c:1793
+#: g10/encrypt.c:555 g10/encrypt.c:808 g10/decrypt-data.c:261 g10/gpg.c:4080
+#: g10/gpg.c:4127 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1646
 #, 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:564 g10/gpg.c:4095 g10/gpg.c:4142 g10/sig-check.c:155
-#: g10/sign.c:452 sm/gpgsm.c:1803 sm/gpgsm.c:1813 sm/sign.c:596 sm/verify.c:510
+#: g10/encrypt.c:564 g10/gpg.c:4092 g10/gpg.c:4139 g10/sig-check.c:155
+#: g10/sign.c:452 sm/gpgsm.c:1656 sm/gpgsm.c:1666 sm/sign.c:596 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"
@@ -2385,7 +2399,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "vyžiadaná symetrická šifra %s (%d) nevyhovuje predvoľbám príjemcu\n"
 
-#: g10/encrypt.c:838 sm/encrypt.c:766
+#: g10/encrypt.c:838 sm/encrypt.c:767
 #, fuzzy, c-format
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "VAROV�N�: použitie parametra \"%s\" sa neodporú�a\n"
@@ -2417,7 +2431,7 @@ msgstr ""
 "použitie %s nie je v móde %s dovolené\n"
 "\n"
 
-#: g10/decrypt-data.c:239 g10/mainproc.c:380 sm/decrypt.c:494
+#: g10/decrypt-data.c:239 g10/mainproc.c:380 sm/decrypt.c:892
 #, fuzzy, c-format
 #| msgid "%s encrypted data\n"
 msgid "%s.%s encrypted data\n"
@@ -2428,7 +2442,7 @@ msgstr "%s zašifrované dáta\n"
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "zašifrované neznámym algoritmom %d\n"
 
-#: g10/decrypt-data.c:361 g10/decrypt-data.c:414 sm/decrypt.c:508
+#: g10/decrypt-data.c:361 g10/decrypt-data.c:414 sm/decrypt.c:906
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2475,7 +2489,7 @@ msgstr ""
 msgid " - skipped"
 msgstr "%s: presko�ené: %s\n"
 
-#: g10/export.c:1333 g10/import.c:2124 g10/openfile.c:202 g10/openfile.c:296
+#: g10/export.c:1333 g10/import.c:2132 g10/openfile.c:202 g10/openfile.c:296
 #: g10/sign.c:1110 g10/sign.c:1447
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
@@ -2514,66 +2528,66 @@ msgstr "chyba pri vytváraní `%s': %s\n"
 msgid "[User ID not found]"
 msgstr "[User id not found]"
 
-#: g10/getkey.c:1199
+#: g10/getkey.c:1324
 #, fuzzy, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "chyba pri vytváraní `%s': %s\n"
 
-#: g10/getkey.c:1205
+#: g10/getkey.c:1330
 #, fuzzy, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "chyba pri vytváraní `%s': %s\n"
 
-#: g10/getkey.c:1207
+#: g10/getkey.c:1332
 #, fuzzy
 msgid "No fingerprint"
 msgstr "vypísať fingerprint"
 
-#: g10/getkey.c:1449
+#: g10/getkey.c:1574
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1884 g10/revoke.c:657 g10/revoke.c:718
+#: g10/getkey.c:2009 g10/revoke.c:658 g10/revoke.c:719
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "tajný kľú� `%s' nebol nájdený: %s\n"
 
-#: g10/getkey.c:1887 g10/pkclist.c:1012
+#: g10/getkey.c:2012 g10/pkclist.c:1012
 #, fuzzy, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "neplatný parameter pre import\n"
 
-#: g10/getkey.c:1965
+#: g10/getkey.c:2090
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "|MENO|použi MENO ako implicitný tajný kľú�"
 
-#: g10/getkey.c:1973
+#: g10/getkey.c:2098
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "|MENO|použi MENO ako implicitný tajný kľú�"
 
-#: g10/getkey.c:1980
+#: g10/getkey.c:2105
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr ""
 
 # c-format
-#: g10/getkey.c:2837
+#: g10/getkey.c:2962
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Neplatný kľú� %08lX zmenený na platný pomocou --always-non-selfsigned-uid\n"
 
-#: g10/getkey.c:3703
+#: g10/getkey.c:3828
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "používam sekundárny kľú� %08lX namiesto primárneho kľú�a %08lX\n"
 
-#: g10/getkey.c:4259 g10/gpg.c:2167
+#: g10/getkey.c:4384 g10/gpg.c:2168
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "neplatný parameter pre import\n"
@@ -2778,7 +2792,7 @@ msgstr ""
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:651 kbx/kbxutil.c:91 sm/gpgsm.c:424 tools/gpgconf.c:113
+#: g10/gpg.c:651 kbx/kbxutil.c:91 sm/gpgsm.c:425 tools/gpgconf.c:113
 msgid "do not make any changes"
 msgstr "nevykonať žiadne zmeny"
 
@@ -2814,7 +2828,7 @@ msgstr ""
 "|N|nastaviť úroveň komprimácie N (0 - žiadna\n"
 " komprimácia)"
 
-#: g10/gpg.c:762 sm/gpgsm.c:357
+#: g10/gpg.c:762 sm/gpgsm.c:358
 msgid "Options controlling key import and export"
 msgstr ""
 
@@ -2833,11 +2847,11 @@ msgstr "importovať kľú�e zo servera kľú�ov"
 msgid "include the public key in signatures"
 msgstr "skontrolovať podpisy kľú�ov"
 
-#: g10/gpg.c:776 sm/gpgsm.c:360
+#: g10/gpg.c:776 sm/gpgsm.c:361
 msgid "disable all access to the dirmngr"
 msgstr ""
 
-#: g10/gpg.c:788 sm/gpgsm.c:367
+#: g10/gpg.c:788 sm/gpgsm.c:368
 msgid "Options controlling key listings"
 msgstr ""
 
@@ -2859,15 +2873,15 @@ msgstr ""
 "použiť toto id užívateľa na podpísanie\n"
 " alebo dešifrovanie"
 
-#: g10/gpg.c:876 sm/gpgsm.c:408
+#: g10/gpg.c:876 sm/gpgsm.c:409
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:895 sm/gpgsm.c:420 dirmngr/dirmngr.c:286
+#: g10/gpg.c:895 sm/gpgsm.c:421 dirmngr/dirmngr.c:289
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:966 sm/gpgsm.c:453
+#: g10/gpg.c:966 sm/gpgsm.c:454
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2927,7 +2941,7 @@ msgstr ""
 "podpísať, overiť, šifrovať alebo dešifrovať\n"
 "implicitné operácie závisia od vstupných dát\n"
 
-#: g10/gpg.c:1168 sm/gpgsm.c:636
+#: g10/gpg.c:1168 sm/gpgsm.c:637
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2951,12 +2965,12 @@ msgstr "Hash: "
 msgid "Compression: "
 msgstr "Kompresia: "
 
-#: g10/gpg.c:1274 sm/gpgsm.c:710
+#: g10/gpg.c:1274 sm/gpgsm.c:711
 #, fuzzy, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "použitie: gpg [možnosti] "
 
-#: g10/gpg.c:1467 sm/gpgsm.c:803
+#: g10/gpg.c:1467 sm/gpgsm.c:804
 #, c-format
 msgid "conflicting commands\n"
 msgstr "konfliktné príkazy\n"
@@ -2966,542 +2980,542 @@ msgstr "konfliktné príkazy\n"
 msgid "no = sign found in group definition '%s'\n"
 msgstr "no = podpis nájdený v definícii skupiny \"%s\"\n"
 
-#: g10/gpg.c:1683
+#: g10/gpg.c:1684
 #, 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:1686
+#: g10/gpg.c:1687
 #, 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:1689
+#: g10/gpg.c:1690
 #, 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:1695
+#: g10/gpg.c:1696
 #, 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:1698
+#: g10/gpg.c:1699
 #, 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:1701
+#: g10/gpg.c:1702
 #, 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:1707
+#: g10/gpg.c:1708
 #, 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:1710
+#: g10/gpg.c:1711
 #, 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:1713
+#: g10/gpg.c:1714
 #, 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:1719
+#: g10/gpg.c:1720
 #, 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:1722
+#: g10/gpg.c:1723
 #, 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:1725
+#: g10/gpg.c:1726
 #, 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:1941
+#: g10/gpg.c:1942
 #, fuzzy, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "neznáma položka konfigurácie \"%s\"\n"
 
-#: g10/gpg.c:2037
+#: g10/gpg.c:2038
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:2039
+#: g10/gpg.c:2040
 #, 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:2041
+#: g10/gpg.c:2042
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2043
+#: g10/gpg.c:2044
 #, 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:2045
+#: g10/gpg.c:2046
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2049
+#: g10/gpg.c:2050
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2051
+#: g10/gpg.c:2052
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "zadané URL pre podpisovú politiku je neplatné\n"
 
-#: g10/gpg.c:2053
+#: g10/gpg.c:2054
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:2055
+#: g10/gpg.c:2056
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:2057
+#: g10/gpg.c:2058
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:2059
+#: g10/gpg.c:2060
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "ukáž v ktorom súbore kľú�ov je vypísaný kľú�"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2062
 #, 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:2178
+#: g10/gpg.c:2179
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "neznámy implicitný adresát `%s'\n"
 
-#: g10/gpg.c:2180
+#: g10/gpg.c:2181
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2975 g10/gpg.c:3828 g10/gpg.c:3840
+#: g10/gpg.c:2978 g10/gpg.c:3825 g10/gpg.c:3837
 #, 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:3151 g10/gpg.c:3163
+#: g10/gpg.c:3154 g10/gpg.c:3166
 #, fuzzy, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "%s nie je platná znaková sada\n"
 
-#: g10/gpg.c:3185
+#: g10/gpg.c:3188
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "Neplatná e-mailová adresa\n"
 
-#: g10/gpg.c:3217 sm/gpgsm.c:1270
+#: g10/gpg.c:3220 sm/gpgsm.c:1143
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "neplatný hashovací algoritmus `%s'\n"
 
-#: g10/gpg.c:3223 sm/gpgsm.c:1276
+#: g10/gpg.c:3226 sm/gpgsm.c:1149
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "neplatný parameter pre import\n"
 
-#: g10/gpg.c:3280
+#: g10/gpg.c:3283
 #, fuzzy, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "%s nie je platná znaková sada\n"
 
-#: g10/gpg.c:3302 g10/gpg.c:3511 g10/keyedit.c:5319
+#: g10/gpg.c:3305 g10/gpg.c:3514 g10/keyedit.c:5322
 #, 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:3320
+#: g10/gpg.c:3323
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: neplatný parameter pre export\n"
 
-#: g10/gpg.c:3323
+#: g10/gpg.c:3326
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "neplatný parameter pre export\n"
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3333
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatný parameter pre import\n"
 
-#: g10/gpg.c:3333
+#: g10/gpg.c:3336
 #, c-format
 msgid "invalid import options\n"
 msgstr "neplatný parameter pre import\n"
 
-#: g10/gpg.c:3339 g10/gpg.c:3354
+#: g10/gpg.c:3342 g10/gpg.c:3357
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "neplatný parameter pre import\n"
 
-#: g10/gpg.c:3345
+#: g10/gpg.c:3348
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatný parameter pre export\n"
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3351
 #, c-format
 msgid "invalid export options\n"
 msgstr "neplatný parameter pre export\n"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3363
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: neplatný parameter pre import\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3366
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "neplatný parameter pre import\n"
 
-#: g10/gpg.c:3371
+#: g10/gpg.c:3374
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3373
+#: g10/gpg.c:3376
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3378
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s nie je platná znaková sada\n"
 
-#: g10/gpg.c:3377
+#: g10/gpg.c:3380
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3384
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3386
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "zadané URL pre podpisovú politiku je neplatné\n"
 
-#: g10/gpg.c:3385
+#: g10/gpg.c:3388
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s nie je platná znaková sada\n"
 
-#: g10/gpg.c:3387
+#: g10/gpg.c:3390
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3389
+#: g10/gpg.c:3392
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s nie je platná znaková sada\n"
 
-#: g10/gpg.c:3396
+#: g10/gpg.c:3399
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: neplatný parameter pre export\n"
 
-#: g10/gpg.c:3399
+#: g10/gpg.c:3402
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "neplatný parameter pre export\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3409
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nemožno nastaviť exec-path na %s\n"
 
-#: g10/gpg.c:3613
+#: g10/gpg.c:3616
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: neplatný parameter pre export\n"
 
-#: g10/gpg.c:3616
+#: g10/gpg.c:3619
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3625
+#: g10/gpg.c:3628
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "neplatný parameter pre import\n"
 
-#: g10/gpg.c:3807 sm/gpgsm.c:1675
+#: g10/gpg.c:3804 sm/gpgsm.c:1528
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROVANIE: program môže vytvoriť súbor core!\n"
 
-#: g10/gpg.c:3821
+#: g10/gpg.c:3818
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROVANIE: %s prepíše %s\n"
 
-#: g10/gpg.c:3830
+#: g10/gpg.c:3827
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie je dovolené používať %s s %s!\n"
 
-#: g10/gpg.c:3833
+#: g10/gpg.c:3830
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nedáva s %s zmysel!\n"
 
-#: g10/gpg.c:3848 sm/gpgsm.c:1696 dirmngr/dirmngr.c:1123
+#: g10/gpg.c:3845 sm/gpgsm.c:1549 dirmngr/dirmngr.c:1160
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3869
+#: g10/gpg.c:3866
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "zapisujem tajný kľú� do `%s'\n"
 
-#: g10/gpg.c:3897 g10/gpg.c:3928 sm/gpgsm.c:1763
+#: g10/gpg.c:3894 g10/gpg.c:3925 sm/gpgsm.c:1616
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybraný šifrovací algoritmus je neplatný\n"
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3901
 #, 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:3916
+#: g10/gpg.c:3913
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "vybraný šifrovací algoritmus je neplatný\n"
 
-#: g10/gpg.c:3922
+#: g10/gpg.c:3919
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybraný hashovací algoritmus je neplatný\n"
 
-#: g10/gpg.c:3937
+#: g10/gpg.c:3934
 #, 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:3939
+#: g10/gpg.c:3936
 #, 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:3941
+#: g10/gpg.c:3938
 #, 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:3943
+#: g10/gpg.c:3940
 #, 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:3945
+#: g10/gpg.c:3942
 #, 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:3949
+#: g10/gpg.c:3946
 #, 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:3953
+#: g10/gpg.c:3950
 #, 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:3960
+#: g10/gpg.c:3957
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "neplatné defaultné predvoľby\n"
 
-#: g10/gpg.c:3964
+#: g10/gpg.c:3961
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatné užívateľské predvoľby pre šifrovanie\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3964
 #, 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:3971
+#: g10/gpg.c:3968
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "neplatné užívateľské predvoľby pre hashovanie\n"
 
-#: g10/gpg.c:3975
+#: g10/gpg.c:3972
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "neplatné užívateľské predvoľby pre kompresiu\n"
 
-#: g10/gpg.c:3984 g10/gpg.c:3989
+#: g10/gpg.c:3981 g10/gpg.c:3986
 #, 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:4026
+#: g10/gpg.c:4023
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ešte nepracuje s %s\n"
 
-#: g10/gpg.c:4089
+#: g10/gpg.c:4086
 #, 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:4101
+#: g10/gpg.c:4098
 #, 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:4256
+#: g10/gpg.c:4253
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nemôžem inicializovať databázu dôvery: %s\n"
 
-#: g10/gpg.c:4268
+#: g10/gpg.c:4265
 #, 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:4340
+#: g10/gpg.c:4337
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "dešifrovanie zlyhalo: %s\n"
 
-#: g10/gpg.c:4369
+#: g10/gpg.c:4366
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4372
+#: g10/gpg.c:4369
 #, 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:4430
+#: g10/gpg.c:4427
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4433
+#: g10/gpg.c:4430
 #, 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:4821 g10/keyserver.c:1870
+#: g10/gpg.c:4818 g10/keyserver.c:1629
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "nepodarilo poslať kľú� na server: %s\n"
 
-#: g10/gpg.c:4826
+#: g10/gpg.c:4823
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "nepodarilo sa prijať kľú� zo servera: %s\n"
 
-#: g10/gpg.c:4832
+#: g10/gpg.c:4829
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "nepodaril sa export kľú�a: %s\n"
 
-#: g10/gpg.c:4845
+#: g10/gpg.c:4842
 #, 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:4857
+#: g10/gpg.c:4854
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "nepodarilo sa nájsť server: %s\n"
 
-#: g10/gpg.c:4870
+#: g10/gpg.c:4867
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aktualizácia servera zlyhala: %s\n"
 
-#: g10/gpg.c:4937
+#: g10/gpg.c:4936
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dekódovanie z ASCII formátu zlyhalo: %s\n"
 
-#: g10/gpg.c:4948
+#: g10/gpg.c:4947
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
 
-#: g10/gpg.c:5053
+#: g10/gpg.c:5052
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "neplatný hashovací algoritmus `%s'\n"
 
-#: g10/gpg.c:5205 g10/tofu.c:2156
+#: g10/gpg.c:5204 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:5216
+#: g10/gpg.c:5215
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5272
+#: g10/gpg.c:5271
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5283
+#: g10/gpg.c:5282
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Za�nite písať svoju správu ...\n"
 
-#: g10/gpg.c:5630
+#: g10/gpg.c:5629
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadané URL pre certifika�nú politiku je neplatné\n"
 
-#: g10/gpg.c:5632
+#: g10/gpg.c:5631
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadané URL pre podpisovú politiku je neplatné\n"
 
-#: g10/gpg.c:5665
+#: g10/gpg.c:5664
 #, fuzzy, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "zadané URL pre podpisovú politiku je neplatné\n"
@@ -3515,7 +3529,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:414 tools/gpgconf.c:116 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:415 tools/gpgconf.c:116 tools/gpg-card.c:95
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zapísať informácie o stave do tohto FD"
 
@@ -3610,273 +3624,273 @@ msgstr ""
 msgid "repair keys on import"
 msgstr "vypísať fingerprint"
 
-#: g10/import.c:399 g10/import.c:721
+#: g10/import.c:407 g10/import.c:729
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "blok typu %d bol presko�ený\n"
 
-#: g10/import.c:738
+#: g10/import.c:746
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu kľú�e boli doteraz spracované\n"
 
-#: g10/import.c:831
+#: g10/import.c:839
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Celkovo spracovaných kľú�ov: %lu\n"
 
-#: g10/import.c:834
+#: g10/import.c:842
 #, fuzzy, c-format
 #| msgid "      skipped new keys: %lu\n"
 msgid "    skipped PGP-2 keys: %lu\n"
 msgstr "      presko�ené nové kľú�e: %lu\n"
 
-#: g10/import.c:836
+#: g10/import.c:844
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      presko�ené nové kľú�e: %lu\n"
 
-#: g10/import.c:839
+#: g10/import.c:847
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "        bez identifikátorov: %lu\n"
 
-#: g10/import.c:842 sm/import.c:129
+#: g10/import.c:850 sm/import.c:129
 #, c-format
 msgid "              imported: %lu"
 msgstr "                importované: %lu"
 
-#: g10/import.c:846 sm/import.c:133
+#: g10/import.c:854 sm/import.c:133
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                  bez zmien: %lu\n"
 
-#: g10/import.c:848
+#: g10/import.c:856
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "         nové id užívateľov: %lu\n"
 
-#: g10/import.c:850
+#: g10/import.c:858
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "              nové podkľú�e: %lu\n"
 
-#: g10/import.c:852
+#: g10/import.c:860
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "               nové podpisy: %lu\n"
 
-#: g10/import.c:854
+#: g10/import.c:862
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "      nové revokácie kľú�ov: %lu\n"
 
-#: g10/import.c:856 sm/import.c:135
+#: g10/import.c:864 sm/import.c:135
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      pre�ítané tajné kľú�e: %lu\n"
 
-#: g10/import.c:858 sm/import.c:137
+#: g10/import.c:866 sm/import.c:137
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "    importované tajné kľú�e: %lu\n"
 
-#: g10/import.c:860 sm/import.c:139
+#: g10/import.c:868 sm/import.c:139
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "      tajné kľú�e nezmenené: %lu\n"
 
-#: g10/import.c:862 sm/import.c:141
+#: g10/import.c:870 sm/import.c:141
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "           neimportované: %lu\n"
 
-#: g10/import.c:864
+#: g10/import.c:872
 #, fuzzy, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "               nové podpisy: %lu\n"
 
-#: g10/import.c:866
+#: g10/import.c:874
 #, fuzzy, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "      pre�ítané tajné kľú�e: %lu\n"
 
-#: g10/import.c:1291
+#: g10/import.c:1299
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:1333
+#: g10/import.c:1341
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:1351
+#: g10/import.c:1359
 #, fuzzy, c-format
 msgid "         \"%s\": preference for AEAD algorithm %s\n"
 msgstr "%s podpis, hashovací algoritmus %s\n"
 
-#: g10/import.c:1366
+#: g10/import.c:1374
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s podpis, hashovací algoritmus %s\n"
 
-#: g10/import.c:1378
+#: g10/import.c:1386
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:1391
+#: g10/import.c:1399
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:1393
+#: g10/import.c:1401
 #, c-format
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:1418
+#: g10/import.c:1426
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:1932 g10/import.c:3053
+#: g10/import.c:1940 g10/import.c:3061
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "kľú� %08lX: chyba identifikátor užívateľa\n"
 
-#: g10/import.c:1938
+#: g10/import.c:1946
 #, fuzzy, c-format
 msgid "key %s: %s\n"
 msgstr "presko�ený `%s': %s\n"
 
-#: g10/import.c:1939 g10/import.c:3025
+#: g10/import.c:1947 g10/import.c:3033
 msgid "rejected by import screener"
 msgstr ""
 
-#: g10/import.c:1988
+#: g10/import.c:1996
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "kľú� %08lX: HKP poškodenie podkľú�a opravené\n"
 
 # c-format
-#: g10/import.c:2009
+#: g10/import.c:2017
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr ""
 "kľú� %08lX: prijaté id užívateľa '%s', ktorý nie je podpísaný ním samým\n"
 
-#: g10/import.c:2020 g10/import.c:2051
+#: g10/import.c:2028 g10/import.c:2059
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "kľú� %08lX: chýba platný identifikátor užívateľa\n"
 
-#: g10/import.c:2022
+#: g10/import.c:2030
 #, c-format
 msgid "this may be caused by a missing self-signature\n"
 msgstr "môže to byť spôsobené chýbajúcim podpisom kľú�a ním samým\n"
 
-#: g10/import.c:2101 g10/import.c:3439
+#: g10/import.c:2109 g10/import.c:3447
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "kľú� %08lX: verejný kľú� nenájdený: %s\n"
 
-#: g10/import.c:2107
+#: g10/import.c:2115
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "kľú� %08lX: nový kľú� - presko�ený\n"
 
-#: g10/import.c:2119
+#: g10/import.c:2127
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "nenájdený zapisovateľný súbor kľú�ov (keyring): %s\n"
 
-#: g10/import.c:2151 g10/import.c:2253 g10/import.c:3514
+#: g10/import.c:2159 g10/import.c:2261 g10/import.c:3522
 #, fuzzy, c-format
 #| msgid "error writing keyring `%s': %s\n"
 msgid "error writing keyring '%s': %s\n"
 msgstr "chyba pri zápise súboru kľú�ov (keyring)  `%s': %s\n"
 
-#: g10/import.c:2174
+#: g10/import.c:2182
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "kľú� %08lX: verejný kľú� \"%s\" importovaný\n"
 
-#: g10/import.c:2201
+#: g10/import.c:2209
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "kľú� %08lX: nezodpovedá našej kópii\n"
 
-#: g10/import.c:2269
+#: g10/import.c:2277
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "kľú� %08lX: \"%s\" 1 nový identifikátor užívateľa\n"
 
-#: g10/import.c:2272
+#: g10/import.c:2280
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "kľú� %08lX: \"%s\" %d nových identifikátorov užívateľa\n"
 
-#: g10/import.c:2275
+#: g10/import.c:2283
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "kľú� %08lX: \"%s\" 1 nový podpis\n"
 
-#: g10/import.c:2278
+#: g10/import.c:2286
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "kľú� %08lX: \"%s\" %d nových podpisov\n"
 
-#: g10/import.c:2281
+#: g10/import.c:2289
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "kľú� %08lX: \"%s\" 1 nový podkľú�\n"
 
-#: g10/import.c:2284
+#: g10/import.c:2292
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "kľú� %08lX: \"%s\" %d nových podkľú�ov\n"
 
-#: g10/import.c:2287
+#: g10/import.c:2295
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "kľú� %08lX: \"%s\" %d nových podpisov\n"
 
-#: g10/import.c:2290
+#: g10/import.c:2298
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "kľú� %08lX: \"%s\" %d nových podpisov\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2301
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "kľú� %08lX: \"%s\" %d nových identifikátorov užívateľa\n"
 
-#: g10/import.c:2296
+#: g10/import.c:2304
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "kľú� %08lX: \"%s\" %d nových identifikátorov užívateľa\n"
 
-#: g10/import.c:2332
+#: g10/import.c:2340
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "kľú� %08lX: \"%s\" bez zmeny\n"
 
-#: g10/import.c:2692 g10/import.c:2887
+#: g10/import.c:2700 g10/import.c:2895
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "kľú� %08lX: tajný kľú� importovaný\n"
 
-#: g10/import.c:2700
+#: g10/import.c:2708
 #, fuzzy, c-format
 #| msgid "skipped: secret key already present\n"
 msgid "key %s: secret key already exists\n"
 msgstr "presko�ené: tajný kľú� je už v databáze\n"
 
-#: g10/import.c:2708
+#: g10/import.c:2716
 #, fuzzy, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "chyba pri posielaní na `%s': %s\n"
@@ -3889,210 +3903,209 @@ msgstr "chyba pri posielaní na `%s': %s\n"
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2877
+#: g10/import.c:2885
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:3024
+#: g10/import.c:3032
 #, fuzzy, c-format
 msgid "secret key %s: %s\n"
 msgstr "tajný kľú� `%s' nebol nájdený: %s\n"
 
-#: g10/import.c:3045 g10/import.c:3084
+#: g10/import.c:3053 g10/import.c:3092
 #, fuzzy, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "zapisujem tajný kľú� do `%s'\n"
 
-#: g10/import.c:3072
+#: g10/import.c:3080
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "kľú� %08lX: tajný kľú� bez verejného kľú�a %d - presko�ené\n"
 
-#: g10/import.c:3234 g10/pkclist.c:75 g10/revoke.c:774
+#: g10/import.c:3242 g10/pkclist.c:75 g10/revoke.c:775
 msgid "No reason specified"
 msgstr "Dôvod nebol špecifikovaný"
 
-#: g10/import.c:3235 g10/pkclist.c:77 g10/revoke.c:776
+#: g10/import.c:3243 g10/pkclist.c:77 g10/revoke.c:777
 msgid "Key is superseded"
 msgstr "Kľú� je nahradený"
 
-#: g10/import.c:3236 g10/pkclist.c:79 g10/revoke.c:775
+#: g10/import.c:3244 g10/pkclist.c:79 g10/revoke.c:776
 msgid "Key has been compromised"
 msgstr "Kľú� bol skompromitovaný"
 
-#: g10/import.c:3237 g10/pkclist.c:81 g10/revoke.c:777
+#: g10/import.c:3245 g10/pkclist.c:81 g10/revoke.c:778
 msgid "Key is no longer used"
 msgstr "Kľú� sa už nepoužíva"
 
-#: g10/import.c:3238 g10/pkclist.c:83 g10/revoke.c:778
+#: g10/import.c:3246 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "Identifikátor užívateľa už neplatí"
 
-#: g10/import.c:3363 g10/keylist.c:1105 g10/pkclist.c:87
+#: g10/import.c:3371 g10/keylist.c:1105 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "dôvod na revokáciu: "
 
-#: g10/import.c:3382 g10/keylist.c:1124 g10/pkclist.c:103
+#: g10/import.c:3390 g10/keylist.c:1124 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "revoka�ná poznámka: "
 
-#: g10/import.c:3432
+#: g10/import.c:3440
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "kľú� %08lX: chýba verejný kľú� - nemôžem aplikovať revoka�ný certifikát\n"
 
-#: g10/import.c:3461
+#: g10/import.c:3469
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "kľú� %08lX: nemôžem nájsť originálny blok kľú�a: %s\n"
 
-#: g10/import.c:3468
+#: g10/import.c:3476
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "kľú� %08lX: nemôžem �ítať originálny blok kľú�a: %s\n"
 
-#: g10/import.c:3488
+#: g10/import.c:3496
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "kľú� %08lX: neplatný revoka�ný certifikát: %s - zamietnuté\n"
 
-#: g10/import.c:3523
+#: g10/import.c:3531
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "kľú� %08lX: \"%s\" revoka�ný certifikát importovaný\n"
 
-#: g10/import.c:3609
+#: g10/import.c:3617
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "kľú� %08lX: neexistuje id užívateľa pre podpis\n"
 
-#: g10/import.c:3626
+#: g10/import.c:3634
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "kľú� %08lX: nepodporovaný algoritmus verejného kľú�a u užívateľského id \"%s"
 "\"\n"
 
-#: g10/import.c:3628
+#: g10/import.c:3636
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr ""
 "kľú� %08lX: neplatný podpis kľú�a ním samým u užívateľského id \"%s\"\n"
 
-#: g10/import.c:3645 g10/import.c:3673 g10/import.c:3729
+#: g10/import.c:3653 g10/import.c:3681 g10/import.c:3737
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "kľú� %08lX: nepodporovaný algoritmus verejného kľú�a\n"
 
-#: g10/import.c:3646
+#: g10/import.c:3654
 #, fuzzy, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "kľú� %08lX: podpis kľú�a ním samým (direct key signature)\n"
 
-#: g10/import.c:3660
+#: g10/import.c:3668
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "kľú� %08lX: neexistuje podkľú� pre viazanie kľú�ov\n"
 
-#: g10/import.c:3675
+#: g10/import.c:3683
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "kľú� %08lX: neplatná väzba podkľú�a\n"
 
-#: g10/import.c:3694
+#: g10/import.c:3702
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "kľú� %08lX: zmazaná viacnásobná väzba podkľú�a\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3726
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "kľú� %08lX: neexistuje podkľú� na revokáciu kľú�a\n"
 
-#: g10/import.c:3731
+#: g10/import.c:3739
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "kľú� %08lX: neplatný revoka�ný podkľú�\n"
 
-#: g10/import.c:3746
+#: g10/import.c:3754
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "kľú� %08lX: zmazaná viacnásobná revokácia podkľú�a\n"
 
-#: g10/import.c:3790
+#: g10/import.c:3798
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "kľú� %08lX: identifikátor užívateľa presko�ený '"
 
-#: g10/import.c:3817
+#: g10/import.c:3825
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "kľú� %08lX: podkľú� presko�ený\n"
 
-#: g10/import.c:3849
+#: g10/import.c:3857
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "kľú� %08lX: podpis nie je exportovateľný (trieda %02x) - presko�ené\n"
 
-#: g10/import.c:3860
+#: g10/import.c:3868
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "kľú� %08lX: revoka�ný certifikát na zlom mieste - presko�ené \n"
 
-#: g10/import.c:3878
+#: g10/import.c:3886
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "kľú� %08lX: neplatný revoka�ný certifikát: %s - presko�ené\n"
 
-#: g10/import.c:3892
+#: g10/import.c:3900
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "kľú� %08lX: podpis subkľú�a na zlom mieste - presko�ené \n"
 
-#: g10/import.c:3900
+#: g10/import.c:3908
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "kľú� %08lX: neo�akávaná podpisová trieda (0x%02X) - presko�ené\n"
 
-#: g10/import.c:4073
+#: g10/import.c:4081
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "kľú� %08lX: zistený duplikovaný identifikátor užívateľa - zlú�ený\n"
 
-#: g10/import.c:4180
+#: g10/import.c:4188
 #, fuzzy, c-format
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr "kľú� %08lX: zistený duplikovaný identifikátor užívateľa - zlú�ený\n"
 
-#: g10/import.c:4245
+#: g10/import.c:4253
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "VAROVANIE: kľú� %08lX môže byť revokovaný: skúšam získať revoka�ný kľú� "
 "%08lX\n"
 
-#: g10/import.c:4261
+#: g10/import.c:4269
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "VAROVANIE: kľú� %08lX môže byť revokovaný: revoka�ný kľú� %08lX nenájdený.\n"
 
-#: g10/import.c:4327
+#: g10/import.c:4335
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "kľú� %08lX: pridaný revoka�ný certifikát \"%s\"\n"
 
-#: g10/import.c:4365
+#: g10/import.c:4373
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "kľú� %08lX: podpis kľú�a ním samým (direct key signature)\n"
 
-#: g10/key-check.c:133 dirmngr/dirmngr_ldap.c:650 dirmngr/ldap-wrapper.c:835
-#: dirmngr/ldap-wrapper.c:852
+#: g10/key-check.c:133 dirmngr/ldap-wrapper.c:835 dirmngr/ldap-wrapper.c:852
 #, fuzzy, c-format
 msgid "error allocating memory: %s\n"
 msgstr "chyba pri vytváraní súboru kľú�ov (keyring)`%s': %s\n"
@@ -4155,7 +4168,7 @@ msgid ""
 "all signatures.\n"
 msgstr ""
 
-#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:284 sm/keydb.c:297
+#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:289 sm/keydb.c:302
 #, fuzzy, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "chyba pri vytváraní súboru kľú�ov (keyring)`%s': %s\n"
@@ -4166,7 +4179,7 @@ msgstr "chyba pri vytváraní súboru kľú�ov (keyring)`%s': %s\n"
 msgid "error creating keyring '%s': %s\n"
 msgstr "chyba pri vytváraní súboru kľú�ov (keyring)`%s': %s\n"
 
-#: g10/keydb.c:388 sm/keydb.c:303
+#: g10/keydb.c:388 sm/keydb.c:308
 #, fuzzy, c-format
 msgid "keybox '%s' created\n"
 msgstr "súbor kľú�ov (keyring) `%s' vytvorený\n"
@@ -4448,8 +4461,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Skuto�ne podpísať? "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6192 g10/keyedit.c:6275 g10/keyedit.c:6404
-#: g10/keyedit.c:6466 g10/sign.c:528
+#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
+#: g10/keyedit.c:6474 g10/sign.c:528
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "podpisovanie zlyhalo: %s\n"
@@ -4856,7 +4869,7 @@ msgstr "Takýto identifikátor užívateľa neexistuje.\n"
 msgid "Nothing to sign.\n"
 msgstr "Ni� na podpísanie kľú�om %08lX\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6057
+#: g10/keyedit.c:2973 g10/keyedit.c:6065
 #, fuzzy, c-format
 msgid "Not signed by you.\n"
 msgstr "   podpísané %08lX v %s%s\n"
@@ -4926,7 +4939,7 @@ msgstr "Tento kľú� môže byť revokovaný kľú�om %s "
 msgid "(sensitive)"
 msgstr "(citlivá informácia)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:525
+#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s: nemôžem vytvoriť: %s\n"
@@ -4942,7 +4955,7 @@ msgid "expired: %s"
 msgstr " [platnosť skon�í: %s]"
 
 #: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2262
-#: g10/keyserver.c:531
+#: g10/keyserver.c:354
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [platnosť skon�í: %s]"
@@ -4978,14 +4991,14 @@ 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:535
-#: g10/mainproc.c:2280 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
+#: g10/mainproc.c:2282 g10/tofu.c:1789 g10/trust.c:426 dirmngr/ocsp.c:792
 #, fuzzy
 msgid "revoked"
 msgstr "[revokované]"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:539
-#: g10/mainproc.c:2282 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
+#: g10/mainproc.c:2284 g10/tofu.c:1794 g10/trust.c:113
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -5027,7 +5040,7 @@ msgstr "Ste si istý, že ho chcete stále pridať? (a/N) "
 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:3107
+#: g10/keyedit.c:4273 g10/keygen.c:3111
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
@@ -5174,7 +5187,7 @@ msgstr ""
 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:5357 g10/keyedit.c:5495
+#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
 #, 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"
@@ -5183,133 +5196,133 @@ msgstr "presko�ený v3 podpis kľú�a ním samým u užívateľského id \"%s\
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5380
+#: g10/keyedit.c:5383
 #, 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:5381
+#: g10/keyedit.c:5384
 #, 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:5441
+#: g10/keyedit.c:5449
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Podpisová notácia: "
 
-#: g10/keyedit.c:5588
+#: g10/keyedit.c:5596
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Prepísať (a/N)? "
 
-#: g10/keyedit.c:5658
+#: g10/keyedit.c:5666
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Neexistuje identifikátor užívateľa s indexom %d\n"
 
-#: g10/keyedit.c:5720
+#: g10/keyedit.c:5728
 #, 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:5821
+#: g10/keyedit.c:5829
 #, 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:5843
+#: g10/keyedit.c:5851
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Neexistuje identifikátor užívateľa s indexom %d\n"
 
-#: g10/keyedit.c:5984
+#: g10/keyedit.c:5992
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "id užívateľa: \""
 
-#: g10/keyedit.c:5987 g10/keyedit.c:6089 g10/keyedit.c:6137
+#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
 #, 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:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
+#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
 msgid " (non-exportable)"
 msgstr " (nexeportovateľné)"
 
-#: g10/keyedit.c:5993
+#: g10/keyedit.c:6001
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Platnosť podpisu vyprší %s.\n"
 
-#: g10/keyedit.c:5998
+#: g10/keyedit.c:6006
 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:6003
+#: g10/keyedit.c:6011
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vytvoriť pre tento podpis revoka�ný certifikát? (a/N)"
 
-#: g10/keyedit.c:6063
+#: g10/keyedit.c:6071
 #, 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:6092
+#: g10/keyedit.c:6100
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (nexeportovateľné)"
 
-#: g10/keyedit.c:6099
+#: g10/keyedit.c:6107
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revokované %08lX v %s\n"
 
-#: g10/keyedit.c:6124
+#: g10/keyedit.c:6132
 msgid "You are about to revoke these signatures:\n"
 msgstr "Chystáte sa revokovať tieto podpisy:\n"
 
-#: g10/keyedit.c:6147
+#: g10/keyedit.c:6155
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Skuto�ne vytvoriť revoka�né certifikáty? (a/N) "
 
-#: g10/keyedit.c:6180
+#: g10/keyedit.c:6188
 #, c-format
 msgid "no secret key\n"
 msgstr "neexistuje tajný kľú�\n"
 
-#: g10/keyedit.c:6228
+#: g10/keyedit.c:6236
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6238
+#: g10/keyedit.c:6246
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "užívateľské ID \"%s\" je už revokované\n"
 
-#: g10/keyedit.c:6255
+#: g10/keyedit.c:6263
 #, 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:6351
+#: g10/keyedit.c:6359
 #, 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:6389
+#: g10/keyedit.c:6397
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "užívateľské ID \"%s\" je už revokované\n"
 
-#: g10/keyedit.c:6451
+#: g10/keyedit.c:6459
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "užívateľské ID \"%s\" je už revokované\n"
 
-#: g10/keyedit.c:6548
+#: g10/keyedit.c:6556
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -5320,83 +5333,83 @@ msgstr ""
 msgid "invalid value for option '%s'\n"
 msgstr "neplatný parameter pre import\n"
 
-#: g10/keygen.c:338
+#: g10/keygen.c:339
 #, fuzzy, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "duplicita predvoľby %c%lu\n"
 
-#: g10/keygen.c:345
+#: g10/keygen.c:346
 #, fuzzy, c-format
 msgid "too many cipher preferences\n"
 msgstr "príliš veľa `%c' predvolieb\n"
 
-#: g10/keygen.c:347
+#: g10/keygen.c:348
 #, fuzzy, c-format
 msgid "too many digest preferences\n"
 msgstr "príliš veľa `%c' predvolieb\n"
 
-#: g10/keygen.c:349
+#: g10/keygen.c:350
 #, fuzzy, c-format
 msgid "too many compression preferences\n"
 msgstr "príliš veľa `%c' predvolieb\n"
 
-#: g10/keygen.c:351
+#: g10/keygen.c:352
 #, fuzzy, c-format
 msgid "too many AEAD preferences\n"
 msgstr "príliš veľa `%c' predvolieb\n"
 
-#: g10/keygen.c:521
+#: g10/keygen.c:522
 #, fuzzy, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "neplatný znak v reťazci s predvoľbami\n"
 
-#: g10/keygen.c:1130
+#: g10/keygen.c:1131
 #, c-format
 msgid "writing direct signature\n"
 msgstr "zapisujem podpis kľú�a ním samým (direct signature)\n"
 
-#: g10/keygen.c:1176
+#: g10/keygen.c:1177
 #, c-format
 msgid "writing self signature\n"
 msgstr "zapisujem podpis kľú�a sebou samým\n"
 
-#: g10/keygen.c:1233
+#: g10/keygen.c:1234
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "zapisujem \"key-binding\" podpis\n"
 
-#: g10/keygen.c:1598 g10/keygen.c:1603 g10/keygen.c:1655 g10/keygen.c:1660
-#: g10/keygen.c:1832 g10/keygen.c:1837
+#: g10/keygen.c:1599 g10/keygen.c:1604 g10/keygen.c:1656 g10/keygen.c:1661
+#: g10/keygen.c:1833 g10/keygen.c:1838
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "neplatná dĺžka kľú�a; použijem %u bitov\n"
 
-#: g10/keygen.c:1609 g10/keygen.c:1666 g10/keygen.c:1674 g10/keygen.c:1843
+#: g10/keygen.c:1610 g10/keygen.c:1667 g10/keygen.c:1675 g10/keygen.c:1844
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "dĺžka kľú�a zaokrúhlená na %u bitov\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1701
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1899
+#: g10/keygen.c:1900
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1902
+#: g10/keygen.c:1903
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1906
 #, fuzzy
 msgid "Encrypt"
 msgstr "šifrovať dáta"
 
-#: g10/keygen.c:1908
+#: g10/keygen.c:1909
 msgid "Authenticate"
 msgstr ""
 
@@ -5410,179 +5423,179 @@ msgstr ""
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1929
+#: g10/keygen.c:1930
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1967
 #, c-format
 msgid "Possible actions for this %s key: "
 msgstr ""
 
-#: g10/keygen.c:1973
+#: g10/keygen.c:1974
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1979
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1981
+#: g10/keygen.c:1982
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (len na Å¡ifrovanie)\n"
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1985
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1987
+#: g10/keygen.c:1988
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:2116
+#: g10/keygen.c:2117
 #, fuzzy, c-format
 msgid "   (%d) RSA and RSA%s\n"
 msgstr "   (%d) DSA a ElGamal (implicitný)\n"
 
-#: g10/keygen.c:2120
+#: g10/keygen.c:2121
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal%s\n"
 msgstr "   (%d) DSA a ElGamal (implicitný)\n"
 
-#: g10/keygen.c:2123
+#: g10/keygen.c:2124
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "   (%d) DSA (sign only)%s\n"
 msgstr "   (%d) DSA (len na podpis)\n"
 
-#: g10/keygen.c:2125
+#: g10/keygen.c:2126
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (sign only)\n"
 msgid "   (%d) RSA (sign only)%s\n"
 msgstr "   (%d) RSA (len na podpis)\n"
 
-#: g10/keygen.c:2131
+#: g10/keygen.c:2132
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)%s\n"
 msgstr "   (%d) ElGamal (len na Å¡ifrovanie)\n"
 
-#: g10/keygen.c:2133
+#: g10/keygen.c:2134
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (encrypt only)\n"
 msgid "   (%d) RSA (encrypt only)%s\n"
 msgstr "   (%d) RSA (len na Å¡ifrovanie)\n"
 
-#: g10/keygen.c:2139
+#: g10/keygen.c:2140
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (len na Å¡ifrovanie)\n"
 
-#: g10/keygen.c:2141
+#: g10/keygen.c:2142
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (len na Å¡ifrovanie)\n"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2148
 #, fuzzy, c-format
 msgid "   (%d) ECC (sign and encrypt)%s\n"
 msgstr "   (%d) RSA (pro šifrování a podpis)\n"
 
-#: g10/keygen.c:2147 g10/keygen.c:2678
+#: g10/keygen.c:2148 g10/keygen.c:2679
 #, fuzzy
 #| msgid " (default)"
 msgid " *default*"
 msgstr "dešifrovať dáta (implicitne)"
 
-#: g10/keygen.c:2148
+#: g10/keygen.c:2149
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "  (%d) ECC (sign only)\n"
 msgstr "   (%d) DSA (len na podpis)\n"
 
-#: g10/keygen.c:2150
+#: g10/keygen.c:2151
 #, fuzzy, c-format
 msgid "  (%d) ECC (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (len na Å¡ifrovanie)\n"
 
-#: g10/keygen.c:2152
+#: g10/keygen.c:2153
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (encrypt only)\n"
 msgid "  (%d) ECC (encrypt only)%s\n"
 msgstr "   (%d) RSA (len na Å¡ifrovanie)\n"
 
-#: g10/keygen.c:2156
+#: g10/keygen.c:2157
 #, fuzzy, c-format
 msgid "  (%d) Existing key%s\n"
 msgstr "   (%d) RSA (len na Å¡ifrovanie)\n"
 
-#: g10/keygen.c:2158
+#: g10/keygen.c:2159
 #, fuzzy, c-format
 msgid "  (%d) Existing key from card%s\n"
 msgstr "   (%d) RSA (len na Å¡ifrovanie)\n"
 
-#: g10/keygen.c:2254 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2255 sm/certreqgen-ui.c:203
 #, fuzzy
 msgid "Enter the keygrip: "
 msgstr "Podpisová notácia: "
 
-#: g10/keygen.c:2267 sm/certreqgen-ui.c:211 tools/gpg-card.c:2280
+#: g10/keygen.c:2268 sm/certreqgen-ui.c:211 tools/gpg-card.c:2297
 #, c-format
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr ""
 
-#: g10/keygen.c:2269 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2270 sm/certreqgen-ui.c:213
 #, fuzzy
 msgid "No key with this keygrip\n"
 msgstr "Neexistuje identifikátor užívateľa s indexom %d\n"
 
-#: g10/keygen.c:2288 g10/keygen.c:2298 g10/keygen.c:3440 g10/keygen.c:3451
+#: g10/keygen.c:2289 g10/keygen.c:2299 g10/keygen.c:3444 g10/keygen.c:3455
 #: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
 #, fuzzy, c-format
 msgid "error reading the card: %s\n"
 msgstr "%s: chyba pri �ítaní voľného záznamu: %s\n"
 
-#: g10/keygen.c:2292 g10/keygen.c:3444 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2293 g10/keygen.c:3448 sm/certreqgen-ui.c:234
 #, fuzzy, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: g10/keygen.c:2311 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2312 sm/certreqgen-ui.c:246
 #, fuzzy
 msgid "Available keys:\n"
 msgstr "nastaviť kľú� ako neplatný (disable)"
 
-#: g10/keygen.c:2504 g10/keygen.c:2518
+#: g10/keygen.c:2505 g10/keygen.c:2519
 #, fuzzy, c-format
 #| msgid "rounded up to %u bits\n"
 msgid "rounded to %u bits\n"
 msgstr "zaokrúhlené na %u bitov\n"
 
-#: g10/keygen.c:2559
+#: g10/keygen.c:2560
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:2567
+#: g10/keygen.c:2568
 #, fuzzy, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Akú veľkosť kľú�a si prajete? (1024) "
 
-#: g10/keygen.c:2584 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2585 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Požadovaná dĺžka kľú�a je %u bitov.\n"
 
-#: g10/keygen.c:2630
+#: g10/keygen.c:2631
 #, fuzzy
 #| msgid "Please select what kind of key you want:\n"
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Prosím, vyberte druh kľú�a, ktorý chcete:\n"
 
-#: g10/keygen.c:2819
+#: g10/keygen.c:2820
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5598,7 +5611,7 @@ msgstr ""
 "      <n>m = doba platnosti kľú�a skon�í za n mesiacov\n"
 "      <n>y = doba platnosti kľú�a skon�í za n rokov\n"
 
-#: g10/keygen.c:2830
+#: g10/keygen.c:2831
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5614,40 +5627,40 @@ msgstr ""
 "      <n>m = doba platnosti podpisu skon�í za n mesiacov\n"
 "      <n>y = doba platnosti podpisu skon�í za n rokov\n"
 
-#: g10/keygen.c:2853
+#: g10/keygen.c:2854
 msgid "Key is valid for? (0) "
 msgstr "Kľú� je platný na? (0) "
 
-#: g10/keygen.c:2858
+#: g10/keygen.c:2859
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Podpis je platný na? (0) "
 
-#: g10/keygen.c:2871 g10/keygen.c:2896
+#: g10/keygen.c:2875 g10/keygen.c:2900
 msgid "invalid value\n"
 msgstr "neplatná hodnota\n"
 
-#: g10/keygen.c:2878
+#: g10/keygen.c:2882
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "platnosť %s neskon�í\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2883
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "platnosť %s neskon�í\n"
 
-#: g10/keygen.c:2884
+#: g10/keygen.c:2888
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "platnosť %s skon�í %s\n"
 
-#: g10/keygen.c:2885
+#: g10/keygen.c:2889
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Platnosť podpisu vyprší %s\n"
 
-#: g10/keygen.c:2889
+#: g10/keygen.c:2893
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5655,12 +5668,12 @@ msgstr ""
 "Váš systém nevie zobraziť dátumy po roku 2038.\n"
 "V každom prípade budú dátumy korektne spracovávané do roku 2106.\n"
 
-#: g10/keygen.c:2902
+#: g10/keygen.c:2906
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Je to správne (a/n)? "
 
-#: g10/keygen.c:2970
+#: g10/keygen.c:2974
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5671,7 +5684,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2985
+#: g10/keygen.c:2989
 #, fuzzy
 msgid ""
 "\n"
@@ -5688,50 +5701,50 @@ msgstr ""
 "    \"Jozko Mrkvicka (student) <jozko@mrkvicka.sk>\"\n"
 "\n"
 
-#: g10/keygen.c:3004
+#: g10/keygen.c:3008
 msgid "Real name: "
 msgstr "Meno a priezvisko: "
 
-#: g10/keygen.c:3013
+#: g10/keygen.c:3017
 msgid "Invalid character in name\n"
 msgstr "Neplatný znak ve mene\n"
 
-#: g10/keygen.c:3014
+#: g10/keygen.c:3018
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:3018
+#: g10/keygen.c:3022
 msgid "Name may not start with a digit\n"
 msgstr "Meno nemôže za�ínať �íslicou\n"
 
-#: g10/keygen.c:3021
+#: g10/keygen.c:3025
 msgid "Name must be at least 5 characters long\n"
 msgstr "Meno musí byť dlhé aspoň 5 znakov\n"
 
-#: g10/keygen.c:3031
+#: g10/keygen.c:3035
 msgid "Email address: "
 msgstr "E-mailová adresa: "
 
-#: g10/keygen.c:3037
+#: g10/keygen.c:3041
 msgid "Not a valid email address\n"
 msgstr "Neplatná e-mailová adresa\n"
 
-#: g10/keygen.c:3046
+#: g10/keygen.c:3050
 msgid "Comment: "
 msgstr "Komentár: "
 
-#: g10/keygen.c:3052
+#: g10/keygen.c:3056
 msgid "Invalid character in comment\n"
 msgstr "Neplatný znak v komentári\n"
 
-#: g10/keygen.c:3088
+#: g10/keygen.c:3092
 #, fuzzy, c-format
 #| msgid "You are using the `%s' character set.\n"
 msgid "You are using the '%s' character set.\n"
 msgstr "Používate znakovú sadu `%s'.\n"
 
-#: g10/keygen.c:3094
+#: g10/keygen.c:3098
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5742,7 +5755,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3099
+#: g10/keygen.c:3103
 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"
 
@@ -5757,35 +5770,35 @@ msgstr "Do poľa meno alebo komentár nepíšte, prosím, e-mailovú adresu.\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3124
+#: g10/keygen.c:3128
 msgid "NnCcEeOoQq"
 msgstr "mMkKeEPpUu"
 
-#: g10/keygen.c:3134
+#: g10/keygen.c:3138
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Zmeniť (M)eno, (K)omentár, (E)-mail alebo (U)kon�iť? "
 
-#: g10/keygen.c:3135
+#: g10/keygen.c:3139
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Zmeniť (M)eno, (K)omentár, (E)-mail alebo (P)okra�ovať/(U)kon�iť? "
 
-#: g10/keygen.c:3140
+#: g10/keygen.c:3144
 #, fuzzy
 #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Zmeniť (M)eno, (K)omentár, (E)-mail alebo (U)kon�iť? "
 
-#: g10/keygen.c:3141
+#: g10/keygen.c:3145
 #, fuzzy
 #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "Zmeniť (M)eno, (K)omentár, (E)-mail alebo (P)okra�ovať/(U)kon�iť? "
 
-#: g10/keygen.c:3160
+#: g10/keygen.c:3164
 msgid "Please correct the error first\n"
 msgstr "Najskôr, prosím, opravte chybu\n"
 
-#: g10/keygen.c:3206
+#: g10/keygen.c:3210
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -5797,18 +5810,18 @@ msgstr ""
 "používať disky); v�aka tomu má generátor lepšiu šancu získať dostatok "
 "entropie.\n"
 
-#: g10/keygen.c:3591
+#: g10/keygen.c:3595
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4590 g10/keygen.c:4663 g10/keygen.c:4681 g10/keygen.c:4710
-#: g10/keygen.c:5086 g10/keygen.c:5632 g10/keygen.c:5943 g10/keygen.c:6050
+#: g10/keygen.c:4594 g10/keygen.c:4667 g10/keygen.c:4685 g10/keygen.c:4714
+#: g10/keygen.c:5113 g10/keygen.c:5663 g10/keygen.c:5974 g10/keygen.c:6081
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Vytvorenie kľú�a sa nepodarilo: %s\n"
 
-#: g10/keygen.c:4599
+#: g10/keygen.c:4603
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5816,67 +5829,67 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:4601
+#: g10/keygen.c:4605
 msgid "Continue? (Y/n) "
 msgstr ""
 
-#: g10/keygen.c:4622
+#: g10/keygen.c:4626
 #, fuzzy, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "`%s' je už skomprimovaný\n"
 
-#: g10/keygen.c:4627
+#: g10/keygen.c:4631
 #, fuzzy
 msgid "Create anyway? (y/N) "
 msgstr "Použiť napriek tomu tento kľú�? "
 
-#: g10/keygen.c:4633
+#: g10/keygen.c:4637
 #, fuzzy, c-format
 msgid "creating anyway\n"
 msgstr "vytvoriť nový pár kľú�ov"
 
-#: g10/keygen.c:5069
+#: g10/keygen.c:5096
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 
-#: g10/keygen.c:5118
+#: g10/keygen.c:5145
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Vytváranie kľú�a bolo zrušené.\n"
 
-#: g10/keygen.c:5178
+#: g10/keygen.c:5205
 #, fuzzy, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "nemôžem vytvoriť `%s': %s\n"
 
-#: g10/keygen.c:5198
+#: g10/keygen.c:5225
 #, fuzzy, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "POZN�MKA: platnosť tajného kľú�a %08lX skon�ila %s\n"
 
-#: g10/keygen.c:5359 g10/keygen.c:5561
+#: g10/keygen.c:5389 g10/keygen.c:5591
 #, fuzzy, c-format
 #| msgid "writing public key to `%s'\n"
 msgid "writing public key to '%s'\n"
 msgstr "zapisujem verejný kľú� do `%s'\n"
 
-#: g10/keygen.c:5555
+#: g10/keygen.c:5585
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "nenájdený zapisovateľný súbor verejných kľú�ov (pubring): %s\n"
 
-#: g10/keygen.c:5569
+#: g10/keygen.c:5599
 #, fuzzy, c-format
 #| msgid "error writing public keyring `%s': %s\n"
 msgid "error writing public keyring '%s': %s\n"
 msgstr "chyba pri zápise do súboru verejných kľú�ov `%s': %s\n"
 
-#: g10/keygen.c:5603
+#: g10/keygen.c:5634
 msgid "public and secret key created and signed.\n"
 msgstr "verejný a tajný kľú� boli vytvorené a podpísané.\n"
 
-#: g10/keygen.c:5619
+#: g10/keygen.c:5650
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -5885,7 +5898,7 @@ msgstr ""
 "Tento kľú� nemôže byť použitý na šifrovanie. Pre vytvorenie\n"
 "sekundárneho kľú�a na tento ú�el môžete použiť príkaz \"--edit-key\".\n"
 
-#: g10/keygen.c:5801 g10/keygen.c:6000
+#: g10/keygen.c:5832 g10/keygen.c:6031
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5893,7 +5906,7 @@ msgstr ""
 "kľú� bol vytvorený %lu sekund v budúcnosti (došlo k zmene �asu alebo\n"
 "je problém so systémovým �asom)\n"
 
-#: g10/keygen.c:5803 g10/keygen.c:6002
+#: g10/keygen.c:5834 g10/keygen.c:6033
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5901,23 +5914,23 @@ msgstr ""
 "kľú� bol vytvorený %lu sekund v budúcnosti (došlo k zmene �asu alebo\n"
 "je problém so systémovým �asom)\n"
 
-#: g10/keygen.c:5814 g10/keygen.c:6013
+#: g10/keygen.c:5845 g10/keygen.c:6044
 #, fuzzy, c-format
 #| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "POZN�MKA: vytvorenie podkľú�a pre kľú�e v3 nie je v súlade s OpenPGP\n"
 
-#: g10/keygen.c:5826 g10/keygen.c:5828
+#: g10/keygen.c:5857 g10/keygen.c:5859
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Tajné �asti primárneho kľú�a nie sú dostupné.\n"
 
-#: g10/keygen.c:5835 g10/keygen.c:5837
+#: g10/keygen.c:5866 g10/keygen.c:5868
 #, fuzzy, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Tajné �asti primárneho kľú�a nie sú dostupné.\n"
 
-#: g10/keygen.c:5857 g10/keygen.c:6027
+#: g10/keygen.c:5888 g10/keygen.c:6058
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Skuto�ne vytvoriť? "
@@ -6000,26 +6013,26 @@ msgstr "   Fingerprint kľú�a ="
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1467
+#: g10/keyring.c:1477
 #, fuzzy, c-format
 msgid "caching keyring '%s'\n"
 msgstr "kontrolujem súbor kľú�ov (keyring) `%s'\n"
 
-#: g10/keyring.c:1541
+#: g10/keyring.c:1551
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signature)\n"
 msgid_plural "%lu keys cached so far (%lu signatures)\n"
 msgstr[0] "%lu kľú�ov skontrolovaných (%lu podpisov)\n"
 msgstr[1] "%lu kľú�ov skontrolovaných (%lu podpisov)\n"
 
-#: g10/keyring.c:1557
+#: g10/keyring.c:1567
 #, c-format
 msgid "%lu key cached"
 msgid_plural "%lu keys cached"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/keyring.c:1559
+#: g10/keyring.c:1569
 #, fuzzy, c-format
 #| msgid "1 bad signature\n"
 msgid " (%lu signature)\n"
@@ -6027,7 +6040,7 @@ msgid_plural " (%lu signatures)\n"
 msgstr[0] "1 zlý podpis\n"
 msgstr[1] "1 zlý podpis\n"
 
-#: g10/keyring.c:1636
+#: g10/keyring.c:1646
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: súbor kľú�ov (keyring) vytvorený\n"
@@ -6057,80 +6070,75 @@ msgstr ""
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "zadané URL pre podpisovú politiku je neplatné\n"
 
-#: g10/keyserver.c:537
+#: g10/keyserver.c:360
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:740
+#: g10/keyserver.c:563
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:846
+#: g10/keyserver.c:669
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "neplatný parameter pre export\n"
 
-#: g10/keyserver.c:986 g10/keyserver.c:1096
+#: g10/keyserver.c:809 g10/keyserver.c:919
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1420 g10/keyserver.c:1453
+#: g10/keyserver.c:1217 g10/keyserver.c:1250
 #, 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:1427
+#: g10/keyserver.c:1224
 #, 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:1531
+#: g10/keyserver.c:1316
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "kľú� `%s' nebol nájdený: %s\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1319
 #, fuzzy, c-format
 msgid "key not found on keyserver\n"
 msgstr "kľú� `%s' nebol nájdený: %s\n"
 
-#: g10/keyserver.c:1722
-#, fuzzy, c-format
-msgid "requesting key %s from %s server %s\n"
-msgstr "požadujem kľú� %08lX z %s\n"
-
-#: g10/keyserver.c:1726
+#: g10/keyserver.c:1481
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "požadujem kľú� %08lX z %s\n"
 
-#: g10/keyserver.c:1841 g10/keyserver.c:2020
+#: g10/keyserver.c:1600 g10/keyserver.c:1793
 #, fuzzy, c-format
 msgid "no keyserver known\n"
 msgstr "neplatný parameter pre export\n"
 
-#: g10/keyserver.c:1856 g10/skclist.c:213 g10/skclist.c:241
+#: g10/keyserver.c:1615 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:1860
+#: g10/keyserver.c:1619
 #, 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:1901
+#: g10/keyserver.c:1662
 #, fuzzy, c-format
 msgid "requesting key from '%s'\n"
 msgstr "požadujem kľú� %08lX z %s\n"
 
-#: g10/keyserver.c:1917
+#: g10/keyserver.c:1680
 #, 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"
@@ -6157,258 +6165,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:472
+#: g10/mainproc.c:473
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "verejný kľú� je %08lX\n"
 
-#: g10/mainproc.c:524
+#: g10/mainproc.c:525
 #, 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:528 g10/pkclist.c:231
+#: g10/mainproc.c:529 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:532
+#: g10/mainproc.c:533
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "zašifrovaná %s kľú�om, ID %08lX\n"
 
-#: g10/mainproc.c:552 g10/mainproc.c:935
+#: g10/mainproc.c:553 g10/mainproc.c:937
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:560
+#: g10/mainproc.c:561
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "zašifrované s %lu heslami\n"
 
-#: g10/mainproc.c:562
+#: g10/mainproc.c:563
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "zašifrované jedným heslom\n"
 
-#: g10/mainproc.c:577 g10/mainproc.c:602
+#: g10/mainproc.c:578 g10/mainproc.c:603
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "dešifrovanie verejným kľú�om zlyhalo: %s\n"
 
-#: g10/mainproc.c:613
+#: g10/mainproc.c:614
 #, 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:642 g10/mainproc.c:663
+#: g10/mainproc.c:643 g10/mainproc.c:664
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "predpokladám %s šifrovaných dát\n"
 
-#: g10/mainproc.c:649
+#: g10/mainproc.c:650
 #, 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:742 g10/mainproc.c:780
+#: g10/mainproc.c:744 g10/mainproc.c:782
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "VAROVANIE: správa nemá ochranu integrity\n"
 
-#: g10/mainproc.c:753
+#: g10/mainproc.c:755
 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:756
+#: g10/mainproc.c:758
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:761
+#: g10/mainproc.c:763
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "dešifrovanie zlyhalo: %s\n"
 
-#: g10/mainproc.c:773
+#: g10/mainproc.c:775
 #, c-format
 msgid "decryption okay\n"
 msgstr "dešifrovanie o.k.\n"
 
-#: g10/mainproc.c:786
+#: g10/mainproc.c:788
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VAROVANIE: so zašifrovanou správou bolo manipulované!\n"
 
-#: g10/mainproc.c:804
+#: g10/mainproc.c:806
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dešifrovanie zlyhalo: %s\n"
 
-#: g10/mainproc.c:851
+#: g10/mainproc.c:853
 #, 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:858
+#: g10/mainproc.c:860
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "pôvodné meno súboru='%.*s'\n"
 
-#: g10/mainproc.c:1135
+#: g10/mainproc.c:1137
 #, 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:1440 g10/mainproc.c:1483
+#: g10/mainproc.c:1442 g10/mainproc.c:1485
 #, fuzzy, c-format
 msgid "no signature found\n"
 msgstr "Dobrý podpis od \""
 
-#: g10/mainproc.c:1763
+#: g10/mainproc.c:1765
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ZL� podpis od \""
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1767
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Podpis s vypršanou platnosťou od \""
 
-#: g10/mainproc.c:1767
+#: g10/mainproc.c:1769
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Dobrý podpis od \""
 
-#: g10/mainproc.c:1789
+#: g10/mainproc.c:1791
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "verifikácia podpisu potla�ená\n"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1905
 #, 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:1919 g10/mainproc.c:1926
+#: g10/mainproc.c:1921 g10/mainproc.c:1928
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Platnosť podpisu vypršala %s\n"
 
-#: g10/mainproc.c:1920 g10/mainproc.c:1927 sm/verify.c:480
+#: g10/mainproc.c:1922 g10/mainproc.c:1929 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:1931
+#: g10/mainproc.c:1933
 #, 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:1937
+#: g10/mainproc.c:1939
 #, fuzzy, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "                alias \""
 
-#: g10/mainproc.c:1992
+#: g10/mainproc.c:1994
 #, c-format
 msgid "Key available at: "
 msgstr "Kľú� k dispozícii na: "
 
-#: g10/mainproc.c:2034
+#: g10/mainproc.c:2036
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2234
+#: g10/mainproc.c:2236
 msgid "[uncertain]"
 msgstr "[neistý]  "
 
-#: g10/mainproc.c:2272
+#: g10/mainproc.c:2274
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                alias \""
 
-#: g10/mainproc.c:2347
+#: g10/mainproc.c:2349
 #, 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:2363
+#: g10/mainproc.c:2365
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Platnosť podpisu vypršala %s\n"
 
-#: g10/mainproc.c:2368
+#: g10/mainproc.c:2370
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Platnosť podpisu vyprší %s\n"
 
-#: g10/mainproc.c:2379
+#: g10/mainproc.c:2381
 #, 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:2380
+#: g10/mainproc.c:2382
 msgid "binary"
 msgstr "binárne"
 
-#: g10/mainproc.c:2381
+#: g10/mainproc.c:2383
 msgid "textmode"
 msgstr "textový mód"
 
-#: g10/mainproc.c:2381 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2383 g10/trust.c:112 dirmngr/ocsp.c:793
 msgid "unknown"
 msgstr "neznáme"
 
-#: g10/mainproc.c:2383
+#: g10/mainproc.c:2385
 #, fuzzy
 #| msgid "unknown pubkey algorithm"
 msgid ", key algorithm "
 msgstr "neznámy algoritmus verejného kľú�a"
 
-#: g10/mainproc.c:2418
+#: g10/mainproc.c:2420
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2457
+#: g10/mainproc.c:2459
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nemôžem overiť podpis: %s\n"
 
-#: g10/mainproc.c:2553 g10/mainproc.c:2572 g10/mainproc.c:2696
+#: g10/mainproc.c:2555 g10/mainproc.c:2574 g10/mainproc.c:2698
 #, c-format
 msgid "not a detached signature\n"
 msgstr "toto nie je podpis oddelený od dokumentu\n"
 
-#: g10/mainproc.c:2606
+#: g10/mainproc.c:2608
 #, 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:2615
+#: g10/mainproc.c:2617
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "samostatný podpis triedy 0x%02x\n"
 
-#: g10/mainproc.c:2700
+#: g10/mainproc.c:2702
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis starého typu (PGP 2.x)\n"
@@ -6596,51 +6604,56 @@ msgstr "Kritická podpisová notácia: "
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpaket typu %d má nastavený kritický bit\n"
 
-#: g10/passphrase.c:208
+#: g10/passphrase.c:201 sm/decrypt.c:669
+#, fuzzy
+msgid "Please enter the passphrase for decryption."
+msgstr "zmeniť heslo"
+
+#: g10/passphrase.c:203
 msgid "Enter passphrase\n"
 msgstr "Vložiť heslo\n"
 
-#: g10/passphrase.c:219
+#: g10/passphrase.c:227
 #, c-format
 msgid "cancelled by user\n"
 msgstr "zrušené užívateľom\n"
 
-#: g10/passphrase.c:460
+#: g10/passphrase.c:472
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (hlavné ID kľú�a %08lX)"
 
-#: g10/passphrase.c:467
+#: g10/passphrase.c:479
 #, fuzzy
 msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 msgstr "Prosím, vložte heslo; toto je tajná veta \n"
 
-#: g10/passphrase.c:471
+#: g10/passphrase.c:483
 #, fuzzy
 msgid "Please enter the passphrase to import the OpenPGP secret key:"
 msgstr "Prosím, vložte heslo; toto je tajná veta \n"
 
-#: g10/passphrase.c:476
+#: g10/passphrase.c:488
 #, fuzzy
 msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 msgstr "Prosím, vložte heslo; toto je tajná veta \n"
 
-#: g10/passphrase.c:479
+#: g10/passphrase.c:491
 #, fuzzy
 msgid "Please enter the passphrase to export the OpenPGP secret key:"
 msgstr "Prosím, vložte heslo; toto je tajná veta \n"
 
-#: g10/passphrase.c:484
+#: g10/passphrase.c:496
 #, fuzzy
 msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 msgstr "Skuto�ne chcete zmazať vybrané kľú�e? "
 
-#: g10/passphrase.c:487
+#: g10/passphrase.c:499
 #, fuzzy
 msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgstr "Skuto�ne chcete zmazať vybrané kľú�e? "
 
-#: g10/passphrase.c:496
+#: g10/passphrase.c:508
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -6813,7 +6826,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:313 g10/revoke.c:803
+#: g10/pkclist.c:313 g10/revoke.c:804
 msgid "Your decision? "
 msgstr "Vaše rozhodnutie? "
 
@@ -7114,7 +7127,7 @@ msgstr "nemôžem otvoriť podpísané dáta '%s'\n"
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "nemôžem otvoriť podpísané dáta '%s'\n"
 
-#: g10/pubkey-enc.c:99 sm/decrypt.c:879
+#: g10/pubkey-enc.c:99 sm/decrypt.c:1329
 #, fuzzy, c-format
 msgid "key %s is not suitable for decryption in %s mode\n"
 msgstr "kľú� %08lX: chyba identifikátor užívateľa\n"
@@ -7161,7 +7174,7 @@ msgid "Note: key has been revoked"
 msgstr "POZN�MKA: kľú� bol revokovaný"
 
 #: g10/revoke.c:100 g10/revoke.c:126 g10/revoke.c:172 g10/revoke.c:184
-#: g10/revoke.c:502
+#: g10/revoke.c:503
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet zlyhala: %s\n"
@@ -7190,11 +7203,11 @@ msgstr "Tajný kľú� je dostupný.\n"
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Vytvoriť pre tento podpis revoka�ný certifikát? "
 
-#: g10/revoke.c:334 g10/revoke.c:744
+#: g10/revoke.c:334 g10/revoke.c:745
 msgid "ASCII armored output forced.\n"
 msgstr "Vynútený ASCII textový výstup.\n"
 
-#: g10/revoke.c:350 g10/revoke.c:481
+#: g10/revoke.c:350 g10/revoke.c:482
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet zlyhala: %s\n"
@@ -7208,19 +7221,19 @@ msgstr "Revoka�ný certifikát bol vytvorený.\n"
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "žiadne revoka�né kľú�e pre `%s' nenájdené\n"
 
-#: g10/revoke.c:567
+#: g10/revoke.c:568
 #, fuzzy
 msgid "This is a revocation certificate for the OpenPGP key:"
 msgstr "Vytvoriť pre tento podpis revoka�ný certifikát? "
 
-#: g10/revoke.c:583
+#: g10/revoke.c:584
 msgid ""
 "A revocation certificate is a kind of \"kill switch\" to publicly\n"
 "declare that a key shall not anymore be used.  It is not possible\n"
 "to retract such a revocation certificate once it has been published."
 msgstr ""
 
-#: g10/revoke.c:586
+#: g10/revoke.c:587
 msgid ""
 "Use it to revoke this key in case of a compromise or loss of\n"
 "the secret key.  However, if the secret key is still accessible,\n"
@@ -7229,20 +7242,20 @@ msgid ""
 "of the gpg command \"--generate-revocation\" in the GnuPG manual."
 msgstr ""
 
-#: g10/revoke.c:592
+#: g10/revoke.c:593
 msgid ""
 "To avoid an accidental use of this file, a colon has been inserted\n"
 "before the 5 dashes below.  Remove this colon with a text editor\n"
 "before importing and publishing this revocation certificate."
 msgstr ""
 
-#: g10/revoke.c:611
+#: g10/revoke.c:612
 #, fuzzy, c-format
 #| msgid "Revocation certificate created.\n"
 msgid "revocation certificate stored as '%s.rev'\n"
 msgstr "Revoka�ný certifikát bol vytvorený.\n"
 
-#: g10/revoke.c:655
+#: g10/revoke.c:656
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found\n"
 msgstr "tajný kľú� `%s' nebol nájdený: %s\n"
@@ -7250,23 +7263,23 @@ msgstr "tajný kľú� `%s' nebol nájdený: %s\n"
 #. TRANSLATORS: The %s prints a key specification which
 #. for example has been given at the command line.  Several lines
 #. lines with secret key infos are printed after this message.
-#: g10/revoke.c:680
+#: g10/revoke.c:681
 #, c-format
 msgid "'%s' matches multiple secret keys:\n"
 msgstr ""
 
-#: g10/revoke.c:705
+#: g10/revoke.c:706
 #, fuzzy, c-format
 #| msgid "error creating keyring `%s': %s\n"
 msgid "error searching the keyring: %s\n"
 msgstr "chyba pri vytváraní súboru kľú�ov (keyring)`%s': %s\n"
 
-#: g10/revoke.c:728
+#: g10/revoke.c:729
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Vytvoriť pre tento podpis revoka�ný certifikát? "
 
-#: g10/revoke.c:752
+#: g10/revoke.c:753
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -7284,33 +7297,33 @@ msgstr ""
 "Ale hrozí nebezpe�enstvo: Tla�ový systém Vášho po�íta�a môže ukladať dáta a\n"
 "sprístupniť ich iným!\n"
 
-#: g10/revoke.c:786
+#: g10/revoke.c:787
 msgid "Please select the reason for the revocation:\n"
 msgstr "Prosím výberte dôvod na revokáciu:\n"
 
-#: g10/revoke.c:796
+#: g10/revoke.c:797
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#: g10/revoke.c:798
+#: g10/revoke.c:799
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Pravdepodobne ste chceli vybrať %d)\n"
 
-#: g10/revoke.c:839
+#: g10/revoke.c:843
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Ak chcete, napíšte popis; ukon�ite prázdnym riadkom:\n"
 
-#: g10/revoke.c:867
+#: g10/revoke.c:871
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Dôvod na revokáciu: %s\n"
 
-#: g10/revoke.c:869
+#: g10/revoke.c:873
 msgid "(No description given)\n"
 msgstr "(Žiadny popis)\n"
 
-#: g10/revoke.c:874
+#: g10/revoke.c:878
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Je to v poriadku? "
@@ -7491,24 +7504,24 @@ msgstr "podpisujem:"
 msgid "%s.%s encryption will be used\n"
 msgstr "bude použité šifrovanie %s\n"
 
-#: g10/skclist.c:172 g10/skclist.c:253
+#: g10/skclist.c:173 g10/skclist.c:254
 #, c-format
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "kľú� nie je ozna�ený ako nedostato�ne bezpe�ný - nemôžem ho použiť s "
 "falošným RNG!\n"
 
-#: g10/skclist.c:204
+#: g10/skclist.c:205
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "presko�ený `%s': duplikovaný\n"
 
-#: g10/skclist.c:223
+#: g10/skclist.c:224
 #, c-format
 msgid "skipped: secret key already present\n"
 msgstr "presko�ené: tajný kľú� je už v databáze\n"
 
-#: g10/skclist.c:242
+#: g10/skclist.c:243
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
@@ -7739,10 +7752,10 @@ msgstr ""
 msgid "TOFU DB error"
 msgstr ""
 
-#: g10/tofu.c:687 g10/tofu.c:2073 g10/tofu.c:2354 g10/tofu.c:2373
-#: g10/tofu.c:2386 g10/tofu.c:2398 g10/tofu.c:2413 g10/tofu.c:2425
-#: g10/tofu.c:3021 g10/tofu.c:3038 g10/tofu.c:3075 g10/tofu.c:3092
-#: g10/tofu.c:3404
+#: g10/tofu.c:687 g10/tofu.c:2077 g10/tofu.c:2358 g10/tofu.c:2377
+#: g10/tofu.c:2390 g10/tofu.c:2402 g10/tofu.c:2417 g10/tofu.c:2429
+#: g10/tofu.c:3025 g10/tofu.c:3042 g10/tofu.c:3079 g10/tofu.c:3096
+#: g10/tofu.c:3408
 #, fuzzy, c-format
 msgid "error reading TOFU database: %s\n"
 msgstr "chyba pri posielaní na `%s': %s\n"
@@ -7764,7 +7777,7 @@ msgstr "%s: chyba pri zápise adresárového záznamu: %s\n"
 msgid "error opening TOFU database '%s': %s\n"
 msgstr "chyba pri �ítaní `%s': %s\n"
 
-#: g10/tofu.c:1148 g10/tofu.c:3458 g10/tofu.c:3604
+#: g10/tofu.c:1148 g10/tofu.c:3462 g10/tofu.c:3608
 #, fuzzy, c-format
 msgid "error updating TOFU database: %s\n"
 msgstr "chyba pri posielaní na `%s': %s\n"
@@ -7804,43 +7817,43 @@ msgstr "chyba pri vytváraní hesla: %s\n"
 msgid "This key's user IDs:\n"
 msgstr "vypísať zoznam kľú�ov a id užívateľov"
 
-#: g10/tofu.c:1634 g10/tofu.c:1799
+#: g10/tofu.c:1634 g10/tofu.c:1801
 #, fuzzy, c-format
 #| msgid "Policy: "
 msgid "policy: %s"
 msgstr "Politika: "
 
-#: g10/tofu.c:1725
+#: g10/tofu.c:1727
 #, fuzzy, c-format
 msgid "error gathering signature stats: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: g10/tofu.c:1729
+#: g10/tofu.c:1731
 #, c-format
 msgid "The email address \"%s\" is associated with %d key:\n"
 msgid_plural "The email address \"%s\" is associated with %d keys:\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1747
+#: g10/tofu.c:1749
 #, c-format
 msgid "Statistics for keys with the email address \"%s\":\n"
 msgstr ""
 
-#: g10/tofu.c:1797
+#: g10/tofu.c:1799
 #, fuzzy
 #| msgid "list keys"
 msgid "this key"
 msgstr "vypísať zoznam kľú�ov"
 
-#: g10/tofu.c:1823
+#: g10/tofu.c:1825
 #, fuzzy, c-format
 msgid "Verified %d message."
 msgid_plural "Verified %d messages."
 msgstr[0] "|algo [súbory]|vypíš hash"
 msgstr[1] "|algo [súbory]|vypíš hash"
 
-#: g10/tofu.c:1827
+#: g10/tofu.c:1829
 #, fuzzy, c-format
 #| msgid "encrypted with %lu passphrases\n"
 msgid "Encrypted %d message."
@@ -7848,68 +7861,68 @@ msgid_plural "Encrypted %d messages."
 msgstr[0] "zašifrované s %lu heslami\n"
 msgstr[1] "zašifrované s %lu heslami\n"
 
-#: g10/tofu.c:1834
+#: g10/tofu.c:1836
 #, fuzzy, c-format
 msgid "Verified %d message in the future."
 msgid_plural "Verified %d messages in the future."
 msgstr[0] "|algo [súbory]|vypíš hash"
 msgstr[1] "|algo [súbory]|vypíš hash"
 
-#: g10/tofu.c:1838
+#: g10/tofu.c:1840
 #, fuzzy, c-format
 msgid "Encrypted %d message in the future."
 msgid_plural "Encrypted %d messages in the future."
 msgstr[0] "|algo [súbory]|vypíš hash"
 msgstr[1] "|algo [súbory]|vypíš hash"
 
-#: g10/tofu.c:1852
+#: g10/tofu.c:1854
 #, c-format
 msgid "Messages verified over the past %d day: %d."
 msgid_plural "Messages verified over the past %d days: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1858
+#: g10/tofu.c:1860
 #, c-format
 msgid "Messages encrypted over the past %d day: %d."
 msgid_plural "Messages encrypted over the past %d days: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1868
+#: g10/tofu.c:1870
 #, c-format
 msgid "Messages verified over the past %d month: %d."
 msgid_plural "Messages verified over the past %d months: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1874
+#: g10/tofu.c:1876
 #, c-format
 msgid "Messages encrypted over the past %d month: %d."
 msgid_plural "Messages encrypted over the past %d months: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1884
+#: g10/tofu.c:1886
 #, c-format
 msgid "Messages verified over the past %d year: %d."
 msgid_plural "Messages verified over the past %d years: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1890
+#: g10/tofu.c:1892
 #, c-format
 msgid "Messages encrypted over the past %d year: %d."
 msgid_plural "Messages encrypted over the past %d years: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1898
+#: g10/tofu.c:1900
 #, c-format
 msgid "Messages verified in the past: %d."
 msgstr ""
 
-#: g10/tofu.c:1902
+#: g10/tofu.c:1904
 #, fuzzy, c-format
 msgid "Messages encrypted in the past: %d."
 msgstr "|algo [súbory]|vypíš hash"
@@ -7917,130 +7930,130 @@ msgstr "|algo [súbory]|vypíš hash"
 #. TRANSLATORS: Please translate the text found in the source
 #. * file below.  We don't directly internationalize that text so
 #. * that we can tweak it without breaking translations.
-#: g10/tofu.c:1919
+#: g10/tofu.c:1921
 msgid "TOFU detected a binding conflict"
 msgstr ""
 
 #. TRANSLATORS: Two letters (normally the lower and upper case
 #. * version of the hotkey) for each of the five choices.  If
 #. * there is only one choice in your language, repeat it.
-#: g10/tofu.c:1961
+#: g10/tofu.c:1963
 msgid "gGaAuUrRbB"
 msgstr ""
 
-#: g10/tofu.c:1967
+#: g10/tofu.c:1969
 msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 
-#: g10/tofu.c:1975
+#: g10/tofu.c:1978
 msgid "Defaulting to unknown.\n"
 msgstr ""
 
-#: g10/tofu.c:2093 g10/tofu.c:2228
+#: g10/tofu.c:2097 g10/tofu.c:2232
 #, c-format
 msgid "TOFU db corruption detected.\n"
 msgstr ""
 
-#: g10/tofu.c:2829
+#: g10/tofu.c:2833
 #, fuzzy, c-format
 msgid "error changing TOFU policy: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: g10/tofu.c:2880
+#: g10/tofu.c:2884
 #, c-format
 msgid "%lld~year"
 msgid_plural "%lld~years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2885
+#: g10/tofu.c:2889
 #, c-format
 msgid "%lld~month"
 msgid_plural "%lld~months"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2890
+#: g10/tofu.c:2894
 #, c-format
 msgid "%lld~week"
 msgid_plural "%lld~weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2895
+#: g10/tofu.c:2899
 #, c-format
 msgid "%lld~day"
 msgid_plural "%lld~days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2900
+#: g10/tofu.c:2904
 #, c-format
 msgid "%lld~hour"
 msgid_plural "%lld~hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2905
+#: g10/tofu.c:2909
 #, c-format
 msgid "%lld~minute"
 msgid_plural "%lld~minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2907
+#: g10/tofu.c:2911
 #, c-format
 msgid "%lld~second"
 msgid_plural "%lld~seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:3145
+#: g10/tofu.c:3149
 #, c-format
 msgid "%s: Verified 0~signatures and encrypted 0~messages."
 msgstr ""
 
-#: g10/tofu.c:3151
+#: g10/tofu.c:3155
 #, fuzzy, c-format
 #| msgid "Deleted %d signatures.\n"
 msgid "%s: Verified 0 signatures."
 msgstr "Zmazaných %d podpisov.\n"
 
-#: g10/tofu.c:3165
+#: g10/tofu.c:3169
 #, fuzzy
 #| msgid "encrypted with %lu passphrases\n"
 msgid "Encrypted 0 messages."
 msgstr "zašifrované s %lu heslami\n"
 
-#: g10/tofu.c:3181
+#: g10/tofu.c:3185
 #, fuzzy, c-format
 #| msgid "Policy: "
 msgid "(policy: %s)"
 msgstr "Politika: "
 
-#: g10/tofu.c:3215
+#: g10/tofu.c:3219
 #, c-format
 msgid ""
 "Warning: we have yet to see a message signed using this key and user id!\n"
 msgstr ""
 
-#: g10/tofu.c:3218
+#: g10/tofu.c:3222
 #, c-format
 msgid ""
 "Warning: we've only seen one message signed using this key and user id!\n"
 msgstr ""
 
-#: g10/tofu.c:3222
+#: g10/tofu.c:3226
 #, c-format
 msgid "Warning: you have yet to encrypt a message to this key!\n"
 msgstr ""
 
-#: g10/tofu.c:3225
+#: g10/tofu.c:3229
 #, c-format
 msgid "Warning: you have only encrypted one message to this key!\n"
 msgstr ""
 
-#: g10/tofu.c:3254
+#: g10/tofu.c:3258
 #, c-format
 msgid ""
 "Warning: if you think you've seen more signatures by this key and user id, "
@@ -8057,13 +8070,13 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:3339 g10/tofu.c:3502 g10/tofu.c:3708 g10/tofu.c:3761
-#: g10/tofu.c:3902 g10/tofu.c:3979 g10/tofu.c:4017
+#: g10/tofu.c:3343 g10/tofu.c:3506 g10/tofu.c:3712 g10/tofu.c:3765
+#: g10/tofu.c:3906 g10/tofu.c:3983 g10/tofu.c:4021
 #, fuzzy, c-format
 msgid "error opening TOFU database: %s\n"
 msgstr "chyba pri posielaní na `%s': %s\n"
 
-#: g10/tofu.c:3535
+#: g10/tofu.c:3539
 #, c-format
 msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
 msgstr ""
@@ -8130,7 +8143,7 @@ msgstr ""
 msgid "no need for a trustdb check\n"
 msgstr "nie je nutné kontrolovať databázu dôvery\n"
 
-#: g10/trustdb.c:601 g10/trustdb.c:2272
+#: g10/trustdb.c:601 g10/trustdb.c:2273
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "dalšia kontrola databázy dôvery %s\n"
@@ -8160,14 +8173,14 @@ msgstr "prosím vykonajte --check-trustdb\n"
 msgid "checking the trustdb\n"
 msgstr "kontrolujem databázu dôvery\n"
 
-#: g10/trustdb.c:1993
+#: g10/trustdb.c:1994
 #, fuzzy, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr[0] "%lu kľú�e boli doteraz spracované\n"
 msgstr[1] "%lu kľú�e boli doteraz spracované\n"
 
-#: g10/trustdb.c:1996
+#: g10/trustdb.c:1997
 #, fuzzy, c-format
 #| msgid "%d keys processed (%d validity counts cleared)\n"
 msgid " (%d validity count cleared)\n"
@@ -8175,45 +8188,45 @@ msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] "%d kľú�ov spracovaných (%d po�tov platnosti vymazaných)\n"
 msgstr[1] "%d kľú�ov spracovaných (%d po�tov platnosti vymazaných)\n"
 
-#: g10/trustdb.c:2066
+#: g10/trustdb.c:2067
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "neboli nájdené žiadne absolútne dôveryhodné kľú�e\n"
 
-#: g10/trustdb.c:2080
+#: g10/trustdb.c:2081
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "verejný kľú� k absolútne dôveryhodnému kľú�u  %08lX nebol nájdený\n"
 
-#: g10/trustdb.c:2198
+#: g10/trustdb.c:2199
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2279
+#: g10/trustdb.c:2280
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "záznam dôvery %lu, typ %d: zápis zlyhal: %s\n"
 
-#: g10/trust.c:125
+#: g10/trust.c:114
 msgid "undefined"
 msgstr ""
 
-#: g10/trust.c:126
+#: g10/trust.c:115
 #, fuzzy
 msgid "never"
 msgstr "nikdy     "
 
-#: g10/trust.c:127
+#: g10/trust.c:116
 msgid "marginal"
 msgstr ""
 
-#: g10/trust.c:128
+#: g10/trust.c:117
 msgid "full"
 msgstr ""
 
-#: g10/trust.c:129
+#: g10/trust.c:118
 msgid "ultimate"
 msgstr ""
 
@@ -8225,43 +8238,43 @@ msgstr ""
 #. It gets passed to atoi() so everything after the number is
 #. essentially a comment and need not be translated.  Either key and
 #. uid are both NULL, or neither are NULL.
-#: g10/trust.c:166
+#: g10/trust.c:155
 msgid "10 translator see trust.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trust.c:169
+#: g10/trust.c:158
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[revokované]"
 
-#: g10/trust.c:171 g10/trust.c:177
+#: g10/trust.c:160 g10/trust.c:166
 #, fuzzy
 msgid "[ expired]"
 msgstr "[expirované]"
 
-#: g10/trust.c:176
+#: g10/trust.c:165
 #, fuzzy
 msgid "[ unknown]"
 msgstr "neznáme"
 
-#: g10/trust.c:178
+#: g10/trust.c:167
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trust.c:179
+#: g10/trust.c:168
 #, fuzzy
 msgid "[  never ]"
 msgstr "nikdy     "
 
-#: g10/trust.c:180
+#: g10/trust.c:169
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trust.c:181
+#: g10/trust.c:170
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trust.c:182
+#: g10/trust.c:171
 msgid "[ultimate]"
 msgstr ""
 
@@ -8320,16 +8333,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:4937 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2386
+#: scd/app-piv.c:1770 scd/app-p15.c:5035 scd/app-nks.c:1530
+#: scd/app-openpgp.c:2387
 #, 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:4956 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2402
+#: scd/app-piv.c:1787 scd/app-p15.c:5054 scd/app-nks.c:1549
+#: scd/app-openpgp.c:2403
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
@@ -8364,10 +8377,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:2669
-#: scd/app-openpgp.c:2693 scd/app-openpgp.c:2871 scd/app-openpgp.c:2893
-#: scd/app-openpgp.c:3074 scd/app-openpgp.c:3361 scd/app-openpgp.c:3408
-#: scd/app-openpgp.c:3545 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2670
+#: scd/app-openpgp.c:2694 scd/app-openpgp.c:2872 scd/app-openpgp.c:2894
+#: scd/app-openpgp.c:3075 scd/app-openpgp.c:3362 scd/app-openpgp.c:3409
+#: scd/app-openpgp.c:3547 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -8387,96 +8400,96 @@ msgstr ""
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr ""
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3616
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3618
 #, fuzzy, c-format
 msgid "key already exists\n"
 msgstr "`%s' je už skomprimovaný\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3620
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3622
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3622
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3624
 #, fuzzy, c-format
 msgid "generating new key\n"
 msgstr "vytvoriť nový pár kľú�ov"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3624
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3626
 #, fuzzy, c-format
 msgid "writing new key\n"
 msgstr "vytvoriť nový pár kľú�ov"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4484 scd/app-openpgp.c:4767
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4486 scd/app-openpgp.c:4761
 #, 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:1615
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1616
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1622
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1623
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1732
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1733
 #, 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:4943
+#: scd/app-piv.c:3279 scd/app-openpgp.c:4937
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4951
+#: scd/app-piv.c:3294 scd/app-openpgp.c:4945
 #, 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:4957
+#: scd/app-piv.c:3300 scd/app-openpgp.c:4951
 #, 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:1842 scd/app-openpgp.c:4966
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1843 scd/app-openpgp.c:4960
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-p15.c:5035 scd/app-nks.c:2038
+#: scd/app-p15.c:5133 scd/app-nks.c:2038
 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:5038 scd/app-openpgp.c:2818
+#: scd/app-p15.c:5136 scd/app-openpgp.c:2819
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "zmeniť heslo"
 
-#: scd/app-p15.c:5040 scd/app-nks.c:2028
+#: scd/app-p15.c:5138 scd/app-nks.c:2028
 #, 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:5043 scd/app-nks.c:2019
+#: scd/app-p15.c:5141 scd/app-nks.c:2019
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "zmeniť heslo"
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4321
+#: scd/app-nks.c:1468 scd/app-openpgp.c:4323
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1476 scd/app-openpgp.c:4333
+#: scd/app-nks.c:1476 scd/app-openpgp.c:4335
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
@@ -8518,27 +8531,27 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3442 scd/app-dinsig.c:534
+#: scd/app-nks.c:2221 scd/app-openpgp.c:3443 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:943
+#: scd/app-openpgp.c:944
 #, 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:956
+#: scd/app-openpgp.c:957
 #, 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:1427 scd/app-openpgp.c:3389 scd/app-openpgp.c:5715
+#: scd/app-openpgp.c:1428 scd/app-openpgp.c:3390 scd/app-openpgp.c:5709
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1949
+#: scd/app-openpgp.c:1950
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "zmazanie bloku kľú�a sa nepodarilo:  %s\n"
@@ -8546,43 +8559,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:2373
+#: scd/app-openpgp.c:2374
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2621
+#: scd/app-openpgp.c:2622
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2628
+#: scd/app-openpgp.c:2629
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2641
+#: scd/app-openpgp.c:2642
 #, fuzzy
 msgid "||Please unlock the card"
 msgstr "zmeniť heslo"
 
-#: scd/app-openpgp.c:2700 scd/app-openpgp.c:2900 scd/app-openpgp.c:3368
+#: scd/app-openpgp.c:2701 scd/app-openpgp.c:2901 scd/app-openpgp.c:3369
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2717 scd/app-openpgp.c:2760 scd/app-openpgp.c:2917
-#: scd/app-openpgp.c:5325
+#: scd/app-openpgp.c:2718 scd/app-openpgp.c:2761 scd/app-openpgp.c:2918
+#: scd/app-openpgp.c:5319
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "nepodarilo poslať kľú� na server: %s\n"
 
-#: scd/app-openpgp.c:2804 scd/app-openpgp.c:5724
+#: scd/app-openpgp.c:2805 scd/app-openpgp.c:5718
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2808
+#: scd/app-openpgp.c:2809
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8590,22 +8603,22 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: scd/app-openpgp.c:2841
+#: scd/app-openpgp.c:2842
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3355
+#: scd/app-openpgp.c:3356
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "zmeniť heslo"
 
-#: scd/app-openpgp.c:3404
+#: scd/app-openpgp.c:3405
 #, 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:3414 scd/app-openpgp.c:3481
+#: scd/app-openpgp.c:3415 scd/app-openpgp.c:3484
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
@@ -8613,81 +8626,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:3437
+#: scd/app-openpgp.c:3438
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3439
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3439
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3541
+#: scd/app-openpgp.c:3543
 #, fuzzy
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "zmeniť heslo"
 
-#: scd/app-openpgp.c:3542
+#: scd/app-openpgp.c:3544
 #, fuzzy
 msgid "||Please enter the PIN and New PIN"
 msgstr "zmeniť heslo"
 
-#: scd/app-openpgp.c:3600 scd/app-openpgp.c:5026
+#: scd/app-openpgp.c:3602 scd/app-openpgp.c:5020
 #, fuzzy, c-format
 msgid "error reading application data\n"
 msgstr "chyba pri �ítaní bloku kľú�a: %s\n"
 
-#: scd/app-openpgp.c:3606 scd/app-openpgp.c:5033
+#: scd/app-openpgp.c:3608 scd/app-openpgp.c:5027
 #, 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:4302 scd/app-openpgp.c:4657
+#: scd/app-openpgp.c:4304 scd/app-openpgp.c:4653
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4343 scd/app-openpgp.c:4351
+#: scd/app-openpgp.c:4345 scd/app-openpgp.c:4353
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4651
+#: scd/app-openpgp.c:4647
 #, fuzzy, c-format
 #| msgid "unsupported URI"
 msgid "unsupported curve\n"
 msgstr "toto URI nie je podporované"
 
-#: scd/app-openpgp.c:4991
+#: scd/app-openpgp.c:4985
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5041
+#: scd/app-openpgp.c:5035
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5240
+#: scd/app-openpgp.c:5234
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s podpis, hashovací algoritmus %s\n"
 
-#: scd/app-openpgp.c:5298
+#: scd/app-openpgp.c:5292
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5729
+#: scd/app-openpgp.c:5723
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:6241 scd/app-openpgp.c:6252
+#: scd/app-openpgp.c:6250 scd/app-openpgp.c:6261
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nenájdené žiadne platné dáta vo formáte OpenPGP.\n"
@@ -8708,7 +8721,7 @@ msgstr ""
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:274 dirmngr/dirmngr.c:198
+#: scd/scdaemon.c:136 sm/gpgsm.c:274 dirmngr/dirmngr.c:199
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
@@ -8773,12 +8786,12 @@ msgstr ""
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2104
+#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2143
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2112
+#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2151
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -8788,11 +8801,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:199 sm/certchain.c:2172
+#: sm/certchain.c:199 sm/certchain.c:2174
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:200 sm/certchain.c:2172
+#: sm/certchain.c:200 sm/certchain.c:2174
 #, fuzzy
 msgid "shell"
 msgstr "help"
@@ -8826,231 +8839,231 @@ msgstr "zapisujem tajný kľú� do `%s'\n"
 msgid "certificate policy not allowed"
 msgstr "zapisujem tajný kľú� do `%s'\n"
 
-#: sm/certchain.c:595 sm/keydb.c:1891 sm/keydb.c:1980
+#: sm/certchain.c:596 sm/keydb.c:1913 sm/keydb.c:2002
 #, fuzzy, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "nemôžem inicializovať databázu dôvery: %s\n"
 
-#: sm/certchain.c:624
+#: sm/certchain.c:625
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:644
+#: sm/certchain.c:645
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#: sm/certchain.c:724 dirmngr/ocsp.c:683
 #, fuzzy, c-format
 #| msgid "%s: can't access: %s\n"
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "%s: nemôžem pristupovať k: %s\n"
 
-#: sm/certchain.c:791
+#: sm/certchain.c:792
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr ""
 
-#: sm/certchain.c:816
+#: sm/certchain.c:817
 #, fuzzy, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: sm/certchain.c:819
+#: sm/certchain.c:820
 #, fuzzy, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "zmazanie bloku kľú�a sa nepodarilo:  %s\n"
 
-#: sm/certchain.c:1046 sm/certchain.c:1561 sm/certchain.c:2200 sm/decrypt.c:643
-#: sm/encrypt.c:620 sm/import.c:414 sm/keydb.c:1898 sm/keydb.c:1987
-#: sm/sign.c:428 sm/verify.c:117
+#: sm/certchain.c:1047 sm/certchain.c:1562 sm/certchain.c:2202
+#: sm/decrypt.c:1084 sm/encrypt.c:621 sm/import.c:414 sm/keydb.c:1920
+#: sm/keydb.c:2009 sm/sign.c:428 sm/verify.c:117
 #, fuzzy, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "nemôžem inicializovať databázu dôvery: %s\n"
 
-#: sm/certchain.c:1232
+#: sm/certchain.c:1233
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "POZN�MKA: kľú� bol revokovaný"
 
-#: sm/certchain.c:1247
+#: sm/certchain.c:1248
 msgid "the status of the certificate is unknown"
 msgstr ""
 
-#: sm/certchain.c:1254
+#: sm/certchain.c:1255
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:1260
+#: sm/certchain.c:1261
 #, fuzzy, c-format
 msgid "checking the CRL failed: %s"
 msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
 
-#: sm/certchain.c:1289 sm/certchain.c:1357 dirmngr/validate.c:497
+#: sm/certchain.c:1290 sm/certchain.c:1358 dirmngr/validate.c:497
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:1304 sm/certchain.c:1389 dirmngr/validate.c:515
+#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:515
 #, c-format
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1305 sm/certchain.c:1390
+#: sm/certchain.c:1306 sm/certchain.c:1391
 #, fuzzy
 msgid "root certificate not yet valid"
 msgstr "zapisujem tajný kľú� do `%s'\n"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1307 sm/certchain.c:1392
 msgid "intermediate certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1319 dirmngr/validate.c:526
+#: sm/certchain.c:1320 dirmngr/validate.c:526
 #, fuzzy, c-format
 msgid "certificate has expired"
 msgstr "Platnosť kľú�a vypršala!"
 
-#: sm/certchain.c:1320
+#: sm/certchain.c:1321
 #, fuzzy
 msgid "root certificate has expired"
 msgstr "Platnosť kľú�a vypršala!"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1322
 #, fuzzy
 msgid "intermediate certificate has expired"
 msgstr "Platnosť kľú�a vypršala!"
 
-#: sm/certchain.c:1363
+#: sm/certchain.c:1364
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:1372
+#: sm/certchain.c:1373
 #, fuzzy
 msgid "certificate with invalid validity"
 msgstr "Platnosť kľú�a vypršala!"
 
-#: sm/certchain.c:1409
+#: sm/certchain.c:1410
 msgid "signature not created during lifetime of certificate"
 msgstr ""
 
-#: sm/certchain.c:1411
+#: sm/certchain.c:1412
 msgid "certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1413
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1416
+#: sm/certchain.c:1417
 #, fuzzy, c-format
 msgid "  (  signature created at "
 msgstr "               nové podpisy: %lu\n"
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1418
 #, fuzzy, c-format
 msgid "  (certificate created at "
 msgstr "Revoka�ný certifikát bol vytvorený.\n"
 
-#: sm/certchain.c:1420
+#: sm/certchain.c:1421
 #, fuzzy, c-format
 msgid "  (certificate valid from "
 msgstr "nesprávny certifikát"
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1422
 #, c-format
 msgid "  (     issuer valid from "
 msgstr ""
 
-#: sm/certchain.c:1451 dirmngr/validate.c:577
+#: sm/certchain.c:1452 dirmngr/validate.c:577
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "vypísať fingerprint"
 
-#: sm/certchain.c:1460
+#: sm/certchain.c:1461
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:1473
+#: sm/certchain.c:1474
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1479
+#: sm/certchain.c:1480
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1538
+#: sm/certchain.c:1539
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 
-#: sm/certchain.c:1602
+#: sm/certchain.c:1603
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "vytvoriť revoka�ný certifikát"
 
-#: sm/certchain.c:1680
+#: sm/certchain.c:1681
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1749 dirmngr/validate.c:575
+#: sm/certchain.c:1750 dirmngr/validate.c:575
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:1765
+#: sm/certchain.c:1766
 #, fuzzy, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
 
-#: sm/certchain.c:1796 sm/import.c:175 dirmngr/validate.c:630
+#: sm/certchain.c:1797 sm/import.c:175 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1808 dirmngr/validate.c:642
+#: sm/certchain.c:1809 dirmngr/validate.c:642
 #, c-format
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1842 dirmngr/validate.c:668
+#: sm/certchain.c:1844 dirmngr/validate.c:668
 #, fuzzy, c-format
 msgid "certificate has a BAD signature"
 msgstr "verifikovať podpis"
 
-#: sm/certchain.c:1874 dirmngr/validate.c:692
+#: sm/certchain.c:1876 dirmngr/validate.c:692
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1933 dirmngr/validate.c:717
+#: sm/certchain.c:1935 dirmngr/validate.c:717
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr ""
 
-#: sm/certchain.c:1975 sm/certchain.c:2275 dirmngr/validate.c:747
+#: sm/certchain.c:1977 sm/certchain.c:2278 dirmngr/validate.c:747
 #, fuzzy, c-format
 msgid "certificate is good\n"
 msgstr "duplicita predvoľby %c%lu\n"
 
-#: sm/certchain.c:1976
+#: sm/certchain.c:1978
 #, fuzzy, c-format
 msgid "intermediate certificate is good\n"
 msgstr "Revoka�ný certifikát bol vytvorený.\n"
 
-#: sm/certchain.c:1977
+#: sm/certchain.c:1979
 #, fuzzy, c-format
 msgid "root certificate is good\n"
 msgstr "nesprávny certifikát"
 
-#: sm/certchain.c:2159
+#: sm/certchain.c:2161
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:2168
+#: sm/certchain.c:2170
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -9061,18 +9074,18 @@ 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:1372 dirmngr/validate.c:903
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1411 dirmngr/validate.c:903
 #: dirmngr/validate.c:927
 #, fuzzy, c-format
 msgid "out of core\n"
 msgstr "nespracované"
 
-#: sm/certcheck.c:389 sm/verify.c:212
+#: sm/certcheck.c:388 sm/verify.c:212
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:793
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:794
 #, fuzzy
 msgid "none"
 msgstr "nie"
@@ -9369,19 +9382,19 @@ msgstr ""
 msgid "resource problem: out of core\n"
 msgstr ""
 
-#: sm/decrypt.c:719
+#: sm/decrypt.c:1159
 #, c-format
 msgid "(this is the RC2 algorithm)\n"
 msgstr ""
 
-#: sm/decrypt.c:721
+#: sm/decrypt.c:1161
 #, c-format
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr ""
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
 # [kw]
-#: sm/decrypt.c:868
+#: sm/decrypt.c:1318
 #, fuzzy, c-format
 msgid "encrypted to %s key %s\n"
 msgstr "zašifrovaná %s kľú�om, ID %08lX\n"
@@ -9391,7 +9404,7 @@ msgstr "zašifrovaná %s kľú�om, ID %08lX\n"
 msgid "certificate '%s' not found: %s\n"
 msgstr "kľú� `%s' nebol nájdený: %s\n"
 
-#: sm/delete.c:120 sm/keydb.c:1999 sm/keydb.c:2098
+#: sm/delete.c:120 sm/keydb.c:2021 sm/keydb.c:2120
 #, fuzzy, c-format
 msgid "error locking keybox: %s\n"
 msgstr "chyba pri �ítaní bloku kľú�a: %s\n"
@@ -9411,7 +9424,7 @@ msgstr "duplicita predvoľby %c%lu\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "zmazanie bloku kľú�a sa nepodarilo:  %s\n"
 
-#: sm/encrypt.c:606
+#: sm/encrypt.c:607
 #, fuzzy, c-format
 msgid "no valid recipients given\n"
 msgstr "(Žiadny popis)\n"
@@ -9489,70 +9502,70 @@ msgstr ""
 "pridať tento súbor kľú�ov do zoznamu\n"
 " používaných súborov kľú�ov"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:352 dirmngr/dirmngr.c:265
 #, fuzzy
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr ""
 "|POČ�TAČ|použi tento server kľú�ov na vyhľadávanie\n"
 " kľú�ov"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:363
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:364
+#: sm/gpgsm.c:365
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|ALG|použiť šifrovací algoritmus ALG pre heslá"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:386
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:389
+#: sm/gpgsm.c:390
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: sm/gpgsm.c:393
+#: sm/gpgsm.c:394
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:396
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:398
+#: sm/gpgsm.c:399
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|ALG|použiť šifrovací algoritmus ALG"
 
-#: sm/gpgsm.c:400
+#: sm/gpgsm.c:401
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|ALG|použiť hashovací algoritmus ALG"
 
-#: sm/gpgsm.c:410
+#: sm/gpgsm.c:411
 msgid "batch mode: never ask"
 msgstr "dávkový režim: nikdy sa na ni� nepýtať"
 
-#: sm/gpgsm.c:412
+#: sm/gpgsm.c:413
 msgid "assume yes on most questions"
 msgstr "automaticky odpovedať áno na vä�šinu otázok"
 
-#: sm/gpgsm.c:413
+#: sm/gpgsm.c:414
 msgid "assume no on most questions"
 msgstr "automaticky odpovedať NIE na vä�šinu otázok"
 
-#: sm/gpgsm.c:430
+#: sm/gpgsm.c:431
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|SÚBOR|nahrať rozširujúci modul SÚBOR"
 
-#: sm/gpgsm.c:615
+#: sm/gpgsm.c:616
 #, 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:618
+#: sm/gpgsm.c:619
 #, fuzzy
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
@@ -9563,52 +9576,27 @@ msgstr ""
 "podpísať, overiť, šifrovať alebo dešifrovať\n"
 "implicitné operácie závisia od vstupných dát\n"
 
-#: sm/gpgsm.c:826
+#: sm/gpgsm.c:827
 #, 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:837
+#: sm/gpgsm.c:838
 #, fuzzy, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "neznámy implicitný adresát `%s'\n"
 
-#: sm/gpgsm.c:896 dirmngr/ldapserver.c:89
-#, fuzzy, c-format
-msgid "%s:%u: no hostname given\n"
-msgstr "(Žiadny popis)\n"
-
-#: sm/gpgsm.c:915 dirmngr/ldapserver.c:108
-#, c-format
-msgid "%s:%u: password given without user\n"
-msgstr ""
-
-#: sm/gpgsm.c:946 dirmngr/ldapserver.c:139
-#, c-format
-msgid "%s:%u: ignoring unknown flag '%s'\n"
-msgstr ""
-
-#: sm/gpgsm.c:962 dirmngr/ldapserver.c:155
-#, fuzzy, c-format
-msgid "%s:%u: skipping this line\n"
-msgstr " s = presko�iť tento kľú�\n"
-
-#: sm/gpgsm.c:1550
-#, fuzzy, c-format
-msgid "could not parse keyserver\n"
-msgstr "nemožno použiť URI servera kľú�ov - chyba analýzy URI\n"
-
-#: sm/gpgsm.c:1858
+#: sm/gpgsm.c:1711
 #, fuzzy, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "zapisujem do '%s'\n"
 
-#: sm/gpgsm.c:1904
+#: sm/gpgsm.c:1757
 #, fuzzy, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "nemôžem zavrieť `%s': %s\n"
 
-#: sm/gpgsm.c:2273
+#: sm/gpgsm.c:2129
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
@@ -9628,52 +9616,52 @@ msgstr "vytvoriť revoka�ný certifikát"
 msgid "basic certificate checks failed - not imported\n"
 msgstr ""
 
-#: sm/import.c:471 sm/keydb.c:2018 sm/keydb.c:2111
+#: sm/import.c:472 sm/keydb.c:2040 sm/keydb.c:2133
 #, fuzzy, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: sm/import.c:530 sm/import.c:562
+#: sm/import.c:531 sm/import.c:563
 #, fuzzy, c-format
 msgid "error importing certificate: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: sm/import.c:751 tools/gpg-connect-agent.c:1475
+#: sm/import.c:752 tools/gpg-connect-agent.c:1475
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "chyba pri �ítaní `%s': %s\n"
 
-#: sm/keydb.c:503
+#: sm/keydb.c:508
 #, fuzzy, c-format
 msgid "no keyboxd running in this session\n"
 msgstr "gpg-agent nie je v tomto sedení dostupný\n"
 
-#: sm/keydb.c:595
+#: sm/keydb.c:600
 #, fuzzy, c-format
 msgid "error opening key DB: %s\n"
 msgstr "chyba pri �ítaní `%s': %s\n"
 
-#: sm/keydb.c:1936
+#: sm/keydb.c:1958
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr ""
 
-#: sm/keydb.c:1948
+#: sm/keydb.c:1970
 #, fuzzy, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: sm/keydb.c:1956
+#: sm/keydb.c:1978
 #, fuzzy, c-format
 msgid "error storing certificate: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: sm/keydb.c:2009
+#: sm/keydb.c:2031
 #, fuzzy, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "rev? problém overenia revokácie: %s\n"
 
-#: sm/keydb.c:2030 sm/keydb.c:2122
+#: sm/keydb.c:2052 sm/keydb.c:2144
 #, fuzzy, c-format
 msgid "error storing flags: %s\n"
 msgstr "chyba pri �ítaní `%s': %s\n"
@@ -9846,57 +9834,57 @@ msgstr ""
 msgid "error loading certificate '%s': %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: dirmngr/certcache.c:819
+#: dirmngr/certcache.c:820
 #, fuzzy, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "nesprávny certifikát"
 
-#: dirmngr/certcache.c:821
+#: dirmngr/certcache.c:822
 #, fuzzy, c-format
 msgid "    runtime cached certificates: %u\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: dirmngr/certcache.c:823
+#: dirmngr/certcache.c:824
 #, fuzzy, c-format
 msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: dirmngr/certcache.c:851 dirmngr/dirmngr-client.c:392
+#: dirmngr/certcache.c:852 dirmngr/dirmngr-client.c:392
 #, fuzzy, c-format
 msgid "certificate already cached\n"
 msgstr "Revoka�ný certifikát bol vytvorený.\n"
 
-#: dirmngr/certcache.c:853
+#: dirmngr/certcache.c:854
 #, fuzzy, c-format
 msgid "certificate cached\n"
 msgstr "duplicita predvoľby %c%lu\n"
 
-#: dirmngr/certcache.c:855 dirmngr/certcache.c:875 dirmngr/dirmngr-client.c:396
+#: dirmngr/certcache.c:856 dirmngr/certcache.c:876 dirmngr/dirmngr-client.c:396
 #, fuzzy, c-format
 msgid "error caching certificate: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: dirmngr/certcache.c:938
+#: dirmngr/certcache.c:939
 #, fuzzy, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "chyba: neplatný odtla�ok\n"
 
-#: dirmngr/certcache.c:1384 dirmngr/certcache.c:1393
+#: dirmngr/certcache.c:1385 dirmngr/certcache.c:1394
 #, fuzzy, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: dirmngr/certcache.c:1579 dirmngr/certcache.c:1588
+#: dirmngr/certcache.c:1580 dirmngr/certcache.c:1589
 #, fuzzy, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: dirmngr/certcache.c:1694 dirmngr/validate.c:483
+#: dirmngr/certcache.c:1695 dirmngr/validate.c:483
 #, fuzzy, c-format
 msgid "no issuer found in certificate\n"
 msgstr "vytvoriť revoka�ný certifikát"
 
-#: dirmngr/certcache.c:1704
+#: dirmngr/certcache.c:1705
 #, fuzzy, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
@@ -9933,7 +9921,7 @@ msgstr "zmazanie bloku kľú�a sa nepodarilo:  %s\n"
 msgid "not removing file '%s'\n"
 msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
 
-#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2380
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2383
 #, fuzzy, c-format
 msgid "error closing cache file: %s\n"
 msgstr "chyba pri �ítaní `%s': %s\n"
@@ -10166,14 +10154,14 @@ msgid "error getting data from cache file: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
 #: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1672 dirmngr/crlcache.c:1697
-#: dirmngr/crlcache.c:1763
+#: dirmngr/crlcache.c:1766
 #, fuzzy, c-format
 #| msgid "invalid response from agent\n"
 msgid "got an invalid S-expression from libksba\n"
 msgstr "neplatná reakcia od agenta\n"
 
 #: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1679 dirmngr/crlcache.c:1705
-#: dirmngr/crlcache.c:1770 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1773 dirmngr/misc.c:176
 #, fuzzy, c-format
 msgid "converting S-expression failed: %s\n"
 msgstr "nemožno otvoriť súbor: %s\n"
@@ -10189,201 +10177,201 @@ msgstr "neplatný hashovací algoritmus `%s'\n"
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1797 dirmngr/ocsp.c:478
+#: dirmngr/crlcache.c:1800 dirmngr/ocsp.c:478
 #, fuzzy, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "zmazanie bloku kľú�a sa nepodarilo:  %s\n"
 
-#: dirmngr/crlcache.c:1871
+#: dirmngr/crlcache.c:1874
 #, fuzzy, c-format
 #| msgid "build_packet failed: %s\n"
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "build_packet zlyhala: %s\n"
 
-#: dirmngr/crlcache.c:1886
+#: dirmngr/crlcache.c:1889
 #, fuzzy, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: dirmngr/crlcache.c:1893
+#: dirmngr/crlcache.c:1896
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1897
+#: dirmngr/crlcache.c:1900
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1917
+#: dirmngr/crlcache.c:1920
 #, fuzzy, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: dirmngr/crlcache.c:1932
+#: dirmngr/crlcache.c:1935
 #, fuzzy, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "zapisujem do '%s'\n"
 
-#: dirmngr/crlcache.c:1959
+#: dirmngr/crlcache.c:1962
 #, fuzzy, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "vytvoriť revoka�ný certifikát"
 
-#: dirmngr/crlcache.c:1974
+#: dirmngr/crlcache.c:1977
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2020
+#: dirmngr/crlcache.c:2023
 #, fuzzy, c-format
 #| msgid "signature verification suppressed\n"
 msgid "CRL signature verification failed: %s\n"
 msgstr "verifikácia podpisu potla�ená\n"
 
-#: dirmngr/crlcache.c:2032
+#: dirmngr/crlcache.c:2035
 #, fuzzy, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
 
-#: dirmngr/crlcache.c:2174
+#: dirmngr/crlcache.c:2177
 #, fuzzy, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "zmazanie bloku kľú�a sa nepodarilo:  %s\n"
 
-#: dirmngr/crlcache.c:2181
+#: dirmngr/crlcache.c:2184
 #, fuzzy, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "aktualizácia zlyhala: %s\n"
 
-#: dirmngr/crlcache.c:2215
+#: dirmngr/crlcache.c:2218
 #, fuzzy, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "nemôžem vytvoriť adresár `%s': %s\n"
 
-#: dirmngr/crlcache.c:2219
+#: dirmngr/crlcache.c:2222
 #, fuzzy, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "nemôžem vytvoriť adresár `%s': %s\n"
 
-#: dirmngr/crlcache.c:2229
+#: dirmngr/crlcache.c:2232
 #, fuzzy, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: dirmngr/crlcache.c:2239
+#: dirmngr/crlcache.c:2242
 #, fuzzy, c-format
 #| msgid "update secret failed: %s\n"
 msgid "crl_parse_insert failed: %s\n"
 msgstr "aktualizácia tajného kľú�a zlyhala: %s\n"
 
-#: dirmngr/crlcache.c:2249
+#: dirmngr/crlcache.c:2252
 #, fuzzy, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "zapisujem do '%s'\n"
 
-#: dirmngr/crlcache.c:2256
+#: dirmngr/crlcache.c:2259
 #, fuzzy, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: dirmngr/crlcache.c:2281
+#: dirmngr/crlcache.c:2284
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2285
+#: dirmngr/crlcache.c:2288
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2301
+#: dirmngr/crlcache.c:2304
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2311
+#: dirmngr/crlcache.c:2314
 #, fuzzy, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "chyba pri �ítaní `%s': %s\n"
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2365
 #, fuzzy, c-format
 msgid "creating cache file '%s'\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: dirmngr/crlcache.c:2394
+#: dirmngr/crlcache.c:2397
 #, fuzzy, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
 
-#: dirmngr/crlcache.c:2408
+#: dirmngr/crlcache.c:2411
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
 "program start\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2448
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2468
+#: dirmngr/crlcache.c:2471
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2471
+#: dirmngr/crlcache.c:2474
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2474
+#: dirmngr/crlcache.c:2477
 msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2481
+#: dirmngr/crlcache.c:2484
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2499
+#: dirmngr/crlcache.c:2502
 #, fuzzy, c-format
 #| msgid "WARNING: invalid size of random_seed file - not used\n"
 msgid " WARNING: invalid cache record length\n"
 msgstr "varovanie: neplatná veľkosť random_seed - súbor nepoužitý\n"
 
-#: dirmngr/crlcache.c:2506
+#: dirmngr/crlcache.c:2509
 #, fuzzy, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "%s: chyba pri �ítaní voľného záznamu: %s\n"
 
-#: dirmngr/crlcache.c:2517
+#: dirmngr/crlcache.c:2520
 #, fuzzy, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "rev? problém overenia revokácie: %s\n"
 
-#: dirmngr/crlcache.c:2548
+#: dirmngr/crlcache.c:2551
 #, fuzzy, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "chyba pri �ítaní `%s': %s\n"
 
-#: dirmngr/crlcache.c:2551
+#: dirmngr/crlcache.c:2554
 msgid "End CRL dump\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2672
+#: dirmngr/crlcache.c:2675
 #, fuzzy, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "aktualizácia zlyhala: %s\n"
 
-#: dirmngr/crlcache.c:2683
+#: dirmngr/crlcache.c:2686
 #, fuzzy, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
 
-#: dirmngr/crlcache.c:2743
+#: dirmngr/crlcache.c:2746
 #, fuzzy, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "zmazanie bloku kľú�a sa nepodarilo:  %s\n"
@@ -10404,7 +10392,7 @@ msgstr ""
 msgid "error retrieving '%s': %s\n"
 msgstr "chyba pri vytváraní `%s': %s\n"
 
-#: dirmngr/crlfetch.c:218 dirmngr/ldap-wrapper.c:881 dirmngr/misc.c:573
+#: dirmngr/crlfetch.c:218 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
 #, fuzzy, c-format
 #| msgid "%s: error writing dir record: %s\n"
 msgid "error initializing reader object: %s\n"
@@ -10572,135 +10560,135 @@ msgstr ""
 msgid "looking up '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:175
+#: dirmngr/dirmngr.c:176
 msgid "list the contents of the CRL cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:176
+#: dirmngr/dirmngr.c:177
 #, fuzzy
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|SÚBOR|nahrať rozširujúci modul SÚBOR"
 
-#: dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr.c:178
 msgid "|URL|fetch a CRL from URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:178
+#: dirmngr/dirmngr.c:179
 msgid "shutdown the dirmngr"
 msgstr ""
 
-#: dirmngr/dirmngr.c:179
+#: dirmngr/dirmngr.c:180
 msgid "flush the cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:213
 msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:215
+#: dirmngr/dirmngr.c:216
 msgid "|N|do not return more than N items in one query"
 msgstr ""
 
-#: dirmngr/dirmngr.c:221
+#: dirmngr/dirmngr.c:222
 msgid "Network related options"
 msgstr ""
 
-#: dirmngr/dirmngr.c:223
+#: dirmngr/dirmngr.c:224
 msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:235
+#: dirmngr/dirmngr.c:236
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:238
+#: dirmngr/dirmngr.c:239
 #, fuzzy
 msgid "|URL|use keyserver at URL"
 msgstr "nemožno použiť URI servera kľú�ov - chyba analýzy URI\n"
 
-#: dirmngr/dirmngr.c:240
+#: dirmngr/dirmngr.c:241
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-#: dirmngr/dirmngr.c:242
+#: dirmngr/dirmngr.c:243
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: dirmngr/dirmngr.c:244
+#: dirmngr/dirmngr.c:245
 msgid "inhibit the use of HTTP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:246
+#: dirmngr/dirmngr.c:247
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:248
+#: dirmngr/dirmngr.c:249
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:250
+#: dirmngr/dirmngr.c:251
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: dirmngr/dirmngr.c:254
+#: dirmngr/dirmngr.c:255
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: dirmngr/dirmngr.c:256
+#: dirmngr/dirmngr.c:257
 msgid "inhibit the use of LDAP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:258
+#: dirmngr/dirmngr.c:259
 msgid "ignore LDAP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:260
+#: dirmngr/dirmngr.c:261
 msgid "|HOST|use HOST for LDAP queries"
 msgstr ""
 
-#: dirmngr/dirmngr.c:262
+#: dirmngr/dirmngr.c:263
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr ""
 
-#: dirmngr/dirmngr.c:264
+#: dirmngr/dirmngr.c:267
 #, fuzzy
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|SÚBOR|nahrať rozširujúci modul SÚBOR"
 
-#: dirmngr/dirmngr.c:266
+#: dirmngr/dirmngr.c:269
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 
-#: dirmngr/dirmngr.c:269 dirmngr/dirmngr_ldap.c:104
+#: dirmngr/dirmngr.c:272
 msgid "|N|set LDAP timeout to N seconds"
 msgstr ""
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:275
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:274
+#: dirmngr/dirmngr.c:277
 msgid "allow sending OCSP requests"
 msgstr ""
 
-#: dirmngr/dirmngr.c:276
+#: dirmngr/dirmngr.c:279
 msgid "ignore certificate contained OCSP service URLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:278
+#: dirmngr/dirmngr.c:281
 #, fuzzy
 msgid "|URL|use OCSP responder at URL"
 msgstr "nemožno použiť URI servera kľú�ov - chyba analýzy URI\n"
 
-#: dirmngr/dirmngr.c:280
+#: dirmngr/dirmngr.c:283
 msgid "|FPR|OCSP response signed by FPR"
 msgstr ""
 
-#: dirmngr/dirmngr.c:288
+#: dirmngr/dirmngr.c:291
 msgid "force loading of outdated CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:299
+#: dirmngr/dirmngr.c:302
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -10714,304 +10702,115 @@ msgstr ""
 "(Použite manuálové stránky pre kompletný zoznam všetkých príkazov a "
 "možností)\n"
 
-#: dirmngr/dirmngr.c:441
+#: dirmngr/dirmngr.c:449
 #, fuzzy
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
 
-#: dirmngr/dirmngr.c:443
+#: dirmngr/dirmngr.c:451
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:523
+#: dirmngr/dirmngr.c:531
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:609 tools/gpgconf.c:667 tools/gpgconf.c:702
-#: tools/gpgconf.c:802
+#: dirmngr/dirmngr.c:617 tools/gpgconf.c:701 tools/gpgconf.c:736
+#: tools/gpgconf.c:836
 #, fuzzy, c-format
 msgid "usage: %s [options] "
 msgstr "použitie: gpg [možnosti] "
 
-#: dirmngr/dirmngr.c:1260
+#: dirmngr/dirmngr.c:1299
 #, 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:1495 dirmngr/server.c:1824
+#: dirmngr/dirmngr.c:1534 dirmngr/server.c:1878
 #, fuzzy, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
 
-#: dirmngr/dirmngr.c:1501 dirmngr/server.c:1830
+#: dirmngr/dirmngr.c:1540 dirmngr/server.c:1884
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
 
-#: dirmngr/dirmngr.c:1643
+#: dirmngr/dirmngr.c:1682
 #, fuzzy, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "riadok je príliš dlhý\n"
 
-#: dirmngr/dirmngr.c:1698 dirmngr/dirmngr.c:1782
+#: dirmngr/dirmngr.c:1737 dirmngr/dirmngr.c:1821
 #, fuzzy, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "chyba: neplatný odtla�ok\n"
 
-#: dirmngr/dirmngr.c:1734 dirmngr/dirmngr.c:1760 tools/gpgconf-comp.c:3539
+#: dirmngr/dirmngr.c:1773 dirmngr/dirmngr.c:1799 tools/gpgconf-comp.c:3549
 #, fuzzy, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "chyba pri �ítaní: %s\n"
 
-#: dirmngr/dirmngr.c:1789
+#: dirmngr/dirmngr.c:1828
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1876
+#: dirmngr/dirmngr.c:1915
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1917
+#: dirmngr/dirmngr.c:1956
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1922
+#: dirmngr/dirmngr.c:1961
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1924
+#: dirmngr/dirmngr.c:1963
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1929
+#: dirmngr/dirmngr.c:1968
 #, fuzzy, c-format
 msgid "shutdown forced\n"
 msgstr "nespracované"
 
-#: dirmngr/dirmngr.c:1937
+#: dirmngr/dirmngr.c:1976
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1944
+#: dirmngr/dirmngr.c:1983
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:105
-msgid "return all values in a record oriented format"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:108
-msgid "|NAME|ignore host part and connect through NAME"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:109
-msgid "force a TLS connection"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:110
-#, fuzzy
-#| msgid "|NAME|set terminal charset to NAME"
-msgid "|NAME|connect to host NAME"
-msgstr "|MENO|nastav znakovú sadu terminálu na MENO"
-
-#: dirmngr/dirmngr_ldap.c:111
-msgid "|N|connect to port N"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:112
-#, fuzzy
-#| msgid "|NAME|use NAME as default recipient"
-msgid "|NAME|use user NAME for authentication"
-msgstr "|MENO|použiť MENO ako implicitného adresáta"
-
-#: dirmngr/dirmngr_ldap.c:113
-msgid "|PASS|use password PASS for authentication"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:115
-msgid "take password from $DIRMNGR_LDAP_PASS"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:116
-msgid "|STRING|query DN STRING"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:117
-msgid "|STRING|use STRING as filter expression"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:118
-msgid "|STRING|return the attribute STRING"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:179
-#, fuzzy
-#| msgid "Usage: gpg [options] [files] (-h for help)"
-msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
-msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
-
-#: dirmngr/dirmngr_ldap.c:182
-msgid ""
-"Syntax: dirmngr_ldap [options] [URL]\n"
-"Internal LDAP helper for Dirmngr\n"
-"Interface and options may change without notice\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:291
-#, fuzzy, c-format
-#| msgid "invalid import options\n"
-msgid "invalid port number %d\n"
-msgstr "neplatný parameter pre import\n"
-
-#: dirmngr/dirmngr_ldap.c:400
-#, c-format
-msgid "scanning result for attribute '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:407 dirmngr/dirmngr_ldap.c:490
-#: dirmngr/dirmngr_ldap.c:514 dirmngr/dirmngr_ldap.c:526
-#: dirmngr/dirmngr_ldap.c:722
-#, fuzzy, c-format
-msgid "error writing to stdout: %s\n"
-msgstr "chyba pri zápise súboru kľú�ov (keyring)  `%s': %s\n"
-
-#: dirmngr/dirmngr_ldap.c:424
-#, c-format
-msgid "          available attribute '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:462
-#, fuzzy, c-format
-msgid "attribute '%s' not found\n"
-msgstr "kľú� `%s' nebol nájdený: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:469
-#, c-format
-msgid "found attribute '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:581
-#, fuzzy, c-format
-#| msgid "reading from `%s'\n"
-msgid "processing url '%s'\n"
-msgstr "�ítam z `%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:588
-#, fuzzy, c-format
-#| msgid "          w/o user IDs: %lu\n"
-msgid "          user '%s'\n"
-msgstr "        bez identifikátorov: %lu\n"
-
-#: dirmngr/dirmngr_ldap.c:590
-#, fuzzy, c-format
-msgid "          pass '%s'\n"
-msgstr "                alias \""
-
-#: dirmngr/dirmngr_ldap.c:592
-#, fuzzy, c-format
-msgid "          host '%s'\n"
-msgstr "                alias \""
-
-#: dirmngr/dirmngr_ldap.c:593
-#, fuzzy, c-format
-#| msgid "          not imported: %lu\n"
-msgid "          port %d\n"
-msgstr "           neimportované: %lu\n"
-
-#: dirmngr/dirmngr_ldap.c:595
-#, fuzzy, c-format
-msgid "            DN '%s'\n"
-msgstr "                alias \""
-
-#: dirmngr/dirmngr_ldap.c:597
-#, c-format
-msgid "        filter '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:602 dirmngr/dirmngr_ldap.c:605
-#, fuzzy, c-format
-msgid "          attr '%s'\n"
-msgstr "                alias \""
-
-#: dirmngr/dirmngr_ldap.c:611
-#, fuzzy, c-format
-msgid "no host name in '%s'\n"
-msgstr "(Žiadny popis)\n"
-
-#: dirmngr/dirmngr_ldap.c:616
-#, c-format
-msgid "no attribute given for query '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:622
-#, fuzzy, c-format
-#| msgid "WARNING: using insecure memory!\n"
-msgid "WARNING: using first attribute only\n"
-msgstr "VAROVANIE: Používaná pamäť nie je bezpe�ná!\n"
-
-#: dirmngr/dirmngr_ldap.c:637 dirmngr/dirmngr_ldap.c:678
-#, fuzzy, c-format
-msgid "LDAP init to '%s:%d' failed: %s\n"
-msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:659
-#, fuzzy, c-format
-msgid "LDAP init to '%s' failed: %s\n"
-msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:665
-#, fuzzy, c-format
-msgid "LDAP init to '%s' done\n"
-msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:704
-#, fuzzy, c-format
-msgid "binding to '%s:%d' failed: %s\n"
-msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:728
-#, fuzzy, c-format
-#| msgid "dearmoring failed: %s\n"
-msgid "searching '%s' failed: %s\n"
-msgstr "dekódovanie z ASCII formátu zlyhalo: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:759
-#, fuzzy, c-format
-msgid "'%s' is not an LDAP URL\n"
-msgstr "\"%s\" nie je súbor JPEG\n"
-
-#: dirmngr/dirmngr_ldap.c:765
-#, c-format
-msgid "'%s' is an invalid LDAP URL\n"
-msgstr ""
-
-#: dirmngr/http.c:1989 dirmngr/ocsp.c:255
+#: dirmngr/http.c:1998 dirmngr/ocsp.c:255
 #, fuzzy, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "chyba pri �ítaní `%s': %s\n"
 
-#: dirmngr/http.c:3630 dirmngr/ocsp.c:229
+#: dirmngr/http.c:3652 dirmngr/ocsp.c:229
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr ""
 
-#: dirmngr/http.c:3636 dirmngr/ocsp.c:246
+#: dirmngr/http.c:3658 dirmngr/ocsp.c:246
 #, fuzzy, c-format
 msgid "too many redirections\n"
 msgstr "príliš veľa `%c' predvolieb\n"
 
-#: dirmngr/http.c:3748
+#: dirmngr/http.c:3768
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "redirection changed to '%s'\n"
@@ -11052,31 +10851,51 @@ msgstr "aktualizácia zlyhala: %s\n"
 msgid "ldap wrapper %d stalled - killing\n"
 msgstr ""
 
-#: dirmngr/ldap.c:91
+#: dirmngr/ldap.c:92
 #, c-format
 msgid "invalid char 0x%02x in host name - not added\n"
 msgstr ""
 
-#: dirmngr/ldap.c:95
+#: dirmngr/ldap.c:96
 #, fuzzy, c-format
 msgid "adding '%s:%d' to the ldap server list\n"
 msgstr "vyhľadávam \"%s\" na HKP serveri %s\n"
 
-#: dirmngr/ldap.c:98 dirmngr/misc.c:512
+#: dirmngr/ldap.c:99 dirmngr/misc.c:512
 #, fuzzy, c-format
 msgid "malloc failed: %s\n"
 msgstr "zmazanie bloku kľú�a sa nepodarilo:  %s\n"
 
-#: dirmngr/ldap.c:634
+#: dirmngr/ldap.c:221
+#, fuzzy, c-format
+msgid "'%s' is not an LDAP URL\n"
+msgstr "\"%s\" nie je súbor JPEG\n"
+
+#: dirmngr/ldap.c:227 dirmngr/ldap.c:233
 #, c-format
-msgid "start_cert_fetch: invalid pattern '%s'\n"
+msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
-#: dirmngr/ldap.c:846
+#: dirmngr/ldap.c:968
 #, c-format
 msgid "ldap_search hit the size limit of the server\n"
 msgstr ""
 
+#: dirmngr/ldapserver.c:119
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr ""
+
+#: dirmngr/ldapserver.c:181
+#, c-format
+msgid "%s:%u: ignoring unknown flag '%s'\n"
+msgstr ""
+
+#: dirmngr/ldapserver.c:203
+#, fuzzy, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr " s = presko�iť tento kľú�\n"
+
 #: dirmngr/misc.c:172
 #, fuzzy, c-format
 #| msgid "%s: invalid file version %d\n"
@@ -11169,88 +10988,88 @@ msgstr ""
 msgid "allocating list item failed: %s\n"
 msgstr "zmazanie bloku kľú�a sa nepodarilo:  %s\n"
 
-#: dirmngr/ocsp.c:537 dirmngr/ocsp.c:724
+#: dirmngr/ocsp.c:538 dirmngr/ocsp.c:725
 #, fuzzy, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: dirmngr/ocsp.c:584
+#: dirmngr/ocsp.c:585
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:623 dirmngr/validate.c:648
+#: dirmngr/ocsp.c:624 dirmngr/validate.c:648
 #, fuzzy, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "kľú� `%s' nebol nájdený: %s\n"
 
-#: dirmngr/ocsp.c:633
+#: dirmngr/ocsp.c:634
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:640
+#: dirmngr/ocsp.c:641
 #, fuzzy, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "vytvoriť revoka�ný certifikát"
 
-#: dirmngr/ocsp.c:650
+#: dirmngr/ocsp.c:651
 #, fuzzy, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "nemôžem inicializovať databázu dôvery: %s\n"
 
-#: dirmngr/ocsp.c:689
+#: dirmngr/ocsp.c:690
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:696
 #, fuzzy, c-format
 #| msgid "no default secret keyring: %s\n"
 msgid "no default OCSP signer defined\n"
 msgstr "nie je nastavený implicitný súbor tajných kľú�ov %s\n"
 
-#: dirmngr/ocsp.c:702
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:707
+#: dirmngr/ocsp.c:708
 #, fuzzy, c-format
 #| msgid "using cipher %s\n"
 msgid "using OCSP responder '%s'\n"
 msgstr "použitá šifra %s\n"
 
-#: dirmngr/ocsp.c:764
+#: dirmngr/ocsp.c:765
 #, fuzzy, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: dirmngr/ocsp.c:789
+#: dirmngr/ocsp.c:790
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:790
+#: dirmngr/ocsp.c:791
 msgid "good"
 msgstr ""
 
-#: dirmngr/ocsp.c:796
+#: dirmngr/ocsp.c:797
 #, fuzzy, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "POZN�MKA: kľú� bol revokovaný"
 
-#: dirmngr/ocsp.c:831
+#: dirmngr/ocsp.c:832
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:843
+#: dirmngr/ocsp.c:844
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:858
+#: dirmngr/ocsp.c:859
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr ""
@@ -11260,72 +11079,68 @@ msgstr ""
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "podpisovanie zlyhalo: %s\n"
 
-#: dirmngr/server.c:1158
-msgid "ldapserver missing"
-msgstr ""
-
-#: dirmngr/server.c:1224
+#: dirmngr/server.c:1277
 msgid "serialno missing in cert ID"
 msgstr ""
 
-#: dirmngr/server.c:1387 dirmngr/server.c:1473 dirmngr/server.c:1909
-#: dirmngr/server.c:1980 dirmngr/server.c:2556 dirmngr/server.c:2571
+#: dirmngr/server.c:1440 dirmngr/server.c:1526 dirmngr/server.c:1963
+#: dirmngr/server.c:2034 dirmngr/server.c:2662 dirmngr/server.c:2677
 #, fuzzy, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "podpisovanie zlyhalo: %s\n"
 
-#: dirmngr/server.c:1516
+#: dirmngr/server.c:1569
 #, fuzzy, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "zmazanie bloku kľú�a sa nepodarilo:  %s\n"
 
-#: dirmngr/server.c:1528 dirmngr/server.c:1559 dirmngr/server.c:1718
+#: dirmngr/server.c:1581 dirmngr/server.c:1612 dirmngr/server.c:1772
 #, fuzzy, c-format
 msgid "error sending data: %s\n"
 msgstr "chyba pri posielaní na `%s': %s\n"
 
-#: dirmngr/server.c:1666
+#: dirmngr/server.c:1720
 #, fuzzy, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "zmazanie bloku kľú�a sa nepodarilo:  %s\n"
 
-#: dirmngr/server.c:1699
+#: dirmngr/server.c:1753
 #, fuzzy, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "zmazanie bloku kľú�a sa nepodarilo:  %s\n"
 
-#: dirmngr/server.c:1726
+#: dirmngr/server.c:1780
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:2860
+#: dirmngr/server.c:2966
 #, fuzzy, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "nemôžem vytvoriť `%s': %s\n"
 
-#: dirmngr/server.c:2871
+#: dirmngr/server.c:2977
 #, fuzzy, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "%s: nepodarilo sa vytvoriť hashovaciu tabuľku: %s\n"
 
-#: dirmngr/server.c:2892
+#: dirmngr/server.c:2998
 #, fuzzy, c-format
 #| msgid "failed to initialize the TrustDB: %s\n"
 msgid "failed to initialize the server: %s\n"
 msgstr "nemôžem inicializovať databázu dôvery: %s\n"
 
-#: dirmngr/server.c:2900
+#: dirmngr/server.c:3006
 #, fuzzy, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "zlyhalo obnovenie vyrovnávacej pamäti kľú�ov: %s\n"
 
-#: dirmngr/server.c:2933
+#: dirmngr/server.c:3039
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:2952
+#: dirmngr/server.c:3058
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -11474,73 +11289,73 @@ msgstr "gpg-agent nie je v tomto sedení dostupný\n"
 msgid "error sending standard options: %s\n"
 msgstr "chyba pri posielaní na `%s': %s\n"
 
-#: tools/gpgconf-comp.c:649
+#: tools/gpgconf-comp.c:655
 msgid "OpenPGP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:653
+#: tools/gpgconf-comp.c:659
 msgid "S/MIME"
 msgstr ""
 
-#: tools/gpgconf-comp.c:657
+#: tools/gpgconf-comp.c:663
 #, fuzzy
 msgid "Public Keys"
 msgstr "verejný kľú� je %08lX\n"
 
-#: tools/gpgconf-comp.c:661
+#: tools/gpgconf-comp.c:667
 msgid "Private Keys"
 msgstr ""
 
-#: tools/gpgconf-comp.c:665
+#: tools/gpgconf-comp.c:671
 msgid "Smartcards"
 msgstr ""
 
-#: tools/gpgconf-comp.c:669
+#: tools/gpgconf-comp.c:676
 msgid "TPM"
 msgstr ""
 
-#: tools/gpgconf-comp.c:673
+#: tools/gpgconf-comp.c:681
 #, fuzzy
 #| msgid "network error"
 msgid "Network"
 msgstr "chyba siete"
 
-#: tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:685
 #, fuzzy
 msgid "Passphrase Entry"
 msgstr "nesprávne heslo"
 
-#: tools/gpgconf-comp.c:941
+#: tools/gpgconf-comp.c:951
 #, fuzzy
 msgid "Component not suitable for launching"
 msgstr "verejný kľú� nenájdený"
 
-#: tools/gpgconf-comp.c:947
+#: tools/gpgconf-comp.c:957
 #, c-format
 msgid "Configuration file of component %s is broken\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:950
+#: tools/gpgconf-comp.c:960
 #, fuzzy, c-format
 #| msgid "Please use the command \"toggle\" first.\n"
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr "Prosím, najskôr použite príkaz \"toggle\" (prepnúť).\n"
 
-#: tools/gpgconf-comp.c:2816
+#: tools/gpgconf-comp.c:2826
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2946
+#: tools/gpgconf-comp.c:2956
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3543
+#: tools/gpgconf-comp.c:3553
 #, fuzzy, c-format
 msgid "error closing '%s'\n"
 msgstr "chyba pri �ítaní `%s': %s\n"
 
-#: tools/gpgconf-comp.c:3545
+#: tools/gpgconf-comp.c:3555
 #, fuzzy, c-format
 msgid "error parsing '%s'\n"
 msgstr "chyba pri �ítaní `%s': %s\n"
@@ -11624,16 +11439,16 @@ msgid ""
 "Manage configuration options for tools of the @GNUPG@ system\n"
 msgstr ""
 
-#: tools/gpgconf.c:669 tools/gpgconf.c:704
+#: tools/gpgconf.c:703 tools/gpgconf.c:738
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:678 tools/gpgconf.c:728 tools/gpgconf.c:778
+#: tools/gpgconf.c:712 tools/gpgconf.c:762 tools/gpgconf.c:812
 #, fuzzy
 msgid "Component not found"
 msgstr "verejný kľú� nenájdený"
 
-#: tools/gpgconf.c:804
+#: tools/gpgconf.c:838
 #, fuzzy
 msgid "No argument allowed"
 msgstr "zapisujem tajný kľú� do `%s'\n"
@@ -11649,88 +11464,189 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
-#: tools/gpg-card.c:2390
+#: tools/gpg-card.c:2407
 #, fuzzy, c-format
 msgid "Note: key %s is already stored on the card!\n"
 msgstr "presko�ené: tajný kľú� je už v databáze\n"
 
-#: tools/gpg-card.c:2393
+#: tools/gpg-card.c:2410
 #, fuzzy, c-format
 msgid "Note: Keys are already stored on the card!\n"
 msgstr "presko�ené: tajný kľú� je už v databáze\n"
 
-#: tools/gpg-card.c:2396
+#: tools/gpg-card.c:2413
 #, c-format
 msgid "Replace existing key %s ? (y/N) "
 msgstr ""
 
-#: tools/gpg-card.c:2549 tools/gpg-card.c:2712 tools/gpg-card.c:2935
-#: tools/gpg-card.c:3044
+#: tools/gpg-card.c:2566 tools/gpg-card.c:2729 tools/gpg-card.c:2952
+#: tools/gpg-card.c:3061
 #, c-format
 msgid "%s card no. %s detected\n"
 msgstr ""
 
-#: tools/gpg-card.c:3396
+#: tools/gpg-card.c:3413
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3406 tools/gpg-card.c:3420
+#: tools/gpg-card.c:3423 tools/gpg-card.c:3437
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
 "         can only be reverted using a factory reset!\n"
 msgstr ""
 
-#: tools/gpg-card.c:3423
+#: tools/gpg-card.c:3440
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3669
+#: tools/gpg-card.c:3686
 #, fuzzy
 msgid "authenticate to the card"
 msgstr "Revoka�ný certifikát bol vytvorený.\n"
 
-#: tools/gpg-card.c:3671
+#: tools/gpg-card.c:3688
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3673
+#: tools/gpg-card.c:3690
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication"
 msgstr "|MENO|použiť MENO ako implicitného adresáta"
 
-#: tools/gpg-card.c:3675
+#: tools/gpg-card.c:3692
 #, fuzzy
 #| msgid "change the expire date"
 msgid "change a private data object"
 msgstr "zmeniť dobu platnosti"
 
-#: tools/gpg-card.c:3676
+#: tools/gpg-card.c:3693
 #, fuzzy
 msgid "read a certificate from a data object"
 msgstr "Revoka�ný certifikát bol vytvorený.\n"
 
-#: tools/gpg-card.c:3677
+#: tools/gpg-card.c:3694
 #, fuzzy
 msgid "store a certificate to a data object"
 msgstr "Revoka�ný certifikát bol vytvorený.\n"
 
-#: tools/gpg-card.c:3678
+#: tools/gpg-card.c:3695
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3679
+#: tools/gpg-card.c:3696
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3681
+#: tools/gpg-card.c:3698
 msgid "manage the command history"
 msgstr ""
 
 #, fuzzy
+#~ msgid "requesting key %s from %s server %s\n"
+#~ msgstr "požadujem kľú� %08lX z %s\n"
+
+#, fuzzy
+#~ msgid "%s:%u: no hostname given\n"
+#~ msgstr "(Žiadny popis)\n"
+
+#, fuzzy
+#~ msgid "could not parse keyserver\n"
+#~ msgstr "nemožno použiť URI servera kľú�ov - chyba analýzy URI\n"
+
+#, fuzzy
+#~| msgid "|NAME|set terminal charset to NAME"
+#~ msgid "|NAME|connect to host NAME"
+#~ msgstr "|MENO|nastav znakovú sadu terminálu na MENO"
+
+#, fuzzy
+#~| msgid "|NAME|use NAME as default recipient"
+#~ msgid "|NAME|use user NAME for authentication"
+#~ msgstr "|MENO|použiť MENO ako implicitného adresáta"
+
+#, fuzzy
+#~| msgid "Usage: gpg [options] [files] (-h for help)"
+#~ msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
+#~ msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
+
+#, fuzzy
+#~| msgid "invalid import options\n"
+#~ msgid "invalid port number %d\n"
+#~ msgstr "neplatný parameter pre import\n"
+
+#, fuzzy
+#~ msgid "error writing to stdout: %s\n"
+#~ msgstr "chyba pri zápise súboru kľú�ov (keyring)  `%s': %s\n"
+
+#, fuzzy
+#~ msgid "attribute '%s' not found\n"
+#~ msgstr "kľú� `%s' nebol nájdený: %s\n"
+
+#, fuzzy
+#~| msgid "reading from `%s'\n"
+#~ msgid "processing url '%s'\n"
+#~ msgstr "�ítam z `%s'\n"
+
+#, fuzzy
+#~| msgid "          w/o user IDs: %lu\n"
+#~ msgid "          user '%s'\n"
+#~ msgstr "        bez identifikátorov: %lu\n"
+
+#, fuzzy
+#~ msgid "          pass '%s'\n"
+#~ msgstr "                alias \""
+
+#, fuzzy
+#~ msgid "          host '%s'\n"
+#~ msgstr "                alias \""
+
+#, fuzzy
+#~| msgid "          not imported: %lu\n"
+#~ msgid "          port %d\n"
+#~ msgstr "           neimportované: %lu\n"
+
+#, fuzzy
+#~ msgid "            DN '%s'\n"
+#~ msgstr "                alias \""
+
+#, fuzzy
+#~ msgid "          attr '%s'\n"
+#~ msgstr "                alias \""
+
+#, fuzzy
+#~ msgid "no host name in '%s'\n"
+#~ msgstr "(Žiadny popis)\n"
+
+#, fuzzy
+#~| msgid "WARNING: using insecure memory!\n"
+#~ msgid "WARNING: using first attribute only\n"
+#~ msgstr "VAROVANIE: Používaná pamäť nie je bezpe�ná!\n"
+
+#, fuzzy
+#~ msgid "LDAP init to '%s:%d' failed: %s\n"
+#~ msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
+
+#, fuzzy
+#~ msgid "LDAP init to '%s' failed: %s\n"
+#~ msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
+
+#, fuzzy
+#~ msgid "LDAP init to '%s' done\n"
+#~ msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
+
+#, fuzzy
+#~ msgid "binding to '%s:%d' failed: %s\n"
+#~ msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
+
+#, fuzzy
+#~| msgid "dearmoring failed: %s\n"
+#~ msgid "searching '%s' failed: %s\n"
+#~ msgstr "dekódovanie z ASCII formátu zlyhalo: %s\n"
+
+#, fuzzy
 #~ msgid "Suggest a random passphrase."
 #~ msgstr "zmeniť heslo"
 
diff --git a/po/sv.gmo b/po/sv.gmo
index 3a1ed1d..eb2eda9 100644
--- a/po/sv.gmo
+++ b/po/sv.gmo
diff --git a/po/sv.po b/po/sv.po
index b29e73e..f491fc2 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: 2021-04-20 12:38+0200\n"
+"POT-Creation-Date: 2021-08-24 18:50+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:328
+#: agent/call-pinentry.c:338
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "misslyckades med att ta kontroll över PIN-inmatningslåset: %s\n"
@@ -45,55 +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:546
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_OK"
 msgstr "_OK"
 
-#: agent/call-pinentry.c:547
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_Cancel"
 msgstr "_Avbryt"
 
-#: agent/call-pinentry.c:548
+#: agent/call-pinentry.c:558
 #, fuzzy
 #| msgid "|pinentry-label|_OK"
 msgid "|pinentry-label|_Yes"
 msgstr "_OK"
 
-#: agent/call-pinentry.c:549
+#: agent/call-pinentry.c:559
 #, fuzzy
 #| msgid "|pinentry-label|_OK"
 msgid "|pinentry-label|_No"
 msgstr "_OK"
 
-#: agent/call-pinentry.c:550
+#: agent/call-pinentry.c:560
 msgid "|pinentry-label|PIN:"
 msgstr "PIN-kod:"
 
-#: agent/call-pinentry.c:551
+#: agent/call-pinentry.c:561
 #, fuzzy
 #| msgid "|pinentry-label|_Cancel"
 msgid "|pinentry-label|_Save in password manager"
 msgstr "_Avbryt"
 
-#: agent/call-pinentry.c:552
+#: agent/call-pinentry.c:562
 #, 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:554
+#: agent/call-pinentry.c:564
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:555
+#: agent/call-pinentry.c:565
 #, fuzzy
 #| msgid "Enter new passphrase"
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "Ange ny lösenfras"
 
+#: agent/call-pinentry.c:566
+msgid "Caps Lock is on"
+msgstr ""
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:944
+#: agent/call-pinentry.c:1022
 msgid "Suggest"
 msgstr ""
 
@@ -104,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:966
+#: agent/call-pinentry.c:1044
 #, fuzzy
 #| msgid "pinentry.qualitybar.tooltip"
 msgid "pinentry.genpin.tooltip"
@@ -115,9 +119,22 @@ msgstr ""
 "och specialtecken. Fråga din administratör om mer exakt information hur\n"
 "man anger säkra lösenfraser."
 
+#: agent/call-pinentry.c:1072
+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
+#, fuzzy
+#| msgid "Passphrase too long"
+msgid "Passphrase Not Allowed"
+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:998
+#: agent/call-pinentry.c:1198
 msgid "Quality:"
 msgstr "Kvalitet:"
 
@@ -127,7 +144,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:1019
+#: agent/call-pinentry.c:1219
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 "Denna rad indikerar kvaliteten för ovan angiven lösenfras.\n"
@@ -136,7 +153,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:1263
+#: agent/call-pinentry.c:1477
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
@@ -144,84 +161,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:1266
+#: agent/call-pinentry.c:1480
 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:1303 agent/call-pinentry.c:1506
+#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1303 agent/call-pinentry.c:1506
-#: agent/protect-tool.c:728
+#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/protect-tool.c:729
 msgid "Passphrase:"
 msgstr "Lösenfras:"
 
-#: agent/call-pinentry.c:1330 agent/call-pinentry.c:1580 agent/command.c:1799
-#: agent/command.c:1852 agent/command-ssh.c:3046 agent/genkey.c:398
+#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
+#: agent/command.c:1988 agent/command-ssh.c:3046 agent/genkey.c:442
 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:1351 agent/call-pinentry.c:1603
+#: agent/call-pinentry.c:1566 agent/call-pinentry.c:1830
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (försök %d av %d)"
 
-#: agent/call-pinentry.c:1362 agent/call-pinentry.c:1614
+#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
 msgid "Repeat:"
 msgstr ""
 
-#: agent/call-pinentry.c:1372 agent/call-pinentry.c:1384
-#: agent/call-pinentry.c:1624 agent/call-pinentry.c:1636
+#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
+#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
 msgid "PIN too long"
 msgstr "PIN-koden är för lång"
 
-#: agent/call-pinentry.c:1373 agent/call-pinentry.c:1625
+#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
 msgid "Passphrase too long"
 msgstr "Lösenfrasen är för lång"
 
-#: agent/call-pinentry.c:1381 agent/call-pinentry.c:1633
+#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
 msgid "Invalid characters in PIN"
 msgstr "Ogiltiga tecken i PIN-kod"
 
-#: agent/call-pinentry.c:1386 agent/call-pinentry.c:1638
+#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
 msgid "PIN too short"
 msgstr "PIN-kod för kort"
 
 # MPI står för Multiple Precision Integer (tror jag)
-#: agent/call-pinentry.c:1405 agent/call-pinentry.c:1656
+#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
 msgid "Bad PIN"
 msgstr "Felaktig PIN-kod"
 
-#: agent/call-pinentry.c:1405 agent/call-pinentry.c:1656
+#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
 msgid "Bad Passphrase"
 msgstr "Felaktig lösenfras"
 
-#: agent/command.c:697
+#: agent/command.c:823
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:698
+#: agent/command.c:824
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1106 g10/card-util.c:708 g10/card-util.c:729
+#: agent/command.c:1235 g10/card-util.c:713 g10/card-util.c:734
 #, 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:1634 agent/command.c:1791 agent/command-ssh.c:2974
-#: agent/genkey.c:333
+#: agent/command.c:1756 agent/command.c:1921 agent/command-ssh.c:2974
+#: agent/genkey.c:377
 msgid "Please re-enter this passphrase"
 msgstr "Ange denna lösenfras igen"
 
-#: agent/command.c:2567
+#: agent/command.c:2703
 #, fuzzy, c-format
 #| msgid ""
 #| "Please enter the passphrase to protect the imported object within the "
@@ -232,7 +249,7 @@ msgid ""
 msgstr ""
 "Ange lösenfrasen för att skydda det importerade objektet inom GnuPG-systemet."
 
-#: agent/command.c:2697
+#: agent/command.c:2833
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -245,26 +262,26 @@ msgstr ""
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ssh-nycklar större än %d bitar stöds inte\n"
 
-#: agent/command-ssh.c:872 common/dotlock.c:852 g10/card-util.c:953
-#: g10/export.c:1329 g10/gpg.c:1431 g10/keygen.c:5347 g10/keyring.c:1319
-#: g10/keyring.c:1632 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
+#: agent/command-ssh.c:872 common/dotlock.c:852 g10/card-util.c:963
+#: g10/export.c:1329 g10/gpg.c:1431 g10/keygen.c:5377 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
 #: g10/sign.c:1106 g10/sign.c:1443 g10/tdbio.c:753 tools/gpg-card.c:479
 #, fuzzy, c-format
 #| msgid "can't create `%s': %s\n"
 msgid "can't create '%s': %s\n"
 msgstr "kan inte skapa \"%s\": %s\n"
 
-#: agent/command-ssh.c:884 common/helpfile.c:57 g10/card-util.c:910
+#: agent/command-ssh.c:884 common/helpfile.c:57 g10/card-util.c:920
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
 #: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:721 g10/gpg.c:1432
-#: g10/import.c:371 g10/import.c:558 g10/import.c:793 g10/keygen.c:4322
-#: g10/keyring.c:1658 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
+#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4326
+#: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
 #: g10/plaintext.c:610 g10/sign.c:1086 g10/sign.c:1311 g10/sign.c:1424
 #: g10/sign.c:1596 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2380
-#: sm/gpgsm.c:2410 sm/gpgsm.c:2448 sm/keylist.c:1737 sm/qualified.c:65
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2236
+#: sm/gpgsm.c:2266 sm/gpgsm.c:2304 sm/keylist.c:1775 sm/qualified.c:65
 #: dirmngr/certcache.c:396 dirmngr/certcache.c:476 dirmngr/certcache.c:478
-#: dirmngr/crlcache.c:2588 dirmngr/dirmngr.c:1720 tools/gpg-card.c:408
+#: dirmngr/crlcache.c:2591 dirmngr/dirmngr.c:1759 tools/gpg-card.c:408
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
@@ -372,27 +389,27 @@ msgstr "PIN-kod repeterades inte korrekt; försök igen"
 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:109 sm/certreqgen-ui.c:433
+#: 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:116
+#: 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
+#: agent/genkey.c:191
 msgid "Enter new passphrase"
 msgstr "Ange ny lösenfras"
 
-#: agent/genkey.c:184
+#: agent/genkey.c:227
 #, 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:186
+#: agent/genkey.c:229
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -401,11 +418,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:198
+#: agent/genkey.c:241
 msgid "Yes, protection is not needed"
 msgstr "Ja, skydd behövs inte"
 
-#: agent/genkey.c:215
+#: agent/genkey.c:258
 #, fuzzy, c-format
 #| msgid "Name must be at least 5 characters long\n"
 msgid "A passphrase should be at least %u character long."
@@ -413,7 +430,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:234
+#: agent/genkey.c:277
 #, fuzzy, c-format
 #| msgid ""
 #| "Warning: You have entered an insecure passphrase.%%0AA passphrase should "
@@ -431,7 +448,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:260
+#: agent/genkey.c:304
 #, fuzzy, c-format
 #| msgid ""
 #| "Warning: You have entered an insecure passphrase.%%0AA passphrase may not "
@@ -441,7 +458,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:275
+#: agent/genkey.c:319
 #, fuzzy
 #| msgid ""
 #| "Warning: You have entered an insecure passphrase.%%0AA passphrase should "
@@ -454,250 +471,249 @@ 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:296
+#: agent/genkey.c:340
 msgid "Take this one anyway"
 msgstr "Ta den här ändå"
 
 # fel kapitalisering i originalet?
-#: agent/genkey.c:464
+#: agent/genkey.c:508
 #, 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:590
+#: agent/genkey.c:637
 msgid "Please enter the new passphrase"
 msgstr "Ange den nya lösenfrasen"
 
-#: agent/gpg-agent.c:162 scd/scdaemon.c:115 dirmngr/dirmngr.c:182
+#: agent/gpg-agent.c:164 scd/scdaemon.c:115 dirmngr/dirmngr.c:183
 #, fuzzy
 #| msgid "Options useful for debugging"
 msgid "Options used for startup"
 msgstr "Flaggor användbara för felsökning"
 
-#: agent/gpg-agent.c:164 scd/scdaemon.c:120 dirmngr/dirmngr.c:171
+#: agent/gpg-agent.c:166 scd/scdaemon.c:120 dirmngr/dirmngr.c:172
 msgid "run in daemon mode (background)"
 msgstr "kör i demonläge (bakgrund)"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:117 dirmngr/dirmngr.c:170
+#: agent/gpg-agent.c:167 scd/scdaemon.c:117 dirmngr/dirmngr.c:171
 msgid "run in server mode (foreground)"
 msgstr "kör i serverläge (förgrund)"
 
-#: agent/gpg-agent.c:167 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:169 dirmngr/dirmngr.c:174
 #, fuzzy
 #| msgid "run in server mode"
 msgid "run in supervised mode"
 msgstr "kör i serverläge"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:121 dirmngr/dirmngr.c:184
+#: agent/gpg-agent.c:171 scd/scdaemon.c:121 dirmngr/dirmngr.c:185
 msgid "do not detach from the console"
 msgstr "frigör inte från konsollen"
 
-#: agent/gpg-agent.c:170 scd/scdaemon.c:122 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:172 scd/scdaemon.c:122 dirmngr/dirmngr.c:186
 msgid "sh-style command output"
 msgstr "sh-liknande kommandoutdata"
 
-#: agent/gpg-agent.c:171 scd/scdaemon.c:123 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:173 scd/scdaemon.c:123 dirmngr/dirmngr.c:187
 msgid "csh-style command output"
 msgstr "csh-liknande kommandoutdata"
 
-#: agent/gpg-agent.c:179 g10/gpg.c:589 scd/scdaemon.c:125 sm/gpgsm.c:422
-#: dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:181 g10/gpg.c:589 scd/scdaemon.c:125 sm/gpgsm.c:423
+#: dirmngr/dirmngr.c:189
 msgid "|FILE|read options from FILE"
 msgstr "|FIL|läs inställningar från FIL"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:574 scd/scdaemon.c:129 sm/gpgsm.c:265
-#: dirmngr/dirmngr.c:192
+#: agent/gpg-agent.c:185 g10/gpg.c:574 scd/scdaemon.c:129 sm/gpgsm.c:265
+#: dirmngr/dirmngr.c:193
 msgid "Options controlling the diagnostic output"
 msgstr "Flaggor som kontrollerar diagnosutdata"
 
-#: agent/gpg-agent.c:185 g10/gpg.c:576 g10/gpgv.c:78 kbx/kbxutil.c:89
+#: agent/gpg-agent.c:187 g10/gpg.c:576 g10/gpgv.c:78 kbx/kbxutil.c:89
 #: scd/scdaemon.c:131 sm/gpgsm.c:267 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:194 dirmngr/dirmngr_ldap.c:102
-#: tools/gpg-connect-agent.c:85 tools/gpgconf.c:111
+#: dirmngr/dirmngr.c:195 tools/gpg-connect-agent.c:85 tools/gpgconf.c:111
 msgid "verbose"
 msgstr "utförlig"
 
-#: agent/gpg-agent.c:186 g10/gpg.c:578 g10/gpgv.c:79 kbx/kbxutil.c:90
+#: agent/gpg-agent.c:188 g10/gpg.c:578 g10/gpgv.c:79 kbx/kbxutil.c:90
 #: scd/scdaemon.c:132 sm/gpgsm.c:269 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:195 dirmngr/dirmngr_ldap.c:103
+#: dirmngr/dirmngr.c:196
 msgid "be somewhat more quiet"
 msgstr "var något tystare"
 
-#: agent/gpg-agent.c:194 g10/gpg.c:593 sm/gpgsm.c:283 dirmngr/dirmngr.c:205
+#: agent/gpg-agent.c:196 g10/gpg.c:593 sm/gpgsm.c:283 dirmngr/dirmngr.c:206
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FIL|skriv serverlägesloggar till FIL"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 scd/scdaemon.c:146 sm/gpgsm.c:290
-#: dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:599 scd/scdaemon.c:146 sm/gpgsm.c:290
+#: dirmngr/dirmngr.c:210
 msgid "Options controlling the configuration"
 msgstr "Flaggor som kontrollerar konfigurationen"
 
-#: agent/gpg-agent.c:201
+#: agent/gpg-agent.c:203
 msgid "do not use the SCdaemon"
 msgstr "använd inte SCdaemon"
 
-#: agent/gpg-agent.c:203
+#: agent/gpg-agent.c:205
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PRG|använd PRG som SCdaemon-programmet"
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 #, 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:209
+#: agent/gpg-agent.c:211
 #, 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:213
+#: agent/gpg-agent.c:215
 msgid "ignore requests to change the TTY"
 msgstr "ignorera begäran om att ändra TTY"
 
-#: agent/gpg-agent.c:215
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the X display"
 msgstr "ignorera begäran om att ändra X-display"
 
-#: agent/gpg-agent.c:216
+#: agent/gpg-agent.c:218
 #, fuzzy
 #| msgid "enable ssh-agent emulation"
 msgid "enable ssh support"
 msgstr "aktivera ssh-agent-emulering"
 
-#: agent/gpg-agent.c:218
+#: agent/gpg-agent.c:220
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:221
+#: agent/gpg-agent.c:223
 msgid "enable putty support"
 msgstr ""
 
-#: agent/gpg-agent.c:233 g10/gpg.c:844 scd/scdaemon.c:176 sm/gpgsm.c:382
+#: agent/gpg-agent.c:235 g10/gpg.c:844 scd/scdaemon.c:176 sm/gpgsm.c:383
 msgid "Options controlling the security"
 msgstr "Flaggor som kontrollerar säkerheten"
 
-#: agent/gpg-agent.c:236
+#: agent/gpg-agent.c:238
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|låt mellanlagrade PIN-koder gå ut efter N sekunder"
 
-#: agent/gpg-agent.c:238
+#: agent/gpg-agent.c:240
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|låt mellanlagrade SSH-nycklar gå ut efter N sekunder"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:242
 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:242
+#: agent/gpg-agent.c:244
 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:244
+#: agent/gpg-agent.c:246
 msgid "do not use the PIN cache when signing"
 msgstr "använd inte mellanlagring av PIN-kod vid signering"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:248
 #, 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:248
+#: agent/gpg-agent.c:250
 #, 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:251
+#: agent/gpg-agent.c:253
 msgid "allow presetting passphrase"
 msgstr "tillåt förinställning av lösenfras"
 
-#: agent/gpg-agent.c:256
+#: agent/gpg-agent.c:258
 msgid "Options enforcing a passphrase policy"
 msgstr "Flaggor som tvingar igenom en lösenfraspolicy"
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:261
 msgid "do not allow bypassing the passphrase policy"
 msgstr "tillåt inte att gå förbi lösenfraspolicyn"
 
-#: agent/gpg-agent.c:261
+#: agent/gpg-agent.c:263
 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:263
+#: agent/gpg-agent.c:265
 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:266
+#: agent/gpg-agent.c:268
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr "|FIL|kontrollera nya lösenfraser mot mönster i FIL"
 
-#: agent/gpg-agent.c:268
+#: agent/gpg-agent.c:272
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|låt mellanlagrad lösenfras gå ut efter N dagar"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:274
 msgid "do not allow the reuse of old passphrases"
 msgstr "tillåt inte återanvändning av gamla lösenfraser"
 
-#: agent/gpg-agent.c:273
+#: agent/gpg-agent.c:277
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the PIN-Entry"
 msgstr "Flaggor som kontrollerar säkerheten"
 
-#: agent/gpg-agent.c:275
+#: agent/gpg-agent.c:279
 msgid "never use the PIN-entry"
 msgstr ""
 
-#: agent/gpg-agent.c:277
+#: agent/gpg-agent.c:281
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:283
 #, 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:282
+#: agent/gpg-agent.c:286
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PRG|använd PRG som PIN-inmatningsprogrammet"
 
-#: agent/gpg-agent.c:286
+#: agent/gpg-agent.c:290
 #, 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:288
+#: agent/gpg-agent.c:294
 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:551 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: agent/gpg-agent.c:557 agent/preset-passphrase.c:99 agent/protect-tool.c:154
 #: g10/gpg.c:1132 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:612 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:438
-#: dirmngr/dirmngr_ldap.c:175 tools/gpg-connect-agent.c:220 tools/gpgconf.c:151
+#: sm/gpgsm.c:613 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:446
+#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:151
 #: 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:560
+#: agent/gpg-agent.c:566
 #, 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:562
+#: agent/gpg-agent.c:568
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg-agent [options] [command [args]]\n"
@@ -709,146 +725,146 @@ msgstr ""
 "Syntax: gpg-agent [flaggor] [kommando [argument]]\n"
 "Hantering av hemliga nycklar för GnuPG\n"
 
-#: agent/gpg-agent.c:607 g10/gpg.c:1337 scd/scdaemon.c:384 sm/gpgsm.c:760
-#: dirmngr/dirmngr.c:522
+#: agent/gpg-agent.c:613 g10/gpg.c:1337 scd/scdaemon.c:384 sm/gpgsm.c:761
+#: dirmngr/dirmngr.c:530
 #, 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:972 g10/gpg.c:3910 g10/gpg.c:3934 sm/gpgsm.c:1769
-#: sm/gpgsm.c:1775
+#: agent/gpg-agent.c:986 g10/gpg.c:3907 g10/gpg.c:3931 sm/gpgsm.c:1622
+#: sm/gpgsm.c:1628
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "vald sammandragsalgoritm är ogiltig\n"
 
-#: agent/gpg-agent.c:1196 agent/gpg-agent.c:2019 common/comopt.c:93
-#: g10/gpg.c:2591 scd/scdaemon.c:549 sm/gpgsm.c:1155 dirmngr/dirmngr.c:989
-#: dirmngr/dirmngr.c:1840
+#: agent/gpg-agent.c:1210 agent/gpg-agent.c:2035 common/comopt.c:93
+#: g10/gpg.c:2594 scd/scdaemon.c:549 sm/gpgsm.c:1028 dirmngr/dirmngr.c:1029
+#: dirmngr/dirmngr.c:1879
 #, 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:1335 g10/gpg.c:3861 scd/scdaemon.c:687 sm/gpgsm.c:1709
-#: dirmngr/dirmngr.c:1108 tools/gpg-connect-agent.c:1270 tools/gpgconf.c:634
+#: agent/gpg-agent.c:1349 g10/gpg.c:3858 scd/scdaemon.c:687 sm/gpgsm.c:1562
+#: dirmngr/dirmngr.c:1145 tools/gpg-connect-agent.c:1270 tools/gpgconf.c:668
 #, 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:2172 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1267
+#: agent/gpg-agent.c:2188 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1306
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "kan inte skapa uttag: %s\n"
 
-#: agent/gpg-agent.c:2189 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1280
+#: agent/gpg-agent.c:2205 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1319
 #, 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:2228
+#: agent/gpg-agent.c:2244
 #, 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:2239 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1312
+#: agent/gpg-agent.c:2255 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1351
 #, 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:2244 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1315
+#: agent/gpg-agent.c:2260 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1354
 #, 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:2255 agent/gpg-agent.c:2295 agent/gpg-agent.c:2304
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1324
+#: agent/gpg-agent.c:2271 agent/gpg-agent.c:2311 agent/gpg-agent.c:2320
+#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1363
 #, 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:2269 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1336
+#: agent/gpg-agent.c:2285 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1375
 #, 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:2289 agent/gpg-agent.c:2342 common/homedir.c:517
+#: agent/gpg-agent.c:2305 agent/gpg-agent.c:2358 common/homedir.c:537
 #: 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:2292 agent/gpg-agent.c:2347 common/homedir.c:520
+#: agent/gpg-agent.c:2308 agent/gpg-agent.c:2363 common/homedir.c:540
 #: 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:2353
+#: agent/gpg-agent.c:2369
 #, 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:2357
+#: agent/gpg-agent.c:2373
 #, 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:2512 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2069
+#: agent/gpg-agent.c:2528 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2108
 #, 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:2719
+#: agent/gpg-agent.c:2735
 #, 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:2724
+#: agent/gpg-agent.c:2740
 #, 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:2799
+#: agent/gpg-agent.c:2815
 #, 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:2804
+#: agent/gpg-agent.c:2820
 #, 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:3026 scd/scdaemon.c:1374 dirmngr/dirmngr.c:2283
+#: agent/gpg-agent.c:3042 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2322
 #, 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:3114 scd/scdaemon.c:1439
+#: agent/gpg-agent.c:3130 scd/scdaemon.c:1441
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s stoppad\n"
 
-#: agent/gpg-agent.c:3252 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3271 common/simple-pwquery.c:247 g10/call-agent.c:260
 #: sm/call-agent.c:131 tools/gpg-connect-agent.c:2319 tools/card-call-scd.c:311
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "ingen gpg-agent kör i den här sessionen\n"
 
 # Här bruksanvisning för kommandoraden. Resultatet har jag översatt med "inställningar", eftersom flaggorna även kan förekomma i en inställningsfil.
-#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:70
+#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:66
 msgid ""
 "@Options:\n"
 " "
@@ -871,7 +887,7 @@ msgstr ""
 "Underhåll av lösenordscache\n"
 
 #: agent/protect-tool.c:107 g10/gpg.c:448 kbx/kbxutil.c:72 sm/gpgsm.c:215
-#: dirmngr/dirmngr.c:168 tools/gpgconf.c:81
+#: dirmngr/dirmngr.c:169 tools/gpgconf.c:81
 msgid ""
 "@Commands:\n"
 " "
@@ -903,22 +919,22 @@ msgstr ""
 "Syntax: gpg-protect-tool [flaggor] [argument]\n"
 "Underhållsverktyg för hemliga nycklar\n"
 
-#: agent/protect-tool.c:707
+#: agent/protect-tool.c:708 sm/import.c:775
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Ange lösenfrasen för att avskydda PKCS#12-objektet."
 
-#: agent/protect-tool.c:712
+#: agent/protect-tool.c:713 sm/export.c:727
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Ange lösenfrasen för att skydda det nya PKCS#12-objektet."
 
-#: agent/protect-tool.c:718
+#: agent/protect-tool.c:719
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 "Ange lösenfrasen för att skydda det importerade objektet inom GnuPG-systemet."
 
-#: agent/protect-tool.c:723
+#: agent/protect-tool.c:724
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -926,17 +942,17 @@ msgstr ""
 "Ange lösenfrasen eller PIN-koden som\n"
 "behövs för att färdigställa denna åtgärd."
 
-#: agent/protect-tool.c:734
+#: agent/protect-tool.c:735
 #, c-format
 msgid "cancelled\n"
 msgstr "avbruten\n"
 
-#: agent/protect-tool.c:736
+#: agent/protect-tool.c:737
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "fel vid fråga efter lösenfrasen: %s\n"
 
-#: agent/trustlist.c:153 agent/trustlist.c:363 tools/gpgconf.c:424
+#: agent/trustlist.c:153 agent/trustlist.c:363 tools/gpgconf.c:458
 #, fuzzy, c-format
 #| msgid "error opening `%s': %s\n"
 msgid "error opening '%s': %s\n"
@@ -1107,7 +1123,7 @@ msgstr "kontroll av den skapade signaturen misslyckades: %s\n"
 msgid "secret key parts are not available\n"
 msgstr "de hemliga nyckeldelarna är inte tillgängliga\n"
 
-#: agent/cvt-openpgp.c:343 g10/card-util.c:1562
+#: agent/cvt-openpgp.c:343 g10/card-util.c:1575
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -1140,7 +1156,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:505 common/exechelp-posix.c:580
-#: common/exechelp-posix.c:866 dirmngr/dirmngr.c:1354
+#: common/exechelp-posix.c:866 dirmngr/dirmngr.c:1393
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "fel vid grening av process: %s\n"
@@ -1220,7 +1236,7 @@ msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "namnbyte från \"%s\" till \"%s\" misslyckades: %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3082
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3099
 msgid "yes"
 msgstr "ja"
 
@@ -1274,7 +1290,7 @@ msgstr "slut på kärna i säkert minne vid allokering av %lu byte"
 msgid "out of core while allocating %lu bytes"
 msgstr "slut på kärna vid allokering av %lu byte"
 
-#: common/miscellaneous.c:115 g10/card-util.c:917 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:927 tools/no-libgcrypt.c:30
 #: tools/gpg-card.c:416
 #, c-format
 msgid "error allocating enough memory: %s\n"
@@ -1355,7 +1371,7 @@ msgstr "fel när nyckelringen \"%s\" skapades: %s\n"
 msgid "server '%s' is older than us (%s < %s)"
 msgstr ""
 
-#: common/asshelp.c:737 g10/call-dirmngr.c:408
+#: common/asshelp.c:737 g10/call-dirmngr.c:407
 #, fuzzy, c-format
 #| msgid "WARNING: %s overrides %s\n"
 msgid "WARNING: %s\n"
@@ -1440,7 +1456,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:4212
+#: scd/app-openpgp.c:4214
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "algoritmen stöds inte: %s"
@@ -1515,11 +1531,11 @@ msgstr "Certifikatkedjan är giltig"
 msgid "Root certificate trustworthy"
 msgstr "rotcertifikatet är pålitligt"
 
-#: common/audit.c:1112 sm/certchain.c:1242
+#: common/audit.c:1112 sm/certchain.c:1243
 msgid "no CRL found for certificate"
 msgstr "ingen spärrlista hittades för certifikatet"
 
-#: common/audit.c:1115 sm/certchain.c:1252
+#: common/audit.c:1115 sm/certchain.c:1253
 msgid "the available CRL is too old"
 msgstr "den tillgängliga spärrlistan är för gammal"
 
@@ -1567,22 +1583,22 @@ msgstr "[ingen]"
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "ogiltigt radix64-tecken %02x hoppades över\n"
 
-#: common/ttyio.c:433
+#: common/ttyio.c:447
 #, c-format
 msgid "Sorry, we are in batchmode - can't get input\n"
 msgstr ""
 
-#: common/ttyio.c:439
+#: common/ttyio.c:453
 #, c-format
 msgid "Sorry, no terminal at all requested - can't get input\n"
 msgstr ""
 
-#: common/ttyio.c:474 common/ttyio.c:484
+#: common/ttyio.c:488 common/ttyio.c:498
 #, c-format
 msgid "too many errors; giving up\n"
 msgstr ""
 
-#: common/ttyio.c:536
+#: common/ttyio.c:550
 #, c-format
 msgid "Control-D detected\n"
 msgstr ""
@@ -1641,8 +1657,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:1036 dirmngr/dirmngr.c:895
-#: dirmngr/dirmngr.c:904
+#: common/init.c:191 sm/gpgsm.c:909 dirmngr/dirmngr.c:935 dirmngr/dirmngr.c:944
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s är för gammal (behöver %s, har %s)\n"
@@ -1808,7 +1823,7 @@ msgid "Enter passphrase: "
 msgstr "Ange lösenfrasen\n"
 
 #: g10/call-agent.c:318 g10/encrypt.c:282 g10/encrypt.c:818 g10/sign.c:473
-#: sm/call-agent.c:180 sm/encrypt.c:701 sm/sign.c:436
+#: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
 #, fuzzy, c-format
 #| msgid "%s does not yet work with %s\n"
 msgid "%s is not compliant with %s mode\n"
@@ -1820,223 +1835,223 @@ msgstr "%s fungerar ännu inte med  %s\n"
 msgid "error from TPM: %s\n"
 msgstr "fel vid läsning från %s: %s\n"
 
-#: g10/call-agent.c:2123 g10/passphrase.c:225 g10/passphrase.c:258
-#: tools/card-call-scd.c:1751
+#: g10/call-agent.c:2135 g10/passphrase.c:233 g10/passphrase.c:266
+#: tools/card-call-scd.c:1755
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problem med agenten: %s\n"
 
-#: g10/call-dirmngr.c:179 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2316
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2316
 #, fuzzy, c-format
 #| msgid "no gpg-agent running in this session\n"
 msgid "no dirmngr running in this session\n"
 msgstr "ingen gpg-agent kör i den här sessionen\n"
 
-#: g10/call-dirmngr.c:213
+#: g10/call-dirmngr.c:212
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "keyserver option \"honor-keyserver-url\" may not be used in Tor mode\n"
 msgstr "du kan inte använda %s när du är i %s-läget\n"
 
-#: g10/call-dirmngr.c:386
+#: g10/call-dirmngr.c:385
 msgid "WKD uses a cached result"
 msgstr ""
 
-#: g10/call-dirmngr.c:389
+#: g10/call-dirmngr.c:388
 msgid "Tor is not running"
 msgstr ""
 
-#: g10/call-dirmngr.c:391
+#: g10/call-dirmngr.c:390
 #, fuzzy
 #| msgid "invalid fingerprint"
 msgid "Tor is not properly configured"
 msgstr "ogiltigt fingeravtryck"
 
-#: g10/call-dirmngr.c:393
+#: g10/call-dirmngr.c:392
 #, fuzzy
 #| msgid "invalid fingerprint"
 msgid "DNS is not properly configured"
 msgstr "ogiltigt fingeravtryck"
 
-#: g10/call-dirmngr.c:395
+#: g10/call-dirmngr.c:394
 msgid "unacceptable HTTP redirect from server"
 msgstr ""
 
-#: g10/call-dirmngr.c:397
+#: g10/call-dirmngr.c:396
 msgid "unacceptable HTTP redirect from server was cleaned up"
 msgstr ""
 
-#: g10/call-dirmngr.c:399
+#: g10/call-dirmngr.c:398
 #, fuzzy
 #| msgid "generate a revocation certificate"
 msgid "server uses an invalid certificate"
 msgstr "generera ett spärrcertifikat"
 
-#: g10/call-dirmngr.c:406 g10/gpg.c:4599
+#: g10/call-dirmngr.c:405 g10/gpg.c:4596
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "ASCII-skal: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:369 g10/card-util.c:1924
-#: tools/gpg-card.c:3039
+#: g10/card-util.c:86 g10/card-util.c:374 g10/card-util.c:1937
+#: tools/gpg-card.c:3056
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP-kort är inte tillgängligt: %s\n"
 
-#: g10/card-util.c:91 g10/card-util.c:1930
+#: g10/card-util.c:91 g10/card-util.c:1943
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP-kort nr. %s identifierades\n"
 
-#: g10/card-util.c:97 g10/card-util.c:2309 g10/delkey.c:164 g10/keyedit.c:1428
-#: g10/keygen.c:4791 g10/revoke.c:214 g10/revoke.c:638
+#: g10/card-util.c:97 g10/card-util.c:2322 g10/delkey.c:164 g10/keyedit.c:1428
+#: g10/keygen.c:4795 g10/revoke.c:214 g10/revoke.c:639
 #, c-format
 msgid "can't do this in batch mode\n"
 msgstr "kan inte göra detta i satsläge\n"
 
-#: g10/card-util.c:105 tools/gpg-card.c:2943
+#: g10/card-util.c:105 tools/gpg-card.c:2960
 #, c-format
 msgid "This command is only available for version 2 cards\n"
 msgstr "Detta kommando är endast tillgängligt för kort av version 2\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3398 tools/gpg-card.c:2948
+#: g10/card-util.c:107 scd/app-openpgp.c:3399 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"
 
-#: g10/card-util.c:140 g10/card-util.c:1448 g10/card-util.c:1710
-#: g10/card-util.c:1802 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1991 g10/keygen.c:2165 g10/keygen.c:2385 g10/keygen.c:2685
+#: g10/card-util.c:140 g10/card-util.c:1458 g10/card-util.c:1723
+#: g10/card-util.c:1815 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/keygen.c:1992 g10/keygen.c:2166 g10/keygen.c:2386 g10/keygen.c:2686
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
 #: tools/gpg-card.c:510
 msgid "Your selection? "
 msgstr "Vad väljer du? "
 
-#: g10/card-util.c:262 g10/card-util.c:313 tools/gpg-card.c:596
+#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:596
 #: tools/gpg-card.c:636
 msgid "[not set]"
 msgstr "[inte inställt]"
 
-#: g10/card-util.c:558 tools/gpg-card.c:903
+#: g10/card-util.c:563 tools/gpg-card.c:905
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:559 tools/gpg-card.c:904
+#: g10/card-util.c:564 tools/gpg-card.c:906
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:586 tools/gpg-card.c:931
+#: g10/card-util.c:591 tools/gpg-card.c:933
 msgid "not forced"
 msgstr "inte tvingad"
 
-#: g10/card-util.c:586 tools/gpg-card.c:931
+#: g10/card-util.c:591 tools/gpg-card.c:933
 msgid "forced"
 msgstr "tvingad"
 
-#: g10/card-util.c:768 tools/gpg-card.c:1468
+#: g10/card-util.c:773 tools/gpg-card.c:1484
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Fel: Endast ren ASCII tillåts för närvarande.\n"
 
-#: g10/card-util.c:770 tools/gpg-card.c:1470
+#: g10/card-util.c:775 tools/gpg-card.c:1486
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Fel: Tecknet \"<\" får inte användas.\n"
 
-#: g10/card-util.c:772 tools/gpg-card.c:1472
+#: g10/card-util.c:777 tools/gpg-card.c:1488
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Fel: Dubbla blanksteg tillåts inte.\n"
 
-#: g10/card-util.c:789 tools/gpg-card.c:1505
+#: g10/card-util.c:795 tools/gpg-card.c:1521
 msgid "Cardholder's surname: "
 msgstr "Kortinnehavarens efternamn: "
 
-#: g10/card-util.c:791 tools/gpg-card.c:1506
+#: g10/card-util.c:797 tools/gpg-card.c:1522
 msgid "Cardholder's given name: "
 msgstr "Kortinnehavarens förnamn: "
 
-#: g10/card-util.c:809 tools/gpg-card.c:1523
+#: g10/card-util.c:816 tools/gpg-card.c:1539
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Fel: Fullständigt namn för långt (gränsen är %d tecken).\n"
 
-#: g10/card-util.c:830 tools/gpg-card.c:1561
+#: g10/card-util.c:840 tools/gpg-card.c:1577
 msgid "URL to retrieve public key: "
 msgstr "Url för att hämta publik nyckel: "
 
-#: g10/card-util.c:926 g10/decrypt-data.c:495 g10/import.c:406 g10/import.c:756
-#: g10/import.c:815 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1666
-#: tools/gpgconf.c:437 tools/gpgconf.c:483 tools/gpg-card.c:426
+#: g10/card-util.c:936 g10/decrypt-data.c:495 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:1705
+#: tools/gpgconf.c:471 tools/gpgconf.c:517 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:959 g10/decrypt-data.c:498 g10/export.c:2496
+#: g10/card-util.c:969 g10/decrypt-data.c:498 g10/export.c:2496
 #: dirmngr/crlcache.c:925 tools/gpg-card.c:486 tools/gpg-card.c:493
 #, fuzzy, c-format
 #| msgid "error writing `%s': %s\n"
 msgid "error writing '%s': %s\n"
 msgstr "fel vid skrivning till \"%s\": %s\n"
 
-#: g10/card-util.c:986 tools/gpg-card.c:1650
+#: g10/card-util.c:996 tools/gpg-card.c:1666
 msgid "Login data (account name): "
 msgstr "Inloggningsdata (kontonamn): "
 
-#: g10/card-util.c:1024 tools/gpg-card.c:1945
+#: g10/card-util.c:1034 tools/gpg-card.c:1962
 msgid "Private DO data: "
 msgstr "Privat DO-data: "
 
-#: g10/card-util.c:1109 tools/gpg-card.c:1699
+#: g10/card-util.c:1119 tools/gpg-card.c:1715
 msgid "Language preferences: "
 msgstr "Språkinställningar: "
 
-#: g10/card-util.c:1117 tools/gpg-card.c:1710
+#: g10/card-util.c:1127 tools/gpg-card.c:1726
 #, c-format
 msgid "Error: invalid length of preference string.\n"
 msgstr "Fel: ogiltig längd på inställningssträngen\n"
 
-#: g10/card-util.c:1126 tools/gpg-card.c:1719
+#: g10/card-util.c:1136 tools/gpg-card.c:1735
 #, c-format
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Fel: ogiltiga tecken i inställningssträngen.\n"
 
-#: g10/card-util.c:1148 tools/gpg-card.c:1753
+#: g10/card-util.c:1158 tools/gpg-card.c:1769
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1162 tools/gpg-card.c:1770
+#: g10/card-util.c:1172 tools/gpg-card.c:1786
 msgid "Error: invalid response.\n"
 msgstr "Fel: ogiltigt svar.\n"
 
-#: g10/card-util.c:1185 tools/gpg-card.c:1835
+#: g10/card-util.c:1195 tools/gpg-card.c:1852
 msgid "CA fingerprint: "
 msgstr "CA-fingeravtryck: "
 
-#: g10/card-util.c:1209 tools/gpg-card.c:1861
+#: g10/card-util.c:1219 tools/gpg-card.c:1878
 #, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Fel: ogiltigt formaterat fingeravtryck.\n"
 
-#: g10/card-util.c:1259
+#: g10/card-util.c:1269
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "nyckelåtgärden är inte möjlig: %s\n"
 
-#: g10/card-util.c:1260
+#: g10/card-util.c:1270
 msgid "not an OpenPGP card"
 msgstr "inte ett OpenPGP-kort"
 
-#: g10/card-util.c:1273 g10/keygen.c:4811 g10/keygen.c:5972
+#: g10/card-util.c:1283 g10/keygen.c:4815 g10/keygen.c:6003
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "fel vid hämtning av aktuell nyckelinformation: %s\n"
 
-#: g10/card-util.c:1358
+#: g10/card-util.c:1368
 msgid "Replace existing key? (y/N) "
 msgstr "Ersätt existerande nyckel? (j/N) "
 
-#: g10/card-util.c:1375 tools/gpg-card.c:3328
+#: g10/card-util.c:1385 tools/gpg-card.c:3345
 #, fuzzy
 #| msgid ""
 #| "Note: There is no guarantee that the card supports the requested size.\n"
@@ -2053,73 +2068,73 @@ msgstr ""
 "      kontrollera dokumentationen för ditt kort för att se vilka storlekar\n"
 "      som tillåts.\n"
 
-#: g10/card-util.c:1396 g10/keygen.c:2570 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1406 g10/keygen.c:2571 sm/certreqgen-ui.c:180
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Vilken nyckelstorlek vill du ha? (%u) "
 
-#: g10/card-util.c:1406 g10/keygen.c:2493 g10/keygen.c:2525
+#: g10/card-util.c:1416 g10/keygen.c:2494 g10/keygen.c:2526
 #: sm/certreqgen-ui.c:195
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "avrundade uppåt till %u bitar\n"
 
-#: g10/card-util.c:1414 g10/keygen.c:2578 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1424 g10/keygen.c:2579 sm/certreqgen-ui.c:185
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s nyckelstorlekar måste vara inom intervallet %u-%u\n"
 
-#: g10/card-util.c:1433
+#: g10/card-util.c:1443
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1435
+#: g10/card-util.c:1445
 #, fuzzy
 #| msgid "   (1) Signature key\n"
 msgid "Signature key\n"
 msgstr "   (1) Signeringsnyckel\n"
 
-#: g10/card-util.c:1437
+#: g10/card-util.c:1447
 #, fuzzy
 #| msgid "   (2) Encryption key\n"
 msgid "Encryption key\n"
 msgstr "   (2) Krypteringsnyckel\n"
 
-#: g10/card-util.c:1439
+#: g10/card-util.c:1449
 #, fuzzy
 #| msgid "   (3) Authentication key\n"
 msgid "Authentication key\n"
 msgstr "   (3) Autentiseringsnyckel\n"
 
-#: g10/card-util.c:1441 g10/keygen.c:2112 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1451 g10/keygen.c:2113 sm/certreqgen-ui.c:158
 msgid "Please select what kind of key you want:\n"
 msgstr "Välj vilken typ av nyckel du vill ha:\n"
 
-#: g10/card-util.c:1442 sm/certreqgen-ui.c:159
+#: g10/card-util.c:1452 sm/certreqgen-ui.c:159
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1443
+#: g10/card-util.c:1453
 #, fuzzy, c-format
 #| msgid "   (%d) DSA and Elgamal\n"
 msgid "   (%d) ECC\n"
 msgstr "   (%d) DSA och Elgamal\n"
 
-#: g10/card-util.c:1455 g10/card-util.c:1722 g10/card-util.c:1822
-#: g10/keyedit.c:900 g10/keygen.c:2017 g10/keygen.c:2045 g10/keygen.c:2172
-#: g10/keygen.c:2425 g10/keygen.c:2713 g10/revoke.c:836
+#: g10/card-util.c:1468 g10/card-util.c:1735 g10/card-util.c:1835
+#: g10/keyedit.c:900 g10/keygen.c:2018 g10/keygen.c:2046 g10/keygen.c:2173
+#: g10/keygen.c:2426 g10/keygen.c:2714 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Ogiltigt val.\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1541
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 "Kortet kommer nu att konfigureras om för att generera en nyckel med %u "
 "bitar\n"
 
-#: g10/card-util.c:1533
+#: g10/card-util.c:1546
 #, fuzzy, c-format
 #| msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgid "The card will now be re-configured to generate a key of type: %s\n"
@@ -2127,41 +2142,41 @@ msgstr ""
 "Kortet kommer nu att konfigureras om för att generera en nyckel med %u "
 "bitar\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1582
 #, fuzzy, c-format
 #| msgid "error changing size of key %d to %u bits: %s\n"
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "fel vid ändring av storlek för nyckel %d till %u bitar: %s\n"
 
-#: g10/card-util.c:1585 g10/card-util.c:2106 g10/card-util.c:2162
+#: g10/card-util.c:1598 g10/card-util.c:2119 g10/card-util.c:2175
 #, fuzzy, c-format
 #| msgid "error getting current key info: %s\n"
 msgid "error getting card info: %s\n"
 msgstr "fel vid hämtning av aktuell nyckelinformation: %s\n"
 
-#: g10/card-util.c:1591 g10/card-util.c:1936 g10/card-util.c:2112
-#: g10/card-util.c:2171 tools/gpg-card.c:3057 tools/gpg-card.c:3296
-#: tools/gpg-card.c:3354
+#: g10/card-util.c:1604 g10/card-util.c:1949 g10/card-util.c:2125
+#: g10/card-util.c:2184 tools/gpg-card.c:3074 tools/gpg-card.c:3313
+#: tools/gpg-card.c:3371
 #, fuzzy, c-format
 #| msgid "This command is not allowed while in %s mode.\n"
 msgid "This command is not supported by this card\n"
 msgstr "Detta kommando är inte tillåtet när du är i %s-läge.\n"
 
-#: g10/card-util.c:1637 tools/gpg-card.c:2426
+#: g10/card-util.c:1650 tools/gpg-card.c:2443
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Skapa säkerhetskopia av krypteringsnyckel utanför kortet? (J/n) "
 
-#: g10/card-util.c:1651
+#: g10/card-util.c:1664
 #, fuzzy, c-format
 #| msgid "NOTE: keys are already stored on the card!\n"
 msgid "Note: keys are already stored on the card!\n"
 msgstr "OBSERVERA: nycklar har redan lagrats på kortet!\n"
 
-#: g10/card-util.c:1654 tools/gpg-card.c:2398
+#: g10/card-util.c:1667 tools/gpg-card.c:2415
 msgid "Replace existing keys? (y/N) "
 msgstr "Ersätt existerande nycklar? (j/N) "
 
-#: g10/card-util.c:1666 tools/gpg-card.c:2457
+#: g10/card-util.c:1679 tools/gpg-card.c:2474
 #, fuzzy, c-format
 #| msgid ""
 #| "Please note that the factory settings of the PINs are\n"
@@ -2176,170 +2191,170 @@ msgstr ""
 "   PIN-kod = \"%s\"     Admin PIN-kod = \"%s\"\n"
 "Du bör ändra dem med kommandot --change-pin\n"
 
-#: g10/card-util.c:1701
+#: g10/card-util.c:1714
 msgid "Please select the type of key to generate:\n"
 msgstr "Välj vilken typ av nyckel som ska genereras:\n"
 
-#: g10/card-util.c:1703 g10/card-util.c:1793
+#: g10/card-util.c:1716 g10/card-util.c:1806
 msgid "   (1) Signature key\n"
 msgstr "   (1) Signeringsnyckel\n"
 
-#: g10/card-util.c:1704 g10/card-util.c:1795
+#: g10/card-util.c:1717 g10/card-util.c:1808
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Krypteringsnyckel\n"
 
-#: g10/card-util.c:1705 g10/card-util.c:1797
+#: g10/card-util.c:1718 g10/card-util.c:1810
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Autentiseringsnyckel\n"
 
-#: g10/card-util.c:1790
+#: g10/card-util.c:1803
 msgid "Please select where to store the key:\n"
 msgstr "Välj var nyckeln ska sparas:\n"
 
-#: g10/card-util.c:1836
+#: g10/card-util.c:1849
 #, fuzzy, c-format
 #| msgid "read failed: %s\n"
 msgid "KEYTOCARD failed: %s\n"
 msgstr "läsning misslyckades: %s\n"
 
-#: g10/card-util.c:1941 tools/gpg-card.c:3065
+#: g10/card-util.c:1954 tools/gpg-card.c:3082
 #, fuzzy, c-format
 #| msgid "NOTE: keys are already stored on the card!\n"
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr "OBSERVERA: nycklar har redan lagrats på kortet!\n"
 
-#: g10/card-util.c:1944 tools/gpg-card.c:3068 tools/gpg-card.c:3409
+#: g10/card-util.c:1957 tools/gpg-card.c:3085 tools/gpg-card.c:3426
 #, fuzzy
 #| msgid "Sign it? (y/N) "
 msgid "Continue? (y/N) "
 msgstr "Signera den? (j/N) "
 
-#: g10/card-util.c:1949 tools/gpg-card.c:3079
+#: g10/card-util.c:1962 tools/gpg-card.c:3096
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2142
+#: g10/card-util.c:2155
 #, fuzzy, c-format
 #| msgid "error closing %s: %s\n"
 msgid "error for setup KDF: %s\n"
 msgstr "fel vid stängning av %s: %s\n"
 
-#: g10/card-util.c:2188
+#: g10/card-util.c:2201
 #, fuzzy, c-format
 #| msgid "error closing %s: %s\n"
 msgid "error for setup UIF: %s\n"
 msgstr "fel vid stängning av %s: %s\n"
 
-#: g10/card-util.c:2212 g10/keyedit.c:1263 tools/gpg-card.c:3649
+#: g10/card-util.c:2225 g10/keyedit.c:1263 tools/gpg-card.c:3666
 msgid "quit this menu"
 msgstr "avsluta denna meny"
 
-#: g10/card-util.c:2214
+#: g10/card-util.c:2227
 msgid "show admin commands"
 msgstr "visa administratörskommandon"
 
-#: g10/card-util.c:2215 g10/keyedit.c:1266 tools/gpg-card.c:3652
+#: g10/card-util.c:2228 g10/keyedit.c:1266 tools/gpg-card.c:3669
 msgid "show this help"
 msgstr "visa denna hjälp"
 
-#: g10/card-util.c:2217 tools/gpg-card.c:3654
+#: g10/card-util.c:2230 tools/gpg-card.c:3671
 msgid "list all available data"
 msgstr "lista allt tillgängligt data"
 
-#: g10/card-util.c:2220 tools/gpg-card.c:3656
+#: g10/card-util.c:2233 tools/gpg-card.c:3673
 msgid "change card holder's name"
 msgstr "ändra kortinnehavarens namn"
 
-#: g10/card-util.c:2221 tools/gpg-card.c:3657
+#: g10/card-util.c:2234 tools/gpg-card.c:3674
 msgid "change URL to retrieve key"
 msgstr "ändra url för att hämta nyckel"
 
-#: g10/card-util.c:2222 tools/gpg-card.c:3658
+#: g10/card-util.c:2235 tools/gpg-card.c:3675
 msgid "fetch the key specified in the card URL"
 msgstr "hämta nyckel som anges i kortets url"
 
-#: g10/card-util.c:2223 tools/gpg-card.c:3659
+#: g10/card-util.c:2236 tools/gpg-card.c:3676
 msgid "change the login name"
 msgstr "ändra inloggningsnamnet"
 
 # originalet borde ha ett value
-#: g10/card-util.c:2224 tools/gpg-card.c:3660
+#: g10/card-util.c:2237 tools/gpg-card.c:3677
 msgid "change the language preferences"
 msgstr "ändra språkinställningarna"
 
-#: g10/card-util.c:2225 tools/gpg-card.c:3661
+#: g10/card-util.c:2238 tools/gpg-card.c:3678
 #, fuzzy
 #| msgid "change card holder's sex"
 msgid "change card holder's salutation"
 msgstr "ändra kortinnehavarens kön"
 
-#: g10/card-util.c:2227 tools/gpg-card.c:3663
+#: g10/card-util.c:2240 tools/gpg-card.c:3680
 msgid "change a CA fingerprint"
 msgstr "ändra ett CA-fingeravtryck"
 
 # den låter skum
-#: g10/card-util.c:2228 tools/gpg-card.c:3664
+#: g10/card-util.c:2241 tools/gpg-card.c:3681
 msgid "toggle the signature force PIN flag"
 msgstr "växla flagga för att tvinga signatur-PIN-kod"
 
-#: g10/card-util.c:2229 tools/gpg-card.c:3665
+#: g10/card-util.c:2242 tools/gpg-card.c:3682
 msgid "generate new keys"
 msgstr "generera nya nycklar"
 
-#: g10/card-util.c:2230 tools/gpg-card.c:3666
+#: g10/card-util.c:2243 tools/gpg-card.c:3683
 msgid "menu to change or unblock the PIN"
 msgstr "meny för att ändra eller avblockera PIN-koden"
 
-#: g10/card-util.c:2231 tools/gpg-card.c:3667
+#: g10/card-util.c:2244 tools/gpg-card.c:3684
 msgid "verify the PIN and list all data"
 msgstr "validera PIN-koden och lista allt data"
 
-#: g10/card-util.c:2232 tools/gpg-card.c:3668
+#: g10/card-util.c:2245 tools/gpg-card.c:3685
 msgid "unblock the PIN using a Reset Code"
 msgstr "lås upp PIN-koden med en nollställningskod"
 
-#: g10/card-util.c:2233 tools/gpg-card.c:3672
+#: g10/card-util.c:2246 tools/gpg-card.c:3689
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2235
+#: g10/card-util.c:2248
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr "|NAMN|använd NAMN som standardmottagare"
 
 # originalet borde ha ett value
-#: g10/card-util.c:2236
+#: g10/card-util.c:2249
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "ändra ägartillitsvärdet"
 
 # originalet borde ha ett value
-#: g10/card-util.c:2237 tools/gpg-card.c:3674
+#: g10/card-util.c:2250 tools/gpg-card.c:3691
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the User Interaction Flag"
 msgstr "ändra ägartillitsvärdet"
 
-#: g10/card-util.c:2361 tools/gpg-card.c:3924
+#: g10/card-util.c:2374 tools/gpg-card.c:3941
 msgid "gpg/card> "
 msgstr "gpg/kort> "
 
-#: g10/card-util.c:2402
+#: g10/card-util.c:2415
 msgid "Admin-only command\n"
 msgstr "Kommandon endast för administratör\n"
 
-#: g10/card-util.c:2433
+#: g10/card-util.c:2446
 msgid "Admin commands are allowed\n"
 msgstr "Administrationskommandon tillåts\n"
 
-#: g10/card-util.c:2435
+#: g10/card-util.c:2448
 msgid "Admin commands are not allowed\n"
 msgstr "Administrationskommandon tillåts inte\n"
 
-#: g10/card-util.c:2546 g10/keyedit.c:2275 tools/gpg-card.c:3814
-#: tools/gpg-card.c:4072
+#: g10/card-util.c:2559 g10/keyedit.c:2275 tools/gpg-card.c:3831
+#: tools/gpg-card.c:4089
 #, c-format
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ogiltigt kommando (prova med \"help\")\n"
@@ -2350,23 +2365,23 @@ 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:5293 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5292 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:1934 g10/export.c:2342 g10/export.c:2463
-#: g10/getkey.c:1907 g10/gpg.c:5238 g10/keyedit.c:1450 g10/keyedit.c:2382
-#: g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:703 g10/keyserver.c:1240
-#: g10/revoke.c:230 g10/tofu.c:2168
+#: g10/getkey.c:2032 g10/gpg.c:5237 g10/keyedit.c:1450 g10/keyedit.c:2382
+#: g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:703 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:2002 g10/getkey.c:1915 g10/getkey.c:4330
-#: g10/gpg.c:5247 g10/keyedit.c:2354 g10/keyserver.c:1258 g10/revoke.c:236
-#: g10/revoke.c:665 g10/tofu.c:2176
+#: g10/delkey.c:90 g10/export.c:2002 g10/getkey.c:2040 g10/getkey.c:4455
+#: g10/gpg.c:5246 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"
 msgstr "fel vid läsning av nyckelblock: %s\n"
@@ -2493,15 +2508,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:555 g10/encrypt.c:808 g10/decrypt-data.c:261 g10/gpg.c:4083
-#: g10/gpg.c:4130 sm/decrypt.c:742 sm/encrypt.c:691 sm/gpgsm.c:1793
+#: g10/encrypt.c:555 g10/encrypt.c:808 g10/decrypt-data.c:261 g10/gpg.c:4080
+#: g10/gpg.c:4127 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1646
 #, 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:564 g10/gpg.c:4095 g10/gpg.c:4142 g10/sig-check.c:155
-#: g10/sign.c:452 sm/gpgsm.c:1803 sm/gpgsm.c:1813 sm/sign.c:596 sm/verify.c:510
+#: g10/encrypt.c:564 g10/gpg.c:4092 g10/gpg.c:4139 g10/sig-check.c:155
+#: g10/sign.c:452 sm/gpgsm.c:1656 sm/gpgsm.c:1666 sm/sign.c:596 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"
@@ -2522,7 +2537,7 @@ msgstr ""
 "VARNING: tvinga symmetriskt chiffer med %s (%d) strider mot "
 "mottagarinställningarna\n"
 
-#: g10/encrypt.c:838 sm/encrypt.c:766
+#: g10/encrypt.c:838 sm/encrypt.c:767
 #, fuzzy, c-format
 #| msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
@@ -2555,7 +2570,7 @@ msgstr "%s/%s krypterad för: \"%s\"\n"
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "du kan inte använda %s när du är i %s-läget\n"
 
-#: g10/decrypt-data.c:239 g10/mainproc.c:380 sm/decrypt.c:494
+#: g10/decrypt-data.c:239 g10/mainproc.c:380 sm/decrypt.c:892
 #, fuzzy, c-format
 #| msgid "%s encrypted data\n"
 msgid "%s.%s encrypted data\n"
@@ -2567,7 +2582,7 @@ msgid "encrypted with unknown algorithm %d\n"
 msgstr "krypterad med en okänd algoritm %d\n"
 
 # I vissa algoritmer kan svaga nycklar förekomma. Dessa ska inte användas.
-#: g10/decrypt-data.c:361 g10/decrypt-data.c:414 sm/decrypt.c:508
+#: g10/decrypt-data.c:361 g10/decrypt-data.c:414 sm/decrypt.c:906
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2610,7 +2625,7 @@ msgstr ""
 msgid " - skipped"
 msgstr "%s: hoppade över: %s\n"
 
-#: g10/export.c:1333 g10/import.c:2124 g10/openfile.c:202 g10/openfile.c:296
+#: g10/export.c:1333 g10/import.c:2132 g10/openfile.c:202 g10/openfile.c:296
 #: g10/sign.c:1110 g10/sign.c:1447
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
@@ -2648,67 +2663,67 @@ msgstr "Fel när \"%s\" skapades: %s\n"
 msgid "[User ID not found]"
 msgstr "[Användaridentiteten hittades inte]"
 
-#: g10/getkey.c:1199
+#: g10/getkey.c:1324
 #, fuzzy, c-format
 #| msgid "automatically retrieved `%s' via %s\n"
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "hämtade \"%s\" automatiskt via %s\n"
 
-#: g10/getkey.c:1205
+#: g10/getkey.c:1330
 #, fuzzy, c-format
 #| msgid "error retrieving `%s' via %s: %s\n"
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "fel vid hämtning av \"%s\" via %s: %s\n"
 
-#: g10/getkey.c:1207
+#: g10/getkey.c:1332
 msgid "No fingerprint"
 msgstr "Inget fingeravtryck"
 
-#: g10/getkey.c:1449
+#: g10/getkey.c:1574
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1884 g10/revoke.c:657 g10/revoke.c:718
+#: g10/getkey.c:2009 g10/revoke.c:658 g10/revoke.c:719
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "hemliga nyckeln \"%s\" hittades inte: %s\n"
 
-#: g10/getkey.c:1887 g10/pkclist.c:1012
+#: g10/getkey.c:2012 g10/pkclist.c:1012
 #, fuzzy, c-format
 #| msgid "missing argument for option \"%.50s\"\n"
 msgid "(check argument of option '%s')\n"
 msgstr "argument för flaggan \"%.50s\" saknas\n"
 
-#: g10/getkey.c:1965
+#: g10/getkey.c:2090
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "|NAMN|använd NAMN som förvald hemlig nyckel"
 
-#: g10/getkey.c:1973
+#: g10/getkey.c:2098
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "|NAMN|använd NAMN som förvald hemlig nyckel"
 
-#: g10/getkey.c:1980
+#: g10/getkey.c:2105
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr ""
 
-#: g10/getkey.c:2837
+#: g10/getkey.c:2962
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Ogiltiga nyckeln %s tvingades till giltig med --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:3703
+#: g10/getkey.c:3828
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "använder undernyckeln %s istället för primära nyckeln %s\n"
 
-#: g10/getkey.c:4259 g10/gpg.c:2167
+#: g10/getkey.c:4384 g10/gpg.c:2168
 #, fuzzy, c-format
 #| msgid "missing argument for option \"%.50s\"\n"
 msgid "valid values for option '%s':\n"
@@ -2909,7 +2924,7 @@ msgstr "|SPEC|ange e-postalias (ett eller flera)"
 msgid "use strict OpenPGP behavior"
 msgstr "använd strikt OpenPGP-beteende"
 
-#: g10/gpg.c:651 kbx/kbxutil.c:91 sm/gpgsm.c:424 tools/gpgconf.c:113
+#: g10/gpg.c:651 kbx/kbxutil.c:91 sm/gpgsm.c:425 tools/gpgconf.c:113
 msgid "do not make any changes"
 msgstr "gör inga ändringar"
 
@@ -2945,7 +2960,7 @@ msgstr "använd \"ursprunglig text\"-läget"
 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:762 sm/gpgsm.c:357
+#: g10/gpg.c:762 sm/gpgsm.c:358
 #, fuzzy
 #| msgid "Options controlling the interactivity and enforcement"
 msgid "Options controlling key import and export"
@@ -2967,11 +2982,11 @@ msgstr "importera nycklar från en nyckelserver"
 msgid "include the public key in signatures"
 msgstr "lista och kontrollera nyckelsignaturer"
 
-#: g10/gpg.c:776 sm/gpgsm.c:360
+#: g10/gpg.c:776 sm/gpgsm.c:361
 msgid "disable all access to the dirmngr"
 msgstr "inaktivera all åtkomst till dirmngr"
 
-#: g10/gpg.c:788 sm/gpgsm.c:367
+#: g10/gpg.c:788 sm/gpgsm.c:368
 #, fuzzy
 #| msgid "Options controlling the configuration"
 msgid "Options controlling key listings"
@@ -2991,17 +3006,17 @@ msgstr "|ANVÄNDAR-ID|kryptera för ANVÄNDAR-ID"
 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:876 sm/gpgsm.c:408
+#: g10/gpg.c:876 sm/gpgsm.c:409
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:895 sm/gpgsm.c:420 dirmngr/dirmngr.c:286
+#: g10/gpg.c:895 sm/gpgsm.c:421 dirmngr/dirmngr.c:289
 msgid "Other options"
 msgstr ""
 
 # inställningar istället för flaggor?
 # Nej, här är det bruksanvisningen för kommandoraden.
-#: g10/gpg.c:966 sm/gpgsm.c:453
+#: g10/gpg.c:966 sm/gpgsm.c:454
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -3061,7 +3076,7 @@ msgstr ""
 "signera, kontrollera, kryptera eller dekryptera\n"
 "standardåtgärden beror på inmatningsdata\n"
 
-#: g10/gpg.c:1168 sm/gpgsm.c:636
+#: g10/gpg.c:1168 sm/gpgsm.c:637
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -3085,13 +3100,13 @@ msgstr "Kontrollsumma: "
 msgid "Compression: "
 msgstr "Komprimering: "
 
-#: g10/gpg.c:1274 sm/gpgsm.c:710
+#: g10/gpg.c:1274 sm/gpgsm.c:711
 #, fuzzy, c-format
 #| msgid "usage: gpgsm [options] "
 msgid "usage: %s [options] %s\n"
 msgstr "användning: gpgsm [flaggor] "
 
-#: g10/gpg.c:1467 sm/gpgsm.c:803
+#: g10/gpg.c:1467 sm/gpgsm.c:804
 #, c-format
 msgid "conflicting commands\n"
 msgstr "motstridiga kommandon\n"
@@ -3103,51 +3118,51 @@ msgstr "motstridiga kommandon\n"
 msgid "no = sign found in group definition '%s'\n"
 msgstr "no = signatur hittad i gruppdefinitionen \"%s\"\n"
 
-#: g10/gpg.c:1683
+#: g10/gpg.c:1684
 #, 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:1686
+#: g10/gpg.c:1687
 #, 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:1689
+#: g10/gpg.c:1690
 #, 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:1695
+#: g10/gpg.c:1696
 #, 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:1698
+#: g10/gpg.c:1699
 #, 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:1701
+#: g10/gpg.c:1702
 #, 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:1707
+#: g10/gpg.c:1708
 #, 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:1710
+#: g10/gpg.c:1711
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -3157,21 +3172,21 @@ msgstr ""
 "VARNING: osäkert ägarskap på inneslutande katalog för konfigurationsfilen "
 "\"%s\"\n"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1714
 #, 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:1719
+#: g10/gpg.c:1720
 #, 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:1722
+#: g10/gpg.c:1723
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@ -3182,500 +3197,500 @@ msgstr ""
 "VARNING: osäkra rättigheter på inneslutande katalog för konfigurationsfilen "
 "\"%s\"\n"
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1726
 #, 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:1941
+#: g10/gpg.c:1942
 #, fuzzy, c-format
 #| msgid "unknown configuration item `%s'\n"
 msgid "unknown configuration item '%s'\n"
 msgstr "okänd konfigurationspost \"%s\"\n"
 
-#: g10/gpg.c:2037
+#: g10/gpg.c:2038
 msgid "display photo IDs during key listings"
 msgstr "visa foto-id under nyckellistning"
 
-#: g10/gpg.c:2039
+#: g10/gpg.c:2040
 #, 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:2041
+#: g10/gpg.c:2042
 msgid "show policy URLs during signature listings"
 msgstr "visa policy-url:er under signaturlistningar"
 
-#: g10/gpg.c:2043
+#: g10/gpg.c:2044
 msgid "show all notations during signature listings"
 msgstr "visa alla notationer under signaturlistningar"
 
-#: g10/gpg.c:2045
+#: g10/gpg.c:2046
 msgid "show IETF standard notations during signature listings"
 msgstr "visa IETF-standardnotationer under signaturlistningar"
 
-#: g10/gpg.c:2049
+#: g10/gpg.c:2050
 msgid "show user-supplied notations during signature listings"
 msgstr "visa användarangivna notationer under signaturlistningar"
 
-#: g10/gpg.c:2051
+#: g10/gpg.c:2052
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "visa url:er till föredragna nyckelservrar under signaturlistningar"
 
-#: g10/gpg.c:2053
+#: g10/gpg.c:2054
 msgid "show user ID validity during key listings"
 msgstr "visa giltighet för användaridentitet vid nyckellistningar "
 
-#: g10/gpg.c:2055
+#: g10/gpg.c:2056
 msgid "show revoked and expired user IDs in key listings"
 msgstr "visa spärrade och utgångna användaridentiteter i nyckellistningar"
 
-#: g10/gpg.c:2057
+#: g10/gpg.c:2058
 msgid "show revoked and expired subkeys in key listings"
 msgstr "visa spärrade och utgångna undernycklar i nyckellistningar"
 
-#: g10/gpg.c:2059
+#: g10/gpg.c:2060
 msgid "show the keyring name in key listings"
 msgstr "visa nyckelringens namn i nyckellistningar"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2062
 msgid "show expiration dates during signature listings"
 msgstr "visa utgångsdatum under signaturlistningar"
 
-#: g10/gpg.c:2178
+#: g10/gpg.c:2179
 #, fuzzy, c-format
 #| msgid "unknown option `%s'\n"
 msgid "unknown TOFU policy '%s'\n"
 msgstr "okänd flagga \"%s\"\n"
 
-#: g10/gpg.c:2180
+#: g10/gpg.c:2181
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2975 g10/gpg.c:3828 g10/gpg.c:3840
+#: g10/gpg.c:2978 g10/gpg.c:3825 g10/gpg.c:3837
 #, 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:3151 g10/gpg.c:3163
+#: g10/gpg.c:3154 g10/gpg.c:3166
 #, 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:3185
+#: g10/gpg.c:3188
 #, 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:3217 sm/gpgsm.c:1270
+#: g10/gpg.c:3220 sm/gpgsm.c:1143
 #, 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:3223 sm/gpgsm.c:1276
+#: g10/gpg.c:3226 sm/gpgsm.c:1149
 #, 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:3280
+#: g10/gpg.c:3283
 #, 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:3302 g10/gpg.c:3511 g10/keyedit.c:5319
+#: g10/gpg.c:3305 g10/gpg.c:3514 g10/keyedit.c:5322
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "kunde inte tolka url till nyckelserver\n"
 
-#: g10/gpg.c:3320
+#: g10/gpg.c:3323
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ogiltiga flaggor för nyckelserver\n"
 
-#: g10/gpg.c:3323
+#: g10/gpg.c:3326
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "ogiltiga flaggor för nyckelserver\n"
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3333
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ogiltiga importeringsflaggor\n"
 
-#: g10/gpg.c:3333
+#: g10/gpg.c:3336
 #, c-format
 msgid "invalid import options\n"
 msgstr "ogiltiga importflaggor\n"
 
-#: g10/gpg.c:3339 g10/gpg.c:3354
+#: g10/gpg.c:3342 g10/gpg.c:3357
 #, fuzzy, c-format
 #| msgid "invalid list options\n"
 msgid "invalid filter option: %s\n"
 msgstr "ogiltiga listflaggor\n"
 
-#: g10/gpg.c:3345
+#: g10/gpg.c:3348
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ogiltiga exportflaggor\n"
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3351
 #, c-format
 msgid "invalid export options\n"
 msgstr "ogiltiga exportinställningar\n"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3363
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ogiltiga listflaggor\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3366
 #, c-format
 msgid "invalid list options\n"
 msgstr "ogiltiga listflaggor\n"
 
-#: g10/gpg.c:3371
+#: g10/gpg.c:3374
 msgid "display photo IDs during signature verification"
 msgstr "visa foto-id under signaturvalidering"
 
-#: g10/gpg.c:3373
+#: g10/gpg.c:3376
 msgid "show policy URLs during signature verification"
 msgstr "visa policy-url:er under signaturvalidering"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3378
 msgid "show all notations during signature verification"
 msgstr "visa alla notationer under signaturvalidering"
 
-#: g10/gpg.c:3377
+#: g10/gpg.c:3380
 msgid "show IETF standard notations during signature verification"
 msgstr "visa IETF-standardnotationer under signaturvalidering"
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3384
 msgid "show user-supplied notations during signature verification"
 msgstr "visa användarangivna notationer under signaturvalidering"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3386
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "visa url:er till föredragna nyckelserver under signaturvalidering"
 
-#: g10/gpg.c:3385
+#: g10/gpg.c:3388
 msgid "show user ID validity during signature verification"
 msgstr "visa giltighet för användaridentitet vid signaturvalidering"
 
-#: g10/gpg.c:3387
+#: g10/gpg.c:3390
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "visa spärrade och utgångna användaridentiteter i signaturvalidering"
 
-#: g10/gpg.c:3389
+#: g10/gpg.c:3392
 msgid "show only the primary user ID in signature verification"
 msgstr "visa endast primär användaridentitet i signaturvalidering"
 
-#: g10/gpg.c:3396
+#: g10/gpg.c:3399
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ogiltiga flaggor för validering\n"
 
-#: g10/gpg.c:3399
+#: g10/gpg.c:3402
 #, c-format
 msgid "invalid verify options\n"
 msgstr "ogiltiga flaggor för validering\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3409
 #, 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:3613
+#: g10/gpg.c:3616
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ogiltig auto-key-locate-lista\n"
 
-#: g10/gpg.c:3616
+#: g10/gpg.c:3619
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "ogiltig auto-key-locate-lista\n"
 
-#: g10/gpg.c:3625
+#: g10/gpg.c:3628
 #, 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:3807 sm/gpgsm.c:1675
+#: g10/gpg.c:3804 sm/gpgsm.c:1528
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "VARNING: programmet kan komma att skapa en minnesavbild!\n"
 
-#: g10/gpg.c:3821
+#: g10/gpg.c:3818
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VARNING: %s gäller istället för %s\n"
 
-#: g10/gpg.c:3830
+#: g10/gpg.c:3827
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s är inte tillåten tillsammans med %s!\n"
 
-#: g10/gpg.c:3833
+#: g10/gpg.c:3830
 #, 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:3848 sm/gpgsm.c:1696 dirmngr/dirmngr.c:1123
+#: g10/gpg.c:3845 sm/gpgsm.c:1549 dirmngr/dirmngr.c:1160
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "VARNING: kör med falsk systemtid: "
 
-#: g10/gpg.c:3869
+#: g10/gpg.c:3866
 #, 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:3897 g10/gpg.c:3928 sm/gpgsm.c:1763
+#: g10/gpg.c:3894 g10/gpg.c:3925 sm/gpgsm.c:1616
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "den valda chifferalgoritmen är ogiltig\n"
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3901
 #, 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:3916
+#: g10/gpg.c:3913
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "vald komprimeringsalgoritm är ogiltig\n"
 
-#: g10/gpg.c:3922
+#: g10/gpg.c:3919
 #, 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:3937
+#: g10/gpg.c:3934
 #, 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:3939
+#: g10/gpg.c:3936
 #, 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:3941
+#: g10/gpg.c:3938
 #, 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:3943
+#: g10/gpg.c:3940
 #, 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:3945
+#: g10/gpg.c:3942
 #, 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:3949
+#: g10/gpg.c:3946
 #, 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:3953
+#: g10/gpg.c:3950
 #, 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:3960
+#: g10/gpg.c:3957
 #, 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:3964
+#: g10/gpg.c:3961
 #, 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:3967
+#: g10/gpg.c:3964
 #, 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:3971
+#: g10/gpg.c:3968
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "ogiltig inställning av föredragna kontrollsummealgoritmer\n"
 
-#: g10/gpg.c:3975
+#: g10/gpg.c:3972
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "ogiltig inställning av föredragna kompressionsalgoritmer\n"
 
-#: g10/gpg.c:3984 g10/gpg.c:3989
+#: g10/gpg.c:3981 g10/gpg.c:3986
 #, 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:4026
+#: g10/gpg.c:4023
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s fungerar ännu inte med  %s\n"
 
-#: g10/gpg.c:4089
+#: g10/gpg.c:4086
 #, 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:4101
+#: g10/gpg.c:4098
 #, 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:4256
+#: g10/gpg.c:4253
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: g10/gpg.c:4268
+#: g10/gpg.c:4265
 #, 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:4340
+#: g10/gpg.c:4337
 #, 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:4369
+#: g10/gpg.c:4366
 #, 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:4372
+#: g10/gpg.c:4369
 #, 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:4430
+#: g10/gpg.c:4427
 #, 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:4433
+#: g10/gpg.c:4430
 #, 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:4821 g10/keyserver.c:1870
+#: g10/gpg.c:4818 g10/keyserver.c:1629
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "sändning till nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:4826
+#: g10/gpg.c:4823
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "hämtning från nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:4832
+#: g10/gpg.c:4829
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export av nyckeln misslyckades: %s\n"
 
-#: g10/gpg.c:4845
+#: g10/gpg.c:4842
 #, 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:4857
+#: g10/gpg.c:4854
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "sökning på nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:4870
+#: g10/gpg.c:4867
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "uppdatering av  nyckeln från en nyckelserver misslyckades: %s\n"
 
-#: g10/gpg.c:4937
+#: g10/gpg.c:4936
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "misslyckades med att ta bort ASCII-skalet: %s\n"
 
-#: g10/gpg.c:4948
+#: g10/gpg.c:4947
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "misslyckades med att skapa ASCII-skal: %s\n"
 
-#: g10/gpg.c:5053
+#: g10/gpg.c:5052
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "ogiltig kontrollsummealgoritm \"%s\"\n"
 
-#: g10/gpg.c:5205 g10/tofu.c:2156
+#: g10/gpg.c:5204 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:5216
+#: g10/gpg.c:5215
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5272
+#: g10/gpg.c:5271
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5283
+#: g10/gpg.c:5282
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Skriv ditt meddelande här ...\n"
 
-#: g10/gpg.c:5630
+#: g10/gpg.c:5629
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "den angivna URL som beskriver certifieringsspolicy är ogiltig\n"
 
-#: g10/gpg.c:5632
+#: g10/gpg.c:5631
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "den angivna URL som beskriver signaturpolicy är ogiltig\n"
 
-#: g10/gpg.c:5665
+#: g10/gpg.c:5664
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den angivna föredragna nyckelserver-url:n är ogiltig\n"
@@ -3691,7 +3706,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:414 tools/gpgconf.c:116 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:415 tools/gpgconf.c:116 tools/gpg-card.c:95
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinformation till denna FD"
 
@@ -3787,98 +3802,98 @@ msgstr "anta att inmatning är i binärformat"
 msgid "repair keys on import"
 msgstr "visa nyckelns fingeravtryck"
 
-#: g10/import.c:399 g10/import.c:721
+#: g10/import.c:407 g10/import.c:729
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "hoppar över block av typen %d\n"
 
-#: g10/import.c:738
+#: g10/import.c:746
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu nycklar behandlade än så länge\n"
 
-#: g10/import.c:831
+#: g10/import.c:839
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Totalt antal behandlade enheter: %lu\n"
 
-#: g10/import.c:834
+#: g10/import.c:842
 #, fuzzy, c-format
 #| msgid "      skipped new keys: %lu\n"
 msgid "    skipped PGP-2 keys: %lu\n"
 msgstr "        överhoppade nya nycklar: %lu\n"
 
-#: g10/import.c:836
+#: g10/import.c:844
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "        överhoppade nya nycklar: %lu\n"
 
-#: g10/import.c:839
+#: g10/import.c:847
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "       utan användaridentiteter: %lu\n"
 
-#: g10/import.c:842 sm/import.c:129
+#: g10/import.c:850 sm/import.c:129
 #, c-format
 msgid "              imported: %lu"
 msgstr "                    importerade: %lu"
 
-#: g10/import.c:846 sm/import.c:133
+#: g10/import.c:854 sm/import.c:133
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                    oförändrade: %lu\n"
 
-#: g10/import.c:848
+#: g10/import.c:856
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "        nya användaridentiteter: %lu\n"
 
-#: g10/import.c:850
+#: g10/import.c:858
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "               nya undernycklar: %lu\n"
 
-#: g10/import.c:852
+#: g10/import.c:860
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "                 nya signaturer: %lu\n"
 
-#: g10/import.c:854
+#: g10/import.c:862
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "          nya nyckelspärrningar: %lu\n"
 
-#: g10/import.c:856 sm/import.c:135
+#: g10/import.c:864 sm/import.c:135
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "    antal lästa hemliga nycklar: %lu\n"
 
-#: g10/import.c:858 sm/import.c:137
+#: g10/import.c:866 sm/import.c:137
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "    importerade hemliga nycklar: %lu\n"
 
-#: g10/import.c:860 sm/import.c:139
+#: g10/import.c:868 sm/import.c:139
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "    oförändrade hemliga nycklar: %lu\n"
 
-#: g10/import.c:862 sm/import.c:141
+#: g10/import.c:870 sm/import.c:141
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "               inte importerade: %lu\n"
 
-#: g10/import.c:864
+#: g10/import.c:872
 #, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "             signaturer rensade: %lu\n"
 
-#: g10/import.c:866
+#: g10/import.c:874
 #, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "    användaridentiteter rensade: %lu\n"
 
-#: g10/import.c:1291
+#: g10/import.c:1299
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
@@ -3887,181 +3902,181 @@ msgstr ""
 "VARNING: nyckeln %s innehåller inställningar för otillgängliga\n"
 "algoritmer för dessa användaridentiteter:\n"
 
-#: g10/import.c:1333
+#: g10/import.c:1341
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": inställning för chifferalgoritmen %s\n"
 
-#: g10/import.c:1351
+#: g10/import.c:1359
 #, fuzzy, c-format
 #| msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgid "         \"%s\": preference for AEAD algorithm %s\n"
 msgstr "         \"%s\": inställning för chifferalgoritmen %s\n"
 
-#: g10/import.c:1366
+#: g10/import.c:1374
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": inställning för sammandragsalgoritmen %s\n"
 
-#: g10/import.c:1378
+#: g10/import.c:1386
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": inställning för komprimeringsalgoritmen %s\n"
 
-#: g10/import.c:1391
+#: g10/import.c:1399
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "det rekommenderas starkt att du uppdaterar dina inställningar\n"
 
-#: g10/import.c:1393
+#: g10/import.c:1401
 #, c-format
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "och distribuerar denna nyckel igen för att undvika tänkbara problem\n"
 "med att algoritmerna inte stämmer\n"
 
-#: g10/import.c:1418
+#: g10/import.c:1426
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 "du kan uppdatera dina inställningar med: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:1932 g10/import.c:3053
+#: g10/import.c:1940 g10/import.c:3061
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "nyckel %s: ingen användaridentitet\n"
 
-#: g10/import.c:1938
+#: g10/import.c:1946
 #, fuzzy, c-format
 #| msgid "skipped \"%s\": %s\n"
 msgid "key %s: %s\n"
 msgstr "hoppade över \"%s\": %s\n"
 
-#: g10/import.c:1939 g10/import.c:3025
+#: g10/import.c:1947 g10/import.c:3033
 msgid "rejected by import screener"
 msgstr ""
 
 # Undernyckeln är skadad på HKP-servern. Vanligt fel vid många undernycklar.
-#: g10/import.c:1988
+#: g10/import.c:1996
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "nyckeln %s: PKS-skadad undernyckel reparerades\n"
 
 # vad innebär fnutten i slutet?
-#: g10/import.c:2009
+#: g10/import.c:2017
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "nyckel %s: accepterade icke-självsignerad användaridentitet \"%s\"\n"
 
-#: g10/import.c:2020 g10/import.c:2051
+#: g10/import.c:2028 g10/import.c:2059
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "nyckel %s: inga giltiga användaridentiteter\n"
 
-#: g10/import.c:2022
+#: g10/import.c:2030
 #, c-format
 msgid "this may be caused by a missing self-signature\n"
 msgstr "detta kan bero på att det saknas en självsignatur\n"
 
-#: g10/import.c:2101 g10/import.c:3439
+#: g10/import.c:2109 g10/import.c:3447
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "nyckel %s: hittade ingen publik nyckel: %s\n"
 
-#: g10/import.c:2107
+#: g10/import.c:2115
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "nyckel %s: ny nyckel - hoppade över\n"
 
-#: g10/import.c:2119
+#: g10/import.c:2127
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "hittade ingen nyckelring som gick att skriva till: %s\n"
 
-#: g10/import.c:2151 g10/import.c:2253 g10/import.c:3514
+#: g10/import.c:2159 g10/import.c:2261 g10/import.c:3522
 #, fuzzy, c-format
 #| msgid "error writing keyring `%s': %s\n"
 msgid "error writing keyring '%s': %s\n"
 msgstr "fel vid skrivning av nyckelringen \"%s\": %s\n"
 
 # fixme: I appended the %s -wk
-#: g10/import.c:2174
+#: g10/import.c:2182
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "nyckel %s: publika nyckeln \"%s\" importerades\n"
 
-#: g10/import.c:2201
+#: g10/import.c:2209
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "nyckel %s: stämmer inte mot vår lokala kopia\n"
 
-#: g10/import.c:2269
+#: g10/import.c:2277
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "nyckel %s: \"%s\" 1 ny användaridentitet\n"
 
-#: g10/import.c:2272
+#: g10/import.c:2280
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "nyckel %s: \"%s\" %d nya användaridentiteter\n"
 
-#: g10/import.c:2275
+#: g10/import.c:2283
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "nyckel %s: \"%s\" 1 ny signatur\n"
 
-#: g10/import.c:2278
+#: g10/import.c:2286
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "nyckel %s: \"%s\" %d nya signaturer\n"
 
-#: g10/import.c:2281
+#: g10/import.c:2289
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "nyckel %s: \"%s\" 1 ny undernyckel\n"
 
-#: g10/import.c:2284
+#: g10/import.c:2292
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "nyckel %s: \"%s\" %d nya undernycklar\n"
 
-#: g10/import.c:2287
+#: g10/import.c:2295
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "nyckel %s: \"%s\" %d signatur rensad\n"
 
-#: g10/import.c:2290
+#: g10/import.c:2298
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "nyckel %s: \"%s\" %d signaturer rensade\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2301
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "nyckel %s: \"%s\" %d användaridentitet rensad\n"
 
-#: g10/import.c:2296
+#: g10/import.c:2304
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "nyckel %s: \"%s\" %d användaridentiteter rensade\n"
 
-#: g10/import.c:2332
+#: g10/import.c:2340
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "nyckel %s: \"%s\" inte ändrad\n"
 
-#: g10/import.c:2692 g10/import.c:2887
+#: g10/import.c:2700 g10/import.c:2895
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "nyckel %s: hemlig nyckel importerades\n"
 
-#: g10/import.c:2700
+#: g10/import.c:2708
 #, fuzzy, c-format
 #| msgid "skipped: secret key already present\n"
 msgid "key %s: secret key already exists\n"
 msgstr "hoppade över: hemlig nyckel finns redan\n"
 
-#: g10/import.c:2708
+#: g10/import.c:2716
 #, fuzzy, c-format
 #| msgid "error sending %s command: %s\n"
 msgid "key %s: error sending to agent: %s\n"
@@ -4075,214 +4090,213 @@ msgstr "fel vid sändning av %s-kommando: %s\n"
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2877
+#: g10/import.c:2885
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:3024
+#: g10/import.c:3032
 #, fuzzy, c-format
 #| msgid "secret key \"%s\" not found: %s\n"
 msgid "secret key %s: %s\n"
 msgstr "hemliga nyckeln \"%s\" hittades inte: %s\n"
 
-#: g10/import.c:3045 g10/import.c:3084
+#: g10/import.c:3053 g10/import.c:3092
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "import av hemliga nycklar tillåts inte\n"
 
-#: g10/import.c:3072
+#: g10/import.c:3080
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "nyckel %s: hemlig nyckel med ogiltigt chiffer %d - hoppade över\n"
 
-#: g10/import.c:3234 g10/pkclist.c:75 g10/revoke.c:774
+#: g10/import.c:3242 g10/pkclist.c:75 g10/revoke.c:775
 msgid "No reason specified"
 msgstr "Ingen anledning har angivits"
 
 # tveksam översättning. funderar på "ersatt av något bättre" men det
 # känns inte heller bra. Betyder att nyckeln inte används längre, utan användaren har skapat en ny nyckel som ersätter den gamla.
-#: g10/import.c:3235 g10/pkclist.c:77 g10/revoke.c:776
+#: g10/import.c:3243 g10/pkclist.c:77 g10/revoke.c:777
 msgid "Key is superseded"
 msgstr "Nyckeln är åsidosatt"
 
-#: g10/import.c:3236 g10/pkclist.c:79 g10/revoke.c:775
+#: g10/import.c:3244 g10/pkclist.c:79 g10/revoke.c:776
 msgid "Key has been compromised"
 msgstr "Nyckeln har blivit komprometterad"
 
-#: g10/import.c:3237 g10/pkclist.c:81 g10/revoke.c:777
+#: g10/import.c:3245 g10/pkclist.c:81 g10/revoke.c:778
 msgid "Key is no longer used"
 msgstr "Nyckeln används inte längre"
 
-#: g10/import.c:3238 g10/pkclist.c:83 g10/revoke.c:778
+#: g10/import.c:3246 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "Användaridentiteten är inte längre giltig"
 
-#: g10/import.c:3363 g10/keylist.c:1105 g10/pkclist.c:87
+#: g10/import.c:3371 g10/keylist.c:1105 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "anledning för spärrning: "
 
-#: g10/import.c:3382 g10/keylist.c:1124 g10/pkclist.c:103
+#: g10/import.c:3390 g10/keylist.c:1124 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "spärrningskommentar: "
 
-#: g10/import.c:3432
+#: g10/import.c:3440
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "nyckel %s: ingen publik nyckel - kan inte verkställa spärrcertifikat\n"
 
-#: g10/import.c:3461
+#: g10/import.c:3469
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "nyckel %s: kan inte hitta det ursprungliga nyckelblocket: %s\n"
 
-#: g10/import.c:3468
+#: g10/import.c:3476
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "nyckel %s: kan inte läsa det ursprungliga nyckelblocket %s\n"
 
-#: g10/import.c:3488
+#: g10/import.c:3496
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "nyckel %s: ogiltigt spärrcertifikat: %s - avvisat\n"
 
-#: g10/import.c:3523
+#: g10/import.c:3531
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "nyckel %s: \"%s\" spärrcertifikat importerat\n"
 
-#: g10/import.c:3609
+#: g10/import.c:3617
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "nyckel %s: ingen användaridentitet för signaturen\n"
 
 # fixme: I appended the %s -wk
-#: g10/import.c:3626
+#: g10/import.c:3634
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "nyckel %s: algoritmen för publika nycklar stöds inte för "
 "användaridentiteten  \"%s\"\n"
 
-#: g10/import.c:3628
+#: g10/import.c:3636
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "nyckel %s: ogiltig självsignatur på användaridentiteten \"%s\"\n"
 
-#: g10/import.c:3645 g10/import.c:3673 g10/import.c:3729
+#: g10/import.c:3653 g10/import.c:3681 g10/import.c:3737
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "nyckel %s: algoritmen för publika nycklar stöds inte\n"
 
-#: g10/import.c:3646
+#: g10/import.c:3654
 #, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "nyckel %s: ogiltig direkt nyckelsignatur\n"
 
-#: g10/import.c:3660
+#: g10/import.c:3668
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "nyckel %s: ingen undernyckel för nyckelbindning\n"
 
-#: g10/import.c:3675
+#: g10/import.c:3683
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "nyckel %s: ogiltig undernyckelbindning\n"
 
-#: g10/import.c:3694
+#: g10/import.c:3702
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "nyckel %s: tog bort flera undernyckelbindningar\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3726
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "nyckel %s: ingen undernyckel för nyckelspärrning\n"
 
-#: g10/import.c:3731
+#: g10/import.c:3739
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "nyckel %s: ogiltig spärr av undernyckel\n"
 
-#: g10/import.c:3746
+#: g10/import.c:3754
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "nyckel %s: tog bort flera spärrar av undernyckel\n"
 
-#: g10/import.c:3790
+#: g10/import.c:3798
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "nyckel %s: hoppade över användaridentiteten \"%s\"\n"
 
-#: g10/import.c:3817
+#: g10/import.c:3825
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "nyckel %s: hoppade över undernyckel\n"
 
-#: g10/import.c:3849
+#: g10/import.c:3857
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "nyckel %s: icke-exporterbar signatur (klass 0x%02X) - hoppade över\n"
 
-#: g10/import.c:3860
+#: g10/import.c:3868
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "nyckel %s: spärrcertifikat på fel plats - hoppade över\n"
 
 # nyckeln eller certifikatet??
-#: g10/import.c:3878
+#: g10/import.c:3886
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "nyckel %s: ogiltigt spärrcertifikat: %s - hoppade över\n"
 
-#: g10/import.c:3892
+#: g10/import.c:3900
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "nyckel %s: signatur på undernyckel på fel plats - hoppade över\n"
 
 # nyckeln eller klassen?
-#: g10/import.c:3900
+#: g10/import.c:3908
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "nyckel %s: oväntad signaturklass  (0x%02X) - hoppade över\n"
 
-#: g10/import.c:4073
+#: g10/import.c:4081
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr ""
 "nyckel %s: dubblett av användaridentiteten hittades - slog samman dem\n"
 
-#: g10/import.c:4180
+#: g10/import.c:4188
 #, fuzzy, c-format
 #| msgid "key %s: duplicated user ID detected - merged\n"
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr ""
 "nyckel %s: dubblett av användaridentiteten hittades - slog samman dem\n"
 
-#: g10/import.c:4245
+#: g10/import.c:4253
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "VARNING: nyckeln %s kan ha spärrats: hämtar spärrnyckeln %s\n"
 
-#: g10/import.c:4261
+#: g10/import.c:4269
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "VARNING: nyckeln %s kan ha spärrats: spärrnyckeln %s saknas.\n"
 
-#: g10/import.c:4327
+#: g10/import.c:4335
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "nyckel %s: \"%s\" spärrcertifikat lades till\n"
 
-#: g10/import.c:4365
+#: g10/import.c:4373
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "nyckel %s: lade till direkt nyckelsignatur\n"
 
-#: g10/key-check.c:133 dirmngr/dirmngr_ldap.c:650 dirmngr/ldap-wrapper.c:835
-#: dirmngr/ldap-wrapper.c:852
+#: g10/key-check.c:133 dirmngr/ldap-wrapper.c:835 dirmngr/ldap-wrapper.c:852
 #, fuzzy, c-format
 #| msgid "error allocating enough memory: %s\n"
 msgid "error allocating memory: %s\n"
@@ -4352,7 +4366,7 @@ msgid ""
 "all signatures.\n"
 msgstr ""
 
-#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:284 sm/keydb.c:297
+#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:289 sm/keydb.c:302
 #, fuzzy, c-format
 #| msgid "error creating keybox `%s': %s\n"
 msgid "error creating keybox '%s': %s\n"
@@ -4364,7 +4378,7 @@ msgstr "fel när nyckelskåpet \"%s\" skapades: %s\n"
 msgid "error creating keyring '%s': %s\n"
 msgstr "fel när nyckelringen \"%s\" skapades: %s\n"
 
-#: g10/keydb.c:388 sm/keydb.c:303
+#: g10/keydb.c:388 sm/keydb.c:308
 #, fuzzy, c-format
 #| msgid "keybox `%s' created\n"
 msgid "keybox '%s' created\n"
@@ -4624,8 +4638,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:6192 g10/keyedit.c:6275 g10/keyedit.c:6404
-#: g10/keyedit.c:6466 g10/sign.c:528
+#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
+#: g10/keyedit.c:6474 g10/sign.c:528
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signeringen misslyckades: %s\n"
@@ -5030,7 +5044,7 @@ msgstr "Ingen sådan användaridentitet.\n"
 msgid "Nothing to sign.\n"
 msgstr "Det finns inget att signera med nyckeln %s\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6057
+#: g10/keyedit.c:2973 g10/keyedit.c:6065
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "Inte signerad av dig.\n"
@@ -5103,7 +5117,7 @@ msgstr "Den här nyckeln kan vara spärrad av %s nyckel %s"
 msgid "(sensitive)"
 msgstr "(känsligt)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:525
+#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "skapat: %s"
@@ -5119,7 +5133,7 @@ msgid "expired: %s"
 msgstr "utgånget: %s"
 
 #: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2262
-#: g10/keyserver.c:531
+#: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "går ut: %s"
@@ -5155,13 +5169,13 @@ 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:535
-#: g10/mainproc.c:2280 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
+#: g10/mainproc.c:2282 g10/tofu.c:1789 g10/trust.c:426 dirmngr/ocsp.c:792
 msgid "revoked"
 msgstr "spärrad"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:539
-#: g10/mainproc.c:2282 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
+#: g10/mainproc.c:2284 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "utgånget"
 
@@ -5203,7 +5217,7 @@ msgstr "Vill du verkligen fortfarande lägga till den? (j/N) "
 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:3107
+#: g10/keyedit.c:4273 g10/keygen.c:3111
 msgid "Such a user ID already exists on this key!\n"
 msgstr "En sådan användaridentitet finns redan på denna nyckel!\n"
 
@@ -5358,7 +5372,7 @@ msgstr "undernyckeln %s signerar inte och behöver inte korscertifieras\n"
 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:5357 g10/keyedit.c:5495
+#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "hoppar över v3-självsignatur på användaridentiteten \"%s\"\n"
@@ -5368,133 +5382,133 @@ 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:5380
+#: g10/keyedit.c:5383
 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:5381
+#: g10/keyedit.c:5384
 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:5441
+#: g10/keyedit.c:5449
 msgid "Enter the notation: "
 msgstr "Ange notationen: "
 
-#: g10/keyedit.c:5588
+#: g10/keyedit.c:5596
 msgid "Proceed? (y/N) "
 msgstr "Fortsätt? (j/N) "
 
-#: g10/keyedit.c:5658
+#: g10/keyedit.c:5666
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen användaridentitet med indexet %d\n"
 
-#: g10/keyedit.c:5720
+#: g10/keyedit.c:5728
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Ingen användaridentitet med hashen %s\n"
 
-#: g10/keyedit.c:5821
+#: g10/keyedit.c:5829
 #, 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:5843
+#: g10/keyedit.c:5851
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Ingen undernyckel med indexet %d\n"
 
-#: g10/keyedit.c:5984
+#: g10/keyedit.c:5992
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "användaridentitet: \"%s\"\n"
 
-#: g10/keyedit.c:5987 g10/keyedit.c:6089 g10/keyedit.c:6137
+#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
 #, 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:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
+#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
 msgid " (non-exportable)"
 msgstr "  (icke exporterbar)"
 
-#: g10/keyedit.c:5993
+#: g10/keyedit.c:6001
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denna signatur gick ut den %s.\n"
 
 # nyckel? signatur?
-#: g10/keyedit.c:5998
+#: g10/keyedit.c:6006
 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:6003
+#: g10/keyedit.c:6011
 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:6063
+#: g10/keyedit.c:6071
 #, 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:6092
+#: g10/keyedit.c:6100
 msgid " (non-revocable)"
 msgstr " (inte spärrbar)"
 
-#: g10/keyedit.c:6099
+#: g10/keyedit.c:6107
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "spärrad av din nyckel %s den %s\n"
 
-#: g10/keyedit.c:6124
+#: g10/keyedit.c:6132
 msgid "You are about to revoke these signatures:\n"
 msgstr "Du är på väg att spärra dessa signaturer:\n"
 
-#: g10/keyedit.c:6147
+#: g10/keyedit.c:6155
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Vill du verkligen skapa spärrcertifikatet? (j/N) "
 
-#: g10/keyedit.c:6180
+#: g10/keyedit.c:6188
 #, c-format
 msgid "no secret key\n"
 msgstr "ingen hemlig nyckel\n"
 
-#: g10/keyedit.c:6228
+#: g10/keyedit.c:6236
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6238
+#: g10/keyedit.c:6246
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "användaridentiteten \"%s\" är redan spärrad\n"
 
-#: g10/keyedit.c:6255
+#: g10/keyedit.c:6263
 #, 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:6351
+#: g10/keyedit.c:6359
 #, 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:6389
+#: g10/keyedit.c:6397
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Nyckeln %s är redan spärrad.\n"
 
-#: g10/keyedit.c:6451
+#: g10/keyedit.c:6459
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Undernyckeln %s är redan spärrad.\n"
 
-#: g10/keyedit.c:6548
+#: g10/keyedit.c:6556
 #, 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"
@@ -5505,66 +5519,66 @@ msgstr "Visar %s foto-id med storleken %ld för nyckeln %s (uid %d)\n"
 msgid "invalid value for option '%s'\n"
 msgstr "argument för flaggan \"%.50s\" saknas\n"
 
-#: g10/keygen.c:338
+#: g10/keygen.c:339
 #, fuzzy, c-format
 #| msgid "preference `%s' duplicated\n"
 msgid "preference '%s' duplicated\n"
 msgstr "inställningen \"%s\" förekommer flera gånger\n"
 
-#: g10/keygen.c:345
+#: g10/keygen.c:346
 #, c-format
 msgid "too many cipher preferences\n"
 msgstr "för många chifferinställningar\n"
 
-#: g10/keygen.c:347
+#: g10/keygen.c:348
 #, c-format
 msgid "too many digest preferences\n"
 msgstr "för många sammandragsinställningar\n"
 
-#: g10/keygen.c:349
+#: g10/keygen.c:350
 #, c-format
 msgid "too many compression preferences\n"
 msgstr "för många komprimeringsinställningar\n"
 
-#: g10/keygen.c:351
+#: g10/keygen.c:352
 #, fuzzy, c-format
 #| msgid "too many cipher preferences\n"
 msgid "too many AEAD preferences\n"
 msgstr "för många chifferinställningar\n"
 
-#: g10/keygen.c:521
+#: g10/keygen.c:522
 #, fuzzy, c-format
 #| msgid "invalid item `%s' in preference string\n"
 msgid "invalid item '%s' in preference string\n"
 msgstr "ogiltig post \"%s\" i inställningssträngen\n"
 
-#: g10/keygen.c:1130
+#: g10/keygen.c:1131
 #, c-format
 msgid "writing direct signature\n"
 msgstr "skriver direkt signatur\n"
 
-#: g10/keygen.c:1176
+#: g10/keygen.c:1177
 #, c-format
 msgid "writing self signature\n"
 msgstr "skriver självsignatur\n"
 
-#: g10/keygen.c:1233
+#: g10/keygen.c:1234
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "skriver signatur knuten till nyckeln\n"
 
-#: g10/keygen.c:1598 g10/keygen.c:1603 g10/keygen.c:1655 g10/keygen.c:1660
-#: g10/keygen.c:1832 g10/keygen.c:1837
+#: g10/keygen.c:1599 g10/keygen.c:1604 g10/keygen.c:1656 g10/keygen.c:1661
+#: g10/keygen.c:1833 g10/keygen.c:1838
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "ogiltig nyckelstorlek; använder %u bitar\n"
 
-#: g10/keygen.c:1609 g10/keygen.c:1666 g10/keygen.c:1674 g10/keygen.c:1843
+#: g10/keygen.c:1610 g10/keygen.c:1667 g10/keygen.c:1675 g10/keygen.c:1844
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "nyckelstorleken avrundad uppåt till %u bitar\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1701
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
@@ -5572,19 +5586,19 @@ msgstr ""
 "VARNING: vissa OpenPGP-program kan inte hantera en DSA-nyckel med den här "
 "sammandragsstorleken\n"
 
-#: g10/keygen.c:1899
+#: g10/keygen.c:1900
 msgid "Sign"
 msgstr "Signera"
 
-#: g10/keygen.c:1902
+#: g10/keygen.c:1903
 msgid "Certify"
 msgstr "Certifiera"
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1906
 msgid "Encrypt"
 msgstr "Kryptera"
 
-#: g10/keygen.c:1908
+#: g10/keygen.c:1909
 msgid "Authenticate"
 msgstr "Autentisera"
 
@@ -5602,185 +5616,185 @@ msgstr "Autentisera"
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1929
+#: g10/keygen.c:1930
 msgid "SsEeAaQq"
 msgstr "SsKkAaQq"
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1967
 #, fuzzy, c-format
 #| msgid "Possible actions for a %s key: "
 msgid "Possible actions for this %s key: "
 msgstr "Möjliga åtgärder för en %s-nyckel: "
 
-#: g10/keygen.c:1973
+#: g10/keygen.c:1974
 msgid "Current allowed actions: "
 msgstr "För närvarande tillåtna åtgärder: "
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1979
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Växla signeringsförmågan\n"
 
-#: g10/keygen.c:1981
+#: g10/keygen.c:1982
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Växla krypteringsförmågan\n"
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1985
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Växla autentiseringsförmågan\n"
 
-#: g10/keygen.c:1987
+#: g10/keygen.c:1988
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Färdig\n"
 
-#: g10/keygen.c:2116
+#: g10/keygen.c:2117
 #, fuzzy, c-format
 #| msgid "   (%d) RSA and RSA (default)\n"
 msgid "   (%d) RSA and RSA%s\n"
 msgstr "   (%d) RSA och RSA (standard)\n"
 
-#: g10/keygen.c:2120
+#: g10/keygen.c:2121
 #, fuzzy, c-format
 #| msgid "   (%d) DSA and Elgamal\n"
 msgid "   (%d) DSA and Elgamal%s\n"
 msgstr "   (%d) DSA och Elgamal\n"
 
-#: g10/keygen.c:2123
+#: g10/keygen.c:2124
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "   (%d) DSA (sign only)%s\n"
 msgstr "   (%d) DSA (endast signering)\n"
 
-#: g10/keygen.c:2125
+#: g10/keygen.c:2126
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (sign only)\n"
 msgid "   (%d) RSA (sign only)%s\n"
 msgstr "   (%d) RSA (endast signering)\n"
 
-#: g10/keygen.c:2131
+#: g10/keygen.c:2132
 #, fuzzy, c-format
 #| msgid "   (%d) Elgamal (encrypt only)\n"
 msgid "   (%d) Elgamal (encrypt only)%s\n"
 msgstr "   (%d) Elgamal (endast kryptering)\n"
 
-#: g10/keygen.c:2133
+#: g10/keygen.c:2134
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (encrypt only)\n"
 msgid "   (%d) RSA (encrypt only)%s\n"
 msgstr "   (%d) RSA (endast kryptering)\n"
 
-#: g10/keygen.c:2139
+#: g10/keygen.c:2140
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (set your own capabilities)\n"
 msgid "   (%d) DSA (set your own capabilities)%s\n"
 msgstr "   (%d) DSA (ställ in dina egna förmågor)\n"
 
-#: g10/keygen.c:2141
+#: g10/keygen.c:2142
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (set your own capabilities)\n"
 msgid "   (%d) RSA (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (ställ in dina egna förmågor)\n"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2148
 #, fuzzy, c-format
 #| msgid "   (%d) sign, encrypt\n"
 msgid "   (%d) ECC (sign and encrypt)%s\n"
 msgstr "   (%d) signering, kryptering\n"
 
-#: g10/keygen.c:2147 g10/keygen.c:2678
+#: g10/keygen.c:2148 g10/keygen.c:2679
 msgid " *default*"
 msgstr ""
 
-#: g10/keygen.c:2148
+#: g10/keygen.c:2149
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "  (%d) ECC (sign only)\n"
 msgstr "   (%d) DSA (endast signering)\n"
 
-#: g10/keygen.c:2150
+#: g10/keygen.c:2151
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (set your own capabilities)\n"
 msgid "  (%d) ECC (set your own capabilities)%s\n"
 msgstr "   (%d) DSA (ställ in dina egna förmågor)\n"
 
-#: g10/keygen.c:2152
+#: g10/keygen.c:2153
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (encrypt only)\n"
 msgid "  (%d) ECC (encrypt only)%s\n"
 msgstr "   (%d) RSA (endast kryptering)\n"
 
-#: g10/keygen.c:2156
+#: g10/keygen.c:2157
 #, fuzzy, c-format
 #| msgid "   (%d) Existing key\n"
 msgid "  (%d) Existing key%s\n"
 msgstr "   (%d) Befintlig nyckel\n"
 
-#: g10/keygen.c:2158
+#: g10/keygen.c:2159
 #, fuzzy, c-format
 #| msgid "   (%d) Existing key from card\n"
 msgid "  (%d) Existing key from card%s\n"
 msgstr "   (%d) Befintlig nyckel från kort\n"
 
-#: g10/keygen.c:2254 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2255 sm/certreqgen-ui.c:203
 msgid "Enter the keygrip: "
 msgstr "Ange nyckelhashen: "
 
-#: g10/keygen.c:2267 sm/certreqgen-ui.c:211 tools/gpg-card.c:2280
+#: g10/keygen.c:2268 sm/certreqgen-ui.c:211 tools/gpg-card.c:2297
 #, c-format
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr "Inte en giltig nyckelhash (förväntade 40 hexadecimala siffror)\n"
 
-#: g10/keygen.c:2269 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2270 sm/certreqgen-ui.c:213
 msgid "No key with this keygrip\n"
 msgstr "Ingen nyckel med denna nyckelhash\n"
 
-#: g10/keygen.c:2288 g10/keygen.c:2298 g10/keygen.c:3440 g10/keygen.c:3451
+#: g10/keygen.c:2289 g10/keygen.c:2299 g10/keygen.c:3444 g10/keygen.c:3455
 #: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
 #, c-format
 msgid "error reading the card: %s\n"
 msgstr "fel vid läsning av kortet: %s\n"
 
-#: g10/keygen.c:2292 g10/keygen.c:3444 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2293 g10/keygen.c:3448 sm/certreqgen-ui.c:234
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "Serienummer för kortet: %s\n"
 
-#: g10/keygen.c:2311 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2312 sm/certreqgen-ui.c:246
 msgid "Available keys:\n"
 msgstr "Tillgängliga nycklar:\n"
 
-#: g10/keygen.c:2504 g10/keygen.c:2518
+#: g10/keygen.c:2505 g10/keygen.c:2519
 #, fuzzy, c-format
 #| msgid "rounded up to %u bits\n"
 msgid "rounded to %u bits\n"
 msgstr "avrundade uppåt till %u bitar\n"
 
-#: g10/keygen.c:2559
+#: g10/keygen.c:2560
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s-nycklar kan vara mellan %u och %u bitar långa.\n"
 
-#: g10/keygen.c:2567
+#: g10/keygen.c:2568
 #, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Vilken nyckelstorlek vill du använda för undernyckeln? (%u) "
 
-#: g10/keygen.c:2584 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2585 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Den efterfrågade nyckelstorleken är %u bitar\n"
 
-#: g10/keygen.c:2630
+#: g10/keygen.c:2631
 #, fuzzy
 #| msgid "Please select what kind of key you want:\n"
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Välj vilken typ av nyckel du vill ha:\n"
 
 # borde kolla upp möjligheterna i källkoden att använda v m å istället för wmy
-#: g10/keygen.c:2819
+#: g10/keygen.c:2820
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5797,7 +5811,7 @@ msgstr ""
 "      <n>y = nyckeln blir ogiltig efter n år\n"
 
 # borde kolla upp möjligheterna i källkoden att använda v m å istället för wmy
-#: g10/keygen.c:2830
+#: g10/keygen.c:2831
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5813,38 +5827,38 @@ msgstr ""
 "      <n>m = signaturen blir ogiltig efter n månader\n"
 "      <n>y = signaturen blir ogiltig efter n år\n"
 
-#: g10/keygen.c:2853
+#: g10/keygen.c:2854
 msgid "Key is valid for? (0) "
 msgstr "För hur lång tid ska nyckeln vara giltig? (0) "
 
-#: g10/keygen.c:2858
+#: g10/keygen.c:2859
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Signaturen är giltig hur länge? (%s) "
 
-#: g10/keygen.c:2871 g10/keygen.c:2896
+#: g10/keygen.c:2875 g10/keygen.c:2900
 msgid "invalid value\n"
 msgstr "ogiltigt värde\n"
 
-#: g10/keygen.c:2878
+#: g10/keygen.c:2882
 msgid "Key does not expire at all\n"
 msgstr "Nyckeln går aldrig ut\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2883
 msgid "Signature does not expire at all\n"
 msgstr "Signaturen går aldrig ut\n"
 
-#: g10/keygen.c:2884
+#: g10/keygen.c:2888
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Nyckeln går ut %s\n"
 
-#: g10/keygen.c:2885
+#: g10/keygen.c:2889
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Signaturen går ut %s\n"
 
-#: g10/keygen.c:2889
+#: g10/keygen.c:2893
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5852,11 +5866,11 @@ msgstr ""
 "Ditt system kan inte visa datum senare än år 2038.\n"
 "Datum fram till år 2106 kommer dock att hanteras korrekt.\n"
 
-#: g10/keygen.c:2902
+#: g10/keygen.c:2906
 msgid "Is this correct? (y/N) "
 msgstr "Stämmer detta? (j/N) "
 
-#: g10/keygen.c:2970
+#: g10/keygen.c:2974
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5871,7 +5885,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2985
+#: g10/keygen.c:2989
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5889,50 +5903,50 @@ msgstr ""
 "    \"Gustav Vasa (Brutal kung) <gustav@trekronor.se>\"\n"
 "\n"
 
-#: g10/keygen.c:3004
+#: g10/keygen.c:3008
 msgid "Real name: "
 msgstr "Namn: "
 
-#: g10/keygen.c:3013
+#: g10/keygen.c:3017
 msgid "Invalid character in name\n"
 msgstr "Ogiltigt tecken i namnet\n"
 
-#: g10/keygen.c:3014
+#: g10/keygen.c:3018
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:3018
+#: g10/keygen.c:3022
 msgid "Name may not start with a digit\n"
 msgstr "Namnet får inte börja med en siffra\n"
 
-#: g10/keygen.c:3021
+#: g10/keygen.c:3025
 msgid "Name must be at least 5 characters long\n"
 msgstr "Namnet måste vara åtminstone 5 tecken långt\n"
 
-#: g10/keygen.c:3031
+#: g10/keygen.c:3035
 msgid "Email address: "
 msgstr "E-postadress: "
 
-#: g10/keygen.c:3037
+#: g10/keygen.c:3041
 msgid "Not a valid email address\n"
 msgstr "E-postadressen är ogiltig\n"
 
-#: g10/keygen.c:3046
+#: g10/keygen.c:3050
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:3052
+#: g10/keygen.c:3056
 msgid "Invalid character in comment\n"
 msgstr "Ogiltigt tecken i kommentaren\n"
 
-#: g10/keygen.c:3088
+#: g10/keygen.c:3092
 #, fuzzy, c-format
 #| msgid "You are using the `%s' character set.\n"
 msgid "You are using the '%s' character set.\n"
 msgstr "Du använder teckentabellen \"%s\"\n"
 
-#: g10/keygen.c:3094
+#: g10/keygen.c:3098
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5943,7 +5957,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3099
+#: g10/keygen.c:3103
 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"
 
@@ -5959,35 +5973,35 @@ msgstr "Ange inte e-postadressen som namn eller kommentar\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3124
+#: g10/keygen.c:3128
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoAa"
 
-#: g10/keygen.c:3134
+#: g10/keygen.c:3138
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Ändra (N)amn, (K)ommentar, (E)post eller (A)vsluta? "
 
-#: g10/keygen.c:3135
+#: g10/keygen.c:3139
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Ändra (N)amn, (K)ommentar, (E)post eller (O)k/(A)vsluta? "
 
-#: g10/keygen.c:3140
+#: g10/keygen.c:3144
 #, fuzzy
 #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Ändra (N)amn, (K)ommentar, (E)post eller (A)vsluta? "
 
-#: g10/keygen.c:3141
+#: g10/keygen.c:3145
 #, fuzzy
 #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "Ändra (N)amn, (K)ommentar, (E)post eller (O)k/(A)vsluta? "
 
-#: g10/keygen.c:3160
+#: g10/keygen.c:3164
 msgid "Please correct the error first\n"
 msgstr "Rätta först felet\n"
 
-#: g10/keygen.c:3206
+#: g10/keygen.c:3210
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -5999,18 +6013,18 @@ msgstr ""
 "hårddisken) under primtalsgenereringen; detta ger slumptalsgeneratorn\n"
 "en större chans att samla ihop en tillräcklig mängd slumpmässig data.\n"
 
-#: g10/keygen.c:3591
+#: g10/keygen.c:3595
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4590 g10/keygen.c:4663 g10/keygen.c:4681 g10/keygen.c:4710
-#: g10/keygen.c:5086 g10/keygen.c:5632 g10/keygen.c:5943 g10/keygen.c:6050
+#: g10/keygen.c:4594 g10/keygen.c:4667 g10/keygen.c:4685 g10/keygen.c:4714
+#: g10/keygen.c:5113 g10/keygen.c:5663 g10/keygen.c:5974 g10/keygen.c:6081
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Nyckelgenereringen misslyckades: %s\n"
 
-#: g10/keygen.c:4599
+#: g10/keygen.c:4603
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -6018,73 +6032,73 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:4601
+#: g10/keygen.c:4605
 msgid "Continue? (Y/n) "
 msgstr ""
 
-#: g10/keygen.c:4622
+#: g10/keygen.c:4626
 #, fuzzy, c-format
 #| msgid "key already exists\n"
 msgid "A key for \"%s\" already exists\n"
 msgstr "nyckeln finns redan\n"
 
-#: g10/keygen.c:4627
+#: g10/keygen.c:4631
 #, fuzzy
 #| msgid "Use this key anyway? (y/N) "
 msgid "Create anyway? (y/N) "
 msgstr "Vill du använda nyckeln ändå? (j/N) "
 
-#: g10/keygen.c:4633
+#: g10/keygen.c:4637
 #, fuzzy, c-format
 #| msgid "generating new key\n"
 msgid "creating anyway\n"
 msgstr "genererar ny nyckel\n"
 
-#: g10/keygen.c:5069
+#: g10/keygen.c:5096
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 
-#: g10/keygen.c:5118
+#: g10/keygen.c:5145
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Skapandet av nycklar avbröts.\n"
 
-#: g10/keygen.c:5178
+#: g10/keygen.c:5205
 #, fuzzy, c-format
 #| msgid "can't create backup file `%s': %s\n"
 msgid "can't create backup file '%s': %s\n"
 msgstr "kan inte skapa säkerhetskopian \"%s\": %s\n"
 
-#: g10/keygen.c:5198
+#: g10/keygen.c:5225
 #, fuzzy, c-format
 #| msgid "NOTE: backup of card key saved to `%s'\n"
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "OBSERVERA: säkerhetskopia av kortnyckeln sparades i \"%s\"\n"
 
-#: g10/keygen.c:5359 g10/keygen.c:5561
+#: g10/keygen.c:5389 g10/keygen.c:5591
 #, fuzzy, c-format
 #| msgid "writing public key to `%s'\n"
 msgid "writing public key to '%s'\n"
 msgstr "skriver den publika nyckeln till \"%s\"\n"
 
-#: g10/keygen.c:5555
+#: g10/keygen.c:5585
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "ingen skrivbar publik nyckelring hittades: %s\n"
 
-#: g10/keygen.c:5569
+#: g10/keygen.c:5599
 #, fuzzy, c-format
 #| msgid "error writing public keyring `%s': %s\n"
 msgid "error writing public keyring '%s': %s\n"
 msgstr "fel vid skrivning av publika nyckelringen \"%s\": %s\n"
 
-#: g10/keygen.c:5603
+#: g10/keygen.c:5634
 msgid "public and secret key created and signed.\n"
 msgstr "den publika och den hemliga nyckeln är skapade och signerade.\n"
 
 # Flagga.. inte kommando
-#: g10/keygen.c:5619
+#: g10/keygen.c:5650
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -6094,7 +6108,7 @@ msgstr ""
 "syfte.\n"
 
 # c-format behövs inte i singularis
-#: g10/keygen.c:5801 g10/keygen.c:6000
+#: g10/keygen.c:5832 g10/keygen.c:6031
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -6102,7 +6116,7 @@ msgstr ""
 "nyckeln är skapad %lu sekund in i framtiden (problemet är\n"
 "relaterat till tidsresande eller en felställd klocka)\n"
 
-#: g10/keygen.c:5803 g10/keygen.c:6002
+#: g10/keygen.c:5834 g10/keygen.c:6033
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -6110,23 +6124,23 @@ msgstr ""
 "nyckeln är skapad %lu sekunder in i framtiden (problemet är\n"
 "relaterat till tidsresande eller en felställd klocka)\n"
 
-#: g10/keygen.c:5814 g10/keygen.c:6013
+#: g10/keygen.c:5845 g10/keygen.c:6044
 #, fuzzy, c-format
 #| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "OBS: att skapa undernycklar till v3-nycklar bryter mot OpenPGP\n"
 
-#: g10/keygen.c:5826 g10/keygen.c:5828
+#: g10/keygen.c:5857 g10/keygen.c:5859
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "De hemliga delarna av den primära nyckeln är inte tillgängliga.\n"
 
-#: g10/keygen.c:5835 g10/keygen.c:5837
+#: g10/keygen.c:5866 g10/keygen.c:5868
 #, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Hemliga delar av den primära nyckeln är lagrade på kortet.\n"
 
-#: g10/keygen.c:5857 g10/keygen.c:6027
+#: g10/keygen.c:5888 g10/keygen.c:6058
 msgid "Really create? (y/N) "
 msgstr "Verkligen skapa? (j/N) "
 
@@ -6207,13 +6221,13 @@ msgstr "Nyckelns fingeravtryck ="
 msgid "      Card serial no. ="
 msgstr "       Kortets serienr ="
 
-#: g10/keyring.c:1467
+#: g10/keyring.c:1477
 #, fuzzy, c-format
 #| msgid "caching keyring `%s'\n"
 msgid "caching keyring '%s'\n"
 msgstr "mellanlagrar nyckelringen \"%s\"\n"
 
-#: g10/keyring.c:1541
+#: g10/keyring.c:1551
 #, fuzzy, c-format
 #| msgid "%lu keys cached so far (%lu signatures)\n"
 msgid "%lu keys cached so far (%lu signature)\n"
@@ -6221,14 +6235,14 @@ msgid_plural "%lu keys cached so far (%lu signatures)\n"
 msgstr[0] "%lu nycklar mellanlagrade än så länge (%lu signaturer)\n"
 msgstr[1] "%lu nycklar mellanlagrade än så länge (%lu signaturer)\n"
 
-#: g10/keyring.c:1557
+#: g10/keyring.c:1567
 #, c-format
 msgid "%lu key cached"
 msgid_plural "%lu keys cached"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/keyring.c:1559
+#: g10/keyring.c:1569
 #, fuzzy, c-format
 #| msgid "1 bad signature\n"
 msgid " (%lu signature)\n"
@@ -6236,7 +6250,7 @@ msgid_plural " (%lu signatures)\n"
 msgstr[0] "1 felaktig signatur\n"
 msgstr[1] "1 felaktig signatur\n"
 
-#: g10/keyring.c:1636
+#: g10/keyring.c:1646
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: nyckelring skapad\n"
@@ -6265,25 +6279,25 @@ msgstr "hämta automatiskt nycklar vid validering av signaturer"
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "respektera föredragen nyckelserver-url inställd i nyckeln"
 
-#: g10/keyserver.c:537
+#: g10/keyserver.c:360
 msgid "disabled"
 msgstr "inaktiverad"
 
-#: g10/keyserver.c:740
+#: g10/keyserver.c:563
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Ange nummer, N)ästa, eller Q) för Avsluta > "
 
-#: g10/keyserver.c:846
+#: g10/keyserver.c:669
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "ogiltigt nyckelserverprotokoll (vi %d!=hanterare %d)\n"
 
-#: g10/keyserver.c:986 g10/keyserver.c:1096
+#: g10/keyserver.c:809 g10/keyserver.c:919
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" inte ett nyckel-id: hoppar över\n"
 
-#: g10/keyserver.c:1420 g10/keyserver.c:1453
+#: g10/keyserver.c:1217 g10/keyserver.c:1250
 #, fuzzy, c-format
 #| msgid "refreshing %d keys from %s\n"
 msgid "refreshing %d key from %s\n"
@@ -6291,54 +6305,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:1427
+#: g10/keyserver.c:1224
 #, 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:1531
+#: g10/keyserver.c:1316
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "nyckeln \"%s\" hittades inte på nyckelservern\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1319
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "nyckeln hittades inte på nyckelservern\n"
 
-#: g10/keyserver.c:1722
-#, c-format
-msgid "requesting key %s from %s server %s\n"
-msgstr "begär nyckeln %s från %s-servern %s\n"
-
-#: g10/keyserver.c:1726
+#: g10/keyserver.c:1481
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "begär nyckeln %s från %s\n"
 
-#: g10/keyserver.c:1841 g10/keyserver.c:2020
+#: g10/keyserver.c:1600 g10/keyserver.c:1793
 #, fuzzy, c-format
 #| msgid "no keyserver action!\n"
 msgid "no keyserver known\n"
 msgstr "ingen nyckelserveråtgärd!\n"
 
-#: g10/keyserver.c:1856 g10/skclist.c:213 g10/skclist.c:241
+#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "hoppade över \"%s\": %s\n"
 
-#: g10/keyserver.c:1860
+#: g10/keyserver.c:1619
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "skickar nyckeln %s till %s\n"
 
-#: g10/keyserver.c:1901
+#: g10/keyserver.c:1662
 #, 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:1917
+#: g10/keyserver.c:1680
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "VARNING: kunde inte hämta uri:n %s: %s\n"
@@ -6365,60 +6374,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:472
+#: g10/mainproc.c:473
 #, c-format
 msgid "public key is %s\n"
 msgstr "publik nyckel är %s\n"
 
-#: g10/mainproc.c:524
+#: g10/mainproc.c:525
 #, 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:528 g10/pkclist.c:231
+#: g10/mainproc.c:529 g10/pkclist.c:231
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:532
+#: g10/mainproc.c:533
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "krypterad med %s-nyckel, id %s\n"
 
-#: g10/mainproc.c:552 g10/mainproc.c:935
+#: g10/mainproc.c:553 g10/mainproc.c:937
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "VARNING: multipla klartexter har påträffats\n"
 
-#: g10/mainproc.c:560
+#: g10/mainproc.c:561
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "krypterad med %lu lösenfraser\n"
 
-#: g10/mainproc.c:562
+#: g10/mainproc.c:563
 #, 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:577 g10/mainproc.c:602
+#: g10/mainproc.c:578 g10/mainproc.c:603
 #, 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:613
+#: g10/mainproc.c:614
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "Data krypterat med publik nyckel: korrekt DEK\n"
 
-#: g10/mainproc.c:642 g10/mainproc.c:663
+#: g10/mainproc.c:643 g10/mainproc.c:664
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "antar att %s krypterade data\n"
 
-#: g10/mainproc.c:649
+#: g10/mainproc.c:650
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
@@ -6426,191 +6435,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:742 g10/mainproc.c:780
+#: g10/mainproc.c:744 g10/mainproc.c:782
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "VARNING: detta meddelande var inte integritetsskyddat\n"
 
-#: g10/mainproc.c:753
+#: g10/mainproc.c:755
 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:756
+#: g10/mainproc.c:758
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:761
+#: g10/mainproc.c:763
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "dekrypteringen misslyckades: %s\n"
 
-#: g10/mainproc.c:773
+#: g10/mainproc.c:775
 #, 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:786
+#: g10/mainproc.c:788
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VARNING: det krypterade meddelandet har ändrats!\n"
 
-#: g10/mainproc.c:804
+#: g10/mainproc.c:806
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekrypteringen misslyckades: %s\n"
 
-#: g10/mainproc.c:851
+#: g10/mainproc.c:853
 #, 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:858
+#: g10/mainproc.c:860
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "ursprungligt filnamn=\"%.*s\"\n"
 
-#: g10/mainproc.c:1135
+#: g10/mainproc.c:1137
 #, 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:1440 g10/mainproc.c:1483
+#: g10/mainproc.c:1442 g10/mainproc.c:1485
 #, c-format
 msgid "no signature found\n"
 msgstr "ingen signatur hittades\n"
 
-#: g10/mainproc.c:1763
+#: g10/mainproc.c:1765
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "FELAKTIG signatur från \"%s\""
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1767
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Utgången signatur från \"%s\""
 
-#: g10/mainproc.c:1767
+#: g10/mainproc.c:1769
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Korrekt signatur från \"%s\""
 
-#: g10/mainproc.c:1789
+#: g10/mainproc.c:1791
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "signaturvalidering utlämnad\n"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1905
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "kan inte hantera detta tvetydliga signaturdata\n"
 
-#: g10/mainproc.c:1919 g10/mainproc.c:1926
+#: g10/mainproc.c:1921 g10/mainproc.c:1928
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Signatur gjord %s\n"
 
-#: g10/mainproc.c:1920 g10/mainproc.c:1927 sm/verify.c:480
+#: g10/mainproc.c:1922 g10/mainproc.c:1929 sm/verify.c:480
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "             med %s-nyckeln %s\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1933
 #, 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:1937
+#: g10/mainproc.c:1939
 #, fuzzy, c-format
 #| msgid "                aka \"%s\""
 msgid "               issuer \"%s\"\n"
 msgstr "      även känd som \"%s\""
 
-#: g10/mainproc.c:1992
+#: g10/mainproc.c:1994
 #, c-format
 msgid "Key available at: "
 msgstr "Nyckeln tillgänglig hos: "
 
-#: g10/mainproc.c:2034
+#: g10/mainproc.c:2036
 #, 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:2234
+#: g10/mainproc.c:2236
 msgid "[uncertain]"
 msgstr "[osäkert]"
 
-#: g10/mainproc.c:2272
+#: g10/mainproc.c:2274
 #, c-format
 msgid "                aka \"%s\""
 msgstr "      även känd som \"%s\""
 
-#: g10/mainproc.c:2347
+#: g10/mainproc.c:2349
 #, 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:2363
+#: g10/mainproc.c:2365
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Giltighetstiden för signaturen har upphört %s\n"
 
-#: g10/mainproc.c:2368
+#: g10/mainproc.c:2370
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Giltighetstiden för signaturen går ut %s\n"
 
-#: g10/mainproc.c:2379
+#: g10/mainproc.c:2381
 #, 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:2380
+#: g10/mainproc.c:2382
 msgid "binary"
 msgstr "binär"
 
-#: g10/mainproc.c:2381
+#: g10/mainproc.c:2383
 msgid "textmode"
 msgstr "textläge"
 
-#: g10/mainproc.c:2381 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2383 g10/trust.c:112 dirmngr/ocsp.c:793
 msgid "unknown"
 msgstr "okänd"
 
-#: g10/mainproc.c:2383
+#: g10/mainproc.c:2385
 #, fuzzy
 #| msgid "algorithm: %s"
 msgid ", key algorithm "
 msgstr "algoritm: %s"
 
-#: g10/mainproc.c:2418
+#: g10/mainproc.c:2420
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2457
+#: g10/mainproc.c:2459
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan inte kontrollera signaturen: %s\n"
 
-#: g10/mainproc.c:2553 g10/mainproc.c:2572 g10/mainproc.c:2696
+#: g10/mainproc.c:2555 g10/mainproc.c:2574 g10/mainproc.c:2698
 #, c-format
 msgid "not a detached signature\n"
 msgstr "detta är inte någon signatur i en separat fil\n"
 
-#: g10/mainproc.c:2606
+#: g10/mainproc.c:2608
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
@@ -6618,12 +6627,12 @@ msgstr ""
 "VARNING: multipla signaturer upptäckta. Endast den första kommer att "
 "kontrolleras.\n"
 
-#: g10/mainproc.c:2615
+#: g10/mainproc.c:2617
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "fristående signatur av klassen 0x%02x\n"
 
-#: g10/mainproc.c:2700
+#: g10/mainproc.c:2702
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signatur av den gamla (PGP 2.x) typen\n"
@@ -6815,57 +6824,63 @@ msgstr "Kritisk signaturnotation: "
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "underpaket av typen %d har den bit satt som markerar den som kritisk\n"
 
-#: g10/passphrase.c:208
+#: g10/passphrase.c:201 sm/decrypt.c:669
+#, fuzzy
+#| msgid "Please enter the new passphrase"
+msgid "Please enter the passphrase for decryption."
+msgstr "Ange den nya lösenfrasen"
+
+#: g10/passphrase.c:203
 msgid "Enter passphrase\n"
 msgstr "Ange lösenfrasen\n"
 
-#: g10/passphrase.c:219
+#: g10/passphrase.c:227
 #, c-format
 msgid "cancelled by user\n"
 msgstr "avbruten av användaren\n"
 
-#: g10/passphrase.c:460
+#: g10/passphrase.c:472
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (primära nyckelns id %s)"
 
-#: g10/passphrase.c:467
+#: g10/passphrase.c:479
 #, fuzzy
 #| msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 msgstr "Ange lösenfrasen för att avskydda PKCS#12-objektet."
 
-#: g10/passphrase.c:471
+#: g10/passphrase.c:483
 #, fuzzy
 #| msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgid "Please enter the passphrase to import the OpenPGP secret key:"
 msgstr "Ange lösenfrasen för att skydda det nya PKCS#12-objektet."
 
-#: g10/passphrase.c:476
+#: g10/passphrase.c:488
 #, fuzzy
 #| msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 msgstr "Ange lösenfrasen för att skydda det nya PKCS#12-objektet."
 
-#: g10/passphrase.c:479
+#: g10/passphrase.c:491
 #, fuzzy
 #| msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgid "Please enter the passphrase to export the OpenPGP secret key:"
 msgstr "Ange lösenfrasen för att skydda det nya PKCS#12-objektet."
 
-#: g10/passphrase.c:484
+#: g10/passphrase.c:496
 #, fuzzy
 #| msgid "Do you really want to delete the selected keys? (y/N) "
 msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 msgstr "Vill du verkligen ta bort de valda nycklarna? (j/N) "
 
-#: g10/passphrase.c:487
+#: g10/passphrase.c:499
 #, fuzzy
 #| msgid "Do you really want to delete the selected keys? (y/N) "
 msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgstr "Vill du verkligen ta bort de valda nycklarna? (j/N) "
 
-#: g10/passphrase.c:496
+#: g10/passphrase.c:508
 #, fuzzy, c-format
 #| msgid "%u-bit %s key, ID %s, created %s"
 msgid ""
@@ -7038,7 +7053,7 @@ msgstr ""
 "Minimum tillitsnivå för denna nyckel är: %s\n"
 "\n"
 
-#: g10/pkclist.c:313 g10/revoke.c:803
+#: g10/pkclist.c:313 g10/revoke.c:804
 msgid "Your decision? "
 msgstr "Vad väljer du? "
 
@@ -7352,7 +7367,7 @@ msgstr "kan inte öppna signerat data \"%s\"\n"
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "kan inte öppna signerad data fd=%d: %s\n"
 
-#: g10/pubkey-enc.c:99 sm/decrypt.c:879
+#: g10/pubkey-enc.c:99 sm/decrypt.c:1329
 #, fuzzy, c-format
 #| msgid "certificate is not usable for encryption\n"
 msgid "key %s is not suitable for decryption in %s mode\n"
@@ -7404,7 +7419,7 @@ msgstr "OBSERVERA: nyckeln har spärrats"
 
 # Vad?
 #: g10/revoke.c:100 g10/revoke.c:126 g10/revoke.c:172 g10/revoke.c:184
-#: g10/revoke.c:502
+#: g10/revoke.c:503
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet misslyckades: %s\n"
@@ -7437,12 +7452,12 @@ msgstr "Skapa ett spärrcertifikat för denna nyckel? (j/N) "
 # -do-not-force översatt med:
 # genomdriv inte
 # I detta fall gäller det ett revokeringscertifikat, som gnupg alltid skapar i ASCII-format för att det ska gå att skriva ut.
-#: g10/revoke.c:334 g10/revoke.c:744
+#: g10/revoke.c:334 g10/revoke.c:745
 msgid "ASCII armored output forced.\n"
 msgstr "utdata med ett ascii-skal genomdrivet.\n"
 
 # Vad menas???
-#: g10/revoke.c:350 g10/revoke.c:481
+#: g10/revoke.c:350 g10/revoke.c:482
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet misslyckades: %s\n"
@@ -7456,20 +7471,20 @@ msgstr "Spärrcertifikat skapat.\n"
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "inga spärrnycklar hittades för \"%s\"\n"
 
-#: g10/revoke.c:567
+#: g10/revoke.c:568
 #, fuzzy
 #| msgid "Create a revocation certificate for this key? (y/N) "
 msgid "This is a revocation certificate for the OpenPGP key:"
 msgstr "Skapa ett spärrcertifikat för denna nyckel? (j/N) "
 
-#: g10/revoke.c:583
+#: g10/revoke.c:584
 msgid ""
 "A revocation certificate is a kind of \"kill switch\" to publicly\n"
 "declare that a key shall not anymore be used.  It is not possible\n"
 "to retract such a revocation certificate once it has been published."
 msgstr ""
 
-#: g10/revoke.c:586
+#: g10/revoke.c:587
 msgid ""
 "Use it to revoke this key in case of a compromise or loss of\n"
 "the secret key.  However, if the secret key is still accessible,\n"
@@ -7478,20 +7493,20 @@ msgid ""
 "of the gpg command \"--generate-revocation\" in the GnuPG manual."
 msgstr ""
 
-#: g10/revoke.c:592
+#: g10/revoke.c:593
 msgid ""
 "To avoid an accidental use of this file, a colon has been inserted\n"
 "before the 5 dashes below.  Remove this colon with a text editor\n"
 "before importing and publishing this revocation certificate."
 msgstr ""
 
-#: g10/revoke.c:611
+#: g10/revoke.c:612
 #, fuzzy, c-format
 #| msgid "Revocation certificate created.\n"
 msgid "revocation certificate stored as '%s.rev'\n"
 msgstr "Spärrcertifikat skapat.\n"
 
-#: g10/revoke.c:655
+#: g10/revoke.c:656
 #, fuzzy, c-format
 #| msgid "secret key \"%s\" not found: %s\n"
 msgid "secret key \"%s\" not found\n"
@@ -7500,22 +7515,22 @@ msgstr "hemliga nyckeln \"%s\" hittades inte: %s\n"
 #. TRANSLATORS: The %s prints a key specification which
 #. for example has been given at the command line.  Several lines
 #. lines with secret key infos are printed after this message.
-#: g10/revoke.c:680
+#: g10/revoke.c:681
 #, c-format
 msgid "'%s' matches multiple secret keys:\n"
 msgstr ""
 
-#: g10/revoke.c:705
+#: g10/revoke.c:706
 #, fuzzy, c-format
 #| msgid "error creating keyring `%s': %s\n"
 msgid "error searching the keyring: %s\n"
 msgstr "fel när nyckelringen \"%s\" skapades: %s\n"
 
-#: g10/revoke.c:728
+#: g10/revoke.c:729
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Skapa ett spärrcertifikat för denna nyckel? (j/N) "
 
-#: g10/revoke.c:752
+#: g10/revoke.c:753
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -7533,33 +7548,33 @@ msgstr ""
 "media blir oläsligt.  Men se upp:  Utskriftsfunktionen på\n"
 "din dator kan spara data så att det blir åtkomligt för andra!\n"
 
-#: g10/revoke.c:786
+#: g10/revoke.c:787
 msgid "Please select the reason for the revocation:\n"
 msgstr "Välj anledning till varför nyckeln spärras:\n"
 
-#: g10/revoke.c:796
+#: g10/revoke.c:797
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: g10/revoke.c:798
+#: g10/revoke.c:799
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Troligen vill du välja %d här)\n"
 
-#: g10/revoke.c:839
+#: g10/revoke.c:843
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Ange en valfri beskrivning; avsluta med en tom rad:\n"
 
-#: g10/revoke.c:867
+#: g10/revoke.c:871
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Anledning för spärrning: %s\n"
 
-#: g10/revoke.c:869
+#: g10/revoke.c:873
 msgid "(No description given)\n"
 msgstr "(Ingen beskrivning angiven)\n"
 
-#: g10/revoke.c:874
+#: g10/revoke.c:878
 msgid "Is this okay? (y/N) "
 msgstr "Är detta OK? (j/N) "
 
@@ -7753,24 +7768,24 @@ msgid "%s.%s encryption will be used\n"
 msgstr "krypteringen %s kommer att användas\n"
 
 # Slumptalsgenerator: Random Number Generator
-#: g10/skclist.c:172 g10/skclist.c:253
+#: g10/skclist.c:173 g10/skclist.c:254
 #, c-format
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "nyckeln är inte markerad som osäker - det går inte att använda den med "
 "fejkad slumptalsgenerator!\n"
 
-#: g10/skclist.c:204
+#: g10/skclist.c:205
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "hoppade över \"%s\": förekommer flera gånger\n"
 
-#: g10/skclist.c:223
+#: g10/skclist.c:224
 #, c-format
 msgid "skipped: secret key already present\n"
 msgstr "hoppade över: hemlig nyckel finns redan\n"
 
-#: g10/skclist.c:242
+#: g10/skclist.c:243
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "det här är en PGP-genererad Elgamal-nyckel som inte är säker för signaturer!"
@@ -8001,10 +8016,10 @@ msgstr "algoritmen stöds inte: %s"
 msgid "TOFU DB error"
 msgstr ""
 
-#: g10/tofu.c:687 g10/tofu.c:2073 g10/tofu.c:2354 g10/tofu.c:2373
-#: g10/tofu.c:2386 g10/tofu.c:2398 g10/tofu.c:2413 g10/tofu.c:2425
-#: g10/tofu.c:3021 g10/tofu.c:3038 g10/tofu.c:3075 g10/tofu.c:3092
-#: g10/tofu.c:3404
+#: g10/tofu.c:687 g10/tofu.c:2077 g10/tofu.c:2358 g10/tofu.c:2377
+#: g10/tofu.c:2390 g10/tofu.c:2402 g10/tofu.c:2417 g10/tofu.c:2429
+#: g10/tofu.c:3025 g10/tofu.c:3042 g10/tofu.c:3079 g10/tofu.c:3096
+#: g10/tofu.c:3408
 #, fuzzy, c-format
 #| msgid "error sending %s command: %s\n"
 msgid "error reading TOFU database: %s\n"
@@ -8028,7 +8043,7 @@ msgstr "%s: fel vid läsning av katalogpost: %s\n"
 msgid "error opening TOFU database '%s': %s\n"
 msgstr "fel vid öppnandet av \"%s\": %s\n"
 
-#: g10/tofu.c:1148 g10/tofu.c:3458 g10/tofu.c:3604
+#: g10/tofu.c:1148 g10/tofu.c:3462 g10/tofu.c:3608
 #, fuzzy, c-format
 #| msgid "error sending %s command: %s\n"
 msgid "error updating TOFU database: %s\n"
@@ -8070,37 +8085,37 @@ msgstr "fel vid hämtning av ny PIN-kod: %s\n"
 msgid "This key's user IDs:\n"
 msgstr "lista nycklar och användaridentiteter"
 
-#: g10/tofu.c:1634 g10/tofu.c:1799
+#: g10/tofu.c:1634 g10/tofu.c:1801
 #, fuzzy, c-format
 #| msgid "validity: %s"
 msgid "policy: %s"
 msgstr "giltighet: %s"
 
-#: g10/tofu.c:1725
+#: g10/tofu.c:1727
 #, fuzzy, c-format
 #| msgid "error getting stored flags: %s\n"
 msgid "error gathering signature stats: %s\n"
 msgstr "fel vid hämtning av lagrade flaggor: %s\n"
 
-#: g10/tofu.c:1729
+#: g10/tofu.c:1731
 #, c-format
 msgid "The email address \"%s\" is associated with %d key:\n"
 msgid_plural "The email address \"%s\" is associated with %d keys:\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1747
+#: g10/tofu.c:1749
 #, c-format
 msgid "Statistics for keys with the email address \"%s\":\n"
 msgstr ""
 
-#: g10/tofu.c:1797
+#: g10/tofu.c:1799
 #, fuzzy
 #| msgid "list keys"
 msgid "this key"
 msgstr "lista nycklar"
 
-#: g10/tofu.c:1823
+#: g10/tofu.c:1825
 #, fuzzy, c-format
 #| msgid "print message digests"
 msgid "Verified %d message."
@@ -8108,7 +8123,7 @@ msgid_plural "Verified %d messages."
 msgstr[0] "skriv ut kontrollsummor"
 msgstr[1] "skriv ut kontrollsummor"
 
-#: g10/tofu.c:1827
+#: g10/tofu.c:1829
 #, fuzzy, c-format
 #| msgid "encrypted with %lu passphrases\n"
 msgid "Encrypted %d message."
@@ -8116,7 +8131,7 @@ msgid_plural "Encrypted %d messages."
 msgstr[0] "krypterad med %lu lösenfraser\n"
 msgstr[1] "krypterad med %lu lösenfraser\n"
 
-#: g10/tofu.c:1834
+#: g10/tofu.c:1836
 #, fuzzy, c-format
 #| msgid "print message digests"
 msgid "Verified %d message in the future."
@@ -8124,7 +8139,7 @@ msgid_plural "Verified %d messages in the future."
 msgstr[0] "skriv ut kontrollsummor"
 msgstr[1] "skriv ut kontrollsummor"
 
-#: g10/tofu.c:1838
+#: g10/tofu.c:1840
 #, fuzzy, c-format
 #| msgid "print message digests"
 msgid "Encrypted %d message in the future."
@@ -8132,54 +8147,54 @@ msgid_plural "Encrypted %d messages in the future."
 msgstr[0] "skriv ut kontrollsummor"
 msgstr[1] "skriv ut kontrollsummor"
 
-#: g10/tofu.c:1852
+#: g10/tofu.c:1854
 #, c-format
 msgid "Messages verified over the past %d day: %d."
 msgid_plural "Messages verified over the past %d days: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1858
+#: g10/tofu.c:1860
 #, c-format
 msgid "Messages encrypted over the past %d day: %d."
 msgid_plural "Messages encrypted over the past %d days: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1868
+#: g10/tofu.c:1870
 #, c-format
 msgid "Messages verified over the past %d month: %d."
 msgid_plural "Messages verified over the past %d months: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1874
+#: g10/tofu.c:1876
 #, c-format
 msgid "Messages encrypted over the past %d month: %d."
 msgid_plural "Messages encrypted over the past %d months: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1884
+#: g10/tofu.c:1886
 #, c-format
 msgid "Messages verified over the past %d year: %d."
 msgid_plural "Messages verified over the past %d years: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1890
+#: g10/tofu.c:1892
 #, c-format
 msgid "Messages encrypted over the past %d year: %d."
 msgid_plural "Messages encrypted over the past %d years: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1898
+#: g10/tofu.c:1900
 #, c-format
 msgid "Messages verified in the past: %d."
 msgstr ""
 
-#: g10/tofu.c:1902
+#: g10/tofu.c:1904
 #, fuzzy, c-format
 #| msgid "print message digests"
 msgid "Messages encrypted in the past: %d."
@@ -8188,131 +8203,131 @@ msgstr "skriv ut kontrollsummor"
 #. TRANSLATORS: Please translate the text found in the source
 #. * file below.  We don't directly internationalize that text so
 #. * that we can tweak it without breaking translations.
-#: g10/tofu.c:1919
+#: g10/tofu.c:1921
 msgid "TOFU detected a binding conflict"
 msgstr ""
 
 #. TRANSLATORS: Two letters (normally the lower and upper case
 #. * version of the hotkey) for each of the five choices.  If
 #. * there is only one choice in your language, repeat it.
-#: g10/tofu.c:1961
+#: g10/tofu.c:1963
 msgid "gGaAuUrRbB"
 msgstr ""
 
-#: g10/tofu.c:1967
+#: g10/tofu.c:1969
 msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 
-#: g10/tofu.c:1975
+#: g10/tofu.c:1978
 msgid "Defaulting to unknown.\n"
 msgstr ""
 
-#: g10/tofu.c:2093 g10/tofu.c:2228
+#: g10/tofu.c:2097 g10/tofu.c:2232
 #, c-format
 msgid "TOFU db corruption detected.\n"
 msgstr ""
 
-#: g10/tofu.c:2829
+#: g10/tofu.c:2833
 #, fuzzy, c-format
 #| msgid "error creating a pipe: %s\n"
 msgid "error changing TOFU policy: %s\n"
 msgstr "fel när ett rör skapades: %s\n"
 
-#: g10/tofu.c:2880
+#: g10/tofu.c:2884
 #, c-format
 msgid "%lld~year"
 msgid_plural "%lld~years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2885
+#: g10/tofu.c:2889
 #, c-format
 msgid "%lld~month"
 msgid_plural "%lld~months"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2890
+#: g10/tofu.c:2894
 #, c-format
 msgid "%lld~week"
 msgid_plural "%lld~weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2895
+#: g10/tofu.c:2899
 #, c-format
 msgid "%lld~day"
 msgid_plural "%lld~days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2900
+#: g10/tofu.c:2904
 #, c-format
 msgid "%lld~hour"
 msgid_plural "%lld~hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2905
+#: g10/tofu.c:2909
 #, c-format
 msgid "%lld~minute"
 msgid_plural "%lld~minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2907
+#: g10/tofu.c:2911
 #, c-format
 msgid "%lld~second"
 msgid_plural "%lld~seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:3145
+#: g10/tofu.c:3149
 #, c-format
 msgid "%s: Verified 0~signatures and encrypted 0~messages."
 msgstr ""
 
-#: g10/tofu.c:3151
+#: g10/tofu.c:3155
 #, fuzzy, c-format
 #| msgid "Deleted %d signatures.\n"
 msgid "%s: Verified 0 signatures."
 msgstr "Raderade %d signaturer.\n"
 
-#: g10/tofu.c:3165
+#: g10/tofu.c:3169
 #, fuzzy
 #| msgid "encrypted with %lu passphrases\n"
 msgid "Encrypted 0 messages."
 msgstr "krypterad med %lu lösenfraser\n"
 
-#: g10/tofu.c:3181
+#: g10/tofu.c:3185
 #, fuzzy, c-format
 #| msgid "validity: %s"
 msgid "(policy: %s)"
 msgstr "giltighet: %s"
 
-#: g10/tofu.c:3215
+#: g10/tofu.c:3219
 #, c-format
 msgid ""
 "Warning: we have yet to see a message signed using this key and user id!\n"
 msgstr ""
 
-#: g10/tofu.c:3218
+#: g10/tofu.c:3222
 #, c-format
 msgid ""
 "Warning: we've only seen one message signed using this key and user id!\n"
 msgstr ""
 
-#: g10/tofu.c:3222
+#: g10/tofu.c:3226
 #, c-format
 msgid "Warning: you have yet to encrypt a message to this key!\n"
 msgstr ""
 
-#: g10/tofu.c:3225
+#: g10/tofu.c:3229
 #, c-format
 msgid "Warning: you have only encrypted one message to this key!\n"
 msgstr ""
 
-#: g10/tofu.c:3254
+#: g10/tofu.c:3258
 #, c-format
 msgid ""
 "Warning: if you think you've seen more signatures by this key and user id, "
@@ -8329,14 +8344,14 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:3339 g10/tofu.c:3502 g10/tofu.c:3708 g10/tofu.c:3761
-#: g10/tofu.c:3902 g10/tofu.c:3979 g10/tofu.c:4017
+#: g10/tofu.c:3343 g10/tofu.c:3506 g10/tofu.c:3712 g10/tofu.c:3765
+#: g10/tofu.c:3906 g10/tofu.c:3983 g10/tofu.c:4021
 #, fuzzy, c-format
 #| msgid "error sending %s command: %s\n"
 msgid "error opening TOFU database: %s\n"
 msgstr "fel vid sändning av %s-kommando: %s\n"
 
-#: g10/tofu.c:3535
+#: g10/tofu.c:3539
 #, c-format
 msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
 msgstr ""
@@ -8407,7 +8422,7 @@ msgstr "använder tillitsmodellen %s\n"
 msgid "no need for a trustdb check\n"
 msgstr "det behövs ingen kontroll av tillitsdatabasen\n"
 
-#: g10/trustdb.c:601 g10/trustdb.c:2272
+#: g10/trustdb.c:601 g10/trustdb.c:2273
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "nästa kontroll av tillitsdatabasen kommer att äga rum %s\n"
@@ -8442,7 +8457,7 @@ msgstr "gör en kontroll av tillitsdatabasen --check-trustdb\n"
 msgid "checking the trustdb\n"
 msgstr "kontrollerar  tillitsdatabasen\n"
 
-#: g10/trustdb.c:1993
+#: g10/trustdb.c:1994
 #, fuzzy, c-format
 #| msgid "%lu keys processed so far\n"
 msgid "%d key processed"
@@ -8451,7 +8466,7 @@ msgstr[0] "%lu nycklar behandlade än så länge\n"
 msgstr[1] "%lu nycklar behandlade än så länge\n"
 
 # Vad är detta!?
-#: g10/trustdb.c:1996
+#: g10/trustdb.c:1997
 #, fuzzy, c-format
 #| msgid "%d keys processed (%d validity counts cleared)\n"
 msgid " (%d validity count cleared)\n"
@@ -8459,47 +8474,47 @@ msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] "%d nycklar behandlade (%d validity counts rensade)\n"
 msgstr[1] "%d nycklar behandlade (%d validity counts rensade)\n"
 
-#: g10/trustdb.c:2066
+#: g10/trustdb.c:2067
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "hittade inga nycklar med förbehållslöst förtroende\n"
 
-#: g10/trustdb.c:2080
+#: g10/trustdb.c:2081
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "publik nyckel för förbehållslöst betrodda nyckeln %s hittades inte\n"
 
-#: g10/trustdb.c:2198
+#: g10/trustdb.c:2199
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 "djup: %d  giltig: %3d  signerad: %3d  tillit: %d-, %dq, %dn, %dm, %df, %du\n"
 
-#: g10/trustdb.c:2279
+#: g10/trustdb.c:2280
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
 "kunde inte uppdatera versionspost i tillitsdatabasen: skrivning "
 "misslyckades: %s\n"
 
-#: g10/trust.c:125
+#: g10/trust.c:114
 msgid "undefined"
 msgstr "odefinierad"
 
-#: g10/trust.c:126
+#: g10/trust.c:115
 msgid "never"
 msgstr "aldrig"
 
-#: g10/trust.c:127
+#: g10/trust.c:116
 msgid "marginal"
 msgstr "marginell"
 
-#: g10/trust.c:128
+#: g10/trust.c:117
 msgid "full"
 msgstr "fullständig"
 
-#: g10/trust.c:129
+#: g10/trust.c:118
 msgid "ultimate"
 msgstr "förbehållslös"
 
@@ -8520,43 +8535,43 @@ msgstr "förbehållslös"
 #. It gets passed to atoi() so everything after the number is
 #. essentially a comment and need not be translated.  Either key and
 #. uid are both NULL, or neither are NULL.
-#: g10/trust.c:166
+#: g10/trust.c:155
 #, fuzzy
 #| msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgid "10 translator see trust.c:uid_trust_string_fixed"
 msgstr "15"
 
-#: g10/trust.c:169
+#: g10/trust.c:158
 msgid "[ revoked]"
 msgstr "[   spärrad   ]"
 
-#: g10/trust.c:171 g10/trust.c:177
+#: g10/trust.c:160 g10/trust.c:166
 msgid "[ expired]"
 msgstr "[   utgånget  ]"
 
-#: g10/trust.c:176
+#: g10/trust.c:165
 msgid "[ unknown]"
 msgstr "[    okänt    ]"
 
-#: g10/trust.c:178
+#: g10/trust.c:167
 msgid "[  undef ]"
 msgstr "[ odefinierad ]"
 
-#: g10/trust.c:179
+#: g10/trust.c:168
 #, fuzzy
 #| msgid "never"
 msgid "[  never ]"
 msgstr "aldrig"
 
-#: g10/trust.c:180
+#: g10/trust.c:169
 msgid "[marginal]"
 msgstr "[  marginell  ]"
 
-#: g10/trust.c:181
+#: g10/trust.c:170
 msgid "[  full  ]"
 msgstr "[ fullständig ]"
 
-#: g10/trust.c:182
+#: g10/trust.c:171
 msgid "[ultimate]"
 msgstr "[förbehållslös]"
 
@@ -8621,16 +8636,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:4937 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2386
+#: scd/app-piv.c:1770 scd/app-p15.c:5035 scd/app-nks.c:1530
+#: scd/app-openpgp.c:2387
 #, 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:4956 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2402
+#: scd/app-piv.c:1787 scd/app-p15.c:5054 scd/app-nks.c:1549
+#: scd/app-openpgp.c:2403
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
@@ -8671,10 +8686,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:2669
-#: scd/app-openpgp.c:2693 scd/app-openpgp.c:2871 scd/app-openpgp.c:2893
-#: scd/app-openpgp.c:3074 scd/app-openpgp.c:3361 scd/app-openpgp.c:3408
-#: scd/app-openpgp.c:3545 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2670
+#: scd/app-openpgp.c:2694 scd/app-openpgp.c:2872 scd/app-openpgp.c:2894
+#: scd/app-openpgp.c:3075 scd/app-openpgp.c:3362 scd/app-openpgp.c:3409
+#: scd/app-openpgp.c:3547 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN-Ã¥teranrop returnerade fel: %s\n"
@@ -8696,58 +8711,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:3616
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3618
 #, c-format
 msgid "key already exists\n"
 msgstr "nyckeln finns redan\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3620
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3622
 #, 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:3622
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3624
 #, c-format
 msgid "generating new key\n"
 msgstr "genererar ny nyckel\n"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3624
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3626
 #, c-format
 msgid "writing new key\n"
 msgstr "skriver ny nyckel\n"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4484 scd/app-openpgp.c:4767
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4486 scd/app-openpgp.c:4761
 #, 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:1615
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1616
 #, 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:1622
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1623
 #, 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:1732
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1733
 #, 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:4943
+#: scd/app-piv.c:3279 scd/app-openpgp.c:4937
 #, 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:4951
+#: scd/app-piv.c:3294 scd/app-openpgp.c:4945
 #, c-format
 msgid "generating key failed\n"
 msgstr "nyckelgenereringen misslyckades\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4957
+#: scd/app-piv.c:3300 scd/app-openpgp.c:4951
 #, fuzzy, c-format
 #| msgid "key generation completed (%d seconds)\n"
 msgid "key generation completed (%d second)\n"
@@ -8755,35 +8770,35 @@ 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:1842 scd/app-openpgp.c:4966
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1843 scd/app-openpgp.c:4960
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr "svaret innehåller inte publikt nyckeldata\n"
 
-#: scd/app-p15.c:5035 scd/app-nks.c:2038
+#: scd/app-p15.c:5133 scd/app-nks.c:2038
 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:5038 scd/app-openpgp.c:2818
+#: scd/app-p15.c:5136 scd/app-openpgp.c:2819
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Ange administratörens PIN-kod"
 
-#: scd/app-p15.c:5040 scd/app-nks.c:2028
+#: scd/app-p15.c:5138 scd/app-nks.c:2028
 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:5043 scd/app-nks.c:2019
+#: scd/app-p15.c:5141 scd/app-nks.c:2019
 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:4321
+#: scd/app-nks.c:1468 scd/app-openpgp.c:4323
 #, 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:4333
+#: scd/app-nks.c:1476 scd/app-openpgp.c:4335
 #, 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"
@@ -8828,27 +8843,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:3442 scd/app-dinsig.c:534
+#: scd/app-nks.c:2221 scd/app-openpgp.c:3443 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:943
+#: scd/app-openpgp.c:944
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "misslyckades med att lagra fingeravtrycket: %s\n"
 
-#: scd/app-openpgp.c:956
+#: scd/app-openpgp.c:957
 #, 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:1427 scd/app-openpgp.c:3389 scd/app-openpgp.c:5715
+#: scd/app-openpgp.c:1428 scd/app-openpgp.c:3390 scd/app-openpgp.c:5709
 #, 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:1949
+#: scd/app-openpgp.c:1950
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "läsning av publik nyckel misslyckades: %s\n"
@@ -8856,46 +8871,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:2373
+#: scd/app-openpgp.c:2374
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2621
+#: scd/app-openpgp.c:2622
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "använder standard-PIN som %s\n"
 
-#: scd/app-openpgp.c:2628
+#: scd/app-openpgp.c:2629
 #, 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:2641
+#: scd/app-openpgp.c:2642
 #, fuzzy
 #| msgid "||Please enter the PIN"
 msgid "||Please unlock the card"
 msgstr "||Ange PIN-koden"
 
-#: scd/app-openpgp.c:2700 scd/app-openpgp.c:2900 scd/app-openpgp.c:3368
+#: scd/app-openpgp.c:2701 scd/app-openpgp.c:2901 scd/app-openpgp.c:3369
 #, 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:2717 scd/app-openpgp.c:2760 scd/app-openpgp.c:2917
-#: scd/app-openpgp.c:5325
+#: scd/app-openpgp.c:2718 scd/app-openpgp.c:2761 scd/app-openpgp.c:2918
+#: scd/app-openpgp.c:5319
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "validering av CHV%d misslyckades: %s\n"
 
-#: scd/app-openpgp.c:2804 scd/app-openpgp.c:5724
+#: scd/app-openpgp.c:2805 scd/app-openpgp.c:5718
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "kortet är låst permanent!\n"
 
-#: scd/app-openpgp.c:2808
+#: scd/app-openpgp.c:2809
 #, 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"
@@ -8906,20 +8921,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:2841
+#: scd/app-openpgp.c:2842
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr "åtkomst till administrationskommandon är inte konfigurerat\n"
 
-#: scd/app-openpgp.c:3355
+#: scd/app-openpgp.c:3356
 msgid "||Please enter the PIN"
 msgstr "||Ange PIN-koden"
 
-#: scd/app-openpgp.c:3404
+#: scd/app-openpgp.c:3405
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Ange nollställningskoden för kortet"
 
-#: scd/app-openpgp.c:3414 scd/app-openpgp.c:3481
+#: scd/app-openpgp.c:3415 scd/app-openpgp.c:3484
 #, 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"
@@ -8927,77 +8942,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:3437
+#: scd/app-openpgp.c:3438
 msgid "|RN|New Reset Code"
 msgstr "|RN|Ny nollställningskod"
 
-#: scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3439
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Ny Admin PIN-kod"
 
-#: scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3439
 msgid "|N|New PIN"
 msgstr "|N|Ny PIN-kod"
 
-#: scd/app-openpgp.c:3541
+#: scd/app-openpgp.c:3543
 #, 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:3542
+#: scd/app-openpgp.c:3544
 #, fuzzy
 #| msgid "||Please enter the PIN"
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Ange PIN-koden"
 
-#: scd/app-openpgp.c:3600 scd/app-openpgp.c:5026
+#: scd/app-openpgp.c:3602 scd/app-openpgp.c:5020
 #, c-format
 msgid "error reading application data\n"
 msgstr "fel vid läsning av programdata\n"
 
-#: scd/app-openpgp.c:3606 scd/app-openpgp.c:5033
+#: scd/app-openpgp.c:3608 scd/app-openpgp.c:5027
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "fel vid läsning av fingeravtryckets DO\n"
 
-#: scd/app-openpgp.c:4302 scd/app-openpgp.c:4657
+#: scd/app-openpgp.c:4304 scd/app-openpgp.c:4653
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "tidsstämpel för skapandet saknas\n"
 
-#: scd/app-openpgp.c:4343 scd/app-openpgp.c:4351
+#: scd/app-openpgp.c:4345 scd/app-openpgp.c:4353
 #, 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:4651
+#: scd/app-openpgp.c:4647
 #, fuzzy, c-format
 #| msgid "unsupported algorithm: %s"
 msgid "unsupported curve\n"
 msgstr "algoritmen stöds inte: %s"
 
-#: scd/app-openpgp.c:4991
+#: scd/app-openpgp.c:4985
 #, 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:5041
+#: scd/app-openpgp.c:5035
 #, 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:5240
+#: scd/app-openpgp.c:5234
 #, 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:5298
+#: scd/app-openpgp.c:5292
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "signaturer skapade hittills: %lu\n"
 
-#: scd/app-openpgp.c:5729
+#: scd/app-openpgp.c:5723
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
@@ -9005,7 +9020,7 @@ msgstr ""
 "validering av Admin PIN-kod är för närvarande förbjudet genom detta "
 "kommando\n"
 
-#: scd/app-openpgp.c:6241 scd/app-openpgp.c:6252
+#: scd/app-openpgp.c:6250 scd/app-openpgp.c:6261
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "kan inte komma åt %s - ogiltigt OpenPGP-kort?\n"
@@ -9027,7 +9042,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:274 dirmngr/dirmngr.c:198
+#: scd/scdaemon.c:136 sm/gpgsm.c:274 dirmngr/dirmngr.c:199
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|NIVÅ|ställ in felsökningsnivån till NIVÅ"
 
@@ -9098,12 +9113,12 @@ msgstr ""
 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:2104
+#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2143
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "hanterare för fd %d startad\n"
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2112
+#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2151
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "hanterare för fd %d avslutad\n"
@@ -9113,11 +9128,11 @@ msgstr "hanterare för fd %d avslutad\n"
 msgid "validation model requested by certificate: %s"
 msgstr "valideringsmodellen begärd av certifikat: %s"
 
-#: sm/certchain.c:199 sm/certchain.c:2172
+#: sm/certchain.c:199 sm/certchain.c:2174
 msgid "chain"
 msgstr "kedja"
 
-#: sm/certchain.c:200 sm/certchain.c:2172
+#: sm/certchain.c:200 sm/certchain.c:2174
 msgid "shell"
 msgstr "skal"
 
@@ -9152,226 +9167,226 @@ msgstr "observera: icke-kritisk certifikatpolicy tillåts inte"
 msgid "certificate policy not allowed"
 msgstr "certifikatpolicy tillåts inte"
 
-#: sm/certchain.c:595 sm/keydb.c:1891 sm/keydb.c:1980
+#: sm/certchain.c:596 sm/keydb.c:1913 sm/keydb.c:2002
 #, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "misslyckades med att få fingeravtrycket\n"
 
-#: sm/certchain.c:624
+#: sm/certchain.c:625
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr "slår upp utfärdare på extern plats\n"
 
-#: sm/certchain.c:644
+#: sm/certchain.c:645
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "antal utfärdare som matchar: %d\n"
 
-#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#: sm/certchain.c:724 dirmngr/ocsp.c:683
 #, fuzzy, c-format
 #| msgid "can't access `%s': %s\n"
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "kan inte komma åt \"%s\": %s\n"
 
-#: sm/certchain.c:791
+#: sm/certchain.c:792
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr "slår upp utfärdare från Dirmngr-cachen\n"
 
-#: sm/certchain.c:816
+#: sm/certchain.c:817
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "antal matchande certifikat: %d\n"
 
-#: sm/certchain.c:819
+#: sm/certchain.c:820
 #, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "uppslag av endast-mellanlagrad dirmngr-nyckel misslyckades: %s\n"
 
-#: sm/certchain.c:1046 sm/certchain.c:1561 sm/certchain.c:2200 sm/decrypt.c:643
-#: sm/encrypt.c:620 sm/import.c:414 sm/keydb.c:1898 sm/keydb.c:1987
-#: sm/sign.c:428 sm/verify.c:117
+#: sm/certchain.c:1047 sm/certchain.c:1562 sm/certchain.c:2202
+#: sm/decrypt.c:1084 sm/encrypt.c:621 sm/import.c:414 sm/keydb.c:1920
+#: sm/keydb.c:2009 sm/sign.c:428 sm/verify.c:117
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "misslyckades med att allokera keyDB-hanterare\n"
 
-#: sm/certchain.c:1232
+#: sm/certchain.c:1233
 msgid "certificate has been revoked"
 msgstr "certifikatet har spärrats"
 
-#: sm/certchain.c:1247
+#: sm/certchain.c:1248
 msgid "the status of the certificate is unknown"
 msgstr "status för certifikatet är okänt"
 
-#: sm/certchain.c:1254
+#: sm/certchain.c:1255
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr "se till att \"dirmngr\" är korrekt installerat\n"
 
-#: sm/certchain.c:1260
+#: sm/certchain.c:1261
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "kontroll mot spärrlistan misslyckades: %s"
 
-#: sm/certchain.c:1289 sm/certchain.c:1357 dirmngr/validate.c:497
+#: sm/certchain.c:1290 sm/certchain.c:1358 dirmngr/validate.c:497
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "certifikat med felaktig giltighetstid: %s"
 
-#: sm/certchain.c:1304 sm/certchain.c:1389 dirmngr/validate.c:515
+#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:515
 #, c-format
 msgid "certificate not yet valid"
 msgstr "certifikatet är ännu inte giltigt"
 
-#: sm/certchain.c:1305 sm/certchain.c:1390
+#: sm/certchain.c:1306 sm/certchain.c:1391
 msgid "root certificate not yet valid"
 msgstr "rotcertifikatet är ännu inte giltigt"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1307 sm/certchain.c:1392
 msgid "intermediate certificate not yet valid"
 msgstr "tillfälligt certifikat är ännu inte giltigt"
 
-#: sm/certchain.c:1319 dirmngr/validate.c:526
+#: sm/certchain.c:1320 dirmngr/validate.c:526
 #, c-format
 msgid "certificate has expired"
 msgstr "certifikatet har gått ut"
 
-#: sm/certchain.c:1320
+#: sm/certchain.c:1321
 msgid "root certificate has expired"
 msgstr "rotcertifikatet har gått ut"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1322
 msgid "intermediate certificate has expired"
 msgstr "tillfälligt certifikat har gått ut"
 
-#: sm/certchain.c:1363
+#: sm/certchain.c:1364
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr "nödvändiga certifikattillägg saknas: %s%s%s"
 
-#: sm/certchain.c:1372
+#: sm/certchain.c:1373
 msgid "certificate with invalid validity"
 msgstr "certifikat med felaktig giltighetstid"
 
-#: sm/certchain.c:1409
+#: sm/certchain.c:1410
 msgid "signature not created during lifetime of certificate"
 msgstr "signaturen inte skapad under certifikatets livstid"
 
-#: sm/certchain.c:1411
+#: sm/certchain.c:1412
 msgid "certificate not created during lifetime of issuer"
 msgstr "certifikatet skapades inte under utfärdarens livstid"
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1413
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr "tillfälligt certifikat är inte skapat under utfärdarens livstid"
 
-#: sm/certchain.c:1416
+#: sm/certchain.c:1417
 #, c-format
 msgid "  (  signature created at "
 msgstr "  (  signatur skapad "
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1418
 #, c-format
 msgid "  (certificate created at "
 msgstr "  (certifikat skapat "
 
-#: sm/certchain.c:1420
+#: sm/certchain.c:1421
 #, c-format
 msgid "  (certificate valid from "
 msgstr "  (certifikat giltigt från "
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1422
 #, c-format
 msgid "  (     issuer valid from "
 msgstr "  (     utfärdare giltig från "
 
-#: sm/certchain.c:1451 dirmngr/validate.c:577
+#: sm/certchain.c:1452 dirmngr/validate.c:577
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "fingeravtryck=%s\n"
 
-#: sm/certchain.c:1460
+#: sm/certchain.c:1461
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr "rotcertifikatet har nu markerats som betrott\n"
 
-#: sm/certchain.c:1473
+#: sm/certchain.c:1474
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr "interaktiv markering som betrodd inte aktiverad i gpg-agent\n"
 
-#: sm/certchain.c:1479
+#: sm/certchain.c:1480
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr "interaktiv markering som betrodd inaktiverad för den här sessionen\n"
 
-#: sm/certchain.c:1538
+#: sm/certchain.c:1539
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 "VARNING: tid för skapandet av signaturen är inte känd - antar aktuell tid"
 
-#: sm/certchain.c:1602
+#: sm/certchain.c:1603
 msgid "no issuer found in certificate"
 msgstr "ingen utfärdare hittades i certifikatet"
 
-#: sm/certchain.c:1680
+#: sm/certchain.c:1681
 msgid "self-signed certificate has a BAD signature"
 msgstr "självsignerat certifikat har en FELAKTIG signatur"
 
-#: sm/certchain.c:1749 dirmngr/validate.c:575
+#: sm/certchain.c:1750 dirmngr/validate.c:575
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "rotcertifikatet har inte markerats som betrott"
 
-#: sm/certchain.c:1765
+#: sm/certchain.c:1766
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "kontroll mot tillitslistan misslyckades: %s\n"
 
-#: sm/certchain.c:1796 sm/import.c:175 dirmngr/validate.c:630
+#: sm/certchain.c:1797 sm/import.c:175 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "certifikatkedjan är för lång\n"
 
-#: sm/certchain.c:1808 dirmngr/validate.c:642
+#: sm/certchain.c:1809 dirmngr/validate.c:642
 #, c-format
 msgid "issuer certificate not found"
 msgstr "utfärdarens certifikat hittades inte"
 
-#: sm/certchain.c:1842 dirmngr/validate.c:668
+#: sm/certchain.c:1844 dirmngr/validate.c:668
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr "certifikatet har en FELAKTIG signatur"
 
-#: sm/certchain.c:1874 dirmngr/validate.c:692
+#: sm/certchain.c:1876 dirmngr/validate.c:692
 msgid "found another possible matching CA certificate - trying again"
 msgstr "hittade ett annat möjligen matchande CA-certifikat - försöker igen"
 
-#: sm/certchain.c:1933 dirmngr/validate.c:717
+#: sm/certchain.c:1935 dirmngr/validate.c:717
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "certifikatkedjan längre än vad som tillåts av CA (%d)"
 
-#: sm/certchain.c:1975 sm/certchain.c:2275 dirmngr/validate.c:747
+#: sm/certchain.c:1977 sm/certchain.c:2278 dirmngr/validate.c:747
 #, c-format
 msgid "certificate is good\n"
 msgstr "certifikatet är korrekt\n"
 
-#: sm/certchain.c:1976
+#: sm/certchain.c:1978
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "tillfälligt certifikat är korrekt\n"
 
-#: sm/certchain.c:1977
+#: sm/certchain.c:1979
 #, c-format
 msgid "root certificate is good\n"
 msgstr "rotcertifikatet är korrekt\n"
 
-#: sm/certchain.c:2159
+#: sm/certchain.c:2161
 msgid "switching to chain model"
 msgstr "växlar till kedjemodell"
 
-#: sm/certchain.c:2168
+#: sm/certchain.c:2170
 #, c-format
 msgid "validation model used: %s"
 msgstr "valideringsmodell använd: %s"
@@ -9382,18 +9397,18 @@ 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:1372 dirmngr/validate.c:903
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1411 dirmngr/validate.c:903
 #: dirmngr/validate.c:927
 #, c-format
 msgid "out of core\n"
 msgstr "slut på minne\n"
 
-#: sm/certcheck.c:389 sm/verify.c:212
+#: sm/certcheck.c:388 sm/verify.c:212
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(det här är MD2-algoritmen)\n"
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:793
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:794
 msgid "none"
 msgstr "ingen"
 
@@ -9712,17 +9727,17 @@ msgstr ""
 msgid "resource problem: out of core\n"
 msgstr "resursproblem: slut på minne\n"
 
-#: sm/decrypt.c:719
+#: sm/decrypt.c:1159
 #, c-format
 msgid "(this is the RC2 algorithm)\n"
 msgstr "(det här är RC2-algoritmen)\n"
 
-#: sm/decrypt.c:721
+#: sm/decrypt.c:1161
 #, c-format
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr "(det här verkar inte vara ett krypterat meddelande)\n"
 
-#: sm/decrypt.c:868
+#: sm/decrypt.c:1318
 #, fuzzy, c-format
 #| msgid "encrypted with %s key, ID %s\n"
 msgid "encrypted to %s key %s\n"
@@ -9734,7 +9749,7 @@ msgstr "krypterad med %s-nyckel, id %s\n"
 msgid "certificate '%s' not found: %s\n"
 msgstr "certifikatet \"%s\" hittades inte: %s\n"
 
-#: sm/delete.c:120 sm/keydb.c:1999 sm/keydb.c:2098
+#: sm/delete.c:120 sm/keydb.c:2021 sm/keydb.c:2120
 #, c-format
 msgid "error locking keybox: %s\n"
 msgstr "fel vid låsning av nyckelskåp: %s\n"
@@ -9756,7 +9771,7 @@ msgstr "certifikatet \"%s\" togs bort\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "borttagning av certifikatet \"%s\" misslyckades: %s\n"
 
-#: sm/encrypt.c:606
+#: sm/encrypt.c:607
 #, c-format
 msgid "no valid recipients given\n"
 msgstr "inga giltiga mottagare angavs\n"
@@ -9825,66 +9840,66 @@ msgstr "|ANVÄNDAR-ID|använd ANVÄNDAR-ID som förvald hemlig nyckel"
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|FIL|lägg till nyckelring till listan över nyckelringar"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:352 dirmngr/dirmngr.c:265
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|SPEC|använd denna nyckelserver för att slå upp nycklar"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:363
 msgid "fetch missing issuer certificates"
 msgstr "hämta saknade utfärdarcertifikat"
 
-#: sm/gpgsm.c:364
+#: sm/gpgsm.c:365
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NAMN|använd kodningen NAMN för PKCS#12-lösenfraser"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:386
 msgid "never consult a CRL"
 msgstr "kontrollera aldrig mot spärrlista"
 
-#: sm/gpgsm.c:389
+#: sm/gpgsm.c:390
 msgid "do not check CRLs for root certificates"
 msgstr "kontrollera inte spärrlistor för rotcertifikat"
 
-#: sm/gpgsm.c:393
+#: sm/gpgsm.c:394
 msgid "check validity using OCSP"
 msgstr "kontrollera giltigheten med OCSP"
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:396
 msgid "do not check certificate policies"
 msgstr "kontrollera inte certifikatpolicier"
 
-#: sm/gpgsm.c:398
+#: sm/gpgsm.c:399
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAMN|använd chifferalgoritmen NAMN"
 
-#: sm/gpgsm.c:400
+#: sm/gpgsm.c:401
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAMN|använd algoritmen NAMN för kontrollsummor"
 
-#: sm/gpgsm.c:410
+#: sm/gpgsm.c:411
 msgid "batch mode: never ask"
 msgstr "satsläge: fråga aldrig"
 
-#: sm/gpgsm.c:412
+#: sm/gpgsm.c:413
 msgid "assume yes on most questions"
 msgstr "anta ja på de flesta frågorna"
 
-#: sm/gpgsm.c:413
+#: sm/gpgsm.c:414
 msgid "assume no on most questions"
 msgstr "anta nej på de flesta frågorna"
 
-#: sm/gpgsm.c:430
+#: sm/gpgsm.c:431
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FIL|skriv en granskningslogg till FIL"
 
-#: sm/gpgsm.c:615
+#: sm/gpgsm.c:616
 #, 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:618
+#: sm/gpgsm.c:619
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpgsm [options] [files]\n"
@@ -9899,56 +9914,31 @@ msgstr ""
 "signera, kontrollera, kryptera eller dekryptera med S/MIME-protokollet\n"
 "standardåtgärden beror på inmatningsdata\n"
 
-#: sm/gpgsm.c:826
+#: sm/gpgsm.c:827
 #, 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:837
+#: sm/gpgsm.c:838
 #, fuzzy, c-format
 #| msgid "unknown validation model `%s'\n"
 msgid "unknown validation model '%s'\n"
 msgstr "okänd valideringsmodell \"%s\"\n"
 
-#: sm/gpgsm.c:896 dirmngr/ldapserver.c:89
-#, c-format
-msgid "%s:%u: no hostname given\n"
-msgstr "%s:%u: inget värdnamn angivet\n"
-
-#: sm/gpgsm.c:915 dirmngr/ldapserver.c:108
-#, c-format
-msgid "%s:%u: password given without user\n"
-msgstr "%s:%u: lösenord angivet utan användare\n"
-
-#: sm/gpgsm.c:946 dirmngr/ldapserver.c:139
-#, c-format
-msgid "%s:%u: ignoring unknown flag '%s'\n"
-msgstr ""
-
-#: sm/gpgsm.c:962 dirmngr/ldapserver.c:155
-#, c-format
-msgid "%s:%u: skipping this line\n"
-msgstr "%s:%u: hoppar över denna rad\n"
-
-#: sm/gpgsm.c:1550
-#, c-format
-msgid "could not parse keyserver\n"
-msgstr "kunde inte tolka nyckelserver\n"
-
-#: sm/gpgsm.c:1858
+#: sm/gpgsm.c:1711
 #, fuzzy, c-format
 #| msgid "importing common certificates `%s'\n"
 msgid "importing common certificates '%s'\n"
 msgstr "importerar vanliga certifikat \"%s\"\n"
 
-#: sm/gpgsm.c:1904
+#: sm/gpgsm.c:1757
 #, 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:2273
+#: sm/gpgsm.c:2129
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "ogiltigt kommando (det finns inget implicit kommando)\n"
@@ -9968,54 +9958,54 @@ msgstr "fel vid lagring av certifikat\n"
 msgid "basic certificate checks failed - not imported\n"
 msgstr "enkla certifikatkontroller misslyckades - importeras inte\n"
 
-#: sm/import.c:471 sm/keydb.c:2018 sm/keydb.c:2111
+#: sm/import.c:472 sm/keydb.c:2040 sm/keydb.c:2133
 #, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "fel vid hämtning av lagrade flaggor: %s\n"
 
-#: sm/import.c:530 sm/import.c:562
+#: sm/import.c:531 sm/import.c:563
 #, c-format
 msgid "error importing certificate: %s\n"
 msgstr "fel vid import av certifikat: %s\n"
 
-#: sm/import.c:751 tools/gpg-connect-agent.c:1475
+#: sm/import.c:752 tools/gpg-connect-agent.c:1475
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "fel vid läsning av indata: %s\n"
 
-#: sm/keydb.c:503
+#: sm/keydb.c:508
 #, fuzzy, c-format
 #| msgid "no gpg-agent running in this session\n"
 msgid "no keyboxd running in this session\n"
 msgstr "ingen gpg-agent kör i den här sessionen\n"
 
-#: sm/keydb.c:595
+#: sm/keydb.c:600
 #, fuzzy, c-format
 #| msgid "error opening `%s': %s\n"
 msgid "error opening key DB: %s\n"
 msgstr "fel vid öppnandet av \"%s\": %s\n"
 
-#: sm/keydb.c:1936
+#: sm/keydb.c:1958
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr "problem vid sökandet efter befintligt certifikat: %s\n"
 
-#: sm/keydb.c:1948
+#: sm/keydb.c:1970
 #, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "fel vid sökning efter skrivbar keyDB: %s\n"
 
-#: sm/keydb.c:1956
+#: sm/keydb.c:1978
 #, c-format
 msgid "error storing certificate: %s\n"
 msgstr "fel vid lagring av certifikat: %s\n"
 
-#: sm/keydb.c:2009
+#: sm/keydb.c:2031
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "problem vid ytterligare sökning efter certifikat: %s\n"
 
-#: sm/keydb.c:2030 sm/keydb.c:2122
+#: sm/keydb.c:2052 sm/keydb.c:2144
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr "fel vid lagring av flaggor: %s\n"
@@ -10211,67 +10201,67 @@ msgstr ""
 msgid "error loading certificate '%s': %s\n"
 msgstr "fel vid lagring av certifikat: %s\n"
 
-#: dirmngr/certcache.c:819
+#: dirmngr/certcache.c:820
 #, fuzzy, c-format
 #| msgid "Included certificates"
 msgid "permanently loaded certificates: %u\n"
 msgstr "Inkluderade certifikat"
 
-#: dirmngr/certcache.c:821
+#: dirmngr/certcache.c:822
 #, fuzzy, c-format
 #| msgid "number of matching certificates: %d\n"
 msgid "    runtime cached certificates: %u\n"
 msgstr "antal matchande certifikat: %d\n"
 
-#: dirmngr/certcache.c:823
+#: dirmngr/certcache.c:824
 #, fuzzy, c-format
 #| msgid "number of matching certificates: %d\n"
 msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "antal matchande certifikat: %d\n"
 
-#: dirmngr/certcache.c:851 dirmngr/dirmngr-client.c:392
+#: dirmngr/certcache.c:852 dirmngr/dirmngr-client.c:392
 #, fuzzy, c-format
 #| msgid "  (certificate created at "
 msgid "certificate already cached\n"
 msgstr "  (certifikat skapat "
 
-#: dirmngr/certcache.c:853
+#: dirmngr/certcache.c:854
 #, fuzzy, c-format
 #| msgid "certificate is good\n"
 msgid "certificate cached\n"
 msgstr "certifikatet är korrekt\n"
 
-#: dirmngr/certcache.c:855 dirmngr/certcache.c:875 dirmngr/dirmngr-client.c:396
+#: dirmngr/certcache.c:856 dirmngr/certcache.c:876 dirmngr/dirmngr-client.c:396
 #, fuzzy, c-format
 #| msgid "error storing certificate: %s\n"
 msgid "error caching certificate: %s\n"
 msgstr "fel vid lagring av certifikat: %s\n"
 
-#: dirmngr/certcache.c:938
+#: dirmngr/certcache.c:939
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "ogiltigt fingeravtryck"
 
-#: dirmngr/certcache.c:1384 dirmngr/certcache.c:1393
+#: dirmngr/certcache.c:1385 dirmngr/certcache.c:1394
 #, fuzzy, c-format
 #| msgid "error storing certificate: %s\n"
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "fel vid lagring av certifikat: %s\n"
 
-#: dirmngr/certcache.c:1579 dirmngr/certcache.c:1588
+#: dirmngr/certcache.c:1580 dirmngr/certcache.c:1589
 #, fuzzy, c-format
 #| msgid "error storing certificate: %s\n"
 msgid "error fetching certificate by subject: %s\n"
 msgstr "fel vid lagring av certifikat: %s\n"
 
-#: dirmngr/certcache.c:1694 dirmngr/validate.c:483
+#: dirmngr/certcache.c:1695 dirmngr/validate.c:483
 #, fuzzy, c-format
 #| msgid "no issuer found in certificate"
 msgid "no issuer found in certificate\n"
 msgstr "ingen utfärdare hittades i certifikatet"
 
-#: dirmngr/certcache.c:1704
+#: dirmngr/certcache.c:1705
 #, fuzzy, c-format
 #| msgid "error getting stored flags: %s\n"
 msgid "error getting authorityKeyIdentifier: %s\n"
@@ -10313,7 +10303,7 @@ msgstr "mottagande rad misslyckades: %s\n"
 msgid "not removing file '%s'\n"
 msgstr "misslyckades med att skapa ASCII-skal: %s\n"
 
-#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2380
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2383
 #, fuzzy, c-format
 #| msgid "error closing %s: %s\n"
 msgid "error closing cache file: %s\n"
@@ -10567,13 +10557,13 @@ msgid "error getting data from cache file: %s\n"
 msgstr "fel vid hämtning av lagrade flaggor: %s\n"
 
 #: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1672 dirmngr/crlcache.c:1697
-#: dirmngr/crlcache.c:1763
+#: dirmngr/crlcache.c:1766
 #, c-format
 msgid "got an invalid S-expression from libksba\n"
 msgstr ""
 
 #: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1679 dirmngr/crlcache.c:1705
-#: dirmngr/crlcache.c:1770 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1773 dirmngr/misc.c:176
 #, fuzzy, c-format
 #| msgid "iconv_open failed: %s\n"
 msgid "converting S-expression failed: %s\n"
@@ -10590,223 +10580,223 @@ msgstr "ogiltig kontrollsummealgoritm \"%s\"\n"
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1797 dirmngr/ocsp.c:478
+#: dirmngr/crlcache.c:1800 dirmngr/ocsp.c:478
 #, fuzzy, c-format
 #| msgid "receiving line failed: %s\n"
 msgid "creating S-expression failed: %s\n"
 msgstr "mottagande rad misslyckades: %s\n"
 
 # Vad?
-#: dirmngr/crlcache.c:1871
+#: dirmngr/crlcache.c:1874
 #, fuzzy, c-format
 #| msgid "build_packet failed: %s\n"
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "build_packet misslyckades: %s\n"
 
-#: dirmngr/crlcache.c:1886
+#: dirmngr/crlcache.c:1889
 #, fuzzy, c-format
 #| msgid "error getting serial number of card: %s\n"
 msgid "error getting update times of CRL: %s\n"
 msgstr "fel när serienumret hämtades från kortet: %s\n"
 
-#: dirmngr/crlcache.c:1893
+#: dirmngr/crlcache.c:1896
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1897
+#: dirmngr/crlcache.c:1900
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1917
+#: dirmngr/crlcache.c:1920
 #, fuzzy, c-format
 #| msgid "error getting new PIN: %s\n"
 msgid "error getting CRL item: %s\n"
 msgstr "fel vid hämtning av ny PIN-kod: %s\n"
 
-#: dirmngr/crlcache.c:1932
+#: dirmngr/crlcache.c:1935
 #, fuzzy, c-format
 #| msgid "error writing to temporary file: %s\n"
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "fel vid skrivning till temporärfil: %s\n"
 
-#: dirmngr/crlcache.c:1959
+#: dirmngr/crlcache.c:1962
 #, fuzzy, c-format
 #| msgid "no issuer found in certificate"
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "ingen utfärdare hittades i certifikatet"
 
-#: dirmngr/crlcache.c:1974
+#: dirmngr/crlcache.c:1977
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2020
+#: dirmngr/crlcache.c:2023
 #, fuzzy, c-format
 #| msgid "signature verification suppressed\n"
 msgid "CRL signature verification failed: %s\n"
 msgstr "signaturvalidering utlämnad\n"
 
-#: dirmngr/crlcache.c:2032
+#: dirmngr/crlcache.c:2035
 #, fuzzy, c-format
 #| msgid "error reading list of trusted root certificates\n"
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "fel vid inläsning av betrodda rotcertifikat\n"
 
-#: dirmngr/crlcache.c:2174
+#: dirmngr/crlcache.c:2177
 #, fuzzy, c-format
 #| msgid "select failed: %s\n"
 msgid "ksba_crl_new failed: %s\n"
 msgstr "val misslyckades: %s\n"
 
-#: dirmngr/crlcache.c:2181
+#: dirmngr/crlcache.c:2184
 #, fuzzy, c-format
 #| msgid "read failed: %s\n"
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "läsning misslyckades: %s\n"
 
-#: dirmngr/crlcache.c:2215
+#: dirmngr/crlcache.c:2218
 #, fuzzy, c-format
 #| msgid "failed to create temporary file `%s': %s\n"
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "misslyckades med att skapa temporärfilen \"%s\": %s\n"
 
-#: dirmngr/crlcache.c:2219
+#: dirmngr/crlcache.c:2222
 #, fuzzy, c-format
 #| msgid "failed to create temporary file `%s': %s\n"
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "misslyckades med att skapa temporärfilen \"%s\": %s\n"
 
-#: dirmngr/crlcache.c:2229
+#: dirmngr/crlcache.c:2232
 #, fuzzy, c-format
 #| msgid "error creating temporary file: %s\n"
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "fel när temporärfil skapades: %s\n"
 
-#: dirmngr/crlcache.c:2239
+#: dirmngr/crlcache.c:2242
 #, fuzzy, c-format
 #| msgid "update secret failed: %s\n"
 msgid "crl_parse_insert failed: %s\n"
 msgstr "misslyckades med att uppdatera hemligheten: %s\n"
 
-#: dirmngr/crlcache.c:2249
+#: dirmngr/crlcache.c:2252
 #, fuzzy, c-format
 #| msgid "error writing to temporary file: %s\n"
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "fel vid skrivning till temporärfil: %s\n"
 
-#: dirmngr/crlcache.c:2256
+#: dirmngr/crlcache.c:2259
 #, fuzzy, c-format
 #| msgid "error creating temporary file: %s\n"
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "fel när temporärfil skapades: %s\n"
 
-#: dirmngr/crlcache.c:2281
+#: dirmngr/crlcache.c:2284
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2285
+#: dirmngr/crlcache.c:2288
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2301
+#: dirmngr/crlcache.c:2304
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2311
+#: dirmngr/crlcache.c:2314
 #, fuzzy, c-format
 #| msgid "error reading input: %s\n"
 msgid "error reading CRL extensions: %s\n"
 msgstr "fel vid läsning av indata: %s\n"
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2365
 #, fuzzy, c-format
 #| msgid "error creating a pipe: %s\n"
 msgid "creating cache file '%s'\n"
 msgstr "fel när ett rör skapades: %s\n"
 
-#: dirmngr/crlcache.c:2394
+#: dirmngr/crlcache.c:2397
 #, fuzzy, c-format
 #| msgid "renaming `%s' to `%s' failed: %s\n"
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "namnbyte från \"%s\" till \"%s\" misslyckades: %s\n"
 
-#: dirmngr/crlcache.c:2408
+#: dirmngr/crlcache.c:2411
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
 "program start\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2448
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2468
+#: dirmngr/crlcache.c:2471
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2471
+#: dirmngr/crlcache.c:2474
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2474
+#: dirmngr/crlcache.c:2477
 msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2481
+#: dirmngr/crlcache.c:2484
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2499
+#: dirmngr/crlcache.c:2502
 #, fuzzy, c-format
 #| msgid "WARNING: invalid notation data found\n"
 msgid " WARNING: invalid cache record length\n"
 msgstr "VARNING: ogiltig notationsdata hittades\n"
 
-#: dirmngr/crlcache.c:2506
+#: dirmngr/crlcache.c:2509
 #, fuzzy, c-format
 #| msgid "error reading the card: %s\n"
 msgid "problem reading cache record: %s\n"
 msgstr "fel vid läsning av kortet: %s\n"
 
-#: dirmngr/crlcache.c:2517
+#: dirmngr/crlcache.c:2520
 #, fuzzy, c-format
 #| msgid "problem re-searching certificate: %s\n"
 msgid "problem reading cache key: %s\n"
 msgstr "problem vid ytterligare sökning efter certifikat: %s\n"
 
-#: dirmngr/crlcache.c:2548
+#: dirmngr/crlcache.c:2551
 #, fuzzy, c-format
 #| msgid "error reading nonce on fd %d: %s\n"
 msgid "error reading cache entry from db: %s\n"
 msgstr "fel vid läsning av nonce på fd %d: %s\n"
 
-#: dirmngr/crlcache.c:2551
+#: dirmngr/crlcache.c:2554
 msgid "End CRL dump\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2672
+#: dirmngr/crlcache.c:2675
 #, fuzzy, c-format
 #| msgid "read failed: %s\n"
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "läsning misslyckades: %s\n"
 
-#: dirmngr/crlcache.c:2683
+#: dirmngr/crlcache.c:2686
 #, fuzzy, c-format
 #| msgid "checking the trust list failed: %s\n"
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "kontroll mot tillitslistan misslyckades: %s\n"
 
-#: dirmngr/crlcache.c:2743
+#: dirmngr/crlcache.c:2746
 #, fuzzy, c-format
 #| msgid "receiving line failed: %s\n"
 msgid "crl_cache_insert via issuer failed: %s\n"
@@ -10829,7 +10819,7 @@ msgstr ""
 msgid "error retrieving '%s': %s\n"
 msgstr "fel vid hämtning av \"%s\" via %s: %s\n"
 
-#: dirmngr/crlfetch.c:218 dirmngr/ldap-wrapper.c:881 dirmngr/misc.c:573
+#: dirmngr/crlfetch.c:218 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
 #, fuzzy, c-format
 #| msgid "%s: error writing dir record: %s\n"
 msgid "error initializing reader object: %s\n"
@@ -11011,145 +11001,145 @@ msgstr ""
 msgid "looking up '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:175
+#: dirmngr/dirmngr.c:176
 msgid "list the contents of the CRL cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:176
+#: dirmngr/dirmngr.c:177
 #, fuzzy
 #| msgid "|FILE|run commands from FILE on startup"
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|FIL|kör kommandon från FIL vid uppstart"
 
-#: dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr.c:178
 msgid "|URL|fetch a CRL from URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:178
+#: dirmngr/dirmngr.c:179
 #, fuzzy
 #| msgid "pass a command to the dirmngr"
 msgid "shutdown the dirmngr"
 msgstr "skicka ett kommando till dirmngr"
 
-#: dirmngr/dirmngr.c:179
+#: dirmngr/dirmngr.c:180
 msgid "flush the cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:213
 msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:215
+#: dirmngr/dirmngr.c:216
 msgid "|N|do not return more than N items in one query"
 msgstr ""
 
-#: dirmngr/dirmngr.c:221
+#: dirmngr/dirmngr.c:222
 msgid "Network related options"
 msgstr ""
 
-#: dirmngr/dirmngr.c:223
+#: dirmngr/dirmngr.c:224
 msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:235
+#: dirmngr/dirmngr.c:236
 msgid "Configuration for Keyservers"
 msgstr "Konfiguration för nyckelservrar"
 
-#: dirmngr/dirmngr.c:238
+#: dirmngr/dirmngr.c:239
 msgid "|URL|use keyserver at URL"
 msgstr "|URL| använd nyckelservern på URL"
 
-#: dirmngr/dirmngr.c:240
+#: dirmngr/dirmngr.c:241
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-#: dirmngr/dirmngr.c:242
+#: dirmngr/dirmngr.c:243
 msgid "Configuration for HTTP servers"
 msgstr "Konfiguration för HTTP-servrar"
 
-#: dirmngr/dirmngr.c:244
+#: dirmngr/dirmngr.c:245
 msgid "inhibit the use of HTTP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:246
+#: dirmngr/dirmngr.c:247
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:248
+#: dirmngr/dirmngr.c:249
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:250
+#: dirmngr/dirmngr.c:251
 msgid "use system's HTTP proxy setting"
 msgstr "använd systemets HTTP-proxyinställningar"
 
-#: dirmngr/dirmngr.c:254
+#: dirmngr/dirmngr.c:255
 msgid "Configuration of LDAP servers to use"
 msgstr "Konfiguration av LDAP-servrar som ska användas"
 
-#: dirmngr/dirmngr.c:256
+#: dirmngr/dirmngr.c:257
 msgid "inhibit the use of LDAP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:258
+#: dirmngr/dirmngr.c:259
 msgid "ignore LDAP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:260
+#: dirmngr/dirmngr.c:261
 msgid "|HOST|use HOST for LDAP queries"
 msgstr ""
 
-#: dirmngr/dirmngr.c:262
+#: dirmngr/dirmngr.c:263
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr ""
 
-#: dirmngr/dirmngr.c:264
+#: dirmngr/dirmngr.c:267
 #, fuzzy
 #| msgid "|FILE|read options from FILE"
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FIL|läs inställningar från FIL"
 
-#: dirmngr/dirmngr.c:266
+#: dirmngr/dirmngr.c:269
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 
-#: dirmngr/dirmngr.c:269 dirmngr/dirmngr_ldap.c:104
+#: dirmngr/dirmngr.c:272
 #, fuzzy
 #| msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|ställ in maximal livstid för PIN-cache till N sekunder"
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:275
 msgid "Configuration for OCSP"
 msgstr "Konfiguration för OCSP"
 
-#: dirmngr/dirmngr.c:274
+#: dirmngr/dirmngr.c:277
 #, fuzzy
 #| msgid "allow PKA lookups (DNS requests)"
 msgid "allow sending OCSP requests"
 msgstr "tillåt PKA-uppslag (DNS-förfrågningar)"
 
-#: dirmngr/dirmngr.c:276
+#: dirmngr/dirmngr.c:279
 msgid "ignore certificate contained OCSP service URLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:278
+#: dirmngr/dirmngr.c:281
 #, fuzzy
 #| msgid "|URL|use keyserver at URL"
 msgid "|URL|use OCSP responder at URL"
 msgstr "|URL| använd nyckelservern på URL"
 
-#: dirmngr/dirmngr.c:280
+#: dirmngr/dirmngr.c:283
 msgid "|FPR|OCSP response signed by FPR"
 msgstr ""
 
-#: dirmngr/dirmngr.c:288
+#: dirmngr/dirmngr.c:291
 msgid "force loading of outdated CRLs"
 msgstr ""
 
 # inställningar istället för flaggor?
 # Nej, här är det bruksanvisningen för kommandoraden.
-#: dirmngr/dirmngr.c:299
+#: dirmngr/dirmngr.c:302
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -11162,13 +11152,13 @@ msgstr ""
 "@\n"
 "(Se manualsidan för en fullständig lista över alla kommandon och flaggor)\n"
 
-#: dirmngr/dirmngr.c:441
+#: dirmngr/dirmngr.c:449
 #, fuzzy
 #| msgid "Usage: gpgconf [options] (-h for help)"
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Användning: gpgconf [flaggor] (-h för hjälp)"
 
-#: dirmngr/dirmngr.c:443
+#: dirmngr/dirmngr.c:451
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg-agent [options] [command [args]]\n"
@@ -11180,317 +11170,114 @@ msgstr ""
 "Syntax: gpg-agent [flaggor] [kommando [argument]]\n"
 "Hantering av hemliga nycklar för GnuPG\n"
 
-#: dirmngr/dirmngr.c:523
+#: dirmngr/dirmngr.c:531
 #, fuzzy, c-format
 #| msgid "invalid debug-level `%s' given\n"
 msgid "valid debug levels are: %s\n"
 msgstr "ogiltig debug-level \"%s\" angiven\n"
 
-#: dirmngr/dirmngr.c:609 tools/gpgconf.c:667 tools/gpgconf.c:702
-#: tools/gpgconf.c:802
+#: dirmngr/dirmngr.c:617 tools/gpgconf.c:701 tools/gpgconf.c:736
+#: tools/gpgconf.c:836
 #, fuzzy, c-format
 #| msgid "usage: gpgsm [options] "
 msgid "usage: %s [options] "
 msgstr "användning: gpgsm [flaggor] "
 
-#: dirmngr/dirmngr.c:1260
+#: dirmngr/dirmngr.c:1299
 #, 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:1495 dirmngr/server.c:1824
+#: dirmngr/dirmngr.c:1534 dirmngr/server.c:1878
 #, 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:1501 dirmngr/server.c:1830
+#: dirmngr/dirmngr.c:1540 dirmngr/server.c:1884
 #, 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:1643
+#: dirmngr/dirmngr.c:1682
 #, 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:1698 dirmngr/dirmngr.c:1782
+#: dirmngr/dirmngr.c:1737 dirmngr/dirmngr.c:1821
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "ogiltigt fingeravtryck"
 
-#: dirmngr/dirmngr.c:1734 dirmngr/dirmngr.c:1760 tools/gpgconf-comp.c:3539
+#: dirmngr/dirmngr.c:1773 dirmngr/dirmngr.c:1799 tools/gpgconf-comp.c:3549
 #, 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:1789
+#: dirmngr/dirmngr.c:1828
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1876
+#: dirmngr/dirmngr.c:1915
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1917
+#: dirmngr/dirmngr.c:1956
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1922
+#: dirmngr/dirmngr.c:1961
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1924
+#: dirmngr/dirmngr.c:1963
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1929
+#: dirmngr/dirmngr.c:1968
 #, fuzzy, c-format
 #| msgid "not forced"
 msgid "shutdown forced\n"
 msgstr "inte tvingad"
 
-#: dirmngr/dirmngr.c:1937
+#: dirmngr/dirmngr.c:1976
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1944
+#: dirmngr/dirmngr.c:1983
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:105
-msgid "return all values in a record oriented format"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:108
-msgid "|NAME|ignore host part and connect through NAME"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:109
-msgid "force a TLS connection"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:110
-#, fuzzy
-#| msgid "|NAME|connect to Assuan socket NAME"
-msgid "|NAME|connect to host NAME"
-msgstr "|NAMN|anslut till Assuan-uttaget NAMN"
-
-#: dirmngr/dirmngr_ldap.c:111
-#, fuzzy
-#| msgid "|N|connect to reader at port N"
-msgid "|N|connect to port N"
-msgstr "|N|anslut till läsare på port N"
-
-#: dirmngr/dirmngr_ldap.c:112
-#, fuzzy
-#| msgid "|NAME|use NAME as default recipient"
-msgid "|NAME|use user NAME for authentication"
-msgstr "|NAMN|använd NAMN som standardmottagare"
-
-#: dirmngr/dirmngr_ldap.c:113
-msgid "|PASS|use password PASS for authentication"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:115
-msgid "take password from $DIRMNGR_LDAP_PASS"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:116
-msgid "|STRING|query DN STRING"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:117
-msgid "|STRING|use STRING as filter expression"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:118
-msgid "|STRING|return the attribute STRING"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:179
-#, fuzzy
-#| msgid "Usage: gpg [options] [files] (-h for help)"
-msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
-msgstr "Användning: gpg [flaggor] [filer] (-h för hjälp)"
-
-#: dirmngr/dirmngr_ldap.c:182
-msgid ""
-"Syntax: dirmngr_ldap [options] [URL]\n"
-"Internal LDAP helper for Dirmngr\n"
-"Interface and options may change without notice\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:291
-#, fuzzy, c-format
-#| msgid "invalid import options\n"
-msgid "invalid port number %d\n"
-msgstr "ogiltiga importflaggor\n"
-
-#: dirmngr/dirmngr_ldap.c:400
-#, c-format
-msgid "scanning result for attribute '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:407 dirmngr/dirmngr_ldap.c:490
-#: dirmngr/dirmngr_ldap.c:514 dirmngr/dirmngr_ldap.c:526
-#: dirmngr/dirmngr_ldap.c:722
-#, fuzzy, c-format
-#| msgid "error writing to %s: %s\n"
-msgid "error writing to stdout: %s\n"
-msgstr "fel vid skrivning till %s: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:424
-#, c-format
-msgid "          available attribute '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:462
-#, fuzzy, c-format
-#| msgid "certificate `%s' not found: %s\n"
-msgid "attribute '%s' not found\n"
-msgstr "certifikatet \"%s\" hittades inte: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:469
-#, c-format
-msgid "found attribute '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:581
-#, fuzzy, c-format
-#| msgid "reading from `%s'\n"
-msgid "processing url '%s'\n"
-msgstr "läser från \"%s\"\n"
-
-#: dirmngr/dirmngr_ldap.c:588
-#, fuzzy, c-format
-#| msgid "          w/o user IDs: %lu\n"
-msgid "          user '%s'\n"
-msgstr "       utan användaridentiteter: %lu\n"
-
-#: dirmngr/dirmngr_ldap.c:590
-#, fuzzy, c-format
-#| msgid "                aka \"%s\""
-msgid "          pass '%s'\n"
-msgstr "      även känd som \"%s\""
-
-#: dirmngr/dirmngr_ldap.c:592
-#, fuzzy, c-format
-#| msgid "          w/o user IDs: %lu\n"
-msgid "          host '%s'\n"
-msgstr "       utan användaridentiteter: %lu\n"
-
-#: dirmngr/dirmngr_ldap.c:593
-#, fuzzy, c-format
-#| msgid "          not imported: %lu\n"
-msgid "          port %d\n"
-msgstr "               inte importerade: %lu\n"
-
-#: dirmngr/dirmngr_ldap.c:595
-#, fuzzy, c-format
-#| msgid "                aka \"%s\""
-msgid "            DN '%s'\n"
-msgstr "      även känd som \"%s\""
-
-#: dirmngr/dirmngr_ldap.c:597
-#, c-format
-msgid "        filter '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:602 dirmngr/dirmngr_ldap.c:605
-#, fuzzy, c-format
-#| msgid "                aka \"%s\""
-msgid "          attr '%s'\n"
-msgstr "      även känd som \"%s\""
-
-#: dirmngr/dirmngr_ldap.c:611
-#, fuzzy, c-format
-#| msgid "%s:%u: no hostname given\n"
-msgid "no host name in '%s'\n"
-msgstr "%s:%u: inget värdnamn angivet\n"
-
-#: dirmngr/dirmngr_ldap.c:616
-#, c-format
-msgid "no attribute given for query '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:622
-#, fuzzy, c-format
-#| msgid "WARNING: Using untrusted key!\n"
-msgid "WARNING: using first attribute only\n"
-msgstr "VARNING: Använder en nyckel som inte är betrodd!\n"
-
-#: dirmngr/dirmngr_ldap.c:637 dirmngr/dirmngr_ldap.c:678
-#, fuzzy, c-format
-#| msgid "renaming `%s' to `%s' failed: %s\n"
-msgid "LDAP init to '%s:%d' failed: %s\n"
-msgstr "namnbyte från \"%s\" till \"%s\" misslyckades: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:659
-#, fuzzy, c-format
-#| msgid "renaming `%s' to `%s' failed: %s\n"
-msgid "LDAP init to '%s' failed: %s\n"
-msgstr "namnbyte från \"%s\" till \"%s\" misslyckades: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:665
-#, fuzzy, c-format
-#| msgid "renaming `%s' to `%s' failed: %s\n"
-msgid "LDAP init to '%s' done\n"
-msgstr "namnbyte från \"%s\" till \"%s\" misslyckades: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:704
-#, fuzzy, c-format
-#| msgid "renaming `%s' to `%s' failed: %s\n"
-msgid "binding to '%s:%d' failed: %s\n"
-msgstr "namnbyte från \"%s\" till \"%s\" misslyckades: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:728
-#, fuzzy, c-format
-#| msgid "dearmoring failed: %s\n"
-msgid "searching '%s' failed: %s\n"
-msgstr "misslyckades med att ta bort ASCII-skalet: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:759
-#, fuzzy, c-format
-#| msgid "`%s' is not a JPEG file\n"
-msgid "'%s' is not an LDAP URL\n"
-msgstr "\"%s\" är inte en JPEG-fil\n"
-
-#: dirmngr/dirmngr_ldap.c:765
-#, c-format
-msgid "'%s' is an invalid LDAP URL\n"
-msgstr ""
-
-#: dirmngr/http.c:1989 dirmngr/ocsp.c:255
+#: dirmngr/http.c:1998 dirmngr/ocsp.c:255
 #, fuzzy, c-format
 #| msgid "error running `%s': exit status %d\n"
 msgid "error accessing '%s': http status %u\n"
 msgstr "fel vid körning av \"%s\": avslutsstatus %d\n"
 
-#: dirmngr/http.c:3630 dirmngr/ocsp.c:229
+#: dirmngr/http.c:3652 dirmngr/ocsp.c:229
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr ""
 
-#: dirmngr/http.c:3636 dirmngr/ocsp.c:246
+#: dirmngr/http.c:3658 dirmngr/ocsp.c:246
 #, fuzzy, c-format
 #| msgid "too many cipher preferences\n"
 msgid "too many redirections\n"
 msgstr "för många chifferinställningar\n"
 
-#: dirmngr/http.c:3748
+#: dirmngr/http.c:3768
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "redirection changed to '%s'\n"
@@ -11534,33 +11321,54 @@ msgstr "misslyckades med att vänta på att processen %d skulle avslutas: %s\n"
 msgid "ldap wrapper %d stalled - killing\n"
 msgstr ""
 
-#: dirmngr/ldap.c:91
+#: dirmngr/ldap.c:92
 #, c-format
 msgid "invalid char 0x%02x in host name - not added\n"
 msgstr ""
 
-#: dirmngr/ldap.c:95
+#: dirmngr/ldap.c:96
 #, fuzzy, c-format
 #| msgid "sending key %s to %s server %s\n"
 msgid "adding '%s:%d' to the ldap server list\n"
 msgstr "skickar nyckeln %s till %s-servern %s\n"
 
-#: dirmngr/ldap.c:98 dirmngr/misc.c:512
+#: dirmngr/ldap.c:99 dirmngr/misc.c:512
 #, fuzzy, c-format
 #| msgid "select failed: %s\n"
 msgid "malloc failed: %s\n"
 msgstr "val misslyckades: %s\n"
 
-#: dirmngr/ldap.c:634
+#: dirmngr/ldap.c:221
+#, fuzzy, c-format
+#| msgid "`%s' is not a JPEG file\n"
+msgid "'%s' is not an LDAP URL\n"
+msgstr "\"%s\" är inte en JPEG-fil\n"
+
+#: dirmngr/ldap.c:227 dirmngr/ldap.c:233
 #, c-format
-msgid "start_cert_fetch: invalid pattern '%s'\n"
+msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
-#: dirmngr/ldap.c:846
+#: dirmngr/ldap.c:968
 #, c-format
 msgid "ldap_search hit the size limit of the server\n"
 msgstr ""
 
+#: dirmngr/ldapserver.c:119
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr "%s:%u: lösenord angivet utan användare\n"
+
+#: dirmngr/ldapserver.c:181
+#, c-format
+msgid "%s:%u: ignoring unknown flag '%s'\n"
+msgstr ""
+
+#: dirmngr/ldapserver.c:203
+#, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr "%s:%u: hoppar över denna rad\n"
+
 #: dirmngr/misc.c:172
 #, fuzzy, c-format
 #| msgid "%s: invalid file version %d\n"
@@ -11664,97 +11472,97 @@ msgstr ""
 msgid "allocating list item failed: %s\n"
 msgstr "mottagande rad misslyckades: %s\n"
 
-#: dirmngr/ocsp.c:537 dirmngr/ocsp.c:724
+#: dirmngr/ocsp.c:538 dirmngr/ocsp.c:725
 #, fuzzy, c-format
 #| msgid "error getting new PIN: %s\n"
 msgid "error getting responder ID: %s\n"
 msgstr "fel vid hämtning av ny PIN-kod: %s\n"
 
-#: dirmngr/ocsp.c:584
+#: dirmngr/ocsp.c:585
 #, fuzzy, c-format
 #| msgid "certificate should have not been used for OCSP response signing\n"
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr "certifikatet skulle inte använts för signering av OCSP-svar\n"
 
-#: dirmngr/ocsp.c:623 dirmngr/validate.c:648
+#: dirmngr/ocsp.c:624 dirmngr/validate.c:648
 #, fuzzy, c-format
 #| msgid "issuer certificate not found"
 msgid "issuer certificate not found: %s\n"
 msgstr "utfärdarens certifikat hittades inte"
 
-#: dirmngr/ocsp.c:633
+#: dirmngr/ocsp.c:634
 #, fuzzy, c-format
 #| msgid "error reading list of trusted root certificates\n"
 msgid "caller did not return the target certificate\n"
 msgstr "fel vid inläsning av betrodda rotcertifikat\n"
 
-#: dirmngr/ocsp.c:640
+#: dirmngr/ocsp.c:641
 #, fuzzy, c-format
 #| msgid "error storing certificate\n"
 msgid "caller did not return the issuing certificate\n"
 msgstr "fel vid lagring av certifikat\n"
 
-#: dirmngr/ocsp.c:650
+#: dirmngr/ocsp.c:651
 #, fuzzy, c-format
 #| msgid "failed to allocate keyDB handle\n"
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "misslyckades med att allokera keyDB-hanterare\n"
 
-#: dirmngr/ocsp.c:689
+#: dirmngr/ocsp.c:690
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:696
 #, fuzzy, c-format
 #| msgid "no default secret keyring: %s\n"
 msgid "no default OCSP signer defined\n"
 msgstr "ingen hemlig nyckelring angiven som standard: %s\n"
 
-#: dirmngr/ocsp.c:702
+#: dirmngr/ocsp.c:703
 #, fuzzy, c-format
 #| msgid "using default PIN as %s\n"
 msgid "using default OCSP responder '%s'\n"
 msgstr "använder standard-PIN som %s\n"
 
-#: dirmngr/ocsp.c:707
+#: dirmngr/ocsp.c:708
 #, fuzzy, c-format
 #| msgid "using cipher %s\n"
 msgid "using OCSP responder '%s'\n"
 msgstr "använder %s-chiffer\n"
 
-#: dirmngr/ocsp.c:764
+#: dirmngr/ocsp.c:765
 #, fuzzy, c-format
 #| msgid "error storing certificate: %s\n"
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "fel vid lagring av certifikat: %s\n"
 
-#: dirmngr/ocsp.c:789
+#: dirmngr/ocsp.c:790
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:790
+#: dirmngr/ocsp.c:791
 msgid "good"
 msgstr ""
 
-#: dirmngr/ocsp.c:796
+#: dirmngr/ocsp.c:797
 #, fuzzy, c-format
 #| msgid "certificate has been revoked"
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "certifikatet har spärrats"
 
-#: dirmngr/ocsp.c:831
+#: dirmngr/ocsp.c:832
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:843
+#: dirmngr/ocsp.c:844
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:858
+#: dirmngr/ocsp.c:859
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr ""
@@ -11765,80 +11573,76 @@ msgstr ""
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "sändande rad misslyckades: %s\n"
 
-#: dirmngr/server.c:1158
-msgid "ldapserver missing"
-msgstr ""
-
-#: dirmngr/server.c:1224
+#: dirmngr/server.c:1277
 msgid "serialno missing in cert ID"
 msgstr ""
 
-#: dirmngr/server.c:1387 dirmngr/server.c:1473 dirmngr/server.c:1909
-#: dirmngr/server.c:1980 dirmngr/server.c:2556 dirmngr/server.c:2571
+#: dirmngr/server.c:1440 dirmngr/server.c:1526 dirmngr/server.c:1963
+#: dirmngr/server.c:2034 dirmngr/server.c:2662 dirmngr/server.c:2677
 #, fuzzy, c-format
 #| msgid "sending line failed: %s\n"
 msgid "assuan_inquire failed: %s\n"
 msgstr "sändande rad misslyckades: %s\n"
 
-#: dirmngr/server.c:1516
+#: dirmngr/server.c:1569
 #, fuzzy, c-format
 #| msgid "select failed: %s\n"
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "val misslyckades: %s\n"
 
-#: dirmngr/server.c:1528 dirmngr/server.c:1559 dirmngr/server.c:1718
+#: dirmngr/server.c:1581 dirmngr/server.c:1612 dirmngr/server.c:1772
 #, fuzzy, c-format
 #| msgid "error sending %s command: %s\n"
 msgid "error sending data: %s\n"
 msgstr "fel vid sändning av %s-kommando: %s\n"
 
-#: dirmngr/server.c:1666
+#: dirmngr/server.c:1720
 #, fuzzy, c-format
 #| msgid "select failed: %s\n"
 msgid "start_cert_fetch failed: %s\n"
 msgstr "val misslyckades: %s\n"
 
-#: dirmngr/server.c:1699
+#: dirmngr/server.c:1753
 #, fuzzy, c-format
 #| msgid "select failed: %s\n"
 msgid "fetch_next_cert failed: %s\n"
 msgstr "val misslyckades: %s\n"
 
-#: dirmngr/server.c:1726
+#: dirmngr/server.c:1780
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:2860
+#: dirmngr/server.c:2966
 #, fuzzy, c-format
 #| msgid "cannot allocate outfile string: %s\n"
 msgid "can't allocate control structure: %s\n"
 msgstr "kan inte allokera utfilssträng: %s\n"
 
-#: dirmngr/server.c:2871
+#: dirmngr/server.c:2977
 #, fuzzy, c-format
 #| msgid "failed to create stream from socket: %s\n"
 msgid "failed to allocate assuan context: %s\n"
 msgstr "misslyckades med att skapa flöde från uttag: %s\n"
 
-#: dirmngr/server.c:2892
+#: dirmngr/server.c:2998
 #, fuzzy, c-format
 #| msgid "failed to initialize the TrustDB: %s\n"
 msgid "failed to initialize the server: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: dirmngr/server.c:2900
+#: dirmngr/server.c:3006
 #, fuzzy, c-format
 #| msgid "failed to store the creation date: %s\n"
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "misslyckades med att lagra datum för skapandet: %s\n"
 
-#: dirmngr/server.c:2933
+#: dirmngr/server.c:3039
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:2952
+#: dirmngr/server.c:3058
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -12007,76 +11811,76 @@ msgstr "ingen gpg-agent kör i den här sessionen\n"
 msgid "error sending standard options: %s\n"
 msgstr "fel vid sändning av standardflaggor: %s\n"
 
-#: tools/gpgconf-comp.c:649
+#: tools/gpgconf-comp.c:655
 msgid "OpenPGP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:653
+#: tools/gpgconf-comp.c:659
 msgid "S/MIME"
 msgstr ""
 
-#: tools/gpgconf-comp.c:657
+#: tools/gpgconf-comp.c:663
 #, fuzzy
 #| msgid "public key is %s\n"
 msgid "Public Keys"
 msgstr "publik nyckel är %s\n"
 
-#: tools/gpgconf-comp.c:661
+#: tools/gpgconf-comp.c:667
 msgid "Private Keys"
 msgstr ""
 
-#: tools/gpgconf-comp.c:665
+#: tools/gpgconf-comp.c:671
 msgid "Smartcards"
 msgstr ""
 
-#: tools/gpgconf-comp.c:669
+#: tools/gpgconf-comp.c:676
 msgid "TPM"
 msgstr ""
 
-#: tools/gpgconf-comp.c:673
+#: tools/gpgconf-comp.c:681
 msgid "Network"
 msgstr ""
 
-#: tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:685
 #, fuzzy
 #| msgid "Bad Passphrase"
 msgid "Passphrase Entry"
 msgstr "Felaktig lösenfras"
 
-#: tools/gpgconf-comp.c:941
+#: tools/gpgconf-comp.c:951
 #, fuzzy
 #| msgid "Component not found"
 msgid "Component not suitable for launching"
 msgstr "Komponenten hittades inte"
 
-#: tools/gpgconf-comp.c:947
+#: tools/gpgconf-comp.c:957
 #, fuzzy, c-format
 #| msgid "External verification of component %s failed"
 msgid "Configuration file of component %s is broken\n"
 msgstr "Extern validering av komponenten %s misslyckades"
 
-#: tools/gpgconf-comp.c:950
+#: tools/gpgconf-comp.c:960
 #, fuzzy, c-format
 #| msgid "Please use the command \"toggle\" first.\n"
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr "Använd kommandot \"toggle\" först.\n"
 
-#: tools/gpgconf-comp.c:2816
+#: tools/gpgconf-comp.c:2826
 #, c-format
 msgid "External verification of component %s failed"
 msgstr "Extern validering av komponenten %s misslyckades"
 
-#: tools/gpgconf-comp.c:2946
+#: tools/gpgconf-comp.c:2956
 msgid "Note that group specifications are ignored\n"
 msgstr "Observera att gruppspecifikationer ignoreras\n"
 
-#: tools/gpgconf-comp.c:3543
+#: tools/gpgconf-comp.c:3553
 #, 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:3545
+#: tools/gpgconf-comp.c:3555
 #, fuzzy, c-format
 #| msgid "error in `%s': %s\n"
 msgid "error parsing '%s'\n"
@@ -12176,15 +11980,15 @@ msgstr ""
 "Syntax: gpgconf [flaggor]\n"
 "Hantera konfigurationsinställningar för verktygen i GnuPG-systemet\n"
 
-#: tools/gpgconf.c:669 tools/gpgconf.c:704
+#: tools/gpgconf.c:703 tools/gpgconf.c:738
 msgid "Need one component argument"
 msgstr "Behöver ett komponentargument"
 
-#: tools/gpgconf.c:678 tools/gpgconf.c:728 tools/gpgconf.c:778
+#: tools/gpgconf.c:712 tools/gpgconf.c:762 tools/gpgconf.c:812
 msgid "Component not found"
 msgstr "Komponenten hittades inte"
 
-#: tools/gpgconf.c:804
+#: tools/gpgconf.c:838
 msgid "No argument allowed"
 msgstr "Inget argument tillåts"
 
@@ -12200,92 +12004,206 @@ msgstr ""
 "Syntax: gpg-check-pattern [flaggor] mönsterfil\n"
 "Kontrollera en lösenfras angiven på standard in mot mönsterfilen\n"
 
-#: tools/gpg-card.c:2390
+#: tools/gpg-card.c:2407
 #, fuzzy, c-format
 #| msgid "NOTE: keys are already stored on the card!\n"
 msgid "Note: key %s is already stored on the card!\n"
 msgstr "OBSERVERA: nycklar har redan lagrats på kortet!\n"
 
-#: tools/gpg-card.c:2393
+#: tools/gpg-card.c:2410
 #, fuzzy, c-format
 #| msgid "NOTE: keys are already stored on the card!\n"
 msgid "Note: Keys are already stored on the card!\n"
 msgstr "OBSERVERA: nycklar har redan lagrats på kortet!\n"
 
-#: tools/gpg-card.c:2396
+#: tools/gpg-card.c:2413
 #, fuzzy, c-format
 #| msgid "Replace existing keys? (y/N) "
 msgid "Replace existing key %s ? (y/N) "
 msgstr "Ersätt existerande nycklar? (j/N) "
 
-#: tools/gpg-card.c:2549 tools/gpg-card.c:2712 tools/gpg-card.c:2935
-#: tools/gpg-card.c:3044
+#: tools/gpg-card.c:2566 tools/gpg-card.c:2729 tools/gpg-card.c:2952
+#: tools/gpg-card.c:3061
 #, fuzzy, c-format
 #| msgid "OpenPGP card no. %s detected\n"
 msgid "%s card no. %s detected\n"
 msgstr "OpenPGP-kort nr. %s identifierades\n"
 
-#: tools/gpg-card.c:3396
+#: tools/gpg-card.c:3413
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3406 tools/gpg-card.c:3420
+#: tools/gpg-card.c:3423 tools/gpg-card.c:3437
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
 "         can only be reverted using a factory reset!\n"
 msgstr ""
 
-#: tools/gpg-card.c:3423
+#: tools/gpg-card.c:3440
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3669
+#: tools/gpg-card.c:3686
 #, fuzzy
 #| msgid "  (certificate created at "
 msgid "authenticate to the card"
 msgstr "  (certifikat skapat "
 
-#: tools/gpg-card.c:3671
+#: tools/gpg-card.c:3688
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3673
+#: tools/gpg-card.c:3690
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication"
 msgstr "|NAMN|använd NAMN som standardmottagare"
 
-#: tools/gpg-card.c:3675
+#: tools/gpg-card.c:3692
 msgid "change a private data object"
 msgstr ""
 
-#: tools/gpg-card.c:3676
+#: tools/gpg-card.c:3693
 #, fuzzy
 #| msgid "  (certificate created at "
 msgid "read a certificate from a data object"
 msgstr "  (certifikat skapat "
 
-#: tools/gpg-card.c:3677
+#: tools/gpg-card.c:3694
 #, fuzzy
 #| msgid "  (certificate created at "
 msgid "store a certificate to a data object"
 msgstr "  (certifikat skapat "
 
-#: tools/gpg-card.c:3678
+#: tools/gpg-card.c:3695
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3679
+#: tools/gpg-card.c:3696
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3681
+#: tools/gpg-card.c:3698
 msgid "manage the command history"
 msgstr ""
 
+#~ msgid "requesting key %s from %s server %s\n"
+#~ msgstr "begär nyckeln %s från %s-servern %s\n"
+
+#~ msgid "%s:%u: no hostname given\n"
+#~ msgstr "%s:%u: inget värdnamn angivet\n"
+
+#~ msgid "could not parse keyserver\n"
+#~ msgstr "kunde inte tolka nyckelserver\n"
+
+#, fuzzy
+#~| msgid "|NAME|connect to Assuan socket NAME"
+#~ msgid "|NAME|connect to host NAME"
+#~ msgstr "|NAMN|anslut till Assuan-uttaget NAMN"
+
+#, fuzzy
+#~| msgid "|N|connect to reader at port N"
+#~ msgid "|N|connect to port N"
+#~ msgstr "|N|anslut till läsare på port N"
+
+#, fuzzy
+#~| msgid "|NAME|use NAME as default recipient"
+#~ msgid "|NAME|use user NAME for authentication"
+#~ msgstr "|NAMN|använd NAMN som standardmottagare"
+
+#, fuzzy
+#~| msgid "Usage: gpg [options] [files] (-h for help)"
+#~ msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
+#~ msgstr "Användning: gpg [flaggor] [filer] (-h för hjälp)"
+
+#, fuzzy
+#~| msgid "invalid import options\n"
+#~ msgid "invalid port number %d\n"
+#~ msgstr "ogiltiga importflaggor\n"
+
+#, fuzzy
+#~| msgid "error writing to %s: %s\n"
+#~ msgid "error writing to stdout: %s\n"
+#~ msgstr "fel vid skrivning till %s: %s\n"
+
+#, fuzzy
+#~| msgid "certificate `%s' not found: %s\n"
+#~ msgid "attribute '%s' not found\n"
+#~ msgstr "certifikatet \"%s\" hittades inte: %s\n"
+
+#, fuzzy
+#~| msgid "reading from `%s'\n"
+#~ msgid "processing url '%s'\n"
+#~ msgstr "läser från \"%s\"\n"
+
+#, fuzzy
+#~| msgid "          w/o user IDs: %lu\n"
+#~ msgid "          user '%s'\n"
+#~ msgstr "       utan användaridentiteter: %lu\n"
+
+#, fuzzy
+#~| msgid "                aka \"%s\""
+#~ msgid "          pass '%s'\n"
+#~ msgstr "      även känd som \"%s\""
+
+#, fuzzy
+#~| msgid "          w/o user IDs: %lu\n"
+#~ msgid "          host '%s'\n"
+#~ msgstr "       utan användaridentiteter: %lu\n"
+
+#, fuzzy
+#~| msgid "          not imported: %lu\n"
+#~ msgid "          port %d\n"
+#~ msgstr "               inte importerade: %lu\n"
+
+#, fuzzy
+#~| msgid "                aka \"%s\""
+#~ msgid "            DN '%s'\n"
+#~ msgstr "      även känd som \"%s\""
+
+#, fuzzy
+#~| msgid "                aka \"%s\""
+#~ msgid "          attr '%s'\n"
+#~ msgstr "      även känd som \"%s\""
+
+#, fuzzy
+#~| msgid "%s:%u: no hostname given\n"
+#~ msgid "no host name in '%s'\n"
+#~ msgstr "%s:%u: inget värdnamn angivet\n"
+
+#, fuzzy
+#~| msgid "WARNING: Using untrusted key!\n"
+#~ msgid "WARNING: using first attribute only\n"
+#~ msgstr "VARNING: Använder en nyckel som inte är betrodd!\n"
+
+#, fuzzy
+#~| msgid "renaming `%s' to `%s' failed: %s\n"
+#~ msgid "LDAP init to '%s:%d' failed: %s\n"
+#~ msgstr "namnbyte från \"%s\" till \"%s\" misslyckades: %s\n"
+
+#, fuzzy
+#~| msgid "renaming `%s' to `%s' failed: %s\n"
+#~ msgid "LDAP init to '%s' failed: %s\n"
+#~ msgstr "namnbyte från \"%s\" till \"%s\" misslyckades: %s\n"
+
+#, fuzzy
+#~| msgid "renaming `%s' to `%s' failed: %s\n"
+#~ msgid "LDAP init to '%s' done\n"
+#~ msgstr "namnbyte från \"%s\" till \"%s\" misslyckades: %s\n"
+
+#, fuzzy
+#~| msgid "renaming `%s' to `%s' failed: %s\n"
+#~ msgid "binding to '%s:%d' failed: %s\n"
+#~ msgstr "namnbyte från \"%s\" till \"%s\" misslyckades: %s\n"
+
+#, fuzzy
+#~| msgid "dearmoring failed: %s\n"
+#~ msgid "searching '%s' failed: %s\n"
+#~ msgstr "misslyckades med att ta bort ASCII-skalet: %s\n"
+
 #, fuzzy
 #~| msgid "change a passphrase"
 #~ msgid "Suggest a random passphrase."
diff --git a/po/tr.gmo b/po/tr.gmo
index 9628799..df2d121 100644
--- a/po/tr.gmo
+++ b/po/tr.gmo
diff --git a/po/tr.po b/po/tr.po
index d1b6d13..bb5ddb6 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: 2021-04-20 12:38+0200\n"
+"POT-Creation-Date: 2021-08-24 18:50+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:328
+#: agent/call-pinentry.c:338
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "PIN giriÅŸ kilidi edinilemedi: %s\n"
@@ -29,49 +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:546
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_OK"
 msgstr ""
 
-#: agent/call-pinentry.c:547
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
-#: agent/call-pinentry.c:548
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|_Yes"
 msgstr ""
 
-#: agent/call-pinentry.c:549
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_No"
 msgstr ""
 
-#: agent/call-pinentry.c:550
+#: agent/call-pinentry.c:560
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:551
+#: agent/call-pinentry.c:561
 msgid "|pinentry-label|_Save in password manager"
 msgstr ""
 
-#: agent/call-pinentry.c:552
+#: agent/call-pinentry.c:562
 #, 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:554
+#: agent/call-pinentry.c:564
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:555
+#: agent/call-pinentry.c:565
 #, fuzzy
 #| msgid "Enter new passphrase"
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "Yeni anahtar parolasını giriniz"
 
+#: agent/call-pinentry.c:566
+msgid "Caps Lock is on"
+msgstr ""
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:944
+#: agent/call-pinentry.c:1022
 msgid "Suggest"
 msgstr ""
 
@@ -82,13 +86,26 @@ 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:966
+#: agent/call-pinentry.c:1044
 msgid "pinentry.genpin.tooltip"
 msgstr ""
 
+#: agent/call-pinentry.c:1072
+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
+#, fuzzy
+#| msgid "Passphrase too long"
+msgid "Passphrase Not Allowed"
+msgstr "Anahtar Parolası çok uzun"
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:998
+#: agent/call-pinentry.c:1198
 msgid "Quality:"
 msgstr "Kalite:"
 
@@ -98,11 +115,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:1019
+#: agent/call-pinentry.c:1219
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:1263
+#: agent/call-pinentry.c:1477
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
@@ -110,7 +127,7 @@ msgstr ""
 "Lütfen PIN'inizi giriniz, böylelikle bu oturumda bu gizli anahtar kilitsiz "
 "olabilecek"
 
-#: agent/call-pinentry.c:1266
+#: agent/call-pinentry.c:1480
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -118,76 +135,76 @@ msgstr ""
 "Lütfen anahtar parolanızı giriniz, böylelikle bu oturumda bu gizli anahtar "
 "kilitsiz olabilecek"
 
-#: agent/call-pinentry.c:1303 agent/call-pinentry.c:1506
+#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1303 agent/call-pinentry.c:1506
-#: agent/protect-tool.c:728
+#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/protect-tool.c:729
 msgid "Passphrase:"
 msgstr "Anahtar Parolası:"
 
-#: agent/call-pinentry.c:1330 agent/call-pinentry.c:1580 agent/command.c:1799
-#: agent/command.c:1852 agent/command-ssh.c:3046 agent/genkey.c:398
+#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
+#: agent/command.c:1988 agent/command-ssh.c:3046 agent/genkey.c:442
 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:1351 agent/call-pinentry.c:1603
+#: agent/call-pinentry.c:1566 agent/call-pinentry.c:1830
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (%d/%d dene)"
 
-#: agent/call-pinentry.c:1362 agent/call-pinentry.c:1614
+#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
 msgid "Repeat:"
 msgstr ""
 
-#: agent/call-pinentry.c:1372 agent/call-pinentry.c:1384
-#: agent/call-pinentry.c:1624 agent/call-pinentry.c:1636
+#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
+#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
 msgid "PIN too long"
 msgstr "PIN çok uzun"
 
-#: agent/call-pinentry.c:1373 agent/call-pinentry.c:1625
+#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
 msgid "Passphrase too long"
 msgstr "Anahtar Parolası çok uzun"
 
-#: agent/call-pinentry.c:1381 agent/call-pinentry.c:1633
+#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
 msgid "Invalid characters in PIN"
 msgstr "PIN içinde geçersiz karakterler var"
 
-#: agent/call-pinentry.c:1386 agent/call-pinentry.c:1638
+#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
 msgid "PIN too short"
 msgstr "PIN çok kısa"
 
-#: agent/call-pinentry.c:1405 agent/call-pinentry.c:1656
+#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
 msgid "Bad PIN"
 msgstr "PIN hatalı"
 
-#: agent/call-pinentry.c:1405 agent/call-pinentry.c:1656
+#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
 msgid "Bad Passphrase"
 msgstr "Anahtar Parolası hatalı"
 
-#: agent/command.c:697
+#: agent/command.c:823
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:698
+#: agent/command.c:824
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1106 g10/card-util.c:708 g10/card-util.c:729
+#: agent/command.c:1235 g10/card-util.c:713 g10/card-util.c:734
 #, 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:1634 agent/command.c:1791 agent/command-ssh.c:2974
-#: agent/genkey.c:333
+#: agent/command.c:1756 agent/command.c:1921 agent/command-ssh.c:2974
+#: agent/genkey.c:377
 msgid "Please re-enter this passphrase"
 msgstr "Lütfen bu anahtar parolasını tekrar girin"
 
-#: agent/command.c:2567
+#: agent/command.c:2703
 #, fuzzy, c-format
 #| msgid ""
 #| "Please enter the passphrase to protect the imported object within the "
@@ -199,7 +216,7 @@ msgstr ""
 "Lütfen GnuPG sistemine ithal edilen nesneyi koruyacak anahtar parolasını "
 "giriniz."
 
-#: agent/command.c:2697
+#: agent/command.c:2833
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -210,26 +227,26 @@ msgstr ""
 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:872 common/dotlock.c:852 g10/card-util.c:953
-#: g10/export.c:1329 g10/gpg.c:1431 g10/keygen.c:5347 g10/keyring.c:1319
-#: g10/keyring.c:1632 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
+#: agent/command-ssh.c:872 common/dotlock.c:852 g10/card-util.c:963
+#: g10/export.c:1329 g10/gpg.c:1431 g10/keygen.c:5377 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
 #: g10/sign.c:1106 g10/sign.c:1443 g10/tdbio.c:753 tools/gpg-card.c:479
 #, fuzzy, c-format
 #| msgid "can't create `%s': %s\n"
 msgid "can't create '%s': %s\n"
 msgstr "\"%s\" oluşturulamıyor: %s\n"
 
-#: agent/command-ssh.c:884 common/helpfile.c:57 g10/card-util.c:910
+#: agent/command-ssh.c:884 common/helpfile.c:57 g10/card-util.c:920
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
 #: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:721 g10/gpg.c:1432
-#: g10/import.c:371 g10/import.c:558 g10/import.c:793 g10/keygen.c:4322
-#: g10/keyring.c:1658 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
+#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4326
+#: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
 #: g10/plaintext.c:610 g10/sign.c:1086 g10/sign.c:1311 g10/sign.c:1424
 #: g10/sign.c:1596 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2380
-#: sm/gpgsm.c:2410 sm/gpgsm.c:2448 sm/keylist.c:1737 sm/qualified.c:65
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2236
+#: sm/gpgsm.c:2266 sm/gpgsm.c:2304 sm/keylist.c:1775 sm/qualified.c:65
 #: dirmngr/certcache.c:396 dirmngr/certcache.c:476 dirmngr/certcache.c:478
-#: dirmngr/crlcache.c:2588 dirmngr/dirmngr.c:1720 tools/gpg-card.c:408
+#: dirmngr/crlcache.c:2591 dirmngr/dirmngr.c:1759 tools/gpg-card.c:408
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
@@ -339,27 +356,27 @@ msgstr "PIN doğru tekrarlanmadı; tekrar deneyin"
 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:109 sm/certreqgen-ui.c:433
+#: 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:116
+#: 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
+#: agent/genkey.c:191
 msgid "Enter new passphrase"
 msgstr "Yeni anahtar parolasını giriniz"
 
-#: agent/genkey.c:184
+#: agent/genkey.c:227
 #, 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:186
+#: agent/genkey.c:229
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -368,11 +385,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:198
+#: agent/genkey.c:241
 msgid "Yes, protection is not needed"
 msgstr "Evet, korumak gereksiz"
 
-#: agent/genkey.c:215
+#: agent/genkey.c:258
 #, fuzzy, c-format
 #| msgid "Name must be at least 5 characters long\n"
 msgid "A passphrase should be at least %u character long."
@@ -380,7 +397,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:234
+#: agent/genkey.c:277
 #, fuzzy, c-format
 #| msgid ""
 #| "Warning: You have entered an insecure passphrase.%%0AA passphrase should "
@@ -398,7 +415,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:260
+#: agent/genkey.c:304
 #, fuzzy, c-format
 #| msgid ""
 #| "Warning: You have entered an insecure passphrase.%%0AA passphrase may not "
@@ -408,7 +425,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:275
+#: agent/genkey.c:319
 #, fuzzy
 #| msgid ""
 #| "Warning: You have entered an insecure passphrase.%%0AA passphrase should "
@@ -421,248 +438,247 @@ msgstr ""
 "Uyarı: Girdiğiniz anahtar parolası güvenli değil.%%0AParola en az %u "
 "karakterlik olmalı."
 
-#: agent/genkey.c:296
+#: agent/genkey.c:340
 msgid "Take this one anyway"
 msgstr "Ne olursa olsun bunu al"
 
-#: agent/genkey.c:464
+#: agent/genkey.c:508
 #, 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:590
+#: agent/genkey.c:637
 msgid "Please enter the new passphrase"
 msgstr "Lütfen yeni anahtar parolasını girin"
 
-#: agent/gpg-agent.c:162 scd/scdaemon.c:115 dirmngr/dirmngr.c:182
+#: agent/gpg-agent.c:164 scd/scdaemon.c:115 dirmngr/dirmngr.c:183
 #, fuzzy
 #| msgid "Options useful for debugging"
 msgid "Options used for startup"
 msgstr "Hata ayıklamaya elverişli seçenekler"
 
-#: agent/gpg-agent.c:164 scd/scdaemon.c:120 dirmngr/dirmngr.c:171
+#: agent/gpg-agent.c:166 scd/scdaemon.c:120 dirmngr/dirmngr.c:172
 msgid "run in daemon mode (background)"
 msgstr "artalan süreci olarak çalışır"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:117 dirmngr/dirmngr.c:170
+#: agent/gpg-agent.c:167 scd/scdaemon.c:117 dirmngr/dirmngr.c:171
 msgid "run in server mode (foreground)"
 msgstr "sunucu olarak (önalanda) çalışır"
 
-#: agent/gpg-agent.c:167 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:169 dirmngr/dirmngr.c:174
 #, fuzzy
 #| msgid "run in server mode"
 msgid "run in supervised mode"
 msgstr "sunucu kipinde çalışır"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:121 dirmngr/dirmngr.c:184
+#: agent/gpg-agent.c:171 scd/scdaemon.c:121 dirmngr/dirmngr.c:185
 msgid "do not detach from the console"
 msgstr "konsoldan kopulmaz"
 
-#: agent/gpg-agent.c:170 scd/scdaemon.c:122 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:172 scd/scdaemon.c:122 dirmngr/dirmngr.c:186
 msgid "sh-style command output"
 msgstr "sh tarzı komut çıktısı"
 
-#: agent/gpg-agent.c:171 scd/scdaemon.c:123 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:173 scd/scdaemon.c:123 dirmngr/dirmngr.c:187
 msgid "csh-style command output"
 msgstr "csh tarzı komut çıktısı"
 
-#: agent/gpg-agent.c:179 g10/gpg.c:589 scd/scdaemon.c:125 sm/gpgsm.c:422
-#: dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:181 g10/gpg.c:589 scd/scdaemon.c:125 sm/gpgsm.c:423
+#: dirmngr/dirmngr.c:189
 msgid "|FILE|read options from FILE"
 msgstr "|DOSYA|seçenekler DOSYAdan okunur"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:574 scd/scdaemon.c:129 sm/gpgsm.c:265
-#: dirmngr/dirmngr.c:192
+#: agent/gpg-agent.c:185 g10/gpg.c:574 scd/scdaemon.c:129 sm/gpgsm.c:265
+#: dirmngr/dirmngr.c:193
 msgid "Options controlling the diagnostic output"
 msgstr "Tanı çıktısını denetleyen seçenekler"
 
-#: agent/gpg-agent.c:185 g10/gpg.c:576 g10/gpgv.c:78 kbx/kbxutil.c:89
+#: agent/gpg-agent.c:187 g10/gpg.c:576 g10/gpgv.c:78 kbx/kbxutil.c:89
 #: scd/scdaemon.c:131 sm/gpgsm.c:267 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:194 dirmngr/dirmngr_ldap.c:102
-#: tools/gpg-connect-agent.c:85 tools/gpgconf.c:111
+#: dirmngr/dirmngr.c:195 tools/gpg-connect-agent.c:85 tools/gpgconf.c:111
 msgid "verbose"
 msgstr "ayrıntılı"
 
-#: agent/gpg-agent.c:186 g10/gpg.c:578 g10/gpgv.c:79 kbx/kbxutil.c:90
+#: agent/gpg-agent.c:188 g10/gpg.c:578 g10/gpgv.c:79 kbx/kbxutil.c:90
 #: scd/scdaemon.c:132 sm/gpgsm.c:269 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:195 dirmngr/dirmngr_ldap.c:103
+#: dirmngr/dirmngr.c:196
 msgid "be somewhat more quiet"
 msgstr "biraz daha sessiz olur"
 
-#: agent/gpg-agent.c:194 g10/gpg.c:593 sm/gpgsm.c:283 dirmngr/dirmngr.c:205
+#: agent/gpg-agent.c:196 g10/gpg.c:593 sm/gpgsm.c:283 dirmngr/dirmngr.c:206
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|DOSYA|sunucu kipi günlükleri DOSYAya yazar"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 scd/scdaemon.c:146 sm/gpgsm.c:290
-#: dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:599 scd/scdaemon.c:146 sm/gpgsm.c:290
+#: dirmngr/dirmngr.c:210
 msgid "Options controlling the configuration"
 msgstr "Yapılandırmayı denetleyen seçenekler"
 
-#: agent/gpg-agent.c:201
+#: agent/gpg-agent.c:203
 msgid "do not use the SCdaemon"
 msgstr "Akıllı kart süreci kullanılmaz"
 
-#: agent/gpg-agent.c:203
+#: agent/gpg-agent.c:205
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "[UYG|Akıllı kart uygulaması olarak UYG kullanılır"
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 #, 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:209
+#: agent/gpg-agent.c:211
 #, 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:213
+#: agent/gpg-agent.c:215
 msgid "ignore requests to change the TTY"
 msgstr "TTY değiştirme istekleri yoksayılır"
 
-#: agent/gpg-agent.c:215
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the X display"
 msgstr "X birimi değiştirme istekleri yoksayılır"
 
-#: agent/gpg-agent.c:216
+#: agent/gpg-agent.c:218
 #, fuzzy
 #| msgid "enable ssh-agent emulation"
 msgid "enable ssh support"
 msgstr "ssh-agent öykünümü etkinleşir"
 
-#: agent/gpg-agent.c:218
+#: agent/gpg-agent.c:220
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:221
+#: agent/gpg-agent.c:223
 msgid "enable putty support"
 msgstr ""
 
-#: agent/gpg-agent.c:233 g10/gpg.c:844 scd/scdaemon.c:176 sm/gpgsm.c:382
+#: agent/gpg-agent.c:235 g10/gpg.c:844 scd/scdaemon.c:176 sm/gpgsm.c:383
 msgid "Options controlling the security"
 msgstr "Güvenliği denetleyen seçenekler"
 
-#: agent/gpg-agent.c:236
+#: agent/gpg-agent.c:238
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|arabellekteki PINler N saniyede zamanaşımına uğrar"
 
-#: agent/gpg-agent.c:238
+#: agent/gpg-agent.c:240
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|SSH anahtarları N saniyede zamanaşımına uğrar"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:242
 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:242
+#: agent/gpg-agent.c:244
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr "|N|azami SSH anahtarı ömrü N saniyeye ayarlanır"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:246
 msgid "do not use the PIN cache when signing"
 msgstr "imzalarken PIN arabelleği kullanılmaz"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:248
 #, 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:248
+#: agent/gpg-agent.c:250
 #, 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:251
+#: agent/gpg-agent.c:253
 msgid "allow presetting passphrase"
 msgstr "anahtar parolasının önceden atanmasına izin verilir"
 
-#: agent/gpg-agent.c:256
+#: agent/gpg-agent.c:258
 msgid "Options enforcing a passphrase policy"
 msgstr "Bir anahtar parolası kuralını zorlayan seçenekler"
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:261
 msgid "do not allow bypassing the passphrase policy"
 msgstr "anahtar parolası kuralının atlanmasına izin verilmez"
 
-#: agent/gpg-agent.c:261
+#: agent/gpg-agent.c:263
 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:263
+#: agent/gpg-agent.c:265
 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:266
+#: agent/gpg-agent.c:268
 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:268
+#: agent/gpg-agent.c:272
 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:270
+#: agent/gpg-agent.c:274
 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:273
+#: agent/gpg-agent.c:277
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the PIN-Entry"
 msgstr "Güvenliği denetleyen seçenekler"
 
-#: agent/gpg-agent.c:275
+#: agent/gpg-agent.c:279
 msgid "never use the PIN-entry"
 msgstr ""
 
-#: agent/gpg-agent.c:277
+#: agent/gpg-agent.c:281
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:283
 #, 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:282
+#: agent/gpg-agent.c:286
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|UYG|PIN girme uygulaması olarak UYG kullanılır"
 
-#: agent/gpg-agent.c:286
+#: agent/gpg-agent.c:290
 #, 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:288
+#: agent/gpg-agent.c:294
 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:551 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: agent/gpg-agent.c:557 agent/preset-passphrase.c:99 agent/protect-tool.c:154
 #: g10/gpg.c:1132 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:612 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:438
-#: dirmngr/dirmngr_ldap.c:175 tools/gpg-connect-agent.c:220 tools/gpgconf.c:151
+#: sm/gpgsm.c:613 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:446
+#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:151
 #: 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:560
+#: agent/gpg-agent.c:566
 #, 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:562
+#: agent/gpg-agent.c:568
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg-agent [options] [command [args]]\n"
@@ -674,143 +690,143 @@ msgstr ""
 "Sözdizimi: gpg-agent [seçenekler] [komut [arg ...]]\n"
 "GnuPG için gizli anahtar yönetimi\n"
 
-#: agent/gpg-agent.c:607 g10/gpg.c:1337 scd/scdaemon.c:384 sm/gpgsm.c:760
-#: dirmngr/dirmngr.c:522
+#: agent/gpg-agent.c:613 g10/gpg.c:1337 scd/scdaemon.c:384 sm/gpgsm.c:761
+#: dirmngr/dirmngr.c:530
 #, 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:972 g10/gpg.c:3910 g10/gpg.c:3934 sm/gpgsm.c:1769
-#: sm/gpgsm.c:1775
+#: agent/gpg-agent.c:986 g10/gpg.c:3907 g10/gpg.c:3931 sm/gpgsm.c:1622
+#: sm/gpgsm.c:1628
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "seçilen özet algoritması geçersiz\n"
 
-#: agent/gpg-agent.c:1196 agent/gpg-agent.c:2019 common/comopt.c:93
-#: g10/gpg.c:2591 scd/scdaemon.c:549 sm/gpgsm.c:1155 dirmngr/dirmngr.c:989
-#: dirmngr/dirmngr.c:1840
+#: agent/gpg-agent.c:1210 agent/gpg-agent.c:2035 common/comopt.c:93
+#: g10/gpg.c:2594 scd/scdaemon.c:549 sm/gpgsm.c:1028 dirmngr/dirmngr.c:1029
+#: dirmngr/dirmngr.c:1879
 #, 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:1335 g10/gpg.c:3861 scd/scdaemon.c:687 sm/gpgsm.c:1709
-#: dirmngr/dirmngr.c:1108 tools/gpg-connect-agent.c:1270 tools/gpgconf.c:634
+#: agent/gpg-agent.c:1349 g10/gpg.c:3858 scd/scdaemon.c:687 sm/gpgsm.c:1562
+#: dirmngr/dirmngr.c:1145 tools/gpg-connect-agent.c:1270 tools/gpgconf.c:668
 #, 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:2172 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1267
+#: agent/gpg-agent.c:2188 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1306
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "soket oluşturulamıyor: %s\n"
 
-#: agent/gpg-agent.c:2189 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1280
+#: agent/gpg-agent.c:2205 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1319
 #, 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:2228
+#: agent/gpg-agent.c:2244
 #, 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:2239 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1312
+#: agent/gpg-agent.c:2255 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1351
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "soket için tuz alınırken hata\n"
 
-#: agent/gpg-agent.c:2244 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1315
+#: agent/gpg-agent.c:2260 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1354
 #, 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:2255 agent/gpg-agent.c:2295 agent/gpg-agent.c:2304
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1324
+#: agent/gpg-agent.c:2271 agent/gpg-agent.c:2311 agent/gpg-agent.c:2320
+#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1363
 #, 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:2269 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1336
+#: agent/gpg-agent.c:2285 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1375
 #, fuzzy, c-format
 #| msgid "listening on socket `%s'\n"
 msgid "listening on socket '%s'\n"
 msgstr "`%s' soketi dinlemede\n"
 
-#: agent/gpg-agent.c:2289 agent/gpg-agent.c:2342 common/homedir.c:517
+#: agent/gpg-agent.c:2305 agent/gpg-agent.c:2358 common/homedir.c:537
 #: 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:2292 agent/gpg-agent.c:2347 common/homedir.c:520
+#: agent/gpg-agent.c:2308 agent/gpg-agent.c:2363 common/homedir.c:540
 #: 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:2353
+#: agent/gpg-agent.c:2369
 #, 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:2357
+#: agent/gpg-agent.c:2373
 #, 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:2512 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2069
+#: agent/gpg-agent.c:2528 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2108
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "fd %d üzerinde tuz okunurken hata: %s\n"
 
-#: agent/gpg-agent.c:2719
+#: agent/gpg-agent.c:2735
 #, 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:2724
+#: agent/gpg-agent.c:2740
 #, 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:2799
+#: agent/gpg-agent.c:2815
 #, 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:2804
+#: agent/gpg-agent.c:2820
 #, 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:3026 scd/scdaemon.c:1374 dirmngr/dirmngr.c:2283
+#: agent/gpg-agent.c:3042 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2322
 #, 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:3114 scd/scdaemon.c:1439
+#: agent/gpg-agent.c:3130 scd/scdaemon.c:1441
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s durdu\n"
 
-#: agent/gpg-agent.c:3252 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3271 common/simple-pwquery.c:247 g10/call-agent.c:260
 #: sm/call-agent.c:131 tools/gpg-connect-agent.c:2319 tools/card-call-scd.c:311
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "bu oturumda çalışan gpg-agent yok\n"
 
-#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:70
+#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:66
 msgid ""
 "@Options:\n"
 " "
@@ -832,7 +848,7 @@ msgstr ""
 "Parola arabelleği bakımcısı\n"
 
 #: agent/protect-tool.c:107 g10/gpg.c:448 kbx/kbxutil.c:72 sm/gpgsm.c:215
-#: dirmngr/dirmngr.c:168 tools/gpgconf.c:81
+#: dirmngr/dirmngr.c:169 tools/gpgconf.c:81
 msgid ""
 "@Commands:\n"
 " "
@@ -863,16 +879,16 @@ msgstr ""
 "Sözdizimi: gpg-protect-tool [seçenekler] [arg ...]\n"
 "Gizli anahtar bakım aracı\n"
 
-#: agent/protect-tool.c:707
+#: agent/protect-tool.c:708 sm/import.c:775
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr ""
 "PKCS#12 nesnesinin korumasını aşmak için lütfen anahtar parolasını giriniz."
 
-#: agent/protect-tool.c:712
+#: agent/protect-tool.c:713 sm/export.c:727
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "PKCS#12 nesnesini korumak için lütfen anahtar parolasını giriniz."
 
-#: agent/protect-tool.c:718
+#: agent/protect-tool.c:719
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
@@ -880,7 +896,7 @@ msgstr ""
 "Lütfen GnuPG sistemine ithal edilen nesneyi koruyacak anahtar parolasını "
 "giriniz."
 
-#: agent/protect-tool.c:723
+#: agent/protect-tool.c:724
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -888,17 +904,17 @@ msgstr ""
 "Lütfen bu işlemi tamamlamak için gereken\n"
 "PIN'i veya anahtar parolasını giriniz."
 
-#: agent/protect-tool.c:734
+#: agent/protect-tool.c:735
 #, c-format
 msgid "cancelled\n"
 msgstr "iptal edildi\n"
 
-#: agent/protect-tool.c:736
+#: agent/protect-tool.c:737
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "anahtar parolası sorulurken hata: %s\n"
 
-#: agent/trustlist.c:153 agent/trustlist.c:363 tools/gpgconf.c:424
+#: agent/trustlist.c:153 agent/trustlist.c:363 tools/gpgconf.c:458
 #, fuzzy, c-format
 #| msgid "error opening `%s': %s\n"
 msgid "error opening '%s': %s\n"
@@ -1068,7 +1084,7 @@ msgstr "oluşturulan imzanın denetimi başarısız: %s\n"
 msgid "secret key parts are not available\n"
 msgstr "gizli anahtar parçaları kullanım dışı\n"
 
-#: agent/cvt-openpgp.c:343 g10/card-util.c:1562
+#: agent/cvt-openpgp.c:343 g10/card-util.c:1575
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -1101,7 +1117,7 @@ msgid "error creating a stream for a pipe: %s\n"
 msgstr "boru oluÅŸturulurken hata: %s\n"
 
 #: common/exechelp-posix.c:505 common/exechelp-posix.c:580
-#: common/exechelp-posix.c:866 dirmngr/dirmngr.c:1354
+#: common/exechelp-posix.c:866 dirmngr/dirmngr.c:1393
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "süreç çatallanırken hata: %s\n"
@@ -1180,7 +1196,7 @@ msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "`%s' > `%s' isim değişikliği başarısız: %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3082
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3099
 msgid "yes"
 msgstr "evet"
 
@@ -1234,7 +1250,7 @@ msgstr "%lu bayt ayrılırken güvenli bellekte nüve dışına çıkıldı"
 msgid "out of core while allocating %lu bytes"
 msgstr "%lu bayt ayrılırken nüve dışına çıkıldı"
 
-#: common/miscellaneous.c:115 g10/card-util.c:917 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:927 tools/no-libgcrypt.c:30
 #: tools/gpg-card.c:416
 #, c-format
 msgid "error allocating enough memory: %s\n"
@@ -1315,7 +1331,7 @@ msgstr "`%s' anahtarlığı oluşturulurken hata: %s\n"
 msgid "server '%s' is older than us (%s < %s)"
 msgstr ""
 
-#: common/asshelp.c:737 g10/call-dirmngr.c:408
+#: common/asshelp.c:737 g10/call-dirmngr.c:407
 #, fuzzy, c-format
 #| msgid "WARNING: %s overrides %s\n"
 msgid "WARNING: %s\n"
@@ -1406,7 +1422,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:4212
+#: scd/app-openpgp.c:4214
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "desteklenmeyen algoritma: %s"
@@ -1483,11 +1499,11 @@ msgstr "Sertifika zinciri geçerli"
 msgid "Root certificate trustworthy"
 msgstr "Kök sertifika güvenilir"
 
-#: common/audit.c:1112 sm/certchain.c:1242
+#: common/audit.c:1112 sm/certchain.c:1243
 msgid "no CRL found for certificate"
 msgstr "sertifika için bir CRL yok"
 
-#: common/audit.c:1115 sm/certchain.c:1252
+#: common/audit.c:1115 sm/certchain.c:1253
 msgid "the available CRL is too old"
 msgstr "mevcut CRL çok eski"
 
@@ -1534,22 +1550,22 @@ msgstr "[yok]"
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "geçersiz radix64 karakteri %02x atlandı\n"
 
-#: common/ttyio.c:433
+#: common/ttyio.c:447
 #, c-format
 msgid "Sorry, we are in batchmode - can't get input\n"
 msgstr ""
 
-#: common/ttyio.c:439
+#: common/ttyio.c:453
 #, c-format
 msgid "Sorry, no terminal at all requested - can't get input\n"
 msgstr ""
 
-#: common/ttyio.c:474 common/ttyio.c:484
+#: common/ttyio.c:488 common/ttyio.c:498
 #, c-format
 msgid "too many errors; giving up\n"
 msgstr ""
 
-#: common/ttyio.c:536
+#: common/ttyio.c:550
 #, c-format
 msgid "Control-D detected\n"
 msgstr ""
@@ -1608,8 +1624,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:1036 dirmngr/dirmngr.c:895
-#: dirmngr/dirmngr.c:904
+#: common/init.c:191 sm/gpgsm.c:909 dirmngr/dirmngr.c:935 dirmngr/dirmngr.c:944
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s çok eski (gereken %s, sizinki %s)\n"
@@ -1770,7 +1785,7 @@ msgid "Enter passphrase: "
 msgstr "Anahtar parolasını giriniz\n"
 
 #: g10/call-agent.c:318 g10/encrypt.c:282 g10/encrypt.c:818 g10/sign.c:473
-#: sm/call-agent.c:180 sm/encrypt.c:701 sm/sign.c:436
+#: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
 #, fuzzy, c-format
 #| msgid "%s does not yet work with %s\n"
 msgid "%s is not compliant with %s mode\n"
@@ -1782,222 +1797,222 @@ msgstr "%s, %s ile henüz çalışmıyor\n"
 msgid "error from TPM: %s\n"
 msgstr "%s okunurken hata: %s\n"
 
-#: g10/call-agent.c:2123 g10/passphrase.c:225 g10/passphrase.c:258
-#: tools/card-call-scd.c:1751
+#: g10/call-agent.c:2135 g10/passphrase.c:233 g10/passphrase.c:266
+#: tools/card-call-scd.c:1755
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "aracı ile sorun var: %s\n"
 
-#: g10/call-dirmngr.c:179 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2316
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2316
 #, fuzzy, c-format
 #| msgid "no gpg-agent running in this session\n"
 msgid "no dirmngr running in this session\n"
 msgstr "bu oturumda çalışan gpg-agent yok\n"
 
-#: g10/call-dirmngr.c:213
+#: g10/call-dirmngr.c:212
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "keyserver option \"honor-keyserver-url\" may not be used in Tor mode\n"
 msgstr "%2$s kipindeyken %1$s kullanılamayabilir.\n"
 
-#: g10/call-dirmngr.c:386
+#: g10/call-dirmngr.c:385
 msgid "WKD uses a cached result"
 msgstr ""
 
-#: g10/call-dirmngr.c:389
+#: g10/call-dirmngr.c:388
 msgid "Tor is not running"
 msgstr ""
 
-#: g10/call-dirmngr.c:391
+#: g10/call-dirmngr.c:390
 #, fuzzy
 #| msgid "invalid fingerprint"
 msgid "Tor is not properly configured"
 msgstr "parmakizi geçersiz"
 
-#: g10/call-dirmngr.c:393
+#: g10/call-dirmngr.c:392
 #, fuzzy
 #| msgid "invalid fingerprint"
 msgid "DNS is not properly configured"
 msgstr "parmakizi geçersiz"
 
-#: g10/call-dirmngr.c:395
+#: g10/call-dirmngr.c:394
 msgid "unacceptable HTTP redirect from server"
 msgstr ""
 
-#: g10/call-dirmngr.c:397
+#: g10/call-dirmngr.c:396
 msgid "unacceptable HTTP redirect from server was cleaned up"
 msgstr ""
 
-#: g10/call-dirmngr.c:399
+#: g10/call-dirmngr.c:398
 #, fuzzy
 #| msgid "generate a revocation certificate"
 msgid "server uses an invalid certificate"
 msgstr "bir yürürlükten kaldırma sertifikası üretir"
 
-#: g10/call-dirmngr.c:406 g10/gpg.c:4599
+#: g10/call-dirmngr.c:405 g10/gpg.c:4596
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "zırh: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:369 g10/card-util.c:1924
-#: tools/gpg-card.c:3039
+#: g10/card-util.c:86 g10/card-util.c:374 g10/card-util.c:1937
+#: tools/gpg-card.c:3056
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP anahtarı kullanılabilir değil: %s\n"
 
-#: g10/card-util.c:91 g10/card-util.c:1930
+#: g10/card-util.c:91 g10/card-util.c:1943
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "%s numaralı OpenPGP kartı saptandı\n"
 
-#: g10/card-util.c:97 g10/card-util.c:2309 g10/delkey.c:164 g10/keyedit.c:1428
-#: g10/keygen.c:4791 g10/revoke.c:214 g10/revoke.c:638
+#: g10/card-util.c:97 g10/card-util.c:2322 g10/delkey.c:164 g10/keyedit.c:1428
+#: g10/keygen.c:4795 g10/revoke.c:214 g10/revoke.c:639
 #, c-format
 msgid "can't do this in batch mode\n"
 msgstr "bu önceden betik kipinde yapılamaz\n"
 
-#: g10/card-util.c:105 tools/gpg-card.c:2943
+#: g10/card-util.c:105 tools/gpg-card.c:2960
 #, c-format
 msgid "This command is only available for version 2 cards\n"
 msgstr "Bu komut sadece 2. sürüm kartlar için kullanılabilir\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3398 tools/gpg-card.c:2948
+#: g10/card-util.c:107 scd/app-openpgp.c:3399 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"
 
-#: g10/card-util.c:140 g10/card-util.c:1448 g10/card-util.c:1710
-#: g10/card-util.c:1802 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1991 g10/keygen.c:2165 g10/keygen.c:2385 g10/keygen.c:2685
+#: g10/card-util.c:140 g10/card-util.c:1458 g10/card-util.c:1723
+#: g10/card-util.c:1815 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/keygen.c:1992 g10/keygen.c:2166 g10/keygen.c:2386 g10/keygen.c:2686
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
 #: tools/gpg-card.c:510
 msgid "Your selection? "
 msgstr "Seçiminiz? "
 
-#: g10/card-util.c:262 g10/card-util.c:313 tools/gpg-card.c:596
+#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:596
 #: tools/gpg-card.c:636
 msgid "[not set]"
 msgstr "[belirtilmedi]"
 
-#: g10/card-util.c:558 tools/gpg-card.c:903
+#: g10/card-util.c:563 tools/gpg-card.c:905
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:559 tools/gpg-card.c:904
+#: g10/card-util.c:564 tools/gpg-card.c:906
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:586 tools/gpg-card.c:931
+#: g10/card-util.c:591 tools/gpg-card.c:933
 msgid "not forced"
 msgstr "zorlanmadı"
 
-#: g10/card-util.c:586 tools/gpg-card.c:931
+#: g10/card-util.c:591 tools/gpg-card.c:933
 msgid "forced"
 msgstr "zorlandı"
 
-#: g10/card-util.c:768 tools/gpg-card.c:1468
+#: g10/card-util.c:773 tools/gpg-card.c:1484
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Hata: Şimdilik sadece US-ASCII mümkün.\n"
 
-#: g10/card-util.c:770 tools/gpg-card.c:1470
+#: g10/card-util.c:775 tools/gpg-card.c:1486
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Hata: \"<\" karakteri kullanılmamalı.\n"
 
-#: g10/card-util.c:772 tools/gpg-card.c:1472
+#: g10/card-util.c:777 tools/gpg-card.c:1488
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Hata: Çift boşluğa izin verilmez.\n"
 
-#: g10/card-util.c:789 tools/gpg-card.c:1505
+#: g10/card-util.c:795 tools/gpg-card.c:1521
 msgid "Cardholder's surname: "
 msgstr "Kart sahibinin soyadı: "
 
-#: g10/card-util.c:791 tools/gpg-card.c:1506
+#: g10/card-util.c:797 tools/gpg-card.c:1522
 msgid "Cardholder's given name: "
 msgstr "Kart sahibinin adı: "
 
-#: g10/card-util.c:809 tools/gpg-card.c:1523
+#: g10/card-util.c:816 tools/gpg-card.c:1539
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Hata: İsimler birlikte çok uzun oluyor (sınır: %d karakter).\n"
 
-#: g10/card-util.c:830 tools/gpg-card.c:1561
+#: g10/card-util.c:840 tools/gpg-card.c:1577
 msgid "URL to retrieve public key: "
 msgstr "genel anahtarın alınacağı URL: "
 
-#: g10/card-util.c:926 g10/decrypt-data.c:495 g10/import.c:406 g10/import.c:756
-#: g10/import.c:815 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1666
-#: tools/gpgconf.c:437 tools/gpgconf.c:483 tools/gpg-card.c:426
+#: g10/card-util.c:936 g10/decrypt-data.c:495 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:1705
+#: tools/gpgconf.c:471 tools/gpgconf.c:517 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:959 g10/decrypt-data.c:498 g10/export.c:2496
+#: g10/card-util.c:969 g10/decrypt-data.c:498 g10/export.c:2496
 #: dirmngr/crlcache.c:925 tools/gpg-card.c:486 tools/gpg-card.c:493
 #, fuzzy, c-format
 msgid "error writing '%s': %s\n"
 msgstr "`%s' yazılırken hata: %s\n"
 
-#: g10/card-util.c:986 tools/gpg-card.c:1650
+#: g10/card-util.c:996 tools/gpg-card.c:1666
 msgid "Login data (account name): "
 msgstr "Oturum açma verisi (hesap adı): "
 
-#: g10/card-util.c:1024 tools/gpg-card.c:1945
+#: g10/card-util.c:1034 tools/gpg-card.c:1962
 msgid "Private DO data: "
 msgstr "Özel DO verisi: "
 
-#: g10/card-util.c:1109 tools/gpg-card.c:1699
+#: g10/card-util.c:1119 tools/gpg-card.c:1715
 msgid "Language preferences: "
 msgstr "Dil tercihleri: "
 
-#: g10/card-util.c:1117 tools/gpg-card.c:1710
+#: g10/card-util.c:1127 tools/gpg-card.c:1726
 #, c-format
 msgid "Error: invalid length of preference string.\n"
 msgstr "Hata: tercih dizgesinin uzunluğu geçersiz.\n"
 
-#: g10/card-util.c:1126 tools/gpg-card.c:1719
+#: g10/card-util.c:1136 tools/gpg-card.c:1735
 #, c-format
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Hata: tercih dizgesindeki karakterler geçersiz.\n"
 
-#: g10/card-util.c:1148 tools/gpg-card.c:1753
+#: g10/card-util.c:1158 tools/gpg-card.c:1769
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1162 tools/gpg-card.c:1770
+#: g10/card-util.c:1172 tools/gpg-card.c:1786
 msgid "Error: invalid response.\n"
 msgstr "Hata: yanıt geçersiz.\n"
 
-#: g10/card-util.c:1185 tools/gpg-card.c:1835
+#: g10/card-util.c:1195 tools/gpg-card.c:1852
 msgid "CA fingerprint: "
 msgstr "CA parmak izi: "
 
-#: g10/card-util.c:1209 tools/gpg-card.c:1861
+#: g10/card-util.c:1219 tools/gpg-card.c:1878
 #, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Hata: biçimli parmakizi geçersiz\n"
 
-#: g10/card-util.c:1259
+#: g10/card-util.c:1269
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "anahtar işlemi mümkün değil: %s\n"
 
-#: g10/card-util.c:1260
+#: g10/card-util.c:1270
 msgid "not an OpenPGP card"
 msgstr "bir OpenPGP kartı değil"
 
-#: g10/card-util.c:1273 g10/keygen.c:4811 g10/keygen.c:5972
+#: g10/card-util.c:1283 g10/keygen.c:4815 g10/keygen.c:6003
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "geçerli anahtar bilgisi alınırken hata: %s\n"
 
-#: g10/card-util.c:1358
+#: g10/card-util.c:1368
 msgid "Replace existing key? (y/N) "
 msgstr "Mevcut anahtar deÄŸiÅŸtirilsin mi? (e/H ya da y/N) "
 
-#: g10/card-util.c:1375 tools/gpg-card.c:3328
+#: g10/card-util.c:1385 tools/gpg-card.c:3345
 msgid ""
 "Note: There is no guarantee that the card supports the requested\n"
 "      key type or size.  If the key generation does not succeed,\n"
@@ -2005,107 +2020,107 @@ msgid ""
 "      key types and sizes are supported.\n"
 msgstr ""
 
-#: g10/card-util.c:1396 g10/keygen.c:2570 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1406 g10/keygen.c:2571 sm/certreqgen-ui.c:180
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Ä°stediÄŸiniz anahtar uzunluÄŸu nedir? (%u) "
 
-#: g10/card-util.c:1406 g10/keygen.c:2493 g10/keygen.c:2525
+#: g10/card-util.c:1416 g10/keygen.c:2494 g10/keygen.c:2526
 #: sm/certreqgen-ui.c:195
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "%u bite yuvarlandı\n"
 
-#: g10/card-util.c:1414 g10/keygen.c:2578 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1424 g10/keygen.c:2579 sm/certreqgen-ui.c:185
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s anahtar uzunlukları %u-%u aralığında olmalı\n"
 
-#: g10/card-util.c:1433
+#: g10/card-util.c:1443
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1435
+#: g10/card-util.c:1445
 #, fuzzy
 #| msgid "   (1) Signature key\n"
 msgid "Signature key\n"
 msgstr "   (1) İmzalama anahtarı\n"
 
-#: g10/card-util.c:1437
+#: g10/card-util.c:1447
 #, fuzzy
 #| msgid "   (2) Encryption key\n"
 msgid "Encryption key\n"
 msgstr "   (2) Şifreleme anahtarı\n"
 
-#: g10/card-util.c:1439
+#: g10/card-util.c:1449
 #, fuzzy
 #| msgid "   (3) Authentication key\n"
 msgid "Authentication key\n"
 msgstr "   (3) Kimlik kanıtlama anahtarı\n"
 
-#: g10/card-util.c:1441 g10/keygen.c:2112 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1451 g10/keygen.c:2113 sm/certreqgen-ui.c:158
 msgid "Please select what kind of key you want:\n"
 msgstr "Lütfen istediğiniz anahtarı seçiniz:\n"
 
-#: g10/card-util.c:1442 sm/certreqgen-ui.c:159
+#: g10/card-util.c:1452 sm/certreqgen-ui.c:159
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1443
+#: g10/card-util.c:1453
 #, fuzzy, c-format
 msgid "   (%d) ECC\n"
 msgstr "  (%d) DSA ve ElGamal (öntanımlı)\n"
 
-#: g10/card-util.c:1455 g10/card-util.c:1722 g10/card-util.c:1822
-#: g10/keyedit.c:900 g10/keygen.c:2017 g10/keygen.c:2045 g10/keygen.c:2172
-#: g10/keygen.c:2425 g10/keygen.c:2713 g10/revoke.c:836
+#: g10/card-util.c:1468 g10/card-util.c:1735 g10/card-util.c:1835
+#: g10/keyedit.c:900 g10/keygen.c:2018 g10/keygen.c:2046 g10/keygen.c:2173
+#: g10/keygen.c:2426 g10/keygen.c:2714 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Seçim geçersiz.\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1541
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 
-#: g10/card-util.c:1533
+#: g10/card-util.c:1546
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1582
 #, fuzzy, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "soket `%s'e bağlanırken hata: %s\n"
 
-#: g10/card-util.c:1585 g10/card-util.c:2106 g10/card-util.c:2162
+#: g10/card-util.c:1598 g10/card-util.c:2119 g10/card-util.c:2175
 #, fuzzy, c-format
 #| msgid "error getting current key info: %s\n"
 msgid "error getting card info: %s\n"
 msgstr "geçerli anahtar bilgisi alınırken hata: %s\n"
 
-#: g10/card-util.c:1591 g10/card-util.c:1936 g10/card-util.c:2112
-#: g10/card-util.c:2171 tools/gpg-card.c:3057 tools/gpg-card.c:3296
-#: tools/gpg-card.c:3354
+#: g10/card-util.c:1604 g10/card-util.c:1949 g10/card-util.c:2125
+#: g10/card-util.c:2184 tools/gpg-card.c:3074 tools/gpg-card.c:3313
+#: tools/gpg-card.c:3371
 #, fuzzy, c-format
 #| msgid "This command is not allowed while in %s mode.\n"
 msgid "This command is not supported by this card\n"
 msgstr "%s kipindeyken bu komut kullanılamaz.\n"
 
-#: g10/card-util.c:1637 tools/gpg-card.c:2426
+#: g10/card-util.c:1650 tools/gpg-card.c:2443
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Şifreli anahtarın kartsız yedeği yapılsın mı? (E/h ya da Y/n) "
 
-#: g10/card-util.c:1651
+#: g10/card-util.c:1664
 #, fuzzy, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "gizli anahtar zaten bir kartın üzerinde saklı\n"
 
-#: g10/card-util.c:1654 tools/gpg-card.c:2398
+#: g10/card-util.c:1667 tools/gpg-card.c:2415
 msgid "Replace existing keys? (y/N) "
 msgstr "Mevcut anahtarlar deÄŸiÅŸtirilsin mi? (e/H ya da y/N) "
 
-#: g10/card-util.c:1666 tools/gpg-card.c:2457
+#: g10/card-util.c:1679 tools/gpg-card.c:2474
 #, fuzzy, c-format
 #| msgid ""
 #| "Please note that the factory settings of the PINs are\n"
@@ -2120,163 +2135,163 @@ msgstr ""
 "   PIN = `%s'     Admin PIN = `%s'\n"
 "Bunları --change-pin komutunu kullanarak değiştirmelisiniz\n"
 
-#: g10/card-util.c:1701
+#: g10/card-util.c:1714
 msgid "Please select the type of key to generate:\n"
 msgstr "Lütfen üretilecek anahtar türünü seçiniz:\n"
 
-#: g10/card-util.c:1703 g10/card-util.c:1793
+#: g10/card-util.c:1716 g10/card-util.c:1806
 msgid "   (1) Signature key\n"
 msgstr "   (1) İmzalama anahtarı\n"
 
-#: g10/card-util.c:1704 g10/card-util.c:1795
+#: g10/card-util.c:1717 g10/card-util.c:1808
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Şifreleme anahtarı\n"
 
-#: g10/card-util.c:1705 g10/card-util.c:1797
+#: g10/card-util.c:1718 g10/card-util.c:1810
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Kimlik kanıtlama anahtarı\n"
 
-#: g10/card-util.c:1790
+#: g10/card-util.c:1803
 msgid "Please select where to store the key:\n"
 msgstr "Lütfen anahtarın saklanacağı yeri seçiniz:\n"
 
-#: g10/card-util.c:1836
+#: g10/card-util.c:1849
 #, fuzzy, c-format
 #| msgid "read failed: %s\n"
 msgid "KEYTOCARD failed: %s\n"
 msgstr "read başarısız: %s\n"
 
-#: g10/card-util.c:1941 tools/gpg-card.c:3065
+#: g10/card-util.c:1954 tools/gpg-card.c:3082
 #, fuzzy, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr "gizli anahtar zaten bir kartın üzerinde saklı\n"
 
-#: g10/card-util.c:1944 tools/gpg-card.c:3068 tools/gpg-card.c:3409
+#: g10/card-util.c:1957 tools/gpg-card.c:3085 tools/gpg-card.c:3426
 #, fuzzy
 #| msgid "Sign it? (y/N) "
 msgid "Continue? (y/N) "
 msgstr "İmzalayacak mısınız? (e/H veya y/N) "
 
-#: g10/card-util.c:1949 tools/gpg-card.c:3079
+#: g10/card-util.c:1962 tools/gpg-card.c:3096
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2142
+#: g10/card-util.c:2155
 #, fuzzy, c-format
 #| msgid "error closing %s: %s\n"
 msgid "error for setup KDF: %s\n"
 msgstr "%s kapanırken hata: %s\n"
 
-#: g10/card-util.c:2188
+#: g10/card-util.c:2201
 #, fuzzy, c-format
 #| msgid "error closing %s: %s\n"
 msgid "error for setup UIF: %s\n"
 msgstr "%s kapanırken hata: %s\n"
 
-#: g10/card-util.c:2212 g10/keyedit.c:1263 tools/gpg-card.c:3649
+#: g10/card-util.c:2225 g10/keyedit.c:1263 tools/gpg-card.c:3666
 msgid "quit this menu"
 msgstr "bu menüden çık"
 
-#: g10/card-util.c:2214
+#: g10/card-util.c:2227
 msgid "show admin commands"
 msgstr "yönetici komutlarını gösterir"
 
-#: g10/card-util.c:2215 g10/keyedit.c:1266 tools/gpg-card.c:3652
+#: g10/card-util.c:2228 g10/keyedit.c:1266 tools/gpg-card.c:3669
 msgid "show this help"
 msgstr "bunu gösterir"
 
-#: g10/card-util.c:2217 tools/gpg-card.c:3654
+#: g10/card-util.c:2230 tools/gpg-card.c:3671
 msgid "list all available data"
 msgstr "tüm kullanılabilir veriyi listeler"
 
-#: g10/card-util.c:2220 tools/gpg-card.c:3656
+#: g10/card-util.c:2233 tools/gpg-card.c:3673
 msgid "change card holder's name"
 msgstr "kart sahibinin ismini deÄŸiÅŸtirir"
 
-#: g10/card-util.c:2221 tools/gpg-card.c:3657
+#: g10/card-util.c:2234 tools/gpg-card.c:3674
 msgid "change URL to retrieve key"
 msgstr "anahtarın alınacağı URL değiştirilir"
 
-#: g10/card-util.c:2222 tools/gpg-card.c:3658
+#: g10/card-util.c:2235 tools/gpg-card.c:3675
 msgid "fetch the key specified in the card URL"
 msgstr "kart URL'sinde belirtilmiş anahtarı alır"
 
-#: g10/card-util.c:2223 tools/gpg-card.c:3659
+#: g10/card-util.c:2236 tools/gpg-card.c:3676
 msgid "change the login name"
 msgstr "oturum açma ismini değiştirir"
 
-#: g10/card-util.c:2224 tools/gpg-card.c:3660
+#: g10/card-util.c:2237 tools/gpg-card.c:3677
 msgid "change the language preferences"
 msgstr "dil tercihlerini deÄŸiÅŸtirir"
 
-#: g10/card-util.c:2225 tools/gpg-card.c:3661
+#: g10/card-util.c:2238 tools/gpg-card.c:3678
 #, fuzzy
 #| msgid "change card holder's sex"
 msgid "change card holder's salutation"
 msgstr "kart sahibinin cinsiyetini deÄŸiÅŸtirir"
 
-#: g10/card-util.c:2227 tools/gpg-card.c:3663
+#: g10/card-util.c:2240 tools/gpg-card.c:3680
 msgid "change a CA fingerprint"
 msgstr "bir CA parmakizini deÄŸiÅŸtirir"
 
-#: g10/card-util.c:2228 tools/gpg-card.c:3664
+#: g10/card-util.c:2241 tools/gpg-card.c:3681
 msgid "toggle the signature force PIN flag"
 msgstr "imza zorlama PIN'i bayrağını değiştirir"
 
-#: g10/card-util.c:2229 tools/gpg-card.c:3665
+#: g10/card-util.c:2242 tools/gpg-card.c:3682
 msgid "generate new keys"
 msgstr "yeni anahtarlar üretir"
 
-#: g10/card-util.c:2230 tools/gpg-card.c:3666
+#: g10/card-util.c:2243 tools/gpg-card.c:3683
 msgid "menu to change or unblock the PIN"
 msgstr "PIN'i değiştirme veya engelleme menüsü"
 
-#: g10/card-util.c:2231 tools/gpg-card.c:3667
+#: g10/card-util.c:2244 tools/gpg-card.c:3684
 msgid "verify the PIN and list all data"
 msgstr "PIN'i doğrular ve tüm veriyi listeler"
 
-#: g10/card-util.c:2232 tools/gpg-card.c:3668
+#: g10/card-util.c:2245 tools/gpg-card.c:3685
 msgid "unblock the PIN using a Reset Code"
 msgstr "Bir Sıfırlama Kodu kullanarak PIN'in engelini kaldır"
 
-#: g10/card-util.c:2233 tools/gpg-card.c:3672
+#: g10/card-util.c:2246 tools/gpg-card.c:3689
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2235
+#: g10/card-util.c:2248
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr ""
 
-#: g10/card-util.c:2236
+#: g10/card-util.c:2249
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "sahibiningüvencesini değiştirir"
 
-#: g10/card-util.c:2237 tools/gpg-card.c:3674
+#: g10/card-util.c:2250 tools/gpg-card.c:3691
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the User Interaction Flag"
 msgstr "sahibiningüvencesini değiştirir"
 
-#: g10/card-util.c:2361 tools/gpg-card.c:3924
+#: g10/card-util.c:2374 tools/gpg-card.c:3941
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2402
+#: g10/card-util.c:2415
 msgid "Admin-only command\n"
 msgstr "Yöneticiye özel komut\n"
 
-#: g10/card-util.c:2433
+#: g10/card-util.c:2446
 msgid "Admin commands are allowed\n"
 msgstr "Yönetici komutlarına izin verilir\n"
 
-#: g10/card-util.c:2435
+#: g10/card-util.c:2448
 msgid "Admin commands are not allowed\n"
 msgstr "Yönetici komutlarına izin verilmez\n"
 
-#: g10/card-util.c:2546 g10/keyedit.c:2275 tools/gpg-card.c:3814
-#: tools/gpg-card.c:4072
+#: g10/card-util.c:2559 g10/keyedit.c:2275 tools/gpg-card.c:3831
+#: tools/gpg-card.c:4089
 #, c-format
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Komut geçersiz (\"help\" komutunu deneyin)\n"
@@ -2286,23 +2301,23 @@ msgstr "Komut geçersiz (\"help\" komutunu deneyin)\n"
 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:5293 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5292 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:1934 g10/export.c:2342 g10/export.c:2463
-#: g10/getkey.c:1907 g10/gpg.c:5238 g10/keyedit.c:1450 g10/keyedit.c:2382
-#: g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:703 g10/keyserver.c:1240
-#: g10/revoke.c:230 g10/tofu.c:2168
+#: g10/getkey.c:2032 g10/gpg.c:5237 g10/keyedit.c:1450 g10/keyedit.c:2382
+#: g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:703 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:2002 g10/getkey.c:1915 g10/getkey.c:4330
-#: g10/gpg.c:5247 g10/keyedit.c:2354 g10/keyserver.c:1258 g10/revoke.c:236
-#: g10/revoke.c:665 g10/tofu.c:2176
+#: g10/delkey.c:90 g10/export.c:2002 g10/getkey.c:2040 g10/getkey.c:4455
+#: g10/gpg.c:5246 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"
 msgstr "anahtar bloÄŸu okunurken hata: %s\n"
@@ -2429,15 +2444,15 @@ msgstr "%2$s kipindeyken '%1$s' şifreleme algoritması kullanılamaz\n"
 msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:555 g10/encrypt.c:808 g10/decrypt-data.c:261 g10/gpg.c:4083
-#: g10/gpg.c:4130 sm/decrypt.c:742 sm/encrypt.c:691 sm/gpgsm.c:1793
+#: g10/encrypt.c:555 g10/encrypt.c:808 g10/decrypt-data.c:261 g10/gpg.c:4080
+#: g10/gpg.c:4127 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1646
 #, 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:564 g10/gpg.c:4095 g10/gpg.c:4142 g10/sig-check.c:155
-#: g10/sign.c:452 sm/gpgsm.c:1803 sm/gpgsm.c:1813 sm/sign.c:596 sm/verify.c:510
+#: g10/encrypt.c:564 g10/gpg.c:4092 g10/gpg.c:4139 g10/sig-check.c:155
+#: g10/sign.c:452 sm/gpgsm.c:1656 sm/gpgsm.c:1666 sm/sign.c:596 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"
@@ -2457,7 +2472,7 @@ msgstr ""
 "UYARI: alıcının tercihleriyle çelişen %s (%d) simetrik şifre kullanımı "
 "zorlanıyor\n"
 
-#: g10/encrypt.c:838 sm/encrypt.c:766
+#: g10/encrypt.c:838 sm/encrypt.c:767
 #, fuzzy, c-format
 #| msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
@@ -2490,7 +2505,7 @@ msgstr "%s/%s \"%s\" için şifrelendi\n"
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "%2$s kipindeyken %1$s kullanılamayabilir.\n"
 
-#: g10/decrypt-data.c:239 g10/mainproc.c:380 sm/decrypt.c:494
+#: g10/decrypt-data.c:239 g10/mainproc.c:380 sm/decrypt.c:892
 #, fuzzy, c-format
 #| msgid "%s encrypted data\n"
 msgid "%s.%s encrypted data\n"
@@ -2501,7 +2516,7 @@ msgstr "%s ÅŸifreli veri\n"
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "bilinmeyen algoritma %d ile ÅŸifrelenmiÅŸ\n"
 
-#: g10/decrypt-data.c:361 g10/decrypt-data.c:414 sm/decrypt.c:508
+#: g10/decrypt-data.c:361 g10/decrypt-data.c:414 sm/decrypt.c:906
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2543,7 +2558,7 @@ msgstr ""
 msgid " - skipped"
 msgstr "%s: atlandı: %s\n"
 
-#: g10/export.c:1333 g10/import.c:2124 g10/openfile.c:202 g10/openfile.c:296
+#: g10/export.c:1333 g10/import.c:2132 g10/openfile.c:202 g10/openfile.c:296
 #: g10/sign.c:1110 g10/sign.c:1447
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
@@ -2581,67 +2596,67 @@ msgstr "`%s' oluÅŸturulurken hata: %s\n"
 msgid "[User ID not found]"
 msgstr "[Kullanıcı kimliği yok]"
 
-#: g10/getkey.c:1199
+#: g10/getkey.c:1324
 #, fuzzy, c-format
 #| msgid "automatically retrieved `%s' via %s\n"
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "`%s' %s üzerinden özdevinimli olarak alındı\n"
 
-#: g10/getkey.c:1205
+#: g10/getkey.c:1330
 #, fuzzy, c-format
 #| msgid "error retrieving `%s' via %s: %s\n"
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "`%s' %s üzerinden alınırken hata: %s\n"
 
-#: g10/getkey.c:1207
+#: g10/getkey.c:1332
 msgid "No fingerprint"
 msgstr "Parmak izi yok"
 
-#: g10/getkey.c:1449
+#: g10/getkey.c:1574
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1884 g10/revoke.c:657 g10/revoke.c:718
+#: g10/getkey.c:2009 g10/revoke.c:658 g10/revoke.c:719
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "gizli anahtar \"%s\" yok: %s\n"
 
-#: g10/getkey.c:1887 g10/pkclist.c:1012
+#: g10/getkey.c:2012 g10/pkclist.c:1012
 #, fuzzy, c-format
 #| msgid "missing argument for option \"%.50s\"\n"
 msgid "(check argument of option '%s')\n"
 msgstr "\"%.50s\" seçeneği için değiştirge eksik\n"
 
-#: g10/getkey.c:1965
+#: g10/getkey.c:2090
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "|İSİM|öntanımlı gizli anahtar olarak İSİM kullanılır"
 
-#: g10/getkey.c:1973
+#: g10/getkey.c:2098
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "|İSİM|öntanımlı gizli anahtar olarak İSİM kullanılır"
 
-#: g10/getkey.c:1980
+#: g10/getkey.c:2105
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr ""
 
-#: g10/getkey.c:2837
+#: g10/getkey.c:2962
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Geçersiz %s anahtarı --allow-non-selfsigned-uid kullanılarak geçerli oldu\n"
 
-#: g10/getkey.c:3703
+#: g10/getkey.c:3828
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "yardımcı anahtar %s, asıl anahtar %s yerine kullanılıyor\n"
 
-#: g10/getkey.c:4259 g10/gpg.c:2167
+#: g10/getkey.c:4384 g10/gpg.c:2168
 #, fuzzy, c-format
 #| msgid "missing argument for option \"%.50s\"\n"
 msgid "valid values for option '%s':\n"
@@ -2841,7 +2856,7 @@ msgstr "|BELİRTİM|eposta rumuzlarını ayarlar"
 msgid "use strict OpenPGP behavior"
 msgstr "kesin OpenPGP davranışı etkin olur"
 
-#: g10/gpg.c:651 kbx/kbxutil.c:91 sm/gpgsm.c:424 tools/gpgconf.c:113
+#: g10/gpg.c:651 kbx/kbxutil.c:91 sm/gpgsm.c:425 tools/gpgconf.c:113
 msgid "do not make any changes"
 msgstr "hiçbir değişiklik yapmaz"
 
@@ -2877,7 +2892,7 @@ msgstr "kurallı metin kipini kullanır"
 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:762 sm/gpgsm.c:357
+#: g10/gpg.c:762 sm/gpgsm.c:358
 #, fuzzy
 #| msgid "Options controlling the interactivity and enforcement"
 msgid "Options controlling key import and export"
@@ -2901,11 +2916,11 @@ msgstr "anahtarları bir anahtar sunucusundan indirir"
 msgid "include the public key in signatures"
 msgstr "anahtar imzalarını listeler ve sınar"
 
-#: g10/gpg.c:776 sm/gpgsm.c:360
+#: g10/gpg.c:776 sm/gpgsm.c:361
 msgid "disable all access to the dirmngr"
 msgstr "dirmngr'a tüm erişim iptal edilir"
 
-#: g10/gpg.c:788 sm/gpgsm.c:367
+#: g10/gpg.c:788 sm/gpgsm.c:368
 #, fuzzy
 #| msgid "Options controlling the configuration"
 msgid "Options controlling key listings"
@@ -2927,15 +2942,15 @@ msgstr ""
 "|KULLANICI-KİMLİĞİ|imzalamak ya da şifre çözmek için KULLANICI-KİMLİĞİ "
 "kullanılır"
 
-#: g10/gpg.c:876 sm/gpgsm.c:408
+#: g10/gpg.c:876 sm/gpgsm.c:409
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:895 sm/gpgsm.c:420 dirmngr/dirmngr.c:286
+#: g10/gpg.c:895 sm/gpgsm.c:421 dirmngr/dirmngr.c:289
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:966 sm/gpgsm.c:453
+#: g10/gpg.c:966 sm/gpgsm.c:454
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2994,7 +3009,7 @@ msgstr ""
 "imzalama, kontrol, şifreleme veya çözme\n"
 "öntanımlı işlem girilen veriye bağımlıdır\n"
 
-#: g10/gpg.c:1168 sm/gpgsm.c:636
+#: g10/gpg.c:1168 sm/gpgsm.c:637
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -3018,13 +3033,13 @@ msgstr "Hash: "
 msgid "Compression: "
 msgstr "Sıkıştırma: "
 
-#: g10/gpg.c:1274 sm/gpgsm.c:710
+#: g10/gpg.c:1274 sm/gpgsm.c:711
 #, fuzzy, c-format
 #| msgid "usage: gpgsm [options] "
 msgid "usage: %s [options] %s\n"
 msgstr "kullanımı: gpgsm [seçenekler] "
 
-#: g10/gpg.c:1467 sm/gpgsm.c:803
+#: g10/gpg.c:1467 sm/gpgsm.c:804
 #, c-format
 msgid "conflicting commands\n"
 msgstr "çelişen komutlar\n"
@@ -3035,49 +3050,49 @@ msgstr "çelişen komutlar\n"
 msgid "no = sign found in group definition '%s'\n"
 msgstr "grup tanımı '%s' içinde = işareti yok\n"
 
-#: g10/gpg.c:1683
+#: g10/gpg.c:1684
 #, 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:1686
+#: g10/gpg.c:1687
 #, 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:1689
+#: g10/gpg.c:1690
 #, 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:1695
+#: g10/gpg.c:1696
 #, 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:1698
+#: g10/gpg.c:1699
 #, 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:1701
+#: g10/gpg.c:1702
 #, 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:1707
+#: g10/gpg.c:1708
 #, 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:1710
+#: g10/gpg.c:1711
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -3085,19 +3100,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:1713
+#: g10/gpg.c:1714
 #, 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:1719
+#: g10/gpg.c:1720
 #, 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:1722
+#: g10/gpg.c:1723
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@ -3106,496 +3121,496 @@ 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:1725
+#: g10/gpg.c:1726
 #, 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:1941
+#: g10/gpg.c:1942
 #, 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:2037
+#: g10/gpg.c:2038
 msgid "display photo IDs during key listings"
 msgstr "anahtarların listelenmesi sırasında foto kimliklerini gösterir"
 
-#: g10/gpg.c:2039
+#: g10/gpg.c:2040
 #, 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:2041
+#: g10/gpg.c:2042
 msgid "show policy URLs during signature listings"
 msgstr "imza listelemesi sırasında poliçe URLleri gösterilir"
 
-#: g10/gpg.c:2043
+#: g10/gpg.c:2044
 msgid "show all notations during signature listings"
 msgstr "imza listelemesi sırasında tüm simgelemi gösterir"
 
-#: g10/gpg.c:2045
+#: g10/gpg.c:2046
 msgid "show IETF standard notations during signature listings"
 msgstr "imza listelemesi sırasında IETF standart simgelemlerini gösterir"
 
-#: g10/gpg.c:2049
+#: g10/gpg.c:2050
 msgid "show user-supplied notations during signature listings"
 msgstr "imza listelemesi sırasında kullanıcı kanaklı simgelemleri gösterir"
 
-#: g10/gpg.c:2051
+#: g10/gpg.c:2052
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 "imza listelemesi sırasında tercih edilen anahtar sunucusu adresi gösterilir"
 
-#: g10/gpg.c:2053
+#: g10/gpg.c:2054
 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:2055
+#: g10/gpg.c:2056
 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:2057
+#: g10/gpg.c:2058
 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:2059
+#: g10/gpg.c:2060
 msgid "show the keyring name in key listings"
 msgstr "anahtar zinciri ismini anahtar listelerinde gösterir"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2062
 msgid "show expiration dates during signature listings"
 msgstr "imza listelemesi sırasında zamanaşımı tarihleri gösterilir"
 
-#: g10/gpg.c:2178
+#: g10/gpg.c:2179
 #, fuzzy, c-format
 #| msgid "unknown option `%s'\n"
 msgid "unknown TOFU policy '%s'\n"
 msgstr "`%s' seçeneği bilinmiyor\n"
 
-#: g10/gpg.c:2180
+#: g10/gpg.c:2181
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2975 g10/gpg.c:3828 g10/gpg.c:3840
+#: g10/gpg.c:2978 g10/gpg.c:3825 g10/gpg.c:3837
 #, 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:3151 g10/gpg.c:3163
+#: g10/gpg.c:3154 g10/gpg.c:3166
 #, 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:3185
+#: g10/gpg.c:3188
 #, 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:3217 sm/gpgsm.c:1270
+#: g10/gpg.c:3220 sm/gpgsm.c:1143
 #, 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:3223 sm/gpgsm.c:1276
+#: g10/gpg.c:3226 sm/gpgsm.c:1149
 #, 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:3280
+#: g10/gpg.c:3283
 #, 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:3302 g10/gpg.c:3511 g10/keyedit.c:5319
+#: g10/gpg.c:3305 g10/gpg.c:3514 g10/keyedit.c:5322
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
 
-#: g10/gpg.c:3320
+#: g10/gpg.c:3323
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: anahtar sunucusu seçenekleri geçersiz\n"
 
-#: g10/gpg.c:3323
+#: g10/gpg.c:3326
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "anahtar sunucusu seçenekleri geçersiz\n"
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3333
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: geçersiz içselleştirme seçenekleri\n"
 
-#: g10/gpg.c:3333
+#: g10/gpg.c:3336
 #, c-format
 msgid "invalid import options\n"
 msgstr "içselleştirme seçenekleri geçersiz\n"
 
-#: g10/gpg.c:3339 g10/gpg.c:3354
+#: g10/gpg.c:3342 g10/gpg.c:3357
 #, fuzzy, c-format
 #| msgid "invalid list options\n"
 msgid "invalid filter option: %s\n"
 msgstr "liste seçenekleri geçersiz\n"
 
-#: g10/gpg.c:3345
+#: g10/gpg.c:3348
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d geçersiz dışsallaştırma seçenekleri\n"
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3351
 #, c-format
 msgid "invalid export options\n"
 msgstr "dışsallaştırma seçenekleri geçersiz\n"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3363
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: liste seçenekleri geçersiz\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3366
 #, c-format
 msgid "invalid list options\n"
 msgstr "liste seçenekleri geçersiz\n"
 
-#: g10/gpg.c:3371
+#: g10/gpg.c:3374
 msgid "display photo IDs during signature verification"
 msgstr "imza doğrulaması sırasında foto kimliklerini gösterir"
 
-#: g10/gpg.c:3373
+#: g10/gpg.c:3376
 msgid "show policy URLs during signature verification"
 msgstr "imza doğrulaması sırasında poliçe adreslerini gösterir"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3378
 msgid "show all notations during signature verification"
 msgstr "imza doğrulaması sırasında tüm simgelemi gösterir"
 
-#: g10/gpg.c:3377
+#: g10/gpg.c:3380
 msgid "show IETF standard notations during signature verification"
 msgstr "imza doğrulaması sırasında IETF standart simgelemlerini gösterir"
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3384
 msgid "show user-supplied notations during signature verification"
 msgstr "imza doğrulaması sırasında kullanıcı kaynaklı simgelemleri gösterir"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3386
 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:3385
+#: g10/gpg.c:3388
 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:3387
+#: g10/gpg.c:3390
 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:3389
+#: g10/gpg.c:3392
 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:3396
+#: g10/gpg.c:3399
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d doğrulama seçenekleri geçersiz\n"
 
-#: g10/gpg.c:3399
+#: g10/gpg.c:3402
 #, c-format
 msgid "invalid verify options\n"
 msgstr "doğrulama seçenekleri geçersiz\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3409
 #, 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:3613
+#: g10/gpg.c:3616
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: özdevinimli anahtar konumlama listesi geçersiz\n"
 
-#: g10/gpg.c:3616
+#: g10/gpg.c:3619
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "özdevinimli anahtar konumlama listesi geçersiz\n"
 
-#: g10/gpg.c:3625
+#: g10/gpg.c:3628
 #, 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:3807 sm/gpgsm.c:1675
+#: g10/gpg.c:3804 sm/gpgsm.c:1528
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "UYARI: program bir \"core\" dosyası oluşturabilir!\n"
 
-#: g10/gpg.c:3821
+#: g10/gpg.c:3818
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "UYARI: %s %s'i aşıyor\n"
 
-#: g10/gpg.c:3830
+#: g10/gpg.c:3827
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ile %s birlikte kullanılmaz!\n"
 
-#: g10/gpg.c:3833
+#: g10/gpg.c:3830
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s, %s ile etkisiz olur!\n"
 
-#: g10/gpg.c:3848 sm/gpgsm.c:1696 dirmngr/dirmngr.c:1123
+#: g10/gpg.c:3845 sm/gpgsm.c:1549 dirmngr/dirmngr.c:1160
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "UYARI: sahte sistem zamanıyla çalışıyor: "
 
-#: g10/gpg.c:3869
+#: g10/gpg.c:3866
 #, 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:3897 g10/gpg.c:3928 sm/gpgsm.c:1763
+#: g10/gpg.c:3894 g10/gpg.c:3925 sm/gpgsm.c:1616
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3901
 #, 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:3916
+#: g10/gpg.c:3913
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/gpg.c:3922
+#: g10/gpg.c:3919
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "seçilen sertifikalama özet algoritması geçersiz\n"
 
-#: g10/gpg.c:3937
+#: g10/gpg.c:3934
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "\"completes-needed\" 0 dan büyük olmalı\n"
 
-#: g10/gpg.c:3939
+#: g10/gpg.c:3936
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "\"marginals-needed\" 1 den büyük olmalı\n"
 
-#: g10/gpg.c:3941
+#: g10/gpg.c:3938
 #, 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:3943
+#: g10/gpg.c:3940
 #, 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:3945
+#: g10/gpg.c:3942
 #, 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:3949
+#: g10/gpg.c:3946
 #, 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:3953
+#: g10/gpg.c:3950
 #, 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:3960
+#: g10/gpg.c:3957
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "öntanımlı tercihler geçersiz\n"
 
-#: g10/gpg.c:3964
+#: g10/gpg.c:3961
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "kişisel şifre tercihleri geçersiz\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3964
 #, 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:3971
+#: g10/gpg.c:3968
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "kişisel özet tercihleri geçersiz\n"
 
-#: g10/gpg.c:3975
+#: g10/gpg.c:3972
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "kişisel sıkıştırma tercihleri geçersiz\n"
 
-#: g10/gpg.c:3984 g10/gpg.c:3989
+#: g10/gpg.c:3981 g10/gpg.c:3986
 #, 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:4026
+#: g10/gpg.c:4023
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s, %s ile henüz çalışmıyor\n"
 
-#: g10/gpg.c:4089
+#: g10/gpg.c:4086
 #, 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:4101
+#: g10/gpg.c:4098
 #, 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:4256
+#: g10/gpg.c:4253
 #, 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:4268
+#: g10/gpg.c:4265
 #, 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:4340
+#: g10/gpg.c:4337
 #, 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:4369
+#: g10/gpg.c:4366
 #, 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:4372
+#: g10/gpg.c:4369
 #, 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:4430
+#: g10/gpg.c:4427
 #, 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:4433
+#: g10/gpg.c:4430
 #, 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:4821 g10/keyserver.c:1870
+#: g10/gpg.c:4818 g10/keyserver.c:1629
 #, 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:4826
+#: g10/gpg.c:4823
 #, 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:4832
+#: g10/gpg.c:4829
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "anahtar ihracı başarısızlığa uğradı: %s\n"
 
-#: g10/gpg.c:4845
+#: g10/gpg.c:4842
 #, 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:4857
+#: g10/gpg.c:4854
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "anahtar sunucusunda arama başarısız: %s\n"
 
-#: g10/gpg.c:4870
+#: g10/gpg.c:4867
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "anahtar sunucusunda tazeleme başarısız: %s\n"
 
-#: g10/gpg.c:4937
+#: g10/gpg.c:4936
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zırhın kaldırılması başarısız: %s\n"
 
-#: g10/gpg.c:4948
+#: g10/gpg.c:4947
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "zırhlama başarısız: %s\n"
 
-#: g10/gpg.c:5053
+#: g10/gpg.c:5052
 #, 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:5205 g10/tofu.c:2156
+#: g10/gpg.c:5204 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:5216
+#: g10/gpg.c:5215
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5272
+#: g10/gpg.c:5271
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5283
+#: g10/gpg.c:5282
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "İletinizi yazın ...\n"
 
-#: g10/gpg.c:5630
+#: g10/gpg.c:5629
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "belirtilen sertifika güvence adresi geçersiz\n"
 
-#: g10/gpg.c:5632
+#: g10/gpg.c:5631
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "belirtilen imza güvence adresi geçersiz\n"
 
-#: g10/gpg.c:5665
+#: g10/gpg.c:5664
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "belirtilen anahtar sunucusu adresi geçersiz\n"
@@ -3608,7 +3623,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:414 tools/gpgconf.c:116 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:415 tools/gpgconf.c:116 tools/gpg-card.c:95
 msgid "|FD|write status info to this FD"
 msgstr "|FD|durum bilgisini bu FD'ye yazar"
 
@@ -3705,98 +3720,98 @@ msgstr "girdinin ikilik biçimde olduğu kabul edilir"
 msgid "repair keys on import"
 msgstr "parmakizini gösterir"
 
-#: g10/import.c:399 g10/import.c:721
+#: g10/import.c:407 g10/import.c:729
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "%d türündeki blok atlanıyor\n"
 
-#: g10/import.c:738
+#: g10/import.c:746
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "ÅŸu ana kadar %lu anahtar iÅŸlendi\n"
 
-#: g10/import.c:831
+#: g10/import.c:839
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Ä°ÅŸlenmiÅŸ toplam miktar: %lu\n"
 
-#: g10/import.c:834
+#: g10/import.c:842
 #, fuzzy, c-format
 #| msgid "      skipped new keys: %lu\n"
 msgid "    skipped PGP-2 keys: %lu\n"
 msgstr "     yeni anahtarlar atlandı: %lu\n"
 
-#: g10/import.c:836
+#: g10/import.c:844
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "     yeni anahtarlar atlandı: %lu\n"
 
-#: g10/import.c:839
+#: g10/import.c:847
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         kullanıcı kimliksiz: %lu\n"
 
-#: g10/import.c:842 sm/import.c:129
+#: g10/import.c:850 sm/import.c:129
 #, c-format
 msgid "              imported: %lu"
 msgstr "                      alınan: %lu"
 
-#: g10/import.c:846 sm/import.c:133
+#: g10/import.c:854 sm/import.c:133
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                   deÄŸiÅŸmedi: %lu\n"
 
-#: g10/import.c:848
+#: g10/import.c:856
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      yeni kullanıcı kimliği: %lu\n"
 
-#: g10/import.c:850
+#: g10/import.c:858
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "    yeni yardımcı anahtarlar: %lu\n"
 
-#: g10/import.c:852
+#: g10/import.c:860
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "                yeni imzalar: %lu\n"
 
-#: g10/import.c:854
+#: g10/import.c:862
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "      yeni anahtar iptalleri: %lu\n"
 
-#: g10/import.c:856 sm/import.c:135
+#: g10/import.c:864 sm/import.c:135
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "     gizli anahtarlar okundu: %lu\n"
 
-#: g10/import.c:858 sm/import.c:137
+#: g10/import.c:866 sm/import.c:137
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  gizli anahtarlar indirildi: %lu\n"
 
-#: g10/import.c:860 sm/import.c:139
+#: g10/import.c:868 sm/import.c:139
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "  gizli anahtarlar deÄŸiÅŸmedi: %lu\n"
 
-#: g10/import.c:862 sm/import.c:141
+#: g10/import.c:870 sm/import.c:141
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "             alınamadı: %lu\n"
 
-#: g10/import.c:864
+#: g10/import.c:872
 #, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "    temizlenen imzalar: %lu\n"
 
-#: g10/import.c:866
+#: g10/import.c:874
 #, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "     temizlenen kullanıcı kimlikleri: %lu\n"
 
-#: g10/import.c:1291
+#: g10/import.c:1299
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
@@ -3805,180 +3820,180 @@ msgstr ""
 "UYARI: anahtar %s bu kullanıcı kimliklerde kullanışsız algoritmalar için "
 "tercihler içeriyor:\n"
 
-#: g10/import.c:1333
+#: g10/import.c:1341
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": şifreleme algoritması %s için tercih edilir\n"
 
-#: g10/import.c:1351
+#: g10/import.c:1359
 #, fuzzy, c-format
 #| msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgid "         \"%s\": preference for AEAD algorithm %s\n"
 msgstr "         \"%s\": şifreleme algoritması %s için tercih edilir\n"
 
-#: g10/import.c:1366
+#: g10/import.c:1374
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": özet algoritması %s için tercih edilir\n"
 
-#: g10/import.c:1378
+#: g10/import.c:1386
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 "         \"%s\": sıkıştırma algoritması %s için tercih edilir\n"
 "\n"
 
-#: g10/import.c:1391
+#: g10/import.c:1399
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "tercihlerinizi güncellemenizi ve\n"
 
-#: g10/import.c:1393
+#: g10/import.c:1401
 #, c-format
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "olası algoritma uyuşmazlığı sorunlarından kaçınmak için bu anahtarı\n"
 "tekrar dağıtmanızı şiddetle öneririz.\n"
 
-#: g10/import.c:1418
+#: g10/import.c:1426
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 "tercihlerinizi böyle güncelleyemezsiniz: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:1932 g10/import.c:3053
+#: g10/import.c:1940 g10/import.c:3061
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "anahtar %s: kullanıcı kimliği yok\n"
 
-#: g10/import.c:1938
+#: g10/import.c:1946
 #, fuzzy, c-format
 #| msgid "skipped \"%s\": %s\n"
 msgid "key %s: %s\n"
 msgstr "\"%s\" atlandı: %s\n"
 
-#: g10/import.c:1939 g10/import.c:3025
+#: g10/import.c:1947 g10/import.c:3033
 msgid "rejected by import screener"
 msgstr ""
 
-#: g10/import.c:1988
+#: g10/import.c:1996
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "anahtar %s: PKS yardımcı anahtar bozulması giderildi\n"
 
-#: g10/import.c:2009
+#: g10/import.c:2017
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "anahtar %s: öz-imzalı olmayan kullanıcı kimliği \"%s\" kabul edildi\n"
 
-#: g10/import.c:2020 g10/import.c:2051
+#: g10/import.c:2028 g10/import.c:2059
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "anahtar %s: geçerli kullanıcı kimliği yok\n"
 
-#: g10/import.c:2022
+#: g10/import.c:2030
 #, c-format
 msgid "this may be caused by a missing self-signature\n"
 msgstr "bu kayıp bir öz-imza yüzünden meydana gelebilir\n"
 
-#: g10/import.c:2101 g10/import.c:3439
+#: g10/import.c:2109 g10/import.c:3447
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "anahtar %s: genel anahtar yok: %s\n"
 
-#: g10/import.c:2107
+#: g10/import.c:2115
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "anahtar %s: yeni anahtar - atlandı\n"
 
-#: g10/import.c:2119
+#: g10/import.c:2127
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "yazılabilir bir anahtar zinciri yok: %s\n"
 
-#: g10/import.c:2151 g10/import.c:2253 g10/import.c:3514
+#: g10/import.c:2159 g10/import.c:2261 g10/import.c:3522
 #, fuzzy, c-format
 #| msgid "error writing keyring `%s': %s\n"
 msgid "error writing keyring '%s': %s\n"
 msgstr "\"%s\" anahtarlığına yazarken hata oluştu: %s\n"
 
-#: g10/import.c:2174
+#: g10/import.c:2182
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "anahtar %s: genel anahtar \"%s\" alındı\n"
 
-#: g10/import.c:2201
+#: g10/import.c:2209
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "anahtar %s: bizim kopyamızla eşleşmiyor\n"
 
-#: g10/import.c:2269
+#: g10/import.c:2277
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "anahtar %s: \"%s\" 1 yeni kullanıcı kimliği\n"
 
-#: g10/import.c:2272
+#: g10/import.c:2280
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "anahtar %s: \"%s\" %d yeni kullanıcı kimliği\n"
 
-#: g10/import.c:2275
+#: g10/import.c:2283
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "anahtar %s: \"%s\" 1 yeni imza\n"
 
-#: g10/import.c:2278
+#: g10/import.c:2286
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "anahtar %s: \"%s\" %d yeni imza\n"
 
-#: g10/import.c:2281
+#: g10/import.c:2289
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "anahtar %s: %s 1 yeni yardımcı anahtar\n"
 
-#: g10/import.c:2284
+#: g10/import.c:2292
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "anahtar %s: \"%s\" %d yeni yardımcı anahtar\n"
 
-#: g10/import.c:2287
+#: g10/import.c:2295
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "anahtar %s: \"%s\" %d imza temizlendi\n"
 
-#: g10/import.c:2290
+#: g10/import.c:2298
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "anahtar %s: \"%s\" %d imza temizlendi\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2301
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "anahtar %s: \"%s\" %d kullanıcı kimliği temizlendi\n"
 
-#: g10/import.c:2296
+#: g10/import.c:2304
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "anahtar %s: \"%s\" %d kullanıcı kimliği temizlendi\n"
 
-#: g10/import.c:2332
+#: g10/import.c:2340
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "anahtar %s: \"%s\" deÄŸiÅŸmedi\n"
 
-#: g10/import.c:2692 g10/import.c:2887
+#: g10/import.c:2700 g10/import.c:2895
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "anahtar %s: gizli anahtar alındı\n"
 
-#: g10/import.c:2700
+#: g10/import.c:2708
 #, fuzzy, c-format
 #| msgid "skipped: secret key already present\n"
 msgid "key %s: secret key already exists\n"
 msgstr "atlandı: gizli anahtar zaten var\n"
 
-#: g10/import.c:2708
+#: g10/import.c:2716
 #, fuzzy, c-format
 #| msgid "error sending %s command: %s\n"
 msgid "key %s: error sending to agent: %s\n"
@@ -3992,215 +4007,214 @@ msgstr "%s komutu gönderilirken hata: %s\n"
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2877
+#: g10/import.c:2885
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:3024
+#: g10/import.c:3032
 #, fuzzy, c-format
 #| msgid "secret key \"%s\" not found: %s\n"
 msgid "secret key %s: %s\n"
 msgstr "gizli anahtar \"%s\" yok: %s\n"
 
-#: g10/import.c:3045 g10/import.c:3084
+#: g10/import.c:3053 g10/import.c:3092
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "gizli anahtarı alımına izin verilmez\n"
 
-#: g10/import.c:3072
+#: g10/import.c:3080
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "anahtar %s: geçersiz şifreli (%d) gizli anahtar - atlandı\n"
 
-#: g10/import.c:3234 g10/pkclist.c:75 g10/revoke.c:774
+#: g10/import.c:3242 g10/pkclist.c:75 g10/revoke.c:775
 msgid "No reason specified"
 msgstr "BelirtilmiÅŸ bir neden yok"
 
-#: g10/import.c:3235 g10/pkclist.c:77 g10/revoke.c:776
+#: g10/import.c:3243 g10/pkclist.c:77 g10/revoke.c:777
 msgid "Key is superseded"
 msgstr "Anahtarın yerine başkası konulmuş ve iptal edilmiştir"
 
-#: g10/import.c:3236 g10/pkclist.c:79 g10/revoke.c:775
+#: g10/import.c:3244 g10/pkclist.c:79 g10/revoke.c:776
 msgid "Key has been compromised"
 msgstr "Anahtar tehlikede"
 
-#: g10/import.c:3237 g10/pkclist.c:81 g10/revoke.c:777
+#: g10/import.c:3245 g10/pkclist.c:81 g10/revoke.c:778
 msgid "Key is no longer used"
 msgstr "Anahtar artık kullanılmayacak"
 
-#: g10/import.c:3238 g10/pkclist.c:83 g10/revoke.c:778
+#: g10/import.c:3246 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "Kullanıcı kimliği artık geçersiz"
 
-#: g10/import.c:3363 g10/keylist.c:1105 g10/pkclist.c:87
+#: g10/import.c:3371 g10/keylist.c:1105 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "yürürlükten kaldırma sebebi: "
 
-#: g10/import.c:3382 g10/keylist.c:1124 g10/pkclist.c:103
+#: g10/import.c:3390 g10/keylist.c:1124 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "yürürlükten kaldırma açıklaması: "
 
-#: g10/import.c:3432
+#: g10/import.c:3440
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "anahtar %s: genel anahtar değil - yürürlükten kaldırma sertifikası "
 "uygulanamaz\n"
 
-#: g10/import.c:3461
+#: g10/import.c:3469
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "anahtar %s: özgün anahtar bloku bulunamadı: %s\n"
 
-#: g10/import.c:3468
+#: g10/import.c:3476
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "anahtar %s: özgün anahtar bloku okunamadı: %s\n"
 
-#: g10/import.c:3488
+#: g10/import.c:3496
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 "anahtar %s: yürürlükten kaldırma sertifikası geçersiz: %s - reddedildi\n"
 
-#: g10/import.c:3523
+#: g10/import.c:3531
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "anahtar %s: \"%s\" yürürlükten kaldırma sertifikası alındı\n"
 
-#: g10/import.c:3609
+#: g10/import.c:3617
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "anahtar %s: imza için kullanıcı kimliği yok\n"
 
-#: g10/import.c:3626
+#: g10/import.c:3634
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "anahtar %s: genel anahtar algoritması, kullanıcı kimliği \"%s\" için "
 "desteklenmiyor\n"
 
-#: g10/import.c:3628
+#: g10/import.c:3636
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "anahtar %s: kullanıcı kimliği \"%s\" için öz-imza geçersiz\n"
 
-#: g10/import.c:3645 g10/import.c:3673 g10/import.c:3729
+#: g10/import.c:3653 g10/import.c:3681 g10/import.c:3737
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "anahtar %s: genel anahtar algoritması desteklenmiyor\n"
 
-#: g10/import.c:3646
+#: g10/import.c:3654
 #, fuzzy, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "anahtar %s: doğrudan anahtar imzası eklendi\n"
 
-#: g10/import.c:3660
+#: g10/import.c:3668
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "anahtar %s: anahtarı garantilemek için yardımcı anahtar yok\n"
 
-#: g10/import.c:3675
+#: g10/import.c:3683
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "anahtar %s: yardımcı anahtar garantileme geçersiz\n"
 
-#: g10/import.c:3694
+#: g10/import.c:3702
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "anahtar %s: çok sayıda yardımcı anahtar bağlantısı silindi\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3726
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "anahtar %s: anahtarı yürürlükten kaldırılacak yardımcı anahtar yok\n"
 
-#: g10/import.c:3731
+#: g10/import.c:3739
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "anahtar %s: yardımcı anahtar yürürlükten kaldırması geçersiz\n"
 
-#: g10/import.c:3746
+#: g10/import.c:3754
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr ""
 "anahtar %s: çok sayıda yardımcı anahtar yürürlükten kaldırması silindi\n"
 
-#: g10/import.c:3790
+#: g10/import.c:3798
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "anahtar %s: kullanıcı kimliği \"%s\" atlandı\n"
 
-#: g10/import.c:3817
+#: g10/import.c:3825
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "anahtar %s: yardımcı anahtar atlandı\n"
 
-#: g10/import.c:3849
+#: g10/import.c:3857
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "anahtar %s: imza gönderilebilir değil (0x%02X sınıfı) - atlandı\n"
 
-#: g10/import.c:3860
+#: g10/import.c:3868
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "anahtar %s: yürürlükten kaldırma sertifikası yanlış yerde - atlandı\n"
 
-#: g10/import.c:3878
+#: g10/import.c:3886
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "anahtar %s: yürürlükten kaldırma sertifikası geçersiz: %s - atlandı\n"
 
-#: g10/import.c:3892
+#: g10/import.c:3900
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "anahtar %s: yardımcı anahtar imzası yanlış yerde - atlandı\n"
 
-#: g10/import.c:3900
+#: g10/import.c:3908
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "anahtar %s: umulmayan imza sınıfı (0x%02X) - atlandı\n"
 
-#: g10/import.c:4073
+#: g10/import.c:4081
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "anahtar %s: çift kullanıcı kimliği saptandı - birleştirildi\n"
 
-#: g10/import.c:4180
+#: g10/import.c:4188
 #, fuzzy, c-format
 #| msgid "key %s: duplicated user ID detected - merged\n"
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr "anahtar %s: çift kullanıcı kimliği saptandı - birleştirildi\n"
 
-#: g10/import.c:4245
+#: g10/import.c:4253
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "UYARI: anahtar %s yürürlükten kaldırılmış olmalı: yürürlükten kaldırma "
 "anahtarı %s alınıyor\n"
 
-#: g10/import.c:4261
+#: g10/import.c:4269
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "UYARI: anahtar %s yürürlükten kaldırılmış olabilir: yürürlükten kaldırma "
 "anahtarı %s mevcut değil.\n"
 
-#: g10/import.c:4327
+#: g10/import.c:4335
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "anahtar %s: \"%s\" yürürlükten kaldırma sertifikası eklendi\n"
 
-#: g10/import.c:4365
+#: g10/import.c:4373
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "anahtar %s: doğrudan anahtar imzası eklendi\n"
 
-#: g10/key-check.c:133 dirmngr/dirmngr_ldap.c:650 dirmngr/ldap-wrapper.c:835
-#: dirmngr/ldap-wrapper.c:852
+#: g10/key-check.c:133 dirmngr/ldap-wrapper.c:835 dirmngr/ldap-wrapper.c:852
 #, fuzzy, c-format
 #| msgid "error allocating enough memory: %s\n"
 msgid "error allocating memory: %s\n"
@@ -4270,7 +4284,7 @@ msgid ""
 "all signatures.\n"
 msgstr ""
 
-#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:284 sm/keydb.c:297
+#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:289 sm/keydb.c:302
 #, fuzzy, c-format
 #| msgid "error creating keybox `%s': %s\n"
 msgid "error creating keybox '%s': %s\n"
@@ -4282,7 +4296,7 @@ msgstr "anahtar bloku `%s' oluÅŸturulurken hata: %s\n"
 msgid "error creating keyring '%s': %s\n"
 msgstr "`%s' anahtarlığı oluşturulurken hata: %s\n"
 
-#: g10/keydb.c:388 sm/keydb.c:303
+#: g10/keydb.c:388 sm/keydb.c:308
 #, fuzzy, c-format
 #| msgid "keybox `%s' created\n"
 msgid "keybox '%s' created\n"
@@ -4545,8 +4559,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:6192 g10/keyedit.c:6275 g10/keyedit.c:6404
-#: g10/keyedit.c:6466 g10/sign.c:528
+#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
+#: g10/keyedit.c:6474 g10/sign.c:528
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "imzalama başarısız: %s\n"
@@ -4962,7 +4976,7 @@ msgstr "Böyle bir kullanıcı kimliği yok.\n"
 msgid "Nothing to sign.\n"
 msgstr "%s anahtarı ile imzalanacak hiçbir şey yok\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6057
+#: g10/keyedit.c:2973 g10/keyedit.c:6065
 #, c-format
 msgid "Not signed by you.\n"
 msgstr ""
@@ -5036,7 +5050,7 @@ msgstr ""
 msgid "(sensitive)"
 msgstr "(duyarlı)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:525
+#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "oluÅŸturuldu: %s"
@@ -5052,7 +5066,7 @@ msgid "expired: %s"
 msgstr "son kullanma tarihi: %s"
 
 #: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2262
-#: g10/keyserver.c:531
+#: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "son kullanma tarihi: %s"
@@ -5088,13 +5102,13 @@ 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:535
-#: g10/mainproc.c:2280 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
+#: g10/mainproc.c:2282 g10/tofu.c:1789 g10/trust.c:426 dirmngr/ocsp.c:792
 msgid "revoked"
 msgstr "yürürlükten kaldırıldı"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:539
-#: g10/mainproc.c:2282 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
+#: g10/mainproc.c:2284 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "zamanaşımına uğradı"
 
@@ -5136,7 +5150,7 @@ msgstr "Onu yine de eklemek istiyor musunuz? (e/H veya y/N) "
 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:3107
+#: g10/keyedit.c:4273 g10/keygen.c:3111
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
@@ -5300,7 +5314,7 @@ msgstr ""
 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:5357 g10/keyedit.c:5495
+#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
 #, 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"
@@ -5309,133 +5323,133 @@ msgstr "kullanıcı kimliği \"%s\" için v3 öz-imzası atlanıyor\n"
 msgid "Enter your preferred keyserver URL: "
 msgstr "Tercih ettiÄŸiniz sunucunun adresini girin: "
 
-#: g10/keyedit.c:5380
+#: g10/keyedit.c:5383
 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:5381
+#: g10/keyedit.c:5384
 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:5441
+#: g10/keyedit.c:5449
 msgid "Enter the notation: "
 msgstr "Simgelemi giriniz: "
 
-#: g10/keyedit.c:5588
+#: g10/keyedit.c:5596
 msgid "Proceed? (y/N) "
 msgstr "Devam? (e/H ya da y/N) "
 
-#: g10/keyedit.c:5658
+#: g10/keyedit.c:5666
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d endeksine sahip kullanıcı kimliği yok\n"
 
-#: g10/keyedit.c:5720
+#: g10/keyedit.c:5728
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "%s çittirmeli kullanıcı kimliği yok\n"
 
-#: g10/keyedit.c:5821
+#: g10/keyedit.c:5829
 #, 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:5843
+#: g10/keyedit.c:5851
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "%d indisli bir yardımcı anahtar yok\n"
 
-#: g10/keyedit.c:5984
+#: g10/keyedit.c:5992
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Kullanıcı kimliği: \"%s\"\n"
 
-#: g10/keyedit.c:5987 g10/keyedit.c:6089 g10/keyedit.c:6137
+#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
 #, 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:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
+#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
 msgid " (non-exportable)"
 msgstr " (dışarda geçersiz)"
 
-#: g10/keyedit.c:5993
+#: g10/keyedit.c:6001
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Bu anahtarın geçerliliği %s de bitti.\n"
 
-#: g10/keyedit.c:5998
+#: g10/keyedit.c:6006
 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:6003
+#: g10/keyedit.c:6011
 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:6063
+#: g10/keyedit.c:6071
 #, 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:6092
+#: g10/keyedit.c:6100
 msgid " (non-revocable)"
 msgstr " (yürülükten kaldırılmaz)"
 
-#: g10/keyedit.c:6099
+#: g10/keyedit.c:6107
 #, 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:6124
+#: g10/keyedit.c:6132
 msgid "You are about to revoke these signatures:\n"
 msgstr "Bu imzaları yürürlükten kaldırmak üzeresiniz:\n"
 
-#: g10/keyedit.c:6147
+#: g10/keyedit.c:6155
 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:6180
+#: g10/keyedit.c:6188
 #, c-format
 msgid "no secret key\n"
 msgstr "gizli anahtar yok\n"
 
-#: g10/keyedit.c:6228
+#: g10/keyedit.c:6236
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6238
+#: g10/keyedit.c:6246
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "kullanıcı kimliği \"%s\" zaten iptal edilmişti\n"
 
-#: g10/keyedit.c:6255
+#: g10/keyedit.c:6263
 #, 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:6351
+#: g10/keyedit.c:6359
 #, 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:6389
+#: g10/keyedit.c:6397
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Anahtar %s zaten yürürlükten kaldırılmış.\n"
 
-#: g10/keyedit.c:6451
+#: g10/keyedit.c:6459
 #, 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:6548
+#: g10/keyedit.c:6556
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -5448,66 +5462,66 @@ msgstr ""
 msgid "invalid value for option '%s'\n"
 msgstr "\"%.50s\" seçeneği için değiştirge eksik\n"
 
-#: g10/keygen.c:338
+#: g10/keygen.c:339
 #, fuzzy, c-format
 #| msgid "preference `%s' duplicated\n"
 msgid "preference '%s' duplicated\n"
 msgstr "'%s' tercihi yinelendi\n"
 
-#: g10/keygen.c:345
+#: g10/keygen.c:346
 #, c-format
 msgid "too many cipher preferences\n"
 msgstr "çok fazla şifreleme tercihi\n"
 
-#: g10/keygen.c:347
+#: g10/keygen.c:348
 #, c-format
 msgid "too many digest preferences\n"
 msgstr "çok fazla özet tercihi\n"
 
-#: g10/keygen.c:349
+#: g10/keygen.c:350
 #, c-format
 msgid "too many compression preferences\n"
 msgstr "çok fazla sıkıştırma tercihi\n"
 
-#: g10/keygen.c:351
+#: g10/keygen.c:352
 #, fuzzy, c-format
 #| msgid "too many cipher preferences\n"
 msgid "too many AEAD preferences\n"
 msgstr "çok fazla şifreleme tercihi\n"
 
-#: g10/keygen.c:521
+#: g10/keygen.c:522
 #, fuzzy, c-format
 #| msgid "invalid item `%s' in preference string\n"
 msgid "invalid item '%s' in preference string\n"
 msgstr "tercih dizgesindeki '%s' öğesi geçersiz\n"
 
-#: g10/keygen.c:1130
+#: g10/keygen.c:1131
 #, c-format
 msgid "writing direct signature\n"
 msgstr "doğrudan imza yazılıyor\n"
 
-#: g10/keygen.c:1176
+#: g10/keygen.c:1177
 #, c-format
 msgid "writing self signature\n"
 msgstr "öz-imza yazılıyor\n"
 
-#: g10/keygen.c:1233
+#: g10/keygen.c:1234
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "anahtarı garantileyen imzayı yazıyor\n"
 
-#: g10/keygen.c:1598 g10/keygen.c:1603 g10/keygen.c:1655 g10/keygen.c:1660
-#: g10/keygen.c:1832 g10/keygen.c:1837
+#: g10/keygen.c:1599 g10/keygen.c:1604 g10/keygen.c:1656 g10/keygen.c:1661
+#: g10/keygen.c:1833 g10/keygen.c:1838
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "anahtar uzunluğu geçersiz; %u bit kullanılıyor\n"
 
-#: g10/keygen.c:1609 g10/keygen.c:1666 g10/keygen.c:1674 g10/keygen.c:1843
+#: g10/keygen.c:1610 g10/keygen.c:1667 g10/keygen.c:1675 g10/keygen.c:1844
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "anahtar uzunluğu %u bite yuvarlandı\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1701
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
@@ -5515,19 +5529,19 @@ msgstr ""
 "UYARI: bazı OpenPGP uygulamaları bu özet boyutlu bir DSA anahtarıyla "
 "çalışamayabilir\n"
 
-#: g10/keygen.c:1899
+#: g10/keygen.c:1900
 msgid "Sign"
 msgstr "Ä°mzalama"
 
-#: g10/keygen.c:1902
+#: g10/keygen.c:1903
 msgid "Certify"
 msgstr "Onayla"
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1906
 msgid "Encrypt"
 msgstr "Åžifrele"
 
-#: g10/keygen.c:1908
+#: g10/keygen.c:1909
 msgid "Authenticate"
 msgstr "Kimlik kanıtla"
 
@@ -5541,185 +5555,185 @@ msgstr "Kimlik kanıtla"
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1929
+#: g10/keygen.c:1930
 msgid "SsEeAaQq"
 msgstr "OoŞşKkçÇ"
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1967
 #, fuzzy, c-format
 #| msgid "Possible actions for a %s key: "
 msgid "Possible actions for this %s key: "
 msgstr "bir %s anahtarı için olası eylemler: "
 
-#: g10/keygen.c:1973
+#: g10/keygen.c:1974
 msgid "Current allowed actions: "
 msgstr "Şimdilik mümkün eylemler: "
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1979
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) İmzalama yeteneğini açar/kapar\n"
 
-#: g10/keygen.c:1981
+#: g10/keygen.c:1982
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Şifreleme yeteneğini açar/kapar\n"
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1985
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Kimlik kanıtlama yeteneğini açar/kapar\n"
 
-#: g10/keygen.c:1987
+#: g10/keygen.c:1988
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Bitti\n"
 
-#: g10/keygen.c:2116
+#: g10/keygen.c:2117
 #, fuzzy, c-format
 msgid "   (%d) RSA and RSA%s\n"
 msgstr "  (%d) DSA ve ElGamal (öntanımlı)\n"
 
-#: g10/keygen.c:2120
+#: g10/keygen.c:2121
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal%s\n"
 msgstr "  (%d) DSA ve ElGamal (öntanımlı)\n"
 
-#: g10/keygen.c:2123
+#: g10/keygen.c:2124
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "   (%d) DSA (sign only)%s\n"
 msgstr "   (%d) DSA (yalnız imzalamak için)\n"
 
-#: g10/keygen.c:2125
+#: g10/keygen.c:2126
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (sign only)\n"
 msgid "   (%d) RSA (sign only)%s\n"
 msgstr "   (%d) RSA (sadece imzalamak için)\n"
 
-#: g10/keygen.c:2131
+#: g10/keygen.c:2132
 #, fuzzy, c-format
 #| msgid "   (%d) Elgamal (encrypt only)\n"
 msgid "   (%d) Elgamal (encrypt only)%s\n"
 msgstr "   (%d) ElGamal (yalnız şifrelemek için)\n"
 
-#: g10/keygen.c:2133
+#: g10/keygen.c:2134
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (encrypt only)\n"
 msgid "   (%d) RSA (encrypt only)%s\n"
 msgstr "   (%d) RSA (sadece şifrelemek için)\n"
 
-#: g10/keygen.c:2139
+#: g10/keygen.c:2140
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (set your own capabilities)\n"
 msgid "   (%d) DSA (set your own capabilities)%s\n"
 msgstr "   (%d) DSA (yeteneklerini belirtin)\n"
 
-#: g10/keygen.c:2141
+#: g10/keygen.c:2142
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (set your own capabilities)\n"
 msgid "   (%d) RSA (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (yeteneklerini belirtin)\n"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2148
 #, fuzzy, c-format
 #| msgid "   (%d) sign, encrypt\n"
 msgid "   (%d) ECC (sign and encrypt)%s\n"
 msgstr "   (%d) imza, ÅŸifreleme\n"
 
-#: g10/keygen.c:2147 g10/keygen.c:2678
+#: g10/keygen.c:2148 g10/keygen.c:2679
 msgid " *default*"
 msgstr ""
 
-#: g10/keygen.c:2148
+#: g10/keygen.c:2149
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "  (%d) ECC (sign only)\n"
 msgstr "   (%d) DSA (yalnız imzalamak için)\n"
 
-#: g10/keygen.c:2150
+#: g10/keygen.c:2151
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (set your own capabilities)\n"
 msgid "  (%d) ECC (set your own capabilities)%s\n"
 msgstr "   (%d) DSA (yeteneklerini belirtin)\n"
 
-#: g10/keygen.c:2152
+#: g10/keygen.c:2153
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (encrypt only)\n"
 msgid "  (%d) ECC (encrypt only)%s\n"
 msgstr "   (%d) RSA (sadece şifrelemek için)\n"
 
-#: g10/keygen.c:2156
+#: g10/keygen.c:2157
 #, fuzzy, c-format
 #| msgid "   (%d) Existing key\n"
 msgid "  (%d) Existing key%s\n"
 msgstr "   (%d) Mevcut anahtar\n"
 
-#: g10/keygen.c:2158
+#: g10/keygen.c:2159
 #, fuzzy, c-format
 #| msgid "   (%d) Existing key from card\n"
 msgid "  (%d) Existing key from card%s\n"
 msgstr "   (%d) Karttaki mevcut anahtar\n"
 
-#: g10/keygen.c:2254 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2255 sm/certreqgen-ui.c:203
 #, fuzzy
 msgid "Enter the keygrip: "
 msgstr "Simgelemi giriniz: "
 
-#: g10/keygen.c:2267 sm/certreqgen-ui.c:211 tools/gpg-card.c:2280
+#: g10/keygen.c:2268 sm/certreqgen-ui.c:211 tools/gpg-card.c:2297
 #, c-format
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr ""
 
-#: g10/keygen.c:2269 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2270 sm/certreqgen-ui.c:213
 #, fuzzy
 msgid "No key with this keygrip\n"
 msgstr "%d indisli bir yardımcı anahtar yok\n"
 
-#: g10/keygen.c:2288 g10/keygen.c:2298 g10/keygen.c:3440 g10/keygen.c:3451
+#: g10/keygen.c:2289 g10/keygen.c:2299 g10/keygen.c:3444 g10/keygen.c:3455
 #: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
 #, fuzzy, c-format
 msgid "error reading the card: %s\n"
 msgstr "%s: serbest kaydı okuma hatası: %s\n"
 
-#: g10/keygen.c:2292 g10/keygen.c:3444 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2293 g10/keygen.c:3448 sm/certreqgen-ui.c:234
 #, fuzzy, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "kartın seri numarası alınırken hata: %s\n"
 
-#: g10/keygen.c:2311 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2312 sm/certreqgen-ui.c:246
 #, fuzzy
 msgid "Available keys:\n"
 msgstr "anahtarı iptal eder"
 
-#: g10/keygen.c:2504 g10/keygen.c:2518
+#: g10/keygen.c:2505 g10/keygen.c:2519
 #, fuzzy, c-format
 #| msgid "rounded up to %u bits\n"
 msgid "rounded to %u bits\n"
 msgstr "%u bite yuvarlandı\n"
 
-#: g10/keygen.c:2559
+#: g10/keygen.c:2560
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s anahtarları %u bit ile %u bit arasında olmalı.\n"
 
-#: g10/keygen.c:2567
+#: g10/keygen.c:2568
 #, fuzzy, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Ä°stediÄŸiniz anahtar uzunluÄŸu nedir? (%u) "
 
-#: g10/keygen.c:2584 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2585 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Ä°stenen anahtar uzunluÄŸu: %u bit\n"
 
-#: g10/keygen.c:2630
+#: g10/keygen.c:2631
 #, fuzzy
 #| msgid "Please select what kind of key you want:\n"
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Lütfen istediğiniz anahtarı seçiniz:\n"
 
-#: g10/keygen.c:2819
+#: g10/keygen.c:2820
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5735,7 +5749,7 @@ msgstr ""
 "      <n>m = anahtar n ay geçerli\n"
 "      <n>y = anahtar n yıl geçerli\n"
 
-#: g10/keygen.c:2830
+#: g10/keygen.c:2831
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5751,38 +5765,38 @@ msgstr ""
 "      <n>m = imza n ay geçerli\n"
 "      <n>y = imza n yıl geçerli\n"
 
-#: g10/keygen.c:2853
+#: g10/keygen.c:2854
 msgid "Key is valid for? (0) "
 msgstr "Anahtar ne kadar geçerli olacak? (0) "
 
-#: g10/keygen.c:2858
+#: g10/keygen.c:2859
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "İmza ne kadar geçerli olacak? (%s) "
 
-#: g10/keygen.c:2871 g10/keygen.c:2896
+#: g10/keygen.c:2875 g10/keygen.c:2900
 msgid "invalid value\n"
 msgstr "değer hatalı\n"
 
-#: g10/keygen.c:2878
+#: g10/keygen.c:2882
 msgid "Key does not expire at all\n"
 msgstr "Anahtar hep geçerli olacak\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2883
 msgid "Signature does not expire at all\n"
 msgstr "İmza hep geçerli olacak\n"
 
-#: g10/keygen.c:2884
+#: g10/keygen.c:2888
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Anahtarın geçerliliği %s de bitecek.\n"
 
-#: g10/keygen.c:2885
+#: g10/keygen.c:2889
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "İmzanın geçerliliği %s de bitecek.\n"
 
-#: g10/keygen.c:2889
+#: g10/keygen.c:2893
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5790,11 +5804,11 @@ msgstr ""
 "Sisteminiz 2038 yılından sonraki tarihleri gösteremiyor.\n"
 "Ama emin olun ki 2106 yılına kadar elde edilebilecek.\n"
 
-#: g10/keygen.c:2902
+#: g10/keygen.c:2906
 msgid "Is this correct? (y/N) "
 msgstr "Bu doÄŸru mu? (e/H ya da y/N) "
 
-#: g10/keygen.c:2970
+#: g10/keygen.c:2974
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5809,7 +5823,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2985
+#: g10/keygen.c:2989
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5825,50 +5839,50 @@ msgstr ""
 "\t\"Fatih Sultan Mehmed (Padisah) <padisah@ottoman.gov>\"\n"
 "\n"
 
-#: g10/keygen.c:3004
+#: g10/keygen.c:3008
 msgid "Real name: "
 msgstr "Adınız ve Soyadınız: "
 
-#: g10/keygen.c:3013
+#: g10/keygen.c:3017
 msgid "Invalid character in name\n"
 msgstr "Ad ve soyadınızda geçersiz karakter var\n"
 
-#: g10/keygen.c:3014
+#: g10/keygen.c:3018
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:3018
+#: g10/keygen.c:3022
 msgid "Name may not start with a digit\n"
 msgstr "Ad ve soyadınız bir rakamla başlamamalı\n"
 
-#: g10/keygen.c:3021
+#: g10/keygen.c:3025
 msgid "Name must be at least 5 characters long\n"
 msgstr "Ad ve soyadınız en az 5 harfli olmalı\n"
 
-#: g10/keygen.c:3031
+#: g10/keygen.c:3035
 msgid "Email address: "
 msgstr "E-posta adresiniz: "
 
-#: g10/keygen.c:3037
+#: g10/keygen.c:3041
 msgid "Not a valid email address\n"
 msgstr "geçerli bir E-posta adresi değil\n"
 
-#: g10/keygen.c:3046
+#: g10/keygen.c:3050
 msgid "Comment: "
 msgstr "Önbilgi: "
 
-#: g10/keygen.c:3052
+#: g10/keygen.c:3056
 msgid "Invalid character in comment\n"
 msgstr "Önbilgi alanında geçersiz karakter var\n"
 
-#: g10/keygen.c:3088
+#: g10/keygen.c:3092
 #, fuzzy, c-format
 #| msgid "You are using the `%s' character set.\n"
 msgid "You are using the '%s' character set.\n"
 msgstr "`%s' karakter kümesini kullanıyorsunuz.\n"
 
-#: g10/keygen.c:3094
+#: g10/keygen.c:3098
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5879,7 +5893,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3099
+#: g10/keygen.c:3103
 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"
@@ -5895,37 +5909,37 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3124
+#: g10/keygen.c:3128
 msgid "NnCcEeOoQq"
 msgstr "AaYyEeTtKk"
 
-#: g10/keygen.c:3134
+#: g10/keygen.c:3138
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "(A)dı ve Soyadı, (Y)orum, (E)posta alanlarını değiştir ya da Çı(k)? "
 
-#: g10/keygen.c:3135
+#: g10/keygen.c:3139
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "(A)dı ve Soyadı, (Y)orum, (E)posta alanlarını değiştir ya da (T)amam/Çı(k)? "
 
-#: g10/keygen.c:3140
+#: g10/keygen.c:3144
 #, fuzzy
 #| msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "(A)dı ve Soyadı, (Y)orum, (E)posta alanlarını değiştir ya da Çı(k)? "
 
-#: g10/keygen.c:3141
+#: g10/keygen.c:3145
 #, fuzzy
 #| msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr ""
 "(A)dı ve Soyadı, (Y)orum, (E)posta alanlarını değiştir ya da (T)amam/Çı(k)? "
 
-#: g10/keygen.c:3160
+#: g10/keygen.c:3164
 msgid "Please correct the error first\n"
 msgstr "Lütfen önce hatayı düzeltin\n"
 
-#: g10/keygen.c:3206
+#: g10/keygen.c:3210
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -5938,18 +5952,18 @@ msgstr ""
 "iyi olacaktır; bu yeterli rasgele bayt kazanmak için rasgele sayı\n"
 "üretecine yardımcı olur. \n"
 
-#: g10/keygen.c:3591
+#: g10/keygen.c:3595
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4590 g10/keygen.c:4663 g10/keygen.c:4681 g10/keygen.c:4710
-#: g10/keygen.c:5086 g10/keygen.c:5632 g10/keygen.c:5943 g10/keygen.c:6050
+#: g10/keygen.c:4594 g10/keygen.c:4667 g10/keygen.c:4685 g10/keygen.c:4714
+#: g10/keygen.c:5113 g10/keygen.c:5663 g10/keygen.c:5974 g10/keygen.c:6081
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Anahtar üretimi başarısızlığa uğradı: %s\n"
 
-#: g10/keygen.c:4599
+#: g10/keygen.c:4603
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5957,72 +5971,72 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:4601
+#: g10/keygen.c:4605
 msgid "Continue? (Y/n) "
 msgstr ""
 
-#: g10/keygen.c:4622
+#: g10/keygen.c:4626
 #, fuzzy, c-format
 #| msgid "key already exists\n"
 msgid "A key for \"%s\" already exists\n"
 msgstr "anahtar zaten mevcut\n"
 
-#: g10/keygen.c:4627
+#: g10/keygen.c:4631
 #, fuzzy
 #| msgid "Use this key anyway? (y/N) "
 msgid "Create anyway? (y/N) "
 msgstr "Bu anahtar yine de kullanılsın mı? (e/H ya da y/N) "
 
-#: g10/keygen.c:4633
+#: g10/keygen.c:4637
 #, fuzzy, c-format
 #| msgid "generating new key\n"
 msgid "creating anyway\n"
 msgstr "yeni anahtar üretiliyor\n"
 
-#: g10/keygen.c:5069
+#: g10/keygen.c:5096
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 
-#: g10/keygen.c:5118
+#: g10/keygen.c:5145
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Anahtar üretimi durduruldu.\n"
 
-#: g10/keygen.c:5178
+#: g10/keygen.c:5205
 #, fuzzy, c-format
 #| msgid "can't create backup file `%s': %s\n"
 msgid "can't create backup file '%s': %s\n"
 msgstr "'%s' yedek dosyası oluşturulamıyor: %s\n"
 
-#: g10/keygen.c:5198
+#: g10/keygen.c:5225
 #, fuzzy, c-format
 #| msgid "NOTE: backup of card key saved to `%s'\n"
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "BİLGİ: kart anahtarının yedeklemesi '%s' e kaydedildi\n"
 
-#: g10/keygen.c:5359 g10/keygen.c:5561
+#: g10/keygen.c:5389 g10/keygen.c:5591
 #, fuzzy, c-format
 #| msgid "writing public key to `%s'\n"
 msgid "writing public key to '%s'\n"
 msgstr "genel anahtarı `%s'e yazıyor\n"
 
-#: g10/keygen.c:5555
+#: g10/keygen.c:5585
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "yazılabilir bir genel anahtar zinciri yok: %s\n"
 
-#: g10/keygen.c:5569
+#: g10/keygen.c:5599
 #, fuzzy, c-format
 #| msgid "error writing public keyring `%s': %s\n"
 msgid "error writing public keyring '%s': %s\n"
 msgstr "`%s' genel anahtarlığa yazılırken hata oluştu: %s\n"
 
-#: g10/keygen.c:5603
+#: g10/keygen.c:5634
 msgid "public and secret key created and signed.\n"
 msgstr "genel ve gizli anahtar üretildi ve imzalandı.\n"
 
-#: g10/keygen.c:5619
+#: g10/keygen.c:5650
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -6030,14 +6044,14 @@ msgstr ""
 "Bu anahtar şifreleme için kullanılamaz. Şifreleme için yardımcı anahtarı\n"
 "\"--edit-key\" seçeneğini kullanarak üretebilirsiniz.\n"
 
-#: g10/keygen.c:5801 g10/keygen.c:6000
+#: g10/keygen.c:5832 g10/keygen.c:6031
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "anahtar %lu saniye sonra üretilmiş (zaman sapması veya saat problemi)\n"
 
-#: g10/keygen.c:5803 g10/keygen.c:6002
+#: g10/keygen.c:5834 g10/keygen.c:6033
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -6045,24 +6059,24 @@ msgstr ""
 "anahtar bundan %lu saniye sonra üretilmiş (zaman sapması veya saat "
 "problemi)\n"
 
-#: g10/keygen.c:5814 g10/keygen.c:6013
+#: g10/keygen.c:5845 g10/keygen.c:6044
 #, fuzzy, c-format
 #| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "BİLGİ: v3 anahtarları için yardımcı anahtar üretimi OpenPGP uyumlu değildir\n"
 
-#: g10/keygen.c:5826 g10/keygen.c:5828
+#: g10/keygen.c:5857 g10/keygen.c:5859
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Asıl anahtarın gizli parçaları kullanılamaz.\n"
 
-#: g10/keygen.c:5835 g10/keygen.c:5837
+#: g10/keygen.c:5866 g10/keygen.c:5868
 #, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Asıl anahtarın gizli parçaları kart üzerinde saklı.\n"
 
-#: g10/keygen.c:5857 g10/keygen.c:6027
+#: g10/keygen.c:5888 g10/keygen.c:6058
 msgid "Really create? (y/N) "
 msgstr "Gerçekten oluşturulsun mu? (e/H ya da y/N) "
 
@@ -6143,13 +6157,13 @@ msgstr "     Anahtar parmakizi ="
 msgid "      Card serial no. ="
 msgstr "      Kart seri no. ="
 
-#: g10/keyring.c:1467
+#: g10/keyring.c:1477
 #, fuzzy, c-format
 #| msgid "caching keyring `%s'\n"
 msgid "caching keyring '%s'\n"
 msgstr "`%s' anahtar zinciri önbellekleniyor\n"
 
-#: g10/keyring.c:1541
+#: g10/keyring.c:1551
 #, fuzzy, c-format
 #| msgid "%lu keys cached so far (%lu signatures)\n"
 msgid "%lu keys cached so far (%lu signature)\n"
@@ -6157,14 +6171,14 @@ msgid_plural "%lu keys cached so far (%lu signatures)\n"
 msgstr[0] "ÅŸimdiye kadar %lu anahtar arabelleklendi (%lu imza)\n"
 msgstr[1] "ÅŸimdiye kadar %lu anahtar arabelleklendi (%lu imza)\n"
 
-#: g10/keyring.c:1557
+#: g10/keyring.c:1567
 #, c-format
 msgid "%lu key cached"
 msgid_plural "%lu keys cached"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/keyring.c:1559
+#: g10/keyring.c:1569
 #, fuzzy, c-format
 #| msgid "1 bad signature\n"
 msgid " (%lu signature)\n"
@@ -6172,7 +6186,7 @@ msgid_plural " (%lu signatures)\n"
 msgstr[0] "1 kötü imza\n"
 msgstr[1] "1 kötü imza\n"
 
-#: g10/keyring.c:1636
+#: g10/keyring.c:1646
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: anahtar zinciri oluÅŸturuldu\n"
@@ -6202,25 +6216,25 @@ msgstr "imzaları doğrularken anahtarları özdevinimli olarak alır"
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "tercihli anahtar sunucusunun adresini adrese atar"
 
-#: g10/keyserver.c:537
+#: g10/keyserver.c:360
 msgid "disabled"
 msgstr "iptal edildi"
 
-#: g10/keyserver.c:740
+#: g10/keyserver.c:563
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Sayıyı/sayıları girin veya S)onraki ya da Ç)ık >"
 
-#: g10/keyserver.c:846
+#: g10/keyserver.c:669
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "anahtar sunucu protokolü geçersiz (bizimki %d!=eylemci %d)\n"
 
-#: g10/keyserver.c:986 g10/keyserver.c:1096
+#: g10/keyserver.c:809 g10/keyserver.c:919
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" bir anahtar kimliği değil: atlanıyor\n"
 
-#: g10/keyserver.c:1420 g10/keyserver.c:1453
+#: g10/keyserver.c:1217 g10/keyserver.c:1250
 #, fuzzy, c-format
 #| msgid "refreshing %d keys from %s\n"
 msgid "refreshing %d key from %s\n"
@@ -6228,54 +6242,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:1427
+#: g10/keyserver.c:1224
 #, 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:1531
+#: g10/keyserver.c:1316
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "anahtar \"%s\" anahtar sunucusunda yok\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1319
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "anahtar, anahtar sunucusunda yok\n"
 
-#: g10/keyserver.c:1722
-#, c-format
-msgid "requesting key %s from %s server %s\n"
-msgstr "%1$s anahtarı %3$s sunucusunun %2$s adresinden isteniyor\n"
-
-#: g10/keyserver.c:1726
+#: g10/keyserver.c:1481
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "%s anahtarı %s adresinden isteniyor\n"
 
-#: g10/keyserver.c:1841 g10/keyserver.c:2020
+#: g10/keyserver.c:1600 g10/keyserver.c:1793
 #, fuzzy, c-format
 #| msgid "no keyserver action!\n"
 msgid "no keyserver known\n"
 msgstr "bir anahtar sunucusu eylemi yok!\n"
 
-#: g10/keyserver.c:1856 g10/skclist.c:213 g10/skclist.c:241
+#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "\"%s\" atlandı: %s\n"
 
-#: g10/keyserver.c:1860
+#: g10/keyserver.c:1619
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "%s anahtarı %s adresine gönderiliyor\n"
 
-#: g10/keyserver.c:1901
+#: g10/keyserver.c:1662
 #, 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:1917
+#: g10/keyserver.c:1680
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "UYARI: Betimleyici %s alınamıyor: %s\n"
@@ -6302,12 +6311,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:472
+#: g10/mainproc.c:473
 #, c-format
 msgid "public key is %s\n"
 msgstr "genel anahtar: %s\n"
 
-#: g10/mainproc.c:524
+#: g10/mainproc.c:525
 #, 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"
@@ -6315,244 +6324,244 @@ msgstr ""
 "%u bitlik %s anahtarı ve %s kullanıcı kimliği ile şifrelendi, %s tarihinde "
 "oluÅŸturuldu\n"
 
-#: g10/mainproc.c:528 g10/pkclist.c:231
+#: g10/mainproc.c:529 g10/pkclist.c:231
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:532
+#: g10/mainproc.c:533
 #, 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:552 g10/mainproc.c:935
+#: g10/mainproc.c:553 g10/mainproc.c:937
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "UYAR: çok sayıda salt metin görüldü\n"
 
-#: g10/mainproc.c:560
+#: g10/mainproc.c:561
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "%lu anahtar parolası ile şifrelenmiş\n"
 
-#: g10/mainproc.c:562
+#: g10/mainproc.c:563
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "1 anahtar parolası ile şifrelenmiş\n"
 
-#: g10/mainproc.c:577 g10/mainproc.c:602
+#: g10/mainproc.c:578 g10/mainproc.c:603
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "genel anahtar şifre çözümü başarısız: %s\n"
 
-#: g10/mainproc.c:613
+#: g10/mainproc.c:614
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "genel anahtarla ÅŸifreli veri: doÄŸru DEK\n"
 
-#: g10/mainproc.c:642 g10/mainproc.c:663
+#: g10/mainproc.c:643 g10/mainproc.c:664
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "%s şifreli veri varsayılıyor\n"
 
-#: g10/mainproc.c:649
+#: g10/mainproc.c:650
 #, 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:742 g10/mainproc.c:780
+#: g10/mainproc.c:744 g10/mainproc.c:782
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "UYARI: ileti bütünlük korumalı değildi\n"
 
-#: g10/mainproc.c:753
+#: g10/mainproc.c:755
 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:756
+#: g10/mainproc.c:758
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:761
+#: g10/mainproc.c:763
 #, 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:773
+#: g10/mainproc.c:775
 #, c-format
 msgid "decryption okay\n"
 msgstr "Şifre çözme tamam\n"
 
-#: g10/mainproc.c:786
+#: g10/mainproc.c:788
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "UYARI: ÅŸifreli ileti tahrip edilmiÅŸ!\n"
 
-#: g10/mainproc.c:804
+#: g10/mainproc.c:806
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "şifre çözme başarısız: %s\n"
 
-#: g10/mainproc.c:851
+#: g10/mainproc.c:853
 #, 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:858
+#: g10/mainproc.c:860
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "özgün dosya adı = '%.*s'\n"
 
-#: g10/mainproc.c:1135
+#: g10/mainproc.c:1137
 #, 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:1440 g10/mainproc.c:1483
+#: g10/mainproc.c:1442 g10/mainproc.c:1485
 #, c-format
 msgid "no signature found\n"
 msgstr "hiç imza yok\n"
 
-#: g10/mainproc.c:1763
+#: g10/mainproc.c:1765
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "\"%s\" deki imza KÖTÜ"
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1767
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "\"%s\" deki imza zamanaşımına uğramış"
 
-#: g10/mainproc.c:1767
+#: g10/mainproc.c:1769
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "\"%s\" deki imza iyi"
 
-#: g10/mainproc.c:1789
+#: g10/mainproc.c:1791
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "imza doÄŸrulama engellendi\n"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1905
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "bu belirsiz imza verisi elde edilemiyor\n"
 
-#: g10/mainproc.c:1919 g10/mainproc.c:1926
+#: g10/mainproc.c:1921 g10/mainproc.c:1928
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Ä°mza %s de\n"
 
-#: g10/mainproc.c:1920 g10/mainproc.c:1927 sm/verify.c:480
+#: g10/mainproc.c:1922 g10/mainproc.c:1929 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:1931
+#: g10/mainproc.c:1933
 #, 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:1937
+#: g10/mainproc.c:1939
 #, fuzzy, c-format
 #| msgid "                aka \"%s\""
 msgid "               issuer \"%s\"\n"
 msgstr "                nam-ı diğer \"%s\""
 
-#: g10/mainproc.c:1992
+#: g10/mainproc.c:1994
 #, c-format
 msgid "Key available at: "
 msgstr "Anahtar burada:"
 
-#: g10/mainproc.c:2034
+#: g10/mainproc.c:2036
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2234
+#: g10/mainproc.c:2236
 msgid "[uncertain]"
 msgstr "[şüpheli]"
 
-#: g10/mainproc.c:2272
+#: g10/mainproc.c:2274
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                nam-ı diğer \"%s\""
 
-#: g10/mainproc.c:2347
+#: g10/mainproc.c:2349
 #, 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:2363
+#: g10/mainproc.c:2365
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Bu imzanın geçerliliği %s de bitti.\n"
 
-#: g10/mainproc.c:2368
+#: g10/mainproc.c:2370
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Bu imzanın geçerliliği %s de bitecek.\n"
 
-#: g10/mainproc.c:2379
+#: g10/mainproc.c:2381
 #, 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:2380
+#: g10/mainproc.c:2382
 msgid "binary"
 msgstr "ikili"
 
-#: g10/mainproc.c:2381
+#: g10/mainproc.c:2383
 msgid "textmode"
 msgstr "metinkipi"
 
-#: g10/mainproc.c:2381 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2383 g10/trust.c:112 dirmngr/ocsp.c:793
 msgid "unknown"
 msgstr "bilinmeyen"
 
-#: g10/mainproc.c:2383
+#: g10/mainproc.c:2385
 #, fuzzy
 #| msgid "algorithm: %s"
 msgid ", key algorithm "
 msgstr "algoritma: %s"
 
-#: g10/mainproc.c:2418
+#: g10/mainproc.c:2420
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2457
+#: g10/mainproc.c:2459
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Ä°mza kontrol edilemedi: %s\n"
 
-#: g10/mainproc.c:2553 g10/mainproc.c:2572 g10/mainproc.c:2696
+#: g10/mainproc.c:2555 g10/mainproc.c:2574 g10/mainproc.c:2698
 #, c-format
 msgid "not a detached signature\n"
 msgstr "bir bağımsız imza değil\n"
 
-#: g10/mainproc.c:2606
+#: g10/mainproc.c:2608
 #, 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:2615
+#: g10/mainproc.c:2617
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "0x%02x sınıfı tek başına imza\n"
 
-#: g10/mainproc.c:2700
+#: g10/mainproc.c:2702
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "eski stil (PGP 2.x) imza\n"
@@ -6744,58 +6753,64 @@ msgstr "Kritik imza simgelemi: "
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d tipi alt paket kritik bit kümesine sahip\n"
 
-#: g10/passphrase.c:208
+#: g10/passphrase.c:201 sm/decrypt.c:669
+#, fuzzy
+#| msgid "Please enter the new passphrase"
+msgid "Please enter the passphrase for decryption."
+msgstr "Lütfen yeni anahtar parolasını girin"
+
+#: g10/passphrase.c:203
 msgid "Enter passphrase\n"
 msgstr "Anahtar parolasını giriniz\n"
 
-#: g10/passphrase.c:219
+#: g10/passphrase.c:227
 #, c-format
 msgid "cancelled by user\n"
 msgstr "kullanıcı tarafından durduruldu\n"
 
-#: g10/passphrase.c:460
+#: g10/passphrase.c:472
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (asıl anahtar kimliği %s)"
 
-#: g10/passphrase.c:467
+#: g10/passphrase.c:479
 #, fuzzy
 #| msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 msgstr ""
 "PKCS#12 nesnesinin korumasını aşmak için lütfen anahtar parolasını giriniz."
 
-#: g10/passphrase.c:471
+#: g10/passphrase.c:483
 #, fuzzy
 #| msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgid "Please enter the passphrase to import the OpenPGP secret key:"
 msgstr "PKCS#12 nesnesini korumak için lütfen anahtar parolasını giriniz."
 
-#: g10/passphrase.c:476
+#: g10/passphrase.c:488
 #, fuzzy
 #| msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 msgstr "PKCS#12 nesnesini korumak için lütfen anahtar parolasını giriniz."
 
-#: g10/passphrase.c:479
+#: g10/passphrase.c:491
 #, fuzzy
 #| msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgid "Please enter the passphrase to export the OpenPGP secret key:"
 msgstr "PKCS#12 nesnesini korumak için lütfen anahtar parolasını giriniz."
 
-#: g10/passphrase.c:484
+#: g10/passphrase.c:496
 #, fuzzy
 #| msgid "Do you really want to delete the selected keys? (y/N) "
 msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 msgstr "Seçili anahtarları gerçekten silmek istiyor musunuz? (e/H ya da y/N) "
 
-#: g10/passphrase.c:487
+#: g10/passphrase.c:499
 #, fuzzy
 #| msgid "Do you really want to delete the selected keys? (y/N) "
 msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgstr "Seçili anahtarları gerçekten silmek istiyor musunuz? (e/H ya da y/N) "
 
-#: g10/passphrase.c:496
+#: g10/passphrase.c:508
 #, fuzzy, c-format
 #| msgid "%u-bit %s key, ID %s, created %s"
 msgid ""
@@ -6966,7 +6981,7 @@ msgstr ""
 "Bu anahtar için asgari güvence seviyesi: %s\n"
 "\n"
 
-#: g10/pkclist.c:313 g10/revoke.c:803
+#: g10/pkclist.c:313 g10/revoke.c:804
 msgid "Your decision? "
 msgstr "Kararınız? "
 
@@ -7278,7 +7293,7 @@ msgstr "imzalı veri '%s'  açılamadı\n"
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "imzalı veri fd=%d açılamadı: %s\n"
 
-#: g10/pubkey-enc.c:99 sm/decrypt.c:879
+#: g10/pubkey-enc.c:99 sm/decrypt.c:1329
 #, fuzzy, c-format
 #| msgid "certificate is not usable for encryption\n"
 msgid "key %s is not suitable for decryption in %s mode\n"
@@ -7328,7 +7343,7 @@ msgid "Note: key has been revoked"
 msgstr "BİLGİ: anahtar yürürlükten kaldırılmıştı"
 
 #: g10/revoke.c:100 g10/revoke.c:126 g10/revoke.c:172 g10/revoke.c:184
-#: g10/revoke.c:502
+#: g10/revoke.c:503
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet başarısız: %s\n"
@@ -7358,11 +7373,11 @@ msgstr ""
 "Bu imza için bir yürürlükten kaldırma sertifikası oluşturulsun mu? (e/H ya "
 "da y/N) "
 
-#: g10/revoke.c:334 g10/revoke.c:744
+#: g10/revoke.c:334 g10/revoke.c:745
 msgid "ASCII armored output forced.\n"
 msgstr "ASCII zırhlı çıktı istendi.\n"
 
-#: g10/revoke.c:350 g10/revoke.c:481
+#: g10/revoke.c:350 g10/revoke.c:482
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet başarısız: %s\n"
@@ -7376,7 +7391,7 @@ msgstr "Yürürlükten kaldırma sertifikası üretildi.\n"
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "\"%s\" için yürürlükten kaldırma anahtarları yok\n"
 
-#: g10/revoke.c:567
+#: g10/revoke.c:568
 #, fuzzy
 #| msgid "Create a revocation certificate for this key? (y/N) "
 msgid "This is a revocation certificate for the OpenPGP key:"
@@ -7384,14 +7399,14 @@ msgstr ""
 "Bu anahtar için bir yürürlükten kaldırma sertifikası oluşturulsun mu? (e/H "
 "ya da y/N) "
 
-#: g10/revoke.c:583
+#: g10/revoke.c:584
 msgid ""
 "A revocation certificate is a kind of \"kill switch\" to publicly\n"
 "declare that a key shall not anymore be used.  It is not possible\n"
 "to retract such a revocation certificate once it has been published."
 msgstr ""
 
-#: g10/revoke.c:586
+#: g10/revoke.c:587
 msgid ""
 "Use it to revoke this key in case of a compromise or loss of\n"
 "the secret key.  However, if the secret key is still accessible,\n"
@@ -7400,20 +7415,20 @@ msgid ""
 "of the gpg command \"--generate-revocation\" in the GnuPG manual."
 msgstr ""
 
-#: g10/revoke.c:592
+#: g10/revoke.c:593
 msgid ""
 "To avoid an accidental use of this file, a colon has been inserted\n"
 "before the 5 dashes below.  Remove this colon with a text editor\n"
 "before importing and publishing this revocation certificate."
 msgstr ""
 
-#: g10/revoke.c:611
+#: g10/revoke.c:612
 #, fuzzy, c-format
 #| msgid "Revocation certificate created.\n"
 msgid "revocation certificate stored as '%s.rev'\n"
 msgstr "Yürürlükten kaldırma sertifikası üretildi.\n"
 
-#: g10/revoke.c:655
+#: g10/revoke.c:656
 #, fuzzy, c-format
 #| msgid "secret key \"%s\" not found: %s\n"
 msgid "secret key \"%s\" not found\n"
@@ -7422,24 +7437,24 @@ msgstr "gizli anahtar \"%s\" yok: %s\n"
 #. TRANSLATORS: The %s prints a key specification which
 #. for example has been given at the command line.  Several lines
 #. lines with secret key infos are printed after this message.
-#: g10/revoke.c:680
+#: g10/revoke.c:681
 #, c-format
 msgid "'%s' matches multiple secret keys:\n"
 msgstr ""
 
-#: g10/revoke.c:705
+#: g10/revoke.c:706
 #, fuzzy, c-format
 #| msgid "error creating keyring `%s': %s\n"
 msgid "error searching the keyring: %s\n"
 msgstr "`%s' anahtarlığı oluşturulurken hata: %s\n"
 
-#: g10/revoke.c:728
+#: g10/revoke.c:729
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr ""
 "Bu anahtar için bir yürürlükten kaldırma sertifikası oluşturulsun mu? (e/H "
 "ya da y/N) "
 
-#: g10/revoke.c:752
+#: g10/revoke.c:753
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -7457,34 +7472,34 @@ msgstr ""
 "Sertifika kısa olacağından isterseniz, bir yazıcı çıktısı olarak alıp\n"
 "bir kasada da muhafaza edebilirsiniz.\n"
 
-#: g10/revoke.c:786
+#: g10/revoke.c:787
 msgid "Please select the reason for the revocation:\n"
 msgstr "Lütfen bir yürürlükten kaldırma sebebi seçiniz:\n"
 
-#: g10/revoke.c:796
+#: g10/revoke.c:797
 msgid "Cancel"
 msgstr "Ä°ptal"
 
-#: g10/revoke.c:798
+#: g10/revoke.c:799
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Burada %d seçtiğiniz varsayılıyor)\n"
 
-#: g10/revoke.c:839
+#: g10/revoke.c:843
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 "İsteğe bağlı açıklamayı girebilirsiniz; Boş bir satır işlemi sonlandırır:\n"
 
-#: g10/revoke.c:867
+#: g10/revoke.c:871
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Yürürlükten kaldırma sebebi: %s\n"
 
-#: g10/revoke.c:869
+#: g10/revoke.c:873
 msgid "(No description given)\n"
 msgstr "(açıklama verilmedi)\n"
 
-#: g10/revoke.c:874
+#: g10/revoke.c:878
 msgid "Is this okay? (y/N) "
 msgstr "Bu tamam mı? (e/H ya da y/N) "
 
@@ -7671,22 +7686,22 @@ msgstr "imzalanıyor:"
 msgid "%s.%s encryption will be used\n"
 msgstr "%s şifrelemesi kullanılmayacak\n"
 
-#: g10/skclist.c:172 g10/skclist.c:253
+#: g10/skclist.c:173 g10/skclist.c:254
 #, c-format
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr "anahtar güvenli olarak imlenmemiş - onu sahte RSÜ ile kullanmayın!\n"
 
-#: g10/skclist.c:204
+#: g10/skclist.c:205
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "\"%s\" atlandı: tekrarlanmış\n"
 
-#: g10/skclist.c:223
+#: g10/skclist.c:224
 #, c-format
 msgid "skipped: secret key already present\n"
 msgstr "atlandı: gizli anahtar zaten var\n"
 
-#: g10/skclist.c:242
+#: g10/skclist.c:243
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr "bu, imzalar için güvenli olmayan PGP üretimi bir ElGamal anahtarı!"
 
@@ -7915,10 +7930,10 @@ msgstr "desteklenmeyen algoritma: %s"
 msgid "TOFU DB error"
 msgstr ""
 
-#: g10/tofu.c:687 g10/tofu.c:2073 g10/tofu.c:2354 g10/tofu.c:2373
-#: g10/tofu.c:2386 g10/tofu.c:2398 g10/tofu.c:2413 g10/tofu.c:2425
-#: g10/tofu.c:3021 g10/tofu.c:3038 g10/tofu.c:3075 g10/tofu.c:3092
-#: g10/tofu.c:3404
+#: g10/tofu.c:687 g10/tofu.c:2077 g10/tofu.c:2358 g10/tofu.c:2377
+#: g10/tofu.c:2390 g10/tofu.c:2402 g10/tofu.c:2417 g10/tofu.c:2429
+#: g10/tofu.c:3025 g10/tofu.c:3042 g10/tofu.c:3079 g10/tofu.c:3096
+#: g10/tofu.c:3408
 #, fuzzy, c-format
 #| msgid "error sending %s command: %s\n"
 msgid "error reading TOFU database: %s\n"
@@ -7942,7 +7957,7 @@ msgstr "%s: dizin kaydını yazma hatası: %s\n"
 msgid "error opening TOFU database '%s': %s\n"
 msgstr "'%s' açılırken hata: %s\n"
 
-#: g10/tofu.c:1148 g10/tofu.c:3458 g10/tofu.c:3604
+#: g10/tofu.c:1148 g10/tofu.c:3462 g10/tofu.c:3608
 #, fuzzy, c-format
 #| msgid "error sending %s command: %s\n"
 msgid "error updating TOFU database: %s\n"
@@ -7984,37 +7999,37 @@ msgstr "yeni PIN alınırken hata: %s\n"
 msgid "This key's user IDs:\n"
 msgstr "anahtarı ve kullanıcı kimliğini gösterir"
 
-#: g10/tofu.c:1634 g10/tofu.c:1799
+#: g10/tofu.c:1634 g10/tofu.c:1801
 #, fuzzy, c-format
 #| msgid "validity: %s"
 msgid "policy: %s"
 msgstr "geçerliliği: %s"
 
-#: g10/tofu.c:1725
+#: g10/tofu.c:1727
 #, fuzzy, c-format
 #| msgid "error getting stored flags: %s\n"
 msgid "error gathering signature stats: %s\n"
 msgstr "saklanmış bayraklar alınırken hata: %s\n"
 
-#: g10/tofu.c:1729
+#: g10/tofu.c:1731
 #, c-format
 msgid "The email address \"%s\" is associated with %d key:\n"
 msgid_plural "The email address \"%s\" is associated with %d keys:\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1747
+#: g10/tofu.c:1749
 #, c-format
 msgid "Statistics for keys with the email address \"%s\":\n"
 msgstr ""
 
-#: g10/tofu.c:1797
+#: g10/tofu.c:1799
 #, fuzzy
 #| msgid "list keys"
 msgid "this key"
 msgstr "anahtarları listeler"
 
-#: g10/tofu.c:1823
+#: g10/tofu.c:1825
 #, fuzzy, c-format
 #| msgid "print message digests"
 msgid "Verified %d message."
@@ -8022,7 +8037,7 @@ msgid_plural "Verified %d messages."
 msgstr[0] "ileti özetlerini gösterir"
 msgstr[1] "ileti özetlerini gösterir"
 
-#: g10/tofu.c:1827
+#: g10/tofu.c:1829
 #, fuzzy, c-format
 #| msgid "encrypted with %lu passphrases\n"
 msgid "Encrypted %d message."
@@ -8030,7 +8045,7 @@ msgid_plural "Encrypted %d messages."
 msgstr[0] "%lu anahtar parolası ile şifrelenmiş\n"
 msgstr[1] "%lu anahtar parolası ile şifrelenmiş\n"
 
-#: g10/tofu.c:1834
+#: g10/tofu.c:1836
 #, fuzzy, c-format
 #| msgid "print message digests"
 msgid "Verified %d message in the future."
@@ -8038,7 +8053,7 @@ msgid_plural "Verified %d messages in the future."
 msgstr[0] "ileti özetlerini gösterir"
 msgstr[1] "ileti özetlerini gösterir"
 
-#: g10/tofu.c:1838
+#: g10/tofu.c:1840
 #, fuzzy, c-format
 #| msgid "print message digests"
 msgid "Encrypted %d message in the future."
@@ -8046,54 +8061,54 @@ msgid_plural "Encrypted %d messages in the future."
 msgstr[0] "ileti özetlerini gösterir"
 msgstr[1] "ileti özetlerini gösterir"
 
-#: g10/tofu.c:1852
+#: g10/tofu.c:1854
 #, c-format
 msgid "Messages verified over the past %d day: %d."
 msgid_plural "Messages verified over the past %d days: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1858
+#: g10/tofu.c:1860
 #, c-format
 msgid "Messages encrypted over the past %d day: %d."
 msgid_plural "Messages encrypted over the past %d days: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1868
+#: g10/tofu.c:1870
 #, c-format
 msgid "Messages verified over the past %d month: %d."
 msgid_plural "Messages verified over the past %d months: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1874
+#: g10/tofu.c:1876
 #, c-format
 msgid "Messages encrypted over the past %d month: %d."
 msgid_plural "Messages encrypted over the past %d months: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1884
+#: g10/tofu.c:1886
 #, c-format
 msgid "Messages verified over the past %d year: %d."
 msgid_plural "Messages verified over the past %d years: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1890
+#: g10/tofu.c:1892
 #, c-format
 msgid "Messages encrypted over the past %d year: %d."
 msgid_plural "Messages encrypted over the past %d years: %d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:1898
+#: g10/tofu.c:1900
 #, c-format
 msgid "Messages verified in the past: %d."
 msgstr ""
 
-#: g10/tofu.c:1902
+#: g10/tofu.c:1904
 #, fuzzy, c-format
 #| msgid "print message digests"
 msgid "Messages encrypted in the past: %d."
@@ -8102,131 +8117,131 @@ msgstr "ileti özetlerini gösterir"
 #. TRANSLATORS: Please translate the text found in the source
 #. * file below.  We don't directly internationalize that text so
 #. * that we can tweak it without breaking translations.
-#: g10/tofu.c:1919
+#: g10/tofu.c:1921
 msgid "TOFU detected a binding conflict"
 msgstr ""
 
 #. TRANSLATORS: Two letters (normally the lower and upper case
 #. * version of the hotkey) for each of the five choices.  If
 #. * there is only one choice in your language, repeat it.
-#: g10/tofu.c:1961
+#: g10/tofu.c:1963
 msgid "gGaAuUrRbB"
 msgstr ""
 
-#: g10/tofu.c:1967
+#: g10/tofu.c:1969
 msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 
-#: g10/tofu.c:1975
+#: g10/tofu.c:1978
 msgid "Defaulting to unknown.\n"
 msgstr ""
 
-#: g10/tofu.c:2093 g10/tofu.c:2228
+#: g10/tofu.c:2097 g10/tofu.c:2232
 #, c-format
 msgid "TOFU db corruption detected.\n"
 msgstr ""
 
-#: g10/tofu.c:2829
+#: g10/tofu.c:2833
 #, fuzzy, c-format
 #| msgid "error creating a pipe: %s\n"
 msgid "error changing TOFU policy: %s\n"
 msgstr "boru oluÅŸturulurken hata: %s\n"
 
-#: g10/tofu.c:2880
+#: g10/tofu.c:2884
 #, c-format
 msgid "%lld~year"
 msgid_plural "%lld~years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2885
+#: g10/tofu.c:2889
 #, c-format
 msgid "%lld~month"
 msgid_plural "%lld~months"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2890
+#: g10/tofu.c:2894
 #, c-format
 msgid "%lld~week"
 msgid_plural "%lld~weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2895
+#: g10/tofu.c:2899
 #, c-format
 msgid "%lld~day"
 msgid_plural "%lld~days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2900
+#: g10/tofu.c:2904
 #, c-format
 msgid "%lld~hour"
 msgid_plural "%lld~hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2905
+#: g10/tofu.c:2909
 #, c-format
 msgid "%lld~minute"
 msgid_plural "%lld~minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:2907
+#: g10/tofu.c:2911
 #, c-format
 msgid "%lld~second"
 msgid_plural "%lld~seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:3145
+#: g10/tofu.c:3149
 #, c-format
 msgid "%s: Verified 0~signatures and encrypted 0~messages."
 msgstr ""
 
-#: g10/tofu.c:3151
+#: g10/tofu.c:3155
 #, fuzzy, c-format
 #| msgid "Deleted %d signatures.\n"
 msgid "%s: Verified 0 signatures."
 msgstr "%d imza silindi.\n"
 
-#: g10/tofu.c:3165
+#: g10/tofu.c:3169
 #, fuzzy
 #| msgid "encrypted with %lu passphrases\n"
 msgid "Encrypted 0 messages."
 msgstr "%lu anahtar parolası ile şifrelenmiş\n"
 
-#: g10/tofu.c:3181
+#: g10/tofu.c:3185
 #, fuzzy, c-format
 #| msgid "validity: %s"
 msgid "(policy: %s)"
 msgstr "geçerliliği: %s"
 
-#: g10/tofu.c:3215
+#: g10/tofu.c:3219
 #, c-format
 msgid ""
 "Warning: we have yet to see a message signed using this key and user id!\n"
 msgstr ""
 
-#: g10/tofu.c:3218
+#: g10/tofu.c:3222
 #, c-format
 msgid ""
 "Warning: we've only seen one message signed using this key and user id!\n"
 msgstr ""
 
-#: g10/tofu.c:3222
+#: g10/tofu.c:3226
 #, c-format
 msgid "Warning: you have yet to encrypt a message to this key!\n"
 msgstr ""
 
-#: g10/tofu.c:3225
+#: g10/tofu.c:3229
 #, c-format
 msgid "Warning: you have only encrypted one message to this key!\n"
 msgstr ""
 
-#: g10/tofu.c:3254
+#: g10/tofu.c:3258
 #, c-format
 msgid ""
 "Warning: if you think you've seen more signatures by this key and user id, "
@@ -8243,14 +8258,14 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/tofu.c:3339 g10/tofu.c:3502 g10/tofu.c:3708 g10/tofu.c:3761
-#: g10/tofu.c:3902 g10/tofu.c:3979 g10/tofu.c:4017
+#: g10/tofu.c:3343 g10/tofu.c:3506 g10/tofu.c:3712 g10/tofu.c:3765
+#: g10/tofu.c:3906 g10/tofu.c:3983 g10/tofu.c:4021
 #, fuzzy, c-format
 #| msgid "error sending %s command: %s\n"
 msgid "error opening TOFU database: %s\n"
 msgstr "%s komutu gönderilirken hata: %s\n"
 
-#: g10/tofu.c:3535
+#: g10/tofu.c:3539
 #, c-format
 msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
 msgstr ""
@@ -8318,7 +8333,7 @@ msgstr "%s güvence modeli kullanılıyor\n"
 msgid "no need for a trustdb check\n"
 msgstr "bir güvence veritabanı denetimi gereksiz\n"
 
-#: g10/trustdb.c:601 g10/trustdb.c:2272
+#: g10/trustdb.c:601 g10/trustdb.c:2273
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "sonraki güvence veritabanı denetimi %s de\n"
@@ -8350,7 +8365,7 @@ msgstr "lütfen bir --check-trustdb yapın\n"
 msgid "checking the trustdb\n"
 msgstr "güvence veritabanı denetleniyor\n"
 
-#: g10/trustdb.c:1993
+#: g10/trustdb.c:1994
 #, fuzzy, c-format
 #| msgid "%lu keys processed so far\n"
 msgid "%d key processed"
@@ -8358,7 +8373,7 @@ msgid_plural "%d keys processed"
 msgstr[0] "ÅŸu ana kadar %lu anahtar iÅŸlendi\n"
 msgstr[1] "ÅŸu ana kadar %lu anahtar iÅŸlendi\n"
 
-#: g10/trustdb.c:1996
+#: g10/trustdb.c:1997
 #, fuzzy, c-format
 #| msgid "%d keys processed (%d validity counts cleared)\n"
 msgid " (%d validity count cleared)\n"
@@ -8366,17 +8381,17 @@ msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] "%d anahtar iÅŸlendi (%d doÄŸrulama temizlendi)\n"
 msgstr[1] "%d anahtar iÅŸlendi (%d doÄŸrulama temizlendi)\n"
 
-#: g10/trustdb.c:2066
+#: g10/trustdb.c:2067
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "son derece güvenli bir anahtar yok\n"
 
-#: g10/trustdb.c:2080
+#: g10/trustdb.c:2081
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "son derece güvenli %s için genel anahtar yok\n"
 
-#: g10/trustdb.c:2198
+#: g10/trustdb.c:2199
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -8384,29 +8399,29 @@ msgstr ""
 "derinlik: %d  geçerli: %3d  imzalı: %3d  güvenilir: %d-, %dq, %dn, %dm, %df, "
 "%du\n"
 
-#: g10/trustdb.c:2279
+#: g10/trustdb.c:2280
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
 "güvence veritabanının sürüm kaydı güncellenemedi: yazma başarısız: %s\n"
 
-#: g10/trust.c:125
+#: g10/trust.c:114
 msgid "undefined"
 msgstr "tanımsız"
 
-#: g10/trust.c:126
+#: g10/trust.c:115
 msgid "never"
 msgstr "asla    "
 
-#: g10/trust.c:127
+#: g10/trust.c:116
 msgid "marginal"
 msgstr "şöyle böyle"
 
-#: g10/trust.c:128
+#: g10/trust.c:117
 msgid "full"
 msgstr "tamamen"
 
-#: g10/trust.c:129
+#: g10/trust.c:118
 msgid "ultimate"
 msgstr "son derece"
 
@@ -8418,43 +8433,43 @@ msgstr "son derece"
 #. It gets passed to atoi() so everything after the number is
 #. essentially a comment and need not be translated.  Either key and
 #. uid are both NULL, or neither are NULL.
-#: g10/trust.c:166
+#: g10/trust.c:155
 #, fuzzy
 #| msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgid "10 translator see trust.c:uid_trust_string_fixed"
 msgstr "20 translator seen trustdb.c:uid_trust_string_fixed"
 
-#: g10/trust.c:169
+#: g10/trust.c:158
 msgid "[ revoked]"
 msgstr "[yürürlükten kalktı]"
 
-#: g10/trust.c:171 g10/trust.c:177
+#: g10/trust.c:160 g10/trust.c:166
 msgid "[ expired]"
 msgstr "[  süresi  doldu  ]"
 
-#: g10/trust.c:176
+#: g10/trust.c:165
 msgid "[ unknown]"
 msgstr "[    bilinmeyen   ]"
 
-#: g10/trust.c:178
+#: g10/trust.c:167
 msgid "[  undef ]"
 msgstr "[     tanımsız    ]"
 
-#: g10/trust.c:179
+#: g10/trust.c:168
 #, fuzzy
 #| msgid "never"
 msgid "[  never ]"
 msgstr "asla    "
 
-#: g10/trust.c:180
+#: g10/trust.c:169
 msgid "[marginal]"
 msgstr "[   şöyle böyle   ]"
 
-#: g10/trust.c:181
+#: g10/trust.c:170
 msgid "[  full  ]"
 msgstr "[     tamamen     ]"
 
-#: g10/trust.c:182
+#: g10/trust.c:171
 msgid "[ultimate]"
 msgstr "[   son  derece   ]"
 
@@ -8518,16 +8533,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:4937 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2386
+#: scd/app-piv.c:1770 scd/app-p15.c:5035 scd/app-nks.c:1530
+#: scd/app-openpgp.c:2387
 #, 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:4956 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2402
+#: scd/app-piv.c:1787 scd/app-p15.c:5054 scd/app-nks.c:1549
+#: scd/app-openpgp.c:2403
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
@@ -8566,10 +8581,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:2669
-#: scd/app-openpgp.c:2693 scd/app-openpgp.c:2871 scd/app-openpgp.c:2893
-#: scd/app-openpgp.c:3074 scd/app-openpgp.c:3361 scd/app-openpgp.c:3408
-#: scd/app-openpgp.c:3545 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2670
+#: scd/app-openpgp.c:2694 scd/app-openpgp.c:2872 scd/app-openpgp.c:2894
+#: scd/app-openpgp.c:3075 scd/app-openpgp.c:3362 scd/app-openpgp.c:3409
+#: scd/app-openpgp.c:3547 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN eylemcisi hata döndürdü: %s\n"
@@ -8591,58 +8606,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:3616
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3618
 #, c-format
 msgid "key already exists\n"
 msgstr "anahtar zaten mevcut\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3620
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3622
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "mevcut anahtar konulacak\n"
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3622
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3624
 #, c-format
 msgid "generating new key\n"
 msgstr "yeni anahtar üretiliyor\n"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3624
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3626
 #, fuzzy, c-format
 msgid "writing new key\n"
 msgstr "yeni anahtar üretiliyor\n"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4484 scd/app-openpgp.c:4767
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4486 scd/app-openpgp.c:4761
 #, 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:1615
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1616
 #, 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:1622
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1623
 #, 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:1732
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1733
 #, 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:4943
+#: scd/app-piv.c:3279 scd/app-openpgp.c:4937
 #, 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:4951
+#: scd/app-piv.c:3294 scd/app-openpgp.c:4945
 #, 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:4957
+#: scd/app-piv.c:3300 scd/app-openpgp.c:4951
 #, fuzzy, c-format
 #| msgid "key generation completed (%d seconds)\n"
 msgid "key generation completed (%d second)\n"
@@ -8650,38 +8665,38 @@ 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:1842 scd/app-openpgp.c:4966
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1843 scd/app-openpgp.c:4960
 #, 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:5035 scd/app-nks.c:2038
+#: scd/app-p15.c:5133 scd/app-nks.c:2038
 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:5038 scd/app-openpgp.c:2818
+#: scd/app-p15.c:5136 scd/app-openpgp.c:2819
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "||Lütfen PIN'i giriniz"
 
-#: scd/app-p15.c:5040 scd/app-nks.c:2028
+#: scd/app-p15.c:5138 scd/app-nks.c:2028
 #, 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:5043 scd/app-nks.c:2019
+#: scd/app-p15.c:5141 scd/app-nks.c:2019
 #, 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:4321
+#: scd/app-nks.c:1468 scd/app-openpgp.c:4323
 #, 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:4333
+#: scd/app-nks.c:1476 scd/app-openpgp.c:4335
 #, 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"
@@ -8723,27 +8738,27 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3442 scd/app-dinsig.c:534
+#: scd/app-nks.c:2221 scd/app-openpgp.c:3443 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:943
+#: scd/app-openpgp.c:944
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "parmakizinin saklanması başarısız oldu: %s\n"
 
-#: scd/app-openpgp.c:956
+#: scd/app-openpgp.c:957
 #, 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:1427 scd/app-openpgp.c:3389 scd/app-openpgp.c:5715
+#: scd/app-openpgp.c:1428 scd/app-openpgp.c:3390 scd/app-openpgp.c:5709
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "karttan CHV durumu alınırken hata\n"
 
-#: scd/app-openpgp.c:1949
+#: scd/app-openpgp.c:1950
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "genel anahtar okuması başarısız: %s\n"
@@ -8751,46 +8766,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:2373
+#: scd/app-openpgp.c:2374
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2621
+#: scd/app-openpgp.c:2622
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "%s olarak öntanımlı PIN kullanılıyor\n"
 
-#: scd/app-openpgp.c:2628
+#: scd/app-openpgp.c:2629
 #, 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:2641
+#: scd/app-openpgp.c:2642
 #, fuzzy
 #| msgid "||Please enter the PIN"
 msgid "||Please unlock the card"
 msgstr "||Lütfen PIN'i giriniz"
 
-#: scd/app-openpgp.c:2700 scd/app-openpgp.c:2900 scd/app-openpgp.c:3368
+#: scd/app-openpgp.c:2701 scd/app-openpgp.c:2901 scd/app-openpgp.c:3369
 #, 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:2717 scd/app-openpgp.c:2760 scd/app-openpgp.c:2917
-#: scd/app-openpgp.c:5325
+#: scd/app-openpgp.c:2718 scd/app-openpgp.c:2761 scd/app-openpgp.c:2918
+#: scd/app-openpgp.c:5319
 #, 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:2804 scd/app-openpgp.c:5724
+#: scd/app-openpgp.c:2805 scd/app-openpgp.c:5718
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "kart kalıcı olarak kilitli!\n"
 
-#: scd/app-openpgp.c:2808
+#: scd/app-openpgp.c:2809
 #, 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"
@@ -8801,20 +8816,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:2841
+#: scd/app-openpgp.c:2842
 #, 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:3355
+#: scd/app-openpgp.c:3356
 msgid "||Please enter the PIN"
 msgstr "||Lütfen PIN'i giriniz"
 
-#: scd/app-openpgp.c:3404
+#: scd/app-openpgp.c:3405
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Lütfen kart için Sıfırlama Kodunu giriniz"
 
-#: scd/app-openpgp.c:3414 scd/app-openpgp.c:3481
+#: scd/app-openpgp.c:3415 scd/app-openpgp.c:3484
 #, 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"
@@ -8822,82 +8837,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:3437
+#: scd/app-openpgp.c:3438
 msgid "|RN|New Reset Code"
 msgstr "|YSK|Yeni Sıfırlama Kodu"
 
-#: scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3439
 msgid "|AN|New Admin PIN"
 msgstr "|YYP|Yeni Yönetici PIN'i"
 
-#: scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3439
 msgid "|N|New PIN"
 msgstr "|N|Yeni PIN"
 
-#: scd/app-openpgp.c:3541
+#: scd/app-openpgp.c:3543
 #, fuzzy
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "||Lütfen PIN'i giriniz"
 
-#: scd/app-openpgp.c:3542
+#: scd/app-openpgp.c:3544
 #, fuzzy
 #| msgid "||Please enter the PIN"
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Lütfen PIN'i giriniz"
 
-#: scd/app-openpgp.c:3600 scd/app-openpgp.c:5026
+#: scd/app-openpgp.c:3602 scd/app-openpgp.c:5020
 #, c-format
 msgid "error reading application data\n"
 msgstr "uygulama verisi okunurken hata\n"
 
-#: scd/app-openpgp.c:3606 scd/app-openpgp.c:5033
+#: scd/app-openpgp.c:3608 scd/app-openpgp.c:5027
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "parmakizi DO okunurken hata\n"
 
-#: scd/app-openpgp.c:4302 scd/app-openpgp.c:4657
+#: scd/app-openpgp.c:4304 scd/app-openpgp.c:4653
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "oluşturum zaman damgası kayıp\n"
 
-#: scd/app-openpgp.c:4343 scd/app-openpgp.c:4351
+#: scd/app-openpgp.c:4345 scd/app-openpgp.c:4353
 #, 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:4651
+#: scd/app-openpgp.c:4647
 #, fuzzy, c-format
 #| msgid "unsupported algorithm: %s"
 msgid "unsupported curve\n"
 msgstr "desteklenmeyen algoritma: %s"
 
-#: scd/app-openpgp.c:4991
+#: scd/app-openpgp.c:4985
 #, 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:5041
+#: scd/app-openpgp.c:5035
 #, 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:5240
+#: scd/app-openpgp.c:5234
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "kart %s özet algoritmasını desteklemiyor\n"
 
-#: scd/app-openpgp.c:5298
+#: scd/app-openpgp.c:5292
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "ÅŸu ana kadar oluÅŸturulan imzalar: %lu\n"
 
-#: scd/app-openpgp.c:5729
+#: scd/app-openpgp.c:5723
 #, 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:6241 scd/app-openpgp.c:6252
+#: scd/app-openpgp.c:6250 scd/app-openpgp.c:6261
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "%s erişilebilir değil - OpenPGP kartı geçersiz olabilir mi?\n"
@@ -8919,7 +8934,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:274 dirmngr/dirmngr.c:198
+#: scd/scdaemon.c:136 sm/gpgsm.c:274 dirmngr/dirmngr.c:199
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LDÜZEY|hata ayıklama düzeyini DÜZEY yapar"
 
@@ -8993,12 +9008,12 @@ 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:2104
+#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2143
 #, 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:2112
+#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2151
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "fd %d için eylemci sonlandı\n"
@@ -9008,11 +9023,11 @@ msgstr "fd %d için eylemci sonlandı\n"
 msgid "validation model requested by certificate: %s"
 msgstr "sertifika tarafından istenen geçerlilik modeli: %s"
 
-#: sm/certchain.c:199 sm/certchain.c:2172
+#: sm/certchain.c:199 sm/certchain.c:2174
 msgid "chain"
 msgstr "zincir"
 
-#: sm/certchain.c:200 sm/certchain.c:2172
+#: sm/certchain.c:200 sm/certchain.c:2174
 msgid "shell"
 msgstr "kabuk"
 
@@ -9047,226 +9062,226 @@ msgstr "bilgi: kritik olmayan sertifika poliçesine izin verilmez"
 msgid "certificate policy not allowed"
 msgstr "sertifika poliçesine izin verilmiyor"
 
-#: sm/certchain.c:595 sm/keydb.c:1891 sm/keydb.c:1980
+#: sm/certchain.c:596 sm/keydb.c:1913 sm/keydb.c:2002
 #, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "parmakizinin alınması başarısız oldu\n"
 
-#: sm/certchain.c:624
+#: sm/certchain.c:625
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr "harici bir sertifikacı arar\n"
 
-#: sm/certchain.c:644
+#: sm/certchain.c:645
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "eşleşen sertifikacı sayısı: %d\n"
 
-#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#: sm/certchain.c:724 dirmngr/ocsp.c:683
 #, fuzzy, c-format
 #| msgid "can't access `%s': %s\n"
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "'%s' eriÅŸilemiyor: %s\n"
 
-#: sm/certchain.c:791
+#: sm/certchain.c:792
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr "Dirmngr önbelleğinde sertifikacıyı arar\n"
 
-#: sm/certchain.c:816
+#: sm/certchain.c:817
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "eşleşen sertifika sayısı: %d\n"
 
-#: sm/certchain.c:819
+#: sm/certchain.c:820
 #, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "dirmngr sadece-önbellek anahtar araması başarısızi: %s\n"
 
-#: sm/certchain.c:1046 sm/certchain.c:1561 sm/certchain.c:2200 sm/decrypt.c:643
-#: sm/encrypt.c:620 sm/import.c:414 sm/keydb.c:1898 sm/keydb.c:1987
-#: sm/sign.c:428 sm/verify.c:117
+#: sm/certchain.c:1047 sm/certchain.c:1562 sm/certchain.c:2202
+#: sm/decrypt.c:1084 sm/encrypt.c:621 sm/import.c:414 sm/keydb.c:1920
+#: sm/keydb.c:2009 sm/sign.c:428 sm/verify.c:117
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "anahtar veritabanı eylemcisine yer ayrılması başarısız oldu\n"
 
-#: sm/certchain.c:1232
+#: sm/certchain.c:1233
 msgid "certificate has been revoked"
 msgstr "sertifika yürürlükten kaldırılmıştı"
 
-#: sm/certchain.c:1247
+#: sm/certchain.c:1248
 msgid "the status of the certificate is unknown"
 msgstr "sertifika durumu bilinmiyor"
 
-#: sm/certchain.c:1254
+#: sm/certchain.c:1255
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr "\"dirmngr\"'ın düzgün olarak kurulu olduğundan lütfen emin olunuz\n"
 
-#: sm/certchain.c:1260
+#: sm/certchain.c:1261
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "CRL sınaması başarısız: %s"
 
-#: sm/certchain.c:1289 sm/certchain.c:1357 dirmngr/validate.c:497
+#: sm/certchain.c:1290 sm/certchain.c:1358 dirmngr/validate.c:497
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "geçersiz doğrulukla sertifika: %s"
 
-#: sm/certchain.c:1304 sm/certchain.c:1389 dirmngr/validate.c:515
+#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:515
 #, c-format
 msgid "certificate not yet valid"
 msgstr "sertifika henüz geçersiz"
 
-#: sm/certchain.c:1305 sm/certchain.c:1390
+#: sm/certchain.c:1306 sm/certchain.c:1391
 msgid "root certificate not yet valid"
 msgstr "kök sertifika henüz geçersiz"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1307 sm/certchain.c:1392
 msgid "intermediate certificate not yet valid"
 msgstr "ara sertifika henüz geçersiz"
 
-#: sm/certchain.c:1319 dirmngr/validate.c:526
+#: sm/certchain.c:1320 dirmngr/validate.c:526
 #, c-format
 msgid "certificate has expired"
 msgstr "sertifika kullanım süresi dolmuş"
 
-#: sm/certchain.c:1320
+#: sm/certchain.c:1321
 msgid "root certificate has expired"
 msgstr "kök sertifikanın kullanım süresi dolmuş"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1322
 msgid "intermediate certificate has expired"
 msgstr "ara sertifikanın kullanım süresi dolmuş"
 
-#: sm/certchain.c:1363
+#: sm/certchain.c:1364
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr "gerekli sertifika özellikleri eksik: %s%s%s"
 
-#: sm/certchain.c:1372
+#: sm/certchain.c:1373
 msgid "certificate with invalid validity"
 msgstr "geçersiz doğrulukla sertifika"
 
-#: sm/certchain.c:1409
+#: sm/certchain.c:1410
 msgid "signature not created during lifetime of certificate"
 msgstr "sertifika yaşam süresi boyunca imza oluşturulmadı"
 
-#: sm/certchain.c:1411
+#: sm/certchain.c:1412
 msgid "certificate not created during lifetime of issuer"
 msgstr "sertifikacının yaşam süresi boyunca sertifika oluşturulmadı"
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1413
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr "sertifikacının yaşam süresi boyunca ara sertifika oluşturulmadı"
 
-#: sm/certchain.c:1416
+#: sm/certchain.c:1417
 #, c-format
 msgid "  (  signature created at "
 msgstr "  (  imzanın oluşturuluşu: "
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1418
 #, c-format
 msgid "  (certificate created at "
 msgstr "  (  sertifikanın oluşturuluşu: "
 
-#: sm/certchain.c:1420
+#: sm/certchain.c:1421
 #, c-format
 msgid "  (certificate valid from "
 msgstr "  (sertifika geçerlilik başlangıcı: "
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1422
 #, c-format
 msgid "  (     issuer valid from "
 msgstr "  (sertifikacı geçerlilik başlangıcı: "
 
-#: sm/certchain.c:1451 dirmngr/validate.c:577
+#: sm/certchain.c:1452 dirmngr/validate.c:577
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "parmakizi=%s\n"
 
-#: sm/certchain.c:1460
+#: sm/certchain.c:1461
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr "kök sertifika artık güvenilir olarak imlenmiş oldu\n"
 
-#: sm/certchain.c:1473
+#: sm/certchain.c:1474
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr "güvenilir olarak etkileşimli imleme gpg-agent'ta etkin değil\n"
 
-#: sm/certchain.c:1479
+#: sm/certchain.c:1480
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr "güvenilir olarak etkileşimli imleme bu oturum için iptal edildi\n"
 
-#: sm/certchain.c:1538
+#: sm/certchain.c:1539
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 "UYARI: imzanın oluşturulma zamanı bilinmiyor - şimdiki zaman varsayılıyor"
 
-#: sm/certchain.c:1602
+#: sm/certchain.c:1603
 msgid "no issuer found in certificate"
 msgstr "sertifikacı kim belli değil"
 
-#: sm/certchain.c:1680
+#: sm/certchain.c:1681
 msgid "self-signed certificate has a BAD signature"
 msgstr "öz-imzalı sertifika KÖTÜ bir imzaya sahip"
 
-#: sm/certchain.c:1749 dirmngr/validate.c:575
+#: sm/certchain.c:1750 dirmngr/validate.c:575
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "kök sertifika güvenilir olarak imli değil"
 
-#: sm/certchain.c:1765
+#: sm/certchain.c:1766
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "güvence listesinin sınanması başarısız: %s\n"
 
-#: sm/certchain.c:1796 sm/import.c:175 dirmngr/validate.c:630
+#: sm/certchain.c:1797 sm/import.c:175 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "sertifika zinciri çok uzun\n"
 
-#: sm/certchain.c:1808 dirmngr/validate.c:642
+#: sm/certchain.c:1809 dirmngr/validate.c:642
 #, c-format
 msgid "issuer certificate not found"
 msgstr "sertifikacı belli değil"
 
-#: sm/certchain.c:1842 dirmngr/validate.c:668
+#: sm/certchain.c:1844 dirmngr/validate.c:668
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr "sertifika KÖTÜ bir imzaya sahip"
 
-#: sm/certchain.c:1874 dirmngr/validate.c:692
+#: sm/certchain.c:1876 dirmngr/validate.c:692
 msgid "found another possible matching CA certificate - trying again"
 msgstr "başka bir eşleşmesi olası CA sertifikası var - tekrar deneniyor"
 
-#: sm/certchain.c:1933 dirmngr/validate.c:717
+#: sm/certchain.c:1935 dirmngr/validate.c:717
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "sertifika zinciri CA tarafından izin verilenden uzun (%d)"
 
-#: sm/certchain.c:1975 sm/certchain.c:2275 dirmngr/validate.c:747
+#: sm/certchain.c:1977 sm/certchain.c:2278 dirmngr/validate.c:747
 #, c-format
 msgid "certificate is good\n"
 msgstr "sertifika iyi durumda\n"
 
-#: sm/certchain.c:1976
+#: sm/certchain.c:1978
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "ara sertifika iyi durumda\n"
 
-#: sm/certchain.c:1977
+#: sm/certchain.c:1979
 #, c-format
 msgid "root certificate is good\n"
 msgstr "kök sertifika iyi durumda\n"
 
-#: sm/certchain.c:2159
+#: sm/certchain.c:2161
 msgid "switching to chain model"
 msgstr "zincir modeline geçiş"
 
-#: sm/certchain.c:2168
+#: sm/certchain.c:2170
 #, c-format
 msgid "validation model used: %s"
 msgstr "kullanılan geçerlilik modeli: %s"
@@ -9277,18 +9292,18 @@ 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:1372 dirmngr/validate.c:903
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1411 dirmngr/validate.c:903
 #: dirmngr/validate.c:927
 #, c-format
 msgid "out of core\n"
 msgstr "nüve dışında\n"
 
-#: sm/certcheck.c:389 sm/verify.c:212
+#: sm/certcheck.c:388 sm/verify.c:212
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(bu, MD2 algoritmasıdır)\n"
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:793
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:794
 msgid "none"
 msgstr "yok"
 
@@ -9604,17 +9619,17 @@ msgstr "Hazır.  Bu isteği şimdi Sertifika Yetkilinize (CA) göndermelisiniz.\
 msgid "resource problem: out of core\n"
 msgstr "özkaynak sorunu: nüve dışı\n"
 
-#: sm/decrypt.c:719
+#: sm/decrypt.c:1159
 #, c-format
 msgid "(this is the RC2 algorithm)\n"
 msgstr "(bu, RC2 algoritmasıdır)\n"
 
-#: sm/decrypt.c:721
+#: sm/decrypt.c:1161
 #, c-format
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr "(bu bir şifreli iletiymiş gibi görünmüyor)\n"
 
-#: sm/decrypt.c:868
+#: sm/decrypt.c:1318
 #, fuzzy, c-format
 #| msgid "encrypted with %s key, ID %s\n"
 msgid "encrypted to %s key %s\n"
@@ -9626,7 +9641,7 @@ msgstr "%s anahtarı ve %s kullanıcı kimliği ile şifrelenmiş\n"
 msgid "certificate '%s' not found: %s\n"
 msgstr "sertifika \"%s\" yok: %s\n"
 
-#: sm/delete.c:120 sm/keydb.c:1999 sm/keydb.c:2098
+#: sm/delete.c:120 sm/keydb.c:2021 sm/keydb.c:2120
 #, c-format
 msgid "error locking keybox: %s\n"
 msgstr "anahtar bloÄŸu kilitlenirken hata: %s\n"
@@ -9648,7 +9663,7 @@ msgstr "sertifika `%s' silindi\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "\"%s\" sertifikası silinemedi: %s\n"
 
-#: sm/encrypt.c:606
+#: sm/encrypt.c:607
 #, c-format
 msgid "no valid recipients given\n"
 msgstr "geçerli alıcılar verilmedi\n"
@@ -9719,65 +9734,65 @@ msgstr ""
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|DOSYA|anahtar zincirini anahtar zincirleri listesine ekler"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:352 dirmngr/dirmngr.c:265
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|BELİRTİM|anahtarları aramak için bu anahtar sunucusu kullanılır"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:363
 msgid "fetch missing issuer certificates"
 msgstr "kayıp sertifikacı sertifikalarını alır"
 
-#: sm/gpgsm.c:364
+#: sm/gpgsm.c:365
 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:385
+#: sm/gpgsm.c:386
 msgid "never consult a CRL"
 msgstr "asla bir CRL sormaz"
 
-#: sm/gpgsm.c:389
+#: sm/gpgsm.c:390
 msgid "do not check CRLs for root certificates"
 msgstr "kök sertifikalar için CRLler sınanmaz"
 
-#: sm/gpgsm.c:393
+#: sm/gpgsm.c:394
 msgid "check validity using OCSP"
 msgstr "doğruluğu OCSP kullarak sınar"
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:396
 msgid "do not check certificate policies"
 msgstr "sertifika poliçeleri sınanmaz"
 
-#: sm/gpgsm.c:398
+#: sm/gpgsm.c:399
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|İSİM|şifre algoritması olarak İSİM kullanılır"
 
-#: sm/gpgsm.c:400
+#: sm/gpgsm.c:401
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|İSİM|özet algoritması olarak İSİM kullanılır"
 
-#: sm/gpgsm.c:410
+#: sm/gpgsm.c:411
 msgid "batch mode: never ask"
 msgstr "önceden belirlenmiş işlemler kipi: hiç sormaz"
 
-#: sm/gpgsm.c:412
+#: sm/gpgsm.c:413
 msgid "assume yes on most questions"
 msgstr "soruların çoğunda cevap evet farzedilir"
 
-#: sm/gpgsm.c:413
+#: sm/gpgsm.c:414
 msgid "assume no on most questions"
 msgstr "soruların çoğunda cevap hayır farzedilir"
 
-#: sm/gpgsm.c:430
+#: sm/gpgsm.c:431
 msgid "|FILE|write an audit log to FILE"
 msgstr "|DOSYA|bir denetim günlüğünü DOSYAya yazar"
 
-#: sm/gpgsm.c:615
+#: sm/gpgsm.c:616
 #, 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:618
+#: sm/gpgsm.c:619
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpgsm [options] [files]\n"
@@ -9792,56 +9807,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:826
+#: sm/gpgsm.c:827
 #, 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:837
+#: sm/gpgsm.c:838
 #, 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:896 dirmngr/ldapserver.c:89
-#, c-format
-msgid "%s:%u: no hostname given\n"
-msgstr "%s:%u: konak adı belirtilmemiş\n"
-
-#: sm/gpgsm.c:915 dirmngr/ldapserver.c:108
-#, c-format
-msgid "%s:%u: password given without user\n"
-msgstr "%s:%u: kullanıcısız parola verilmiş\n"
-
-#: sm/gpgsm.c:946 dirmngr/ldapserver.c:139
-#, c-format
-msgid "%s:%u: ignoring unknown flag '%s'\n"
-msgstr ""
-
-#: sm/gpgsm.c:962 dirmngr/ldapserver.c:155
-#, c-format
-msgid "%s:%u: skipping this line\n"
-msgstr "%s:%u: bu satır atlanıyor\n"
-
-#: sm/gpgsm.c:1550
-#, c-format
-msgid "could not parse keyserver\n"
-msgstr "anahtar sunucusu çözümlenemedi\n"
-
-#: sm/gpgsm.c:1858
+#: sm/gpgsm.c:1711
 #, 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:1904
+#: sm/gpgsm.c:1757
 #, 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:2273
+#: sm/gpgsm.c:2129
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "geçersiz komut (hiç dolaylı komut yok)\n"
@@ -9861,54 +9851,54 @@ msgstr "sertifika saklanırken hata\n"
 msgid "basic certificate checks failed - not imported\n"
 msgstr "temel sertifika sınamaları başarısız oldu - ithal edilmedi\n"
 
-#: sm/import.c:471 sm/keydb.c:2018 sm/keydb.c:2111
+#: sm/import.c:472 sm/keydb.c:2040 sm/keydb.c:2133
 #, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "saklanmış bayraklar alınırken hata: %s\n"
 
-#: sm/import.c:530 sm/import.c:562
+#: sm/import.c:531 sm/import.c:563
 #, c-format
 msgid "error importing certificate: %s\n"
 msgstr "sertifika ithal edilirken hata: %s\n"
 
-#: sm/import.c:751 tools/gpg-connect-agent.c:1475
+#: sm/import.c:752 tools/gpg-connect-agent.c:1475
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "girdi okunurken hata: %s\n"
 
-#: sm/keydb.c:503
+#: sm/keydb.c:508
 #, fuzzy, c-format
 #| msgid "no gpg-agent running in this session\n"
 msgid "no keyboxd running in this session\n"
 msgstr "bu oturumda çalışan gpg-agent yok\n"
 
-#: sm/keydb.c:595
+#: sm/keydb.c:600
 #, fuzzy, c-format
 #| msgid "error opening `%s': %s\n"
 msgid "error opening key DB: %s\n"
 msgstr "'%s' açılırken hata: %s\n"
 
-#: sm/keydb.c:1936
+#: sm/keydb.c:1958
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr "mevcut sertifika aranırken sorun çıktı: %s\n"
 
-#: sm/keydb.c:1948
+#: sm/keydb.c:1970
 #, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "yazılabilir anahtar veritabanı bulunurken hata: %s\n"
 
-#: sm/keydb.c:1956
+#: sm/keydb.c:1978
 #, c-format
 msgid "error storing certificate: %s\n"
 msgstr "serifika saklanırken hata: %s\n"
 
-#: sm/keydb.c:2009
+#: sm/keydb.c:2031
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "sertifika yeniden aranırken sorun çıktı: %s\n"
 
-#: sm/keydb.c:2030 sm/keydb.c:2122
+#: sm/keydb.c:2052 sm/keydb.c:2144
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr "bayraklar saklanırken hata: %s\n"
@@ -10101,67 +10091,67 @@ msgstr ""
 msgid "error loading certificate '%s': %s\n"
 msgstr "serifika saklanırken hata: %s\n"
 
-#: dirmngr/certcache.c:819
+#: dirmngr/certcache.c:820
 #, fuzzy, c-format
 #| msgid "Included certificates"
 msgid "permanently loaded certificates: %u\n"
 msgstr "İçerilen sertifikalar"
 
-#: dirmngr/certcache.c:821
+#: dirmngr/certcache.c:822
 #, fuzzy, c-format
 #| msgid "number of matching certificates: %d\n"
 msgid "    runtime cached certificates: %u\n"
 msgstr "eşleşen sertifika sayısı: %d\n"
 
-#: dirmngr/certcache.c:823
+#: dirmngr/certcache.c:824
 #, fuzzy, c-format
 #| msgid "number of matching certificates: %d\n"
 msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "eşleşen sertifika sayısı: %d\n"
 
-#: dirmngr/certcache.c:851 dirmngr/dirmngr-client.c:392
+#: dirmngr/certcache.c:852 dirmngr/dirmngr-client.c:392
 #, fuzzy, c-format
 #| msgid "  (certificate created at "
 msgid "certificate already cached\n"
 msgstr "  (  sertifikanın oluşturuluşu: "
 
-#: dirmngr/certcache.c:853
+#: dirmngr/certcache.c:854
 #, fuzzy, c-format
 #| msgid "certificate is good\n"
 msgid "certificate cached\n"
 msgstr "sertifika iyi durumda\n"
 
-#: dirmngr/certcache.c:855 dirmngr/certcache.c:875 dirmngr/dirmngr-client.c:396
+#: dirmngr/certcache.c:856 dirmngr/certcache.c:876 dirmngr/dirmngr-client.c:396
 #, fuzzy, c-format
 #| msgid "error storing certificate: %s\n"
 msgid "error caching certificate: %s\n"
 msgstr "serifika saklanırken hata: %s\n"
 
-#: dirmngr/certcache.c:938
+#: dirmngr/certcache.c:939
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "parmakizi geçersiz"
 
-#: dirmngr/certcache.c:1384 dirmngr/certcache.c:1393
+#: dirmngr/certcache.c:1385 dirmngr/certcache.c:1394
 #, fuzzy, c-format
 #| msgid "error storing certificate: %s\n"
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "serifika saklanırken hata: %s\n"
 
-#: dirmngr/certcache.c:1579 dirmngr/certcache.c:1588
+#: dirmngr/certcache.c:1580 dirmngr/certcache.c:1589
 #, fuzzy, c-format
 #| msgid "error storing certificate: %s\n"
 msgid "error fetching certificate by subject: %s\n"
 msgstr "serifika saklanırken hata: %s\n"
 
-#: dirmngr/certcache.c:1694 dirmngr/validate.c:483
+#: dirmngr/certcache.c:1695 dirmngr/validate.c:483
 #, fuzzy, c-format
 #| msgid "no issuer found in certificate"
 msgid "no issuer found in certificate\n"
 msgstr "sertifikacı kim belli değil"
 
-#: dirmngr/certcache.c:1704
+#: dirmngr/certcache.c:1705
 #, fuzzy, c-format
 #| msgid "error getting stored flags: %s\n"
 msgid "error getting authorityKeyIdentifier: %s\n"
@@ -10203,7 +10193,7 @@ msgstr "satır alımı başarısız: %s\n"
 msgid "not removing file '%s'\n"
 msgstr "zırhlama başarısız: %s\n"
 
-#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2380
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2383
 #, fuzzy, c-format
 #| msgid "error closing %s: %s\n"
 msgid "error closing cache file: %s\n"
@@ -10457,13 +10447,13 @@ msgid "error getting data from cache file: %s\n"
 msgstr "saklanmış bayraklar alınırken hata: %s\n"
 
 #: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1672 dirmngr/crlcache.c:1697
-#: dirmngr/crlcache.c:1763
+#: dirmngr/crlcache.c:1766
 #, c-format
 msgid "got an invalid S-expression from libksba\n"
 msgstr ""
 
 #: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1679 dirmngr/crlcache.c:1705
-#: dirmngr/crlcache.c:1770 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1773 dirmngr/misc.c:176
 #, fuzzy, c-format
 #| msgid "iconv_open failed: %s\n"
 msgid "converting S-expression failed: %s\n"
@@ -10480,221 +10470,221 @@ msgstr "`%s' çittirim algoritması geçersiz\n"
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1797 dirmngr/ocsp.c:478
+#: dirmngr/crlcache.c:1800 dirmngr/ocsp.c:478
 #, fuzzy, c-format
 #| msgid "receiving line failed: %s\n"
 msgid "creating S-expression failed: %s\n"
 msgstr "satır alımı başarısız: %s\n"
 
-#: dirmngr/crlcache.c:1871
+#: dirmngr/crlcache.c:1874
 #, fuzzy, c-format
 #| msgid "build_packet failed: %s\n"
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "build_packet başarısız: %s\n"
 
-#: dirmngr/crlcache.c:1886
+#: dirmngr/crlcache.c:1889
 #, fuzzy, c-format
 #| msgid "error getting serial number of card: %s\n"
 msgid "error getting update times of CRL: %s\n"
 msgstr "kartın seri numarası alınırken hata: %s\n"
 
-#: dirmngr/crlcache.c:1893
+#: dirmngr/crlcache.c:1896
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1897
+#: dirmngr/crlcache.c:1900
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1917
+#: dirmngr/crlcache.c:1920
 #, fuzzy, c-format
 #| msgid "error getting new PIN: %s\n"
 msgid "error getting CRL item: %s\n"
 msgstr "yeni PIN alınırken hata: %s\n"
 
-#: dirmngr/crlcache.c:1932
+#: dirmngr/crlcache.c:1935
 #, fuzzy, c-format
 #| msgid "error writing to temporary file: %s\n"
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "geçeci dosyaya yazma hatası: %s\n"
 
-#: dirmngr/crlcache.c:1959
+#: dirmngr/crlcache.c:1962
 #, fuzzy, c-format
 #| msgid "no issuer found in certificate"
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "sertifikacı kim belli değil"
 
-#: dirmngr/crlcache.c:1974
+#: dirmngr/crlcache.c:1977
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2020
+#: dirmngr/crlcache.c:2023
 #, fuzzy, c-format
 #| msgid "signature verification suppressed\n"
 msgid "CRL signature verification failed: %s\n"
 msgstr "imza doÄŸrulama engellendi\n"
 
-#: dirmngr/crlcache.c:2032
+#: dirmngr/crlcache.c:2035
 #, fuzzy, c-format
 #| msgid "error reading list of trusted root certificates\n"
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "güvenilir kök sertifika listesinin okunmasında hata\n"
 
-#: dirmngr/crlcache.c:2174
+#: dirmngr/crlcache.c:2177
 #, fuzzy, c-format
 #| msgid "select failed: %s\n"
 msgid "ksba_crl_new failed: %s\n"
 msgstr "select başarısız: %s\n"
 
-#: dirmngr/crlcache.c:2181
+#: dirmngr/crlcache.c:2184
 #, fuzzy, c-format
 #| msgid "read failed: %s\n"
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "read başarısız: %s\n"
 
-#: dirmngr/crlcache.c:2215
+#: dirmngr/crlcache.c:2218
 #, fuzzy, c-format
 #| msgid "failed to create temporary file `%s': %s\n"
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "`%s' geçici dosyası oluşturulamıyor: %s\n"
 
-#: dirmngr/crlcache.c:2219
+#: dirmngr/crlcache.c:2222
 #, fuzzy, c-format
 #| msgid "failed to create temporary file `%s': %s\n"
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "`%s' geçici dosyası oluşturulamıyor: %s\n"
 
-#: dirmngr/crlcache.c:2229
+#: dirmngr/crlcache.c:2232
 #, fuzzy, c-format
 #| msgid "error creating temporary file: %s\n"
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "geçici dosya oluşturulurken hata: %s\n"
 
-#: dirmngr/crlcache.c:2239
+#: dirmngr/crlcache.c:2242
 #, fuzzy, c-format
 #| msgid "update secret failed: %s\n"
 msgid "crl_parse_insert failed: %s\n"
 msgstr "gizliyi güncelleme başarısız: %s\n"
 
-#: dirmngr/crlcache.c:2249
+#: dirmngr/crlcache.c:2252
 #, fuzzy, c-format
 #| msgid "error writing to temporary file: %s\n"
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "geçeci dosyaya yazma hatası: %s\n"
 
-#: dirmngr/crlcache.c:2256
+#: dirmngr/crlcache.c:2259
 #, fuzzy, c-format
 #| msgid "error creating temporary file: %s\n"
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "geçici dosya oluşturulurken hata: %s\n"
 
-#: dirmngr/crlcache.c:2281
+#: dirmngr/crlcache.c:2284
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2285
+#: dirmngr/crlcache.c:2288
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2301
+#: dirmngr/crlcache.c:2304
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2311
+#: dirmngr/crlcache.c:2314
 #, fuzzy, c-format
 #| msgid "error reading input: %s\n"
 msgid "error reading CRL extensions: %s\n"
 msgstr "girdi okunurken hata: %s\n"
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2365
 #, fuzzy, c-format
 #| msgid "error creating a pipe: %s\n"
 msgid "creating cache file '%s'\n"
 msgstr "boru oluÅŸturulurken hata: %s\n"
 
-#: dirmngr/crlcache.c:2394
+#: dirmngr/crlcache.c:2397
 #, fuzzy, c-format
 #| msgid "renaming `%s' to `%s' failed: %s\n"
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "`%s' > `%s' isim değişikliği başarısız: %s\n"
 
-#: dirmngr/crlcache.c:2408
+#: dirmngr/crlcache.c:2411
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
 "program start\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2448
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2468
+#: dirmngr/crlcache.c:2471
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2471
+#: dirmngr/crlcache.c:2474
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2474
+#: dirmngr/crlcache.c:2477
 msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2481
+#: dirmngr/crlcache.c:2484
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2499
+#: dirmngr/crlcache.c:2502
 #, fuzzy, c-format
 #| msgid "WARNING: invalid notation data found\n"
 msgid " WARNING: invalid cache record length\n"
 msgstr "UYARI: geçersiz simgelem verisi bulundu\n"
 
-#: dirmngr/crlcache.c:2506
+#: dirmngr/crlcache.c:2509
 #, fuzzy, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "%s: serbest kaydı okuma hatası: %s\n"
 
-#: dirmngr/crlcache.c:2517
+#: dirmngr/crlcache.c:2520
 #, fuzzy, c-format
 #| msgid "problem re-searching certificate: %s\n"
 msgid "problem reading cache key: %s\n"
 msgstr "sertifika yeniden aranırken sorun çıktı: %s\n"
 
-#: dirmngr/crlcache.c:2548
+#: dirmngr/crlcache.c:2551
 #, fuzzy, c-format
 #| msgid "error reading nonce on fd %d: %s\n"
 msgid "error reading cache entry from db: %s\n"
 msgstr "fd %d üzerinde tuz okunurken hata: %s\n"
 
-#: dirmngr/crlcache.c:2551
+#: dirmngr/crlcache.c:2554
 msgid "End CRL dump\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2672
+#: dirmngr/crlcache.c:2675
 #, fuzzy, c-format
 #| msgid "read failed: %s\n"
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "read başarısız: %s\n"
 
-#: dirmngr/crlcache.c:2683
+#: dirmngr/crlcache.c:2686
 #, fuzzy, c-format
 #| msgid "checking the trust list failed: %s\n"
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "güvence listesinin sınanması başarısız: %s\n"
 
-#: dirmngr/crlcache.c:2743
+#: dirmngr/crlcache.c:2746
 #, fuzzy, c-format
 #| msgid "receiving line failed: %s\n"
 msgid "crl_cache_insert via issuer failed: %s\n"
@@ -10717,7 +10707,7 @@ msgstr ""
 msgid "error retrieving '%s': %s\n"
 msgstr "`%s' %s üzerinden alınırken hata: %s\n"
 
-#: dirmngr/crlfetch.c:218 dirmngr/ldap-wrapper.c:881 dirmngr/misc.c:573
+#: dirmngr/crlfetch.c:218 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
 #, fuzzy, c-format
 #| msgid "%s: error writing dir record: %s\n"
 msgid "error initializing reader object: %s\n"
@@ -10900,143 +10890,143 @@ msgstr ""
 msgid "looking up '%s'\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:175
+#: dirmngr/dirmngr.c:176
 msgid "list the contents of the CRL cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:176
+#: dirmngr/dirmngr.c:177
 #, fuzzy
 #| msgid "|FILE|run commands from FILE on startup"
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|DOSYA|DOSYAdaki komutlar başlangıçta çalıştırılır"
 
-#: dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr.c:178
 msgid "|URL|fetch a CRL from URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:178
+#: dirmngr/dirmngr.c:179
 #, fuzzy
 #| msgid "pass a command to the dirmngr"
 msgid "shutdown the dirmngr"
 msgstr "dirmngr'a bir komut aktarır"
 
-#: dirmngr/dirmngr.c:179
+#: dirmngr/dirmngr.c:180
 msgid "flush the cache"
 msgstr ""
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:213
 msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:215
+#: dirmngr/dirmngr.c:216
 msgid "|N|do not return more than N items in one query"
 msgstr ""
 
-#: dirmngr/dirmngr.c:221
+#: dirmngr/dirmngr.c:222
 msgid "Network related options"
 msgstr ""
 
-#: dirmngr/dirmngr.c:223
+#: dirmngr/dirmngr.c:224
 msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:235
+#: dirmngr/dirmngr.c:236
 msgid "Configuration for Keyservers"
 msgstr "Anahtar sunucular için yapılandırma"
 
-#: dirmngr/dirmngr.c:238
+#: dirmngr/dirmngr.c:239
 msgid "|URL|use keyserver at URL"
 msgstr "|URL| URL'si veriler anahtar sunucusu kullanılır"
 
-#: dirmngr/dirmngr.c:240
+#: dirmngr/dirmngr.c:241
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr ""
 
-#: dirmngr/dirmngr.c:242
+#: dirmngr/dirmngr.c:243
 msgid "Configuration for HTTP servers"
 msgstr "HTTP sunucuları için yapılandırma"
 
-#: dirmngr/dirmngr.c:244
+#: dirmngr/dirmngr.c:245
 msgid "inhibit the use of HTTP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:246
+#: dirmngr/dirmngr.c:247
 msgid "ignore HTTP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:248
+#: dirmngr/dirmngr.c:249
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr ""
 
-#: dirmngr/dirmngr.c:250
+#: dirmngr/dirmngr.c:251
 msgid "use system's HTTP proxy setting"
 msgstr "sistemin HTTP vekil ayarları kullanılır"
 
-#: dirmngr/dirmngr.c:254
+#: dirmngr/dirmngr.c:255
 msgid "Configuration of LDAP servers to use"
 msgstr "Kullanılacak LDAP sunucularının yapılandırması"
 
-#: dirmngr/dirmngr.c:256
+#: dirmngr/dirmngr.c:257
 msgid "inhibit the use of LDAP"
 msgstr ""
 
-#: dirmngr/dirmngr.c:258
+#: dirmngr/dirmngr.c:259
 msgid "ignore LDAP CRL distribution points"
 msgstr ""
 
-#: dirmngr/dirmngr.c:260
+#: dirmngr/dirmngr.c:261
 msgid "|HOST|use HOST for LDAP queries"
 msgstr ""
 
-#: dirmngr/dirmngr.c:262
+#: dirmngr/dirmngr.c:263
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr ""
 
-#: dirmngr/dirmngr.c:264
+#: dirmngr/dirmngr.c:267
 #, fuzzy
 #| msgid "|FILE|read options from FILE"
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|DOSYA|seçenekler DOSYAdan okunur"
 
-#: dirmngr/dirmngr.c:266
+#: dirmngr/dirmngr.c:269
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr ""
 
-#: dirmngr/dirmngr.c:269 dirmngr/dirmngr_ldap.c:104
+#: dirmngr/dirmngr.c:272
 #, fuzzy
 #| msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|azami PIN önbelleği ömrü N saniyeye ayarlanır"
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:275
 msgid "Configuration for OCSP"
 msgstr "OCSP için yapılandırma"
 
-#: dirmngr/dirmngr.c:274
+#: dirmngr/dirmngr.c:277
 #, fuzzy
 #| msgid "allow PKA lookups (DNS requests)"
 msgid "allow sending OCSP requests"
 msgstr "PKA aramalarına izin verilir (DNS istekleri)"
 
-#: dirmngr/dirmngr.c:276
+#: dirmngr/dirmngr.c:279
 msgid "ignore certificate contained OCSP service URLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:278
+#: dirmngr/dirmngr.c:281
 #, fuzzy
 #| msgid "|URL|use keyserver at URL"
 msgid "|URL|use OCSP responder at URL"
 msgstr "|URL| URL'si veriler anahtar sunucusu kullanılır"
 
-#: dirmngr/dirmngr.c:280
+#: dirmngr/dirmngr.c:283
 msgid "|FPR|OCSP response signed by FPR"
 msgstr ""
 
-#: dirmngr/dirmngr.c:288
+#: dirmngr/dirmngr.c:291
 msgid "force loading of outdated CRLs"
 msgstr ""
 
-#: dirmngr/dirmngr.c:299
+#: dirmngr/dirmngr.c:302
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -11049,13 +11039,13 @@ msgstr ""
 "@\n"
 "(Tüm komut ve seçeneklerin komple listesi için man sayfalarına bakın)\n"
 
-#: dirmngr/dirmngr.c:441
+#: dirmngr/dirmngr.c:449
 #, fuzzy
 #| msgid "Usage: gpgconf [options] (-h for help)"
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Kullanımı: gpgconf [seçenekler] (yardım için -h)"
 
-#: dirmngr/dirmngr.c:443
+#: dirmngr/dirmngr.c:451
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg-agent [options] [command [args]]\n"
@@ -11067,315 +11057,114 @@ msgstr ""
 "Sözdizimi: gpg-agent [seçenekler] [komut [arg ...]]\n"
 "GnuPG için gizli anahtar yönetimi\n"
 
-#: dirmngr/dirmngr.c:523
+#: dirmngr/dirmngr.c:531
 #, fuzzy, c-format
 #| msgid "invalid debug-level `%s' given\n"
 msgid "valid debug levels are: %s\n"
 msgstr "belirtilen hata seviyesi `%s' geçersiz\n"
 
-#: dirmngr/dirmngr.c:609 tools/gpgconf.c:667 tools/gpgconf.c:702
-#: tools/gpgconf.c:802
+#: dirmngr/dirmngr.c:617 tools/gpgconf.c:701 tools/gpgconf.c:736
+#: tools/gpgconf.c:836
 #, fuzzy, c-format
 #| msgid "usage: gpgsm [options] "
 msgid "usage: %s [options] "
 msgstr "kullanımı: gpgsm [seçenekler] "
 
-#: dirmngr/dirmngr.c:1260
+#: dirmngr/dirmngr.c:1299
 #, 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:1495 dirmngr/server.c:1824
+#: dirmngr/dirmngr.c:1534 dirmngr/server.c:1878
 #, 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:1501 dirmngr/server.c:1830
+#: dirmngr/dirmngr.c:1540 dirmngr/server.c:1884
 #, 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:1643
+#: dirmngr/dirmngr.c:1682
 #, 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:1698 dirmngr/dirmngr.c:1782
+#: dirmngr/dirmngr.c:1737 dirmngr/dirmngr.c:1821
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "parmakizi geçersiz"
 
-#: dirmngr/dirmngr.c:1734 dirmngr/dirmngr.c:1760 tools/gpgconf-comp.c:3539
+#: dirmngr/dirmngr.c:1773 dirmngr/dirmngr.c:1799 tools/gpgconf-comp.c:3549
 #, 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:1789
+#: dirmngr/dirmngr.c:1828
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1876
+#: dirmngr/dirmngr.c:1915
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1917
+#: dirmngr/dirmngr.c:1956
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1922
+#: dirmngr/dirmngr.c:1961
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1924
+#: dirmngr/dirmngr.c:1963
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1929
+#: dirmngr/dirmngr.c:1968
 #, fuzzy, c-format
 #| msgid "not forced"
 msgid "shutdown forced\n"
 msgstr "zorlanmadı"
 
-#: dirmngr/dirmngr.c:1937
+#: dirmngr/dirmngr.c:1976
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1944
+#: dirmngr/dirmngr.c:1983
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr_ldap.c:105
-msgid "return all values in a record oriented format"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:108
-msgid "|NAME|ignore host part and connect through NAME"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:109
-msgid "force a TLS connection"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:110
-#, fuzzy
-#| msgid "|NAME|connect to Assuan socket NAME"
-msgid "|NAME|connect to host NAME"
-msgstr "|İSİM|Assuan soketi İSİMe bağlanır"
-
-#: dirmngr/dirmngr_ldap.c:111
-#, fuzzy
-#| msgid "|N|connect to reader at port N"
-msgid "|N|connect to port N"
-msgstr "|N|N. porttaki okuyucuya bağlanır"
-
-#: dirmngr/dirmngr_ldap.c:112
-msgid "|NAME|use user NAME for authentication"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:113
-msgid "|PASS|use password PASS for authentication"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:115
-msgid "take password from $DIRMNGR_LDAP_PASS"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:116
-msgid "|STRING|query DN STRING"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:117
-msgid "|STRING|use STRING as filter expression"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:118
-msgid "|STRING|return the attribute STRING"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:179
-#, fuzzy
-#| msgid "Usage: gpg [options] [files] (-h for help)"
-msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
-msgstr "Kullanımı: gpg [seçenekler] [dosyalar] (yardım için -h)"
-
-#: dirmngr/dirmngr_ldap.c:182
-msgid ""
-"Syntax: dirmngr_ldap [options] [URL]\n"
-"Internal LDAP helper for Dirmngr\n"
-"Interface and options may change without notice\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:291
-#, fuzzy, c-format
-#| msgid "invalid import options\n"
-msgid "invalid port number %d\n"
-msgstr "içselleştirme seçenekleri geçersiz\n"
-
-#: dirmngr/dirmngr_ldap.c:400
-#, c-format
-msgid "scanning result for attribute '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:407 dirmngr/dirmngr_ldap.c:490
-#: dirmngr/dirmngr_ldap.c:514 dirmngr/dirmngr_ldap.c:526
-#: dirmngr/dirmngr_ldap.c:722
-#, fuzzy, c-format
-#| msgid "error writing to %s: %s\n"
-msgid "error writing to stdout: %s\n"
-msgstr "%s yazılırken hata: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:424
-#, c-format
-msgid "          available attribute '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:462
-#, fuzzy, c-format
-#| msgid "certificate `%s' not found: %s\n"
-msgid "attribute '%s' not found\n"
-msgstr "sertifika \"%s\" yok: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:469
-#, c-format
-msgid "found attribute '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:581
-#, fuzzy, c-format
-#| msgid "reading from `%s'\n"
-msgid "processing url '%s'\n"
-msgstr "`%s'den okunuyor\n"
-
-#: dirmngr/dirmngr_ldap.c:588
-#, fuzzy, c-format
-#| msgid "          w/o user IDs: %lu\n"
-msgid "          user '%s'\n"
-msgstr "         kullanıcı kimliksiz: %lu\n"
-
-#: dirmngr/dirmngr_ldap.c:590
-#, fuzzy, c-format
-#| msgid "                aka \"%s\""
-msgid "          pass '%s'\n"
-msgstr "                nam-ı diğer \"%s\""
-
-#: dirmngr/dirmngr_ldap.c:592
-#, fuzzy, c-format
-#| msgid "          w/o user IDs: %lu\n"
-msgid "          host '%s'\n"
-msgstr "         kullanıcı kimliksiz: %lu\n"
-
-#: dirmngr/dirmngr_ldap.c:593
-#, fuzzy, c-format
-#| msgid "          not imported: %lu\n"
-msgid "          port %d\n"
-msgstr "             alınamadı: %lu\n"
-
-#: dirmngr/dirmngr_ldap.c:595
-#, fuzzy, c-format
-#| msgid "                aka \"%s\""
-msgid "            DN '%s'\n"
-msgstr "                nam-ı diğer \"%s\""
-
-#: dirmngr/dirmngr_ldap.c:597
-#, c-format
-msgid "        filter '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:602 dirmngr/dirmngr_ldap.c:605
-#, fuzzy, c-format
-#| msgid "                aka \"%s\""
-msgid "          attr '%s'\n"
-msgstr "                nam-ı diğer \"%s\""
-
-#: dirmngr/dirmngr_ldap.c:611
-#, fuzzy, c-format
-#| msgid "%s:%u: no hostname given\n"
-msgid "no host name in '%s'\n"
-msgstr "%s:%u: konak adı belirtilmemiş\n"
-
-#: dirmngr/dirmngr_ldap.c:616
-#, c-format
-msgid "no attribute given for query '%s'\n"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:622
-#, fuzzy, c-format
-#| msgid "WARNING: Using untrusted key!\n"
-msgid "WARNING: using first attribute only\n"
-msgstr "UYARI: Güven derecesiz anahtar kullanılıyor!\n"
-
-#: dirmngr/dirmngr_ldap.c:637 dirmngr/dirmngr_ldap.c:678
-#, fuzzy, c-format
-#| msgid "renaming `%s' to `%s' failed: %s\n"
-msgid "LDAP init to '%s:%d' failed: %s\n"
-msgstr "`%s' > `%s' isim değişikliği başarısız: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:659
-#, fuzzy, c-format
-#| msgid "renaming `%s' to `%s' failed: %s\n"
-msgid "LDAP init to '%s' failed: %s\n"
-msgstr "`%s' > `%s' isim değişikliği başarısız: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:665
-#, fuzzy, c-format
-#| msgid "renaming `%s' to `%s' failed: %s\n"
-msgid "LDAP init to '%s' done\n"
-msgstr "`%s' > `%s' isim değişikliği başarısız: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:704
-#, fuzzy, c-format
-#| msgid "renaming `%s' to `%s' failed: %s\n"
-msgid "binding to '%s:%d' failed: %s\n"
-msgstr "`%s' > `%s' isim değişikliği başarısız: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:728
-#, fuzzy, c-format
-#| msgid "dearmoring failed: %s\n"
-msgid "searching '%s' failed: %s\n"
-msgstr "zırhın kaldırılması başarısız: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:759
-#, fuzzy, c-format
-#| msgid "`%s' is not a JPEG file\n"
-msgid "'%s' is not an LDAP URL\n"
-msgstr "'%s' bir JPEG dosyası değil\n"
-
-#: dirmngr/dirmngr_ldap.c:765
-#, c-format
-msgid "'%s' is an invalid LDAP URL\n"
-msgstr ""
-
-#: dirmngr/http.c:1989 dirmngr/ocsp.c:255
+#: dirmngr/http.c:1998 dirmngr/ocsp.c:255
 #, fuzzy, c-format
 #| msgid "error running `%s': exit status %d\n"
 msgid "error accessing '%s': http status %u\n"
 msgstr "`%s' çalışırken hata: çıkış durumu: %d\n"
 
-#: dirmngr/http.c:3630 dirmngr/ocsp.c:229
+#: dirmngr/http.c:3652 dirmngr/ocsp.c:229
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr ""
 
-#: dirmngr/http.c:3636 dirmngr/ocsp.c:246
+#: dirmngr/http.c:3658 dirmngr/ocsp.c:246
 #, fuzzy, c-format
 #| msgid "too many cipher preferences\n"
 msgid "too many redirections\n"
 msgstr "çok fazla şifreleme tercihi\n"
 
-#: dirmngr/http.c:3748
+#: dirmngr/http.c:3768
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "redirection changed to '%s'\n"
@@ -11419,33 +11208,54 @@ msgstr "süreç %d sonlanacak diye beklerken başarısızlık: %s\n"
 msgid "ldap wrapper %d stalled - killing\n"
 msgstr ""
 
-#: dirmngr/ldap.c:91
+#: dirmngr/ldap.c:92
 #, c-format
 msgid "invalid char 0x%02x in host name - not added\n"
 msgstr ""
 
-#: dirmngr/ldap.c:95
+#: dirmngr/ldap.c:96
 #, fuzzy, c-format
 #| msgid "sending key %s to %s server %s\n"
 msgid "adding '%s:%d' to the ldap server list\n"
 msgstr "anahtar %1$s, %3$s sunucusunun %2$s adresine gönderiliyor\n"
 
-#: dirmngr/ldap.c:98 dirmngr/misc.c:512
+#: dirmngr/ldap.c:99 dirmngr/misc.c:512
 #, fuzzy, c-format
 #| msgid "select failed: %s\n"
 msgid "malloc failed: %s\n"
 msgstr "select başarısız: %s\n"
 
-#: dirmngr/ldap.c:634
+#: dirmngr/ldap.c:221
+#, fuzzy, c-format
+#| msgid "`%s' is not a JPEG file\n"
+msgid "'%s' is not an LDAP URL\n"
+msgstr "'%s' bir JPEG dosyası değil\n"
+
+#: dirmngr/ldap.c:227 dirmngr/ldap.c:233
 #, c-format
-msgid "start_cert_fetch: invalid pattern '%s'\n"
+msgid "'%s' is an invalid LDAP URL\n"
 msgstr ""
 
-#: dirmngr/ldap.c:846
+#: dirmngr/ldap.c:968
 #, c-format
 msgid "ldap_search hit the size limit of the server\n"
 msgstr ""
 
+#: dirmngr/ldapserver.c:119
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr "%s:%u: kullanıcısız parola verilmiş\n"
+
+#: dirmngr/ldapserver.c:181
+#, c-format
+msgid "%s:%u: ignoring unknown flag '%s'\n"
+msgstr ""
+
+#: dirmngr/ldapserver.c:203
+#, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr "%s:%u: bu satır atlanıyor\n"
+
 #: dirmngr/misc.c:172
 #, fuzzy, c-format
 #| msgid "%s: invalid file version %d\n"
@@ -11549,97 +11359,97 @@ msgstr ""
 msgid "allocating list item failed: %s\n"
 msgstr "satır alımı başarısız: %s\n"
 
-#: dirmngr/ocsp.c:537 dirmngr/ocsp.c:724
+#: dirmngr/ocsp.c:538 dirmngr/ocsp.c:725
 #, fuzzy, c-format
 #| msgid "error getting new PIN: %s\n"
 msgid "error getting responder ID: %s\n"
 msgstr "yeni PIN alınırken hata: %s\n"
 
-#: dirmngr/ocsp.c:584
+#: dirmngr/ocsp.c:585
 #, fuzzy, c-format
 #| msgid "certificate should have not been used for OCSP response signing\n"
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr "sertifika, OCSP yanıtının imzalanması için kullanılmamalıydı\n"
 
-#: dirmngr/ocsp.c:623 dirmngr/validate.c:648
+#: dirmngr/ocsp.c:624 dirmngr/validate.c:648
 #, fuzzy, c-format
 #| msgid "issuer certificate not found"
 msgid "issuer certificate not found: %s\n"
 msgstr "sertifikacı belli değil"
 
-#: dirmngr/ocsp.c:633
+#: dirmngr/ocsp.c:634
 #, fuzzy, c-format
 #| msgid "error reading list of trusted root certificates\n"
 msgid "caller did not return the target certificate\n"
 msgstr "güvenilir kök sertifika listesinin okunmasında hata\n"
 
-#: dirmngr/ocsp.c:640
+#: dirmngr/ocsp.c:641
 #, fuzzy, c-format
 #| msgid "error storing certificate\n"
 msgid "caller did not return the issuing certificate\n"
 msgstr "sertifika saklanırken hata\n"
 
-#: dirmngr/ocsp.c:650
+#: dirmngr/ocsp.c:651
 #, fuzzy, c-format
 #| msgid "failed to allocate keyDB handle\n"
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "anahtar veritabanı eylemcisine yer ayrılması başarısız oldu\n"
 
-#: dirmngr/ocsp.c:689
+#: dirmngr/ocsp.c:690
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:696
 #, fuzzy, c-format
 #| msgid "no default secret keyring: %s\n"
 msgid "no default OCSP signer defined\n"
 msgstr "öntanımlı gizli anahtar zinciri yok: %s\n"
 
-#: dirmngr/ocsp.c:702
+#: dirmngr/ocsp.c:703
 #, fuzzy, c-format
 #| msgid "using default PIN as %s\n"
 msgid "using default OCSP responder '%s'\n"
 msgstr "%s olarak öntanımlı PIN kullanılıyor\n"
 
-#: dirmngr/ocsp.c:707
+#: dirmngr/ocsp.c:708
 #, fuzzy, c-format
 #| msgid "using cipher %s\n"
 msgid "using OCSP responder '%s'\n"
 msgstr "%s şifrelemesi kullanılıyor\n"
 
-#: dirmngr/ocsp.c:764
+#: dirmngr/ocsp.c:765
 #, fuzzy, c-format
 #| msgid "error storing certificate: %s\n"
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "serifika saklanırken hata: %s\n"
 
-#: dirmngr/ocsp.c:789
+#: dirmngr/ocsp.c:790
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:790
+#: dirmngr/ocsp.c:791
 msgid "good"
 msgstr ""
 
-#: dirmngr/ocsp.c:796
+#: dirmngr/ocsp.c:797
 #, fuzzy, c-format
 #| msgid "certificate has been revoked"
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "sertifika yürürlükten kaldırılmıştı"
 
-#: dirmngr/ocsp.c:831
+#: dirmngr/ocsp.c:832
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:843
+#: dirmngr/ocsp.c:844
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:858
+#: dirmngr/ocsp.c:859
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr ""
@@ -11650,80 +11460,76 @@ msgstr ""
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "satır göndirimi başarısız: %s\n"
 
-#: dirmngr/server.c:1158
-msgid "ldapserver missing"
-msgstr ""
-
-#: dirmngr/server.c:1224
+#: dirmngr/server.c:1277
 msgid "serialno missing in cert ID"
 msgstr ""
 
-#: dirmngr/server.c:1387 dirmngr/server.c:1473 dirmngr/server.c:1909
-#: dirmngr/server.c:1980 dirmngr/server.c:2556 dirmngr/server.c:2571
+#: dirmngr/server.c:1440 dirmngr/server.c:1526 dirmngr/server.c:1963
+#: dirmngr/server.c:2034 dirmngr/server.c:2662 dirmngr/server.c:2677
 #, fuzzy, c-format
 #| msgid "sending line failed: %s\n"
 msgid "assuan_inquire failed: %s\n"
 msgstr "satır göndirimi başarısız: %s\n"
 
-#: dirmngr/server.c:1516
+#: dirmngr/server.c:1569
 #, fuzzy, c-format
 #| msgid "select failed: %s\n"
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "select başarısız: %s\n"
 
-#: dirmngr/server.c:1528 dirmngr/server.c:1559 dirmngr/server.c:1718
+#: dirmngr/server.c:1581 dirmngr/server.c:1612 dirmngr/server.c:1772
 #, fuzzy, c-format
 #| msgid "error sending %s command: %s\n"
 msgid "error sending data: %s\n"
 msgstr "%s komutu gönderilirken hata: %s\n"
 
-#: dirmngr/server.c:1666
+#: dirmngr/server.c:1720
 #, fuzzy, c-format
 #| msgid "select failed: %s\n"
 msgid "start_cert_fetch failed: %s\n"
 msgstr "select başarısız: %s\n"
 
-#: dirmngr/server.c:1699
+#: dirmngr/server.c:1753
 #, fuzzy, c-format
 #| msgid "select failed: %s\n"
 msgid "fetch_next_cert failed: %s\n"
 msgstr "select başarısız: %s\n"
 
-#: dirmngr/server.c:1726
+#: dirmngr/server.c:1780
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:2860
+#: dirmngr/server.c:2966
 #, fuzzy, c-format
 #| msgid "cannot allocate outfile string: %s\n"
 msgid "can't allocate control structure: %s\n"
 msgstr "dosya dışı dizge ayrılamıyor: %s\n"
 
-#: dirmngr/server.c:2871
+#: dirmngr/server.c:2977
 #, fuzzy, c-format
 #| msgid "failed to create stream from socket: %s\n"
 msgid "failed to allocate assuan context: %s\n"
 msgstr "sokette akım oluşturulamadı: %s\n"
 
-#: dirmngr/server.c:2892
+#: dirmngr/server.c:2998
 #, fuzzy, c-format
 #| msgid "failed to initialize the TrustDB: %s\n"
 msgid "failed to initialize the server: %s\n"
 msgstr "\"TrustDB\" güvence veritabanı başlangıç aşamasında başarısız: %s\n"
 
-#: dirmngr/server.c:2900
+#: dirmngr/server.c:3006
 #, fuzzy, c-format
 #| msgid "failed to store the creation date: %s\n"
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "oluşturma tarihinin saklanması başarısız oldu: %s\n"
 
-#: dirmngr/server.c:2933
+#: dirmngr/server.c:3039
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:2952
+#: dirmngr/server.c:3058
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -11891,76 +11697,76 @@ msgstr "bu oturumda çalışan gpg-agent yok\n"
 msgid "error sending standard options: %s\n"
 msgstr "standart seçenekler gönderilirken hata: %s\n"
 
-#: tools/gpgconf-comp.c:649
+#: tools/gpgconf-comp.c:655
 msgid "OpenPGP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:653
+#: tools/gpgconf-comp.c:659
 msgid "S/MIME"
 msgstr ""
 
-#: tools/gpgconf-comp.c:657
+#: tools/gpgconf-comp.c:663
 #, fuzzy
 #| msgid "public key is %s\n"
 msgid "Public Keys"
 msgstr "genel anahtar: %s\n"
 
-#: tools/gpgconf-comp.c:661
+#: tools/gpgconf-comp.c:667
 msgid "Private Keys"
 msgstr ""
 
-#: tools/gpgconf-comp.c:665
+#: tools/gpgconf-comp.c:671
 msgid "Smartcards"
 msgstr ""
 
-#: tools/gpgconf-comp.c:669
+#: tools/gpgconf-comp.c:676
 msgid "TPM"
 msgstr ""
 
-#: tools/gpgconf-comp.c:673
+#: tools/gpgconf-comp.c:681
 msgid "Network"
 msgstr ""
 
-#: tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:685
 #, fuzzy
 #| msgid "Bad Passphrase"
 msgid "Passphrase Entry"
 msgstr "Anahtar Parolası hatalı"
 
-#: tools/gpgconf-comp.c:941
+#: tools/gpgconf-comp.c:951
 #, fuzzy
 #| msgid "Component not found"
 msgid "Component not suitable for launching"
 msgstr "BileÅŸen yok"
 
-#: tools/gpgconf-comp.c:947
+#: tools/gpgconf-comp.c:957
 #, fuzzy, c-format
 #| msgid "External verification of component %s failed"
 msgid "Configuration file of component %s is broken\n"
 msgstr "%s bileşeninin harici doğrulaması başarısız oldu"
 
-#: tools/gpgconf-comp.c:950
+#: tools/gpgconf-comp.c:960
 #, fuzzy, c-format
 #| msgid "Please use the command \"toggle\" first.\n"
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr "lütfen önce \"seçmece\" komutunu kullanın.\n"
 
-#: tools/gpgconf-comp.c:2816
+#: tools/gpgconf-comp.c:2826
 #, c-format
 msgid "External verification of component %s failed"
 msgstr "%s bileşeninin harici doğrulaması başarısız oldu"
 
-#: tools/gpgconf-comp.c:2946
+#: tools/gpgconf-comp.c:2956
 msgid "Note that group specifications are ignored\n"
 msgstr "Grup belirtimlerinin yoksayıldığına dikkat edin\n"
 
-#: tools/gpgconf-comp.c:3543
+#: tools/gpgconf-comp.c:3553
 #, 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:3545
+#: tools/gpgconf-comp.c:3555
 #, fuzzy, c-format
 #| msgid "error in `%s': %s\n"
 msgid "error parsing '%s'\n"
@@ -12060,15 +11866,15 @@ msgstr ""
 "Sözdizimi: gpgconf [seçenekler]\n"
 "GnuPG sisteminin araçları için yapılandırma seçeneklerini yönetir\n"
 
-#: tools/gpgconf.c:669 tools/gpgconf.c:704
+#: tools/gpgconf.c:703 tools/gpgconf.c:738
 msgid "Need one component argument"
 msgstr "Tek bileÅŸenlik deÄŸiÅŸtirge gerekli"
 
-#: tools/gpgconf.c:678 tools/gpgconf.c:728 tools/gpgconf.c:778
+#: tools/gpgconf.c:712 tools/gpgconf.c:762 tools/gpgconf.c:812
 msgid "Component not found"
 msgstr "BileÅŸen yok"
 
-#: tools/gpgconf.c:804
+#: tools/gpgconf.c:838
 msgid "No argument allowed"
 msgstr "DeÄŸiÅŸtirgeye izin verilmez"
 
@@ -12086,88 +11892,197 @@ msgstr ""
 "Standart girdiden verilen anahtar parolasını örüntü dosyasıyla "
 "karşılaştırır\n"
 
-#: tools/gpg-card.c:2390
+#: tools/gpg-card.c:2407
 #, fuzzy, c-format
 msgid "Note: key %s is already stored on the card!\n"
 msgstr "gizli anahtar zaten bir kartın üzerinde saklı\n"
 
-#: tools/gpg-card.c:2393
+#: tools/gpg-card.c:2410
 #, fuzzy, c-format
 msgid "Note: Keys are already stored on the card!\n"
 msgstr "gizli anahtar zaten bir kartın üzerinde saklı\n"
 
-#: tools/gpg-card.c:2396
+#: tools/gpg-card.c:2413
 #, fuzzy, c-format
 #| msgid "Replace existing keys? (y/N) "
 msgid "Replace existing key %s ? (y/N) "
 msgstr "Mevcut anahtarlar deÄŸiÅŸtirilsin mi? (e/H ya da y/N) "
 
-#: tools/gpg-card.c:2549 tools/gpg-card.c:2712 tools/gpg-card.c:2935
-#: tools/gpg-card.c:3044
+#: tools/gpg-card.c:2566 tools/gpg-card.c:2729 tools/gpg-card.c:2952
+#: tools/gpg-card.c:3061
 #, fuzzy, c-format
 #| msgid "OpenPGP card no. %s detected\n"
 msgid "%s card no. %s detected\n"
 msgstr "%s numaralı OpenPGP kartı saptandı\n"
 
-#: tools/gpg-card.c:3396
+#: tools/gpg-card.c:3413
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3406 tools/gpg-card.c:3420
+#: tools/gpg-card.c:3423 tools/gpg-card.c:3437
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
 "         can only be reverted using a factory reset!\n"
 msgstr ""
 
-#: tools/gpg-card.c:3423
+#: tools/gpg-card.c:3440
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3669
+#: tools/gpg-card.c:3686
 #, fuzzy
 #| msgid "  (certificate created at "
 msgid "authenticate to the card"
 msgstr "  (  sertifikanın oluşturuluşu: "
 
-#: tools/gpg-card.c:3671
+#: tools/gpg-card.c:3688
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3673
+#: tools/gpg-card.c:3690
 msgid "setup KDF for PIN authentication"
 msgstr ""
 
-#: tools/gpg-card.c:3675
+#: tools/gpg-card.c:3692
 msgid "change a private data object"
 msgstr ""
 
-#: tools/gpg-card.c:3676
+#: tools/gpg-card.c:3693
 #, fuzzy
 #| msgid "  (certificate created at "
 msgid "read a certificate from a data object"
 msgstr "  (  sertifikanın oluşturuluşu: "
 
-#: tools/gpg-card.c:3677
+#: tools/gpg-card.c:3694
 #, fuzzy
 #| msgid "  (certificate created at "
 msgid "store a certificate to a data object"
 msgstr "  (  sertifikanın oluşturuluşu: "
 
-#: tools/gpg-card.c:3678
+#: tools/gpg-card.c:3695
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3679
+#: tools/gpg-card.c:3696
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3681
+#: tools/gpg-card.c:3698
 msgid "manage the command history"
 msgstr ""
 
+#~ msgid "requesting key %s from %s server %s\n"
+#~ msgstr "%1$s anahtarı %3$s sunucusunun %2$s adresinden isteniyor\n"
+
+#~ msgid "%s:%u: no hostname given\n"
+#~ msgstr "%s:%u: konak adı belirtilmemiş\n"
+
+#~ msgid "could not parse keyserver\n"
+#~ msgstr "anahtar sunucusu çözümlenemedi\n"
+
+#, fuzzy
+#~| msgid "|NAME|connect to Assuan socket NAME"
+#~ msgid "|NAME|connect to host NAME"
+#~ msgstr "|İSİM|Assuan soketi İSİMe bağlanır"
+
+#, fuzzy
+#~| msgid "|N|connect to reader at port N"
+#~ msgid "|N|connect to port N"
+#~ msgstr "|N|N. porttaki okuyucuya bağlanır"
+
+#, fuzzy
+#~| msgid "Usage: gpg [options] [files] (-h for help)"
+#~ msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
+#~ msgstr "Kullanımı: gpg [seçenekler] [dosyalar] (yardım için -h)"
+
+#, fuzzy
+#~| msgid "invalid import options\n"
+#~ msgid "invalid port number %d\n"
+#~ msgstr "içselleştirme seçenekleri geçersiz\n"
+
+#, fuzzy
+#~| msgid "error writing to %s: %s\n"
+#~ msgid "error writing to stdout: %s\n"
+#~ msgstr "%s yazılırken hata: %s\n"
+
+#, fuzzy
+#~| msgid "certificate `%s' not found: %s\n"
+#~ msgid "attribute '%s' not found\n"
+#~ msgstr "sertifika \"%s\" yok: %s\n"
+
+#, fuzzy
+#~| msgid "reading from `%s'\n"
+#~ msgid "processing url '%s'\n"
+#~ msgstr "`%s'den okunuyor\n"
+
+#, fuzzy
+#~| msgid "          w/o user IDs: %lu\n"
+#~ msgid "          user '%s'\n"
+#~ msgstr "         kullanıcı kimliksiz: %lu\n"
+
+#, fuzzy
+#~| msgid "                aka \"%s\""
+#~ msgid "          pass '%s'\n"
+#~ msgstr "                nam-ı diğer \"%s\""
+
+#, fuzzy
+#~| msgid "          w/o user IDs: %lu\n"
+#~ msgid "          host '%s'\n"
+#~ msgstr "         kullanıcı kimliksiz: %lu\n"
+
+#, fuzzy
+#~| msgid "          not imported: %lu\n"
+#~ msgid "          port %d\n"
+#~ msgstr "             alınamadı: %lu\n"
+
+#, fuzzy
+#~| msgid "                aka \"%s\""
+#~ msgid "            DN '%s'\n"
+#~ msgstr "                nam-ı diğer \"%s\""
+
+#, fuzzy
+#~| msgid "                aka \"%s\""
+#~ msgid "          attr '%s'\n"
+#~ msgstr "                nam-ı diğer \"%s\""
+
+#, fuzzy
+#~| msgid "%s:%u: no hostname given\n"
+#~ msgid "no host name in '%s'\n"
+#~ msgstr "%s:%u: konak adı belirtilmemiş\n"
+
+#, fuzzy
+#~| msgid "WARNING: Using untrusted key!\n"
+#~ msgid "WARNING: using first attribute only\n"
+#~ msgstr "UYARI: Güven derecesiz anahtar kullanılıyor!\n"
+
+#, fuzzy
+#~| msgid "renaming `%s' to `%s' failed: %s\n"
+#~ msgid "LDAP init to '%s:%d' failed: %s\n"
+#~ msgstr "`%s' > `%s' isim değişikliği başarısız: %s\n"
+
+#, fuzzy
+#~| msgid "renaming `%s' to `%s' failed: %s\n"
+#~ msgid "LDAP init to '%s' failed: %s\n"
+#~ msgstr "`%s' > `%s' isim değişikliği başarısız: %s\n"
+
+#, fuzzy
+#~| msgid "renaming `%s' to `%s' failed: %s\n"
+#~ msgid "LDAP init to '%s' done\n"
+#~ msgstr "`%s' > `%s' isim değişikliği başarısız: %s\n"
+
+#, fuzzy
+#~| msgid "renaming `%s' to `%s' failed: %s\n"
+#~ msgid "binding to '%s:%d' failed: %s\n"
+#~ msgstr "`%s' > `%s' isim değişikliği başarısız: %s\n"
+
+#, fuzzy
+#~| msgid "dearmoring failed: %s\n"
+#~ msgid "searching '%s' failed: %s\n"
+#~ msgstr "zırhın kaldırılması başarısız: %s\n"
+
 #, fuzzy
 #~| msgid "change a passphrase"
 #~ msgid "Suggest a random passphrase."
diff --git a/po/uk.gmo b/po/uk.gmo
index f2c1495..0c3a6b2 100644
--- a/po/uk.gmo
+++ b/po/uk.gmo
diff --git a/po/uk.po b/po/uk.po
index c8070ce..b221de3 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: 2021-04-20 12:38+0200\n"
+"POT-Creation-Date: 2021-08-24 18:50+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:328
+#: agent/call-pinentry.c:338
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "не вдало�� в�тановити блокуванн� запи�у пінкоду: %s\n"
@@ -30,45 +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:546
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_OK"
 msgstr "_Гаразд"
 
-#: agent/call-pinentry.c:547
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_Cancel"
 msgstr "_Ска�увати"
 
-#: agent/call-pinentry.c:548
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|_Yes"
 msgstr "_Так"
 
-#: agent/call-pinentry.c:549
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_No"
 msgstr "_�і"
 
-#: agent/call-pinentry.c:550
+#: agent/call-pinentry.c:560
 msgid "|pinentry-label|PIN:"
 msgstr "Пінкод:"
 
-#: agent/call-pinentry.c:551
+#: agent/call-pinentry.c:561
 msgid "|pinentry-label|_Save in password manager"
 msgstr "_Зберегти у за�обі керуванн� парол�ми"
 
-#: agent/call-pinentry.c:552
+#: agent/call-pinentry.c:562
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "Справді хочете зробити пароль видимим на екрані?"
 
-#: agent/call-pinentry.c:554
+#: agent/call-pinentry.c:564
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr "Зробити пароль видимим"
 
-#: agent/call-pinentry.c:555
+#: agent/call-pinentry.c:565
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "Приховати пароль"
 
+#: agent/call-pinentry.c:566
+msgid "Caps Lock is on"
+msgstr ""
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:944
+#: agent/call-pinentry.c:1022
 msgid "Suggest"
 msgstr ""
 
@@ -79,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:966
+#: agent/call-pinentry.c:1044
 #, fuzzy
 #| msgid "pinentry.qualitybar.tooltip"
 msgid "pinentry.genpin.tooltip"
@@ -87,9 +91,22 @@ msgstr ""
 "Які�ть введеного вище тек�ту.\n"
 "Дані щодо критеріїв �ко�ті можна отримати у вашого адміні�тратора."
 
+#: agent/call-pinentry.c:1072
+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
+#, fuzzy
+#| msgid "Passphrase too long"
+msgid "Passphrase Not Allowed"
+msgstr "Занадто довгий пароль"
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:998
+#: agent/call-pinentry.c:1198
 msgid "Quality:"
 msgstr "Які�ть:"
 
@@ -99,13 +116,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:1019
+#: agent/call-pinentry.c:1219
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 "Які�ть введеного вище тек�ту.\n"
 "Дані щодо критеріїв �ко�ті можна отримати у вашого адміні�тратора."
 
-#: agent/call-pinentry.c:1263
+#: agent/call-pinentry.c:1477
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
@@ -113,7 +130,7 @@ msgstr ""
 "Будь ла�ка, вкажіть ваш пінкод, щоб ключ можна було розблокувати дл� цього "
 "�еан�у"
 
-#: agent/call-pinentry.c:1266
+#: agent/call-pinentry.c:1480
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -121,76 +138,76 @@ msgstr ""
 "Будь ла�ка, вкажіть ваш пароль, щоб ключ можна було розблокувати дл� цього "
 "�еан�у"
 
-#: agent/call-pinentry.c:1303 agent/call-pinentry.c:1506
+#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
 msgid "PIN:"
 msgstr "Пінкод:"
 
-#: agent/call-pinentry.c:1303 agent/call-pinentry.c:1506
-#: agent/protect-tool.c:728
+#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/protect-tool.c:729
 msgid "Passphrase:"
 msgstr "Пароль:"
 
-#: agent/call-pinentry.c:1330 agent/call-pinentry.c:1580 agent/command.c:1799
-#: agent/command.c:1852 agent/command-ssh.c:3046 agent/genkey.c:398
+#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
+#: agent/command.c:1988 agent/command-ssh.c:3046 agent/genkey.c:442
 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:1351 agent/call-pinentry.c:1603
+#: agent/call-pinentry.c:1566 agent/call-pinentry.c:1830
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (�проба %d з %d)"
 
-#: agent/call-pinentry.c:1362 agent/call-pinentry.c:1614
+#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
 msgid "Repeat:"
 msgstr "Повторіть:"
 
-#: agent/call-pinentry.c:1372 agent/call-pinentry.c:1384
-#: agent/call-pinentry.c:1624 agent/call-pinentry.c:1636
+#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
+#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
 msgid "PIN too long"
 msgstr "Занадто довгий пінкод"
 
-#: agent/call-pinentry.c:1373 agent/call-pinentry.c:1625
+#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
 msgid "Passphrase too long"
 msgstr "Занадто довгий пароль"
 
-#: agent/call-pinentry.c:1381 agent/call-pinentry.c:1633
+#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
 msgid "Invalid characters in PIN"
 msgstr "�екоректні �имволи у пінкоді"
 
-#: agent/call-pinentry.c:1386 agent/call-pinentry.c:1638
+#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
 msgid "PIN too short"
 msgstr "Занадто короткий пінкод"
 
-#: agent/call-pinentry.c:1405 agent/call-pinentry.c:1656
+#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
 msgid "Bad PIN"
 msgstr "Помилковий пінкод"
 
-#: agent/call-pinentry.c:1405 agent/call-pinentry.c:1656
+#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
 msgid "Bad Passphrase"
 msgstr "Помилковий пароль"
 
-#: agent/command.c:697
+#: agent/command.c:823
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:698
+#: agent/command.c:824
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1106 g10/card-util.c:708 g10/card-util.c:729
+#: agent/command.c:1235 g10/card-util.c:713 g10/card-util.c:734
 #, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "помилка під ча� �проби отриманн� �ерійного номера картки: %s\n"
 
-#: agent/command.c:1634 agent/command.c:1791 agent/command-ssh.c:2974
-#: agent/genkey.c:333
+#: agent/command.c:1756 agent/command.c:1921 agent/command-ssh.c:2974
+#: agent/genkey.c:377
 msgid "Please re-enter this passphrase"
 msgstr "Будь ла�ка, повторіть введенн� парол�"
 
-#: agent/command.c:2567
+#: agent/command.c:2703
 #, fuzzy, c-format
 #| msgid ""
 #| "Please enter the passphrase to protect the imported object within the "
@@ -201,7 +218,7 @@ msgid ""
 msgstr ""
 "Будь ла�ка, введіть пароль дл� захи�ту імпортованого об’єкта у �и�темі GnuPG."
 
-#: agent/command.c:2697
+#: agent/command.c:2833
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -213,25 +230,25 @@ msgid "ssh keys greater than %d bits are not supported\n"
 msgstr ""
 "підтримки ключів ssh, що �кладають�� з понад %d бітів, не передбачено\n"
 
-#: agent/command-ssh.c:872 common/dotlock.c:852 g10/card-util.c:953
-#: g10/export.c:1329 g10/gpg.c:1431 g10/keygen.c:5347 g10/keyring.c:1319
-#: g10/keyring.c:1632 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
+#: agent/command-ssh.c:872 common/dotlock.c:852 g10/card-util.c:963
+#: g10/export.c:1329 g10/gpg.c:1431 g10/keygen.c:5377 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
 #: g10/sign.c:1106 g10/sign.c:1443 g10/tdbio.c:753 tools/gpg-card.c:479
 #, c-format
 msgid "can't create '%s': %s\n"
 msgstr "не вдало�� �творити «%s»: %s\n"
 
-#: agent/command-ssh.c:884 common/helpfile.c:57 g10/card-util.c:910
+#: agent/command-ssh.c:884 common/helpfile.c:57 g10/card-util.c:920
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
 #: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:721 g10/gpg.c:1432
-#: g10/import.c:371 g10/import.c:558 g10/import.c:793 g10/keygen.c:4322
-#: g10/keyring.c:1658 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
+#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4326
+#: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
 #: g10/plaintext.c:610 g10/sign.c:1086 g10/sign.c:1311 g10/sign.c:1424
 #: g10/sign.c:1596 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2380
-#: sm/gpgsm.c:2410 sm/gpgsm.c:2448 sm/keylist.c:1737 sm/qualified.c:65
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2236
+#: sm/gpgsm.c:2266 sm/gpgsm.c:2304 sm/keylist.c:1775 sm/qualified.c:65
 #: dirmngr/certcache.c:396 dirmngr/certcache.c:476 dirmngr/certcache.c:478
-#: dirmngr/crlcache.c:2588 dirmngr/dirmngr.c:1720 tools/gpg-card.c:408
+#: dirmngr/crlcache.c:2591 dirmngr/dirmngr.c:1759 tools/gpg-card.c:408
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "не вдало�� відкрити «%s»: %s\n"
@@ -339,27 +356,27 @@ msgstr "Помилка під чаÑ� повторного введеннÑ� піÐ
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Будь ла�ка, введіть пінкод%s%s%s дл� розблокуванн� картки"
 
-#: agent/genkey.c:109 sm/certreqgen-ui.c:433
+#: agent/genkey.c:142 sm/certreqgen-ui.c:433
 #, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "помилка �творенн� тимча�ового файла: %s\n"
 
-#: agent/genkey.c:116
+#: agent/genkey.c:150
 #, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "помилка під ча� �проби запи�у до тимча�ового файла: %s\n"
 
-#: agent/genkey.c:154
+#: agent/genkey.c:191
 msgid "Enter new passphrase"
 msgstr "Вкажіть новий пароль"
 
-#: agent/genkey.c:184
+#: agent/genkey.c:227
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr "Вами не вказано парол�!%0AВикори�танн� порожніх паролів заборонено."
 
-#: agent/genkey.c:186
+#: agent/genkey.c:229
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -368,11 +385,11 @@ msgstr ""
 "Вами не вказано парол�. Цього не варто робити!%0AБудь ла�ка, підтвердіть, що "
 "ваш ключ не �лід захищати взагалі."
 
-#: agent/genkey.c:198
+#: agent/genkey.c:241
 msgid "Yes, protection is not needed"
 msgstr "Так, у захи�ті немає потреби"
 
-#: agent/genkey.c:215
+#: agent/genkey.c:258
 #, c-format
 msgid "A passphrase should be at least %u character long."
 msgid_plural "A passphrase should be at least %u characters long."
@@ -380,7 +397,7 @@ msgstr[0] "Пароль має Ñ�кладатиÑ�Ñ� принаймні з %u Ñ�Ð
 msgstr[1] "Пароль має �кладати�� принаймні з %u �имволів."
 msgstr[2] "Пароль має �кладати�� принаймні з %u �имволів."
 
-#: agent/genkey.c:234
+#: agent/genkey.c:277
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -389,242 +406,241 @@ msgstr[0] "У паролі має бути принаймні %u цифра аб
 msgstr[1] "У паролі має бути принаймні %u цифри або%%0A�пеціальних �имволи."
 msgstr[2] "У паролі має бути принаймні %u цифр або%%0A�пеціальних �имволів."
 
-#: agent/genkey.c:260
+#: agent/genkey.c:304
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 "Паролем не повинно бути �лово зі �ловника або �лово%%0A, що відповідає "
 "певному зразку."
 
-#: agent/genkey.c:275
+#: agent/genkey.c:319
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "Попередженн�: вами вказано не�кладний пароль."
 
-#: agent/genkey.c:296
+#: agent/genkey.c:340
 msgid "Take this one anyway"
 msgstr "Скори�тати�� цим"
 
-#: agent/genkey.c:464
+#: agent/genkey.c:508
 #, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "Вкажіть пароль до%0Aз метою захи�ту вашого нового ключа"
 
-#: agent/genkey.c:590
+#: agent/genkey.c:637
 msgid "Please enter the new passphrase"
 msgstr "Вкажіть новий пароль"
 
-#: agent/gpg-agent.c:162 scd/scdaemon.c:115 dirmngr/dirmngr.c:182
+#: agent/gpg-agent.c:164 scd/scdaemon.c:115 dirmngr/dirmngr.c:183
 #, fuzzy
 #| msgid "Options useful for debugging"
 msgid "Options used for startup"
 msgstr "Параметри діагно�тики"
 
-#: agent/gpg-agent.c:164 scd/scdaemon.c:120 dirmngr/dirmngr.c:171
+#: agent/gpg-agent.c:166 scd/scdaemon.c:120 dirmngr/dirmngr.c:172
 msgid "run in daemon mode (background)"
 msgstr "запу�тити у режимі фонової �лужби (фоновий)"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:117 dirmngr/dirmngr.c:170
+#: agent/gpg-agent.c:167 scd/scdaemon.c:117 dirmngr/dirmngr.c:171
 msgid "run in server mode (foreground)"
 msgstr "запу�тити у режимі �ервера (о�новному)"
 
-#: agent/gpg-agent.c:167 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:169 dirmngr/dirmngr.c:174
 msgid "run in supervised mode"
 msgstr "запу�тити у режимі із нагл�дом"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:121 dirmngr/dirmngr.c:184
+#: agent/gpg-agent.c:171 scd/scdaemon.c:121 dirmngr/dirmngr.c:185
 msgid "do not detach from the console"
 msgstr "не від’єднувати від кон�олі"
 
-#: agent/gpg-agent.c:170 scd/scdaemon.c:122 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:172 scd/scdaemon.c:122 dirmngr/dirmngr.c:186
 msgid "sh-style command output"
 msgstr "виведенн� команд у форматі sh"
 
-#: agent/gpg-agent.c:171 scd/scdaemon.c:123 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:173 scd/scdaemon.c:123 dirmngr/dirmngr.c:187
 msgid "csh-style command output"
 msgstr "виведенн� команд у форматі csh"
 
-#: agent/gpg-agent.c:179 g10/gpg.c:589 scd/scdaemon.c:125 sm/gpgsm.c:422
-#: dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:181 g10/gpg.c:589 scd/scdaemon.c:125 sm/gpgsm.c:423
+#: dirmngr/dirmngr.c:189
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|прочитати параметри з вказаного файла"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:574 scd/scdaemon.c:129 sm/gpgsm.c:265
-#: dirmngr/dirmngr.c:192
+#: agent/gpg-agent.c:185 g10/gpg.c:574 scd/scdaemon.c:129 sm/gpgsm.c:265
+#: dirmngr/dirmngr.c:193
 msgid "Options controlling the diagnostic output"
 msgstr "Параметри керуванн� діагно�тичним виводом"
 
-#: agent/gpg-agent.c:185 g10/gpg.c:576 g10/gpgv.c:78 kbx/kbxutil.c:89
+#: agent/gpg-agent.c:187 g10/gpg.c:576 g10/gpgv.c:78 kbx/kbxutil.c:89
 #: scd/scdaemon.c:131 sm/gpgsm.c:267 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:194 dirmngr/dirmngr_ldap.c:102
-#: tools/gpg-connect-agent.c:85 tools/gpgconf.c:111
+#: dirmngr/dirmngr.c:195 tools/gpg-connect-agent.c:85 tools/gpgconf.c:111
 msgid "verbose"
 msgstr "докладний режим"
 
-#: agent/gpg-agent.c:186 g10/gpg.c:578 g10/gpgv.c:79 kbx/kbxutil.c:90
+#: agent/gpg-agent.c:188 g10/gpg.c:578 g10/gpgv.c:79 kbx/kbxutil.c:90
 #: scd/scdaemon.c:132 sm/gpgsm.c:269 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:195 dirmngr/dirmngr_ldap.c:103
+#: dirmngr/dirmngr.c:196
 msgid "be somewhat more quiet"
 msgstr "дещо зменшити кількі�ть повідомлень"
 
-#: agent/gpg-agent.c:194 g10/gpg.c:593 sm/gpgsm.c:283 dirmngr/dirmngr.c:205
+#: agent/gpg-agent.c:196 g10/gpg.c:593 sm/gpgsm.c:283 dirmngr/dirmngr.c:206
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FILE|запи�увати журнал режиму �ервера до файла"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 scd/scdaemon.c:146 sm/gpgsm.c:290
-#: dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:599 scd/scdaemon.c:146 sm/gpgsm.c:290
+#: dirmngr/dirmngr.c:210
 msgid "Options controlling the configuration"
 msgstr "Параметри керуванн� налаштуванн�ми"
 
-#: agent/gpg-agent.c:201
+#: agent/gpg-agent.c:203
 msgid "do not use the SCdaemon"
 msgstr "не викори�товувати SCdaemon"
 
-#: agent/gpg-agent.c:203
+#: agent/gpg-agent.c:205
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|викори�товувати вказану програму SCdaemon"
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 #, fuzzy
 #| msgid "|PGM|use PGM as the SCdaemon program"
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr "|PGM|викори�товувати вказану програму SCdaemon"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|приймати певні команди через NAME"
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 msgid "ignore requests to change the TTY"
 msgstr "ігнорувати запити щодо зміни TTY"
 
-#: agent/gpg-agent.c:215
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the X display"
 msgstr "ігнорувати запити щодо зміни графічного ди�пле�"
 
-#: agent/gpg-agent.c:216
+#: agent/gpg-agent.c:218
 msgid "enable ssh support"
 msgstr "увімкнути підтримку ssh"
 
-#: agent/gpg-agent.c:218
+#: agent/gpg-agent.c:220
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "|�ЛГО|викори�тати алгоритм �ЛГО дл� показу відбитків ssh"
 
-#: agent/gpg-agent.c:221
+#: agent/gpg-agent.c:223
 msgid "enable putty support"
 msgstr "увімкнути підтримку putty"
 
-#: agent/gpg-agent.c:233 g10/gpg.c:844 scd/scdaemon.c:176 sm/gpgsm.c:382
+#: agent/gpg-agent.c:235 g10/gpg.c:844 scd/scdaemon.c:176 sm/gpgsm.c:383
 msgid "Options controlling the security"
 msgstr "Параметри керуванн� захи�том"
 
-#: agent/gpg-agent.c:236
+#: agent/gpg-agent.c:238
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|вважати кешовані пінкоди за вказану кількі�ть �екунд"
 
-#: agent/gpg-agent.c:238
+#: agent/gpg-agent.c:240
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|завершувати �трок дії ключів SSH за N �екунд"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:242
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|в�тановити мак�имальний �трок дії кешу пінкодів у �екундах"
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:244
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr "|N|в�тановити мак�имальний �трок дії ключа SSH у �екундах"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:246
 msgid "do not use the PIN cache when signing"
 msgstr "не викори�товувати кеш пін-кодів дл� підпи�уванн�"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:248
 msgid "disallow the use of an external password cache"
 msgstr "заборонити викори�танн� зовнішнього кешу паролів"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:250
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "заборонити клієнтам позначати ключі �к надійні"
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:253
 msgid "allow presetting passphrase"
 msgstr "дозволити попереднє в�тановленн� парол�"
 
-#: agent/gpg-agent.c:256
+#: agent/gpg-agent.c:258
 msgid "Options enforcing a passphrase policy"
 msgstr "Параметри приму�ового викори�танн� правил паролів"
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:261
 msgid "do not allow bypassing the passphrase policy"
 msgstr "не дозвол�ти обхід правил паролів"
 
-#: agent/gpg-agent.c:261
+#: agent/gpg-agent.c:263
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr "|N|в�тановити вказану мінімальну довжину нових паролів"
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:265
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr "|N|вимагати у нових парол�х не менше вказаної кілько�ті нелітер"
 
-#: agent/gpg-agent.c:266
+#: agent/gpg-agent.c:268
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr "|FILE|перевір�ти нові паролі за зразком з вказаного файла"
 
-#: agent/gpg-agent.c:268
+#: agent/gpg-agent.c:272
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|завершувати �трок дії паролів за вказану кількі�ть днів"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:274
 msgid "do not allow the reuse of old passphrases"
 msgstr "не дозвол�ти повторне викори�танн� �тарих паролів"
 
-#: agent/gpg-agent.c:273
+#: agent/gpg-agent.c:277
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the PIN-Entry"
 msgstr "Параметри керуванн� захи�том"
 
-#: agent/gpg-agent.c:275
+#: agent/gpg-agent.c:279
 msgid "never use the PIN-entry"
 msgstr ""
 
-#: agent/gpg-agent.c:277
+#: agent/gpg-agent.c:281
 msgid "disallow caller to override the pinentry"
 msgstr "заборонити функції виклику перевизначати pinentry"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:283
 #, fuzzy
 #| msgid "do not grab keyboard and mouse"
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr "не захоплювати керуванн� клавіатурою і мишею"
 
-#: agent/gpg-agent.c:282
+#: agent/gpg-agent.c:286
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|викори�товувати вказану програму пінзапи�ів"
 
-#: agent/gpg-agent.c:286
+#: agent/gpg-agent.c:290
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|в�тановити вказаний ча� очікуванн� Pinentry у �екундах"
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:294
 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:551 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: agent/gpg-agent.c:557 agent/preset-passphrase.c:99 agent/protect-tool.c:154
 #: g10/gpg.c:1132 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:612 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:438
-#: dirmngr/dirmngr_ldap.c:175 tools/gpg-connect-agent.c:220 tools/gpgconf.c:151
+#: sm/gpgsm.c:613 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:446
+#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:151
 #: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Будь ла�ка, над�илайте повідомленн� про помилки на <@EMAIL@>.\n"
 
-#: agent/gpg-agent.c:560
+#: agent/gpg-agent.c:566
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Викори�танн�: @GPG_AGENT@ [параметри] (-h — довідка)"
 
-#: agent/gpg-agent.c:562
+#: agent/gpg-agent.c:568
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -632,133 +648,133 @@ msgstr ""
 "Синтак�и�: @GPG_AGENT@ [параметри] [команда [аргументи]]\n"
 "Керуванн� закритими ключами у @GNUPG@\n"
 
-#: agent/gpg-agent.c:607 g10/gpg.c:1337 scd/scdaemon.c:384 sm/gpgsm.c:760
-#: dirmngr/dirmngr.c:522
+#: agent/gpg-agent.c:613 g10/gpg.c:1337 scd/scdaemon.c:384 sm/gpgsm.c:761
+#: dirmngr/dirmngr.c:530
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "вказано некоректне значенн� рівн� діагно�тики «%s»\n"
 
-#: agent/gpg-agent.c:972 g10/gpg.c:3910 g10/gpg.c:3934 sm/gpgsm.c:1769
-#: sm/gpgsm.c:1775
+#: agent/gpg-agent.c:986 g10/gpg.c:3907 g10/gpg.c:3931 sm/gpgsm.c:1622
+#: sm/gpgsm.c:1628
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "вибраний алгоритм побудови контрольних �ум є некоректним\n"
 
-#: agent/gpg-agent.c:1196 agent/gpg-agent.c:2019 common/comopt.c:93
-#: g10/gpg.c:2591 scd/scdaemon.c:549 sm/gpgsm.c:1155 dirmngr/dirmngr.c:989
-#: dirmngr/dirmngr.c:1840
+#: agent/gpg-agent.c:1210 agent/gpg-agent.c:2035 common/comopt.c:93
+#: g10/gpg.c:2594 scd/scdaemon.c:549 sm/gpgsm.c:1028 dirmngr/dirmngr.c:1029
+#: dirmngr/dirmngr.c:1879
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "прочитати параметри з «%s»\n"
 
-#: agent/gpg-agent.c:1335 g10/gpg.c:3861 scd/scdaemon.c:687 sm/gpgsm.c:1709
-#: dirmngr/dirmngr.c:1108 tools/gpg-connect-agent.c:1270 tools/gpgconf.c:634
+#: agent/gpg-agent.c:1349 g10/gpg.c:3858 scd/scdaemon.c:687 sm/gpgsm.c:1562
+#: dirmngr/dirmngr.c:1145 tools/gpg-connect-agent.c:1270 tools/gpgconf.c:668
 #, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr "З�УВ�ЖЕ��Я: %s не призначено дл� звичайного викори�танн�!\n"
 
-#: agent/gpg-agent.c:2172 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1267
+#: agent/gpg-agent.c:2188 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1306
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "не вдало�� �творити �окет: %s\n"
 
-#: agent/gpg-agent.c:2189 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1280
+#: agent/gpg-agent.c:2205 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1319
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "назва �окета «%s» є надто довгою\n"
 
-#: agent/gpg-agent.c:2228
+#: agent/gpg-agent.c:2244
 #, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent вже запущено, потреби у запу�ку нової копії немає\n"
 
-#: agent/gpg-agent.c:2239 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1312
+#: agent/gpg-agent.c:2255 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1351
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "помилка під ча� �проби отриманн� поточного �тану �окета\n"
 
-#: agent/gpg-agent.c:2244 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1315
+#: agent/gpg-agent.c:2260 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1354
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "помилка під ча� �проби прив’�зуванн� �окета до «%s»: %s\n"
 
-#: agent/gpg-agent.c:2255 agent/gpg-agent.c:2295 agent/gpg-agent.c:2304
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1324
+#: agent/gpg-agent.c:2271 agent/gpg-agent.c:2311 agent/gpg-agent.c:2320
+#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1363
 #, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "не вдало�� в�тановити права до�тупу до «%s»: %s\n"
 
-#: agent/gpg-agent.c:2269 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1336
+#: agent/gpg-agent.c:2285 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1375
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "очікуванн� даних на �океті «%s»\n"
 
-#: agent/gpg-agent.c:2289 agent/gpg-agent.c:2342 common/homedir.c:517
+#: agent/gpg-agent.c:2305 agent/gpg-agent.c:2358 common/homedir.c:537
 #: 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:2292 agent/gpg-agent.c:2347 common/homedir.c:520
+#: agent/gpg-agent.c:2308 agent/gpg-agent.c:2363 common/homedir.c:540
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "�творено каталог «%s»\n"
 
-#: agent/gpg-agent.c:2353
+#: agent/gpg-agent.c:2369
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "помилка stat() щодо «%s»: %s\n"
 
-#: agent/gpg-agent.c:2357
+#: agent/gpg-agent.c:2373
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "не можна викори�товувати �к домашній каталог «%s»\n"
 
-#: agent/gpg-agent.c:2512 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2069
+#: agent/gpg-agent.c:2528 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2108
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr ""
 "помилка під ча� �проби читанн� поточного �тану на файловому де�крипторі %d: "
 "%s\n"
 
-#: agent/gpg-agent.c:2719
+#: agent/gpg-agent.c:2735
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "запущено обробки 0x%lx дл� файлового де�криптора %d\n"
 
-#: agent/gpg-agent.c:2724
+#: agent/gpg-agent.c:2740
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "обробник 0x%lx де�криптора файла %d завершив роботу\n"
 
-#: agent/gpg-agent.c:2799
+#: agent/gpg-agent.c:2815
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "запущено обробник ssh 0x%lx дл� де�криптора файла %d\n"
 
-#: agent/gpg-agent.c:2804
+#: agent/gpg-agent.c:2820
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "обробник ssh 0x%lx де�криптора файла %d завершив роботу\n"
 
-#: agent/gpg-agent.c:3026 scd/scdaemon.c:1374 dirmngr/dirmngr.c:2283
+#: agent/gpg-agent.c:3042 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2322
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "помилка pth_select: %s — очікуванн� у 1 �\n"
 
-#: agent/gpg-agent.c:3114 scd/scdaemon.c:1439
+#: agent/gpg-agent.c:3130 scd/scdaemon.c:1441
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s зупинено\n"
 
-#: agent/gpg-agent.c:3252 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3271 common/simple-pwquery.c:247 g10/call-agent.c:260
 #: sm/call-agent.c:131 tools/gpg-connect-agent.c:2319 tools/card-call-scd.c:311
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "у цьому �еан�і не запущено gpg-agent\n"
 
-#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:70
+#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:66
 msgid ""
 "@Options:\n"
 " "
@@ -780,7 +796,7 @@ msgstr ""
 "Керуванн� кешем паролів\n"
 
 #: agent/protect-tool.c:107 g10/gpg.c:448 kbx/kbxutil.c:72 sm/gpgsm.c:215
-#: dirmngr/dirmngr.c:168 tools/gpgconf.c:81
+#: dirmngr/dirmngr.c:169 tools/gpgconf.c:81
 msgid ""
 "@Commands:\n"
 " "
@@ -811,22 +827,22 @@ msgstr ""
 "Синтак�и�: gpg-protect-tool [параметри] [аргументи]\n"
 "Ін�трумент керуванн� закритими ключами\n"
 
-#: agent/protect-tool.c:707
+#: agent/protect-tool.c:708 sm/import.c:775
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Будь ла�ка, вкажіть пароль дл� зн�тт� захи�ту з об’єкта PKCS#12."
 
-#: agent/protect-tool.c:712
+#: agent/protect-tool.c:713 sm/export.c:727
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Будь ла�ка, вкажіть пароль дл� захи�ту нового об’єкта PKCS#12."
 
-#: agent/protect-tool.c:718
+#: agent/protect-tool.c:719
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 "Будь ла�ка, введіть пароль дл� захи�ту імпортованого об’єкта у �и�темі GnuPG."
 
-#: agent/protect-tool.c:723
+#: agent/protect-tool.c:724
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -834,17 +850,17 @@ msgstr ""
 "Будь ла�ка, вкажіть пароль або пінкод,\n"
 "потрібні дл� завершенн� цієї дії."
 
-#: agent/protect-tool.c:734
+#: agent/protect-tool.c:735
 #, c-format
 msgid "cancelled\n"
 msgstr "�ка�овано\n"
 
-#: agent/protect-tool.c:736
+#: agent/protect-tool.c:737
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "помилка під ча� �проби запиту парол�: %s\n"
 
-#: agent/trustlist.c:153 agent/trustlist.c:363 tools/gpgconf.c:424
+#: agent/trustlist.c:153 agent/trustlist.c:363 tools/gpgconf.c:458
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "помилка під ча� відкритт� «%s»: %s\n"
@@ -1007,7 +1023,7 @@ msgstr "невдала �проба перевірити �творений пі
 msgid "secret key parts are not available\n"
 msgstr "закриті ча�тини ключа недо�тупні\n"
 
-#: agent/cvt-openpgp.c:343 g10/card-util.c:1562
+#: agent/cvt-openpgp.c:343 g10/card-util.c:1575
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr ""
@@ -1037,7 +1053,7 @@ msgid "error creating a stream for a pipe: %s\n"
 msgstr "помилка під ча� �проби �творенн� потоку дл� каналу: %s\n"
 
 #: common/exechelp-posix.c:505 common/exechelp-posix.c:580
-#: common/exechelp-posix.c:866 dirmngr/dirmngr.c:1354
+#: common/exechelp-posix.c:866 dirmngr/dirmngr.c:1393
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "помилка під ча� �проби розгалужуванн� проце�у: %s\n"
@@ -1110,7 +1126,7 @@ msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "�проба перейменуванн� «%s» на «%s» зазнала невдачі: %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3082
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3099
 msgid "yes"
 msgstr "yes|так"
 
@@ -1165,7 +1181,7 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr "вихід за межі обла�ті під ча� �проби отриманн� %lu байтів"
 
-#: common/miscellaneous.c:115 g10/card-util.c:917 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:927 tools/no-libgcrypt.c:30
 #: tools/gpg-card.c:416
 #, c-format
 msgid "error allocating enough memory: %s\n"
@@ -1242,7 +1258,7 @@ msgstr "помилка під ча� �проби отриманн� даних
 msgid "server '%s' is older than us (%s < %s)"
 msgstr "�ервер «%s» має вер�ію, �тарішу за нашу (%s < %s)"
 
-#: common/asshelp.c:737 g10/call-dirmngr.c:408
+#: common/asshelp.c:737 g10/call-dirmngr.c:407
 #, c-format
 msgid "WARNING: %s\n"
 msgstr "УВ�Г�: %s\n"
@@ -1327,7 +1343,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:4212
+#: scd/app-openpgp.c:4214
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "непідтримуваний алгоритм: %s"
@@ -1402,11 +1418,11 @@ msgstr "Ланцюжок �ертифікації є чинним"
 msgid "Root certificate trustworthy"
 msgstr "Кореневий �ертифікат є гідним довіри"
 
-#: common/audit.c:1112 sm/certchain.c:1242
+#: common/audit.c:1112 sm/certchain.c:1243
 msgid "no CRL found for certificate"
 msgstr "не знайдено �пи�ку відкликанн� дл� �ертифіката"
 
-#: common/audit.c:1115 sm/certchain.c:1252
+#: common/audit.c:1115 sm/certchain.c:1253
 msgid "the available CRL is too old"
 msgstr "до�тупний �пи�ок відкликанн� є занадто �тарим"
 
@@ -1452,22 +1468,22 @@ msgstr "[немає]"
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "пропущено некоректний �имвол radix64 %02x\n"
 
-#: common/ttyio.c:433
+#: common/ttyio.c:447
 #, c-format
 msgid "Sorry, we are in batchmode - can't get input\n"
 msgstr ""
 
-#: common/ttyio.c:439
+#: common/ttyio.c:453
 #, c-format
 msgid "Sorry, no terminal at all requested - can't get input\n"
 msgstr ""
 
-#: common/ttyio.c:474 common/ttyio.c:484
+#: common/ttyio.c:488 common/ttyio.c:498
 #, c-format
 msgid "too many errors; giving up\n"
 msgstr ""
 
-#: common/ttyio.c:536
+#: common/ttyio.c:550
 #, c-format
 msgid "Control-D detected\n"
 msgstr ""
@@ -1521,8 +1537,7 @@ msgstr "блокуванн� «%s» не виконано: %s\n"
 msgid "waiting for lock %s...\n"
 msgstr "очікуванн� на блокуванн� %s…\n"
 
-#: common/init.c:191 sm/gpgsm.c:1036 dirmngr/dirmngr.c:895
-#: dirmngr/dirmngr.c:904
+#: common/init.c:191 sm/gpgsm.c:909 dirmngr/dirmngr.c:935 dirmngr/dirmngr.c:944
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s є занадто за�тарілою (потрібно %s, маємо %s)\n"
@@ -1674,7 +1689,7 @@ msgid "Enter passphrase: "
 msgstr "Введіть пароль: "
 
 #: g10/call-agent.c:318 g10/encrypt.c:282 g10/encrypt.c:818 g10/sign.c:473
-#: sm/call-agent.c:180 sm/encrypt.c:701 sm/sign.c:436
+#: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
 #, c-format
 msgid "%s is not compliant with %s mode\n"
 msgstr "%s не є �умі�ним із режимом %s\n"
@@ -1685,221 +1700,221 @@ msgstr "%s не є �умі�ним із режимом %s\n"
 msgid "error from TPM: %s\n"
 msgstr "помилка читанн� з %s: %s\n"
 
-#: g10/call-agent.c:2123 g10/passphrase.c:225 g10/passphrase.c:258
-#: tools/card-call-scd.c:1751
+#: g10/call-agent.c:2135 g10/passphrase.c:233 g10/passphrase.c:266
+#: tools/card-call-scd.c:1755
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "проблема з агентом: %s\n"
 
-#: g10/call-dirmngr.c:179 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2316
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2316
 #, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "у цьому �еан�і не запущено dirmngr\n"
 
-#: g10/call-dirmngr.c:213
+#: g10/call-dirmngr.c:212
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "keyserver option \"honor-keyserver-url\" may not be used in Tor mode\n"
 msgstr "не можна викори�товувати %s у режимі %s\n"
 
-#: g10/call-dirmngr.c:386
+#: g10/call-dirmngr.c:385
 msgid "WKD uses a cached result"
 msgstr ""
 
-#: g10/call-dirmngr.c:389
+#: g10/call-dirmngr.c:388
 msgid "Tor is not running"
 msgstr ""
 
-#: g10/call-dirmngr.c:391
+#: g10/call-dirmngr.c:390
 #, fuzzy
 #| msgid "\"%s\" is not a fingerprint\n"
 msgid "Tor is not properly configured"
 msgstr "«%s» не є відбитком\n"
 
-#: g10/call-dirmngr.c:393
+#: g10/call-dirmngr.c:392
 #, fuzzy
 #| msgid "\"%s\" is not a fingerprint\n"
 msgid "DNS is not properly configured"
 msgstr "«%s» не є відбитком\n"
 
-#: g10/call-dirmngr.c:395
+#: g10/call-dirmngr.c:394
 msgid "unacceptable HTTP redirect from server"
 msgstr ""
 
-#: g10/call-dirmngr.c:397
+#: g10/call-dirmngr.c:396
 msgid "unacceptable HTTP redirect from server was cleaned up"
 msgstr ""
 
-#: g10/call-dirmngr.c:399
+#: g10/call-dirmngr.c:398
 #, fuzzy
 #| msgid "generate a revocation certificate"
 msgid "server uses an invalid certificate"
 msgstr "�творити �ертифікат відкликанн�"
 
-#: g10/call-dirmngr.c:406 g10/gpg.c:4599
+#: g10/call-dirmngr.c:405 g10/gpg.c:4596
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "формат ASCII: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:369 g10/card-util.c:1924
-#: tools/gpg-card.c:3039
+#: g10/card-util.c:86 g10/card-util.c:374 g10/card-util.c:1937
+#: tools/gpg-card.c:3056
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "�е вдало�� отримати до�туп до картки OpenPGP: %s\n"
 
-#: g10/card-util.c:91 g10/card-util.c:1930
+#: g10/card-util.c:91 g10/card-util.c:1943
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "Ви�влено картку OpenPGP з номером %s\n"
 
-#: g10/card-util.c:97 g10/card-util.c:2309 g10/delkey.c:164 g10/keyedit.c:1428
-#: g10/keygen.c:4791 g10/revoke.c:214 g10/revoke.c:638
+#: g10/card-util.c:97 g10/card-util.c:2322 g10/delkey.c:164 g10/keyedit.c:1428
+#: g10/keygen.c:4795 g10/revoke.c:214 g10/revoke.c:639
 #, c-format
 msgid "can't do this in batch mode\n"
 msgstr "це не можна робити у пакетному режимі\n"
 
-#: g10/card-util.c:105 tools/gpg-card.c:2943
+#: g10/card-util.c:105 tools/gpg-card.c:2960
 #, c-format
 msgid "This command is only available for version 2 cards\n"
 msgstr "Цією командою можна кори�тувати�� лише дл� карток вер�ії 2\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3398 tools/gpg-card.c:2948
+#: g10/card-util.c:107 scd/app-openpgp.c:3399 tools/gpg-card.c:2965
 #, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "�емає коду �киданн� або код �киданн� вже недо�тупний\n"
 
-#: g10/card-util.c:140 g10/card-util.c:1448 g10/card-util.c:1710
-#: g10/card-util.c:1802 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1991 g10/keygen.c:2165 g10/keygen.c:2385 g10/keygen.c:2685
+#: g10/card-util.c:140 g10/card-util.c:1458 g10/card-util.c:1723
+#: g10/card-util.c:1815 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/keygen.c:1992 g10/keygen.c:2166 g10/keygen.c:2386 g10/keygen.c:2686
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
 #: tools/gpg-card.c:510
 msgid "Your selection? "
 msgstr "Ваш вибір? "
 
-#: g10/card-util.c:262 g10/card-util.c:313 tools/gpg-card.c:596
+#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:596
 #: tools/gpg-card.c:636
 msgid "[not set]"
 msgstr "[не в�тановлено]"
 
-#: g10/card-util.c:558 tools/gpg-card.c:903
+#: g10/card-util.c:563 tools/gpg-card.c:905
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:559 tools/gpg-card.c:904
+#: g10/card-util.c:564 tools/gpg-card.c:906
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:586 tools/gpg-card.c:931
+#: g10/card-util.c:591 tools/gpg-card.c:933
 msgid "not forced"
 msgstr "не увімкнено"
 
-#: g10/card-util.c:586 tools/gpg-card.c:931
+#: g10/card-util.c:591 tools/gpg-card.c:933
 msgid "forced"
 msgstr "увімкнено"
 
-#: g10/card-util.c:768 tools/gpg-card.c:1468
+#: g10/card-util.c:773 tools/gpg-card.c:1484
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 "Помилка: у поточній вер�ії можна викори�товувати лише звичайний ASCII.\n"
 
-#: g10/card-util.c:770 tools/gpg-card.c:1470
+#: g10/card-util.c:775 tools/gpg-card.c:1486
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Помилка: �имвол «<» не можна викори�товувати.\n"
 
-#: g10/card-util.c:772 tools/gpg-card.c:1472
+#: g10/card-util.c:777 tools/gpg-card.c:1488
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Помилка: не можна викори�товувати подвійні пробіли.\n"
 
-#: g10/card-util.c:789 tools/gpg-card.c:1505
+#: g10/card-util.c:795 tools/gpg-card.c:1521
 msgid "Cardholder's surname: "
 msgstr "Прізвище вла�ника картки: "
 
-#: g10/card-util.c:791 tools/gpg-card.c:1506
+#: g10/card-util.c:797 tools/gpg-card.c:1522
 msgid "Cardholder's given name: "
 msgstr "Ім’� вла�ника картки: "
 
-#: g10/card-util.c:809 tools/gpg-card.c:1523
+#: g10/card-util.c:816 tools/gpg-card.c:1539
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Помилка: �кладена назва є занадто довгою (мак�имум — %d �имволів).\n"
 
-#: g10/card-util.c:830 tools/gpg-card.c:1561
+#: g10/card-util.c:840 tools/gpg-card.c:1577
 msgid "URL to retrieve public key: "
 msgstr "�дре�а дл� отриманн� відкритого ключа: "
 
-#: g10/card-util.c:926 g10/decrypt-data.c:495 g10/import.c:406 g10/import.c:756
-#: g10/import.c:815 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1666
-#: tools/gpgconf.c:437 tools/gpgconf.c:483 tools/gpg-card.c:426
+#: g10/card-util.c:936 g10/decrypt-data.c:495 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:1705
+#: tools/gpgconf.c:471 tools/gpgconf.c:517 tools/gpg-card.c:426
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "помилка під ча� �проби читанн� «%s»: %s\n"
 
-#: g10/card-util.c:959 g10/decrypt-data.c:498 g10/export.c:2496
+#: g10/card-util.c:969 g10/decrypt-data.c:498 g10/export.c:2496
 #: dirmngr/crlcache.c:925 tools/gpg-card.c:486 tools/gpg-card.c:493
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr "помилка під ча� �проби читанн� «%s»: %s\n"
 
-#: g10/card-util.c:986 tools/gpg-card.c:1650
+#: g10/card-util.c:996 tools/gpg-card.c:1666
 msgid "Login data (account name): "
 msgstr "Дані кори�тувача (назва запи�у): "
 
-#: g10/card-util.c:1024 tools/gpg-card.c:1945
+#: g10/card-util.c:1034 tools/gpg-card.c:1962
 msgid "Private DO data: "
 msgstr "О�оби�ті дані DO: "
 
-#: g10/card-util.c:1109 tools/gpg-card.c:1699
+#: g10/card-util.c:1119 tools/gpg-card.c:1715
 msgid "Language preferences: "
 msgstr "О�новна мова: "
 
-#: g10/card-util.c:1117 tools/gpg-card.c:1710
+#: g10/card-util.c:1127 tools/gpg-card.c:1726
 #, c-format
 msgid "Error: invalid length of preference string.\n"
 msgstr "Помилка: некоректна довжина р�дка о�новної мови.\n"
 
-#: g10/card-util.c:1126 tools/gpg-card.c:1719
+#: g10/card-util.c:1136 tools/gpg-card.c:1735
 #, c-format
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Помилка: некоректні �имволи у р�дку о�новної мови.\n"
 
-#: g10/card-util.c:1148 tools/gpg-card.c:1753
+#: g10/card-util.c:1158 tools/gpg-card.c:1769
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1162 tools/gpg-card.c:1770
+#: g10/card-util.c:1172 tools/gpg-card.c:1786
 msgid "Error: invalid response.\n"
 msgstr "Помилка: некоректна відповідь.\n"
 
-#: g10/card-util.c:1185 tools/gpg-card.c:1835
+#: g10/card-util.c:1195 tools/gpg-card.c:1852
 msgid "CA fingerprint: "
 msgstr "Відбиток CA: "
 
-#: g10/card-util.c:1209 tools/gpg-card.c:1861
+#: g10/card-util.c:1219 tools/gpg-card.c:1878
 #, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Помилка: некоректне форматуванн� відбитка.\n"
 
-#: g10/card-util.c:1259
+#: g10/card-util.c:1269
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "ді� над ключем неможлива: %s\n"
 
-#: g10/card-util.c:1260
+#: g10/card-util.c:1270
 msgid "not an OpenPGP card"
 msgstr "не є карткою OpenPGP"
 
-#: g10/card-util.c:1273 g10/keygen.c:4811 g10/keygen.c:5972
+#: g10/card-util.c:1283 g10/keygen.c:4815 g10/keygen.c:6003
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "помилка під ча� отриманн� даних поточного ключа: %s\n"
 
-#: g10/card-util.c:1358
+#: g10/card-util.c:1368
 msgid "Replace existing key? (y/N) "
 msgstr "Замінити вже �творений ключ? (y/N або т/�) "
 
-#: g10/card-util.c:1375 tools/gpg-card.c:3328
+#: g10/card-util.c:1385 tools/gpg-card.c:3345
 #, fuzzy
 #| msgid ""
 #| "Note: There is no guarantee that the card supports the requested size.\n"
@@ -1916,100 +1931,100 @@ msgstr ""
 "      ознайомте�� з документацією до вашої картки, щоб\n"
 "      визначити дозволені розміри.\n"
 
-#: g10/card-util.c:1396 g10/keygen.c:2570 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1406 g10/keygen.c:2571 sm/certreqgen-ui.c:180
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Якою має бути довжина ключа? (%u) "
 
-#: g10/card-util.c:1406 g10/keygen.c:2493 g10/keygen.c:2525
+#: g10/card-util.c:1416 g10/keygen.c:2494 g10/keygen.c:2526
 #: sm/certreqgen-ui.c:195
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "округлено до %u бітів\n"
 
-#: g10/card-util.c:1414 g10/keygen.c:2578 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1424 g10/keygen.c:2579 sm/certreqgen-ui.c:185
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "Розміри ключів %s мають перебувати у діапазоні %u—%u\n"
 
-#: g10/card-util.c:1433
+#: g10/card-util.c:1443
 msgid "Changing card key attribute for: "
 msgstr "Зміна атрибута ключа картки дл�: "
 
-#: g10/card-util.c:1435
+#: g10/card-util.c:1445
 msgid "Signature key\n"
 msgstr "Ключ підпи�уванн�\n"
 
-#: g10/card-util.c:1437
+#: g10/card-util.c:1447
 msgid "Encryption key\n"
 msgstr "Ключ шифруванн�\n"
 
-#: g10/card-util.c:1439
+#: g10/card-util.c:1449
 msgid "Authentication key\n"
 msgstr "Ключ розпізнаванн�\n"
 
-#: g10/card-util.c:1441 g10/keygen.c:2112 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1451 g10/keygen.c:2113 sm/certreqgen-ui.c:158
 msgid "Please select what kind of key you want:\n"
 msgstr "Вкажіть потрібний вам тип ключа:\n"
 
-#: g10/card-util.c:1442 sm/certreqgen-ui.c:159
+#: g10/card-util.c:1452 sm/certreqgen-ui.c:159
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1443
+#: g10/card-util.c:1453
 #, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) ECC\n"
 
-#: g10/card-util.c:1455 g10/card-util.c:1722 g10/card-util.c:1822
-#: g10/keyedit.c:900 g10/keygen.c:2017 g10/keygen.c:2045 g10/keygen.c:2172
-#: g10/keygen.c:2425 g10/keygen.c:2713 g10/revoke.c:836
+#: g10/card-util.c:1468 g10/card-util.c:1735 g10/card-util.c:1835
+#: g10/keyedit.c:900 g10/keygen.c:2018 g10/keygen.c:2046 g10/keygen.c:2173
+#: g10/keygen.c:2426 g10/keygen.c:2714 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "�екоректний вибір.\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1541
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr ""
 "Зараз налаштуванн� картки буде змінено дл� �творенн� %u-бітового ключа\n"
 
-#: g10/card-util.c:1533
+#: g10/card-util.c:1546
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr "Зараз налаштуванн� картки буде змінено дл� �творенн� ключа типу %s\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1582
 #, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "помилка під ча� �проби змінити атрибут ключа %d: %s\n"
 
-#: g10/card-util.c:1585 g10/card-util.c:2106 g10/card-util.c:2162
+#: g10/card-util.c:1598 g10/card-util.c:2119 g10/card-util.c:2175
 #, c-format
 msgid "error getting card info: %s\n"
 msgstr "помилка під ча� �проби отриманн� даних щодо картки: %s\n"
 
-#: g10/card-util.c:1591 g10/card-util.c:1936 g10/card-util.c:2112
-#: g10/card-util.c:2171 tools/gpg-card.c:3057 tools/gpg-card.c:3296
-#: tools/gpg-card.c:3354
+#: g10/card-util.c:1604 g10/card-util.c:1949 g10/card-util.c:2125
+#: g10/card-util.c:2184 tools/gpg-card.c:3074 tools/gpg-card.c:3313
+#: tools/gpg-card.c:3371
 #, c-format
 msgid "This command is not supported by this card\n"
 msgstr "Цією карткою не передбачено підтримки вказаної команди\n"
 
-#: g10/card-util.c:1637 tools/gpg-card.c:2426
+#: g10/card-util.c:1650 tools/gpg-card.c:2443
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Створити резервну копію ключа шифруванн� поза карткою? (Y/n або Т/н) "
 
-#: g10/card-util.c:1651
+#: g10/card-util.c:1664
 #, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "З�УВ�ЖЕ��Я: ключі вже збережено на картці!\n"
 
-#: g10/card-util.c:1654 tools/gpg-card.c:2398
+#: g10/card-util.c:1667 tools/gpg-card.c:2415
 msgid "Replace existing keys? (y/N) "
 msgstr "Замірити вже �творені ключі? (y/N або т/�) "
 
-#: g10/card-util.c:1666 tools/gpg-card.c:2457
+#: g10/card-util.c:1679 tools/gpg-card.c:2474
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2020,162 +2035,162 @@ msgstr ""
 "   PIN = «%s»     �дміні�тративний PIN = «%s»\n"
 "Вам �лід змінити параметри за допомогою команди --change-pin\n"
 
-#: g10/card-util.c:1701
+#: g10/card-util.c:1714
 msgid "Please select the type of key to generate:\n"
 msgstr "Виберіть тип ключа, �кий �лід �творити:\n"
 
-#: g10/card-util.c:1703 g10/card-util.c:1793
+#: g10/card-util.c:1716 g10/card-util.c:1806
 msgid "   (1) Signature key\n"
 msgstr "   (1) Ключ підпи�уванн�\n"
 
-#: g10/card-util.c:1704 g10/card-util.c:1795
+#: g10/card-util.c:1717 g10/card-util.c:1808
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Ключ шифруванн�\n"
 
-#: g10/card-util.c:1705 g10/card-util.c:1797
+#: g10/card-util.c:1718 g10/card-util.c:1810
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Ключ розпізнаванн�\n"
 
-#: g10/card-util.c:1790
+#: g10/card-util.c:1803
 msgid "Please select where to store the key:\n"
 msgstr "Виберіть �ховище дл� зберіганн� ключа:\n"
 
-#: g10/card-util.c:1836
+#: g10/card-util.c:1849
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "Помилка KEYTOCARD: %s\n"
 
-#: g10/card-util.c:1941 tools/gpg-card.c:3065
+#: g10/card-util.c:1954 tools/gpg-card.c:3082
 #, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr ""
 "Зауваженн�: у результаті виконанн� цієї команди у�і ключі на картці буде "
 "знищено!\n"
 
-#: g10/card-util.c:1944 tools/gpg-card.c:3068 tools/gpg-card.c:3409
+#: g10/card-util.c:1957 tools/gpg-card.c:3085 tools/gpg-card.c:3426
 msgid "Continue? (y/N) "
 msgstr "Продовжити? (y (так)/N (ні)) "
 
-#: g10/card-util.c:1949 tools/gpg-card.c:3079
+#: g10/card-util.c:1962 tools/gpg-card.c:3096
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 "Справді хочете �кинути у�е до типових налаштувань? (введіть «yes» («так»)) "
 
-#: g10/card-util.c:2142
+#: g10/card-util.c:2155
 #, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "помилка налаштуванн� KDF: %s\n"
 
-#: g10/card-util.c:2188
+#: g10/card-util.c:2201
 #, fuzzy, c-format
 #| msgid "error for setup KDF: %s\n"
 msgid "error for setup UIF: %s\n"
 msgstr "помилка налаштуванн� KDF: %s\n"
 
-#: g10/card-util.c:2212 g10/keyedit.c:1263 tools/gpg-card.c:3649
+#: g10/card-util.c:2225 g10/keyedit.c:1263 tools/gpg-card.c:3666
 msgid "quit this menu"
 msgstr "вийти з цього меню"
 
-#: g10/card-util.c:2214
+#: g10/card-util.c:2227
 msgid "show admin commands"
 msgstr "показати керівні команди"
 
-#: g10/card-util.c:2215 g10/keyedit.c:1266 tools/gpg-card.c:3652
+#: g10/card-util.c:2228 g10/keyedit.c:1266 tools/gpg-card.c:3669
 msgid "show this help"
 msgstr "показати цю довідкову інформацію"
 
-#: g10/card-util.c:2217 tools/gpg-card.c:3654
+#: g10/card-util.c:2230 tools/gpg-card.c:3671
 msgid "list all available data"
 msgstr "показати в�і до�тупні дані"
 
-#: g10/card-util.c:2220 tools/gpg-card.c:3656
+#: g10/card-util.c:2233 tools/gpg-card.c:3673
 msgid "change card holder's name"
 msgstr "змінити ім’� вла�ника картки"
 
-#: g10/card-util.c:2221 tools/gpg-card.c:3657
+#: g10/card-util.c:2234 tools/gpg-card.c:3674
 msgid "change URL to retrieve key"
 msgstr "змінити адре�у дл� отриманн� ключа"
 
-#: g10/card-util.c:2222 tools/gpg-card.c:3658
+#: g10/card-util.c:2235 tools/gpg-card.c:3675
 msgid "fetch the key specified in the card URL"
 msgstr "отримати ключ, вказаний у полі адре�и картки"
 
-#: g10/card-util.c:2223 tools/gpg-card.c:3659
+#: g10/card-util.c:2236 tools/gpg-card.c:3676
 msgid "change the login name"
 msgstr "змінити ім’� кори�тувача"
 
-#: g10/card-util.c:2224 tools/gpg-card.c:3660
+#: g10/card-util.c:2237 tools/gpg-card.c:3677
 msgid "change the language preferences"
 msgstr "змінити о�новну мову"
 
-#: g10/card-util.c:2225 tools/gpg-card.c:3661
+#: g10/card-util.c:2238 tools/gpg-card.c:3678
 #, fuzzy
 #| msgid "change card holder's sex"
 msgid "change card holder's salutation"
 msgstr "змінити поле �таті вла�ника картки"
 
-#: g10/card-util.c:2227 tools/gpg-card.c:3663
+#: g10/card-util.c:2240 tools/gpg-card.c:3680
 msgid "change a CA fingerprint"
 msgstr "змінити відбиток CA"
 
-#: g10/card-util.c:2228 tools/gpg-card.c:3664
+#: g10/card-util.c:2241 tools/gpg-card.c:3681
 msgid "toggle the signature force PIN flag"
 msgstr "увімкнути або вимкнути позначку приму�ового пінкоду підпи�у"
 
-#: g10/card-util.c:2229 tools/gpg-card.c:3665
+#: g10/card-util.c:2242 tools/gpg-card.c:3682
 msgid "generate new keys"
 msgstr "�творити ключі"
 
-#: g10/card-util.c:2230 tools/gpg-card.c:3666
+#: g10/card-util.c:2243 tools/gpg-card.c:3683
 msgid "menu to change or unblock the PIN"
 msgstr "меню зміни або розблокуванн� пінкоду"
 
-#: g10/card-util.c:2231 tools/gpg-card.c:3667
+#: g10/card-util.c:2244 tools/gpg-card.c:3684
 msgid "verify the PIN and list all data"
 msgstr "перевірити пінкод і показати �пи�ок в�іх даних"
 
-#: g10/card-util.c:2232 tools/gpg-card.c:3668
+#: g10/card-util.c:2245 tools/gpg-card.c:3685
 msgid "unblock the PIN using a Reset Code"
 msgstr "розблокувати під коду за допомогою коду �киданн�"
 
-#: g10/card-util.c:2233 tools/gpg-card.c:3672
+#: g10/card-util.c:2246 tools/gpg-card.c:3689
 msgid "destroy all keys and data"
 msgstr "знищити у�і ключі і дані"
 
-#: g10/card-util.c:2235
+#: g10/card-util.c:2248
 #, fuzzy
 #| msgid "setup KDF for PIN authentication"
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr "налаштуванн� KDF дл� розпізнаванн� за PIN"
 
-#: g10/card-util.c:2236
+#: g10/card-util.c:2249
 msgid "change the key attribute"
 msgstr "змінити атрибут ключа"
 
-#: g10/card-util.c:2237 tools/gpg-card.c:3674
+#: g10/card-util.c:2250 tools/gpg-card.c:3691
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the User Interaction Flag"
 msgstr "змінити рівень довіри до вла�ника"
 
-#: g10/card-util.c:2361 tools/gpg-card.c:3924
+#: g10/card-util.c:2374 tools/gpg-card.c:3941
 msgid "gpg/card> "
 msgstr "gpg/картка> "
 
-#: g10/card-util.c:2402
+#: g10/card-util.c:2415
 msgid "Admin-only command\n"
 msgstr "Команда адміні�тратора\n"
 
-#: g10/card-util.c:2433
+#: g10/card-util.c:2446
 msgid "Admin commands are allowed\n"
 msgstr "Команди адміні�труванн� дозволено\n"
 
-#: g10/card-util.c:2435
+#: g10/card-util.c:2448
 msgid "Admin commands are not allowed\n"
 msgstr "Команди адміні�труванн� заборонено\n"
 
-#: g10/card-util.c:2546 g10/keyedit.c:2275 tools/gpg-card.c:3814
-#: tools/gpg-card.c:4072
+#: g10/card-util.c:2559 g10/keyedit.c:2275 tools/gpg-card.c:3831
+#: tools/gpg-card.c:4089
 #, c-format
 msgid "Invalid command  (try \"help\")\n"
 msgstr "�екоректна команда  (�кори�тайте�� командою «help»)\n"
@@ -2185,22 +2200,22 @@ msgstr "Ð�екоректна команда  (Ñ�кориÑ�тайтеÑ�Ñ� комÐ
 msgid "--output doesn't work for this command\n"
 msgstr "--output не працює з цією командою\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5293 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5292 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:1934 g10/export.c:2342 g10/export.c:2463
-#: g10/getkey.c:1907 g10/gpg.c:5238 g10/keyedit.c:1450 g10/keyedit.c:2382
-#: g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:703 g10/keyserver.c:1240
-#: g10/revoke.c:230 g10/tofu.c:2168
+#: g10/getkey.c:2032 g10/gpg.c:5237 g10/keyedit.c:1450 g10/keyedit.c:2382
+#: g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:703 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:2002 g10/getkey.c:1915 g10/getkey.c:4330
-#: g10/gpg.c:5247 g10/keyedit.c:2354 g10/keyserver.c:1258 g10/revoke.c:236
-#: g10/revoke.c:665 g10/tofu.c:2176
+#: g10/delkey.c:90 g10/export.c:2002 g10/getkey.c:2040 g10/getkey.c:4455
+#: g10/gpg.c:5246 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"
 msgstr "помилка під ча� �проби читанн� блокуванн� ключа: %s\n"
@@ -2322,14 +2337,14 @@ msgstr "алгоритм шифруваннÑ� «%s» не можна викорÐ
 msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:555 g10/encrypt.c:808 g10/decrypt-data.c:261 g10/gpg.c:4083
-#: g10/gpg.c:4130 sm/decrypt.c:742 sm/encrypt.c:691 sm/gpgsm.c:1793
+#: g10/encrypt.c:555 g10/encrypt.c:808 g10/decrypt-data.c:261 g10/gpg.c:4080
+#: g10/gpg.c:4127 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1646
 #, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "алгоритм шифруванн� «%s» не можна викори�товувати у режимі %s\n"
 
-#: g10/encrypt.c:564 g10/gpg.c:4095 g10/gpg.c:4142 g10/sig-check.c:155
-#: g10/sign.c:452 sm/gpgsm.c:1803 sm/gpgsm.c:1813 sm/sign.c:596 sm/verify.c:510
+#: g10/encrypt.c:564 g10/gpg.c:4092 g10/gpg.c:4139 g10/sig-check.c:155
+#: g10/sign.c:452 sm/gpgsm.c:1656 sm/gpgsm.c:1666 sm/sign.c:596 sm/verify.c:510
 #, c-format
 msgid "digest algorithm '%s' may not be used in %s mode\n"
 msgstr ""
@@ -2349,7 +2364,7 @@ msgstr ""
 "УВ�Г�: приму�ове викори�танн� �иметричного шифру %s (%d) не відповідає "
 "параметрам отримувача\n"
 
-#: g10/encrypt.c:838 sm/encrypt.c:766
+#: g10/encrypt.c:838 sm/encrypt.c:767
 #, c-format
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "УВ�Г�: ключ %s не можна викори�товувати дл� шифруванн� у режимі %s\n"
@@ -2381,7 +2396,7 @@ msgstr "%s/%s зашифровано дл� «%s»\n"
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "параметр «%s» не можна викори�товувати у режимі %s\n"
 
-#: g10/decrypt-data.c:239 g10/mainproc.c:380 sm/decrypt.c:494
+#: g10/decrypt-data.c:239 g10/mainproc.c:380 sm/decrypt.c:892
 #, fuzzy, c-format
 #| msgid "%s encrypted data\n"
 msgid "%s.%s encrypted data\n"
@@ -2392,7 +2407,7 @@ msgstr "Дані, зашифровані за алгоритмом %s\n"
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "зашифровано за допомогою невідомого алгоритму %d\n"
 
-#: g10/decrypt-data.c:361 g10/decrypt-data.c:414 sm/decrypt.c:508
+#: g10/decrypt-data.c:361 g10/decrypt-data.c:414 sm/decrypt.c:906
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2435,7 +2450,7 @@ msgstr "викориÑ�товувати формат резервних копіÐ
 msgid " - skipped"
 msgstr " - пропущено"
 
-#: g10/export.c:1333 g10/import.c:2124 g10/openfile.c:202 g10/openfile.c:296
+#: g10/export.c:1333 g10/import.c:2132 g10/openfile.c:202 g10/openfile.c:296
 #: g10/sign.c:1110 g10/sign.c:1447
 #, c-format
 msgid "writing to '%s'\n"
@@ -2471,63 +2486,63 @@ msgstr "помилка �творенн� «%s»: %s.\n"
 msgid "[User ID not found]"
 msgstr "[Ідентифікатор не знайдено]"
 
-#: g10/getkey.c:1199
+#: g10/getkey.c:1324
 #, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "автоматично отримано «%s» за допомогою %s\n"
 
-#: g10/getkey.c:1205
+#: g10/getkey.c:1330
 #, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "помилка під ча� �проби отриманн� «%s» за допомогою %s: %s\n"
 
-#: g10/getkey.c:1207
+#: g10/getkey.c:1332
 msgid "No fingerprint"
 msgstr "Без відбитка"
 
-#: g10/getkey.c:1449
+#: g10/getkey.c:1574
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1884 g10/revoke.c:657 g10/revoke.c:718
+#: g10/getkey.c:2009 g10/revoke.c:658 g10/revoke.c:719
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "закритий ключ «%s» не знайдено: %s\n"
 
-#: g10/getkey.c:1887 g10/pkclist.c:1012
+#: g10/getkey.c:2012 g10/pkclist.c:1012
 #, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "(перевірте аргумент параметра «%s»)\n"
 
-#: g10/getkey.c:1965
+#: g10/getkey.c:2090
 #, c-format
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "Попередженн�: «%s» не викори�товуєть�� �к типовий ключ: %s\n"
 
-#: g10/getkey.c:1973
+#: g10/getkey.c:2098
 #, c-format
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "викори�товуємо «%s» �к типовий закритий ключ дл� підпи�уванн�\n"
 
-#: g10/getkey.c:1980
+#: g10/getkey.c:2105
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr "у�і значенн�, передані «%s», проігноровано\n"
 
-#: g10/getkey.c:2837
+#: g10/getkey.c:2962
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "�екоректний ключ %s визнано чинним через параметр --allow-non-selfsigned-"
 "uid\n"
 
-#: g10/getkey.c:3703
+#: g10/getkey.c:3828
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "викори�товуємо підключ %s замі�ть о�новного ключа %s\n"
 
-#: g10/getkey.c:4259 g10/gpg.c:2167
+#: g10/getkey.c:4384 g10/gpg.c:2168
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "коректні значенн� параметра «%s»:\n"
@@ -2714,7 +2729,7 @@ msgstr "|SPEC|вÑ�тановити замінники адреÑ�и електрÐ
 msgid "use strict OpenPGP behavior"
 msgstr "�трого викори�товувати �тандарт OpenPGP"
 
-#: g10/gpg.c:651 kbx/kbxutil.c:91 sm/gpgsm.c:424 tools/gpgconf.c:113
+#: g10/gpg.c:651 kbx/kbxutil.c:91 sm/gpgsm.c:425 tools/gpgconf.c:113
 msgid "do not make any changes"
 msgstr "не вно�ити змін"
 
@@ -2750,7 +2765,7 @@ msgstr "викориÑ�товувати канонічний текÑ�товий Ñ
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|в�тановити рівень �ти�ненн� (0 — вимкнути)"
 
-#: g10/gpg.c:762 sm/gpgsm.c:357
+#: g10/gpg.c:762 sm/gpgsm.c:358
 #, fuzzy
 #| msgid "Options controlling the interactivity and enforcement"
 msgid "Options controlling key import and export"
@@ -2773,11 +2788,11 @@ msgstr "імпортувати ключі з �ервера ключів"
 msgid "include the public key in signatures"
 msgstr "показати �пи�ок і перевірити підпи�и ключів"
 
-#: g10/gpg.c:776 sm/gpgsm.c:360
+#: g10/gpg.c:776 sm/gpgsm.c:361
 msgid "disable all access to the dirmngr"
 msgstr "заборонити до�туп до dirmngr"
 
-#: g10/gpg.c:788 sm/gpgsm.c:367
+#: g10/gpg.c:788 sm/gpgsm.c:368
 #, fuzzy
 #| msgid "Options controlling the configuration"
 msgid "Options controlling key listings"
@@ -2799,15 +2814,15 @@ msgstr ""
 "|USER-ID|викори�товувати дл� �творенн� підпи�ів або розшифруванн� вказаний "
 "ідентифікатор"
 
-#: g10/gpg.c:876 sm/gpgsm.c:408
+#: g10/gpg.c:876 sm/gpgsm.c:409
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:895 sm/gpgsm.c:420 dirmngr/dirmngr.c:286
+#: g10/gpg.c:895 sm/gpgsm.c:421 dirmngr/dirmngr.c:289
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:966 sm/gpgsm.c:453
+#: g10/gpg.c:966 sm/gpgsm.c:454
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2851,7 +2866,7 @@ msgstr ""
 "Підпи�уванн�, перевірка підпи�ів, шифруванн� або розшифруванн�\n"
 "Типова ді� залежатиме від вхідних даних\n"
 
-#: g10/gpg.c:1168 sm/gpgsm.c:636
+#: g10/gpg.c:1168 sm/gpgsm.c:637
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2875,12 +2890,12 @@ msgstr "Хеш: "
 msgid "Compression: "
 msgstr "Сти�ненн�: "
 
-#: g10/gpg.c:1274 sm/gpgsm.c:710
+#: g10/gpg.c:1274 sm/gpgsm.c:711
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "кори�туванн�: %s [параметри] %s\n"
 
-#: g10/gpg.c:1467 sm/gpgsm.c:803
+#: g10/gpg.c:1467 sm/gpgsm.c:804
 #, c-format
 msgid "conflicting commands\n"
 msgstr "не�умі�ні команди\n"
@@ -2890,46 +2905,46 @@ msgstr "не�умі�ні команди\n"
 msgid "no = sign found in group definition '%s'\n"
 msgstr "у визначенні групи «%s» немає знаку «=»\n"
 
-#: g10/gpg.c:1683
+#: g10/gpg.c:1684
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "УВ�Г�: визначенн� вла�ника домашнього каталогу «%s» не є безпечним\n"
 
-#: g10/gpg.c:1686
+#: g10/gpg.c:1687
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "УВ�Г�: визначенн� вла�ника у файлі налаштувань «%s» не є безпечним\n"
 
-#: g10/gpg.c:1689
+#: g10/gpg.c:1690
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "УВ�Г�: визначенн� вла�ника додатка «%s» не є безпечним\n"
 
-#: g10/gpg.c:1695
+#: g10/gpg.c:1696
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr ""
 "УВ�Г�: визначенн� прав до�тупу до домашнього каталогу «%s» не є безпечним\n"
 
-#: g10/gpg.c:1698
+#: g10/gpg.c:1699
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr ""
 "УВ�Г�: визначенн� прав до�тупу до файла налаштувань «%s» не є безпечним\n"
 
-#: g10/gpg.c:1701
+#: g10/gpg.c:1702
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "УВ�Г�: визначенн� прав до�тупу до додатка «%s» не є безпечним\n"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1708
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr ""
 "УВ�Г�: визначенн� вла�ника підлеглого каталогу домашнього каталогу «%s» не є "
 "безпечним\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1711
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@ -2937,21 +2952,21 @@ msgstr ""
 "УВ�Г�: визначенн� вла�ника у підлеглому каталозі, визначеному файлом "
 "налаштувань «%s», не є безпечним\n"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1714
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr ""
 "УВ�Г�: визначенн� вла�ника підлеглого каталогу у додатку «%s» не є "
 "безпечним\n"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1720
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr ""
 "УВ�Г�: визначенн� прав до�тупу до підлеглого каталогу домашнього каталогу "
 "«%s» не є безпечним\n"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1723
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@ -2959,485 +2974,485 @@ msgstr ""
 "УВ�Г�: визначенн� прав до�тупу до підлеглого каталогу, визначеного файлом "
 "налаштувань «%s», не є безпечним\n"
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1726
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr ""
 "УВ�Г�: визначенн� прав до�тупу до підлеглого каталогу у додатку «%s» не є "
 "безпечним\n"
 
-#: g10/gpg.c:1941
+#: g10/gpg.c:1942
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "невідомий пункт налаштувань «%s»\n"
 
-#: g10/gpg.c:2037
+#: g10/gpg.c:2038
 msgid "display photo IDs during key listings"
 msgstr "показувати фотоідентифікатори у �пи�ках ключів"
 
-#: g10/gpg.c:2039
+#: g10/gpg.c:2040
 msgid "show key usage information during key listings"
 msgstr "показувати дані щодо викори�танн� ключа у �пи�ках ключів"
 
-#: g10/gpg.c:2041
+#: g10/gpg.c:2042
 msgid "show policy URLs during signature listings"
 msgstr "показувати адре�и правил у �пи�ках підпи�ів"
 
-#: g10/gpg.c:2043
+#: g10/gpg.c:2044
 msgid "show all notations during signature listings"
 msgstr "показувати в�і примітки у �пи�ках підпи�ів"
 
-#: g10/gpg.c:2045
+#: g10/gpg.c:2046
 msgid "show IETF standard notations during signature listings"
 msgstr "показувати �тандартні примітки IETF у �пи�ках підпи�ів"
 
-#: g10/gpg.c:2049
+#: g10/gpg.c:2050
 msgid "show user-supplied notations during signature listings"
 msgstr "показувати примітки кори�тувача у �пи�ках підпи�ів"
 
-#: g10/gpg.c:2051
+#: g10/gpg.c:2052
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "показувати адре�и о�новних �ерверів ключів у �пи�ках підпи�ів"
 
-#: g10/gpg.c:2053
+#: g10/gpg.c:2054
 msgid "show user ID validity during key listings"
 msgstr "показувати чинні�ть ідентифікаторів кори�тувачів у �пи�ках ключів"
 
-#: g10/gpg.c:2055
+#: g10/gpg.c:2056
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 "показувати відкликані та за�тарілі ідентифікатори кори�тувачів у �пи�ках "
 "ключів"
 
-#: g10/gpg.c:2057
+#: g10/gpg.c:2058
 msgid "show revoked and expired subkeys in key listings"
 msgstr "показувати відкликані та за�тарілі підключі у �пи�ках ключів"
 
-#: g10/gpg.c:2059
+#: g10/gpg.c:2060
 msgid "show the keyring name in key listings"
 msgstr "показувати назву �ховища ключів у �пи�ках ключів"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2062
 msgid "show expiration dates during signature listings"
 msgstr "показувати дати завершенн� �троків дії у �пи�ку підпи�ів"
 
-#: g10/gpg.c:2178
+#: g10/gpg.c:2179
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "невідомі правила TOFU «%s»\n"
 
-#: g10/gpg.c:2180
+#: g10/gpg.c:2181
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(команда «help» виводить �пи�ок можливих варіантів)\n"
 
-#: g10/gpg.c:2975 g10/gpg.c:3828 g10/gpg.c:3840
+#: g10/gpg.c:2978 g10/gpg.c:3825 g10/gpg.c:3837
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "З�УВ�ЖЕ��Я: %s не призначено дл� звичайного викори�танн�!\n"
 
-#: g10/gpg.c:3151 g10/gpg.c:3163
+#: g10/gpg.c:3154 g10/gpg.c:3166
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "«%s» не є коректним запи�ом завершенн� �троку дії підпи�у\n"
 
-#: g10/gpg.c:3185
+#: g10/gpg.c:3188
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "«%s» не є коректною адре�ою електронної пошти\n"
 
-#: g10/gpg.c:3217 sm/gpgsm.c:1270
+#: g10/gpg.c:3220 sm/gpgsm.c:1143
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "некоректний режим pinentry, «%s»\n"
 
-#: g10/gpg.c:3223 sm/gpgsm.c:1276
+#: g10/gpg.c:3226 sm/gpgsm.c:1149
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "некоректне походженн� запиту «%s»\n"
 
-#: g10/gpg.c:3280
+#: g10/gpg.c:3283
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "«%s» не є коректним набором �имволів\n"
 
-#: g10/gpg.c:3302 g10/gpg.c:3511 g10/keyedit.c:5319
+#: g10/gpg.c:3305 g10/gpg.c:3514 g10/keyedit.c:5322
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "не вдало�� обробити адре�у �ервера ключів\n"
 
-#: g10/gpg.c:3320
+#: g10/gpg.c:3323
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: некоректні параметри �ервера ключів\n"
 
-#: g10/gpg.c:3323
+#: g10/gpg.c:3326
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "некоректні параметри �ервера ключів\n"
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3333
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: некоректні параметри імпортуванн�\n"
 
-#: g10/gpg.c:3333
+#: g10/gpg.c:3336
 #, c-format
 msgid "invalid import options\n"
 msgstr "некоректні параметри імпортуванн�\n"
 
-#: g10/gpg.c:3339 g10/gpg.c:3354
+#: g10/gpg.c:3342 g10/gpg.c:3357
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "некоректний параметр фільтруванн�: %s\n"
 
-#: g10/gpg.c:3345
+#: g10/gpg.c:3348
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: некоректні параметри ек�портуванн�\n"
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3351
 #, c-format
 msgid "invalid export options\n"
 msgstr "некоректні параметри ек�портуванн�\n"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3363
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: некоректні параметри побудови �пи�ку\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3366
 #, c-format
 msgid "invalid list options\n"
 msgstr "некоректні параметри побудови �пи�ку\n"
 
-#: g10/gpg.c:3371
+#: g10/gpg.c:3374
 msgid "display photo IDs during signature verification"
 msgstr "показувати фотоідентифікатори під ча� перевірки підпи�ів"
 
-#: g10/gpg.c:3373
+#: g10/gpg.c:3376
 msgid "show policy URLs during signature verification"
 msgstr "показувати адре�и правил під ча� перевірки підпи�ів"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3378
 msgid "show all notations during signature verification"
 msgstr "показувати в�і примітки під ча� перевірки підпи�ів"
 
-#: g10/gpg.c:3377
+#: g10/gpg.c:3380
 msgid "show IETF standard notations during signature verification"
 msgstr "показувати �тандартні примітки IETF під ча� перевірки підпи�ів"
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3384
 msgid "show user-supplied notations during signature verification"
 msgstr "показувати вказані кори�тувачем примітки під ча� перевірки підпи�ів"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3386
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 "показувати адре�и о�новних �ерверів ключів у �пи�ках перевірки підпи�ів"
 
-#: g10/gpg.c:3385
+#: g10/gpg.c:3388
 msgid "show user ID validity during signature verification"
 msgstr ""
 "показувати чинні�ть ідентифікаторів кори�тувача під ча� перевірки підпи�ів"
 
-#: g10/gpg.c:3387
+#: g10/gpg.c:3390
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 "показувати відкликані та за�тарілі ідентифікатори кори�тувачів у �пи�ках "
 "перевірки підпи�ів"
 
-#: g10/gpg.c:3389
+#: g10/gpg.c:3392
 msgid "show only the primary user ID in signature verification"
 msgstr ""
 "показувати лише о�новний ідентифікатор кори�тувача під ча� перевірки підпи�ів"
 
-#: g10/gpg.c:3396
+#: g10/gpg.c:3399
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: некоректні параметри перевірки\n"
 
-#: g10/gpg.c:3399
+#: g10/gpg.c:3402
 #, c-format
 msgid "invalid verify options\n"
 msgstr "некоректні параметри перевірки\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3409
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "не вдало�� в�тановити шл�х дл� запу�ку у значенн� %s\n"
 
-#: g10/gpg.c:3613
+#: g10/gpg.c:3616
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: некоректний �пи�ок auto-key-locate\n"
 
-#: g10/gpg.c:3616
+#: g10/gpg.c:3619
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "некоректний �пи�ок auto-key-locate\n"
 
-#: g10/gpg.c:3625
+#: g10/gpg.c:3628
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "некоректний аргумент параметра «%.50s»\n"
 
-#: g10/gpg.c:3807 sm/gpgsm.c:1675
+#: g10/gpg.c:3804 sm/gpgsm.c:1528
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "УВ�Г�: можливе �творенн� дампу пам’�ті програми!\n"
 
-#: g10/gpg.c:3821
+#: g10/gpg.c:3818
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "УВ�Г�: %s перевизначає %s\n"
 
-#: g10/gpg.c:3830
+#: g10/gpg.c:3827
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s не можна викори�товувати разом з %s!\n"
 
-#: g10/gpg.c:3833
+#: g10/gpg.c:3830
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s є зайвим, �кщо викори�тано %s!\n"
 
-#: g10/gpg.c:3848 sm/gpgsm.c:1696 dirmngr/dirmngr.c:1123
+#: g10/gpg.c:3845 sm/gpgsm.c:1549 dirmngr/dirmngr.c:1160
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "УВ�Г�: запущено з фіктивним �и�темним ча�ом: "
 
-#: g10/gpg.c:3869
+#: g10/gpg.c:3866
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "не буде запущено з помилками у захи�ті пам’�ті через %s\n"
 
-#: g10/gpg.c:3897 g10/gpg.c:3928 sm/gpgsm.c:1763
+#: g10/gpg.c:3894 g10/gpg.c:3925 sm/gpgsm.c:1616
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "вибраний алгоритм шифруванн� є некоректним\n"
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3901
 #, fuzzy, c-format
 #| msgid "selected digest algorithm is invalid\n"
 msgid "selected AEAD algorithm is invalid\n"
 msgstr "вибраний алгоритм побудови контрольних �ум є некоректним\n"
 
-#: g10/gpg.c:3916
+#: g10/gpg.c:3913
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "вибраний алгоритм �ти�канн� є некоректним\n"
 
-#: g10/gpg.c:3922
+#: g10/gpg.c:3919
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 "вибраний алгоритм �творенн� контрольних �ум дл� �ертифікації є некоректним\n"
 
-#: g10/gpg.c:3937
+#: g10/gpg.c:3934
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "значенн� completes-needed має бути більшим за 0\n"
 
-#: g10/gpg.c:3939
+#: g10/gpg.c:3936
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "значенн� marginals-needed має перевищувати 1\n"
 
-#: g10/gpg.c:3941
+#: g10/gpg.c:3938
 #, 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:3943
+#: g10/gpg.c:3940
 #, 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:3945
+#: g10/gpg.c:3942
 #, 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:3949
+#: g10/gpg.c:3946
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr ""
 "З�УВ�ЖЕ��Я: наполегливо не рекомендуємо вам кори�тувати�� про�тим режимом "
 "S2K (0)\n"
 
-#: g10/gpg.c:3953
+#: g10/gpg.c:3950
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "некоректний режим S2K; мало бути вказано 0, 1 або 3\n"
 
-#: g10/gpg.c:3960
+#: g10/gpg.c:3957
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "некоректні типові параметри\n"
 
-#: g10/gpg.c:3964
+#: g10/gpg.c:3961
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "некоректні о�оби�ті параметри шифруванн�\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3964
 #, fuzzy, c-format
 #| msgid "invalid personal cipher preferences\n"
 msgid "invalid personal AEAD preferences\n"
 msgstr "некоректні о�оби�ті параметри шифруванн�\n"
 
-#: g10/gpg.c:3971
+#: g10/gpg.c:3968
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "некоректні о�оби�ті параметри контрольної �уми\n"
 
-#: g10/gpg.c:3975
+#: g10/gpg.c:3972
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "некоректні о�оби�ті параметри �ти�канн�\n"
 
-#: g10/gpg.c:3984 g10/gpg.c:3989
+#: g10/gpg.c:3981 g10/gpg.c:3986
 #, fuzzy, c-format
 #| msgid "keysize invalid; using %u bits\n"
 msgid "chunk size invalid - using %d\n"
 msgstr "некоректний розмір ключа; викори�товуємо %u-бітовий\n"
 
-#: g10/gpg.c:4026
+#: g10/gpg.c:4023
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ще не може працювати разом з %s\n"
 
-#: g10/gpg.c:4089
+#: g10/gpg.c:4086
 #, 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:4101
+#: g10/gpg.c:4098
 #, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "алгоритм �ти�канн� «%s» не можна викори�товувати у режимі %s\n"
 
-#: g10/gpg.c:4256
+#: g10/gpg.c:4253
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "не вдало�� ініціалізувати базу даних надійно�ті (TrustDB): %s\n"
 
-#: g10/gpg.c:4268
+#: g10/gpg.c:4265
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "УВ�Г�: отримувачів (-r) вказано без викори�танн� шифруванн� відкритим "
 "ключем\n"
 
-#: g10/gpg.c:4340
+#: g10/gpg.c:4337
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "помилка під ча� �проби �иметричного шифруванн� «%s»: %s\n"
 
-#: g10/gpg.c:4369
+#: g10/gpg.c:4366
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 "не можна викори�товувати комбінацію --symmetric --encrypt у режимі --s2k-"
 "mode 0\n"
 
-#: g10/gpg.c:4372
+#: g10/gpg.c:4369
 #, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr ""
 "не можна викори�товувати комбінацію --symmetric --encrypt у режимі %s\n"
 
-#: g10/gpg.c:4430
+#: g10/gpg.c:4427
 #, 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:4433
+#: g10/gpg.c:4430
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr ""
 "не можна викори�товувати комбінацію --symmetric --encrypt у режимі %s\n"
 
-#: g10/gpg.c:4821 g10/keyserver.c:1870
+#: g10/gpg.c:4818 g10/keyserver.c:1629
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "помилка під ча� над�иланн� даних на �ервер ключів: %s\n"
 
-#: g10/gpg.c:4826
+#: g10/gpg.c:4823
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "помилка під ча� �проби отриманн� даних з �ервера ключів: %s\n"
 
-#: g10/gpg.c:4832
+#: g10/gpg.c:4829
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "помилка під ча� �проби ек�портуванн� ключа: %s\n"
 
-#: g10/gpg.c:4845
+#: g10/gpg.c:4842
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "�проба ек�портуванн� ключа ssh зазнала невдачі: %s\n"
 
-#: g10/gpg.c:4857
+#: g10/gpg.c:4854
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "помилка пошуку на �ервері ключів: %s\n"
 
-#: g10/gpg.c:4870
+#: g10/gpg.c:4867
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "помилка оновленн� з �ервера ключів: %s\n"
 
-#: g10/gpg.c:4937
+#: g10/gpg.c:4936
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "помилка перетворенн� з формату ASCII: %s\n"
 
-#: g10/gpg.c:4948
+#: g10/gpg.c:4947
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "помилка перетворенн� у формат ASCII: %s\n"
 
-#: g10/gpg.c:5053
+#: g10/gpg.c:5052
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "некоректний алгоритм хешуванн� «%s»\n"
 
-#: g10/gpg.c:5205 g10/tofu.c:2156
+#: g10/gpg.c:5204 g10/tofu.c:2160
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "помилка під ча� �проби обробки �пецифікації ключа «%s»: %s\n"
 
-#: g10/gpg.c:5216
+#: g10/gpg.c:5215
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr "«%s» не є коректним ідентифікатором ключа, відбитком або кодом\n"
 
-#: g10/gpg.c:5272
+#: g10/gpg.c:5271
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr "УВ�Г�: команд не надано. �амагаємо�� вгадати, що вам потрібно...\n"
 
-#: g10/gpg.c:5283
+#: g10/gpg.c:5282
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Почніть вводити ваше повідомленн�...\n"
 
-#: g10/gpg.c:5630
+#: g10/gpg.c:5629
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "вказана адре�а правил �ертифікації є некоректною\n"
 
-#: g10/gpg.c:5632
+#: g10/gpg.c:5631
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "вказана адре�а правил підпи�уванн� є некоректною\n"
 
-#: g10/gpg.c:5665
+#: g10/gpg.c:5664
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "вказана адре�а о�новного �ервера ключів є некоректною\n"
@@ -3450,7 +3465,7 @@ msgstr "|FILE|визначити ключі з файла Ñ�ховища клюÑ
 msgid "make timestamp conflicts only a warning"
 msgstr "�упроводжувати конфлікти ча�ових позначок лише попередженн�ми"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:414 tools/gpgconf.c:116 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:415 tools/gpgconf.c:116 tools/gpg-card.c:95
 msgid "|FD|write status info to this FD"
 msgstr "|FD|запи�увати до де�криптора файла дані щодо �тану"
 
@@ -3539,97 +3554,97 @@ msgstr "припу�кати формат резервних копій ключ
 msgid "repair keys on import"
 msgstr "відновлювати ключі при імпортуванні"
 
-#: g10/import.c:399 g10/import.c:721
+#: g10/import.c:407 g10/import.c:729
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "пропу�каємо блок типу %d\n"
 
-#: g10/import.c:738
+#: g10/import.c:746
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "оброблено %lu ключів\n"
 
-#: g10/import.c:831
+#: g10/import.c:839
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Загалом оброблено: %lu\n"
 
-#: g10/import.c:834
+#: g10/import.c:842
 #, c-format
 msgid "    skipped PGP-2 keys: %lu\n"
 msgstr "    пропущено ключів PGP-2: %lu\n"
 
-#: g10/import.c:836
+#: g10/import.c:844
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "пропущено нових ключів: %lu\n"
 
-#: g10/import.c:839
+#: g10/import.c:847
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "   без ід. кори�тувача: %lu\n"
 
-#: g10/import.c:842 sm/import.c:129
+#: g10/import.c:850 sm/import.c:129
 #, c-format
 msgid "              imported: %lu"
 msgstr "           імпортовано: %lu"
 
-#: g10/import.c:846 sm/import.c:133
+#: g10/import.c:854 sm/import.c:133
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "              без змін: %lu\n"
 
-#: g10/import.c:848
+#: g10/import.c:856
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "нових ід. кори�тувачів: %lu\n"
 
-#: g10/import.c:850
+#: g10/import.c:858
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "       нових підключів: %lu\n"
 
-#: g10/import.c:852
+#: g10/import.c:860
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        нових підпи�ів: %lu\n"
 
-#: g10/import.c:854
+#: g10/import.c:862
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "відкликань нових ключів: %lu\n"
 
-#: g10/import.c:856 sm/import.c:135
+#: g10/import.c:864 sm/import.c:135
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "прочитано закритих ключів: %lu\n"
 
-#: g10/import.c:858 sm/import.c:137
+#: g10/import.c:866 sm/import.c:137
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "імпортовано закр. ключів: %lu\n"
 
-#: g10/import.c:860 sm/import.c:139
+#: g10/import.c:868 sm/import.c:139
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " закр. ключів без змін: %lu\n"
 
-#: g10/import.c:862 sm/import.c:141
+#: g10/import.c:870 sm/import.c:141
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "        не імпортовано: %lu\n"
 
-#: g10/import.c:864
+#: g10/import.c:872
 #, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "    вилучених підпи�ів: %lu\n"
 
-#: g10/import.c:866
+#: g10/import.c:874
 #, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr " вилучених ід. кори�т.: %lu\n"
 
-#: g10/import.c:1291
+#: g10/import.c:1299
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
@@ -3638,175 +3653,175 @@ msgstr ""
 "УВ�Г�: у ключі %s мі�т�ть�� запи�и наданн� переваги\n"
 "недо�тупним алгоритмам дл� таких ід. кори�тувачів:\n"
 
-#: g10/import.c:1333
+#: g10/import.c:1341
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         «%s»: перевага алгоритму шифруванн� %s\n"
 
-#: g10/import.c:1351
+#: g10/import.c:1359
 #, fuzzy, c-format
 #| msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgid "         \"%s\": preference for AEAD algorithm %s\n"
 msgstr "         «%s»: перевага алгоритму шифруванн� %s\n"
 
-#: g10/import.c:1366
+#: g10/import.c:1374
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         «%s»: перевага алгоритму контрольних �ум %s\n"
 
-#: g10/import.c:1378
+#: g10/import.c:1386
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         «%s»: перевага алгоритму �ти�канн� %s\n"
 
-#: g10/import.c:1391
+#: g10/import.c:1399
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "наполегливо рекомендуємо вам оновити запи�и переваг і\n"
 
-#: g10/import.c:1393
+#: g10/import.c:1401
 #, c-format
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "повторно поширити цей ключ, щоб уникнути потенційних проблем з алгоритмами\n"
 
-#: g10/import.c:1418
+#: g10/import.c:1426
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 "оновити запи�и перевад можна за допомогою команди: gpg --edit-key %s updpref "
 "save\n"
 
-#: g10/import.c:1932 g10/import.c:3053
+#: g10/import.c:1940 g10/import.c:3061
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "ключ %s: немає ідентифікатор кори�тувача\n"
 
-#: g10/import.c:1938
+#: g10/import.c:1946
 #, c-format
 msgid "key %s: %s\n"
 msgstr "ключ %s: %s\n"
 
-#: g10/import.c:1939 g10/import.c:3025
+#: g10/import.c:1947 g10/import.c:3033
 msgid "rejected by import screener"
 msgstr "відкинуто екранувальником імпорту"
 
-#: g10/import.c:1988
+#: g10/import.c:1996
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "ключ %s: відновлено пошкоджений підключ PKS\n"
 
-#: g10/import.c:2009
+#: g10/import.c:2017
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "ключ %s: прийн�то не�амопідпи�аний ідентифікатор кори�тувача «%s»\n"
 
-#: g10/import.c:2020 g10/import.c:2051
+#: g10/import.c:2028 g10/import.c:2059
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "ключ %s: немає чинних ідентифікаторів кори�тувача\n"
 
-#: g10/import.c:2022
+#: g10/import.c:2030
 #, c-format
 msgid "this may be caused by a missing self-signature\n"
 msgstr "причиною цього може бути те, що немає �амопідпи�у\n"
 
-#: g10/import.c:2101 g10/import.c:3439
+#: g10/import.c:2109 g10/import.c:3447
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "ключ %s: не знайдено відкритий ключ: %s\n"
 
-#: g10/import.c:2107
+#: g10/import.c:2115
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "ключ %s: новий ключ — пропущено\n"
 
-#: g10/import.c:2119
+#: g10/import.c:2127
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "не ви�влено придатного до запи�у �ховища ключів: %s\n"
 
-#: g10/import.c:2151 g10/import.c:2253 g10/import.c:3514
+#: g10/import.c:2159 g10/import.c:2261 g10/import.c:3522
 #, c-format
 msgid "error writing keyring '%s': %s\n"
 msgstr "помилка під ча� �проби запи�у �ховища ключів «%s»: %s\n"
 
-#: g10/import.c:2174
+#: g10/import.c:2182
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "ключ %s: імпортовано відкритий ключ «%s»\n"
 
-#: g10/import.c:2201
+#: g10/import.c:2209
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "ключ %s: не відповідає нашій копії\n"
 
-#: g10/import.c:2269
+#: g10/import.c:2277
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "ключ %s: «%s» 1 новий ідентифікатор кори�тувача\n"
 
-#: g10/import.c:2272
+#: g10/import.c:2280
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "ключ %s: «%s» %d нових ідентифікаторів кори�тувачів\n"
 
-#: g10/import.c:2275
+#: g10/import.c:2283
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "ключ %s: «%s» 1 новий підпи�\n"
 
-#: g10/import.c:2278
+#: g10/import.c:2286
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "ключ %s: «%s» %d нових підпи�ів\n"
 
-#: g10/import.c:2281
+#: g10/import.c:2289
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "ключ %s: «%s» 1 новий підключ\n"
 
-#: g10/import.c:2284
+#: g10/import.c:2292
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "ключ %s: «%s» %d нових підключів\n"
 
-#: g10/import.c:2287
+#: g10/import.c:2295
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "ключ %s: «%s» вилучено %d підпи�\n"
 
-#: g10/import.c:2290
+#: g10/import.c:2298
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "ключ %s: «%s» вилучено %d підпи�ів\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2301
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "ключ %s: «%s» �порожнено %d ідентифікатор кори�тувача\n"
 
-#: g10/import.c:2296
+#: g10/import.c:2304
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "ключ %s: «%s» �порожнено %d ідентифікаторів кори�тувачів\n"
 
-#: g10/import.c:2332
+#: g10/import.c:2340
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "ключ %s: «%s» не змінено\n"
 
-#: g10/import.c:2692 g10/import.c:2887
+#: g10/import.c:2700 g10/import.c:2895
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "ключ %s: імпортовано закритий ключ\n"
 
-#: g10/import.c:2700
+#: g10/import.c:2708
 #, c-format
 msgid "key %s: secret key already exists\n"
 msgstr "ключ %s: закритий ключ вже і�нує\n"
 
-#: g10/import.c:2708
+#: g10/import.c:2716
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "ключ %s: помилка під ча� �проби над�иланн� агенту: %s\n"
@@ -3819,210 +3834,209 @@ msgstr "ключ %s: помилка під чаÑ� Ñ�проби надÑ�иланÐ
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2877
+#: g10/import.c:2885
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 "Дл� перене�енн� «%s» на кожній із карток пам’�ті �лід виконати таку команду: "
 "%s\n"
 
-#: g10/import.c:3024
+#: g10/import.c:3032
 #, c-format
 msgid "secret key %s: %s\n"
 msgstr "закритий ключ %s: %s\n"
 
-#: g10/import.c:3045 g10/import.c:3084
+#: g10/import.c:3053 g10/import.c:3092
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "імпортуванн� закритих ключів заборонено\n"
 
-#: g10/import.c:3072
+#: g10/import.c:3080
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "ключ %s: закритий ключ з некоректним шифром %d — пропущено\n"
 
-#: g10/import.c:3234 g10/pkclist.c:75 g10/revoke.c:774
+#: g10/import.c:3242 g10/pkclist.c:75 g10/revoke.c:775
 msgid "No reason specified"
 msgstr "Причину не вказано"
 
-#: g10/import.c:3235 g10/pkclist.c:77 g10/revoke.c:776
+#: g10/import.c:3243 g10/pkclist.c:77 g10/revoke.c:777
 msgid "Key is superseded"
 msgstr "Ключ замінено"
 
-#: g10/import.c:3236 g10/pkclist.c:79 g10/revoke.c:775
+#: g10/import.c:3244 g10/pkclist.c:79 g10/revoke.c:776
 msgid "Key has been compromised"
 msgstr "Ключ �компрометовано"
 
-#: g10/import.c:3237 g10/pkclist.c:81 g10/revoke.c:777
+#: g10/import.c:3245 g10/pkclist.c:81 g10/revoke.c:778
 msgid "Key is no longer used"
 msgstr "Ключ більше не викори�товуєть��"
 
-#: g10/import.c:3238 g10/pkclist.c:83 g10/revoke.c:778
+#: g10/import.c:3246 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "Ідентифікатор кори�тувача втратив чинні�ть"
 
-#: g10/import.c:3363 g10/keylist.c:1105 g10/pkclist.c:87
+#: g10/import.c:3371 g10/keylist.c:1105 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "причина відкликанн�: "
 
-#: g10/import.c:3382 g10/keylist.c:1124 g10/pkclist.c:103
+#: g10/import.c:3390 g10/keylist.c:1124 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "коментар щодо відкликанн�: "
 
-#: g10/import.c:3432
+#: g10/import.c:3440
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "ключ %s: немає відкритого ключа — не можна за�то�овувати �ертифікат "
 "відкликанн�\n"
 
-#: g10/import.c:3461
+#: g10/import.c:3469
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "ключ %s: не вдало�� знайти початковий блок ключів: %s\n"
 
-#: g10/import.c:3468
+#: g10/import.c:3476
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "ключ %s: не вдало�� прочитати початковий блок ключів: %s\n"
 
-#: g10/import.c:3488
+#: g10/import.c:3496
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "ключ %s: некоректний �ертифікат відкликанн�: %s — відкинуто\n"
 
-#: g10/import.c:3523
+#: g10/import.c:3531
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "ключ %s: імпортовано �ертифікат відкликанн� «%s»\n"
 
-#: g10/import.c:3609
+#: g10/import.c:3617
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "ключ %s: немає ідентифікатор кори�тувача дл� підпи�у\n"
 
-#: g10/import.c:3626
+#: g10/import.c:3634
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "ключ %s: непідтримуваний алгоритм �творенн� відкритого ключа дл� "
 "ідентифікатора кори�тувача «%s»\n"
 
-#: g10/import.c:3628
+#: g10/import.c:3636
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "ключ %s: некоректний �амопідпи� дл� ідентифікатора кори�тувача «%s»\n"
 
-#: g10/import.c:3645 g10/import.c:3673 g10/import.c:3729
+#: g10/import.c:3653 g10/import.c:3681 g10/import.c:3737
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "ключ %s: непідтримуваний алгоритм �творенн� відкритого ключа\n"
 
-#: g10/import.c:3646
+#: g10/import.c:3654
 #, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "ключ %s: некоректний безпо�ередній підпи� ключа\n"
 
-#: g10/import.c:3660
+#: g10/import.c:3668
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "ключ %s: немає підключа дл� зв’�зуванн� ключів\n"
 
-#: g10/import.c:3675
+#: g10/import.c:3683
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "ключ %s: некоректне зв’�зуванн� підключів\n"
 
-#: g10/import.c:3694
+#: g10/import.c:3702
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "ключ %s: вилучено кратне зв’�зуванн� підключів\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3726
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "ключ %s: немає підключа дл� відкликанн� ключа\n"
 
-#: g10/import.c:3731
+#: g10/import.c:3739
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "ключ %s: некоректне відкликанн� підключа\n"
 
-#: g10/import.c:3746
+#: g10/import.c:3754
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "ключ %s: вилучено кратне відкликанн� підключа\n"
 
-#: g10/import.c:3790
+#: g10/import.c:3798
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "ключ %s: пропущено ідентифікатор кори�тувача «%s»\n"
 
-#: g10/import.c:3817
+#: g10/import.c:3825
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "ключ %s: пропущено підключ\n"
 
-#: g10/import.c:3849
+#: g10/import.c:3857
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "ключ %s: непридатний до ек�порту підпи� (кла� 0x%02X) — пропущено\n"
 
-#: g10/import.c:3860
+#: g10/import.c:3868
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "ключ %s: �ертифікат відкликанн� у помилковому мі�ці — пропущено\n"
 
-#: g10/import.c:3878
+#: g10/import.c:3886
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "ключ %s: некоректний �ертифікат відкликанн�: %s — пропущено\n"
 
-#: g10/import.c:3892
+#: g10/import.c:3900
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "ключ %s: підпи� підключа у помилковому мі�ці — пропущено\n"
 
-#: g10/import.c:3900
+#: g10/import.c:3908
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "ключ %s: неочікуваний кла� підпи�у (0x%02X) — пропущено\n"
 
-#: g10/import.c:4073
+#: g10/import.c:4081
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "ключ %s: ви�влено дублюванн� ідентифікаторів кори�тувача — об’єднано\n"
 
-#: g10/import.c:4180
+#: g10/import.c:4188
 #, fuzzy, c-format
 #| msgid "key %s: duplicated user ID detected - merged\n"
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr "ключ %s: ви�влено дублюванн� ідентифікаторів кори�тувача — об’єднано\n"
 
-#: g10/import.c:4245
+#: g10/import.c:4253
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "УВ�Г�: ключ %s могло бути відкликано: отримуємо ключ відкликанн� %s\n"
 
-#: g10/import.c:4261
+#: g10/import.c:4269
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "УВ�Г�: ключ %s могло бути відкликано: ключа відкликанн� %s немає.\n"
 
-#: g10/import.c:4327
+#: g10/import.c:4335
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "ключ %s: додано �ертифікат відкликанн� «%s»\n"
 
-#: g10/import.c:4365
+#: g10/import.c:4373
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "ключ %s: додано безпо�ередній підпи� ключа\n"
 
-#: g10/key-check.c:133 dirmngr/dirmngr_ldap.c:650 dirmngr/ldap-wrapper.c:835
-#: dirmngr/ldap-wrapper.c:852
+#: g10/key-check.c:133 dirmngr/ldap-wrapper.c:835 dirmngr/ldap-wrapper.c:852
 #, c-format
 msgid "error allocating memory: %s\n"
 msgstr "помилка під ча� �проби отриманн� обла�ті пам’�ті: %s\n"
@@ -4092,7 +4106,7 @@ msgstr ""
 "Попередженн�: ви�влено помилки, перевірка виконувала�� лише дл� "
 "�амопідпи�уванн�, віддайте команду «%s», щоб перевірити у�і підпи�и.\n"
 
-#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:284 sm/keydb.c:297
+#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:289 sm/keydb.c:302
 #, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "помилка під ча� �проби �творенн� �ховища ключів «%s»: %s\n"
@@ -4102,7 +4116,7 @@ msgstr "помилка під чаÑ� Ñ�проби Ñ�твореннÑ� Ñ�ховиÑ
 msgid "error creating keyring '%s': %s\n"
 msgstr "помилка під ча� �проби �творенн� �ховища ключів «%s»: %s\n"
 
-#: g10/keydb.c:388 sm/keydb.c:303
+#: g10/keydb.c:388 sm/keydb.c:308
 #, c-format
 msgid "keybox '%s' created\n"
 msgstr "�творено �ховище ключів «%s»\n"
@@ -4358,8 +4372,8 @@ msgstr "Цей ключ ретельно перевірено мною.\n"
 msgid "Really sign? (y/N) "
 msgstr "Підпи�ати? (y/N або т/�) "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6192 g10/keyedit.c:6275 g10/keyedit.c:6404
-#: g10/keyedit.c:6466 g10/sign.c:528
+#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
+#: g10/keyedit.c:6474 g10/sign.c:528
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "помилка під ча� �проби підпи�уванн�: %s\n"
@@ -4740,7 +4754,7 @@ msgstr "Ð�емає відповідних ідентифікаторів корÐ
 msgid "Nothing to sign.\n"
 msgstr "�ічого підпи�увати.\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6057
+#: g10/keyedit.c:2973 g10/keyedit.c:6065
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "�е підпи�ано вами.\n"
@@ -4809,7 +4823,7 @@ msgstr "Цей ключ може бути відкликано %s ключем %
 msgid "(sensitive)"
 msgstr "(важливий)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:525
+#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "�творено: %s"
@@ -4825,7 +4839,7 @@ msgid "expired: %s"
 msgstr "не діє з: %s"
 
 #: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2262
-#: g10/keyserver.c:531
+#: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "діє до: %s"
@@ -4861,13 +4875,13 @@ msgstr ""
 "Зауважте, що показані дані щодо чинно�ті ключів не обов’�зково є коректними\n"
 "до перезапу�ку програми.\n"
 
-#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:535
-#: g10/mainproc.c:2280 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
+#: g10/mainproc.c:2282 g10/tofu.c:1789 g10/trust.c:426 dirmngr/ocsp.c:792
 msgid "revoked"
 msgstr "відкликано"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:539
-#: g10/mainproc.c:2282 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
+#: g10/mainproc.c:2284 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "збіг �трок дії"
 
@@ -4910,7 +4924,7 @@ msgstr "Ви �правді бажаєте додати його? (y/N або т
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "�е можна додавати фотоідентифікатор до ключа у форматі PGP2.\n"
 
-#: g10/keyedit.c:4273 g10/keygen.c:3107
+#: g10/keyedit.c:4273 g10/keygen.c:3111
 msgid "Such a user ID already exists on this key!\n"
 msgstr "У цьому ключі вже і�нує такий ідентифікатор кори�тувача!\n"
 
@@ -5059,7 +5073,7 @@ msgstr ""
 msgid "Please select exactly one user ID.\n"
 msgstr "Будь ла�ка, виберіть лише один ідентифікатор кори�тувача.\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5357 g10/keyedit.c:5495
+#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "пропу�каємо �амопідпи� v3 дл� ідентифікатора кори�тувача «%s»\n"
@@ -5068,130 +5082,130 @@ msgstr "пропу�каємо �амопідпи� v3 дл� ідентифік
 msgid "Enter your preferred keyserver URL: "
 msgstr "Вкажіть адре�у вашого о�новного �ервера ключів: "
 
-#: g10/keyedit.c:5380
+#: g10/keyedit.c:5383
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Ви �правді бажаєте замінити його? (y/N або т/�) "
 
-#: g10/keyedit.c:5381
+#: g10/keyedit.c:5384
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Ви �правді бажаєте вилучити його? (y/N або т/�) "
 
-#: g10/keyedit.c:5441
+#: g10/keyedit.c:5449
 msgid "Enter the notation: "
 msgstr "Вкажіть примітку: "
 
-#: g10/keyedit.c:5588
+#: g10/keyedit.c:5596
 msgid "Proceed? (y/N) "
 msgstr "Продовжувати? (y/N або т/�) "
 
-#: g10/keyedit.c:5658
+#: g10/keyedit.c:5666
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ідентифікатора кори�тувача з індек�ом %d не і�нує\n"
 
-#: g10/keyedit.c:5720
+#: g10/keyedit.c:5728
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Ідентифікатора кори�тувача з хешем %s не і�нує\n"
 
-#: g10/keyedit.c:5821
+#: g10/keyedit.c:5829
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Піключа із ідентифікатором ключа «%s» не і�нує.\n"
 
-#: g10/keyedit.c:5843
+#: g10/keyedit.c:5851
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Підключа з індек�ом %d не і�нує\n"
 
-#: g10/keyedit.c:5984
+#: g10/keyedit.c:5992
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Ідентифікатор кори�тувача: «%s»\n"
 
-#: g10/keyedit.c:5987 g10/keyedit.c:6089 g10/keyedit.c:6137
+#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "підпи�ано вашим ключем %s %s%s%s\n"
 
-#: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
+#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
 msgid " (non-exportable)"
 msgstr " (неек�портовний)"
 
-#: g10/keyedit.c:5993
+#: g10/keyedit.c:6001
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Строк дії цього підпи�у завершуєть�� %s.\n"
 
-#: g10/keyedit.c:5998
+#: g10/keyedit.c:6006
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Ви �правді бажаєте відкликати його? (y/N або т/�) "
 
-#: g10/keyedit.c:6003
+#: g10/keyedit.c:6011
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Створити �ертифікат відкликанн� дл� цього підпи�у? (y/N або т/�) "
 
-#: g10/keyedit.c:6063
+#: g10/keyedit.c:6071
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Вами підпи�ано ці ідентифікатори кори�тувачів у ключі %s:\n"
 
-#: g10/keyedit.c:6092
+#: g10/keyedit.c:6100
 msgid " (non-revocable)"
 msgstr " (невідкликуваний)"
 
-#: g10/keyedit.c:6099
+#: g10/keyedit.c:6107
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "відкликано вашим ключем %s у %s\n"
 
-#: g10/keyedit.c:6124
+#: g10/keyedit.c:6132
 msgid "You are about to revoke these signatures:\n"
 msgstr "Ви маєте намір відкликати ці підпи�и:\n"
 
-#: g10/keyedit.c:6147
+#: g10/keyedit.c:6155
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Справді �творити �ертифікати відкликанн�? (y/N або т/�) "
 
-#: g10/keyedit.c:6180
+#: g10/keyedit.c:6188
 #, c-format
 msgid "no secret key\n"
 msgstr "немає закритого ключа\n"
 
-#: g10/keyedit.c:6228
+#: g10/keyedit.c:6236
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr "�проба відкликати ідентифікатор, �кий не належить кори�тувачеві: %s\n"
 
-#: g10/keyedit.c:6238
+#: g10/keyedit.c:6246
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ідентифікатор кори�тувача «%s» вже відкликано\n"
 
-#: g10/keyedit.c:6255
+#: g10/keyedit.c:6263
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "УВ�Г�: підпи� ідентифікатора кори�тувача позначено датою на %d �екунд у "
 "майбутньому\n"
 
-#: g10/keyedit.c:6351
+#: g10/keyedit.c:6359
 #, 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:6389
+#: g10/keyedit.c:6397
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Ключ %s вже відкликано.\n"
 
-#: g10/keyedit.c:6451
+#: g10/keyedit.c:6459
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Підключ %s вже відкликано.\n"
 
-#: g10/keyedit.c:6548
+#: g10/keyedit.c:6556
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Показ фотоідентифікатора %s розміру %ld дл� ключа %s (uid %d)\n"
@@ -5201,64 +5215,64 @@ msgstr "Показ фотоідентифікатора %s розміру %ld д
 msgid "invalid value for option '%s'\n"
 msgstr "некоректне значенн� параметра «%s»\n"
 
-#: g10/keygen.c:338
+#: g10/keygen.c:339
 #, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "запи� переваги «%s» продубльовано\n"
 
-#: g10/keygen.c:345
+#: g10/keygen.c:346
 #, c-format
 msgid "too many cipher preferences\n"
 msgstr "занадто багато запи�ів переваг шифрів\n"
 
-#: g10/keygen.c:347
+#: g10/keygen.c:348
 #, c-format
 msgid "too many digest preferences\n"
 msgstr "занадто багато запи�ів переваг контрольних �ум\n"
 
-#: g10/keygen.c:349
+#: g10/keygen.c:350
 #, c-format
 msgid "too many compression preferences\n"
 msgstr "занадто багато запи�ів переваг �ти�канн�\n"
 
-#: g10/keygen.c:351
+#: g10/keygen.c:352
 #, fuzzy, c-format
 #| msgid "too many cipher preferences\n"
 msgid "too many AEAD preferences\n"
 msgstr "занадто багато запи�ів переваг шифрів\n"
 
-#: g10/keygen.c:521
+#: g10/keygen.c:522
 #, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "некоректний запи� «%s» у р�дку переваг\n"
 
-#: g10/keygen.c:1130
+#: g10/keygen.c:1131
 #, c-format
 msgid "writing direct signature\n"
 msgstr "запи�уванн� безпо�ереднього підпи�у\n"
 
-#: g10/keygen.c:1176
+#: g10/keygen.c:1177
 #, c-format
 msgid "writing self signature\n"
 msgstr "запи�уванн� �амопідпи�у\n"
 
-#: g10/keygen.c:1233
+#: g10/keygen.c:1234
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "запи�уванн� підпи�у прив’�зуванн� ключа\n"
 
-#: g10/keygen.c:1598 g10/keygen.c:1603 g10/keygen.c:1655 g10/keygen.c:1660
-#: g10/keygen.c:1832 g10/keygen.c:1837
+#: g10/keygen.c:1599 g10/keygen.c:1604 g10/keygen.c:1656 g10/keygen.c:1661
+#: g10/keygen.c:1833 g10/keygen.c:1838
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "некоректний розмір ключа; викори�товуємо %u-бітовий\n"
 
-#: g10/keygen.c:1609 g10/keygen.c:1666 g10/keygen.c:1674 g10/keygen.c:1843
+#: g10/keygen.c:1610 g10/keygen.c:1667 g10/keygen.c:1675 g10/keygen.c:1844
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "розмір ключа округлено до %u-бітового\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1701
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
@@ -5266,19 +5280,19 @@ msgstr ""
 "УВ�Г�: де�кі з програм OpenPGP не можуть працювати з ключем DSA з таким "
 "розміром контрольної �уми\n"
 
-#: g10/keygen.c:1899
+#: g10/keygen.c:1900
 msgid "Sign"
 msgstr "Підпи�ати"
 
-#: g10/keygen.c:1902
+#: g10/keygen.c:1903
 msgid "Certify"
 msgstr "Сертифікувати"
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1906
 msgid "Encrypt"
 msgstr "Зашифрувати"
 
-#: g10/keygen.c:1908
+#: g10/keygen.c:1909
 msgid "Authenticate"
 msgstr "Пройти розпізнаванн�"
 
@@ -5292,181 +5306,181 @@ msgstr "Пройти розпізнаванн�"
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1929
+#: g10/keygen.c:1930
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1967
 #, fuzzy, c-format
 #| msgid "Possible actions for a %s key: "
 msgid "Possible actions for this %s key: "
 msgstr "Можливі дії з ключем %s: "
 
-#: g10/keygen.c:1973
+#: g10/keygen.c:1974
 msgid "Current allowed actions: "
 msgstr "Поточні дозволені дії: "
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1979
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) увімкнути або вимкнути можливі�ть підпи�уванн�\n"
 
-#: g10/keygen.c:1981
+#: g10/keygen.c:1982
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) увімкнути або вимкнути можливі�ть шифруванн�\n"
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1985
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 "   (%c) увімкнути або вимкнути можливі�ть викори�танн� дл� розпізнаванн�\n"
 
-#: g10/keygen.c:1987
+#: g10/keygen.c:1988
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) вийти\n"
 
-#: g10/keygen.c:2116
+#: g10/keygen.c:2117
 #, fuzzy, c-format
 #| msgid "   (%d) RSA and RSA (default)\n"
 msgid "   (%d) RSA and RSA%s\n"
 msgstr "   (%d) RSA і RSA (типовий)\n"
 
-#: g10/keygen.c:2120
+#: g10/keygen.c:2121
 #, fuzzy, c-format
 #| msgid "   (%d) DSA and Elgamal\n"
 msgid "   (%d) DSA and Elgamal%s\n"
 msgstr "   (%d) DSA Ñ– Elgamal\n"
 
-#: g10/keygen.c:2123
+#: g10/keygen.c:2124
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "   (%d) DSA (sign only)%s\n"
 msgstr "   (%d) DSA (лише підпи�уванн�)\n"
 
-#: g10/keygen.c:2125
+#: g10/keygen.c:2126
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (sign only)\n"
 msgid "   (%d) RSA (sign only)%s\n"
 msgstr "   (%d) RSA (лише підпи�уванн�)\n"
 
-#: g10/keygen.c:2131
+#: g10/keygen.c:2132
 #, fuzzy, c-format
 #| msgid "   (%d) Elgamal (encrypt only)\n"
 msgid "   (%d) Elgamal (encrypt only)%s\n"
 msgstr "   (%d) Elgamal (лише шифруванн�)\n"
 
-#: g10/keygen.c:2133
+#: g10/keygen.c:2134
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (encrypt only)\n"
 msgid "   (%d) RSA (encrypt only)%s\n"
 msgstr "   (%d) RSA (лише шифруванн�)\n"
 
-#: g10/keygen.c:2139
+#: g10/keygen.c:2140
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (set your own capabilities)\n"
 msgid "   (%d) DSA (set your own capabilities)%s\n"
 msgstr "   (%d) DSA (із визначенн�м можливо�тей вла�норуч)\n"
 
-#: g10/keygen.c:2141
+#: g10/keygen.c:2142
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (set your own capabilities)\n"
 msgid "   (%d) RSA (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (із визначенн�м можливо�тей вла�норуч)\n"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2148
 #, fuzzy, c-format
 #| msgid "   (%d) sign, encrypt\n"
 msgid "   (%d) ECC (sign and encrypt)%s\n"
 msgstr "   (%d) підпи�уванн�, шифруванн�\n"
 
-#: g10/keygen.c:2147 g10/keygen.c:2678
+#: g10/keygen.c:2148 g10/keygen.c:2679
 msgid " *default*"
 msgstr ""
 
-#: g10/keygen.c:2148
+#: g10/keygen.c:2149
 #, c-format
 msgid "  (%d) ECC (sign only)\n"
 msgstr "  (%d) ECC (лише підпи�уванн�)\n"
 
-#: g10/keygen.c:2150
+#: g10/keygen.c:2151
 #, fuzzy, c-format
 #| msgid "  (%d) ECC (set your own capabilities)\n"
 msgid "  (%d) ECC (set your own capabilities)%s\n"
 msgstr "  (%d) ECC (із визначенн�м можливо�тей вла�норуч)\n"
 
-#: g10/keygen.c:2152
+#: g10/keygen.c:2153
 #, fuzzy, c-format
 #| msgid "  (%d) ECC (encrypt only)\n"
 msgid "  (%d) ECC (encrypt only)%s\n"
 msgstr "  (%d) ECC (лише шифруванн�)\n"
 
-#: g10/keygen.c:2156
+#: g10/keygen.c:2157
 #, fuzzy, c-format
 #| msgid "  (%d) Existing key\n"
 msgid "  (%d) Existing key%s\n"
 msgstr "   (%d) Вже запи�аний ключ\n"
 
-#: g10/keygen.c:2158
+#: g10/keygen.c:2159
 #, fuzzy, c-format
 #| msgid "   (%d) Existing key from card\n"
 msgid "  (%d) Existing key from card%s\n"
 msgstr "   (%d) Вже запи�аний ключ з картки\n"
 
-#: g10/keygen.c:2254 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2255 sm/certreqgen-ui.c:203
 msgid "Enter the keygrip: "
 msgstr "Вкажіть keygrip: "
 
-#: g10/keygen.c:2267 sm/certreqgen-ui.c:211 tools/gpg-card.c:2280
+#: g10/keygen.c:2268 sm/certreqgen-ui.c:211 tools/gpg-card.c:2297
 #, c-format
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr "�екоректний keygrip (мало бути вказано 40 ші�тнадц�ткових цифр)\n"
 
-#: g10/keygen.c:2269 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2270 sm/certreqgen-ui.c:213
 msgid "No key with this keygrip\n"
 msgstr "�емає ключів з таким значенн�м keygrip\n"
 
-#: g10/keygen.c:2288 g10/keygen.c:2298 g10/keygen.c:3440 g10/keygen.c:3451
+#: g10/keygen.c:2289 g10/keygen.c:2299 g10/keygen.c:3444 g10/keygen.c:3455
 #: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
 #, c-format
 msgid "error reading the card: %s\n"
 msgstr "помилка читанн� картки: %s\n"
 
-#: g10/keygen.c:2292 g10/keygen.c:3444 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2293 g10/keygen.c:3448 sm/certreqgen-ui.c:234
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "Серійний номер картки: %s\n"
 
-#: g10/keygen.c:2311 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2312 sm/certreqgen-ui.c:246
 msgid "Available keys:\n"
 msgstr "До�тупні ключі:\n"
 
-#: g10/keygen.c:2504 g10/keygen.c:2518
+#: g10/keygen.c:2505 g10/keygen.c:2519
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr "округлено до %u бітів\n"
 
-#: g10/keygen.c:2559
+#: g10/keygen.c:2560
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "ключі %s можуть мати довжину від %u до %u бітів.\n"
 
-#: g10/keygen.c:2567
+#: g10/keygen.c:2568
 #, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Якою має бути довжина підключа? (%u) "
 
-#: g10/keygen.c:2584 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2585 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Запитана довжина ключа — %u бітів\n"
 
-#: g10/keygen.c:2630
+#: g10/keygen.c:2631
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Вкажіть потрібну вам еліптичну криву:\n"
 
-#: g10/keygen.c:2819
+#: g10/keygen.c:2820
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5482,7 +5496,7 @@ msgstr ""
 "      <n>m = �трок чинно�ті у n мі��ців\n"
 "      <n>y = �трок чинно�ті у n років\n"
 
-#: g10/keygen.c:2830
+#: g10/keygen.c:2831
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5498,38 +5512,38 @@ msgstr ""
 "      <n>m = �трок чинно�ті підпи�у у n мі��ців\n"
 "      <n>y = �трок чинно�ті підпи�у у n років\n"
 
-#: g10/keygen.c:2853
+#: g10/keygen.c:2854
 msgid "Key is valid for? (0) "
 msgstr "Яким є �трок чинно�ті ключа? (0) "
 
-#: g10/keygen.c:2858
+#: g10/keygen.c:2859
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Яким є �трок чинно�ті підпи�у? (%s) "
 
-#: g10/keygen.c:2871 g10/keygen.c:2896
+#: g10/keygen.c:2875 g10/keygen.c:2900
 msgid "invalid value\n"
 msgstr "некоректне значенн�\n"
 
-#: g10/keygen.c:2878
+#: g10/keygen.c:2882
 msgid "Key does not expire at all\n"
 msgstr "Ключ не має обмеженн� �троку дії\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2883
 msgid "Signature does not expire at all\n"
 msgstr "Підпи� не має обмеженн� �троку дії\n"
 
-#: g10/keygen.c:2884
+#: g10/keygen.c:2888
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Ключ діє до %s\n"
 
-#: g10/keygen.c:2885
+#: g10/keygen.c:2889
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Підпи� діє до %s\n"
 
-#: g10/keygen.c:2889
+#: g10/keygen.c:2893
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5537,11 +5551,11 @@ msgstr ""
 "У вашій �и�темі неможливий показ дат пі�л� 2038 року.\n"
 "�ле програма коректно обробл�тиме ці дати до 2106 року.\n"
 
-#: g10/keygen.c:2902
+#: g10/keygen.c:2906
 msgid "Is this correct? (y/N) "
 msgstr "В�е правильно? (y/N або т/�) "
 
-#: g10/keygen.c:2970
+#: g10/keygen.c:2974
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5556,7 +5570,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2985
+#: g10/keygen.c:2989
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5573,49 +5587,49 @@ msgstr ""
 "    \"Ivan Ivanenko (farmer) <iivanenko@moyahata.ua>\"\n"
 "\n"
 
-#: g10/keygen.c:3004
+#: g10/keygen.c:3008
 msgid "Real name: "
 msgstr "Справжнє ім’�: "
 
-#: g10/keygen.c:3013
+#: g10/keygen.c:3017
 msgid "Invalid character in name\n"
 msgstr "�екоректний �имвол у імені\n"
 
-#: g10/keygen.c:3014
+#: g10/keygen.c:3018
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr "�е можна викори�товувати �имволи «%s» і «%s» у назві\n"
 
-#: g10/keygen.c:3018
+#: g10/keygen.c:3022
 msgid "Name may not start with a digit\n"
 msgstr "Ім’� не може починати�� з цифри\n"
 
-#: g10/keygen.c:3021
+#: g10/keygen.c:3025
 msgid "Name must be at least 5 characters long\n"
 msgstr "Ім’� має бути не коротшим за 5 літер\n"
 
-#: g10/keygen.c:3031
+#: g10/keygen.c:3035
 msgid "Email address: "
 msgstr "�дре�а ел. пошти: "
 
-#: g10/keygen.c:3037
+#: g10/keygen.c:3041
 msgid "Not a valid email address\n"
 msgstr "�екоректна адре�а електронної пошти\n"
 
-#: g10/keygen.c:3046
+#: g10/keygen.c:3050
 msgid "Comment: "
 msgstr "Коментар: "
 
-#: g10/keygen.c:3052
+#: g10/keygen.c:3056
 msgid "Invalid character in comment\n"
 msgstr "�екоректний �имвол у коментарі\n"
 
-#: g10/keygen.c:3088
+#: g10/keygen.c:3092
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr "Вами викори�тано таблицю �имволів «%s».\n"
 
-#: g10/keygen.c:3094
+#: g10/keygen.c:3098
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5626,7 +5640,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3099
+#: g10/keygen.c:3103
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Будь ла�ка, не викори�товуйте адре�у електронної пошти у пол�х �правжнього "
@@ -5643,32 +5657,32 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3124
+#: g10/keygen.c:3128
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:3134
+#: g10/keygen.c:3138
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Змінити назву (N), коментар (C), ел. пошту (E) або вийти (Q)? "
 
-#: g10/keygen.c:3135
+#: g10/keygen.c:3139
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "Змінити назву (N), коментар (C), ел. пошту (E) або гаразд (O) чи вийти (Q)? "
 
-#: g10/keygen.c:3140
+#: g10/keygen.c:3144
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Змінити назву (N), ел. пошту (E) або вийти (Q)? "
 
-#: g10/keygen.c:3141
+#: g10/keygen.c:3145
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "Змінити назву (N), ел. пошту (E) або гаразд (O) чи вийти (Q)? "
 
-#: g10/keygen.c:3160
+#: g10/keygen.c:3164
 msgid "Please correct the error first\n"
 msgstr "Спочатку виправте помилку\n"
 
-#: g10/keygen.c:3206
+#: g10/keygen.c:3210
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -5680,18 +5694,18 @@ msgstr ""
 "під ча� �творенн� про�того чи�ла. Це нада�ть змогу генератору\n"
 "п�евдовипадкових чи�ел �творити краще випадкове чи�ло.\n"
 
-#: g10/keygen.c:3591
+#: g10/keygen.c:3595
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4590 g10/keygen.c:4663 g10/keygen.c:4681 g10/keygen.c:4710
-#: g10/keygen.c:5086 g10/keygen.c:5632 g10/keygen.c:5943 g10/keygen.c:6050
+#: g10/keygen.c:4594 g10/keygen.c:4667 g10/keygen.c:4685 g10/keygen.c:4714
+#: g10/keygen.c:5113 g10/keygen.c:5663 g10/keygen.c:5974 g10/keygen.c:6081
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Помилка під ча� �проби �творенн� ключа: %s\n"
 
-#: g10/keygen.c:4599
+#: g10/keygen.c:4603
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5702,66 +5716,66 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:4601
+#: g10/keygen.c:4605
 msgid "Continue? (Y/n) "
 msgstr "Продовжити? (Y (так)/n (ні)) "
 
-#: g10/keygen.c:4622
+#: g10/keygen.c:4626
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "Ключ дл� «%s» вже і�нує\n"
 
-#: g10/keygen.c:4627
+#: g10/keygen.c:4631
 msgid "Create anyway? (y/N) "
 msgstr "Створити попри це? (y (так)/N (ні)) "
 
-#: g10/keygen.c:4633
+#: g10/keygen.c:4637
 #, c-format
 msgid "creating anyway\n"
 msgstr "�творюємо попри у�е\n"
 
-#: g10/keygen.c:5069
+#: g10/keygen.c:5096
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 "Зауваженн�: �кори�тайте�� «%s %s», щоб викликати повноцінне діалогове вікно "
 "�творенн� ключа.\n"
 
-#: g10/keygen.c:5118
+#: g10/keygen.c:5145
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Створенн� ключа �ка�овано.\n"
 
-#: g10/keygen.c:5178
+#: g10/keygen.c:5205
 #, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "не вдало�� �творити файл резервної копії «%s»: %s\n"
 
-#: g10/keygen.c:5198
+#: g10/keygen.c:5225
 #, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "З�УВ�ЖЕ��Я: резервну копію ключа на картці збережено до «%s»\n"
 
-#: g10/keygen.c:5359 g10/keygen.c:5561
+#: g10/keygen.c:5389 g10/keygen.c:5591
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr "запи�уємо відкритий ключ до «%s»\n"
 
-#: g10/keygen.c:5555
+#: g10/keygen.c:5585
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "не знайдено придатного до запи�у �ховища відкритих ключів: %s\n"
 
-#: g10/keygen.c:5569
+#: g10/keygen.c:5599
 #, c-format
 msgid "error writing public keyring '%s': %s\n"
 msgstr "помилка під ча� �проби запи�у до �ховища відкритих ключів «%s»: %s\n"
 
-#: g10/keygen.c:5603
+#: g10/keygen.c:5634
 msgid "public and secret key created and signed.\n"
 msgstr "відкритий і закритий ключі �творено і підпи�ано.\n"
 
-#: g10/keygen.c:5619
+#: g10/keygen.c:5650
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -5769,7 +5783,7 @@ msgstr ""
 "Зауважте, що цей ключ не може бути викори�тано дл� шифруванн�. Ви можете\n"
 "�кори�тати�� командою «--edit-key» дл� �творенн� підключа з цією метою.\n"
 
-#: g10/keygen.c:5801 g10/keygen.c:6000
+#: g10/keygen.c:5832 g10/keygen.c:6031
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5777,7 +5791,7 @@ msgstr ""
 "ключ було �творено з позначкою на %lu �екунд у майбутньому (ча�ова петл� або "
 "проблема з годинником)\n"
 
-#: g10/keygen.c:5803 g10/keygen.c:6002
+#: g10/keygen.c:5834 g10/keygen.c:6033
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5785,22 +5799,22 @@ msgstr ""
 "ключ було �творено з позначкою на %lu �екунду у майбутньому (ча�ова петл� "
 "або проблема з годинником)\n"
 
-#: g10/keygen.c:5814 g10/keygen.c:6013
+#: g10/keygen.c:5845 g10/keygen.c:6044
 #, c-format
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "З�УВ�ЖЕ��Я: �творенн� підключів дл� ключів v3 не�умі�не з OpenPGP\n"
 
-#: g10/keygen.c:5826 g10/keygen.c:5828
+#: g10/keygen.c:5857 g10/keygen.c:5859
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Закриті ча�тини о�новного ключа недо�тупні.\n"
 
-#: g10/keygen.c:5835 g10/keygen.c:5837
+#: g10/keygen.c:5866 g10/keygen.c:5868
 #, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Закриті ча�тини о�новного ключа зберігають�� на картці.\n"
 
-#: g10/keygen.c:5857 g10/keygen.c:6027
+#: g10/keygen.c:5888 g10/keygen.c:6058
 msgid "Really create? (y/N) "
 msgstr "Створити? (y/N або т/�) "
 
@@ -5884,12 +5898,12 @@ msgstr "      Відбиток ключа ="
 msgid "      Card serial no. ="
 msgstr "Серійний номер картки ="
 
-#: g10/keyring.c:1467
+#: g10/keyring.c:1477
 #, c-format
 msgid "caching keyring '%s'\n"
 msgstr "кешуванн� �ховища ключів «%s»\n"
 
-#: g10/keyring.c:1541
+#: g10/keyring.c:1551
 #, c-format
 msgid "%lu keys cached so far (%lu signature)\n"
 msgid_plural "%lu keys cached so far (%lu signatures)\n"
@@ -5897,7 +5911,7 @@ msgstr[0] "зараз кешовано %lu ключів (%lu підпи�)\n"
 msgstr[1] "зараз кешовано %lu ключів (%lu підпи�и)\n"
 msgstr[2] "зараз кешовано %lu ключів (%lu підпи�ів)\n"
 
-#: g10/keyring.c:1557
+#: g10/keyring.c:1567
 #, c-format
 msgid "%lu key cached"
 msgid_plural "%lu keys cached"
@@ -5905,7 +5919,7 @@ msgstr[0] "кешовано %lu ключ"
 msgstr[1] "кешовано %lu ключі"
 msgstr[2] "кешовано %lu ключів"
 
-#: g10/keyring.c:1559
+#: g10/keyring.c:1569
 #, c-format
 msgid " (%lu signature)\n"
 msgid_plural " (%lu signatures)\n"
@@ -5913,7 +5927,7 @@ msgstr[0] " (%lu підпи�)\n"
 msgstr[1] " (%lu підпи�и)\n"
 msgstr[2] " (%lu підпи�ів)\n"
 
-#: g10/keyring.c:1636
+#: g10/keyring.c:1646
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: �творено �ховище ключів\n"
@@ -5942,25 +5956,25 @@ msgstr "автоматично отримувати ключі під чаÑ� пÐ
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "брати до уваги адре�у о�новного �ервера ключів, в�тановлену у ключі"
 
-#: g10/keyserver.c:537
+#: g10/keyserver.c:360
 msgid "disabled"
 msgstr "вимкнено"
 
-#: g10/keyserver.c:740
+#: g10/keyserver.c:563
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Вкажіть номер, далі (N) чи вийти (Q) > "
 
-#: g10/keyserver.c:846
+#: g10/keyserver.c:669
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "некоректний протокол �ервера ключів (наш %d!=%d обробника)\n"
 
-#: g10/keyserver.c:986 g10/keyserver.c:1096
+#: g10/keyserver.c:809 g10/keyserver.c:919
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "«%s» не є ідентифікатором ключа: пропу�каємо\n"
 
-#: g10/keyserver.c:1420 g10/keyserver.c:1453
+#: g10/keyserver.c:1217 g10/keyserver.c:1250
 #, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
@@ -5968,52 +5982,47 @@ msgstr[0] "оновлюємо %d ключ з %s\n"
 msgstr[1] "оновлюємо %d ключі з %s\n"
 msgstr[2] "оновлюємо %d ключів з %s\n"
 
-#: g10/keyserver.c:1427
+#: g10/keyserver.c:1224
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "УВ�Г�: не вдало�� оновити ключ %s за допомогою %s: %s\n"
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1316
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "ключ «%s» не знайдено на �ервері ключів\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1319
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "ключ не знайдено на �ервері ключів\n"
 
-#: g10/keyserver.c:1722
-#, c-format
-msgid "requesting key %s from %s server %s\n"
-msgstr "над�илаємо запит щодо ключа %s до %s �ервера %s\n"
-
-#: g10/keyserver.c:1726
+#: g10/keyserver.c:1481
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "над�илаємо запит щодо ключа %s з %s\n"
 
-#: g10/keyserver.c:1841 g10/keyserver.c:2020
+#: g10/keyserver.c:1600 g10/keyserver.c:1793
 #, c-format
 msgid "no keyserver known\n"
 msgstr "немає відомих �ерверів ключів\n"
 
-#: g10/keyserver.c:1856 g10/skclist.c:213 g10/skclist.c:241
+#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "пропущено «%s»: %s\n"
 
-#: g10/keyserver.c:1860
+#: g10/keyserver.c:1619
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "над�илаємо ключ %s на %s\n"
 
-#: g10/keyserver.c:1901
+#: g10/keyserver.c:1662
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr "над�илаємо запит щодо ключа з «%s»\n"
 
-#: g10/keyserver.c:1917
+#: g10/keyserver.c:1680
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "УВ�Г�: не вдало�� отримати адре�у %s: %s\n"
@@ -6042,12 +6051,12 @@ msgstr ""
 "пароль �творено за допомогою невідомого алгоритму �творенн� контрольних �ум "
 "%d\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:473
 #, c-format
 msgid "public key is %s\n"
 msgstr "відкритий ключ — %s\n"
 
-#: g10/mainproc.c:524
+#: g10/mainproc.c:525
 #, 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"
@@ -6055,238 +6064,238 @@ msgstr ""
 "зашифровано за допомогою %u-бітового %s ключа, ідентифікатор %s, �творено "
 "%s\n"
 
-#: g10/mainproc.c:528 g10/pkclist.c:231
+#: g10/mainproc.c:529 g10/pkclist.c:231
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      «%s»\n"
 
-#: g10/mainproc.c:532
+#: g10/mainproc.c:533
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "зашифровано ключем %s, ідентифікатор %s\n"
 
-#: g10/mainproc.c:552 g10/mainproc.c:935
+#: g10/mainproc.c:553 g10/mainproc.c:937
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "УВ�Г�: ви�влено декілька фрагментів нешифрованого тек�ту\n"
 
-#: g10/mainproc.c:560
+#: g10/mainproc.c:561
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "зашифровано за допомогою %lu паролів\n"
 
-#: g10/mainproc.c:562
+#: g10/mainproc.c:563
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "зашифровано за допомогою 1 парол�\n"
 
-#: g10/mainproc.c:577 g10/mainproc.c:602
+#: g10/mainproc.c:578 g10/mainproc.c:603
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "невдала �проба розшифровуванн� відкритим ключем: %s\n"
 
-#: g10/mainproc.c:613
+#: g10/mainproc.c:614
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "зашифровані відкритим ключем дані: належний DEK\n"
 
-#: g10/mainproc.c:642 g10/mainproc.c:663
+#: g10/mainproc.c:643 g10/mainproc.c:664
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "припу�каємо, що дані зашифровано %s\n"
 
-#: g10/mainproc.c:649
+#: g10/mainproc.c:650
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "Шифр IDEA недо�тупний, �пробуємо �кори�тати�� замі�ть нього %s\n"
 
-#: g10/mainproc.c:742 g10/mainproc.c:780
+#: g10/mainproc.c:744 g10/mainproc.c:782
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "УВ�Г�: цілі�ні�ть повідомленн� не захищено\n"
 
-#: g10/mainproc.c:753
+#: g10/mainproc.c:755
 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:756
+#: g10/mainproc.c:758
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:761
+#: g10/mainproc.c:763
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "невдала �проба розшифруванн�: %s\n"
 
-#: g10/mainproc.c:773
+#: g10/mainproc.c:775
 #, c-format
 msgid "decryption okay\n"
 msgstr "розшифровано\n"
 
-#: g10/mainproc.c:786
+#: g10/mainproc.c:788
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "УВ�Г�: зашифроване повідомленн� було змінено!\n"
 
-#: g10/mainproc.c:804
+#: g10/mainproc.c:806
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "невдала �проба розшифруванн�: %s\n"
 
-#: g10/mainproc.c:851
+#: g10/mainproc.c:853
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "З�УВ�ЖЕ��Я: вимога відправника: «лише дл� Ва�»\n"
 
-#: g10/mainproc.c:858
+#: g10/mainproc.c:860
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "початкова назва файла=«%.*s»\n"
 
-#: g10/mainproc.c:1135
+#: g10/mainproc.c:1137
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "окреме відкликанн� — �кори�тайте�� командою «gpg --import» дл� за�то�уванн�\n"
 
-#: g10/mainproc.c:1440 g10/mainproc.c:1483
+#: g10/mainproc.c:1442 g10/mainproc.c:1485
 #, c-format
 msgid "no signature found\n"
 msgstr "підпи�у не знайдено\n"
 
-#: g10/mainproc.c:1763
+#: g10/mainproc.c:1765
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ПОМИЛКОВИЙ підпи� від «%s»"
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1767
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Про�трочений підпи� від «%s»"
 
-#: g10/mainproc.c:1767
+#: g10/mainproc.c:1769
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "�алежний підпи� від «%s»"
 
-#: g10/mainproc.c:1789
+#: g10/mainproc.c:1791
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "перевірку підпи�ів придушено\n"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1905
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "не вдало�� обробити ці дані з неоднозначним підпи�ом\n"
 
-#: g10/mainproc.c:1919 g10/mainproc.c:1926
+#: g10/mainproc.c:1921 g10/mainproc.c:1928
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Підпи� �творено %s\n"
 
-#: g10/mainproc.c:1920 g10/mainproc.c:1927 sm/verify.c:480
+#: g10/mainproc.c:1922 g10/mainproc.c:1929 sm/verify.c:480
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               за допомогою %s ключа %s\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1933
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Підпи� �творено %s ключем %s з ідентифікатором %s\n"
 
-#: g10/mainproc.c:1937
+#: g10/mainproc.c:1939
 #, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "               видавець «%s»\n"
 
-#: g10/mainproc.c:1992
+#: g10/mainproc.c:1994
 #, c-format
 msgid "Key available at: "
 msgstr "Ключ до�тупний на: "
 
-#: g10/mainproc.c:2034
+#: g10/mainproc.c:2036
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2234
+#: g10/mainproc.c:2236
 msgid "[uncertain]"
 msgstr "[непевний]"
 
-#: g10/mainproc.c:2272
+#: g10/mainproc.c:2274
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                або «%s»"
 
-#: g10/mainproc.c:2347
+#: g10/mainproc.c:2349
 #, c-format
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr ""
 "УВ�Г�: цей ключ не можна викори�товувати дл� підпи�уванн� у режимі %s\n"
 
-#: g10/mainproc.c:2363
+#: g10/mainproc.c:2365
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Строк дії підпи�у вичерпано %s\n"
 
-#: g10/mainproc.c:2368
+#: g10/mainproc.c:2370
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Підпи� діє до %s\n"
 
-#: g10/mainproc.c:2379
+#: g10/mainproc.c:2381
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s підпи�, алгоритм контрольної �уми %s%s%s\n"
 
-#: g10/mainproc.c:2380
+#: g10/mainproc.c:2382
 msgid "binary"
 msgstr "двійковий"
 
-#: g10/mainproc.c:2381
+#: g10/mainproc.c:2383
 msgid "textmode"
 msgstr "тек�товий"
 
-#: g10/mainproc.c:2381 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2383 g10/trust.c:112 dirmngr/ocsp.c:793
 msgid "unknown"
 msgstr "невідомо"
 
-#: g10/mainproc.c:2383
+#: g10/mainproc.c:2385
 msgid ", key algorithm "
 msgstr ", алгоритм ключа "
 
-#: g10/mainproc.c:2418
+#: g10/mainproc.c:2420
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr "УВ�Г�: не відє’днаний підпи�; файл «%s» не було перевірено!\n"
 
-#: g10/mainproc.c:2457
+#: g10/mainproc.c:2459
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "�е вдало�� перевірити підпи�: %s\n"
 
-#: g10/mainproc.c:2553 g10/mainproc.c:2572 g10/mainproc.c:2696
+#: g10/mainproc.c:2555 g10/mainproc.c:2574 g10/mainproc.c:2698
 #, c-format
 msgid "not a detached signature\n"
 msgstr "не є від’єднаним підпи�ом\n"
 
-#: g10/mainproc.c:2606
+#: g10/mainproc.c:2608
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "УВ�Г�: ви�влено кратні підпи�и. Буде перевірено лише перший.\n"
 
-#: g10/mainproc.c:2615
+#: g10/mainproc.c:2617
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "окремий підпи� кла�у 0x%02x\n"
 
-#: g10/mainproc.c:2700
+#: g10/mainproc.c:2702
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "підпи� у за�тарілому форматі (PGP 2.x)\n"
@@ -6475,45 +6484,51 @@ msgstr "Критична примітка підпи�у: "
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "підпакет типу %d мі�тить критичний набір бітів\n"
 
-#: g10/passphrase.c:208
+#: g10/passphrase.c:201 sm/decrypt.c:669
+#, fuzzy
+#| msgid "Please enter the new passphrase"
+msgid "Please enter the passphrase for decryption."
+msgstr "Вкажіть новий пароль"
+
+#: g10/passphrase.c:203
 msgid "Enter passphrase\n"
 msgstr "Вкажіть пароль\n"
 
-#: g10/passphrase.c:219
+#: g10/passphrase.c:227
 #, c-format
 msgid "cancelled by user\n"
 msgstr "�ка�овано кори�тувачем\n"
 
-#: g10/passphrase.c:460
+#: g10/passphrase.c:472
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (ідентифікатор о�новного ключа %s)"
 
-#: g10/passphrase.c:467
+#: g10/passphrase.c:479
 msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 msgstr "Вкажіть пароль дл� розблокуванн� закритого ключа OpenPGP:"
 
-#: g10/passphrase.c:471
+#: g10/passphrase.c:483
 msgid "Please enter the passphrase to import the OpenPGP secret key:"
 msgstr "Вкажіть пароль дл� імпортуванн� закритого ключа OpenPGP:"
 
-#: g10/passphrase.c:476
+#: g10/passphrase.c:488
 msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 msgstr "Вкажіть пароль дл� ек�портуванн� закритого підключа OpenPGP:"
 
-#: g10/passphrase.c:479
+#: g10/passphrase.c:491
 msgid "Please enter the passphrase to export the OpenPGP secret key:"
 msgstr "Вкажіть пароль дл� ек�портуванн� закритого ключа OpenPGP:"
 
-#: g10/passphrase.c:484
+#: g10/passphrase.c:496
 msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 msgstr "Справді хочете о�таточно вилучити закритий підключ OpenPGP:"
 
-#: g10/passphrase.c:487
+#: g10/passphrase.c:499
 msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgstr "Справді хочете о�таточно вилучити закритий ключ OpenPGP:"
 
-#: g10/passphrase.c:496
+#: g10/passphrase.c:508
 #, c-format
 msgid ""
 "%s\n"
@@ -6686,7 +6701,7 @@ msgstr ""
 "Мінімальним рівнем довіри до цього ключа є %s\n"
 "\n"
 
-#: g10/pkclist.c:313 g10/revoke.c:803
+#: g10/pkclist.c:313 g10/revoke.c:804
 msgid "Your decision? "
 msgstr "Ваше рішенн�? "
 
@@ -6984,7 +6999,7 @@ msgstr "не вдало�� відкрити підпи�ані дані «%s»\
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "не вдало�� відкрити підпи�ані дані fd=%d: %s\n"
 
-#: g10/pubkey-enc.c:99 sm/decrypt.c:879
+#: g10/pubkey-enc.c:99 sm/decrypt.c:1329
 #, c-format
 msgid "key %s is not suitable for decryption in %s mode\n"
 msgstr "ключ %s не можна викори�товувати дл� розшифровуванн� у режимі %s\n"
@@ -7031,7 +7046,7 @@ msgid "Note: key has been revoked"
 msgstr "З�УВ�ЖЕ��Я: ключ було відкликано"
 
 #: g10/revoke.c:100 g10/revoke.c:126 g10/revoke.c:172 g10/revoke.c:184
-#: g10/revoke.c:502
+#: g10/revoke.c:503
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "помилка build_packet: %s\n"
@@ -7058,11 +7073,11 @@ msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr ""
 "Створити підпи�аний �ертифікат відкликанн� дл� цього ключа? (y/N або т/�) "
 
-#: g10/revoke.c:334 g10/revoke.c:744
+#: g10/revoke.c:334 g10/revoke.c:745
 msgid "ASCII armored output forced.\n"
 msgstr "Призначено виведенн� у форматі ASCII.\n"
 
-#: g10/revoke.c:350 g10/revoke.c:481
+#: g10/revoke.c:350 g10/revoke.c:482
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "помилка make_keysig_packet: %s\n"
@@ -7076,11 +7091,11 @@ msgstr "Створено �ертифікат відкликанн�.\n"
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "дл� «%s» не знайдено ключів відкликанн�\n"
 
-#: g10/revoke.c:567
+#: g10/revoke.c:568
 msgid "This is a revocation certificate for the OpenPGP key:"
 msgstr "Це �ертифікат відкликанн� дл� ключа OpenPGP:"
 
-#: g10/revoke.c:583
+#: g10/revoke.c:584
 msgid ""
 "A revocation certificate is a kind of \"kill switch\" to publicly\n"
 "declare that a key shall not anymore be used.  It is not possible\n"
@@ -7091,7 +7106,7 @@ msgstr ""
 "Такий �ертифікат відкликанн� не можна �ка�овувати пі�л� його\n"
 "оприлюдненн�."
 
-#: g10/revoke.c:586
+#: g10/revoke.c:587
 msgid ""
 "Use it to revoke this key in case of a compromise or loss of\n"
 "the secret key.  However, if the secret key is still accessible,\n"
@@ -7106,7 +7121,7 @@ msgstr ""
 "можна знайти у розділах підручника з GnuPG щодо команди\n"
 "gpg «--generate-revocation»."
 
-#: g10/revoke.c:592
+#: g10/revoke.c:593
 msgid ""
 "To avoid an accidental use of this file, a colon has been inserted\n"
 "before the 5 dashes below.  Remove this colon with a text editor\n"
@@ -7117,12 +7132,12 @@ msgstr ""
 "редакторі, перш ніж імпортувати або оприлюднювати цей �ертифікат\n"
 "відкликанн�."
 
-#: g10/revoke.c:611
+#: g10/revoke.c:612
 #, c-format
 msgid "revocation certificate stored as '%s.rev'\n"
 msgstr "�ертифікат відкликанн� збережено �к «%s.rev»\n"
 
-#: g10/revoke.c:655
+#: g10/revoke.c:656
 #, c-format
 msgid "secret key \"%s\" not found\n"
 msgstr "закритий ключ «%s» не знайдено\n"
@@ -7130,21 +7145,21 @@ msgstr "закритий ключ «%s» не знайдено\n"
 #. TRANSLATORS: The %s prints a key specification which
 #. for example has been given at the command line.  Several lines
 #. lines with secret key infos are printed after this message.
-#: g10/revoke.c:680
+#: g10/revoke.c:681
 #, c-format
 msgid "'%s' matches multiple secret keys:\n"
 msgstr "«%s» відповідає декільком закритим ключам:\n"
 
-#: g10/revoke.c:705
+#: g10/revoke.c:706
 #, c-format
 msgid "error searching the keyring: %s\n"
 msgstr "помилка під ча� �проби пошуку у �ховищі ключів: %s\n"
 
-#: g10/revoke.c:728
+#: g10/revoke.c:729
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Створити �ертифікат відкликанн� дл� цього ключа? (y/N або т/�) "
 
-#: g10/revoke.c:752
+#: g10/revoke.c:753
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -7164,33 +7179,33 @@ msgstr ""
 "може зберігати дані друку, до�туп до �ких зможуть отримати\n"
 "�торонні люди!\n"
 
-#: g10/revoke.c:786
+#: g10/revoke.c:787
 msgid "Please select the reason for the revocation:\n"
 msgstr "Будь ла�ка, вкажіть причину відкликанн�:\n"
 
-#: g10/revoke.c:796
+#: g10/revoke.c:797
 msgid "Cancel"
 msgstr "Ска�увати"
 
-#: g10/revoke.c:798
+#: g10/revoke.c:799
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Ймовірно, вам варто тут вибрати %d)\n"
 
-#: g10/revoke.c:839
+#: g10/revoke.c:843
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Вкажіть необов’�зковий опи�; завершіть його порожнім р�дком:\n"
 
-#: g10/revoke.c:867
+#: g10/revoke.c:871
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Причина відкликанн�: %s\n"
 
-#: g10/revoke.c:869
+#: g10/revoke.c:873
 msgid "(No description given)\n"
 msgstr "(Опи�у не надано)\n"
 
-#: g10/revoke.c:874
+#: g10/revoke.c:878
 msgid "Is this okay? (y/N) "
 msgstr "В�е правильно? (y/N або т/�) "
 
@@ -7376,24 +7391,24 @@ msgstr "підпи�уванн�:"
 msgid "%s.%s encryption will be used\n"
 msgstr "Буде викори�тано шифруванн� %s\n"
 
-#: g10/skclist.c:172 g10/skclist.c:253
+#: g10/skclist.c:173 g10/skclist.c:254
 #, c-format
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "ключ не було позначено �к ненадійний — не можна викори�товувати його з "
 "фіктивним RNG!\n"
 
-#: g10/skclist.c:204
+#: g10/skclist.c:205
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "пропущено «%s»: дублюванн�\n"
 
-#: g10/skclist.c:223
+#: g10/skclist.c:224
 #, c-format
 msgid "skipped: secret key already present\n"
 msgstr "пропущено: закритий ключ вже і�нує\n"
 
-#: g10/skclist.c:242
+#: g10/skclist.c:243
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "це ключ Elgamal �творений за допомогою PGP, цей ключ недо�татньо безпечний "
@@ -7617,10 +7632,10 @@ msgstr "непідтримувана вер�і� бази даних TOFU: %s\n
 msgid "TOFU DB error"
 msgstr "помилка бази даних TOFU"
 
-#: g10/tofu.c:687 g10/tofu.c:2073 g10/tofu.c:2354 g10/tofu.c:2373
-#: g10/tofu.c:2386 g10/tofu.c:2398 g10/tofu.c:2413 g10/tofu.c:2425
-#: g10/tofu.c:3021 g10/tofu.c:3038 g10/tofu.c:3075 g10/tofu.c:3092
-#: g10/tofu.c:3404
+#: g10/tofu.c:687 g10/tofu.c:2077 g10/tofu.c:2358 g10/tofu.c:2377
+#: g10/tofu.c:2390 g10/tofu.c:2402 g10/tofu.c:2417 g10/tofu.c:2429
+#: g10/tofu.c:3025 g10/tofu.c:3042 g10/tofu.c:3079 g10/tofu.c:3096
+#: g10/tofu.c:3408
 #, c-format
 msgid "error reading TOFU database: %s\n"
 msgstr "помилка під ча� �проби читанн� бази даних TOFU: %s\n"
@@ -7640,7 +7655,7 @@ msgstr "помилка під чаÑ� Ñ�проби ініціалізації бÐ
 msgid "error opening TOFU database '%s': %s\n"
 msgstr "помилка під ча� �проби відкрити бази даних TOFU «%s»: %s\n"
 
-#: g10/tofu.c:1148 g10/tofu.c:3458 g10/tofu.c:3604
+#: g10/tofu.c:1148 g10/tofu.c:3462 g10/tofu.c:3608
 #, c-format
 msgid "error updating TOFU database: %s\n"
 msgstr "помилка під ча� �проби оновленн� бази даних TOFU: %s\n"
@@ -7683,18 +7698,18 @@ msgstr "помилка під чаÑ� збираннÑ� інших ідентифÑ
 msgid "This key's user IDs:\n"
 msgstr "Ідентифікатори кори�тувачів цього ключа:\n"
 
-#: g10/tofu.c:1634 g10/tofu.c:1799
+#: g10/tofu.c:1634 g10/tofu.c:1801
 #, c-format
 msgid "policy: %s"
 msgstr "правило: %s"
 
-#: g10/tofu.c:1725
+#: g10/tofu.c:1727
 #, c-format
 msgid "error gathering signature stats: %s\n"
 msgstr ""
 "помилка під ча� �проби зібрати �тати�тичні дані щодо підпи�уванн�: %s\n"
 
-#: g10/tofu.c:1729
+#: g10/tofu.c:1731
 #, c-format
 msgid "The email address \"%s\" is associated with %d key:\n"
 msgid_plural "The email address \"%s\" is associated with %d keys:\n"
@@ -7702,16 +7717,16 @@ msgstr[0] "�дре�у електронної пошти «%s» пов’�за
 msgstr[1] "�дре�у електронної пошти «%s» пов’�зано із %d ключами:\n"
 msgstr[2] "�дре�у електронної пошти «%s» пов’�зано із %d ключами:\n"
 
-#: g10/tofu.c:1747
+#: g10/tofu.c:1749
 #, c-format
 msgid "Statistics for keys with the email address \"%s\":\n"
 msgstr "Стати�тичні дані дл� ключів із адре�ою електронної пошти «%s»:\n"
 
-#: g10/tofu.c:1797
+#: g10/tofu.c:1799
 msgid "this key"
 msgstr "цей ключ"
 
-#: g10/tofu.c:1823
+#: g10/tofu.c:1825
 #, c-format
 msgid "Verified %d message."
 msgid_plural "Verified %d messages."
@@ -7719,7 +7734,7 @@ msgstr[0] "Перевірено %d повідомленн�."
 msgstr[1] "Перевірено %d повідомленн�."
 msgstr[2] "Перевірено %d повідомлень."
 
-#: g10/tofu.c:1827
+#: g10/tofu.c:1829
 #, c-format
 msgid "Encrypted %d message."
 msgid_plural "Encrypted %d messages."
@@ -7727,7 +7742,7 @@ msgstr[0] "Зашифровано %d повідомленн�."
 msgstr[1] "Зашифровано %d повідомленн�."
 msgstr[2] "Зашифровано %d повідомлень."
 
-#: g10/tofu.c:1834
+#: g10/tofu.c:1836
 #, c-format
 msgid "Verified %d message in the future."
 msgid_plural "Verified %d messages in the future."
@@ -7735,7 +7750,7 @@ msgstr[0] "Перевірено %d повідомленнÑ� у майбутньÐ
 msgstr[1] "Перевірено %d повідомленн� у майбутньому."
 msgstr[2] "Перевірено %d повідомлень у майбутньому."
 
-#: g10/tofu.c:1838
+#: g10/tofu.c:1840
 #, c-format
 msgid "Encrypted %d message in the future."
 msgid_plural "Encrypted %d messages in the future."
@@ -7743,7 +7758,7 @@ msgstr[0] "Зашифровано %d повідомленнÑ� у майбутнÑ
 msgstr[1] "Зашифровано %d повідомленн� у майбутньому."
 msgstr[2] "Зашифровано %d повідомлень у майбутньому."
 
-#: g10/tofu.c:1852
+#: g10/tofu.c:1854
 #, c-format
 msgid "Messages verified over the past %d day: %d."
 msgid_plural "Messages verified over the past %d days: %d."
@@ -7751,7 +7766,7 @@ msgstr[0] "Перевірено повідомлень прот�гом о�та
 msgstr[1] "Перевірено повідомлень прот�гом о�танніх %d днів: %d."
 msgstr[2] "Перевірено повідомлень прот�гом о�танніх %d днів: %d."
 
-#: g10/tofu.c:1858
+#: g10/tofu.c:1860
 #, c-format
 msgid "Messages encrypted over the past %d day: %d."
 msgid_plural "Messages encrypted over the past %d days: %d."
@@ -7759,7 +7774,7 @@ msgstr[0] "Повідомлень, Ñ�кі зашифровано протÑ�гоÐ
 msgstr[1] "Повідомлень, �кі зашифровано прот�гом о�танніх %d днів: %d."
 msgstr[2] "Повідомлень, �кі зашифровано прот�гом о�танніх %d днів: %d."
 
-#: g10/tofu.c:1868
+#: g10/tofu.c:1870
 #, c-format
 msgid "Messages verified over the past %d month: %d."
 msgid_plural "Messages verified over the past %d months: %d."
@@ -7767,7 +7782,7 @@ msgstr[0] "Перевірено повідомлень прот�гом о�та
 msgstr[1] "Перевірено повідомлень прот�гом о�танніх %d мі��ців: %d."
 msgstr[2] "Перевірено повідомлень прот�гом о�танніх %d мі��ців: %d."
 
-#: g10/tofu.c:1874
+#: g10/tofu.c:1876
 #, c-format
 msgid "Messages encrypted over the past %d month: %d."
 msgid_plural "Messages encrypted over the past %d months: %d."
@@ -7775,7 +7790,7 @@ msgstr[0] "Повідомлень, Ñ�кі зашифровано протÑ�гоÐ
 msgstr[1] "Повідомлень, �кі зашифровано прот�гом о�танніх %d мі��ців: %d."
 msgstr[2] "Повідомлень, �кі зашифровано прот�гом о�танніх %d мі��ців: %d."
 
-#: g10/tofu.c:1884
+#: g10/tofu.c:1886
 #, c-format
 msgid "Messages verified over the past %d year: %d."
 msgid_plural "Messages verified over the past %d years: %d."
@@ -7783,7 +7798,7 @@ msgstr[0] "Перевірено повідомлень прот�гом о�та
 msgstr[1] "Перевірено повідомлень прот�гом о�танніх %d років: %d."
 msgstr[2] "Перевірено повідомлень прот�гом о�танніх %d років: %d."
 
-#: g10/tofu.c:1890
+#: g10/tofu.c:1892
 #, c-format
 msgid "Messages encrypted over the past %d year: %d."
 msgid_plural "Messages encrypted over the past %d years: %d."
@@ -7791,12 +7806,12 @@ msgstr[0] "Повідомлень, Ñ�кі зашифровано протÑ�гоÐ
 msgstr[1] "Повідомлень, �кі зашифровано прот�гом о�танніх %d років: %d."
 msgstr[2] "Повідомлень, �кі зашифровано прот�гом о�танніх %d років: %d."
 
-#: g10/tofu.c:1898
+#: g10/tofu.c:1900
 #, c-format
 msgid "Messages verified in the past: %d."
 msgstr "Повідомлень, �кі перевірено у минулому: %d."
 
-#: g10/tofu.c:1902
+#: g10/tofu.c:1904
 #, c-format
 msgid "Messages encrypted in the past: %d."
 msgstr "Повідомлень, �кі зашифровано у минулому: %d."
@@ -7804,7 +7819,7 @@ msgstr "Повідомлень, Ñ�кі зашифровано у минуломÑ
 #. TRANSLATORS: Please translate the text found in the source
 #. * file below.  We don't directly internationalize that text so
 #. * that we can tweak it without breaking translations.
-#: g10/tofu.c:1919
+#: g10/tofu.c:1921
 msgid "TOFU detected a binding conflict"
 msgstr ""
 "Зазвичай, з певною адре�ою електронної пошти пов’�зано лише один ключ. Втім, "
@@ -7817,31 +7832,31 @@ msgstr ""
 #. TRANSLATORS: Two letters (normally the lower and upper case
 #. * version of the hotkey) for each of the five choices.  If
 #. * there is only one choice in your language, repeat it.
-#: g10/tofu.c:1961
+#: g10/tofu.c:1963
 msgid "gGaAuUrRbB"
 msgstr "gGaAuUrRbB"
 
-#: g10/tofu.c:1967
+#: g10/tofu.c:1969
 msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 "(G)Добрий, (A)Прийн�ти одноразово, (U)�евідомий, (R)Відкинути одноразово, "
 "(B)Поганий? "
 
-#: g10/tofu.c:1975
+#: g10/tofu.c:1978
 msgid "Defaulting to unknown.\n"
 msgstr "Типовим значенн�м є «невідомий».\n"
 
-#: g10/tofu.c:2093 g10/tofu.c:2228
+#: g10/tofu.c:2097 g10/tofu.c:2232
 #, c-format
 msgid "TOFU db corruption detected.\n"
 msgstr "Ви�влено пошкодженн� бази даних TOFU.\n"
 
-#: g10/tofu.c:2829
+#: g10/tofu.c:2833
 #, c-format
 msgid "error changing TOFU policy: %s\n"
 msgstr "помилка під ча� �проби змінити правила TOFU: %s\n"
 
-#: g10/tofu.c:2880
+#: g10/tofu.c:2884
 #, c-format
 msgid "%lld~year"
 msgid_plural "%lld~years"
@@ -7849,7 +7864,7 @@ msgstr[0] "%lld~рік"
 msgstr[1] "%lld~роки"
 msgstr[2] "%lld~років"
 
-#: g10/tofu.c:2885
+#: g10/tofu.c:2889
 #, c-format
 msgid "%lld~month"
 msgid_plural "%lld~months"
@@ -7857,7 +7872,7 @@ msgstr[0] "%lld~мі��ць"
 msgstr[1] "%lld~мі��ці"
 msgstr[2] "%lld~мі��ців"
 
-#: g10/tofu.c:2890
+#: g10/tofu.c:2894
 #, c-format
 msgid "%lld~week"
 msgid_plural "%lld~weeks"
@@ -7865,7 +7880,7 @@ msgstr[0] "%lld~тиждень"
 msgstr[1] "%lld~тижні"
 msgstr[2] "%lld~тижнів"
 
-#: g10/tofu.c:2895
+#: g10/tofu.c:2899
 #, c-format
 msgid "%lld~day"
 msgid_plural "%lld~days"
@@ -7873,7 +7888,7 @@ msgstr[0] "%lld~день"
 msgstr[1] "%lld~дні"
 msgstr[2] "%lld~днів"
 
-#: g10/tofu.c:2900
+#: g10/tofu.c:2904
 #, c-format
 msgid "%lld~hour"
 msgid_plural "%lld~hours"
@@ -7881,7 +7896,7 @@ msgstr[0] "%lld~година"
 msgstr[1] "%lld~години"
 msgstr[2] "%lld~годин"
 
-#: g10/tofu.c:2905
+#: g10/tofu.c:2909
 #, c-format
 msgid "%lld~minute"
 msgid_plural "%lld~minutes"
@@ -7889,7 +7904,7 @@ msgstr[0] "%lld~хвилина"
 msgstr[1] "%lld~хвилини"
 msgstr[2] "%lld~хвилин"
 
-#: g10/tofu.c:2907
+#: g10/tofu.c:2911
 #, c-format
 msgid "%lld~second"
 msgid_plural "%lld~seconds"
@@ -7897,26 +7912,26 @@ msgstr[0] "%lld~�екунда"
 msgstr[1] "%lld~�екунди"
 msgstr[2] "%lld~�екунд"
 
-#: g10/tofu.c:3145
+#: g10/tofu.c:3149
 #, c-format
 msgid "%s: Verified 0~signatures and encrypted 0~messages."
 msgstr "%s: перевірено 0~підпи�ів і зашифровано 0~повідомлень."
 
-#: g10/tofu.c:3151
+#: g10/tofu.c:3155
 #, c-format
 msgid "%s: Verified 0 signatures."
 msgstr "%s: перевірено 0 підпи�ів."
 
-#: g10/tofu.c:3165
+#: g10/tofu.c:3169
 msgid "Encrypted 0 messages."
 msgstr "Зашифровано 0 повідомлень."
 
-#: g10/tofu.c:3181
+#: g10/tofu.c:3185
 #, c-format
 msgid "(policy: %s)"
 msgstr "(правило: %s)"
 
-#: g10/tofu.c:3215
+#: g10/tofu.c:3219
 #, c-format
 msgid ""
 "Warning: we have yet to see a message signed using this key and user id!\n"
@@ -7924,7 +7939,7 @@ msgstr ""
 "Попередженн�: ще не і�нує повідомлень, �кі було б підпи�ано цим ключем та "
 "ідентифікатором кори�тувача!\n"
 
-#: g10/tofu.c:3218
+#: g10/tofu.c:3222
 #, c-format
 msgid ""
 "Warning: we've only seen one message signed using this key and user id!\n"
@@ -7932,17 +7947,17 @@ msgstr ""
 "Попередженн�: за допомогою цього ключа і ідентифікатора кори�тувача "
 "підпи�ано лише одне повідомленн�!\n"
 
-#: g10/tofu.c:3222
+#: g10/tofu.c:3226
 #, c-format
 msgid "Warning: you have yet to encrypt a message to this key!\n"
 msgstr "Попередженн�: цим ключем ще не зашифровано жодного повідомленн�!\n"
 
-#: g10/tofu.c:3225
+#: g10/tofu.c:3229
 #, c-format
 msgid "Warning: you have only encrypted one message to this key!\n"
 msgstr "Попередженн�: цим ключем було зашифровано лише одне повідомленн�!\n"
 
-#: g10/tofu.c:3254
+#: g10/tofu.c:3258
 #, c-format
 msgid ""
 "Warning: if you think you've seen more signatures by this key and user id, "
@@ -7978,13 +7993,13 @@ msgstr[2] ""
 "  %s\n"
 "дл� позначенн� ключа �к помилкового.\n"
 
-#: g10/tofu.c:3339 g10/tofu.c:3502 g10/tofu.c:3708 g10/tofu.c:3761
-#: g10/tofu.c:3902 g10/tofu.c:3979 g10/tofu.c:4017
+#: g10/tofu.c:3343 g10/tofu.c:3506 g10/tofu.c:3712 g10/tofu.c:3765
+#: g10/tofu.c:3906 g10/tofu.c:3983 g10/tofu.c:4021
 #, c-format
 msgid "error opening TOFU database: %s\n"
 msgstr "помилка під ча� �проби відкрити бази даних TOFU: %s\n"
 
-#: g10/tofu.c:3535
+#: g10/tofu.c:3539
 #, c-format
 msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
 msgstr ""
@@ -8054,7 +8069,7 @@ msgstr "викори�товуємо модель довіри %s\n"
 msgid "no need for a trustdb check\n"
 msgstr "потреби у перевірці trustdb немає\n"
 
-#: g10/trustdb.c:601 g10/trustdb.c:2272
+#: g10/trustdb.c:601 g10/trustdb.c:2273
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "на�тупну перевірку trustdb призначено на %s\n"
@@ -8084,7 +8099,7 @@ msgstr "будь ла�ка, �кори�тайте�� параметром --c
 msgid "checking the trustdb\n"
 msgstr "перевірка trustdb\n"
 
-#: g10/trustdb.c:1993
+#: g10/trustdb.c:1994
 #, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
@@ -8092,7 +8107,7 @@ msgstr[0] "оброблено %d ключ"
 msgstr[1] "оброблено %d ключі"
 msgstr[2] "оброблено %d ключів"
 
-#: g10/trustdb.c:1996
+#: g10/trustdb.c:1997
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
@@ -8100,17 +8115,17 @@ msgstr[0] " (очищено %d значенн� чинно�ті)\n"
 msgstr[1] " (очищено %d значенн� чинно�ті)\n"
 msgstr[2] " (очищено %d значень чинно�ті)\n"
 
-#: g10/trustdb.c:2066
+#: g10/trustdb.c:2067
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "не знайдено ключів з необмеженою довірою\n"
 
-#: g10/trustdb.c:2080
+#: g10/trustdb.c:2081
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "не знайдено відкритий ключ ключа з необмеженою довірою %s\n"
 
-#: g10/trustdb.c:2198
+#: g10/trustdb.c:2199
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -8118,28 +8133,28 @@ msgstr ""
 "глибина: %d  чинні�ть: %3d  підпи�ано: %3d  надійні�ть: %d-, %dq, %dn, %dm, "
 "%df, %du\n"
 
-#: g10/trustdb.c:2279
+#: g10/trustdb.c:2280
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "не вдало�� оновити запи� вер�ії trustdb: помилка запи�у: %s\n"
 
-#: g10/trust.c:125
+#: g10/trust.c:114
 msgid "undefined"
 msgstr "не визначено"
 
-#: g10/trust.c:126
+#: g10/trust.c:115
 msgid "never"
 msgstr "ніколи"
 
-#: g10/trust.c:127
+#: g10/trust.c:116
 msgid "marginal"
 msgstr "неповна"
 
-#: g10/trust.c:128
+#: g10/trust.c:117
 msgid "full"
 msgstr "повна"
 
-#: g10/trust.c:129
+#: g10/trust.c:118
 msgid "ultimate"
 msgstr "безмежна"
 
@@ -8151,39 +8166,39 @@ msgstr "безмежна"
 #. It gets passed to atoi() so everything after the number is
 #. essentially a comment and need not be translated.  Either key and
 #. uid are both NULL, or neither are NULL.
-#: g10/trust.c:166
+#: g10/trust.c:155
 msgid "10 translator see trust.c:uid_trust_string_fixed"
 msgstr "10"
 
-#: g10/trust.c:169
+#: g10/trust.c:158
 msgid "[ revoked]"
 msgstr "[відклик.]"
 
-#: g10/trust.c:171 g10/trust.c:177
+#: g10/trust.c:160 g10/trust.c:166
 msgid "[ expired]"
 msgstr "[за�таріл]"
 
-#: g10/trust.c:176
+#: g10/trust.c:165
 msgid "[ unknown]"
 msgstr "[невідома]"
 
-#: g10/trust.c:178
+#: g10/trust.c:167
 msgid "[  undef ]"
 msgstr "[не визн.]"
 
-#: g10/trust.c:179
+#: g10/trust.c:168
 msgid "[  never ]"
 msgstr "[ ніколи ]"
 
-#: g10/trust.c:180
+#: g10/trust.c:169
 msgid "[marginal]"
 msgstr "[неповна ]"
 
-#: g10/trust.c:181
+#: g10/trust.c:170
 msgid "[  full  ]"
 msgstr "[ повна  ]"
 
-#: g10/trust.c:182
+#: g10/trust.c:171
 msgid "[ultimate]"
 msgstr "[безмежна]"
 
@@ -8243,16 +8258,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:4937 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2386
+#: scd/app-piv.c:1770 scd/app-p15.c:5035 scd/app-nks.c:1530
+#: scd/app-openpgp.c:2387
 #, 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:4956 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2402
+#: scd/app-piv.c:1787 scd/app-p15.c:5054 scd/app-nks.c:1549
+#: scd/app-openpgp.c:2403
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
@@ -8295,10 +8310,10 @@ msgstr ""
 "|P|Будь ла�ка, вкажіть код розблокуванн� пінкоду (PUK) дл� �тандартних "
 "ключів."
 
-#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2669
-#: scd/app-openpgp.c:2693 scd/app-openpgp.c:2871 scd/app-openpgp.c:2893
-#: scd/app-openpgp.c:3074 scd/app-openpgp.c:3361 scd/app-openpgp.c:3408
-#: scd/app-openpgp.c:3545 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2670
+#: scd/app-openpgp.c:2694 scd/app-openpgp.c:2872 scd/app-openpgp.c:2894
+#: scd/app-openpgp.c:3075 scd/app-openpgp.c:3362 scd/app-openpgp.c:3409
+#: scd/app-openpgp.c:3547 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "Зворотний виклик пінкоду повернув повідомленн� про помилку: %s\n"
@@ -8320,57 +8335,57 @@ msgstr "Пінкод длÑ� CHV%d занадто короткий; мінімаÐ
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr ""
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3616
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3618
 #, c-format
 msgid "key already exists\n"
 msgstr "ключ вже і�нує\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3620
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3622
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "вже �творений ключ буде замінено\n"
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3622
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3624
 #, c-format
 msgid "generating new key\n"
 msgstr "�творенн� нового ключа\n"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3624
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3626
 #, c-format
 msgid "writing new key\n"
 msgstr "запи�уванн� нового ключа\n"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4484 scd/app-openpgp.c:4767
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4486 scd/app-openpgp.c:4761
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "не вдало�� зберегти ключ: %s\n"
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1615
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1616
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr "відповідь не мі�тить о�нови чи�ленн� RSA\n"
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1622
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1623
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr "відповідь не мі�тить відкритого показника RSA\n"
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1732
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1733
 #, c-format
 msgid "response does not contain the EC public key\n"
 msgstr "відповідь не мі�тить відкритого ключа еліптичної кривої\n"
 
-#: scd/app-piv.c:3279 scd/app-openpgp.c:4943
+#: scd/app-piv.c:3279 scd/app-openpgp.c:4937
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr "зачекайте на завершенн� �творенн� ключа...\n"
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4951
+#: scd/app-piv.c:3294 scd/app-openpgp.c:4945
 #, c-format
 msgid "generating key failed\n"
 msgstr "помилка під ча� �творенн� ключа\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4957
+#: scd/app-piv.c:3300 scd/app-openpgp.c:4951
 #, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
@@ -8378,12 +8393,12 @@ msgstr[0] "Ñ�твореннÑ� ключа завершено (за %d Ñ�екунÐ
 msgstr[1] "�творенн� ключа завершено (за %d �екунди)\n"
 msgstr[2] "�творенн� ключа завершено (за %d �екунд)\n"
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1842 scd/app-openpgp.c:4966
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1843 scd/app-openpgp.c:4960
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr "відповідь не мі�тить даних відкритого ключа\n"
 
-#: scd/app-p15.c:5035 scd/app-nks.c:2038
+#: scd/app-p15.c:5133 scd/app-nks.c:2038
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 "||Будь ла�ка, вкажіть пінкод дл� ключа, призначеного дл� �творенн� �кі�них "
@@ -8391,28 +8406,28 @@ 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:5038 scd/app-openpgp.c:2818
+#: scd/app-p15.c:5136 scd/app-openpgp.c:2819
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Вкажіть адміні�тративний пінкод"
 
-#: scd/app-p15.c:5040 scd/app-nks.c:2028
+#: scd/app-p15.c:5138 scd/app-nks.c:2028
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr ""
 "|P|Будь ла�ка, вкажіть код розблокуванн� пінкоду (PUK) дл� �тандартних "
 "ключів."
 
-#: scd/app-p15.c:5043 scd/app-nks.c:2019
+#: scd/app-p15.c:5141 scd/app-nks.c:2019
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||Вкажіть пінкод дл� �тандартних ключів."
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4321
+#: scd/app-nks.c:1468 scd/app-openpgp.c:4323
 #, 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:4333
+#: scd/app-nks.c:1476 scd/app-openpgp.c:4335
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
@@ -8462,27 +8477,27 @@ msgstr ""
 "|P|Будь ла�ка, вкажіть код розблокуванн� пінкоду (PUK) дл� �творенн� �кі�них "
 "підпи�ів."
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3442 scd/app-dinsig.c:534
+#: scd/app-nks.c:2221 scd/app-openpgp.c:3443 scd/app-dinsig.c:534
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "помилка під ча� отриманн� нового пінкоду: %s\n"
 
-#: scd/app-openpgp.c:943
+#: scd/app-openpgp.c:944
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "не вдало�� зберегти відбиток: %s\n"
 
-#: scd/app-openpgp.c:956
+#: scd/app-openpgp.c:957
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "не вдало�� зберегти дату �творенн�: %s\n"
 
-#: scd/app-openpgp.c:1427 scd/app-openpgp.c:3389 scd/app-openpgp.c:5715
+#: scd/app-openpgp.c:1428 scd/app-openpgp.c:3390 scd/app-openpgp.c:5709
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "помилка отриманн� �тану CHV з картки\n"
 
-#: scd/app-openpgp.c:1949
+#: scd/app-openpgp.c:1950
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "помилка читанн� відкритого ключа: %s\n"
@@ -8490,44 +8505,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:2373
+#: scd/app-openpgp.c:2374
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2621
+#: scd/app-openpgp.c:2622
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "викори�товуємо типовий пінкод �к %s\n"
 
-#: scd/app-openpgp.c:2628
+#: scd/app-openpgp.c:2629
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 "не вдало�� викори�тати типовий пінкод �к %s: %s — вимикаємо подальше типове "
 "викори�танн�\n"
 
-#: scd/app-openpgp.c:2641
+#: scd/app-openpgp.c:2642
 msgid "||Please unlock the card"
 msgstr "||Будь ла�ка, розблокуйте картку"
 
-#: scd/app-openpgp.c:2700 scd/app-openpgp.c:2900 scd/app-openpgp.c:3368
+#: scd/app-openpgp.c:2701 scd/app-openpgp.c:2901 scd/app-openpgp.c:3369
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "Пінкод дл� CHV%d занадто короткий; мінімальна довжина — %d\n"
 
-#: scd/app-openpgp.c:2717 scd/app-openpgp.c:2760 scd/app-openpgp.c:2917
-#: scd/app-openpgp.c:5325
+#: scd/app-openpgp.c:2718 scd/app-openpgp.c:2761 scd/app-openpgp.c:2918
+#: scd/app-openpgp.c:5319
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "помилка перевірки CHV%d: %s\n"
 
-#: scd/app-openpgp.c:2804 scd/app-openpgp.c:5724
+#: scd/app-openpgp.c:2805 scd/app-openpgp.c:5718
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "картку заблоковано!\n"
 
-#: scd/app-openpgp.c:2808
+#: scd/app-openpgp.c:2809
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8542,20 +8557,20 @@ msgstr[2] ""
 "залишило�� %d �проб визначенн� адміні�тративного пінкоду перед тим, �к "
 "картку буде о�таточно заблоковано\n"
 
-#: scd/app-openpgp.c:2841
+#: scd/app-openpgp.c:2842
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr "до�туп до адміні�тративних команд не налаштовано\n"
 
-#: scd/app-openpgp.c:3355
+#: scd/app-openpgp.c:3356
 msgid "||Please enter the PIN"
 msgstr "||Вкажіть пінкод"
 
-#: scd/app-openpgp.c:3404
+#: scd/app-openpgp.c:3405
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Вкажіть код �киданн� коду картки"
 
-#: scd/app-openpgp.c:3414 scd/app-openpgp.c:3481
+#: scd/app-openpgp.c:3415 scd/app-openpgp.c:3484
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "Занадто короткий код �киданн�; мінімальна довжина — %d\n"
@@ -8563,79 +8578,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:3437
+#: scd/app-openpgp.c:3438
 msgid "|RN|New Reset Code"
 msgstr "|RN|�овий код �киданн�"
 
-#: scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3439
 msgid "|AN|New Admin PIN"
 msgstr "|AN|�овий адміні�тративний пінкод"
 
-#: scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3439
 msgid "|N|New PIN"
 msgstr "|N|�овий пінкод"
 
-#: scd/app-openpgp.c:3541
+#: scd/app-openpgp.c:3543
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "||Вкажіть адміні�тративний пінкод та новий адміні�тративний пінкод"
 
-#: scd/app-openpgp.c:3542
+#: scd/app-openpgp.c:3544
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Вкажіть пінкод та новий пінкод"
 
-#: scd/app-openpgp.c:3600 scd/app-openpgp.c:5026
+#: scd/app-openpgp.c:3602 scd/app-openpgp.c:5020
 #, c-format
 msgid "error reading application data\n"
 msgstr "помилка читанн� даних програми\n"
 
-#: scd/app-openpgp.c:3606 scd/app-openpgp.c:5033
+#: scd/app-openpgp.c:3608 scd/app-openpgp.c:5027
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "помилка читанн� відбитка DO\n"
 
-#: scd/app-openpgp.c:4302 scd/app-openpgp.c:4657
+#: scd/app-openpgp.c:4304 scd/app-openpgp.c:4653
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "не вказано ча�ової позначки �творенн�\n"
 
-#: scd/app-openpgp.c:4343 scd/app-openpgp.c:4351
+#: scd/app-openpgp.c:4345 scd/app-openpgp.c:4353
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 "�е знайдено про�того чи�ла RSA %s або чи�ло не належить до %d-бітових\n"
 
-#: scd/app-openpgp.c:4651
+#: scd/app-openpgp.c:4647
 #, c-format
 msgid "unsupported curve\n"
 msgstr "непідтримувана крива\n"
 
-#: scd/app-openpgp.c:4991
+#: scd/app-openpgp.c:4985
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "некоректна �труктура картки OpenPGP (DO 0x93)\n"
 
-#: scd/app-openpgp.c:5041
+#: scd/app-openpgp.c:5035
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr "відбиток на картці не відповідає запитаному\n"
 
-#: scd/app-openpgp.c:5240
+#: scd/app-openpgp.c:5234
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "карткою не підтримуєть�� алгоритм контрольних �ум %s\n"
 
-#: scd/app-openpgp.c:5298
+#: scd/app-openpgp.c:5292
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "вже �творено підпи�ів: %lu\n"
 
-#: scd/app-openpgp.c:5729
+#: scd/app-openpgp.c:5723
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr "перевірку адміні�тративного пінкоду заборонено цією командою\n"
 
-#: scd/app-openpgp.c:6241 scd/app-openpgp.c:6252
+#: scd/app-openpgp.c:6250 scd/app-openpgp.c:6261
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "не вдало�� отримати до�туп до %s — некоректна картка OpenPGP?\n"
@@ -8655,7 +8670,7 @@ msgstr "|N|Початковий новий пінкод"
 msgid "run in multi server mode (foreground)"
 msgstr "запу�тити у режимі декількох �ерверів (о�новному режимі)"
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:274 dirmngr/dirmngr.c:198
+#: scd/scdaemon.c:136 sm/gpgsm.c:274 dirmngr/dirmngr.c:199
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LEVEL|в�тановити вказаний рівень діагно�тики"
 
@@ -8718,12 +8733,12 @@ msgstr ""
 "будь ла�ка, �кори�тайте�� параметром «--daemon» дл� запу�ку програми у "
 "фоновому режимі\n"
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2104
+#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2143
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "запущено запу�к обробки дл� де�криптора %d\n"
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2112
+#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2151
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "роботу обробника дл� де�криптора %d перервано\n"
@@ -8733,11 +8748,11 @@ msgstr "роботу обробника длÑ� деÑ�криптора %d перÐ
 msgid "validation model requested by certificate: %s"
 msgstr "модель перевірки, запитана �ертифікатом: %s"
 
-#: sm/certchain.c:199 sm/certchain.c:2172
+#: sm/certchain.c:199 sm/certchain.c:2174
 msgid "chain"
 msgstr "ланцюжок"
 
-#: sm/certchain.c:200 sm/certchain.c:2172
+#: sm/certchain.c:200 sm/certchain.c:2174
 msgid "shell"
 msgstr "оболонка"
 
@@ -8770,226 +8785,226 @@ msgstr "Зауваженн�: заборонено некритичні прав
 msgid "certificate policy not allowed"
 msgstr "заборонено правила �ертифікації"
 
-#: sm/certchain.c:595 sm/keydb.c:1891 sm/keydb.c:1980
+#: sm/certchain.c:596 sm/keydb.c:1913 sm/keydb.c:2002
 #, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "не вдало�� отримати відбиток\n"
 
-#: sm/certchain.c:624
+#: sm/certchain.c:625
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr "пошук видавц� за зовнішньою адре�ою\n"
 
-#: sm/certchain.c:644
+#: sm/certchain.c:645
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "кількі�ть відповідних видавців: %d\n"
 
-#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#: sm/certchain.c:724 dirmngr/ocsp.c:683
 #, c-format
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "не вдало�� отримати authorityInfoAccess: %s\n"
 
-#: sm/certchain.c:791
+#: sm/certchain.c:792
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr "пошук видавц� у кеші dirmngr\n"
 
-#: sm/certchain.c:816
+#: sm/certchain.c:817
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "кількі�ть відповідних �ертифікатів: %d\n"
 
-#: sm/certchain.c:819
+#: sm/certchain.c:820
 #, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "помилка пошуку ключів лише з dirmngr: %s\n"
 
-#: sm/certchain.c:1046 sm/certchain.c:1561 sm/certchain.c:2200 sm/decrypt.c:643
-#: sm/encrypt.c:620 sm/import.c:414 sm/keydb.c:1898 sm/keydb.c:1987
-#: sm/sign.c:428 sm/verify.c:117
+#: sm/certchain.c:1047 sm/certchain.c:1562 sm/certchain.c:2202
+#: sm/decrypt.c:1084 sm/encrypt.c:621 sm/import.c:414 sm/keydb.c:1920
+#: sm/keydb.c:2009 sm/sign.c:428 sm/verify.c:117
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "не вдало�� розмі�тити де�криптор keyDB\n"
 
-#: sm/certchain.c:1232
+#: sm/certchain.c:1233
 msgid "certificate has been revoked"
 msgstr "�ертифікат відкликано"
 
-#: sm/certchain.c:1247
+#: sm/certchain.c:1248
 msgid "the status of the certificate is unknown"
 msgstr "�тан �ертифікату є невідомим"
 
-#: sm/certchain.c:1254
+#: sm/certchain.c:1255
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr "будь ла�ка, переконайте��, що «dirmngr» в�тановлено належним чином\n"
 
-#: sm/certchain.c:1260
+#: sm/certchain.c:1261
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "помилка під ча� перевірки CRL: %s"
 
-#: sm/certchain.c:1289 sm/certchain.c:1357 dirmngr/validate.c:497
+#: sm/certchain.c:1290 sm/certchain.c:1358 dirmngr/validate.c:497
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "�ертифікат з некоректною чинні�тю: %s"
 
-#: sm/certchain.c:1304 sm/certchain.c:1389 dirmngr/validate.c:515
+#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:515
 #, c-format
 msgid "certificate not yet valid"
 msgstr "�ертифікат ще не набув чинно�ті"
 
-#: sm/certchain.c:1305 sm/certchain.c:1390
+#: sm/certchain.c:1306 sm/certchain.c:1391
 msgid "root certificate not yet valid"
 msgstr "кореневий �ертифікат ще не набув чинно�ті"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1307 sm/certchain.c:1392
 msgid "intermediate certificate not yet valid"
 msgstr "проміжний �ертифікат ще не набув чинно�ті"
 
-#: sm/certchain.c:1319 dirmngr/validate.c:526
+#: sm/certchain.c:1320 dirmngr/validate.c:526
 #, c-format
 msgid "certificate has expired"
 msgstr "�трок дії �ертифіката завершив��"
 
-#: sm/certchain.c:1320
+#: sm/certchain.c:1321
 msgid "root certificate has expired"
 msgstr "�трок дії кореневого �ертифіката завершив��"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1322
 msgid "intermediate certificate has expired"
 msgstr "�трок дії проміжного �ертифіката завершив��"
 
-#: sm/certchain.c:1363
+#: sm/certchain.c:1364
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr "не ви�тачає обов’�зкових атрибутів �ертифіката: %s%s%s"
 
-#: sm/certchain.c:1372
+#: sm/certchain.c:1373
 msgid "certificate with invalid validity"
 msgstr "�ертифікат з некоректною чинні�тю"
 
-#: sm/certchain.c:1409
+#: sm/certchain.c:1410
 msgid "signature not created during lifetime of certificate"
 msgstr "підпи� не було �творено під ча� �троку дії �ертифіката"
 
-#: sm/certchain.c:1411
+#: sm/certchain.c:1412
 msgid "certificate not created during lifetime of issuer"
 msgstr "�ертифікат не було �творено під ча� �троку чинно�ті видавц�"
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1413
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr "проміжний �ертифікат не було �творено під ча� �троку чинно�ті видавц�"
 
-#: sm/certchain.c:1416
+#: sm/certchain.c:1417
 #, c-format
 msgid "  (  signature created at "
 msgstr "  (       підпи� �творено "
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1418
 #, c-format
 msgid "  (certificate created at "
 msgstr "  (   �ертифікат �творено "
 
-#: sm/certchain.c:1420
+#: sm/certchain.c:1421
 #, c-format
 msgid "  (certificate valid from "
 msgstr "  (   �ертифікат чинний з "
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1422
 #, c-format
 msgid "  (     issuer valid from "
 msgstr "  (     видавець чинний з "
 
-#: sm/certchain.c:1451 dirmngr/validate.c:577
+#: sm/certchain.c:1452 dirmngr/validate.c:577
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "відбиток=%s\n"
 
-#: sm/certchain.c:1460
+#: sm/certchain.c:1461
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr "кореневий �ертифікат було позначено �к надійний\n"
 
-#: sm/certchain.c:1473
+#: sm/certchain.c:1474
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr "не увімкнено інтерактивне позначенн� надійно�ті у gpg-agent\n"
 
-#: sm/certchain.c:1479
+#: sm/certchain.c:1480
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr "інтерактивне позначенн� надійно�ті вимкнено дл� цього �еан�у\n"
 
-#: sm/certchain.c:1538
+#: sm/certchain.c:1539
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr "УВ�Г�: невідомий ча� �творенн� підпи�у — припу�каємо поточний ча�"
 
-#: sm/certchain.c:1602
+#: sm/certchain.c:1603
 msgid "no issuer found in certificate"
 msgstr "у �ертифікаті не було знайдено даних щодо видавц�"
 
-#: sm/certchain.c:1680
+#: sm/certchain.c:1681
 msgid "self-signed certificate has a BAD signature"
 msgstr "�амопідпи�аний �ертифікат має ПОМИЛКОВИЙ підпи�"
 
-#: sm/certchain.c:1749 dirmngr/validate.c:575
+#: sm/certchain.c:1750 dirmngr/validate.c:575
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "кореневий �ертифікат не позначено �к надійний"
 
-#: sm/certchain.c:1765
+#: sm/certchain.c:1766
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "помилка перевірки �пи�ку довіри: %s\n"
 
-#: sm/certchain.c:1796 sm/import.c:175 dirmngr/validate.c:630
+#: sm/certchain.c:1797 sm/import.c:175 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "занадто довгий ланцюжок �ертифікації\n"
 
-#: sm/certchain.c:1808 dirmngr/validate.c:642
+#: sm/certchain.c:1809 dirmngr/validate.c:642
 #, c-format
 msgid "issuer certificate not found"
 msgstr "не знайдено видавц� �ертифіката"
 
-#: sm/certchain.c:1842 dirmngr/validate.c:668
+#: sm/certchain.c:1844 dirmngr/validate.c:668
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr "�ертифікат має ПОМИЛКОВИЙ підпи�"
 
-#: sm/certchain.c:1874 dirmngr/validate.c:692
+#: sm/certchain.c:1876 dirmngr/validate.c:692
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 "ви�влено інший можливий відповідний �ертифікат �лужби �ертифікації (CA) — "
 "повторюємо �пробу"
 
-#: sm/certchain.c:1933 dirmngr/validate.c:717
+#: sm/certchain.c:1935 dirmngr/validate.c:717
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "ланцюжок �ертифікації є довшим за дозволений CA (%d)"
 
-#: sm/certchain.c:1975 sm/certchain.c:2275 dirmngr/validate.c:747
+#: sm/certchain.c:1977 sm/certchain.c:2278 dirmngr/validate.c:747
 #, c-format
 msgid "certificate is good\n"
 msgstr "�ертифікат є належним\n"
 
-#: sm/certchain.c:1976
+#: sm/certchain.c:1978
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "належний проміжний �ертифікат\n"
 
-#: sm/certchain.c:1977
+#: sm/certchain.c:1979
 #, c-format
 msgid "root certificate is good\n"
 msgstr "належний кореневий �ертифікат\n"
 
-#: sm/certchain.c:2159
+#: sm/certchain.c:2161
 msgid "switching to chain model"
 msgstr "перемикаємо�� на ланцюгову модель"
 
-#: sm/certchain.c:2168
+#: sm/certchain.c:2170
 #, c-format
 msgid "validation model used: %s"
 msgstr "викори�тана модель перевірки: %s"
@@ -9000,18 +9015,18 @@ 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:1372 dirmngr/validate.c:903
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1411 dirmngr/validate.c:903
 #: dirmngr/validate.c:927
 #, c-format
 msgid "out of core\n"
 msgstr "вихід за межі обла�ті пам’�ті\n"
 
-#: sm/certcheck.c:389 sm/verify.c:212
+#: sm/certcheck.c:388 sm/verify.c:212
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(це алгоритм MD2)\n"
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:793
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:794
 msgid "none"
 msgstr "немає"
 
@@ -9306,17 +9321,17 @@ msgstr ""
 msgid "resource problem: out of core\n"
 msgstr "проблема з ре�ур�ами: вихід за межі пам’�ті\n"
 
-#: sm/decrypt.c:719
+#: sm/decrypt.c:1159
 #, c-format
 msgid "(this is the RC2 algorithm)\n"
 msgstr "(це алгоритм RC2)\n"
 
-#: sm/decrypt.c:721
+#: sm/decrypt.c:1161
 #, c-format
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr "(здаєть��, це не зашифроване повідомленн�)\n"
 
-#: sm/decrypt.c:868
+#: sm/decrypt.c:1318
 #, fuzzy, c-format
 #| msgid "encrypted with %s key, ID %s\n"
 msgid "encrypted to %s key %s\n"
@@ -9327,7 +9342,7 @@ msgstr "зашифровано ключем %s, ідентифікатор %s\n"
 msgid "certificate '%s' not found: %s\n"
 msgstr "�ертифіката «%s» не знайдено: %s\n"
 
-#: sm/delete.c:120 sm/keydb.c:1999 sm/keydb.c:2098
+#: sm/delete.c:120 sm/keydb.c:2021 sm/keydb.c:2120
 #, c-format
 msgid "error locking keybox: %s\n"
 msgstr "помилка під ча� блокуванн� �ховища ключів: %s\n"
@@ -9347,7 +9362,7 @@ msgstr "�ертифікат «%s» вилучено\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "помилка під ча� �проби вилученн� �ертифіката «%s»: %s\n"
 
-#: sm/encrypt.c:606
+#: sm/encrypt.c:607
 #, c-format
 msgid "no valid recipients given\n"
 msgstr "не вказано коректних отримувачів\n"
@@ -9417,65 +9432,65 @@ msgstr ""
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|FILE|додати �ховище ключів до �пи�ку �ховищ ключів"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:352 dirmngr/dirmngr.c:265
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "викори�товувати цей �ервер ключів дл� пошуку"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:363
 msgid "fetch missing issuer certificates"
 msgstr "�аді�лати запит щодо незнайдених �ертифікатів видавц�"
 
-#: sm/gpgsm.c:364
+#: sm/gpgsm.c:365
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "викори�товувати вказане кодуванн� дл� паролів PKCS#12"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:386
 msgid "never consult a CRL"
 msgstr "не викори�товувати С�С"
 
-#: sm/gpgsm.c:389
+#: sm/gpgsm.c:390
 msgid "do not check CRLs for root certificates"
 msgstr "не шукати у �пи�ках відкликаних �ертифікатів кореневі �ертифікати"
 
-#: sm/gpgsm.c:393
+#: sm/gpgsm.c:394
 msgid "check validity using OCSP"
 msgstr "перевір�ти чинні�ть за допомогою OCSP"
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:396
 msgid "do not check certificate policies"
 msgstr "не перевір�ти правила �ертифікатів"
 
-#: sm/gpgsm.c:398
+#: sm/gpgsm.c:399
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|викори�товувати вказаний алгоритм шифруванн�"
 
-#: sm/gpgsm.c:400
+#: sm/gpgsm.c:401
 msgid "|NAME|use message digest algorithm NAME"
 msgstr ""
 "|NAME|викори�товувати вказаний алгоритм обчи�ленн� контрольної �уми "
 "повідомленн�"
 
-#: sm/gpgsm.c:410
+#: sm/gpgsm.c:411
 msgid "batch mode: never ask"
 msgstr "пакетний режим: нічого не запитувати"
 
-#: sm/gpgsm.c:412
+#: sm/gpgsm.c:413
 msgid "assume yes on most questions"
 msgstr "вважати відповіддю на більші�ть питань «так»"
 
-#: sm/gpgsm.c:413
+#: sm/gpgsm.c:414
 msgid "assume no on most questions"
 msgstr "вважати відповіддю на більші�ть питань «ні»"
 
-#: sm/gpgsm.c:430
+#: sm/gpgsm.c:431
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FILE|запи�увати журнал перевірки до файла"
 
-#: sm/gpgsm.c:615
+#: sm/gpgsm.c:616
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Викори�танн�: @GPGSM@ [параметри] [файли] (-h — довідка)"
 
-#: sm/gpgsm.c:618
+#: sm/gpgsm.c:619
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -9486,52 +9501,27 @@ msgstr ""
 "протоколу S/MIME\n"
 "Типова ді� залежатиме від вхідних даних\n"
 
-#: sm/gpgsm.c:826
+#: sm/gpgsm.c:827
 #, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "З�УВ�ЖЕ��Я: не вда�ть�� зашифрувати до «%s»: %s\n"
 
-#: sm/gpgsm.c:837
+#: sm/gpgsm.c:838
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "невідома модель перевірки «%s»\n"
 
-#: sm/gpgsm.c:896 dirmngr/ldapserver.c:89
-#, c-format
-msgid "%s:%u: no hostname given\n"
-msgstr "%s:%u: не вказано назви вузла\n"
-
-#: sm/gpgsm.c:915 dirmngr/ldapserver.c:108
-#, c-format
-msgid "%s:%u: password given without user\n"
-msgstr "%s:%u: вказано пароль, але не вказано кори�тувача\n"
-
-#: sm/gpgsm.c:946 dirmngr/ldapserver.c:139
-#, c-format
-msgid "%s:%u: ignoring unknown flag '%s'\n"
-msgstr ""
-
-#: sm/gpgsm.c:962 dirmngr/ldapserver.c:155
-#, c-format
-msgid "%s:%u: skipping this line\n"
-msgstr "%s:%u: пропу�каємо цей р�док\n"
-
-#: sm/gpgsm.c:1550
-#, c-format
-msgid "could not parse keyserver\n"
-msgstr "не вдало�� обробити �ервер ключів\n"
-
-#: sm/gpgsm.c:1858
+#: sm/gpgsm.c:1711
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "імпортуємо загальні �ертифікати «%s»\n"
 
-#: sm/gpgsm.c:1904
+#: sm/gpgsm.c:1757
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "підпи�уванн� за допомогою «%s» неможливе: %s\n"
 
-#: sm/gpgsm.c:2273
+#: sm/gpgsm.c:2129
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "некоректна команда (немає не�вної команди)\n"
@@ -9551,53 +9541,53 @@ msgstr "помилка під чаÑ� Ñ�проби збереженнÑ� Ñ�ертÐ
 msgid "basic certificate checks failed - not imported\n"
 msgstr "помилка під ча� о�новних перевірок �ертифіката — не імпортовано\n"
 
-#: sm/import.c:471 sm/keydb.c:2018 sm/keydb.c:2111
+#: sm/import.c:472 sm/keydb.c:2040 sm/keydb.c:2133
 #, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "помилка під ча� �проби отриманн� збережених прапорців: %s\n"
 
-#: sm/import.c:530 sm/import.c:562
+#: sm/import.c:531 sm/import.c:563
 #, c-format
 msgid "error importing certificate: %s\n"
 msgstr "помилка під ча� �проби імпортуванн� �ертифіката: %s\n"
 
-#: sm/import.c:751 tools/gpg-connect-agent.c:1475
+#: sm/import.c:752 tools/gpg-connect-agent.c:1475
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "помилка під ча� �проби читанн� вхідних даних: %s\n"
 
-#: sm/keydb.c:503
+#: sm/keydb.c:508
 #, fuzzy, c-format
 #| msgid "no dirmngr running in this session\n"
 msgid "no keyboxd running in this session\n"
 msgstr "у цьому �еан�і не запущено dirmngr\n"
 
-#: sm/keydb.c:595
+#: sm/keydb.c:600
 #, c-format
 msgid "error opening key DB: %s\n"
 msgstr "помилка під ча� �проби відкрити базу даних ключів: %s\n"
 
-#: sm/keydb.c:1936
+#: sm/keydb.c:1958
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr "проблем з пошуком вже �твореного �ертифіката: %s\n"
 
-#: sm/keydb.c:1948
+#: sm/keydb.c:1970
 #, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "помилка під ча� �проби знайти придатну до запи�у keyDB: %s\n"
 
-#: sm/keydb.c:1956
+#: sm/keydb.c:1978
 #, c-format
 msgid "error storing certificate: %s\n"
 msgstr "помилка під ча� �проби збереженн� �ертифіката: %s\n"
 
-#: sm/keydb.c:2009
+#: sm/keydb.c:2031
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "проблема з повторним пошуком �ертифіката: %s\n"
 
-#: sm/keydb.c:2030 sm/keydb.c:2122
+#: sm/keydb.c:2052 sm/keydb.c:2144
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr "помилка під ча� �проби збереженн� позначок: %s\n"
@@ -9783,57 +9773,57 @@ msgstr "  призначенн� ="
 msgid "error loading certificate '%s': %s\n"
 msgstr "помилка під ча� �проби завантаженн� �ертифіката «%s»: %s\n"
 
-#: dirmngr/certcache.c:819
+#: dirmngr/certcache.c:820
 #, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "о�таточно завантажені �ертифікати: %u\n"
 
-#: dirmngr/certcache.c:821
+#: dirmngr/certcache.c:822
 #, c-format
 msgid "    runtime cached certificates: %u\n"
 msgstr "    динамічно кешовані �ертифікати: %u\n"
 
-#: dirmngr/certcache.c:823
+#: dirmngr/certcache.c:824
 #, c-format
 msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "           довірені �ертифікати: %u (%u,%u,%u,%u)\n"
 
-#: dirmngr/certcache.c:851 dirmngr/dirmngr-client.c:392
+#: dirmngr/certcache.c:852 dirmngr/dirmngr-client.c:392
 #, c-format
 msgid "certificate already cached\n"
 msgstr "�ертифікат вже кешовано\n"
 
-#: dirmngr/certcache.c:853
+#: dirmngr/certcache.c:854
 #, c-format
 msgid "certificate cached\n"
 msgstr "�ертифікат кешовано\n"
 
-#: dirmngr/certcache.c:855 dirmngr/certcache.c:875 dirmngr/dirmngr-client.c:396
+#: dirmngr/certcache.c:856 dirmngr/certcache.c:876 dirmngr/dirmngr-client.c:396
 #, c-format
 msgid "error caching certificate: %s\n"
 msgstr "помилка під ча� �проби кешуванн� �ертифіката: %s\n"
 
-#: dirmngr/certcache.c:938
+#: dirmngr/certcache.c:939
 #, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "некоректний р�док відбитка SHA1 «%s»\n"
 
-#: dirmngr/certcache.c:1384 dirmngr/certcache.c:1393
+#: dirmngr/certcache.c:1385 dirmngr/certcache.c:1394
 #, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "помилка під ча� �проби отриманн� �ертифіката за �ерійним номером: %s\n"
 
-#: dirmngr/certcache.c:1579 dirmngr/certcache.c:1588
+#: dirmngr/certcache.c:1580 dirmngr/certcache.c:1589
 #, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "помилка під ча� �проби отриманн� �ертифіката за призначенн�м: %s\n"
 
-#: dirmngr/certcache.c:1694 dirmngr/validate.c:483
+#: dirmngr/certcache.c:1695 dirmngr/validate.c:483
 #, c-format
 msgid "no issuer found in certificate\n"
 msgstr "у �ертифікаті не ви�влено запи�у видавц�\n"
 
-#: dirmngr/certcache.c:1704
+#: dirmngr/certcache.c:1705
 #, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "помилка під ча� �проби отриманн� authorityKeyIdentifier: %s\n"
@@ -9868,7 +9858,7 @@ msgstr "вилучаємо файл кешу «%s»\n"
 msgid "not removing file '%s'\n"
 msgstr "не вилучаємо файл «%s»\n"
 
-#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2380
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2383
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr "помилка під ча� �проби закритт� файла кешу: %s\n"
@@ -10104,13 +10094,13 @@ msgid "error getting data from cache file: %s\n"
 msgstr "помилка під ча� �проби отриманн� даних з файла кешу: %s\n"
 
 #: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1672 dirmngr/crlcache.c:1697
-#: dirmngr/crlcache.c:1763
+#: dirmngr/crlcache.c:1766
 #, c-format
 msgid "got an invalid S-expression from libksba\n"
 msgstr "отримано некоректний вираз S з libksba\n"
 
 #: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1679 dirmngr/crlcache.c:1705
-#: dirmngr/crlcache.c:1770 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1773 dirmngr/misc.c:176
 #, c-format
 msgid "converting S-expression failed: %s\n"
 msgstr "�проба перетворенн� виразу S зазнала невдачі: %s\n"
@@ -10125,139 +10115,139 @@ msgstr "невідомий алгоритм хешуванн� «%s»\n"
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr "помилка викори�танн� gcry_md_open дл� алгоритму %d: %s\n"
 
-#: dirmngr/crlcache.c:1797 dirmngr/ocsp.c:478
+#: dirmngr/crlcache.c:1800 dirmngr/ocsp.c:478
 #, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "�проба �творенн� виразу S зазнала невдачі: %s\n"
 
-#: dirmngr/crlcache.c:1871
+#: dirmngr/crlcache.c:1874
 #, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "помилка ksba_crl_parse: %s\n"
 
-#: dirmngr/crlcache.c:1886
+#: dirmngr/crlcache.c:1889
 #, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "помилка під ча� �проби отриманн� даних щодо ча�у оновленн� з CRL: %s\n"
 
-#: dirmngr/crlcache.c:1893
+#: dirmngr/crlcache.c:1896
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr "ча�и оновленн� цього CRL: поточне=%s на�тупне=%s\n"
 
-#: dirmngr/crlcache.c:1897
+#: dirmngr/crlcache.c:1900
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr "не вказано nextUpdate; вважаємо періодом чинно�ті один день\n"
 
-#: dirmngr/crlcache.c:1917
+#: dirmngr/crlcache.c:1920
 #, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "помилка під ча� �проби отриманн� запи�у CRL: %s\n"
 
-#: dirmngr/crlcache.c:1932
+#: dirmngr/crlcache.c:1935
 #, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr ""
 "помилка під ча� �проби додаванн� пункту до файла тимча�ового кешу: %s\n"
 
-#: dirmngr/crlcache.c:1959
+#: dirmngr/crlcache.c:1962
 #, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "не ви�влено видавц� CRL у CRL: %s\n"
 
-#: dirmngr/crlcache.c:1974
+#: dirmngr/crlcache.c:1977
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr "пошук видавц� CRL �ертифіката за authorityKeyIdentifier\n"
 
-#: dirmngr/crlcache.c:2020
+#: dirmngr/crlcache.c:2023
 #, c-format
 msgid "CRL signature verification failed: %s\n"
 msgstr "помилка перевірки підпи�у CRL: %s\n"
 
-#: dirmngr/crlcache.c:2032
+#: dirmngr/crlcache.c:2035
 #, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr ""
 "помилка під ча� �проби перевірки чинно�ті �ертифіката видавц� CRL: %s\n"
 
-#: dirmngr/crlcache.c:2174
+#: dirmngr/crlcache.c:2177
 #, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "помилка ksba_crl_new: %s\n"
 
-#: dirmngr/crlcache.c:2181
+#: dirmngr/crlcache.c:2184
 #, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "помилка ksba_crl_set_reader: %s\n"
 
-#: dirmngr/crlcache.c:2215
+#: dirmngr/crlcache.c:2218
 #, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "вилучено за�тарілий тимча�овий файл кешу «%s»\n"
 
-#: dirmngr/crlcache.c:2219
+#: dirmngr/crlcache.c:2222
 #, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr ""
 "помилка під ча� �проби вилученн� за�тарілого тимча�ового файла кешу «%s»: "
 "%s\n"
 
-#: dirmngr/crlcache.c:2229
+#: dirmngr/crlcache.c:2232
 #, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "помилка під ча� �проби �творенн� тимча�ового файла кешу «%s»: %s\n"
 
-#: dirmngr/crlcache.c:2239
+#: dirmngr/crlcache.c:2242
 #, c-format
 msgid "crl_parse_insert failed: %s\n"
 msgstr "помилка crl_parse_insert: %s\n"
 
-#: dirmngr/crlcache.c:2249
+#: dirmngr/crlcache.c:2252
 #, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr ""
 "помилка під ча� �проби завершенн� запи�у тимча�ового файла кешу «%s»: %s\n"
 
-#: dirmngr/crlcache.c:2256
+#: dirmngr/crlcache.c:2259
 #, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "помилка під ча� �проби закритт� тимча�ового файла кешу «%s»: %s\n"
 
-#: dirmngr/crlcache.c:2281
+#: dirmngr/crlcache.c:2284
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 "УВ�Г�: новий CRL в�е ще занадто �тарий; його �трок дії завершуєть�� %s — "
 "попри це завантажуємо\n"
 
-#: dirmngr/crlcache.c:2285
+#: dirmngr/crlcache.c:2288
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr "новий CRL в�е ще занадто �тарий; його �трок дії завершуєть�� %s\n"
 
-#: dirmngr/crlcache.c:2301
+#: dirmngr/crlcache.c:2304
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr "невідомий критичний додаток CRL %s\n"
 
-#: dirmngr/crlcache.c:2311
+#: dirmngr/crlcache.c:2314
 #, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "помилка під ча� читанн� додатків CRL: %s\n"
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2365
 #, c-format
 msgid "creating cache file '%s'\n"
 msgstr "�творюємо файл кешу «%s»\n"
 
-#: dirmngr/crlcache.c:2394
+#: dirmngr/crlcache.c:2397
 #, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "проблема під ча� перейменуванн� «%s» на «%s»: %s\n"
 
-#: dirmngr/crlcache.c:2408
+#: dirmngr/crlcache.c:2411
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
@@ -10266,12 +10256,12 @@ msgstr ""
 "помилка під ча� �проби оновленн� файла каталогу — запи� кешу буде втрачено "
 "під ча� на�тупного запу�ку програми\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2448
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr "Початок дампу CRL (отримано за допомогою %s)\n"
 
-#: dirmngr/crlcache.c:2468
+#: dirmngr/crlcache.c:2471
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
@@ -10279,54 +10269,54 @@ msgstr ""
 " ПОМИЛК�: CRL не буде викори�тано, о�кільки він в�е ще за�тарілий пі�л� "
 "оновленн�!\n"
 
-#: dirmngr/crlcache.c:2471
+#: dirmngr/crlcache.c:2474
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr " ПОМИЛК�: CRL не буде викори�тано через невідомий критичний додаток!\n"
 
-#: dirmngr/crlcache.c:2474
+#: dirmngr/crlcache.c:2477
 msgid " ERROR: The CRL will not be used\n"
 msgstr " ПОМИЛК�: CRL не буде викори�тано\n"
 
-#: dirmngr/crlcache.c:2481
+#: dirmngr/crlcache.c:2484
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr " ПОМИЛК�: цей кешований CRL можливо було підроблено!\n"
 
-#: dirmngr/crlcache.c:2499
+#: dirmngr/crlcache.c:2502
 #, c-format
 msgid " WARNING: invalid cache record length\n"
 msgstr " УВ�Г�: некоректна довжина запи�у кешу\n"
 
-#: dirmngr/crlcache.c:2506
+#: dirmngr/crlcache.c:2509
 #, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "проблема під ча� читанн� запи�у кешу: %s\n"
 
-#: dirmngr/crlcache.c:2517
+#: dirmngr/crlcache.c:2520
 #, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "проблема під ча� �проби читанн� ключа кешу: %s\n"
 
-#: dirmngr/crlcache.c:2548
+#: dirmngr/crlcache.c:2551
 #, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "помилка під ча� �проби читанн� запи�у кешу з бази даних: %s\n"
 
-#: dirmngr/crlcache.c:2551
+#: dirmngr/crlcache.c:2554
 msgid "End CRL dump\n"
 msgstr "Кінець дампу CRL\n"
 
-#: dirmngr/crlcache.c:2672
+#: dirmngr/crlcache.c:2675
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "помилка crl_fetch за DP: %s\n"
 
-#: dirmngr/crlcache.c:2683
+#: dirmngr/crlcache.c:2686
 #, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "помилка crl_cache_insert за DP: %s\n"
 
-#: dirmngr/crlcache.c:2743
+#: dirmngr/crlcache.c:2746
 #, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "помилка crl_cache_insert за видавцем: %s\n"
@@ -10347,7 +10337,7 @@ msgstr "До�туп до CRL неможливий через вимкнений
 msgid "error retrieving '%s': %s\n"
 msgstr "помилка отриманн� «%s»: %s\n"
 
-#: dirmngr/crlfetch.c:218 dirmngr/ldap-wrapper.c:881 dirmngr/misc.c:573
+#: dirmngr/crlfetch.c:218 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
 #, c-format
 msgid "error initializing reader object: %s\n"
 msgstr "помилка під ча� �проби ініціалізації об’єкта читанн�: %s\n"
@@ -10505,131 +10495,131 @@ msgstr "мало бути вказано аб�олютний шл�х до фа
 msgid "looking up '%s'\n"
 msgstr "пошук «%s»\n"
 
-#: dirmngr/dirmngr.c:175
+#: dirmngr/dirmngr.c:176
 msgid "list the contents of the CRL cache"
 msgstr "показати вмі�т кешу CRL"
 
-#: dirmngr/dirmngr.c:176
+#: dirmngr/dirmngr.c:177
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|FILE|завантажити CRL з вказаного файла до кешу"
 
-#: dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr.c:178
 msgid "|URL|fetch a CRL from URL"
 msgstr "|URL|отримати CRL з вказаної адре�и"
 
-#: dirmngr/dirmngr.c:178
+#: dirmngr/dirmngr.c:179
 msgid "shutdown the dirmngr"
 msgstr "завершити роботу dirmngr"
 
-#: dirmngr/dirmngr.c:179
+#: dirmngr/dirmngr.c:180
 msgid "flush the cache"
 msgstr "�порожнити кеш"
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:213
 msgid "allow online software version check"
 msgstr "дозволити інтерактивну перевірку вер�ії програмного забезпеченн�"
 
-#: dirmngr/dirmngr.c:215
+#: dirmngr/dirmngr.c:216
 msgid "|N|do not return more than N items in one query"
 msgstr "|N|повертати не більше за вказану кількі�ть запи�ів на запит"
 
-#: dirmngr/dirmngr.c:221
+#: dirmngr/dirmngr.c:222
 msgid "Network related options"
 msgstr ""
 
-#: dirmngr/dirmngr.c:223
+#: dirmngr/dirmngr.c:224
 msgid "route all network traffic via Tor"
 msgstr "маршрутизувати уве�ь обмін даними з мережею через Tor"
 
-#: dirmngr/dirmngr.c:235
+#: dirmngr/dirmngr.c:236
 msgid "Configuration for Keyservers"
 msgstr "�алаштуванн� дл� �ерверів ключів"
 
-#: dirmngr/dirmngr.c:238
+#: dirmngr/dirmngr.c:239
 msgid "|URL|use keyserver at URL"
 msgstr "|URL|викори�товувати �ервер ключів за адре�ою"
 
-#: dirmngr/dirmngr.c:240
+#: dirmngr/dirmngr.c:241
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr "|FILE|викори�товувати �ертифікати CA з файла дл� HKP крізь TLS"
 
-#: dirmngr/dirmngr.c:242
+#: dirmngr/dirmngr.c:243
 msgid "Configuration for HTTP servers"
 msgstr "�алаштуванн� дл� �ерверів HTTP"
 
-#: dirmngr/dirmngr.c:244
+#: dirmngr/dirmngr.c:245
 msgid "inhibit the use of HTTP"
 msgstr "заборонити викори�танн� HTTP"
 
-#: dirmngr/dirmngr.c:246
+#: dirmngr/dirmngr.c:247
 msgid "ignore HTTP CRL distribution points"
 msgstr "ігнорувати точки поширенн� С�С протоколу HTTP"
 
-#: dirmngr/dirmngr.c:248
+#: dirmngr/dirmngr.c:249
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr "|URL|пере�пр�мувати в�і запити HTTP на вказану адре�у"
 
-#: dirmngr/dirmngr.c:250
+#: dirmngr/dirmngr.c:251
 msgid "use system's HTTP proxy setting"
 msgstr "викори�товувати загально�и�темний прок�і-�ервер HTTP"
 
-#: dirmngr/dirmngr.c:254
+#: dirmngr/dirmngr.c:255
 msgid "Configuration of LDAP servers to use"
 msgstr "�алаштуванн� викори�танн� �ерверів LDAP"
 
-#: dirmngr/dirmngr.c:256
+#: dirmngr/dirmngr.c:257
 msgid "inhibit the use of LDAP"
 msgstr "заборонити викори�танн� LDAP"
 
-#: dirmngr/dirmngr.c:258
+#: dirmngr/dirmngr.c:259
 msgid "ignore LDAP CRL distribution points"
 msgstr "ігнорувати точки поширенн� С�С протоколу LDAP"
 
-#: dirmngr/dirmngr.c:260
+#: dirmngr/dirmngr.c:261
 msgid "|HOST|use HOST for LDAP queries"
 msgstr "|HOST|викори�товувати вказаний вузол дл� запитів LDAP"
 
-#: dirmngr/dirmngr.c:262
+#: dirmngr/dirmngr.c:263
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr "не викори�товувати резервні вузли з --ldap-proxy"
 
-#: dirmngr/dirmngr.c:264
+#: dirmngr/dirmngr.c:267
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FILE|прочитати �пи�ок �ерверів LDAP з вказаного файла"
 
-#: dirmngr/dirmngr.c:266
+#: dirmngr/dirmngr.c:269
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr "додати ви�влені у точках поширенн� CRL нові �ервери до �пи�ку �ерверів"
 
-#: dirmngr/dirmngr.c:269 dirmngr/dirmngr_ldap.c:104
+#: dirmngr/dirmngr.c:272
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|в�тановити вказаний ча� очікуванн� даних від LDAP"
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:275
 msgid "Configuration for OCSP"
 msgstr "�алаштуванн� OCSP"
 
-#: dirmngr/dirmngr.c:274
+#: dirmngr/dirmngr.c:277
 msgid "allow sending OCSP requests"
 msgstr "дозволити над�иланн� запитів OCSP"
 
-#: dirmngr/dirmngr.c:276
+#: dirmngr/dirmngr.c:279
 msgid "ignore certificate contained OCSP service URLs"
 msgstr "ігнорувати адре�и �лужб OCSP з �ертифікатами"
 
-#: dirmngr/dirmngr.c:278
+#: dirmngr/dirmngr.c:281
 msgid "|URL|use OCSP responder at URL"
 msgstr "|URL|викори�товувати відповідач OCSP за вказаною адре�ою"
 
-#: dirmngr/dirmngr.c:280
+#: dirmngr/dirmngr.c:283
 msgid "|FPR|OCSP response signed by FPR"
 msgstr "|FPR|відповідь OCSP підпи�ано FPR"
 
-#: dirmngr/dirmngr.c:288
+#: dirmngr/dirmngr.c:291
 msgid "force loading of outdated CRLs"
 msgstr "приму�ове завантаженн� за�тарілих С�С"
 
-#: dirmngr/dirmngr.c:299
+#: dirmngr/dirmngr.c:302
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
@@ -10639,11 +10629,11 @@ msgstr ""
 "(Щоб ознайомити�� зі �пи�ком команд і параметрів, �кори�тайте�� �торінкою "
 "довідника (man) «info»)\n"
 
-#: dirmngr/dirmngr.c:441
+#: dirmngr/dirmngr.c:449
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "Викори�танн�: @DIRMNGR@ [параметри] (-h — довідка)"
 
-#: dirmngr/dirmngr.c:443
+#: dirmngr/dirmngr.c:451
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@ -10651,287 +10641,104 @@ msgstr ""
 "Синтак�и�: @DIRMNGR@ [параметри] [команда [аргументи]]\n"
 "До�туп до �ервера ключів, CRL та OCSP дл� @GNUPG@\n"
 
-#: dirmngr/dirmngr.c:523
+#: dirmngr/dirmngr.c:531
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr "коректними рівн�ми зневаджуванн� є: %s\n"
 
-#: dirmngr/dirmngr.c:609 tools/gpgconf.c:667 tools/gpgconf.c:702
-#: tools/gpgconf.c:802
+#: dirmngr/dirmngr.c:617 tools/gpgconf.c:701 tools/gpgconf.c:736
+#: tools/gpgconf.c:836
 #, c-format
 msgid "usage: %s [options] "
 msgstr "викори�танн�: %s [параметри]"
 
-#: dirmngr/dirmngr.c:1260
+#: dirmngr/dirmngr.c:1299
 #, c-format
 msgid "colons are not allowed in the socket name\n"
 msgstr "не можна викори�товувати двокрапки у назві �окета\n"
 
-#: dirmngr/dirmngr.c:1495 dirmngr/server.c:1824
+#: dirmngr/dirmngr.c:1534 dirmngr/server.c:1878
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "помилка під ча� �проби отриманн� CRL з «%s»: %s\n"
 
-#: dirmngr/dirmngr.c:1501 dirmngr/server.c:1830
+#: dirmngr/dirmngr.c:1540 dirmngr/server.c:1884
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "помилка під ча� обробки CRL з «%s»: %s\n"
 
-#: dirmngr/dirmngr.c:1643
+#: dirmngr/dirmngr.c:1682
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: занадто довгий р�док — пропущено\n"
 
-#: dirmngr/dirmngr.c:1698 dirmngr/dirmngr.c:1782
+#: dirmngr/dirmngr.c:1737 dirmngr/dirmngr.c:1821
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: ви�влено некоректний відбиток\n"
 
-#: dirmngr/dirmngr.c:1734 dirmngr/dirmngr.c:1760 tools/gpgconf-comp.c:3539
+#: dirmngr/dirmngr.c:1773 dirmngr/dirmngr.c:1799 tools/gpgconf-comp.c:3549
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: помилка під ча� читанн�: %s\n"
 
-#: dirmngr/dirmngr.c:1789
+#: dirmngr/dirmngr.c:1828
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr "%s:%u: беззмі�товні дані наприкінці р�дка проігноровано\n"
 
-#: dirmngr/dirmngr.c:1876
+#: dirmngr/dirmngr.c:1915
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 "отримано �игнал SIGHUP — повторне читанн� налаштувань та �порожненн� кешу\n"
 
-#: dirmngr/dirmngr.c:1917
+#: dirmngr/dirmngr.c:1956
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "отримано �игнал SIGUSR2 — дій не визначено\n"
 
-#: dirmngr/dirmngr.c:1922
+#: dirmngr/dirmngr.c:1961
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "отримано �игнал SIGTERM — завершуємо роботу…\n"
 
-#: dirmngr/dirmngr.c:1924
+#: dirmngr/dirmngr.c:1963
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "отримано �игнал SIGTERM — підтримуєть�� %d активних з’єднань\n"
 
-#: dirmngr/dirmngr.c:1929
+#: dirmngr/dirmngr.c:1968
 #, c-format
 msgid "shutdown forced\n"
 msgstr "приму�ове завершенн� роботи\n"
 
-#: dirmngr/dirmngr.c:1937
+#: dirmngr/dirmngr.c:1976
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "отримано �игнал SIGINT — негайне завершенн� роботи\n"
 
-#: dirmngr/dirmngr.c:1944
+#: dirmngr/dirmngr.c:1983
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "отримано �игнал %d — дій не визначено\n"
 
-#: dirmngr/dirmngr_ldap.c:105
-msgid "return all values in a record oriented format"
-msgstr "повернути в�і значенн� у форматі запи�ів"
-
-#: dirmngr/dirmngr_ldap.c:108
-msgid "|NAME|ignore host part and connect through NAME"
-msgstr ""
-"|NAME|ігнорувати ча�тину вузла і в�тановити з’єднанн� за вказаною назвою"
-
-#: dirmngr/dirmngr_ldap.c:109
-msgid "force a TLS connection"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:110
-msgid "|NAME|connect to host NAME"
-msgstr "|NAME|в�тановити з’єднанн� з вузлом за вказаною назвою"
-
-#: dirmngr/dirmngr_ldap.c:111
-msgid "|N|connect to port N"
-msgstr "|N|в�тановити з’єднанн� на вказаному порті"
-
-#: dirmngr/dirmngr_ldap.c:112
-msgid "|NAME|use user NAME for authentication"
-msgstr "|NAME|викори�товувати вказаного кори�тувача дл� розпізнаванн�"
-
-#: dirmngr/dirmngr_ldap.c:113
-msgid "|PASS|use password PASS for authentication"
-msgstr "|PASS|викори�товувати вказаний пароль дл� розпізнаванн�"
-
-#: dirmngr/dirmngr_ldap.c:115
-msgid "take password from $DIRMNGR_LDAP_PASS"
-msgstr "визначити пароль за $DIRMNGR_LDAP_PASS"
-
-#: dirmngr/dirmngr_ldap.c:116
-msgid "|STRING|query DN STRING"
-msgstr "|STRING|наді�лати запит до DN щодо вказаного р�дка"
-
-#: dirmngr/dirmngr_ldap.c:117
-msgid "|STRING|use STRING as filter expression"
-msgstr "|STRING|викори�товувати вказаний р�док дл� фільтруванн�"
-
-#: dirmngr/dirmngr_ldap.c:118
-msgid "|STRING|return the attribute STRING"
-msgstr "|STRING|повернути атрибут за вказаним р�дком"
-
-#: dirmngr/dirmngr_ldap.c:179
-msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
-msgstr "Викори�танн�: dirmngr_ldap [параметри] [адре�а] (-h — довідка)\n"
-
-#: dirmngr/dirmngr_ldap.c:182
-msgid ""
-"Syntax: dirmngr_ldap [options] [URL]\n"
-"Internal LDAP helper for Dirmngr\n"
-"Interface and options may change without notice\n"
-msgstr ""
-"Синтак�и�: dirmngr_ldap [параметри] [адре�а]\n"
-"Вбудований допоміжний ін�трумент LDAP дл� Dirmngr\n"
-"Інтерфей� і параметри можуть змінювати�� без додаткового оголошенн�\n"
-
-#: dirmngr/dirmngr_ldap.c:291
-#, c-format
-msgid "invalid port number %d\n"
-msgstr "некоректний номер порту %d\n"
-
-#: dirmngr/dirmngr_ldap.c:400
-#, c-format
-msgid "scanning result for attribute '%s'\n"
-msgstr "�кануванн� результату дл� атрибуту «%s»\n"
-
-#: dirmngr/dirmngr_ldap.c:407 dirmngr/dirmngr_ldap.c:490
-#: dirmngr/dirmngr_ldap.c:514 dirmngr/dirmngr_ldap.c:526
-#: dirmngr/dirmngr_ldap.c:722
-#, c-format
-msgid "error writing to stdout: %s\n"
-msgstr "помилка під ча� �проби запи�у до stdout: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:424
-#, c-format
-msgid "          available attribute '%s'\n"
-msgstr "          до�тупний атрибут «%s»\n"
-
-#: dirmngr/dirmngr_ldap.c:462
-#, c-format
-msgid "attribute '%s' not found\n"
-msgstr "атрибут «%s» не знайдено\n"
-
-#: dirmngr/dirmngr_ldap.c:469
-#, c-format
-msgid "found attribute '%s'\n"
-msgstr "знайдено атрибут «%s»\n"
-
-#: dirmngr/dirmngr_ldap.c:581
-#, c-format
-msgid "processing url '%s'\n"
-msgstr "обробка адре�и «%s»\n"
-
-#: dirmngr/dirmngr_ldap.c:588
-#, c-format
-msgid "          user '%s'\n"
-msgstr "          кори�тувач «%s»\n"
-
-#: dirmngr/dirmngr_ldap.c:590
-#, c-format
-msgid "          pass '%s'\n"
-msgstr "          прохід «%s»\n"
-
-#: dirmngr/dirmngr_ldap.c:592
-#, c-format
-msgid "          host '%s'\n"
-msgstr "          вузол «%s»\n"
-
-#: dirmngr/dirmngr_ldap.c:593
-#, c-format
-msgid "          port %d\n"
-msgstr "          порт %d\n"
-
-#: dirmngr/dirmngr_ldap.c:595
-#, c-format
-msgid "            DN '%s'\n"
-msgstr "            DN «%s»\n"
-
-#: dirmngr/dirmngr_ldap.c:597
-#, c-format
-msgid "        filter '%s'\n"
-msgstr "        фільтр «%s»\n"
-
-#: dirmngr/dirmngr_ldap.c:602 dirmngr/dirmngr_ldap.c:605
-#, c-format
-msgid "          attr '%s'\n"
-msgstr "          атрибут «%s»\n"
-
-#: dirmngr/dirmngr_ldap.c:611
-#, c-format
-msgid "no host name in '%s'\n"
-msgstr "у «%s» немає назви вузла\n"
-
-#: dirmngr/dirmngr_ldap.c:616
-#, c-format
-msgid "no attribute given for query '%s'\n"
-msgstr "не вказано атрибута дл� запи�у «%s»\n"
-
-#: dirmngr/dirmngr_ldap.c:622
-#, c-format
-msgid "WARNING: using first attribute only\n"
-msgstr "УВ�Г�: викори�тано буде лише перший атрибут\n"
-
-#: dirmngr/dirmngr_ldap.c:637 dirmngr/dirmngr_ldap.c:678
-#, c-format
-msgid "LDAP init to '%s:%d' failed: %s\n"
-msgstr "помилка ініціалізації LDAP «%s:%d»: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:659
-#, fuzzy, c-format
-#| msgid "LDAP init to '%s:%d' failed: %s\n"
-msgid "LDAP init to '%s' failed: %s\n"
-msgstr "помилка ініціалізації LDAP «%s:%d»: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:665
-#, fuzzy, c-format
-#| msgid "LDAP init to '%s:%d' failed: %s\n"
-msgid "LDAP init to '%s' done\n"
-msgstr "помилка ініціалізації LDAP «%s:%d»: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:704
-#, c-format
-msgid "binding to '%s:%d' failed: %s\n"
-msgstr "�проба прив’�зуванн� до «%s:%d» зазнала невдачі: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:728
-#, c-format
-msgid "searching '%s' failed: %s\n"
-msgstr "помилка під ча� �проби пошуку «%s»: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:759
-#, c-format
-msgid "'%s' is not an LDAP URL\n"
-msgstr "«%s» не є адре�ою LDAP\n"
-
-#: dirmngr/dirmngr_ldap.c:765
-#, c-format
-msgid "'%s' is an invalid LDAP URL\n"
-msgstr "«%s» є некоректною адре�ою LDAP\n"
-
-#: dirmngr/http.c:1989 dirmngr/ocsp.c:255
+#: dirmngr/http.c:1998 dirmngr/ocsp.c:255
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "помилка під ча� �проби до�тупу до «%s»: �тан http %u\n"
 
-#: dirmngr/http.c:3630 dirmngr/ocsp.c:229
+#: dirmngr/http.c:3652 dirmngr/ocsp.c:229
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr "�дре�у «%s» пере�пр�мовано до «%s» (%u)\n"
 
-#: dirmngr/http.c:3636 dirmngr/ocsp.c:246
+#: dirmngr/http.c:3658 dirmngr/ocsp.c:246
 #, c-format
 msgid "too many redirections\n"
 msgstr "занадто багато пере�пр�мувань\n"
 
-#: dirmngr/http.c:3748
+#: dirmngr/http.c:3768
 #, fuzzy, c-format
 #| msgid "writing to '%s'\n"
 msgid "redirection changed to '%s'\n"
@@ -10972,31 +10779,51 @@ msgstr "очікуванн� даних з обгортки LDAP %d зазнал
 msgid "ldap wrapper %d stalled - killing\n"
 msgstr "обгортка LDAP %d не відповідає — завершуємо роботу\n"
 
-#: dirmngr/ldap.c:91
+#: dirmngr/ldap.c:92
 #, c-format
 msgid "invalid char 0x%02x in host name - not added\n"
 msgstr "некоректний �имвол 0x%02x у назві вузла — не додано\n"
 
-#: dirmngr/ldap.c:95
+#: dirmngr/ldap.c:96
 #, c-format
 msgid "adding '%s:%d' to the ldap server list\n"
 msgstr "додаванн� «%s:%d» до �пи�ку �ервера LDAP\n"
 
-#: dirmngr/ldap.c:98 dirmngr/misc.c:512
+#: dirmngr/ldap.c:99 dirmngr/misc.c:512
 #, c-format
 msgid "malloc failed: %s\n"
 msgstr "помилка malloc: %s\n"
 
-#: dirmngr/ldap.c:634
+#: dirmngr/ldap.c:221
 #, c-format
-msgid "start_cert_fetch: invalid pattern '%s'\n"
-msgstr "start_cert_fetch: некоректний шаблон «%s»\n"
+msgid "'%s' is not an LDAP URL\n"
+msgstr "«%s» не є адре�ою LDAP\n"
+
+#: dirmngr/ldap.c:227 dirmngr/ldap.c:233
+#, c-format
+msgid "'%s' is an invalid LDAP URL\n"
+msgstr "«%s» є некоректною адре�ою LDAP\n"
 
-#: dirmngr/ldap.c:846
+#: dirmngr/ldap.c:968
 #, c-format
 msgid "ldap_search hit the size limit of the server\n"
 msgstr "ldap_search перевищив обмеженн� розміру �ервера\n"
 
+#: dirmngr/ldapserver.c:119
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr "%s:%u: вказано пароль, але не вказано кори�тувача\n"
+
+#: dirmngr/ldapserver.c:181
+#, c-format
+msgid "%s:%u: ignoring unknown flag '%s'\n"
+msgstr ""
+
+#: dirmngr/ldapserver.c:203
+#, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr "%s:%u: пропу�каємо цей р�док\n"
+
 #: dirmngr/misc.c:172
 #, c-format
 msgid "invalid canonical S-expression found\n"
@@ -11087,86 +10914,86 @@ msgstr "не підпи�ано типовим �ертифікатом підп
 msgid "allocating list item failed: %s\n"
 msgstr "�проба розміщенн� пункту �пи�ку у пам’�ті зазнала невдачі: %s\n"
 
-#: dirmngr/ocsp.c:537 dirmngr/ocsp.c:724
+#: dirmngr/ocsp.c:538 dirmngr/ocsp.c:725
 #, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "помилка під ча� �проби отриманн� ідентифікатора відповідача: %s\n"
 
-#: dirmngr/ocsp.c:584
+#: dirmngr/ocsp.c:585
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr "не ви�влено придатного �ертифіката дл� перевірки відповіді за OCSP\n"
 
-#: dirmngr/ocsp.c:623 dirmngr/validate.c:648
+#: dirmngr/ocsp.c:624 dirmngr/validate.c:648
 #, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "не ви�влено �ертифіката видавц�: %s\n"
 
-#: dirmngr/ocsp.c:633
+#: dirmngr/ocsp.c:634
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr "викликаною підпрограмою не повернуто �ертифіката призначенн�\n"
 
-#: dirmngr/ocsp.c:640
+#: dirmngr/ocsp.c:641
 #, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "викликаною підпрограмою не повернуто �ертифіката видавц�\n"
 
-#: dirmngr/ocsp.c:650
+#: dirmngr/ocsp.c:651
 #, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "не вдало�� розмі�тити контек�т OCSP: %s\n"
 
-#: dirmngr/ocsp.c:689
+#: dirmngr/ocsp.c:690
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr "не визначено типового відповідача за OCSP\n"
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:696
 #, c-format
 msgid "no default OCSP signer defined\n"
 msgstr "не визначено типового підпи�увача за OCSP\n"
 
-#: dirmngr/ocsp.c:702
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr "викори�товуємо типовий відповідач за OCSP «%s»\n"
 
-#: dirmngr/ocsp.c:707
+#: dirmngr/ocsp.c:708
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "викори�товуємо відповідач за OCSP «%s»\n"
 
-#: dirmngr/ocsp.c:764
+#: dirmngr/ocsp.c:765
 #, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "помилка під ча� отриманн� �тану OCSP дл� �ертифіката призначенн�: %s\n"
 
-#: dirmngr/ocsp.c:789
+#: dirmngr/ocsp.c:790
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr "�тан �ертифіката: %s  (цей=%s  на�тупний=%s)\n"
 
-#: dirmngr/ocsp.c:790
+#: dirmngr/ocsp.c:791
 msgid "good"
 msgstr "придатний"
 
-#: dirmngr/ocsp.c:796
+#: dirmngr/ocsp.c:797
 #, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "�ертифікат було відкликано: %s причина: %s\n"
 
-#: dirmngr/ocsp.c:831
+#: dirmngr/ocsp.c:832
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr "Відповідачем OCSP повернуто �тан у майбутньому\n"
 
-#: dirmngr/ocsp.c:843
+#: dirmngr/ocsp.c:844
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr "Відповідачем OCSP повернуто не поточний �тан\n"
 
-#: dirmngr/ocsp.c:858
+#: dirmngr/ocsp.c:859
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr "Відповідачем OCSP повернуто занадто за�тарілі дані щодо �тану\n"
@@ -11176,71 +11003,67 @@ msgstr "Відповідачем OCSP повернуто занадто за�т
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "помилка assuan_inquire(%s): %s\n"
 
-#: dirmngr/server.c:1158
-msgid "ldapserver missing"
-msgstr "не вказано ldapserver"
-
-#: dirmngr/server.c:1224
+#: dirmngr/server.c:1277
 msgid "serialno missing in cert ID"
 msgstr "у ідентифікаторі �ертифіката немає �ерійного номера"
 
-#: dirmngr/server.c:1387 dirmngr/server.c:1473 dirmngr/server.c:1909
-#: dirmngr/server.c:1980 dirmngr/server.c:2556 dirmngr/server.c:2571
+#: dirmngr/server.c:1440 dirmngr/server.c:1526 dirmngr/server.c:1963
+#: dirmngr/server.c:2034 dirmngr/server.c:2662 dirmngr/server.c:2677
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "помилка assuan_inquire: %s\n"
 
-#: dirmngr/server.c:1516
+#: dirmngr/server.c:1569
 #, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "помилка fetch_cert_by_url: %s\n"
 
-#: dirmngr/server.c:1528 dirmngr/server.c:1559 dirmngr/server.c:1718
+#: dirmngr/server.c:1581 dirmngr/server.c:1612 dirmngr/server.c:1772
 #, c-format
 msgid "error sending data: %s\n"
 msgstr "помилка під ча� �проби над�иланн� даних: %s\n"
 
-#: dirmngr/server.c:1666
+#: dirmngr/server.c:1720
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "помилка start_cert_fetch: %s\n"
 
-#: dirmngr/server.c:1699
+#: dirmngr/server.c:1753
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "помилка fetch_next_cert: %s\n"
 
-#: dirmngr/server.c:1726
+#: dirmngr/server.c:1780
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr "перевищено max_replies у %d\n"
 
-#: dirmngr/server.c:2860
+#: dirmngr/server.c:2966
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "не вдало�� розмі�тити �труктуру керуванн�: %s\n"
 
-#: dirmngr/server.c:2871
+#: dirmngr/server.c:2977
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "не вдало�� розмі�тити контек�т assuan: %s\n"
 
-#: dirmngr/server.c:2892
+#: dirmngr/server.c:2998
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "не вдало�� ініціалізувати �ервер: %s\n"
 
-#: dirmngr/server.c:2900
+#: dirmngr/server.c:3006
 #, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "не вдало�� зареє�трувати команди за допомогою Assuan: %s\n"
 
-#: dirmngr/server.c:2933
+#: dirmngr/server.c:3039
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "проблема з прийн�тт�м Assuan: %s\n"
 
-#: dirmngr/server.c:2952
+#: dirmngr/server.c:3058
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "помилка обробки за допомогою Assuan: %s\n"
@@ -11391,71 +11214,71 @@ msgstr "у цьому �еан�і не запущено dirmngr\n"
 msgid "error sending standard options: %s\n"
 msgstr "помилка під ча� �проби над�иланн� �тандартних параметрів: %s\n"
 
-#: tools/gpgconf-comp.c:649
+#: tools/gpgconf-comp.c:655
 msgid "OpenPGP"
 msgstr "OpenPGP"
 
-#: tools/gpgconf-comp.c:653
+#: tools/gpgconf-comp.c:659
 msgid "S/MIME"
 msgstr "S/MIME"
 
-#: tools/gpgconf-comp.c:657
+#: tools/gpgconf-comp.c:663
 #, fuzzy
 #| msgid "public key is %s\n"
 msgid "Public Keys"
 msgstr "відкритий ключ — %s\n"
 
-#: tools/gpgconf-comp.c:661
+#: tools/gpgconf-comp.c:667
 msgid "Private Keys"
 msgstr "Закриті ключі"
 
-#: tools/gpgconf-comp.c:665
+#: tools/gpgconf-comp.c:671
 msgid "Smartcards"
 msgstr "Картки пам’�ті"
 
-#: tools/gpgconf-comp.c:669
+#: tools/gpgconf-comp.c:676
 msgid "TPM"
 msgstr ""
 
-#: tools/gpgconf-comp.c:673
+#: tools/gpgconf-comp.c:681
 msgid "Network"
 msgstr "Мережа"
 
-#: tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:685
 msgid "Passphrase Entry"
 msgstr "Введенн� парол�"
 
-#: tools/gpgconf-comp.c:941
+#: tools/gpgconf-comp.c:951
 msgid "Component not suitable for launching"
 msgstr "Компонент не є придатним до запу�ку"
 
-#: tools/gpgconf-comp.c:947
+#: tools/gpgconf-comp.c:957
 #, fuzzy, c-format
 #| msgid "External verification of component %s failed"
 msgid "Configuration file of component %s is broken\n"
 msgstr "Помилка зовнішньої перевірки компонента %s"
 
-#: tools/gpgconf-comp.c:950
+#: tools/gpgconf-comp.c:960
 #, fuzzy, c-format
 #| msgid "Please use the command \"toggle\" first.\n"
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr "Скори�тайте�� �початку командою «toggle».\n"
 
-#: tools/gpgconf-comp.c:2816
+#: tools/gpgconf-comp.c:2826
 #, c-format
 msgid "External verification of component %s failed"
 msgstr "Помилка зовнішньої перевірки компонента %s"
 
-#: tools/gpgconf-comp.c:2946
+#: tools/gpgconf-comp.c:2956
 msgid "Note that group specifications are ignored\n"
 msgstr "Зауважте, що �пецифікації груп буде проігноровано\n"
 
-#: tools/gpgconf-comp.c:3543
+#: tools/gpgconf-comp.c:3553
 #, c-format
 msgid "error closing '%s'\n"
 msgstr "помилка під ча� �проби закрити «%s»\n"
 
-#: tools/gpgconf-comp.c:3545
+#: tools/gpgconf-comp.c:3555
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr "помилка під ча� �проби обробити «%s»'\n"
@@ -11536,15 +11359,15 @@ msgstr ""
 "Синтак�и�: @GPGCONF@ [параметри]\n"
 "Керуванн� параметрами налаштуванн� ін�трументів �и�теми @GNUPG@\n"
 
-#: tools/gpgconf.c:669 tools/gpgconf.c:704
+#: tools/gpgconf.c:703 tools/gpgconf.c:738
 msgid "Need one component argument"
 msgstr "Слід вказати один аргумент компонента"
 
-#: tools/gpgconf.c:678 tools/gpgconf.c:728 tools/gpgconf.c:778
+#: tools/gpgconf.c:712 tools/gpgconf.c:762 tools/gpgconf.c:812
 msgid "Component not found"
 msgstr "Компонент не знайдено"
 
-#: tools/gpgconf.c:804
+#: tools/gpgconf.c:838
 msgid "No argument allowed"
 msgstr "�е можна вказувати аргументів"
 
@@ -11561,90 +11384,218 @@ msgstr ""
 "Синтак�и�: gpg-check-pattern [параметри] файл_шаблонів\n"
 "Перевірити пароль, вказаний у stdin, за допомогою файла_шаблонів\n"
 
-#: tools/gpg-card.c:2390
+#: tools/gpg-card.c:2407
 #, fuzzy, c-format
 #| msgid "Note: keys are already stored on the card!\n"
 msgid "Note: key %s is already stored on the card!\n"
 msgstr "З�УВ�ЖЕ��Я: ключі вже збережено на картці!\n"
 
-#: tools/gpg-card.c:2393
+#: tools/gpg-card.c:2410
 #, fuzzy, c-format
 #| msgid "Note: keys are already stored on the card!\n"
 msgid "Note: Keys are already stored on the card!\n"
 msgstr "З�УВ�ЖЕ��Я: ключі вже збережено на картці!\n"
 
-#: tools/gpg-card.c:2396
+#: tools/gpg-card.c:2413
 #, fuzzy, c-format
 #| msgid "Replace existing keys? (y/N) "
 msgid "Replace existing key %s ? (y/N) "
 msgstr "Замірити вже �творені ключі? (y/N або т/�) "
 
-#: tools/gpg-card.c:2549 tools/gpg-card.c:2712 tools/gpg-card.c:2935
-#: tools/gpg-card.c:3044
+#: tools/gpg-card.c:2566 tools/gpg-card.c:2729 tools/gpg-card.c:2952
+#: tools/gpg-card.c:3061
 #, fuzzy, c-format
 #| msgid "OpenPGP card no. %s detected\n"
 msgid "%s card no. %s detected\n"
 msgstr "Ви�влено картку OpenPGP з номером %s\n"
 
-#: tools/gpg-card.c:3396
+#: tools/gpg-card.c:3413
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3406 tools/gpg-card.c:3420
+#: tools/gpg-card.c:3423 tools/gpg-card.c:3437
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
 "         can only be reverted using a factory reset!\n"
 msgstr ""
 
-#: tools/gpg-card.c:3423
+#: tools/gpg-card.c:3440
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3669
+#: tools/gpg-card.c:3686
 #, fuzzy
 #| msgid "add a certificate to the cache"
 msgid "authenticate to the card"
 msgstr "додати �ертифікат до кешу"
 
-#: tools/gpg-card.c:3671
+#: tools/gpg-card.c:3688
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3673
+#: tools/gpg-card.c:3690
 msgid "setup KDF for PIN authentication"
 msgstr "налаштуванн� KDF дл� розпізнаванн� за PIN"
 
-#: tools/gpg-card.c:3675
+#: tools/gpg-card.c:3692
 msgid "change a private data object"
 msgstr ""
 
-#: tools/gpg-card.c:3676
+#: tools/gpg-card.c:3693
 #, fuzzy
 #| msgid "add a certificate to the cache"
 msgid "read a certificate from a data object"
 msgstr "додати �ертифікат до кешу"
 
-#: tools/gpg-card.c:3677
+#: tools/gpg-card.c:3694
 #, fuzzy
 #| msgid "add a certificate to the cache"
 msgid "store a certificate to a data object"
 msgstr "додати �ертифікат до кешу"
 
-#: tools/gpg-card.c:3678
+#: tools/gpg-card.c:3695
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3679
+#: tools/gpg-card.c:3696
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3681
+#: tools/gpg-card.c:3698
 msgid "manage the command history"
 msgstr ""
 
+#~ msgid "requesting key %s from %s server %s\n"
+#~ msgstr "над�илаємо запит щодо ключа %s до %s �ервера %s\n"
+
+#~ msgid "%s:%u: no hostname given\n"
+#~ msgstr "%s:%u: не вказано назви вузла\n"
+
+#~ msgid "could not parse keyserver\n"
+#~ msgstr "не вдало�� обробити �ервер ключів\n"
+
+#~ msgid "return all values in a record oriented format"
+#~ msgstr "повернути в�і значенн� у форматі запи�ів"
+
+#~ msgid "|NAME|ignore host part and connect through NAME"
+#~ msgstr ""
+#~ "|NAME|ігнорувати ча�тину вузла і в�тановити з’єднанн� за вказаною назвою"
+
+#~ msgid "|NAME|connect to host NAME"
+#~ msgstr "|NAME|в�тановити з’єднанн� з вузлом за вказаною назвою"
+
+#~ msgid "|N|connect to port N"
+#~ msgstr "|N|в�тановити з’єднанн� на вказаному порті"
+
+#~ msgid "|NAME|use user NAME for authentication"
+#~ msgstr "|NAME|викори�товувати вказаного кори�тувача дл� розпізнаванн�"
+
+#~ msgid "|PASS|use password PASS for authentication"
+#~ msgstr "|PASS|викори�товувати вказаний пароль дл� розпізнаванн�"
+
+#~ msgid "take password from $DIRMNGR_LDAP_PASS"
+#~ msgstr "визначити пароль за $DIRMNGR_LDAP_PASS"
+
+#~ msgid "|STRING|query DN STRING"
+#~ msgstr "|STRING|наді�лати запит до DN щодо вказаного р�дка"
+
+#~ msgid "|STRING|use STRING as filter expression"
+#~ msgstr "|STRING|викори�товувати вказаний р�док дл� фільтруванн�"
+
+#~ msgid "|STRING|return the attribute STRING"
+#~ msgstr "|STRING|повернути атрибут за вказаним р�дком"
+
+#~ msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
+#~ msgstr "Викори�танн�: dirmngr_ldap [параметри] [адре�а] (-h — довідка)\n"
+
+#~ msgid ""
+#~ "Syntax: dirmngr_ldap [options] [URL]\n"
+#~ "Internal LDAP helper for Dirmngr\n"
+#~ "Interface and options may change without notice\n"
+#~ msgstr ""
+#~ "Синтак�и�: dirmngr_ldap [параметри] [адре�а]\n"
+#~ "Вбудований допоміжний ін�трумент LDAP дл� Dirmngr\n"
+#~ "Інтерфей� і параметри можуть змінювати�� без додаткового оголошенн�\n"
+
+#~ msgid "invalid port number %d\n"
+#~ msgstr "некоректний номер порту %d\n"
+
+#~ msgid "scanning result for attribute '%s'\n"
+#~ msgstr "�кануванн� результату дл� атрибуту «%s»\n"
+
+#~ msgid "error writing to stdout: %s\n"
+#~ msgstr "помилка під ча� �проби запи�у до stdout: %s\n"
+
+#~ msgid "          available attribute '%s'\n"
+#~ msgstr "          до�тупний атрибут «%s»\n"
+
+#~ msgid "attribute '%s' not found\n"
+#~ msgstr "атрибут «%s» не знайдено\n"
+
+#~ msgid "found attribute '%s'\n"
+#~ msgstr "знайдено атрибут «%s»\n"
+
+#~ msgid "processing url '%s'\n"
+#~ msgstr "обробка адре�и «%s»\n"
+
+#~ msgid "          user '%s'\n"
+#~ msgstr "          кори�тувач «%s»\n"
+
+#~ msgid "          pass '%s'\n"
+#~ msgstr "          прохід «%s»\n"
+
+#~ msgid "          host '%s'\n"
+#~ msgstr "          вузол «%s»\n"
+
+#~ msgid "          port %d\n"
+#~ msgstr "          порт %d\n"
+
+#~ msgid "            DN '%s'\n"
+#~ msgstr "            DN «%s»\n"
+
+#~ msgid "        filter '%s'\n"
+#~ msgstr "        фільтр «%s»\n"
+
+#~ msgid "          attr '%s'\n"
+#~ msgstr "          атрибут «%s»\n"
+
+#~ msgid "no host name in '%s'\n"
+#~ msgstr "у «%s» немає назви вузла\n"
+
+#~ msgid "no attribute given for query '%s'\n"
+#~ msgstr "не вказано атрибута дл� запи�у «%s»\n"
+
+#~ msgid "WARNING: using first attribute only\n"
+#~ msgstr "УВ�Г�: викори�тано буде лише перший атрибут\n"
+
+#~ msgid "LDAP init to '%s:%d' failed: %s\n"
+#~ msgstr "помилка ініціалізації LDAP «%s:%d»: %s\n"
+
+#, fuzzy
+#~| msgid "LDAP init to '%s:%d' failed: %s\n"
+#~ msgid "LDAP init to '%s' failed: %s\n"
+#~ msgstr "помилка ініціалізації LDAP «%s:%d»: %s\n"
+
+#, fuzzy
+#~| msgid "LDAP init to '%s:%d' failed: %s\n"
+#~ msgid "LDAP init to '%s' done\n"
+#~ msgstr "помилка ініціалізації LDAP «%s:%d»: %s\n"
+
+#~ msgid "binding to '%s:%d' failed: %s\n"
+#~ msgstr "�проба прив’�зуванн� до «%s:%d» зазнала невдачі: %s\n"
+
+#~ msgid "searching '%s' failed: %s\n"
+#~ msgstr "помилка під ча� �проби пошуку «%s»: %s\n"
+
+#~ msgid "start_cert_fetch: invalid pattern '%s'\n"
+#~ msgstr "start_cert_fetch: некоректний шаблон «%s»\n"
+
+#~ msgid "ldapserver missing"
+#~ msgstr "не вказано ldapserver"
+
 #, fuzzy
 #~| msgid "change a passphrase"
 #~ msgid "Suggest a random passphrase."
diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo
index a3505d3..3211ba8 100644
--- a/po/zh_CN.gmo
+++ b/po/zh_CN.gmo
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 2bb0032..b807612 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gnupg 2.2.27\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2021-04-20 12:38+0200\n"
-"PO-Revision-Date: 2021-02-23 01:08+0800\n"
+"POT-Creation-Date: 2021-08-24 18:50+0200\n"
+"PO-Revision-Date: 2021-06-11 13:19+0900\n"
 "Last-Translator: bobwxc <bobwxc@yeah.net>\n"
 "Language-Team: None\n"
 "Language: zh_CN\n"
@@ -22,7 +22,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 2.2.1\n"
 
-#: agent/call-pinentry.c:328
+#: agent/call-pinentry.c:338
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "获� pinentry �失败: %s\n"
@@ -33,45 +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:546
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_OK"
 msgstr "|pinentry-label|确认(_O)"
 
-#: agent/call-pinentry.c:547
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_Cancel"
 msgstr "|pinentry-label|�消(_C)"
 
-#: agent/call-pinentry.c:548
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|_Yes"
 msgstr "|pinentry-label|是(_Y)"
 
-#: agent/call-pinentry.c:549
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_No"
 msgstr "|pinentry-label|�(_N)"
 
-#: agent/call-pinentry.c:550
+#: agent/call-pinentry.c:560
 msgid "|pinentry-label|PIN:"
 msgstr "|pinentry-label|PIN："
 
-#: agent/call-pinentry.c:551
+#: agent/call-pinentry.c:561
 msgid "|pinentry-label|_Save in password manager"
 msgstr "|pinentry-label|在密�管�器中�存(_S)"
 
-#: agent/call-pinentry.c:552
+#: agent/call-pinentry.c:562
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "您真的想�使您的密�在�幕上���？"
 
-#: agent/call-pinentry.c:554
+#: agent/call-pinentry.c:564
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr "|pinentry-tt|使密���"
 
-#: agent/call-pinentry.c:555
+#: agent/call-pinentry.c:565
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "|pinentry-tt|��密�"
 
+#: agent/call-pinentry.c:566
+msgid "Caps Lock is on"
+msgstr ""
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:944
+#: agent/call-pinentry.c:1022
 msgid "Suggest"
 msgstr "建议"
 
@@ -82,13 +86,26 @@ 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:966
+#: agent/call-pinentry.c:1044
 msgid "pinentry.genpin.tooltip"
 msgstr "pinentry.genpin.tooltip"
 
+#: agent/call-pinentry.c:1072
+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
+#, fuzzy
+#| msgid "Passphrase too long"
+msgid "Passphrase Not Allowed"
+msgstr "密�太长"
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:998
+#: agent/call-pinentry.c:1198
 msgid "Quality:"
 msgstr "强度："
 
@@ -98,131 +115,128 @@ 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:1019
+#: agent/call-pinentry.c:1219
 msgid "pinentry.qualitybar.tooltip"
 msgstr "pinentry.qualitybar.tooltip"
 
-#: agent/call-pinentry.c:1263
+#: agent/call-pinentry.c:1477
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr "请输入您的 PIN，从而为此会�解��钥"
 
-#: agent/call-pinentry.c:1266
+#: agent/call-pinentry.c:1480
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "请输入您的密�，从而为此会�解��钥"
 
-#: agent/call-pinentry.c:1303 agent/call-pinentry.c:1506
+#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
 msgid "PIN:"
 msgstr "PIN："
 
-#: agent/call-pinentry.c:1303 agent/call-pinentry.c:1506
-#: agent/protect-tool.c:728
+#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/protect-tool.c:729
 msgid "Passphrase:"
 msgstr "密�："
 
-#: agent/call-pinentry.c:1330 agent/call-pinentry.c:1580 agent/command.c:1799
-#: agent/command.c:1852 agent/command-ssh.c:3046 agent/genkey.c:398
+#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
+#: agent/command.c:1988 agent/command-ssh.c:3046 agent/genkey.c:442
 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:1351 agent/call-pinentry.c:1603
+#: agent/call-pinentry.c:1566 agent/call-pinentry.c:1830
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s（�试第%d个，共%d个）"
 
-#: agent/call-pinentry.c:1362 agent/call-pinentry.c:1614
+#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
 msgid "Repeat:"
 msgstr "��："
 
-#: agent/call-pinentry.c:1372 agent/call-pinentry.c:1384
-#: agent/call-pinentry.c:1624 agent/call-pinentry.c:1636
+#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
+#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
 msgid "PIN too long"
 msgstr "PIN 太长"
 
-#: agent/call-pinentry.c:1373 agent/call-pinentry.c:1625
+#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
 msgid "Passphrase too long"
 msgstr "密�太长"
 
-#: agent/call-pinentry.c:1381 agent/call-pinentry.c:1633
+#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
 msgid "Invalid characters in PIN"
 msgstr "PIN 中�有无效字符"
 
-#: agent/call-pinentry.c:1386 agent/call-pinentry.c:1638
+#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
 msgid "PIN too short"
 msgstr "PIN 太短"
 
-#: agent/call-pinentry.c:1405 agent/call-pinentry.c:1656
+#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
 msgid "Bad PIN"
 msgstr "错误的 PIN"
 
-#: agent/call-pinentry.c:1405 agent/call-pinentry.c:1656
+#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
 msgid "Bad Passphrase"
 msgstr "错误的密�"
 
-#: agent/command.c:697
+#: agent/command.c:823
 msgid "Note: Request from the web browser."
-msgstr ""
+msgstr "注�：�自网络�览器的请求。"
 
-#: agent/command.c:698
+#: agent/command.c:824
 msgid "Note: Request from a remote site."
-msgstr ""
+msgstr "注�：�自远程站点的请求。"
 
-#: agent/command.c:1106 g10/card-util.c:708 g10/card-util.c:729
+#: agent/command.c:1235 g10/card-util.c:713 g10/card-util.c:734
 #, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "获��的�列�时出现错误： %s\n"
 
-#: agent/command.c:1634 agent/command.c:1791 agent/command-ssh.c:2974
-#: agent/genkey.c:333
+#: agent/command.c:1756 agent/command.c:1921 agent/command-ssh.c:2974
+#: agent/genkey.c:377
 msgid "Please re-enter this passphrase"
 msgstr "请�新输入此密�"
 
-#: agent/command.c:2567
-#, fuzzy, c-format
-#| msgid ""
-#| "Please enter the passphrase to protect the imported object within the "
-#| "GnuPG system."
+#: agent/command.c:2703
+#, c-format
 msgid ""
 "Please enter the passphrase to protect the imported object within the %s "
 "system."
-msgstr "请输入密�以在 GnuPG 系统内部�护已导入的对象。"
+msgstr "请输入密�以在 %s 系统内部�护已导入的对象。"
 
-#: agent/command.c:2697
+#: agent/command.c:2833
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
-msgstr ""
+msgstr "此密钥（或�密钥）未�密��护。请输入新的密�以将其导出。"
 
 #: agent/command-ssh.c:675 agent/command-ssh.c:764
 #, c-format
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "长度超过 %d �的 ssh 密钥�被支�\n"
 
-#: agent/command-ssh.c:872 common/dotlock.c:852 g10/card-util.c:953
-#: g10/export.c:1329 g10/gpg.c:1431 g10/keygen.c:5347 g10/keyring.c:1319
-#: g10/keyring.c:1632 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
+#: agent/command-ssh.c:872 common/dotlock.c:852 g10/card-util.c:963
+#: g10/export.c:1329 g10/gpg.c:1431 g10/keygen.c:5377 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
 #: g10/sign.c:1106 g10/sign.c:1443 g10/tdbio.c:753 tools/gpg-card.c:479
 #, c-format
 msgid "can't create '%s': %s\n"
 msgstr "无法创建 ‘%s’： %s\n"
 
-#: agent/command-ssh.c:884 common/helpfile.c:57 g10/card-util.c:910
+#: agent/command-ssh.c:884 common/helpfile.c:57 g10/card-util.c:920
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
 #: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:721 g10/gpg.c:1432
-#: g10/import.c:371 g10/import.c:558 g10/import.c:793 g10/keygen.c:4322
-#: g10/keyring.c:1658 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
+#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4326
+#: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
 #: g10/plaintext.c:610 g10/sign.c:1086 g10/sign.c:1311 g10/sign.c:1424
 #: g10/sign.c:1596 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2380
-#: sm/gpgsm.c:2410 sm/gpgsm.c:2448 sm/keylist.c:1737 sm/qualified.c:65
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2236
+#: sm/gpgsm.c:2266 sm/gpgsm.c:2304 sm/keylist.c:1775 sm/qualified.c:65
 #: dirmngr/certcache.c:396 dirmngr/certcache.c:476 dirmngr/certcache.c:478
-#: dirmngr/crlcache.c:2588 dirmngr/dirmngr.c:1720 tools/gpg-card.c:408
+#: dirmngr/crlcache.c:2591 dirmngr/dirmngr.c:1759 tools/gpg-card.c:408
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "无法打开 ‘%s’： %s\n"
@@ -326,27 +340,27 @@ msgstr "PIN �次输入时与首次输入�符；请�试"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "请输入 PIN%s%s%s 以解�这张�"
 
-#: agent/genkey.c:109 sm/certreqgen-ui.c:433
+#: agent/genkey.c:142 sm/certreqgen-ui.c:433
 #, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "创建临时文件时出现错误： %s\n"
 
-#: agent/genkey.c:116
+#: agent/genkey.c:150
 #, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "写入临时文件时出现错误： %s\n"
 
-#: agent/genkey.c:154
+#: agent/genkey.c:191
 msgid "Enter new passphrase"
 msgstr "输入新的密�"
 
-#: agent/genkey.c:184
+#: agent/genkey.c:227
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr "您并没有输入一个密��%0A��许密�留空。"
 
-#: agent/genkey.c:186
+#: agent/genkey.c:229
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -355,253 +369,250 @@ msgstr ""
 "您并没有输入一个密� - 这通常�是一个好主��%0A请确认您�想给您的密钥加上任"
 "何的�护。"
 
-#: agent/genkey.c:198
+#: agent/genkey.c:241
 msgid "Yes, protection is not needed"
 msgstr "是的，�护�是必须的"
 
-#: agent/genkey.c:215
+#: agent/genkey.c:258
 #, 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:234
+#: agent/genkey.c:277
 #, 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:260
+#: agent/genkey.c:304
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr "密��应该是一个已知的用语或者与%%0A特定的模�相匹�。"
 
-#: agent/genkey.c:275
+#: agent/genkey.c:319
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "警告：您输入了一个�安全的密�。"
 
-#: agent/genkey.c:296
+#: agent/genkey.c:340
 msgid "Take this one anyway"
-msgstr "无论如何使用这个"
+msgstr "无论如何都使用这个"
 
-#: agent/genkey.c:464
+#: agent/genkey.c:508
 #, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "请输入密�以%0A�护您的新密钥"
 
-#: agent/genkey.c:590
+#: agent/genkey.c:637
 msgid "Please enter the new passphrase"
 msgstr "请输入新的密�"
 
-#: agent/gpg-agent.c:162 scd/scdaemon.c:115 dirmngr/dirmngr.c:182
+#: agent/gpg-agent.c:164 scd/scdaemon.c:115 dirmngr/dirmngr.c:183
 msgid "Options used for startup"
 msgstr "用于�动的选项"
 
-#: agent/gpg-agent.c:164 scd/scdaemon.c:120 dirmngr/dirmngr.c:171
+#: agent/gpg-agent.c:166 scd/scdaemon.c:120 dirmngr/dirmngr.c:172
 msgid "run in daemon mode (background)"
 msgstr "以守护进程模��行 （��）"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:117 dirmngr/dirmngr.c:170
+#: agent/gpg-agent.c:167 scd/scdaemon.c:117 dirmngr/dirmngr.c:171
 msgid "run in server mode (foreground)"
 msgstr "以�务进程模��行 （��）"
 
-#: agent/gpg-agent.c:167 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:169 dirmngr/dirmngr.c:174
 msgid "run in supervised mode"
 msgstr "以管�进程模��行"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:121 dirmngr/dirmngr.c:184
+#: agent/gpg-agent.c:171 scd/scdaemon.c:121 dirmngr/dirmngr.c:185
 msgid "do not detach from the console"
 msgstr "请勿离开控制�"
 
-#: agent/gpg-agent.c:170 scd/scdaemon.c:122 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:172 scd/scdaemon.c:122 dirmngr/dirmngr.c:186
 msgid "sh-style command output"
 msgstr "sh 风格的命令行输出"
 
-#: agent/gpg-agent.c:171 scd/scdaemon.c:123 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:173 scd/scdaemon.c:123 dirmngr/dirmngr.c:187
 msgid "csh-style command output"
 msgstr "csh 风格的命令行输出"
 
-#: agent/gpg-agent.c:179 g10/gpg.c:589 scd/scdaemon.c:125 sm/gpgsm.c:422
-#: dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:181 g10/gpg.c:589 scd/scdaemon.c:125 sm/gpgsm.c:423
+#: dirmngr/dirmngr.c:189
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|从 FILE 中读�选项"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:574 scd/scdaemon.c:129 sm/gpgsm.c:265
-#: dirmngr/dirmngr.c:192
+#: agent/gpg-agent.c:185 g10/gpg.c:574 scd/scdaemon.c:129 sm/gpgsm.c:265
+#: dirmngr/dirmngr.c:193
 msgid "Options controlling the diagnostic output"
 msgstr "控制诊断输出的选项"
 
-#: agent/gpg-agent.c:185 g10/gpg.c:576 g10/gpgv.c:78 kbx/kbxutil.c:89
+#: agent/gpg-agent.c:187 g10/gpg.c:576 g10/gpgv.c:78 kbx/kbxutil.c:89
 #: scd/scdaemon.c:131 sm/gpgsm.c:267 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:194 dirmngr/dirmngr_ldap.c:102
-#: tools/gpg-connect-agent.c:85 tools/gpgconf.c:111
+#: dirmngr/dirmngr.c:195 tools/gpg-connect-agent.c:85 tools/gpgconf.c:111
 msgid "verbose"
 msgstr "详细模�"
 
-#: agent/gpg-agent.c:186 g10/gpg.c:578 g10/gpgv.c:79 kbx/kbxutil.c:90
+#: agent/gpg-agent.c:188 g10/gpg.c:578 g10/gpgv.c:79 kbx/kbxutil.c:90
 #: scd/scdaemon.c:132 sm/gpgsm.c:269 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:195 dirmngr/dirmngr_ldap.c:103
+#: dirmngr/dirmngr.c:196
 msgid "be somewhat more quiet"
 msgstr "尽��少�示信�"
 
-#: agent/gpg-agent.c:194 g10/gpg.c:593 sm/gpgsm.c:283 dirmngr/dirmngr.c:205
+#: agent/gpg-agent.c:196 g10/gpg.c:593 sm/gpgsm.c:283 dirmngr/dirmngr.c:206
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FILE|将�务器模�的日志写入到 FILE"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 scd/scdaemon.c:146 sm/gpgsm.c:290
-#: dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:599 scd/scdaemon.c:146 sm/gpgsm.c:290
+#: dirmngr/dirmngr.c:210
 msgid "Options controlling the configuration"
 msgstr "控制�置的选项"
 
-#: agent/gpg-agent.c:201
+#: agent/gpg-agent.c:203
 msgid "do not use the SCdaemon"
 msgstr "�使用 SCdaemon"
 
-#: agent/gpg-agent.c:203
+#: agent/gpg-agent.c:205
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|使用 PGM 作为 SCdaemon 程�"
 
-#: agent/gpg-agent.c:205
-#, fuzzy
-#| msgid "|PGM|use PGM as the SCdaemon program"
+#: agent/gpg-agent.c:207
 msgid "|PGM|use PGM as the tpm2daemon program"
-msgstr "|PGM|使用 PGM 作为 SCdaemon 程�"
+msgstr "|PGM|使用 PGM 作为 tpm2daemon 程�"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|通过 NAME 接收一些命令"
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 msgid "ignore requests to change the TTY"
 msgstr "忽略改� TTY 的请求"
 
-#: agent/gpg-agent.c:215
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the X display"
 msgstr "忽略改� X display 的请求"
 
-#: agent/gpg-agent.c:216
+#: agent/gpg-agent.c:218
 msgid "enable ssh support"
 msgstr "�用 ssh 支�"
 
-#: agent/gpg-agent.c:218
+#: agent/gpg-agent.c:220
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "|ALGO|使用 ALGO 显示 ssh 指纹"
 
-#: agent/gpg-agent.c:221
+#: agent/gpg-agent.c:223
 msgid "enable putty support"
 msgstr "�用 putty 支�"
 
-#: agent/gpg-agent.c:233 g10/gpg.c:844 scd/scdaemon.c:176 sm/gpgsm.c:382
+#: agent/gpg-agent.c:235 g10/gpg.c:844 scd/scdaemon.c:176 sm/gpgsm.c:383
 msgid "Options controlling the security"
 msgstr "控制安全的选项"
 
-#: agent/gpg-agent.c:236
+#: agent/gpg-agent.c:238
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|使被缓存的 PIN 在 N 秒�过期"
 
-#: agent/gpg-agent.c:238
+#: agent/gpg-agent.c:240
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|在 N 秒�使 SSH 密钥过期"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:242
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|设置 PIN 缓存的生命周期为 N 秒"
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:244
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr "|N|设置 SSH 缓存的生命周期为 N 秒"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:246
 msgid "do not use the PIN cache when signing"
 msgstr "在签�时�使用 PIN 缓存"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:248
 msgid "disallow the use of an external password cache"
-msgstr "�止使用一个外部的密�缓存"
+msgstr "�止使用外部的密�缓存"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:250
 msgid "disallow clients to mark keys as \"trusted\""
-msgstr "�止客户端将一个密钥标记为“信任�"
+msgstr "�止客户端将密钥标记为“信任�"
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:253
 msgid "allow presetting passphrase"
 msgstr "�许预设置的密�"
 
-#: agent/gpg-agent.c:256
+#: agent/gpg-agent.c:258
 msgid "Options enforcing a passphrase policy"
 msgstr "选项强制�求一个密�策略"
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:261
 msgid "do not allow bypassing the passphrase policy"
 msgstr "��许绕过密�的策略"
 
-#: agent/gpg-agent.c:261
+#: agent/gpg-agent.c:263
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr "|N|设置�求新密�的最短长度为 N"
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:265
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr "|N|�求新密�至少有 N 个�字�字符"
 
-#: agent/gpg-agent.c:266
+#: agent/gpg-agent.c:268
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr "|FILE|按 FILE 中的样�检查新密�"
 
-#: agent/gpg-agent.c:268
+#: agent/gpg-agent.c:272
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|在 N 天�使密�过期"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:274
 msgid "do not allow the reuse of old passphrases"
 msgstr "��许�次使用旧的密�"
 
-#: agent/gpg-agent.c:273
+#: agent/gpg-agent.c:277
 msgid "Options controlling the PIN-Entry"
 msgstr "控制 PIN-Entry 的选项"
 
-#: agent/gpg-agent.c:275
+#: agent/gpg-agent.c:279
 msgid "never use the PIN-entry"
 msgstr "�使用 PIN-entry"
 
-#: agent/gpg-agent.c:277
+#: agent/gpg-agent.c:281
 msgid "disallow caller to override the pinentry"
 msgstr "�止调用者覆盖 pinentry"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:283
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr "�许 PIN-Entry 抓�键盘与鼠标"
 
-#: agent/gpg-agent.c:282
+#: agent/gpg-agent.c:286
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|使用 PGM 作为 PIN-Entry 程�"
 
-#: agent/gpg-agent.c:286
+#: agent/gpg-agent.c:290
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|设置 Pinentry 的超时时间为 N 秒"
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:294
 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:551 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: agent/gpg-agent.c:557 agent/preset-passphrase.c:99 agent/protect-tool.c:154
 #: g10/gpg.c:1132 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:612 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:438
-#: dirmngr/dirmngr_ldap.c:175 tools/gpg-connect-agent.c:220 tools/gpgconf.c:151
+#: sm/gpgsm.c:613 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:446
+#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:151
 #: 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:560
+#: agent/gpg-agent.c:566
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "用法： @GPG_AGENT@ [选项] （-h 获�帮助）"
 
-#: agent/gpg-agent.c:562
+#: agent/gpg-agent.c:568
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -609,131 +620,131 @@ msgstr ""
 "语法： @GPG_AGENT@ [选项] [命令 [�数]]\n"
 "@GNUPG@ �钥管�器\n"
 
-#: agent/gpg-agent.c:607 g10/gpg.c:1337 scd/scdaemon.c:384 sm/gpgsm.c:760
-#: dirmngr/dirmngr.c:522
+#: agent/gpg-agent.c:613 g10/gpg.c:1337 scd/scdaemon.c:384 sm/gpgsm.c:761
+#: dirmngr/dirmngr.c:530
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "无效的调试级别‘%s’\n"
 
-#: agent/gpg-agent.c:972 g10/gpg.c:3910 g10/gpg.c:3934 sm/gpgsm.c:1769
-#: sm/gpgsm.c:1775
+#: agent/gpg-agent.c:986 g10/gpg.c:3907 g10/gpg.c:3931 sm/gpgsm.c:1622
+#: sm/gpgsm.c:1628
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "所选的散列算法无效\n"
 
-#: agent/gpg-agent.c:1196 agent/gpg-agent.c:2019 common/comopt.c:93
-#: g10/gpg.c:2591 scd/scdaemon.c:549 sm/gpgsm.c:1155 dirmngr/dirmngr.c:989
-#: dirmngr/dirmngr.c:1840
+#: agent/gpg-agent.c:1210 agent/gpg-agent.c:2035 common/comopt.c:93
+#: g10/gpg.c:2594 scd/scdaemon.c:549 sm/gpgsm.c:1028 dirmngr/dirmngr.c:1029
+#: dirmngr/dirmngr.c:1879
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "从‘%s’读�选项\n"
 
-#: agent/gpg-agent.c:1335 g10/gpg.c:3861 scd/scdaemon.c:687 sm/gpgsm.c:1709
-#: dirmngr/dirmngr.c:1108 tools/gpg-connect-agent.c:1270 tools/gpgconf.c:634
+#: agent/gpg-agent.c:1349 g10/gpg.c:3858 scd/scdaemon.c:687 sm/gpgsm.c:1562
+#: dirmngr/dirmngr.c:1145 tools/gpg-connect-agent.c:1270 tools/gpgconf.c:668
 #, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr "注�：‘%s’�被认为是一个选项\n"
 
-#: agent/gpg-agent.c:2172 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1267
+#: agent/gpg-agent.c:2188 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1306
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "无法创建套接字： %s\n"
 
-#: agent/gpg-agent.c:2189 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1280
+#: agent/gpg-agent.c:2205 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1319
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "套接字�称‘%s’太长\n"
 
-#: agent/gpg-agent.c:2228
+#: agent/gpg-agent.c:2244
 #, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
-msgstr "一个 gpg-agent 实例正在�行 - ��动新的实例\n"
+msgstr "有一个 gpg-agent 实例正在�行 - 无须�动新的实例\n"
 
-#: agent/gpg-agent.c:2239 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1312
+#: agent/gpg-agent.c:2255 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1351
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "获�套接字 nonce 时出现错误\n"
 
-#: agent/gpg-agent.c:2244 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1315
+#: agent/gpg-agent.c:2260 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1354
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "绑定套接字到 '%s' 时出现错误： %s\n"
 
-#: agent/gpg-agent.c:2255 agent/gpg-agent.c:2295 agent/gpg-agent.c:2304
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1324
+#: agent/gpg-agent.c:2271 agent/gpg-agent.c:2311 agent/gpg-agent.c:2320
+#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1363
 #, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "无法设置‘%s’的��： %s\n"
 
-#: agent/gpg-agent.c:2269 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1336
+#: agent/gpg-agent.c:2285 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1375
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "正在监�套接字‘%s’\n"
 
-#: agent/gpg-agent.c:2289 agent/gpg-agent.c:2342 common/homedir.c:517
+#: agent/gpg-agent.c:2305 agent/gpg-agent.c:2358 common/homedir.c:537
 #: 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:2292 agent/gpg-agent.c:2347 common/homedir.c:520
+#: agent/gpg-agent.c:2308 agent/gpg-agent.c:2363 common/homedir.c:540
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "目录‘%s’已创建\n"
 
-#: agent/gpg-agent.c:2353
+#: agent/gpg-agent.c:2369
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "‘%s’的 stat() 方法失败：%s\n"
 
-#: agent/gpg-agent.c:2357
+#: agent/gpg-agent.c:2373
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "无法使用‘%s’作为家目录\n"
 
-#: agent/gpg-agent.c:2512 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2069
+#: agent/gpg-agent.c:2528 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2108
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "在读� fd %d 上的 nonce 时出现错误： %s\n"
 
-#: agent/gpg-agent.c:2719
+#: agent/gpg-agent.c:2735
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "�柄 0x%lx 于文件�述符 %d �动\n"
 
-#: agent/gpg-agent.c:2724
+#: agent/gpg-agent.c:2740
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "�柄 0x%lx 于文件�述符 %d 终止\n"
 
-#: agent/gpg-agent.c:2799
+#: agent/gpg-agent.c:2815
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "ssh �柄 0x%lx 于文件�述符 %d �动\n"
 
-#: agent/gpg-agent.c:2804
+#: agent/gpg-agent.c:2820
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "ssh �柄 0x%lx 于文件�述符 %d 终止\n"
 
-#: agent/gpg-agent.c:3026 scd/scdaemon.c:1374 dirmngr/dirmngr.c:2283
+#: agent/gpg-agent.c:3042 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2322
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "npth_pselect 方法失败：%s - 等待 1s\n"
 
-#: agent/gpg-agent.c:3114 scd/scdaemon.c:1439
+#: agent/gpg-agent.c:3130 scd/scdaemon.c:1441
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s 已�止\n"
 
-#: agent/gpg-agent.c:3252 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3271 common/simple-pwquery.c:247 g10/call-agent.c:260
 #: sm/call-agent.c:131 tools/gpg-connect-agent.c:2319 tools/card-call-scd.c:311
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "此会�中没有 gpg-agent 实例�行\n"
 
-#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:70
+#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:66
 msgid ""
 "@Options:\n"
 " "
@@ -754,7 +765,7 @@ msgstr ""
 "密�缓存管�\n"
 
 #: agent/protect-tool.c:107 g10/gpg.c:448 kbx/kbxutil.c:72 sm/gpgsm.c:215
-#: dirmngr/dirmngr.c:168 tools/gpgconf.c:81
+#: dirmngr/dirmngr.c:169 tools/gpgconf.c:81
 msgid ""
 "@Commands:\n"
 " "
@@ -785,21 +796,21 @@ msgstr ""
 "语法：gpg-protect-tool [选项] [�数]\n"
 "�钥管�工具\n"
 
-#: agent/protect-tool.c:707
+#: agent/protect-tool.c:708 sm/import.c:775
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "请输入密�以解密 PKCS#12 对象。"
 
-#: agent/protect-tool.c:712
+#: agent/protect-tool.c:713 sm/export.c:727
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "请输入密�以�护新的 PKCS#12 对象。"
 
-#: agent/protect-tool.c:718
+#: agent/protect-tool.c:719
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr "请输入密�以在 GnuPG 系统内部�护已导入的对象。"
 
-#: agent/protect-tool.c:723
+#: agent/protect-tool.c:724
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -807,17 +818,17 @@ msgstr ""
 "请输入所需的密�或者 PIN\n"
 "以完�此�作。"
 
-#: agent/protect-tool.c:734
+#: agent/protect-tool.c:735
 #, c-format
 msgid "cancelled\n"
 msgstr "已�消\n"
 
-#: agent/protect-tool.c:736
+#: agent/protect-tool.c:737
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "请求密�时出现错误： %s\n"
 
-#: agent/trustlist.c:153 agent/trustlist.c:363 tools/gpgconf.c:424
+#: agent/trustlist.c:153 agent/trustlist.c:363 tools/gpgconf.c:458
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "打开‘%s’时出现错误：%s\n"
@@ -925,7 +936,7 @@ msgstr "更改密�"
 
 #: agent/findkey.c:405
 msgid "I'll change it later"
-msgstr "我想��修改"
+msgstr "��修改"
 
 #: agent/findkey.c:1461
 #, c-format
@@ -972,20 +983,20 @@ msgstr "检查已建立的签�时�生错误： %s\n"
 msgid "secret key parts are not available\n"
 msgstr "�钥部分��用\n"
 
-#: agent/cvt-openpgp.c:343 g10/card-util.c:1562
+#: agent/cvt-openpgp.c:343 g10/card-util.c:1575
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
-msgstr "公钥算法 %d (%s) �被支�\n"
+msgstr "�支�的公钥算法: %d (%s)\n"
 
 #: agent/cvt-openpgp.c:493
 #, c-format
 msgid "protection algorithm %d (%s) is not supported\n"
-msgstr "�护算法 %d (%s) �被支�\n"
+msgstr "�支�的�护算法: %d (%s)\n"
 
 #: agent/cvt-openpgp.c:500
 #, c-format
 msgid "protection hash algorithm %d (%s) is not supported\n"
-msgstr "�护散列算法 %d (%s) �被支�\n"
+msgstr "�支�的�护散列算法: %d (%s)\n"
 
 #: common/exechelp-posix.c:360 common/exechelp-w32.c:461
 #: common/exechelp-w32.c:485 common/exechelp-w32.c:515
@@ -1001,7 +1012,7 @@ msgid "error creating a stream for a pipe: %s\n"
 msgstr "为管�创建�时出现错误： %s\n"
 
 #: common/exechelp-posix.c:505 common/exechelp-posix.c:580
-#: common/exechelp-posix.c:866 dirmngr/dirmngr.c:1354
+#: common/exechelp-posix.c:866 dirmngr/dirmngr.c:1393
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "在 fork 进程时出现错误： %s\n"
@@ -1073,7 +1084,7 @@ msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "将 ‘%s’ �命�为 ‘%s’ 时失败：%s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3082
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3099
 msgid "yes"
 msgstr "yes"
 
@@ -1130,7 +1141,7 @@ msgstr "分� %lu 字节时安全内存�足"
 msgid "out of core while allocating %lu bytes"
 msgstr "分� %lu 字节时内存�足"
 
-#: common/miscellaneous.c:115 g10/card-util.c:917 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:927 tools/no-libgcrypt.c:30
 #: tools/gpg-card.c:416
 #, c-format
 msgid "error allocating enough memory: %s\n"
@@ -1201,7 +1212,7 @@ msgstr "从 ‘%s’ 获�版本时出现错误: %s\n"
 msgid "server '%s' is older than us (%s < %s)"
 msgstr "�务器 ‘%s’ 比我们的版本更� （%s < %s）"
 
-#: common/asshelp.c:737 g10/call-dirmngr.c:408
+#: common/asshelp.c:737 g10/call-dirmngr.c:407
 #, c-format
 msgid "WARNING: %s\n"
 msgstr "警告：%s\n"
@@ -1284,7 +1295,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:4212
+#: scd/app-openpgp.c:4214
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "�支�的算法：%s"
@@ -1359,11 +1370,11 @@ msgstr "�书链�有效"
 msgid "Root certificate trustworthy"
 msgstr "根�书��"
 
-#: common/audit.c:1112 sm/certchain.c:1242
+#: common/audit.c:1112 sm/certchain.c:1243
 msgid "no CRL found for certificate"
 msgstr "未找到该�书的�书�销列表（CRL）"
 
-#: common/audit.c:1115 sm/certchain.c:1252
+#: common/audit.c:1115 sm/certchain.c:1253
 msgid "the available CRL is too old"
 msgstr "�用的�书�销列表（CRL）太旧"
 
@@ -1409,25 +1420,25 @@ msgstr "[未有]"
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "无效的 radix64 字符 %02x 已被跳过\n"
 
-#: common/ttyio.c:433
+#: common/ttyio.c:447
 #, c-format
 msgid "Sorry, we are in batchmode - can't get input\n"
-msgstr ""
+msgstr "抱歉，正处于批处�模�——无法获�输入\n"
 
-#: common/ttyio.c:439
+#: common/ttyio.c:453
 #, c-format
 msgid "Sorry, no terminal at all requested - can't get input\n"
-msgstr ""
+msgstr "抱歉，�求了无终端模�——无法获�输入\n"
 
-#: common/ttyio.c:474 common/ttyio.c:484
+#: common/ttyio.c:488 common/ttyio.c:498
 #, c-format
 msgid "too many errors; giving up\n"
-msgstr ""
+msgstr "错误过多；放弃\n"
 
-#: common/ttyio.c:536
+#: common/ttyio.c:550
 #, c-format
 msgid "Control-D detected\n"
-msgstr ""
+msgstr "检测到 Control-D\n"
 
 #: common/utf8conv.c:123
 #, c-format
@@ -1478,8 +1489,7 @@ msgstr "� ‘%s’ 未被建立： %s\n"
 msgid "waiting for lock %s...\n"
 msgstr "等待� %s...\n"
 
-#: common/init.c:191 sm/gpgsm.c:1036 dirmngr/dirmngr.c:895
-#: dirmngr/dirmngr.c:904
+#: common/init.c:191 sm/gpgsm.c:909 dirmngr/dirmngr.c:935 dirmngr/dirmngr.c:944
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s 太旧 （需� %s，拥有 %s）\n"
@@ -1628,225 +1638,224 @@ msgid "Enter passphrase: "
 msgstr "输入密�： "
 
 #: g10/call-agent.c:318 g10/encrypt.c:282 g10/encrypt.c:818 g10/sign.c:473
-#: sm/call-agent.c:180 sm/encrypt.c:701 sm/sign.c:436
+#: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
 #, c-format
 msgid "%s is not compliant with %s mode\n"
 msgstr "%s 与 %s 模��兼容\n"
 
 #: g10/call-agent.c:1081
-#, fuzzy, c-format
-#| msgid "error reading from %s: %s\n"
+#, c-format
 msgid "error from TPM: %s\n"
-msgstr "读� %s 时出现错误：%s\n"
+msgstr "�自 TPM 的错误：%s\n"
 
-#: g10/call-agent.c:2123 g10/passphrase.c:225 g10/passphrase.c:258
-#: tools/card-call-scd.c:1751
+#: g10/call-agent.c:2135 g10/passphrase.c:233 g10/passphrase.c:266
+#: tools/card-call-scd.c:1755
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "代�人程�出现问题：%s\n"
 
-#: g10/call-dirmngr.c:179 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2316
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2316
 #, c-format
 msgid "no dirmngr running in this session\n"
 msgstr ""
 "此会�中没有正在�行的 dirmngr\n"
 "\n"
 
-#: g10/call-dirmngr.c:213
+#: g10/call-dirmngr.c:212
 #, c-format
 msgid "keyserver option \"honor-keyserver-url\" may not be used in Tor mode\n"
 msgstr "密钥�务器选项 “honor-keyserver-url� �应用于 Tor 模�中\n"
 
-#: g10/call-dirmngr.c:386
+#: g10/call-dirmngr.c:385
 msgid "WKD uses a cached result"
 msgstr "WKD 使用了缓存的结果"
 
-#: g10/call-dirmngr.c:389
+#: g10/call-dirmngr.c:388
 msgid "Tor is not running"
 msgstr "Tor 未在�行"
 
-#: g10/call-dirmngr.c:391
+#: g10/call-dirmngr.c:390
 msgid "Tor is not properly configured"
 msgstr "Tor �置错误"
 
-#: g10/call-dirmngr.c:393
+#: g10/call-dirmngr.c:392
 msgid "DNS is not properly configured"
 msgstr "DNS �置错误"
 
-#: g10/call-dirmngr.c:395
+#: g10/call-dirmngr.c:394
 msgid "unacceptable HTTP redirect from server"
 msgstr "无法接��自�务器的 HTTP �定�"
 
-#: g10/call-dirmngr.c:397
+#: g10/call-dirmngr.c:396
 msgid "unacceptable HTTP redirect from server was cleaned up"
 msgstr "已清除�自�务器的��接�的 HTTP �定�"
 
-#: g10/call-dirmngr.c:399
+#: g10/call-dirmngr.c:398
 msgid "server uses an invalid certificate"
 msgstr "�务器�书无效"
 
-#: g10/call-dirmngr.c:406 g10/gpg.c:4599
+#: g10/call-dirmngr.c:405 g10/gpg.c:4596
 #, c-format
 msgid "Note: %s\n"
 msgstr "注�：%s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:369 g10/card-util.c:1924
-#: tools/gpg-card.c:3039
+#: g10/card-util.c:86 g10/card-util.c:374 g10/card-util.c:1937
+#: tools/gpg-card.c:3056
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP ���用：%s\n"
 
-#: g10/card-util.c:91 g10/card-util.c:1930
+#: g10/card-util.c:91 g10/card-util.c:1943
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "检测到 OpenPGP �，��为 %s\n"
 
-#: g10/card-util.c:97 g10/card-util.c:2309 g10/delkey.c:164 g10/keyedit.c:1428
-#: g10/keygen.c:4791 g10/revoke.c:214 g10/revoke.c:638
+#: g10/card-util.c:97 g10/card-util.c:2322 g10/delkey.c:164 g10/keyedit.c:1428
+#: g10/keygen.c:4795 g10/revoke.c:214 g10/revoke.c:639
 #, c-format
 msgid "can't do this in batch mode\n"
 msgstr "在批处�模�中无法完�此�作\n"
 
-#: g10/card-util.c:105 tools/gpg-card.c:2943
+#: g10/card-util.c:105 tools/gpg-card.c:2960
 #, c-format
 msgid "This command is only available for version 2 cards\n"
 msgstr "这一命令�在版本 2 的�上�用\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3398 tools/gpg-card.c:2948
+#: g10/card-util.c:107 scd/app-openpgp.c:3399 tools/gpg-card.c:2965
 #, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "�置���用或���用\n"
 
-#: g10/card-util.c:140 g10/card-util.c:1448 g10/card-util.c:1710
-#: g10/card-util.c:1802 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1991 g10/keygen.c:2165 g10/keygen.c:2385 g10/keygen.c:2685
+#: g10/card-util.c:140 g10/card-util.c:1458 g10/card-util.c:1723
+#: g10/card-util.c:1815 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/keygen.c:1992 g10/keygen.c:2166 g10/keygen.c:2386 g10/keygen.c:2686
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
 #: tools/gpg-card.c:510
 msgid "Your selection? "
 msgstr "您的选择是？ "
 
-#: g10/card-util.c:262 g10/card-util.c:313 tools/gpg-card.c:596
+#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:596
 #: tools/gpg-card.c:636
 msgid "[not set]"
 msgstr "[未设定]"
 
-#: g10/card-util.c:558 tools/gpg-card.c:903
+#: g10/card-util.c:563 tools/gpg-card.c:905
 msgid "Mr."
 msgstr "先生"
 
-#: g10/card-util.c:559 tools/gpg-card.c:904
+#: g10/card-util.c:564 tools/gpg-card.c:906
 msgid "Ms."
 msgstr "女士"
 
-#: g10/card-util.c:586 tools/gpg-card.c:931
+#: g10/card-util.c:591 tools/gpg-card.c:933
 msgid "not forced"
 msgstr "�强制"
 
-#: g10/card-util.c:586 tools/gpg-card.c:931
+#: g10/card-util.c:591 tools/gpg-card.c:933
 msgid "forced"
 msgstr "强制"
 
-#: g10/card-util.c:768 tools/gpg-card.c:1468
+#: g10/card-util.c:773 tools/gpg-card.c:1484
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "错误：目���许使用纯 ASCII 字符。\n"
 
-#: g10/card-util.c:770 tools/gpg-card.c:1470
+#: g10/card-util.c:775 tools/gpg-card.c:1486
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "错误：�能使用字符 “<�。\n"
 
-#: g10/card-util.c:772 tools/gpg-card.c:1472
+#: g10/card-util.c:777 tools/gpg-card.c:1488
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "错误：��许出现两个空格。\n"
 
-#: g10/card-util.c:789 tools/gpg-card.c:1505
+#: g10/card-util.c:795 tools/gpg-card.c:1521
 msgid "Cardholder's surname: "
 msgstr "�片�有人的姓： "
 
-#: g10/card-util.c:791 tools/gpg-card.c:1506
+#: g10/card-util.c:797 tools/gpg-card.c:1522
 msgid "Cardholder's given name: "
 msgstr "�片�有人的�： "
 
-#: g10/card-util.c:809 tools/gpg-card.c:1523
+#: g10/card-util.c:816 tools/gpg-card.c:1539
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "错误：���的姓�太长（至多 %d 个字符）。\n"
 
-#: g10/card-util.c:830 tools/gpg-card.c:1561
+#: g10/card-util.c:840 tools/gpg-card.c:1577
 msgid "URL to retrieve public key: "
 msgstr "拉�公钥的 URL： "
 
-#: g10/card-util.c:926 g10/decrypt-data.c:495 g10/import.c:406 g10/import.c:756
-#: g10/import.c:815 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1666
-#: tools/gpgconf.c:437 tools/gpgconf.c:483 tools/gpg-card.c:426
+#: g10/card-util.c:936 g10/decrypt-data.c:495 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:1705
+#: tools/gpgconf.c:471 tools/gpgconf.c:517 tools/gpg-card.c:426
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "读� ‘%s’ 时出现错误：%s\n"
 
-#: g10/card-util.c:959 g10/decrypt-data.c:498 g10/export.c:2496
+#: g10/card-util.c:969 g10/decrypt-data.c:498 g10/export.c:2496
 #: dirmngr/crlcache.c:925 tools/gpg-card.c:486 tools/gpg-card.c:493
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr "写入 ‘%s’ 时出现错误： %s\n"
 
-#: g10/card-util.c:986 tools/gpg-card.c:1650
+#: g10/card-util.c:996 tools/gpg-card.c:1666
 msgid "Login data (account name): "
 msgstr "登录数�（�户�）： "
 
-#: g10/card-util.c:1024 tools/gpg-card.c:1945
+#: g10/card-util.c:1034 tools/gpg-card.c:1962
 msgid "Private DO data: "
 msgstr "个人 DO 数�： "
 
-#: g10/card-util.c:1109 tools/gpg-card.c:1699
+#: g10/card-util.c:1119 tools/gpg-card.c:1715
 msgid "Language preferences: "
 msgstr "语言�好： "
 
-#: g10/card-util.c:1117 tools/gpg-card.c:1710
+#: g10/card-util.c:1127 tools/gpg-card.c:1726
 #, c-format
 msgid "Error: invalid length of preference string.\n"
 msgstr "错误：�好字符串长度无效。\n"
 
-#: g10/card-util.c:1126 tools/gpg-card.c:1719
+#: g10/card-util.c:1136 tools/gpg-card.c:1735
 #, c-format
 msgid "Error: invalid characters in preference string.\n"
 msgstr "错误：�好字符串中存在无效字符。\n"
 
-#: g10/card-util.c:1148 tools/gpg-card.c:1753
+#: g10/card-util.c:1158 tools/gpg-card.c:1769
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr "称呼（M = 先生，F = 女士，或者留空)： "
 
-#: g10/card-util.c:1162 tools/gpg-card.c:1770
+#: g10/card-util.c:1172 tools/gpg-card.c:1786
 msgid "Error: invalid response.\n"
 msgstr "错误：无效的�应。\n"
 
-#: g10/card-util.c:1185 tools/gpg-card.c:1835
+#: g10/card-util.c:1195 tools/gpg-card.c:1852
 msgid "CA fingerprint: "
 msgstr "CA 指纹： "
 
-#: g10/card-util.c:1209 tools/gpg-card.c:1861
+#: g10/card-util.c:1219 tools/gpg-card.c:1878
 #, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "错误：指纹格�无效。\n"
 
-#: g10/card-util.c:1259
+#: g10/card-util.c:1269
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "密钥�作无法实现：%s\n"
 
-#: g10/card-util.c:1260
+#: g10/card-util.c:1270
 msgid "not an OpenPGP card"
 msgstr "�是一个 OpenPGP �"
 
-#: g10/card-util.c:1273 g10/keygen.c:4811 g10/keygen.c:5972
+#: g10/card-util.c:1283 g10/keygen.c:4815 g10/keygen.c:6003
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "�得当�密钥信�时出错：%s\n"
 
-#: g10/card-util.c:1358
+#: g10/card-util.c:1368
 msgid "Replace existing key? (y/N) "
 msgstr "替�现存的密钥？(y/N) "
 
-#: g10/card-util.c:1375 tools/gpg-card.c:3328
+#: g10/card-util.c:1385 tools/gpg-card.c:3345
 msgid ""
 "Note: There is no guarantee that the card supports the requested\n"
 "      key type or size.  If the key generation does not succeed,\n"
@@ -1857,99 +1866,99 @@ msgstr ""
 "      如果密钥生���功，请检查您的�片文档，\n"
 "      查看其所支�的密钥类型和大�。\n"
 
-#: g10/card-util.c:1396 g10/keygen.c:2570 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1406 g10/keygen.c:2571 sm/certreqgen-ui.c:180
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "您想�使用的密钥长度？(%u) "
 
-#: g10/card-util.c:1406 g10/keygen.c:2493 g10/keygen.c:2525
+#: g10/card-util.c:1416 g10/keygen.c:2494 g10/keygen.c:2526
 #: sm/certreqgen-ui.c:195
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "�入到 %u �\n"
 
-#: g10/card-util.c:1414 g10/keygen.c:2578 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1424 g10/keygen.c:2579 sm/certreqgen-ui.c:185
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s 密钥长度必须在 %u 与 %u 间\n"
 
-#: g10/card-util.c:1433
+#: g10/card-util.c:1443
 msgid "Changing card key attribute for: "
 msgstr "正在改��片的密钥属性： "
 
-#: g10/card-util.c:1435
+#: g10/card-util.c:1445
 msgid "Signature key\n"
 msgstr "签�密钥\n"
 
-#: g10/card-util.c:1437
+#: g10/card-util.c:1447
 msgid "Encryption key\n"
 msgstr "加密密钥\n"
 
-#: g10/card-util.c:1439
+#: g10/card-util.c:1449
 msgid "Authentication key\n"
 msgstr "身份验�密钥\n"
 
-#: g10/card-util.c:1441 g10/keygen.c:2112 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1451 g10/keygen.c:2113 sm/certreqgen-ui.c:158
 msgid "Please select what kind of key you want:\n"
 msgstr "请选择您�使用的密钥类型：\n"
 
-#: g10/card-util.c:1442 sm/certreqgen-ui.c:159
+#: g10/card-util.c:1452 sm/certreqgen-ui.c:159
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1443
+#: g10/card-util.c:1453
 #, c-format
 msgid "   (%d) ECC\n"
 msgstr "   (%d) ECC\n"
 
-#: g10/card-util.c:1455 g10/card-util.c:1722 g10/card-util.c:1822
-#: g10/keyedit.c:900 g10/keygen.c:2017 g10/keygen.c:2045 g10/keygen.c:2172
-#: g10/keygen.c:2425 g10/keygen.c:2713 g10/revoke.c:836
+#: g10/card-util.c:1468 g10/card-util.c:1735 g10/card-util.c:1835
+#: g10/keyedit.c:900 g10/keygen.c:2018 g10/keygen.c:2046 g10/keygen.c:2173
+#: g10/keygen.c:2426 g10/keygen.c:2714 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "无效的选择。\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1541
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr "此�片将会被�新�置以生�一个 %u �的新密钥\n"
 
-#: g10/card-util.c:1533
+#: g10/card-util.c:1546
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr "此�片将会被�新�置以生�一个以下类型的密钥： %s\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1582
 #, c-format
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "改�密钥 %d 的密钥属性时出现错误： %s\n"
 
-#: g10/card-util.c:1585 g10/card-util.c:2106 g10/card-util.c:2162
+#: g10/card-util.c:1598 g10/card-util.c:2119 g10/card-util.c:2175
 #, c-format
 msgid "error getting card info: %s\n"
 msgstr "获��片信�时出现错： %s\n"
 
-#: g10/card-util.c:1591 g10/card-util.c:1936 g10/card-util.c:2112
-#: g10/card-util.c:2171 tools/gpg-card.c:3057 tools/gpg-card.c:3296
-#: tools/gpg-card.c:3354
+#: g10/card-util.c:1604 g10/card-util.c:1949 g10/card-util.c:2125
+#: g10/card-util.c:2184 tools/gpg-card.c:3074 tools/gpg-card.c:3313
+#: tools/gpg-card.c:3371
 #, c-format
 msgid "This command is not supported by this card\n"
 msgstr "此命令�被此�片支�\n"
 
-#: g10/card-util.c:1637 tools/gpg-card.c:2426
+#: g10/card-util.c:1650 tools/gpg-card.c:2443
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "创建加密密钥的离�备份？ (Y/n) "
 
-#: g10/card-util.c:1651
+#: g10/card-util.c:1664
 #, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "注�： 已有�钥被存储于�片上�\n"
 
-#: g10/card-util.c:1654 tools/gpg-card.c:2398
+#: g10/card-util.c:1667 tools/gpg-card.c:2415
 msgid "Replace existing keys? (y/N) "
 msgstr "替�现存的密钥？(y/N) "
 
-#: g10/card-util.c:1666 tools/gpg-card.c:2457
+#: g10/card-util.c:1679 tools/gpg-card.c:2474
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1960,152 +1969,152 @@ msgstr ""
 "  PIN = ‘%s’    管�员 PIN = ‘%s’\n"
 "您应当使用 --change-pin 命令�更改它们\n"
 
-#: g10/card-util.c:1701
+#: g10/card-util.c:1714
 msgid "Please select the type of key to generate:\n"
 msgstr "请选择您�生�的密钥类型：\n"
 
-#: g10/card-util.c:1703 g10/card-util.c:1793
+#: g10/card-util.c:1716 g10/card-util.c:1806
 msgid "   (1) Signature key\n"
 msgstr "  (1) 签�密钥\n"
 
-#: g10/card-util.c:1704 g10/card-util.c:1795
+#: g10/card-util.c:1717 g10/card-util.c:1808
 msgid "   (2) Encryption key\n"
 msgstr "  (2) 加密密钥\n"
 
-#: g10/card-util.c:1705 g10/card-util.c:1797
+#: g10/card-util.c:1718 g10/card-util.c:1810
 msgid "   (3) Authentication key\n"
 msgstr "  (3) 身份验�密钥\n"
 
-#: g10/card-util.c:1790
+#: g10/card-util.c:1803
 msgid "Please select where to store the key:\n"
 msgstr "请选择在哪里存储密钥：\n"
 
-#: g10/card-util.c:1836
+#: g10/card-util.c:1849
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "KEYTOCARD 失败： %s\n"
 
-#: g10/card-util.c:1941 tools/gpg-card.c:3065
+#: g10/card-util.c:1954 tools/gpg-card.c:3082
 #, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr "注�： 这一命令将会销�所有储存于�片上的�钥�\n"
 
-#: g10/card-util.c:1944 tools/gpg-card.c:3068 tools/gpg-card.c:3409
+#: g10/card-util.c:1957 tools/gpg-card.c:3085 tools/gpg-card.c:3426
 msgid "Continue? (y/N) "
 msgstr "继续？ (y/N) "
 
-#: g10/card-util.c:1949 tools/gpg-card.c:3079
+#: g10/card-util.c:1962 tools/gpg-card.c:3096
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr "真的�执行��出厂设置�？ (输入“yes�) "
 
-#: g10/card-util.c:2142
+#: g10/card-util.c:2155
 #, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "设置 KDF 时出现错误： %s\n"
 
-#: g10/card-util.c:2188
+#: g10/card-util.c:2201
 #, c-format
 msgid "error for setup UIF: %s\n"
 msgstr "设置 KDF 时出现错误： %s\n"
 
-#: g10/card-util.c:2212 g10/keyedit.c:1263 tools/gpg-card.c:3649
+#: g10/card-util.c:2225 g10/keyedit.c:1263 tools/gpg-card.c:3666
 msgid "quit this menu"
 msgstr "退出此��"
 
-#: g10/card-util.c:2214
+#: g10/card-util.c:2227
 msgid "show admin commands"
 msgstr "显示管�员命令"
 
-#: g10/card-util.c:2215 g10/keyedit.c:1266 tools/gpg-card.c:3652
+#: g10/card-util.c:2228 g10/keyedit.c:1266 tools/gpg-card.c:3669
 msgid "show this help"
 msgstr "显示此帮助"
 
-#: g10/card-util.c:2217 tools/gpg-card.c:3654
+#: g10/card-util.c:2230 tools/gpg-card.c:3671
 msgid "list all available data"
 msgstr "列出所有�用数�"
 
-#: g10/card-util.c:2220 tools/gpg-card.c:3656
+#: g10/card-util.c:2233 tools/gpg-card.c:3673
 msgid "change card holder's name"
 msgstr "更改��有人的姓�"
 
-#: g10/card-util.c:2221 tools/gpg-card.c:3657
+#: g10/card-util.c:2234 tools/gpg-card.c:3674
 msgid "change URL to retrieve key"
 msgstr "更改拉�密钥的 URL"
 
-#: g10/card-util.c:2222 tools/gpg-card.c:3658
+#: g10/card-util.c:2235 tools/gpg-card.c:3675
 msgid "fetch the key specified in the card URL"
 msgstr "根��中指定的 URL 获�密钥"
 
-#: g10/card-util.c:2223 tools/gpg-card.c:3659
+#: g10/card-util.c:2236 tools/gpg-card.c:3676
 msgid "change the login name"
 msgstr "更改登录�"
 
-#: g10/card-util.c:2224 tools/gpg-card.c:3660
+#: g10/card-util.c:2237 tools/gpg-card.c:3677
 msgid "change the language preferences"
 msgstr "更改语言�好"
 
-#: g10/card-util.c:2225 tools/gpg-card.c:3661
+#: g10/card-util.c:2238 tools/gpg-card.c:3678
 msgid "change card holder's salutation"
 msgstr "�更�片�有人的称呼"
 
-#: g10/card-util.c:2227 tools/gpg-card.c:3663
+#: g10/card-util.c:2240 tools/gpg-card.c:3680
 msgid "change a CA fingerprint"
 msgstr "更改一个 CA 指纹"
 
-#: g10/card-util.c:2228 tools/gpg-card.c:3664
+#: g10/card-util.c:2241 tools/gpg-card.c:3681
 msgid "toggle the signature force PIN flag"
-msgstr "开关签�的强制 PIN 设置"
+msgstr "切�签�强制使用 PIN 标志"
 
-#: g10/card-util.c:2229 tools/gpg-card.c:3665
+#: g10/card-util.c:2242 tools/gpg-card.c:3682
 msgid "generate new keys"
 msgstr "生�新的密钥"
 
-#: g10/card-util.c:2230 tools/gpg-card.c:3666
+#: g10/card-util.c:2243 tools/gpg-card.c:3683
 msgid "menu to change or unblock the PIN"
 msgstr "更改或解� PIN 的��"
 
-#: g10/card-util.c:2231 tools/gpg-card.c:3667
+#: g10/card-util.c:2244 tools/gpg-card.c:3684
 msgid "verify the PIN and list all data"
 msgstr "验� PIN 并列出所有数�"
 
-#: g10/card-util.c:2232 tools/gpg-card.c:3668
+#: g10/card-util.c:2245 tools/gpg-card.c:3685
 msgid "unblock the PIN using a Reset Code"
 msgstr "使用�置�解� PIN"
 
-#: g10/card-util.c:2233 tools/gpg-card.c:3672
+#: g10/card-util.c:2246 tools/gpg-card.c:3689
 msgid "destroy all keys and data"
 msgstr "销�所有密钥和数�"
 
-#: g10/card-util.c:2235
+#: g10/card-util.c:2248
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr "针对 PIN 身份验�设置 KDF（开�/�一/关闭）"
 
-#: g10/card-util.c:2236
+#: g10/card-util.c:2249
 msgid "change the key attribute"
 msgstr "更改密钥属性"
 
-#: g10/card-util.c:2237 tools/gpg-card.c:3674
+#: g10/card-util.c:2250 tools/gpg-card.c:3691
 msgid "change the User Interaction Flag"
 msgstr "�更用户交互选项"
 
-#: g10/card-util.c:2361 tools/gpg-card.c:3924
+#: g10/card-util.c:2374 tools/gpg-card.c:3941
 msgid "gpg/card> "
 msgstr "gpg/card> "
 
-#: g10/card-util.c:2402
+#: g10/card-util.c:2415
 msgid "Admin-only command\n"
 msgstr "仅供管�员使用的命令\n"
 
-#: g10/card-util.c:2433
+#: g10/card-util.c:2446
 msgid "Admin commands are allowed\n"
 msgstr "管�员命令�用\n"
 
-#: g10/card-util.c:2435
+#: g10/card-util.c:2448
 msgid "Admin commands are not allowed\n"
 msgstr "管�员命令��用\n"
 
-#: g10/card-util.c:2546 g10/keyedit.c:2275 tools/gpg-card.c:3814
-#: tools/gpg-card.c:4072
+#: g10/card-util.c:2559 g10/keyedit.c:2275 tools/gpg-card.c:3831
+#: tools/gpg-card.c:4089
 #, c-format
 msgid "Invalid command  (try \"help\")\n"
 msgstr "无效的命令  （�试“help�）\n"
@@ -2115,22 +2124,22 @@ msgstr "无效的命令  （�试“help�）\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output 在这个命令中�起作用\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5293 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5292 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:1934 g10/export.c:2342 g10/export.c:2463
-#: g10/getkey.c:1907 g10/gpg.c:5238 g10/keyedit.c:1450 g10/keyedit.c:2382
-#: g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:703 g10/keyserver.c:1240
-#: g10/revoke.c:230 g10/tofu.c:2168
+#: g10/getkey.c:2032 g10/gpg.c:5237 g10/keyedit.c:1450 g10/keyedit.c:2382
+#: g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:703 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:2002 g10/getkey.c:1915 g10/getkey.c:4330
-#: g10/gpg.c:5247 g10/keyedit.c:2354 g10/keyserver.c:1258 g10/revoke.c:236
-#: g10/revoke.c:665 g10/tofu.c:2176
+#: g10/delkey.c:90 g10/export.c:2002 g10/getkey.c:2040 g10/getkey.c:4455
+#: g10/gpg.c:5246 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"
 msgstr "读�密钥�时出现错误： %s\n"
@@ -2249,14 +2258,14 @@ msgstr "密文算法 ‘%s’ �能�能被用于加密\n"
 msgid "(use option \"%s\" to override)\n"
 msgstr "（使用选项 “%s� �覆盖）\n"
 
-#: g10/encrypt.c:555 g10/encrypt.c:808 g10/decrypt-data.c:261 g10/gpg.c:4083
-#: g10/gpg.c:4130 sm/decrypt.c:742 sm/encrypt.c:691 sm/gpgsm.c:1793
+#: g10/encrypt.c:555 g10/encrypt.c:808 g10/decrypt-data.c:261 g10/gpg.c:4080
+#: g10/gpg.c:4127 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1646
 #, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "密文算法 ‘%s’ �能�能被用于 %s 模�\n"
 
-#: g10/encrypt.c:564 g10/gpg.c:4095 g10/gpg.c:4142 g10/sig-check.c:155
-#: g10/sign.c:452 sm/gpgsm.c:1803 sm/gpgsm.c:1813 sm/sign.c:596 sm/verify.c:510
+#: g10/encrypt.c:564 g10/gpg.c:4092 g10/gpg.c:4139 g10/sig-check.c:155
+#: g10/sign.c:452 sm/gpgsm.c:1656 sm/gpgsm.c:1666 sm/sign.c:596 sm/verify.c:510
 #, c-format
 msgid "digest algorithm '%s' may not be used in %s mode\n"
 msgstr "摘�算法‘%s’�能在 %s 模�下使用\n"
@@ -2272,7 +2281,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "警告： 强制对称密文 %s (%d) 与接收者的�好设置冲�\n"
 
-#: g10/encrypt.c:838 sm/encrypt.c:766
+#: g10/encrypt.c:838 sm/encrypt.c:767
 #, c-format
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "警告： 密钥 %s 在 %s 模�下�适用于加密\n"
@@ -2299,7 +2308,7 @@ msgstr "%s/%s.%s 已�加密给：“%s�\n"
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "选项 ‘%s’ �能�能用于 %s 模�\n"
 
-#: g10/decrypt-data.c:239 g10/mainproc.c:380 sm/decrypt.c:494
+#: g10/decrypt-data.c:239 g10/mainproc.c:380 sm/decrypt.c:892
 #, c-format
 msgid "%s.%s encrypted data\n"
 msgstr "%s.%s 已加密的数�\n"
@@ -2309,7 +2318,7 @@ msgstr "%s.%s 已加密的数�\n"
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "以未知的算法 %d 加密\n"
 
-#: g10/decrypt-data.c:361 g10/decrypt-data.c:414 sm/decrypt.c:508
+#: g10/decrypt-data.c:361 g10/decrypt-data.c:414 sm/decrypt.c:906
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2348,7 +2357,7 @@ msgstr "使用 GnuPG 密钥备份格�"
 msgid " - skipped"
 msgstr " - 已跳过"
 
-#: g10/export.c:1333 g10/import.c:2124 g10/openfile.c:202 g10/openfile.c:296
+#: g10/export.c:1333 g10/import.c:2132 g10/openfile.c:202 g10/openfile.c:296
 #: g10/sign.c:1110 g10/sign.c:1447
 #, c-format
 msgid "writing to '%s'\n"
@@ -2384,61 +2393,61 @@ msgstr "创建‘%s’时出现错误：%s\n"
 msgid "[User ID not found]"
 msgstr "[用户标识未找到]"
 
-#: g10/getkey.c:1199
+#: g10/getkey.c:1324
 #, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "自动拉�‘%s’，通过 %s\n"
 
-#: g10/getkey.c:1205
+#: g10/getkey.c:1330
 #, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "拉�‘%s’通过 %s 时出现错误： %s\n"
 
-#: g10/getkey.c:1207
+#: g10/getkey.c:1332
 msgid "No fingerprint"
 msgstr "无指纹"
 
-#: g10/getkey.c:1449
+#: g10/getkey.c:1574
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr "正在通过 %s 检查一个已过期密钥的新拷�\n"
 
-#: g10/getkey.c:1884 g10/revoke.c:657 g10/revoke.c:718
+#: g10/getkey.c:2009 g10/revoke.c:658 g10/revoke.c:719
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "找�到�钥 “%s�：%s\n"
 
-#: g10/getkey.c:1887 g10/pkclist.c:1012
+#: g10/getkey.c:2012 g10/pkclist.c:1012
 #, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "（检查选项 ‘%s’ 的�数）\n"
 
-#: g10/getkey.c:1965
+#: g10/getkey.c:2090
 #, c-format
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "警告：未使用‘%s’作为默认密钥：%s\n"
 
-#: g10/getkey.c:1973
+#: g10/getkey.c:2098
 #, c-format
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "使用 “%s� 作为默认签�用�钥\n"
 
-#: g10/getkey.c:1980
+#: g10/getkey.c:2105
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr "传递给‘%s’的所有值被忽略\n"
 
-#: g10/getkey.c:2837
+#: g10/getkey.c:2962
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "无效的密钥 %s 通过 --allow-non-selfsigned-uid 生效\n"
 
-#: g10/getkey.c:3703
+#: g10/getkey.c:3828
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "使用�密钥 %s 而�主密钥 %s\n"
 
-#: g10/getkey.c:4259 g10/gpg.c:2167
+#: g10/getkey.c:4384 g10/gpg.c:2168
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "选项 ‘%s’ 的有效值:\n"
@@ -2561,7 +2570,7 @@ msgstr "导出密钥"
 
 #: g10/gpg.c:513
 msgid "export keys to a keyserver"
-msgstr "个密钥导出到一个公钥�务器上"
+msgstr "将密钥导出到一个公钥�务器上"
 
 #: g10/gpg.c:514
 msgid "import keys from a keyserver"
@@ -2623,7 +2632,7 @@ msgstr "|SPEC|设置电�邮件别�"
 msgid "use strict OpenPGP behavior"
 msgstr "使用严格的 OpenPGP 行为"
 
-#: g10/gpg.c:651 kbx/kbxutil.c:91 sm/gpgsm.c:424 tools/gpgconf.c:113
+#: g10/gpg.c:651 kbx/kbxutil.c:91 sm/gpgsm.c:425 tools/gpgconf.c:113
 msgid "do not make any changes"
 msgstr "��任何更改"
 
@@ -2655,7 +2664,7 @@ msgstr "使用规范的文本模�"
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|设置压缩等级为 N （0 为�用）"
 
-#: g10/gpg.c:762 sm/gpgsm.c:357
+#: g10/gpg.c:762 sm/gpgsm.c:358
 msgid "Options controlling key import and export"
 msgstr "控制密钥导入导出的选项"
 
@@ -2665,17 +2674,17 @@ msgstr "|MECHANISMS|通过邮件地�定�密钥时使用机制 MECHANISMS"
 
 #: g10/gpg.c:768
 msgid "import missing key from a signature"
-msgstr "从签�导入缺少的密钥"
+msgstr "从签�中导入缺少的密钥"
 
 #: g10/gpg.c:773
 msgid "include the public key in signatures"
 msgstr "在签�中包�公钥"
 
-#: g10/gpg.c:776 sm/gpgsm.c:360
+#: g10/gpg.c:776 sm/gpgsm.c:361
 msgid "disable all access to the dirmngr"
 msgstr "�用对 dirmngr 的所有访问"
 
-#: g10/gpg.c:788 sm/gpgsm.c:367
+#: g10/gpg.c:788 sm/gpgsm.c:368
 msgid "Options controlling key listings"
 msgstr "控制密钥列表的选项"
 
@@ -2691,15 +2700,15 @@ msgstr "|USER-ID|为 USER-ID 加密"
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|USER-ID|使用 USER-ID �签�或者解密"
 
-#: g10/gpg.c:876 sm/gpgsm.c:408
+#: g10/gpg.c:876 sm/gpgsm.c:409
 msgid "Options for unattended use"
 msgstr "用于无人值守的选项"
 
-#: g10/gpg.c:895 sm/gpgsm.c:420 dirmngr/dirmngr.c:286
+#: g10/gpg.c:895 sm/gpgsm.c:421 dirmngr/dirmngr.c:289
 msgid "Other options"
 msgstr "其他选项"
 
-#: g10/gpg.c:966 sm/gpgsm.c:453
+#: g10/gpg.c:966 sm/gpgsm.c:454
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2741,7 +2750,7 @@ msgstr ""
 "签��检查�加密或解密\n"
 "默认的�作�输入数�而定\n"
 
-#: g10/gpg.c:1168 sm/gpgsm.c:636
+#: g10/gpg.c:1168 sm/gpgsm.c:637
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2765,12 +2774,12 @@ msgstr "散列： "
 msgid "Compression: "
 msgstr "压缩：  "
 
-#: g10/gpg.c:1274 sm/gpgsm.c:710
+#: g10/gpg.c:1274 sm/gpgsm.c:711
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "用法： %s [选项] %s\n"
 
-#: g10/gpg.c:1467 sm/gpgsm.c:803
+#: g10/gpg.c:1467 sm/gpgsm.c:804
 #, c-format
 msgid "conflicting commands\n"
 msgstr "冲�的指令\n"
@@ -2780,518 +2789,518 @@ msgstr "冲�的指令\n"
 msgid "no = sign found in group definition '%s'\n"
 msgstr "群组定义 ‘%s’ 中找�到 = 标志\n"
 
-#: g10/gpg.c:1683
+#: g10/gpg.c:1684
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "警告：家目录‘%s’的所有��安全\n"
 
-#: g10/gpg.c:1686
+#: g10/gpg.c:1687
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "警告：�置文件‘%s’的所有��安全\n"
 
-#: g10/gpg.c:1689
+#: g10/gpg.c:1690
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "警告：扩展模�‘%s’的所有��安全\n"
 
-#: g10/gpg.c:1695
+#: g10/gpg.c:1696
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "警告：家目录‘%s’的����安全\n"
 
-#: g10/gpg.c:1698
+#: g10/gpg.c:1699
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "警告：�置文件‘%s’的����安全\n"
 
-#: g10/gpg.c:1701
+#: g10/gpg.c:1702
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "警告：扩展模�‘%s’的����安全\n"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1708
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "警告：家目录‘%s’的上级目录所有��安全\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1711
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr "警告：�置文件‘%s’的上级目录所有��安全\n"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1714
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr "警告：扩展模�‘%s’的上级目录所有��安全\n"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1720
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr "警告：家目录‘%s’的上级目录����安全\n"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1723
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 msgstr "警告：�置文件‘%s’的上级目录���安全\n"
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1726
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr "警告：扩展模�‘%s’的上级目录����安全\n"
 
-#: g10/gpg.c:1941
+#: g10/gpg.c:1942
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "未知的�置项‘%s’\n"
 
-#: g10/gpg.c:2037
+#: g10/gpg.c:2038
 msgid "display photo IDs during key listings"
 msgstr "列出密钥时显示照片标识"
 
-#: g10/gpg.c:2039
+#: g10/gpg.c:2040
 msgid "show key usage information during key listings"
 msgstr "列出密钥时显示用途信�"
 
-#: g10/gpg.c:2041
+#: g10/gpg.c:2042
 msgid "show policy URLs during signature listings"
 msgstr "列出签�时显示策略 URL"
 
-#: g10/gpg.c:2043
+#: g10/gpg.c:2044
 msgid "show all notations during signature listings"
 msgstr "列出签�时显示所有注记"
 
-#: g10/gpg.c:2045
+#: g10/gpg.c:2046
 msgid "show IETF standard notations during signature listings"
 msgstr "列出签�时显示 IETF 标准注记"
 
-#: g10/gpg.c:2049
+#: g10/gpg.c:2050
 msgid "show user-supplied notations during signature listings"
 msgstr "列出签�时显示用户�供的注记"
 
-#: g10/gpg.c:2051
+#: g10/gpg.c:2052
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "列出签�时显示首选公钥�务器 URL"
 
-#: g10/gpg.c:2053
+#: g10/gpg.c:2054
 msgid "show user ID validity during key listings"
 msgstr "列出密钥时显示用户标识的有效性"
 
-#: g10/gpg.c:2055
+#: g10/gpg.c:2056
 msgid "show revoked and expired user IDs in key listings"
 msgstr "列出密钥时显示已�销或已过期的用户标识"
 
-#: g10/gpg.c:2057
+#: g10/gpg.c:2058
 msgid "show revoked and expired subkeys in key listings"
 msgstr "列出密钥时显示已�销或已过期的�密钥"
 
-#: g10/gpg.c:2059
+#: g10/gpg.c:2060
 msgid "show the keyring name in key listings"
 msgstr "列出密钥时显示钥匙环的�称"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2062
 msgid "show expiration dates during signature listings"
 msgstr "列出签�时显示过期日期"
 
-#: g10/gpg.c:2178
+#: g10/gpg.c:2179
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "未知的 TOFU 政策‘%s’\n"
 
-#: g10/gpg.c:2180
+#: g10/gpg.c:2181
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "（使用“help��列出选择）\n"
 
-#: g10/gpg.c:2975 g10/gpg.c:3828 g10/gpg.c:3840
+#: g10/gpg.c:2978 g10/gpg.c:3825 g10/gpg.c:3837
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "注�：%s �适用于一般使用�\n"
 
-#: g10/gpg.c:3151 g10/gpg.c:3163
+#: g10/gpg.c:3154 g10/gpg.c:3166
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "‘%s’�是一个有效的签�过期日期\n"
 
-#: g10/gpg.c:3185
+#: g10/gpg.c:3188
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "“%s� �是一个�适的邮件地�\n"
 
-#: g10/gpg.c:3217 sm/gpgsm.c:1270
+#: g10/gpg.c:3220 sm/gpgsm.c:1143
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "无效的 pinentry 模�‘%s’\n"
 
-#: g10/gpg.c:3223 sm/gpgsm.c:1276
+#: g10/gpg.c:3226 sm/gpgsm.c:1149
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "无效的请求��‘%s’\n"
 
-#: g10/gpg.c:3280
+#: g10/gpg.c:3283
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "‘%s’�是一个有效的字符集\n"
 
-#: g10/gpg.c:3302 g10/gpg.c:3511 g10/keyedit.c:5319
+#: g10/gpg.c:3305 g10/gpg.c:3514 g10/keyedit.c:5322
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "无法解�公钥�务器 URL\n"
 
-#: g10/gpg.c:3320
+#: g10/gpg.c:3323
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s：%d：无效的公钥�务器选项\n"
 
-#: g10/gpg.c:3323
+#: g10/gpg.c:3326
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "无效的公钥�务器选项\n"
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3333
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s：%d：无效的导入选项\n"
 
-#: g10/gpg.c:3333
+#: g10/gpg.c:3336
 #, c-format
 msgid "invalid import options\n"
 msgstr "无效的导入选项\n"
 
-#: g10/gpg.c:3339 g10/gpg.c:3354
+#: g10/gpg.c:3342 g10/gpg.c:3357
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "无效的过滤选项：%s\n"
 
-#: g10/gpg.c:3345
+#: g10/gpg.c:3348
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s：%d：无效的导出选项\n"
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3351
 #, c-format
 msgid "invalid export options\n"
 msgstr "无效的导出选项\n"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3363
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s：%d：无效的列表选项\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3366
 #, c-format
 msgid "invalid list options\n"
 msgstr "无效的列表选项\n"
 
-#: g10/gpg.c:3371
+#: g10/gpg.c:3374
 msgid "display photo IDs during signature verification"
 msgstr "验�签�时显示照片标识"
 
-#: g10/gpg.c:3373
+#: g10/gpg.c:3376
 msgid "show policy URLs during signature verification"
 msgstr "验�签�时显示策略 URL"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3378
 msgid "show all notations during signature verification"
 msgstr "验�签�时显示所有注记"
 
-#: g10/gpg.c:3377
+#: g10/gpg.c:3380
 msgid "show IETF standard notations during signature verification"
 msgstr "验�签�时显示 IETF 标准注记"
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3384
 msgid "show user-supplied notations during signature verification"
 msgstr "验�签�时显示用户�供的注记"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3386
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "验�签�时显示首选公钥�务器 URL"
 
-#: g10/gpg.c:3385
+#: g10/gpg.c:3388
 msgid "show user ID validity during signature verification"
 msgstr "验�签�时显示用户标识的有效性"
 
-#: g10/gpg.c:3387
+#: g10/gpg.c:3390
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "验�密钥时显示已�销或已过期的�钥"
 
-#: g10/gpg.c:3389
+#: g10/gpg.c:3392
 msgid "show only the primary user ID in signature verification"
 msgstr "在签�验�中�显示主�用户标识"
 
-#: g10/gpg.c:3396
+#: g10/gpg.c:3399
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: 无效的验�选项\n"
 
-#: g10/gpg.c:3399
+#: g10/gpg.c:3402
 #, c-format
 msgid "invalid verify options\n"
 msgstr "无效的验�选项\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3409
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "无法设置�行路径为 %s\n"
 
-#: g10/gpg.c:3613
+#: g10/gpg.c:3616
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s%d: 无效的 auto-key-locate 列表\n"
 
-#: g10/gpg.c:3616
+#: g10/gpg.c:3619
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "无效的 auto-key-locate 列表\n"
 
-#: g10/gpg.c:3625
+#: g10/gpg.c:3628
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "选项 “%.50s� 的�数无效\n"
 
-#: g10/gpg.c:3807 sm/gpgsm.c:1675
+#: g10/gpg.c:3804 sm/gpgsm.c:1528
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告：程��能会创建核心内存转储文件�\n"
 
-#: g10/gpg.c:3821
+#: g10/gpg.c:3818
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "警告：%s 覆盖了 %s \n"
 
-#: g10/gpg.c:3830
+#: g10/gpg.c:3827
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ��许与 %s 并用\n"
 
-#: g10/gpg.c:3833
+#: g10/gpg.c:3830
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s 与 %s 并用时�起作用\n"
 
-#: g10/gpg.c:3848 sm/gpgsm.c:1696 dirmngr/dirmngr.c:1123
+#: g10/gpg.c:3845 sm/gpgsm.c:1549 dirmngr/dirmngr.c:1160
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "警告：正在以虚�的系统时间�行： "
 
-#: g10/gpg.c:3869
+#: g10/gpg.c:3866
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "�会在内存�安全的情况下�行，原因是 %s\n"
 
-#: g10/gpg.c:3897 g10/gpg.c:3928 sm/gpgsm.c:1763
+#: g10/gpg.c:3894 g10/gpg.c:3925 sm/gpgsm.c:1616
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所选的密文算法无效\n"
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3901
 #, c-format
 msgid "selected AEAD algorithm is invalid\n"
 msgstr "所选择的 AEAD 算法无效\n"
 
-#: g10/gpg.c:3916
+#: g10/gpg.c:3913
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "所选的压缩算法无效\n"
 
-#: g10/gpg.c:3922
+#: g10/gpg.c:3919
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "所选的�书散列算法无效\n"
 
-#: g10/gpg.c:3937
+#: g10/gpg.c:3934
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "需�的完全�信签�数一定�大于 0\n"
 
-#: g10/gpg.c:3939
+#: g10/gpg.c:3936
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "需�的勉强�信签�数一定�大于 1\n"
 
-#: g10/gpg.c:3941
+#: g10/gpg.c:3938
 #, 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:3943
+#: g10/gpg.c:3940
 #, 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:3945
+#: g10/gpg.c:3942
 #, 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:3949
+#: g10/gpg.c:3946
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "注�：强烈�建议使用简�的 S2K 模� (0)\n"
 
-#: g10/gpg.c:3953
+#: g10/gpg.c:3950
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "无效的 S2K 模�；必须是 0，1 或 3\n"
 
-#: g10/gpg.c:3960
+#: g10/gpg.c:3957
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "无效的默认�好设置\n"
 
-#: g10/gpg.c:3964
+#: g10/gpg.c:3961
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "无效的个人密文�好设置\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3964
 #, c-format
 msgid "invalid personal AEAD preferences\n"
 msgstr "无效的个人 AEAD �好设置\n"
 
-#: g10/gpg.c:3971
+#: g10/gpg.c:3968
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "无效的个人摘�算法�好设置\n"
 
-#: g10/gpg.c:3975
+#: g10/gpg.c:3972
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "无效的个人压缩算法首选项\n"
 
-#: g10/gpg.c:3984 g10/gpg.c:3989
+#: g10/gpg.c:3981 g10/gpg.c:3986
 #, c-format
 msgid "chunk size invalid - using %d\n"
 msgstr "�大�无效 - 使用 %d\n"
 
-#: g10/gpg.c:4026
+#: g10/gpg.c:4023
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s 尚�能和 %s 并用\n"
 
-#: g10/gpg.c:4089
+#: g10/gpg.c:4086
 #, c-format
 msgid "AEAD algorithm '%s' may not be used in %s mode\n"
 msgstr "AEAD 算法‘%s’�能在 %s 模�下使用\n"
 
-#: g10/gpg.c:4101
+#: g10/gpg.c:4098
 #, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "压缩算法‘%s’�能在 %s 模�下使用\n"
 
-#: g10/gpg.c:4256
+#: g10/gpg.c:4253
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "�始化信任度数�库失败：%s\n"
 
-#: g10/gpg.c:4268
+#: g10/gpg.c:4265
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "警告：给定了接收者（-r）但并未使用公钥加密\n"
 
-#: g10/gpg.c:4340
+#: g10/gpg.c:4337
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "对称加密‘%s’失败：%s\n"
 
-#: g10/gpg.c:4369
+#: g10/gpg.c:4366
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "您�能在使用 --symmetric --encrypt 时使用 --s2k-mode 0\n"
 
-#: g10/gpg.c:4372
+#: g10/gpg.c:4369
 #, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "您�能在 %s 模�下使用 --symmetric -encrypt\n"
 
-#: g10/gpg.c:4430
+#: g10/gpg.c:4427
 #, 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:4433
+#: g10/gpg.c:4430
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "您�能在 %s 模�下使用 --symmetric --sign -encrypt\n"
 
-#: g10/gpg.c:4821 g10/keyserver.c:1870
+#: g10/gpg.c:4818 g10/keyserver.c:1629
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "��至公钥�务器失败：%s\n"
 
-#: g10/gpg.c:4826
+#: g10/gpg.c:4823
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "从公钥�务器接收失败：%s\n"
 
-#: g10/gpg.c:4832
+#: g10/gpg.c:4829
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "导出密钥失败：%s\n"
 
-#: g10/gpg.c:4845
+#: g10/gpg.c:4842
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "作为 ssh 密钥导出失败：%s\n"
 
-#: g10/gpg.c:4857
+#: g10/gpg.c:4854
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "公钥�务器�索失败：%s\n"
 
-#: g10/gpg.c:4870
+#: g10/gpg.c:4867
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "公钥�务器刷新失败：%s\n"
 
-#: g10/gpg.c:4937
+#: g10/gpg.c:4936
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "解开字符�装时失败：%s\n"
 
-#: g10/gpg.c:4948
+#: g10/gpg.c:4947
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "进行字符�装时失败：%s\n"
 
-#: g10/gpg.c:5053
+#: g10/gpg.c:5052
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "无效的散列算法‘%s’\n"
 
-#: g10/gpg.c:5205 g10/tofu.c:2156
+#: g10/gpg.c:5204 g10/tofu.c:2160
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "解�密钥指定‘%s’时出现错误：%s\n"
 
-#: g10/gpg.c:5216
+#: g10/gpg.c:5215
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr "‘%s’��是一个有效的密钥标识�指纹或者 keygrip\n"
 
-#: g10/gpg.c:5272
+#: g10/gpg.c:5271
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr "警告：没有�供命令。正在�试猜测您的�图...\n"
 
-#: g10/gpg.c:5283
+#: g10/gpg.c:5282
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "请开始输入您的消�…\n"
 
-#: g10/gpg.c:5630
+#: g10/gpg.c:5629
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "给定的的�书策略 URL 无效\n"
 
-#: g10/gpg.c:5632
+#: g10/gpg.c:5631
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "给定的签�策略 URL 无效\n"
 
-#: g10/gpg.c:5665
+#: g10/gpg.c:5664
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "给定的首选公钥�务器 URL 无效\n"
@@ -3304,7 +3313,7 @@ msgstr "|FILE|从钥匙环 FILE 文件中�得密钥"
 msgid "make timestamp conflicts only a warning"
 msgstr "把时间戳冲�仅视为警告"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:414 tools/gpgconf.c:116 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:415 tools/gpgconf.c:116 tools/gpg-card.c:95
 msgid "|FD|write status info to this FD"
 msgstr "|FD|把状�信�写入文件�述符 FD"
 
@@ -3389,97 +3398,97 @@ msgstr "�定为 GnuPG 密钥备份格�"
 msgid "repair keys on import"
 msgstr "在导入期间修�密钥"
 
-#: g10/import.c:399 g10/import.c:721
+#: g10/import.c:407 g10/import.c:729
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "跳过 %d 类型的�\n"
 
-#: g10/import.c:738
+#: g10/import.c:746
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "目�已处� %lu 个密钥\n"
 
-#: g10/import.c:831
+#: g10/import.c:839
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "处�的总数：%lu\n"
 
-#: g10/import.c:834
+#: g10/import.c:842
 #, c-format
 msgid "    skipped PGP-2 keys: %lu\n"
 msgstr "    已跳过的 PGP-2 密钥：%lu\n"
 
-#: g10/import.c:836
+#: g10/import.c:844
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      已跳过的新密钥：%lu\n"
 
-#: g10/import.c:839
+#: g10/import.c:847
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          缺少用户标识：%lu\n"
 
-#: g10/import.c:842 sm/import.c:129
+#: g10/import.c:850 sm/import.c:129
 #, c-format
 msgid "              imported: %lu"
 msgstr "              已导入：%lu"
 
-#: g10/import.c:846 sm/import.c:133
+#: g10/import.c:854 sm/import.c:133
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             未改�：%lu\n"
 
-#: g10/import.c:848
+#: g10/import.c:856
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      新用户标识：%lu\n"
 
-#: g10/import.c:850
+#: g10/import.c:858
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "        新的�密钥：%lu\n"
 
-#: g10/import.c:852
+#: g10/import.c:860
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        新的签�：%lu\n"
 
-#: g10/import.c:854
+#: g10/import.c:862
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   新的密钥�销：%lu\n"
 
-#: g10/import.c:856 sm/import.c:135
+#: g10/import.c:864 sm/import.c:135
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      读�的�钥：%lu\n"
 
-#: g10/import.c:858 sm/import.c:137
+#: g10/import.c:866 sm/import.c:137
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  导入的�钥：%lu\n"
 
-#: g10/import.c:860 sm/import.c:139
+#: g10/import.c:868 sm/import.c:139
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " 未改�的�钥：%lu\n"
 
-#: g10/import.c:862 sm/import.c:141
+#: g10/import.c:870 sm/import.c:141
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "          未被导入：%lu\n"
 
-#: g10/import.c:864
+#: g10/import.c:872
 #, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "    清�的签�：%lu\n"
 
-#: g10/import.c:866
+#: g10/import.c:874
 #, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "      清�的用户标识：%lu\n"
 
-#: g10/import.c:1291
+#: g10/import.c:1299
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
@@ -3488,171 +3497,171 @@ msgstr ""
 "警告：密钥 %s 包�了��用算法的�好设置\n"
 "于下列用户标识上：\n"
 
-#: g10/import.c:1333
+#: g10/import.c:1341
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         “%s�：密文算法 %s 的首选项\n"
 
-#: g10/import.c:1351
+#: g10/import.c:1359
 #, c-format
 msgid "         \"%s\": preference for AEAD algorithm %s\n"
 msgstr "         \"%s\"：关于 AEAD 算法 %s 的�好设置\n"
 
-#: g10/import.c:1366
+#: g10/import.c:1374
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         “%s�：散列算法 %s 对应首选项\n"
 
-#: g10/import.c:1378
+#: g10/import.c:1386
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         “%s�：压缩算法 %s 对应首选项\n"
 
-#: g10/import.c:1391
+#: g10/import.c:1399
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "强烈建议您更新您的�好设置并�新分�这个密钥\n"
 
-#: g10/import.c:1393
+#: g10/import.c:1401
 #, c-format
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr "以���能的算法�匹�问题\n"
 
-#: g10/import.c:1418
+#: g10/import.c:1426
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "您�以这样更新您的�好设置：gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:1932 g10/import.c:3053
+#: g10/import.c:1940 g10/import.c:3061
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "密钥 %s：没有用户标识\n"
 
-#: g10/import.c:1938
+#: g10/import.c:1946
 #, c-format
 msgid "key %s: %s\n"
 msgstr "密钥 %s： %s\n"
 
-#: g10/import.c:1939 g10/import.c:3025
+#: g10/import.c:1947 g10/import.c:3033
 msgid "rejected by import screener"
 msgstr "被导入筛查器拒�"
 
-#: g10/import.c:1988
+#: g10/import.c:1996
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "密钥%s：PKS �密钥破�已修�\n"
 
-#: g10/import.c:2009
+#: g10/import.c:2017
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "密钥 %s：已接���自签�的用户标识 “%s�\n"
 
-#: g10/import.c:2020 g10/import.c:2051
+#: g10/import.c:2028 g10/import.c:2059
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "密钥 %s：没有有效的用户标识\n"
 
-#: g10/import.c:2022
+#: g10/import.c:2030
 #, c-format
 msgid "this may be caused by a missing self-signature\n"
 msgstr "这�能由于�失自签�所致\n"
 
-#: g10/import.c:2101 g10/import.c:3439
+#: g10/import.c:2109 g10/import.c:3447
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "密钥 %s：找�到公钥：%s\n"
 
-#: g10/import.c:2107
+#: g10/import.c:2115
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "密钥 %s：新密钥 - 已跳过\n"
 
-#: g10/import.c:2119
+#: g10/import.c:2127
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "找�到�写的钥匙环：%s\n"
 
-#: g10/import.c:2151 g10/import.c:2253 g10/import.c:3514
+#: g10/import.c:2159 g10/import.c:2261 g10/import.c:3522
 #, c-format
 msgid "error writing keyring '%s': %s\n"
 msgstr "写入钥匙环 ‘%s’ 时出现错误： %s\n"
 
-#: g10/import.c:2174
+#: g10/import.c:2182
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "密钥 %s：公钥 “%s� 已导入\n"
 
-#: g10/import.c:2201
+#: g10/import.c:2209
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "密钥 %s：与我们的副本�符�\n"
 
-#: g10/import.c:2269
+#: g10/import.c:2277
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "密钥 %s：“%s� 1 个新的用户标识\n"
 
-#: g10/import.c:2272
+#: g10/import.c:2280
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "密钥 %s：“%s� %d 个新的用户标识\n"
 
-#: g10/import.c:2275
+#: g10/import.c:2283
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "密钥 %s：“%s� 1 个新的签�\n"
 
-#: g10/import.c:2278
+#: g10/import.c:2286
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "密钥 %s：“%s� %d 个新的签�\n"
 
-#: g10/import.c:2281
+#: g10/import.c:2289
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "密钥 %s：“%s� 1 个新的�密钥\n"
 
-#: g10/import.c:2284
+#: g10/import.c:2292
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "密钥 %s：“%s� %d 个新的�密钥\n"
 
-#: g10/import.c:2287
+#: g10/import.c:2295
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "密钥 %s：“%s� %d 个签�被清�\n"
 
-#: g10/import.c:2290
+#: g10/import.c:2298
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "密钥 %s：“%s� %d 个签�被清�\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2301
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "密钥 %s：“%s� %d 个用户标识被清�\n"
 
-#: g10/import.c:2296
+#: g10/import.c:2304
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "密钥 %s：“%s� %d 个用户标识被清�\n"
 
-#: g10/import.c:2332
+#: g10/import.c:2340
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "密钥 %s：“%s� 未改�\n"
 
-#: g10/import.c:2692 g10/import.c:2887
+#: g10/import.c:2700 g10/import.c:2895
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "密钥 %s：�钥已导入\n"
 
-#: g10/import.c:2700
+#: g10/import.c:2708
 #, c-format
 msgid "key %s: secret key already exists\n"
 msgstr "密钥 %s：�钥已存在\n"
 
-#: g10/import.c:2708
+#: g10/import.c:2716
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "密钥 %s：��至代�人程�时出现错误：%s\n"
@@ -3665,203 +3674,202 @@ msgstr "密钥 %s：��至代�人程�时出现错误：%s\n"
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2877
+#: g10/import.c:2885
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr "��移 ‘%s’，对�一张智能�，执行：%s\n"
 
-#: g10/import.c:3024
+#: g10/import.c:3032
 #, c-format
 msgid "secret key %s: %s\n"
 msgstr "�钥 %s：%s\n"
 
-#: g10/import.c:3045 g10/import.c:3084
+#: g10/import.c:3053 g10/import.c:3092
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "�钥导入被�止\n"
 
-#: g10/import.c:3072
+#: g10/import.c:3080
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "密钥 %s：�钥使用了无效的密文算法 %d - 已跳过\n"
 
-#: g10/import.c:3234 g10/pkclist.c:75 g10/revoke.c:774
+#: g10/import.c:3242 g10/pkclist.c:75 g10/revoke.c:775
 msgid "No reason specified"
 msgstr "未指定原因"
 
-#: g10/import.c:3235 g10/pkclist.c:77 g10/revoke.c:776
+#: g10/import.c:3243 g10/pkclist.c:77 g10/revoke.c:777
 msgid "Key is superseded"
 msgstr "密钥被替�"
 
-#: g10/import.c:3236 g10/pkclist.c:79 g10/revoke.c:775
+#: g10/import.c:3244 g10/pkclist.c:79 g10/revoke.c:776
 msgid "Key has been compromised"
 msgstr "密钥已泄�"
 
-#: g10/import.c:3237 g10/pkclist.c:81 g10/revoke.c:777
+#: g10/import.c:3245 g10/pkclist.c:81 g10/revoke.c:778
 msgid "Key is no longer used"
 msgstr "密钥��使用"
 
-#: g10/import.c:3238 g10/pkclist.c:83 g10/revoke.c:778
+#: g10/import.c:3246 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "用户标识��有效"
 
-#: g10/import.c:3363 g10/keylist.c:1105 g10/pkclist.c:87
+#: g10/import.c:3371 g10/keylist.c:1105 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "�销原因： "
 
-#: g10/import.c:3382 g10/keylist.c:1124 g10/pkclist.c:103
+#: g10/import.c:3390 g10/keylist.c:1124 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "�销注释： "
 
-#: g10/import.c:3432
+#: g10/import.c:3440
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "密钥 %s：没有公钥 - 无法应用�销�书\n"
 
-#: g10/import.c:3461
+#: g10/import.c:3469
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "密钥 %s：无法定�原始的密钥区�：%s\n"
 
-#: g10/import.c:3468
+#: g10/import.c:3476
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "密钥 %s：无法读�原始的密钥区�：%s\n"
 
-#: g10/import.c:3488
+#: g10/import.c:3496
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "密钥 %s：无效的�销�书：%s - 已拒�\n"
 
-#: g10/import.c:3523
+#: g10/import.c:3531
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "密钥 %s：“%s� �销�书已被导入\n"
 
-#: g10/import.c:3609
+#: g10/import.c:3617
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "密钥 %s：签�没有用户标识\n"
 
-#: g10/import.c:3626
+#: g10/import.c:3634
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "密钥 %s：用户标识 “%s� 使用了�支�的公钥算法\n"
 
-#: g10/import.c:3628
+#: g10/import.c:3636
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "密钥 %s：用户标识 “%s� 自身签�无效\n"
 
-#: g10/import.c:3645 g10/import.c:3673 g10/import.c:3729
+#: g10/import.c:3653 g10/import.c:3681 g10/import.c:3737
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "密钥 %s：�支�的公钥算法\n"
 
-#: g10/import.c:3646
+#: g10/import.c:3654
 #, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "密钥 %s：无效的直接密钥签�\n"
 
-#: g10/import.c:3660
+#: g10/import.c:3668
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "密钥 %s：没有�供绑定的�密钥\n"
 
-#: g10/import.c:3675
+#: g10/import.c:3683
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "密钥 %s：无效的�密钥绑定\n"
 
-#: g10/import.c:3694
+#: g10/import.c:3702
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "密钥 %s：已删除多��密钥绑定\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3726
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "密钥 %s：没有用于密钥�销用的�密钥\n"
 
-#: g10/import.c:3731
+#: g10/import.c:3739
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "密钥 %s：无效的�密钥�销\n"
 
-#: g10/import.c:3746
+#: g10/import.c:3754
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "密钥 %s：已删除多��密钥�销\n"
 
-#: g10/import.c:3790
+#: g10/import.c:3798
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "密钥 %s：已跳过用户标识 “%s�\n"
 
-#: g10/import.c:3817
+#: g10/import.c:3825
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "密钥 %s：已跳过�密钥\n"
 
-#: g10/import.c:3849
+#: g10/import.c:3857
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "密钥 %s：��导出签�（验�级别 0x%02X）- 已跳过\n"
 
-#: g10/import.c:3860
+#: g10/import.c:3868
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "密钥 %s：�销�书�置错误――已跳过\n"
 
-#: g10/import.c:3878
+#: g10/import.c:3886
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "密钥 %s：无效的�销�书：%s――已跳过\n"
 
-#: g10/import.c:3892
+#: g10/import.c:3900
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "密钥 %s：�钥签��置错误 - 已跳过\n"
 
-#: g10/import.c:3900
+#: g10/import.c:3908
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "密钥 %s：与预期�符的签�级别（0x%02X） - 已跳过\n"
 
-#: g10/import.c:4073
+#: g10/import.c:4081
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "密钥 %s：检测到��的用户标识 - 已�并\n"
 
-#: g10/import.c:4180
+#: g10/import.c:4188
 #, c-format
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr "密钥 %s：检测到��的�钥 - 已�并\n"
 
-#: g10/import.c:4245
+#: g10/import.c:4253
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "警告：密钥 %s �能已被�销：正在�回�销用密钥 %s\n"
 
-#: g10/import.c:4261
+#: g10/import.c:4269
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "警告：密钥 %s �能已被�销：�销用密钥 %s �存在。\n"
 
-#: g10/import.c:4327
+#: g10/import.c:4335
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "密钥 %s：已添加�销�书 “%s�\n"
 
-#: g10/import.c:4365
+#: g10/import.c:4373
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "密钥 %s：已添加直接密钥签�\n"
 
-#: g10/key-check.c:133 dirmngr/dirmngr_ldap.c:650 dirmngr/ldap-wrapper.c:835
-#: dirmngr/ldap-wrapper.c:852
+#: g10/key-check.c:133 dirmngr/ldap-wrapper.c:835 dirmngr/ldap-wrapper.c:852
 #, c-format
 msgid "error allocating memory: %s\n"
 msgstr "分�内存时出现错误：%s\n"
@@ -3917,7 +3925,7 @@ msgid ""
 "all signatures.\n"
 msgstr "警告：�现错误并且�检查了自签�，请�行 ‘%s’ 检查所有签�。\n"
 
-#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:284 sm/keydb.c:297
+#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:289 sm/keydb.c:302
 #, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "创建钥匙箱‘%s’时出现错误：%s\n"
@@ -3927,7 +3935,7 @@ msgstr "创建钥匙箱‘%s’时出现错误：%s\n"
 msgid "error creating keyring '%s': %s\n"
 msgstr "创建钥匙环‘%s’时出现错误：%s\n"
 
-#: g10/keydb.c:388 sm/keydb.c:303
+#: g10/keydb.c:388 sm/keydb.c:308
 #, c-format
 msgid "keybox '%s' created\n"
 msgstr "钥匙箱‘%s’已创建\n"
@@ -4173,8 +4181,8 @@ msgstr "我�常�心地检查过这个密钥。\n"
 msgid "Really sign? (y/N) "
 msgstr "真的�签��？(y/N) "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6192 g10/keyedit.c:6275 g10/keyedit.c:6404
-#: g10/keyedit.c:6466 g10/sign.c:528
+#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
+#: g10/keyedit.c:6474 g10/sign.c:528
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "签�时失败： %s\n"
@@ -4258,7 +4266,7 @@ msgstr "移动一个密钥到智能�"
 
 #: g10/keyedit.c:1303
 msgid "convert a key to TPM form using the local TPM"
-msgstr ""
+msgstr "使用本地 TPM 将密钥转�为 TPM 形�"
 
 #: g10/keyedit.c:1305
 msgid "move a backup key to a smartcard"
@@ -4537,7 +4545,7 @@ msgstr "没有匹�的用户标识。"
 msgid "Nothing to sign.\n"
 msgstr "没有�被签�的东西。\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6057
+#: g10/keyedit.c:2973 g10/keyedit.c:6065
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "并�由您签�。\n"
@@ -4604,7 +4612,7 @@ msgstr "这个密钥�被 %s 的密钥 %s �销"
 msgid "(sensitive)"
 msgstr "（�感的）"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:525
+#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "创建于：%s"
@@ -4620,7 +4628,7 @@ msgid "expired: %s"
 msgstr "过期于：%s"
 
 #: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2262
-#: g10/keyserver.c:531
+#: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "有效至：%s"
@@ -4654,13 +4662,13 @@ msgid ""
 "unless you restart the program.\n"
 msgstr "请注�，在您��程�之�，所显示的密钥有效性�一定正确。\n"
 
-#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:535
-#: g10/mainproc.c:2280 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
+#: g10/mainproc.c:2282 g10/tofu.c:1789 g10/trust.c:426 dirmngr/ocsp.c:792
 msgid "revoked"
 msgstr "已�销"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:539
-#: g10/mainproc.c:2282 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
+#: g10/mainproc.c:2284 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "已过期"
 
@@ -4700,7 +4708,7 @@ msgstr "您确定�然想�增加�？(y/N) "
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "您��以把照片标识增加到 PGP2 样�的密钥里。\n"
 
-#: g10/keyedit.c:4273 g10/keygen.c:3107
+#: g10/keyedit.c:4273 g10/keygen.c:3111
 msgid "Such a user ID already exists on this key!\n"
 msgstr "这样的用户标识已�存在于这个密钥上了�\n"
 
@@ -4837,7 +4845,7 @@ msgstr "�密钥 %s �签�，因此�需�被交�验�\n"
 msgid "Please select exactly one user ID.\n"
 msgstr "请选定仅一个用户标识。\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5357 g10/keyedit.c:5495
+#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "跳过用户标识 “%s� 上的 v3 自签�\n"
@@ -4846,127 +4854,127 @@ msgstr "跳过用户标识 “%s� 上的 v3 自签�\n"
 msgid "Enter your preferred keyserver URL: "
 msgstr "输入您首选公钥�务器的 URL： "
 
-#: g10/keyedit.c:5380
+#: g10/keyedit.c:5383
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "您确定�替�它�？(y/N) "
 
-#: g10/keyedit.c:5381
+#: g10/keyedit.c:5384
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "您确定�删除它�？(y/N) "
 
-#: g10/keyedit.c:5441
+#: g10/keyedit.c:5449
 msgid "Enter the notation: "
 msgstr "输入注记： "
 
-#: g10/keyedit.c:5588
+#: g10/keyedit.c:5596
 msgid "Proceed? (y/N) "
 msgstr "继续？(y/N) "
 
-#: g10/keyedit.c:5658
+#: g10/keyedit.c:5666
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "没有索引为 %d 的用户标识\n"
 
-#: g10/keyedit.c:5720
+#: g10/keyedit.c:5728
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "没有散列值为 %s 的用户标识\n"
 
-#: g10/keyedit.c:5821
+#: g10/keyedit.c:5829
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "没有属于密钥标识‘%s’的�密钥。\n"
 
-#: g10/keyedit.c:5843
+#: g10/keyedit.c:5851
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "没有索引为 %d 的�密钥\n"
 
-#: g10/keyedit.c:5984
+#: g10/keyedit.c:5992
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "用户标识：“%s�\n"
 
-#: g10/keyedit.c:5987 g10/keyedit.c:6089 g10/keyedit.c:6137
+#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "由您的密钥 %s 于 %s%s%s 签�\n"
 
-#: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
+#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
 msgid " (non-exportable)"
 msgstr " (��导出)"
 
-#: g10/keyedit.c:5993
+#: g10/keyedit.c:6001
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "此签�已在 %s 过期。\n"
 
-#: g10/keyedit.c:5998
+#: g10/keyedit.c:6006
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "您确定您�然想��销它�？(y/N) "
 
-#: g10/keyedit.c:6003
+#: g10/keyedit.c:6011
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "�为这份签�生�一份�销�书�？(y/N) "
 
-#: g10/keyedit.c:6063
+#: g10/keyedit.c:6071
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "您已�签��密钥 %s 上的这些用户标识：\n"
 
-#: g10/keyedit.c:6092
+#: g10/keyedit.c:6100
 msgid " (non-revocable)"
 msgstr " (���销)"
 
-#: g10/keyedit.c:6099
+#: g10/keyedit.c:6107
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "由您的密钥 %s �销于 %s\n"
 
-#: g10/keyedit.c:6124
+#: g10/keyedit.c:6132
 msgid "You are about to revoke these signatures:\n"
 msgstr "您正在�销这些签�：\n"
 
-#: g10/keyedit.c:6147
+#: g10/keyedit.c:6155
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "真的�生��销�书�？(y/N) "
 
-#: g10/keyedit.c:6180
+#: g10/keyedit.c:6188
 #, c-format
 msgid "no secret key\n"
 msgstr "没有�钥\n"
 
-#: g10/keyedit.c:6228
+#: g10/keyedit.c:6236
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr "�试�销一个�用户标识：%s\n"
 
-#: g10/keyedit.c:6238
+#: g10/keyedit.c:6246
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "用户标识 “%s� 已�被�销。\n"
 
-#: g10/keyedit.c:6255
+#: g10/keyedit.c:6263
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "警告：有一份用户标识签�的日期标记为 %d 秒�的未�\n"
 
-#: g10/keyedit.c:6351
+#: g10/keyedit.c:6359
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "�能�销最�一个有效的用户标识。\n"
 
-#: g10/keyedit.c:6389
+#: g10/keyedit.c:6397
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "密钥 %s 已被�销。\n"
 
-#: g10/keyedit.c:6451
+#: g10/keyedit.c:6459
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "�密钥 %s 已被�销。\n"
 
-#: g10/keyedit.c:6548
+#: g10/keyedit.c:6556
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "正在显示 %s 的照片标识，大� %ld，属于密钥 %s （用户标识 %d）\n"
@@ -4976,81 +4984,81 @@ msgstr "正在显示 %s 的照片标识，大� %ld，属于密钥 %s （用户
 msgid "invalid value for option '%s'\n"
 msgstr "选项‘%s’有无效的值\n"
 
-#: g10/keygen.c:338
+#: g10/keygen.c:339
 #, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "�好设置‘%s’��\n"
 
-#: g10/keygen.c:345
+#: g10/keygen.c:346
 #, c-format
 msgid "too many cipher preferences\n"
 msgstr "过多的密文�好设置\n"
 
-#: g10/keygen.c:347
+#: g10/keygen.c:348
 #, c-format
 msgid "too many digest preferences\n"
 msgstr "过多的散列算法�好设置\n"
 
-#: g10/keygen.c:349
+#: g10/keygen.c:350
 #, c-format
 msgid "too many compression preferences\n"
 msgstr "过多的压缩算法�好设置\n"
 
-#: g10/keygen.c:351
+#: g10/keygen.c:352
 #, c-format
 msgid "too many AEAD preferences\n"
 msgstr "过多的 AEAD �好设置\n"
 
-#: g10/keygen.c:521
+#: g10/keygen.c:522
 #, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "首选项字符串里有无效项‘%s’\n"
 
-#: g10/keygen.c:1130
+#: g10/keygen.c:1131
 #, c-format
 msgid "writing direct signature\n"
 msgstr "正在写入直接签�\n"
 
-#: g10/keygen.c:1176
+#: g10/keygen.c:1177
 #, c-format
 msgid "writing self signature\n"
 msgstr "正在写入自签�\n"
 
-#: g10/keygen.c:1233
+#: g10/keygen.c:1234
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "正在写入密钥绑定签�\n"
 
-#: g10/keygen.c:1598 g10/keygen.c:1603 g10/keygen.c:1655 g10/keygen.c:1660
-#: g10/keygen.c:1832 g10/keygen.c:1837
+#: g10/keygen.c:1599 g10/keygen.c:1604 g10/keygen.c:1656 g10/keygen.c:1661
+#: g10/keygen.c:1833 g10/keygen.c:1838
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "密钥尺寸无效；改用 %u �\n"
 
-#: g10/keygen.c:1609 g10/keygen.c:1666 g10/keygen.c:1674 g10/keygen.c:1843
+#: g10/keygen.c:1610 g10/keygen.c:1667 g10/keygen.c:1675 g10/keygen.c:1844
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "密钥尺寸�入到 %u �\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1701
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr "警告：一些 OpenPGP 程��能处�具有此摘�长度的 DSA 密钥\n"
 
-#: g10/keygen.c:1899
+#: g10/keygen.c:1900
 msgid "Sign"
 msgstr "签�（Sign）"
 
-#: g10/keygen.c:1902
+#: g10/keygen.c:1903
 msgid "Certify"
 msgstr "认�（Certify）"
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1906
 msgid "Encrypt"
 msgstr "加密（Encrypt）"
 
-#: g10/keygen.c:1908
+#: g10/keygen.c:1909
 msgid "Authenticate"
 msgstr "身份验�（Authenticate）"
 
@@ -5064,166 +5072,166 @@ msgstr "身份验�（Authenticate）"
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1929
+#: g10/keygen.c:1930
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1967
 #, c-format
 msgid "Possible actions for this %s key: "
 msgstr "%s 密钥的�实现的功能： "
 
-#: g10/keygen.c:1973
+#: g10/keygen.c:1974
 msgid "Current allowed actions: "
 msgstr "目��用的功能： "
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1979
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) 签�功能开关\n"
 
-#: g10/keygen.c:1981
+#: g10/keygen.c:1982
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) 加密功能开关\n"
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1985
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) 身份验�功能开关\n"
 
-#: g10/keygen.c:1987
+#: g10/keygen.c:1988
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) 已完�\n"
 
-#: g10/keygen.c:2116
+#: g10/keygen.c:2117
 #, c-format
 msgid "   (%d) RSA and RSA%s\n"
 msgstr "   (%d) RSA 和 RSA %s\n"
 
-#: g10/keygen.c:2120
+#: g10/keygen.c:2121
 #, c-format
 msgid "   (%d) DSA and Elgamal%s\n"
 msgstr "   (%d) DSA 和 Elgamal %s\n"
 
-#: g10/keygen.c:2123
+#: g10/keygen.c:2124
 #, c-format
 msgid "   (%d) DSA (sign only)%s\n"
 msgstr "   (%d) DSA（仅用于签�）%s\n"
 
-#: g10/keygen.c:2125
+#: g10/keygen.c:2126
 #, c-format
 msgid "   (%d) RSA (sign only)%s\n"
 msgstr "   (%d) RSA（仅用于签�）%s\n"
 
-#: g10/keygen.c:2131
+#: g10/keygen.c:2132
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)%s\n"
 msgstr "   (%d) ElGamal（仅用于加密）%s\n"
 
-#: g10/keygen.c:2133
+#: g10/keygen.c:2134
 #, c-format
 msgid "   (%d) RSA (encrypt only)%s\n"
 msgstr "   (%d) RSA（仅用于加密）%s\n"
 
-#: g10/keygen.c:2139
+#: g10/keygen.c:2140
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)%s\n"
 msgstr "   (%d) DSA（自定义用途）%s\n"
 
-#: g10/keygen.c:2141
+#: g10/keygen.c:2142
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)%s\n"
 msgstr "   (%d) RSA（自定义用途）%s\n"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2148
 #, c-format
 msgid "   (%d) ECC (sign and encrypt)%s\n"
 msgstr "   (%d) ECC（签�和加密）%s\n"
 
-#: g10/keygen.c:2147 g10/keygen.c:2678
+#: g10/keygen.c:2148 g10/keygen.c:2679
 msgid " *default*"
 msgstr " *默认*"
 
-#: g10/keygen.c:2148
+#: g10/keygen.c:2149
 #, c-format
 msgid "  (%d) ECC (sign only)\n"
 msgstr "  (%d) ECC（仅用于签�）\n"
 
-#: g10/keygen.c:2150
+#: g10/keygen.c:2151
 #, c-format
 msgid "  (%d) ECC (set your own capabilities)%s\n"
 msgstr "  (%d) ECC（自定义用途）%s\n"
 
-#: g10/keygen.c:2152
+#: g10/keygen.c:2153
 #, c-format
 msgid "  (%d) ECC (encrypt only)%s\n"
 msgstr "  (%d) ECC（仅用于加密）%s\n"
 
-#: g10/keygen.c:2156
+#: g10/keygen.c:2157
 #, c-format
 msgid "  (%d) Existing key%s\n"
 msgstr "  (%d) 现有密钥 %s\n"
 
-#: g10/keygen.c:2158
+#: g10/keygen.c:2159
 #, c-format
 msgid "  (%d) Existing key from card%s\n"
 msgstr " （%d）�中现有密钥 %s\n"
 
-#: g10/keygen.c:2254 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2255 sm/certreqgen-ui.c:203
 msgid "Enter the keygrip: "
 msgstr "输入 keygrip： "
 
-#: g10/keygen.c:2267 sm/certreqgen-ui.c:211 tools/gpg-card.c:2280
+#: g10/keygen.c:2268 sm/certreqgen-ui.c:211 tools/gpg-card.c:2297
 #, c-format
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr "�是一个有效的 keygrip （需� 40 ��六进制数）\n"
 
-#: g10/keygen.c:2269 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2270 sm/certreqgen-ui.c:213
 msgid "No key with this keygrip\n"
 msgstr "没有此 keygrip 关�的密钥\n"
 
-#: g10/keygen.c:2288 g10/keygen.c:2298 g10/keygen.c:3440 g10/keygen.c:3451
+#: g10/keygen.c:2289 g10/keygen.c:2299 g10/keygen.c:3444 g10/keygen.c:3455
 #: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
 #, c-format
 msgid "error reading the card: %s\n"
 msgstr "读��片时出现错误：%s\n"
 
-#: g10/keygen.c:2292 g10/keygen.c:3444 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2293 g10/keygen.c:3448 sm/certreqgen-ui.c:234
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "�片的�列�：%s\n"
 
-#: g10/keygen.c:2311 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2312 sm/certreqgen-ui.c:246
 msgid "Available keys:\n"
 msgstr "�用的密钥：\n"
 
-#: g10/keygen.c:2504 g10/keygen.c:2518
+#: g10/keygen.c:2505 g10/keygen.c:2519
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr "�入到 %u �\n"
 
-#: g10/keygen.c:2559
+#: g10/keygen.c:2560
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s 密钥的长度应在 %u �与 %u �之间。\n"
 
-#: g10/keygen.c:2567
+#: g10/keygen.c:2568
 #, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "您想�为此�密钥使用的密钥长度？(%u) "
 
-#: g10/keygen.c:2584 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2585 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "请求的密钥长度是 %u �\n"
 
-#: g10/keygen.c:2630
+#: g10/keygen.c:2631
 msgid "Please select which elliptic curve you want:\n"
 msgstr "请选择您想�使用的椭圆曲线：\n"
 
-#: g10/keygen.c:2819
+#: g10/keygen.c:2820
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5239,7 +5247,7 @@ msgstr ""
 "      <n>m = 密钥在 n 月�过期\n"
 "      <n>y = 密钥在 n 年�过期\n"
 
-#: g10/keygen.c:2830
+#: g10/keygen.c:2831
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5255,38 +5263,38 @@ msgstr ""
 "      <n>m = 签�在 n 月�过期\n"
 "      <n>y = 签�在 n 年�过期\n"
 
-#: g10/keygen.c:2853
+#: g10/keygen.c:2854
 msgid "Key is valid for? (0) "
 msgstr "密钥的有效期�是？(0) "
 
-#: g10/keygen.c:2858
+#: g10/keygen.c:2859
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "签�的有效期�是？(%s) "
 
-#: g10/keygen.c:2871 g10/keygen.c:2896
+#: g10/keygen.c:2875 g10/keygen.c:2900
 msgid "invalid value\n"
 msgstr "无效的值\n"
 
-#: g10/keygen.c:2878
+#: g10/keygen.c:2882
 msgid "Key does not expire at all\n"
 msgstr "密钥永远�会过期\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2883
 msgid "Signature does not expire at all\n"
 msgstr "签�永远�会过期\n"
 
-#: g10/keygen.c:2884
+#: g10/keygen.c:2888
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "密钥于 %s 过期\n"
 
-#: g10/keygen.c:2885
+#: g10/keygen.c:2889
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "签�于 %s 过期\n"
 
-#: g10/keygen.c:2889
+#: g10/keygen.c:2893
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5294,11 +5302,11 @@ msgstr ""
 "您的系统无法显示 2038 年以�的日期。\n"
 "�过它�以正确地处�到 2106 年之�的日期。\n"
 
-#: g10/keygen.c:2902
+#: g10/keygen.c:2906
 msgid "Is this correct? (y/N) "
 msgstr "这些内容正确�？ (y/N) "
 
-#: g10/keygen.c:2970
+#: g10/keygen.c:2974
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5312,7 +5320,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2985
+#: g10/keygen.c:2989
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5327,49 +5335,49 @@ msgstr ""
 "    “Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>�\n"
 "\n"
 
-#: g10/keygen.c:3004
+#: g10/keygen.c:3008
 msgid "Real name: "
 msgstr "真实姓�： "
 
-#: g10/keygen.c:3013
+#: g10/keygen.c:3017
 msgid "Invalid character in name\n"
 msgstr "姓��有无效的字符\n"
 
-#: g10/keygen.c:3014
+#: g10/keygen.c:3018
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr "字符‘%s’和‘%s’�能出现在姓�中\n"
 
-#: g10/keygen.c:3018
+#: g10/keygen.c:3022
 msgid "Name may not start with a digit\n"
 msgstr "姓���以用数字开头\n"
 
-#: g10/keygen.c:3021
+#: g10/keygen.c:3025
 msgid "Name must be at least 5 characters long\n"
 msgstr "姓�至少�有五个字符长\n"
 
-#: g10/keygen.c:3031
+#: g10/keygen.c:3035
 msgid "Email address: "
 msgstr "电�邮件地�： "
 
-#: g10/keygen.c:3037
+#: g10/keygen.c:3041
 msgid "Not a valid email address\n"
 msgstr "电�邮件地�无效\n"
 
-#: g10/keygen.c:3046
+#: g10/keygen.c:3050
 msgid "Comment: "
 msgstr "注释： "
 
-#: g10/keygen.c:3052
+#: g10/keygen.c:3056
 msgid "Invalid character in comment\n"
 msgstr "注释�有无效的字符\n"
 
-#: g10/keygen.c:3088
+#: g10/keygen.c:3092
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr "您正在使用‘%s’字符集。\n"
 
-#: g10/keygen.c:3094
+#: g10/keygen.c:3098
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5380,7 +5388,7 @@ msgstr ""
 "    “%s�\n"
 "\n"
 
-#: g10/keygen.c:3099
+#: g10/keygen.c:3103
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "请��把电�邮件地�放进您的真实姓�或注释里\n"
 
@@ -5395,31 +5403,31 @@ msgstr "请��把电�邮件地�放进您的真实姓�或注释里\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3124
+#: g10/keygen.c:3128
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:3134
+#: g10/keygen.c:3138
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "更改姓�（N）�注释（C）�电�邮件地�（E）或退出（Q）？ "
 
-#: g10/keygen.c:3135
+#: g10/keygen.c:3139
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "更改姓�（N）�注释（C）�电�邮件地�（E）或确定（O）/退出（Q）？ "
 
-#: g10/keygen.c:3140
+#: g10/keygen.c:3144
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "更改姓�（N）�注释（C）�电�邮件地�（E）或退出（Q）？ "
 
-#: g10/keygen.c:3141
+#: g10/keygen.c:3145
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "更改姓�（N）�注释（C）�电�邮件地�（E）或确定（O）/退出（Q）？ "
 
-#: g10/keygen.c:3160
+#: g10/keygen.c:3164
 msgid "Please correct the error first\n"
 msgstr "请先改正错误\n"
 
-#: g10/keygen.c:3206
+#: g10/keygen.c:3210
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -5430,18 +5438,18 @@ msgstr ""
 "�移动鼠标�读写硬盘之类的）将会是一个�错的主�；这会让�机数\n"
 "�生器有更好的机会获得足够的熵。\n"
 
-#: g10/keygen.c:3591
+#: g10/keygen.c:3595
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
-msgstr ""
+msgstr "警告：已指定 v4，但被 v5 覆盖。\n"
 
-#: g10/keygen.c:4590 g10/keygen.c:4663 g10/keygen.c:4681 g10/keygen.c:4710
-#: g10/keygen.c:5086 g10/keygen.c:5632 g10/keygen.c:5943 g10/keygen.c:6050
+#: g10/keygen.c:4594 g10/keygen.c:4667 g10/keygen.c:4685 g10/keygen.c:4714
+#: g10/keygen.c:5113 g10/keygen.c:5663 g10/keygen.c:5974 g10/keygen.c:6081
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "密钥生�失败：%s\n"
 
-#: g10/keygen.c:4599
+#: g10/keygen.c:4603
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5452,64 +5460,64 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:4601
+#: g10/keygen.c:4605
 msgid "Continue? (Y/n) "
 msgstr "继续�？ (Y/n) "
 
-#: g10/keygen.c:4622
+#: g10/keygen.c:4626
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "一个 \"%s\" 的密钥已�存在\n"
 
-#: g10/keygen.c:4627
+#: g10/keygen.c:4631
 msgid "Create anyway? (y/N) "
 msgstr "无论如何都�创建�？(y/N) "
 
-#: g10/keygen.c:4633
+#: g10/keygen.c:4637
 #, c-format
 msgid "creating anyway\n"
 msgstr "无论如何都创建\n"
 
-#: g10/keygen.c:5069
+#: g10/keygen.c:5096
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr "注�：使用 “%s %s� 以获得一个全功能的密钥生�对�框。\n"
 
-#: g10/keygen.c:5118
+#: g10/keygen.c:5145
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "密钥生�已�消。\n"
 
-#: g10/keygen.c:5178
+#: g10/keygen.c:5205
 #, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "�能创建备份文件‘%s’：%s\n"
 
-#: g10/keygen.c:5198
+#: g10/keygen.c:5225
 #, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "注�：�片密钥的备份已�存到‘%s’\n"
 
-#: g10/keygen.c:5359 g10/keygen.c:5561
+#: g10/keygen.c:5389 g10/keygen.c:5591
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr "正在将公钥写至‘%s’\n"
 
-#: g10/keygen.c:5555
+#: g10/keygen.c:5585
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "无�写的公钥钥匙环：%s\n"
 
-#: g10/keygen.c:5569
+#: g10/keygen.c:5599
 #, c-format
 msgid "error writing public keyring '%s': %s\n"
 msgstr "写入公钥钥匙环‘%s’时�生错误： %s\n"
 
-#: g10/keygen.c:5603
+#: g10/keygen.c:5634
 msgid "public and secret key created and signed.\n"
 msgstr "公钥和�钥已�生�并被签�。\n"
 
-#: g10/keygen.c:5619
+#: g10/keygen.c:5650
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -5517,34 +5525,34 @@ msgstr ""
 "请注�这个密钥�能用于加密。您�能想�使用“--edit-key�命令�\n"
 "生�一个用于此用途的�密钥。\n"
 
-#: g10/keygen.c:5801 g10/keygen.c:6000
+#: g10/keygen.c:5832 g10/keygen.c:6031
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "密钥已�在 %lu 秒�的未�生�（�能是因为时空扭曲或时钟的问题）\n"
 
-#: g10/keygen.c:5803 g10/keygen.c:6002
+#: g10/keygen.c:5834 g10/keygen.c:6033
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "密钥已�在 %lu 秒�的未�生�（�能是因为时空扭曲或时钟的问题）\n"
 
-#: g10/keygen.c:5814 g10/keygen.c:6013
+#: g10/keygen.c:5845 g10/keygen.c:6044
 #, c-format
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "注�：为 v3 密钥创建�密钥是�与 OpenPGP 兼容的\n"
 
-#: g10/keygen.c:5826 g10/keygen.c:5828
+#: g10/keygen.c:5857 g10/keygen.c:5859
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "主密钥的�钥部分��用。\n"
 
-#: g10/keygen.c:5835 g10/keygen.c:5837
+#: g10/keygen.c:5866 g10/keygen.c:5868
 #, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "主密钥的�钥部分存储在�上。\n"
 
-#: g10/keygen.c:5857 g10/keygen.c:6027
+#: g10/keygen.c:5888 g10/keygen.c:6058
 msgid "Really create? (y/N) "
 msgstr "真的�创建�？(y/N) "
 
@@ -5620,30 +5628,30 @@ msgstr "      密钥指纹 ="
 msgid "      Card serial no. ="
 msgstr "      �片�列� ="
 
-#: g10/keyring.c:1467
+#: g10/keyring.c:1477
 #, c-format
 msgid "caching keyring '%s'\n"
 msgstr "正在缓存钥匙环‘%s’\n"
 
-#: g10/keyring.c:1541
+#: g10/keyring.c:1551
 #, c-format
 msgid "%lu keys cached so far (%lu signature)\n"
 msgid_plural "%lu keys cached so far (%lu signatures)\n"
 msgstr[0] "当�有 %lu 把密钥已缓存 （%lu 个签�）\n"
 
-#: g10/keyring.c:1557
+#: g10/keyring.c:1567
 #, c-format
 msgid "%lu key cached"
 msgid_plural "%lu keys cached"
 msgstr[0] "%lu 把密钥已缓存"
 
-#: g10/keyring.c:1559
+#: g10/keyring.c:1569
 #, c-format
 msgid " (%lu signature)\n"
 msgid_plural " (%lu signatures)\n"
 msgstr[0] " (%lu 个签�)\n"
 
-#: g10/keyring.c:1636
+#: g10/keyring.c:1646
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s：钥匙环已创建\n"
@@ -5672,76 +5680,71 @@ msgstr "验�签�时自动拉�密钥"
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "使用密钥中指定的首选公钥�务器 URL"
 
-#: g10/keyserver.c:537
+#: g10/keyserver.c:360
 msgid "disabled"
 msgstr "已�用"
 
-#: g10/keyserver.c:740
+#: g10/keyserver.c:563
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "输入数字以选择，输入 N 翻页，输入 Q 退出 > "
 
-#: g10/keyserver.c:846
+#: g10/keyserver.c:669
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "无效的公钥�务器�议（us %d!=handler %d）\n"
 
-#: g10/keyserver.c:986 g10/keyserver.c:1096
+#: g10/keyserver.c:809 g10/keyserver.c:919
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "“%s� �是一个用户标识：跳过\n"
 
-#: g10/keyserver.c:1420 g10/keyserver.c:1453
+#: g10/keyserver.c:1217 g10/keyserver.c:1250
 #, 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:1427
+#: g10/keyserver.c:1224
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "警告：无法通过 %s 更新密钥 %s ：%s\n"
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1316
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "在公钥�务器上找�到密钥 “%s�\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1319
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "在公钥�务器上找�到密钥\n"
 
-#: g10/keyserver.c:1722
-#, c-format
-msgid "requesting key %s from %s server %s\n"
-msgstr "正在请求密钥 %s 从 %s �务器 %s\n"
-
-#: g10/keyserver.c:1726
+#: g10/keyserver.c:1481
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "正在请求密钥 %s 从 %s\n"
 
-#: g10/keyserver.c:1841 g10/keyserver.c:2020
+#: g10/keyserver.c:1600 g10/keyserver.c:1793
 #, c-format
 msgid "no keyserver known\n"
 msgstr "无已知的公钥�务器\n"
 
-#: g10/keyserver.c:1856 g10/skclist.c:213 g10/skclist.c:241
+#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "已跳过 “%s�： %s\n"
 
-#: g10/keyserver.c:1860
+#: g10/keyserver.c:1619
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "正在��密钥 %s 到 %s\n"
 
-#: g10/keyserver.c:1901
+#: g10/keyserver.c:1662
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr "正在从 %s 请求密钥\n"
 
-#: g10/keyserver.c:1917
+#: g10/keyserver.c:1680
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "警告：无法获� URI %s：%s\n"
@@ -5759,74 +5762,74 @@ msgstr "%s.%s 已加密的会�密钥\n"
 #: g10/mainproc.c:385
 #, c-format
 msgid "encrypted with unknown algorithm %d.%s\n"
-msgstr "以下列未知算法加密 %d.%s\n"
+msgstr "未知的算法加密 %d.%s\n"
 
 #: g10/mainproc.c:391
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "密�由未知的散列算法 %d 生�\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:473
 #, c-format
 msgid "public key is %s\n"
 msgstr "公钥是 %s\n"
 
-#: g10/mainproc.c:524
+#: g10/mainproc.c:525
 #, c-format
 msgid "encrypted with %s key, ID %s, created %s\n"
 msgstr "由 %s 密钥加密，标识为 %s，生�于 %s\n"
 
-#: g10/mainproc.c:528 g10/pkclist.c:231
+#: g10/mainproc.c:529 g10/pkclist.c:231
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      “%s�\n"
 
-#: g10/mainproc.c:532
+#: g10/mainproc.c:533
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "由 %s 密钥加密�密钥�为 %s\n"
 
-#: g10/mainproc.c:552 g10/mainproc.c:935
+#: g10/mainproc.c:553 g10/mainproc.c:937
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "警告： 检测到多�纯文本\n"
 
-#: g10/mainproc.c:560
+#: g10/mainproc.c:561
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "以 %lu 个密�加密\n"
 
-#: g10/mainproc.c:562
+#: g10/mainproc.c:563
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "以 1 个密�加密\n"
 
-#: g10/mainproc.c:577 g10/mainproc.c:602
+#: g10/mainproc.c:578 g10/mainproc.c:603
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "公钥解密失败：%s\n"
 
-#: g10/mainproc.c:613
+#: g10/mainproc.c:614
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "公钥加密数�：完好的数�加密密钥（DEK）\n"
 
-#: g10/mainproc.c:642 g10/mainproc.c:663
+#: g10/mainproc.c:643 g10/mainproc.c:664
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "�定 %s 为加密过的数�\n"
 
-#: g10/mainproc.c:649
+#: g10/mainproc.c:650
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA 密文算法��用，�试使用 %s 代替\n"
 
-#: g10/mainproc.c:742 g10/mainproc.c:780
+#: g10/mainproc.c:744 g10/mainproc.c:782
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "警告：消�未�到完整性�护\n"
 
-#: g10/mainproc.c:753
+#: g10/mainproc.c:755
 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"
@@ -5836,178 +5839,178 @@ msgstr ""
 "看起�此信�就是�法的。这是因为那个时候完整性\n"
 "�护还没有被广泛地采用。\n"
 
-#: g10/mainproc.c:756
+#: g10/mainproc.c:758
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr "无论如何使用选项‘%s’�解密。\n"
 
-#: g10/mainproc.c:761
+#: g10/mainproc.c:763
 #, c-format
 msgid "decryption forced to fail!\n"
 msgstr "解密强制失败�\n"
 
-#: g10/mainproc.c:773
+#: g10/mainproc.c:775
 #, c-format
 msgid "decryption okay\n"
 msgstr "解密�功\n"
 
-#: g10/mainproc.c:786
+#: g10/mainproc.c:788
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "警告：加密过的报文已��造�\n"
 
-#: g10/mainproc.c:804
+#: g10/mainproc.c:806
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "解密失败：%s\n"
 
-#: g10/mainproc.c:851
+#: g10/mainproc.c:853
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "注�：��者�求您“�阅读�存盘�\n"
 
-#: g10/mainproc.c:858
+#: g10/mainproc.c:860
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "原始文件� =‘%.*s’\n"
 
-#: g10/mainproc.c:1135
+#: g10/mainproc.c:1137
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "独立的�销�书 - 请使用“gpg --import��应用\n"
 
-#: g10/mainproc.c:1440 g10/mainproc.c:1483
+#: g10/mainproc.c:1442 g10/mainproc.c:1485
 #, c-format
 msgid "no signature found\n"
 msgstr "未找到签�\n"
 
-#: g10/mainproc.c:1763
+#: g10/mainproc.c:1765
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "已��的签�，�自于 “%s�"
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1767
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "过期的签�，�自于 “%s�"
 
-#: g10/mainproc.c:1767
+#: g10/mainproc.c:1769
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "完好的签�，�自于 “%s�"
 
-#: g10/mainproc.c:1789
+#: g10/mainproc.c:1791
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "签�验�已被抑制\n"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1905
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "无法处�此有歧义的签�数�\n"
 
-#: g10/mainproc.c:1919 g10/mainproc.c:1926
+#: g10/mainproc.c:1921 g10/mainproc.c:1928
 #, c-format
 msgid "Signature made %s\n"
 msgstr "签�建立于 %s\n"
 
-#: g10/mainproc.c:1920 g10/mainproc.c:1927 sm/verify.c:480
+#: g10/mainproc.c:1922 g10/mainproc.c:1929 sm/verify.c:480
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "              使用 %s 密钥 %s\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1933
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "于 %s 创建的签�，使用 %s，密钥� %s\n"
 
-#: g10/mainproc.c:1937
+#: g10/mainproc.c:1939
 #, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "               签�者 \"%s\"\n"
 
-#: g10/mainproc.c:1992
+#: g10/mainproc.c:1994
 #, c-format
 msgid "Key available at: "
 msgstr "密钥在以下地方�用： "
 
-#: g10/mainproc.c:2034
+#: g10/mainproc.c:2036
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr "注�：使用 “%s� �使用此信�\n"
 
-#: g10/mainproc.c:2234
+#: g10/mainproc.c:2236
 msgid "[uncertain]"
 msgstr "[�确定]"
 
-#: g10/mainproc.c:2272
+#: g10/mainproc.c:2274
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                亦� “%s�"
 
-#: g10/mainproc.c:2347
+#: g10/mainproc.c:2349
 #, c-format
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr "警告： 此密钥在 %s 模�下�适用于签�\n"
 
-#: g10/mainproc.c:2363
+#: g10/mainproc.c:2365
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "这份签�已于 %s 过期。\n"
 
-#: g10/mainproc.c:2368
+#: g10/mainproc.c:2370
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "这份签�在 %s 过期。\n"
 
-#: g10/mainproc.c:2379
+#: g10/mainproc.c:2381
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s 签�，摘�算法 %s%s%s\n"
 
-#: g10/mainproc.c:2380
+#: g10/mainproc.c:2382
 msgid "binary"
 msgstr "二进制"
 
-#: g10/mainproc.c:2381
+#: g10/mainproc.c:2383
 msgid "textmode"
 msgstr "文本模�"
 
-#: g10/mainproc.c:2381 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2383 g10/trust.c:112 dirmngr/ocsp.c:793
 msgid "unknown"
 msgstr "未知"
 
-#: g10/mainproc.c:2383
+#: g10/mainproc.c:2385
 msgid ", key algorithm "
 msgstr "，密钥算法 "
 
-#: g10/mainproc.c:2418
+#: g10/mainproc.c:2420
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr "警告：�是一个分离签�；文件‘%s’没有被验��\n"
 
-#: g10/mainproc.c:2457
+#: g10/mainproc.c:2459
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "无法检查签�：%s\n"
 
-#: g10/mainproc.c:2553 g10/mainproc.c:2572 g10/mainproc.c:2696
+#: g10/mainproc.c:2555 g10/mainproc.c:2574 g10/mainproc.c:2698
 #, c-format
 msgid "not a detached signature\n"
 msgstr "�是一份分离的签�\n"
 
-#: g10/mainproc.c:2606
+#: g10/mainproc.c:2608
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "警告：检测到多�签�。�检查第一个签�。\n"
 
-#: g10/mainproc.c:2615
+#: g10/mainproc.c:2617
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "等级 0x%02x 的独立签�\n"
 
-#: g10/mainproc.c:2700
+#: g10/mainproc.c:2702
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "旧�（PGP 2.x）签�\n"
@@ -6185,45 +6188,51 @@ msgstr "未知的紧急签�注记： "
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d 类型的�包设定了紧急�\n"
 
-#: g10/passphrase.c:208
+#: g10/passphrase.c:201 sm/decrypt.c:669
+#, fuzzy
+#| msgid "Please enter the new passphrase"
+msgid "Please enter the passphrase for decryption."
+msgstr "请输入新的密�"
+
+#: g10/passphrase.c:203
 msgid "Enter passphrase\n"
 msgstr "请输入密�\n"
 
-#: g10/passphrase.c:219
+#: g10/passphrase.c:227
 #, c-format
 msgid "cancelled by user\n"
 msgstr "用户�消\n"
 
-#: g10/passphrase.c:460
+#: g10/passphrase.c:472
 #, c-format
 msgid " (main key ID %s)"
 msgstr " （主密钥标识 %s）"
 
-#: g10/passphrase.c:467
+#: g10/passphrase.c:479
 msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 msgstr "请输入密�以解� OpenPGP �钥："
 
-#: g10/passphrase.c:471
+#: g10/passphrase.c:483
 msgid "Please enter the passphrase to import the OpenPGP secret key:"
 msgstr "请输入密�以导入 OpenPGP �钥："
 
-#: g10/passphrase.c:476
+#: g10/passphrase.c:488
 msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 msgstr "请输入密�以导出 OpenPGP �密�密钥："
 
-#: g10/passphrase.c:479
+#: g10/passphrase.c:491
 msgid "Please enter the passphrase to export the OpenPGP secret key:"
 msgstr "请输入密�以导出 OpenPGP �钥："
 
-#: g10/passphrase.c:484
+#: g10/passphrase.c:496
 msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 msgstr "您真的想�永久删除此 OpenPGP �密�密钥�："
 
-#: g10/passphrase.c:487
+#: g10/passphrase.c:499
 msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgstr "您真的想�永久删除此 OpenPGP �密密钥�："
 
-#: g10/passphrase.c:496
+#: g10/passphrase.c:508
 #, c-format
 msgid ""
 "%s\n"
@@ -6253,7 +6262,7 @@ msgstr ""
 
 #: g10/photoid.c:100
 msgid "Enter JPEG filename for photo ID: "
-msgstr "输入�当作相片标识的 JPEG 文件�： "
+msgstr "输入�当作照片标识的 JPEG 文件�： "
 
 #: g10/photoid.c:121
 #, c-format
@@ -6388,7 +6397,7 @@ msgstr ""
 "这个密钥的最�信任等级为：%s\n"
 "\n"
 
-#: g10/pkclist.c:313 g10/revoke.c:803
+#: g10/pkclist.c:313 g10/revoke.c:804
 msgid "Your decision? "
 msgstr "您的决定是什么？ "
 
@@ -6669,7 +6678,7 @@ msgstr "无法打开已签�的数�‘%s’\n"
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "无法打开已签�的数� fd=%d: %s\n"
 
-#: g10/pubkey-enc.c:99 sm/decrypt.c:879
+#: g10/pubkey-enc.c:99 sm/decrypt.c:1329
 #, c-format
 msgid "key %s is not suitable for decryption in %s mode\n"
 msgstr "密钥 %s 在 %s 模�下�适用于解密\n"
@@ -6715,7 +6724,7 @@ msgid "Note: key has been revoked"
 msgstr "注�：密钥已被�销"
 
 #: g10/revoke.c:100 g10/revoke.c:126 g10/revoke.c:172 g10/revoke.c:184
-#: g10/revoke.c:502
+#: g10/revoke.c:503
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet 失败：%s\n"
@@ -6741,11 +6750,11 @@ msgstr "�钥��用。\n"
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "�为这个密钥创建一个指定�销者�书�？(y/N) "
 
-#: g10/revoke.c:334 g10/revoke.c:744
+#: g10/revoke.c:334 g10/revoke.c:745
 msgid "ASCII armored output forced.\n"
 msgstr "已强行使用 ASCII 字符�装过的输出。\n"
 
-#: g10/revoke.c:350 g10/revoke.c:481
+#: g10/revoke.c:350 g10/revoke.c:482
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet 方法失败： %s\n"
@@ -6759,11 +6768,11 @@ msgstr "已建立�销�书。\n"
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "没有找到 “%s� 的�销用密钥\n"
 
-#: g10/revoke.c:567
+#: g10/revoke.c:568
 msgid "This is a revocation certificate for the OpenPGP key:"
 msgstr "这是一份针对此 OpenPGP 密钥的�销�书："
 
-#: g10/revoke.c:583
+#: g10/revoke.c:584
 msgid ""
 "A revocation certificate is a kind of \"kill switch\" to publicly\n"
 "declare that a key shall not anymore be used.  It is not possible\n"
@@ -6773,7 +6782,7 @@ msgstr ""
 "声明一个密钥将��被使用。 一旦一个这样的\n"
 "�销�书被�布之�，就��能撤回。"
 
-#: g10/revoke.c:586
+#: g10/revoke.c:587
 msgid ""
 "Use it to revoke this key in case of a compromise or loss of\n"
 "the secret key.  However, if the secret key is still accessible,\n"
@@ -6786,7 +6795,7 @@ msgstr ""
 "个新的�销�书并给定一个�销�由。更多的细节请�阅\n"
 " GnuPG 手册中关于 gpg 命令“--generate-revocation�的�述。"
 
-#: g10/revoke.c:592
+#: g10/revoke.c:593
 msgid ""
 "To avoid an accidental use of this file, a colon has been inserted\n"
 "before the 5 dashes below.  Remove this colon with a text editor\n"
@@ -6796,12 +6805,12 @@ msgstr ""
 "5 个短横线之�。在导入和�布此�销�书之�，请使用一个\n"
 "文本编辑器�移除此冒�。"
 
-#: g10/revoke.c:611
+#: g10/revoke.c:612
 #, c-format
 msgid "revocation certificate stored as '%s.rev'\n"
 msgstr "�销�书已被存储为‘%s.rev’\n"
 
-#: g10/revoke.c:655
+#: g10/revoke.c:656
 #, c-format
 msgid "secret key \"%s\" not found\n"
 msgstr "�钥 “%s� 未找到\n"
@@ -6809,21 +6818,21 @@ msgstr "�钥 “%s� 未找到\n"
 #. TRANSLATORS: The %s prints a key specification which
 #. for example has been given at the command line.  Several lines
 #. lines with secret key infos are printed after this message.
-#: g10/revoke.c:680
+#: g10/revoke.c:681
 #, c-format
 msgid "'%s' matches multiple secret keys:\n"
 msgstr "‘%s’匹�了多个�钥：\n"
 
-#: g10/revoke.c:705
+#: g10/revoke.c:706
 #, c-format
 msgid "error searching the keyring: %s\n"
 msgstr "�索钥匙环时出现错误： %s\n"
 
-#: g10/revoke.c:728
+#: g10/revoke.c:729
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "�为这个密钥创建一个�销�书�？(y/N) "
 
-#: g10/revoke.c:752
+#: g10/revoke.c:753
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -6841,33 +6850,33 @@ msgstr ""
 "��读。但是�万�心：您机器上的打�系统�能会在打�过程中储存\n"
 "这些数�，并使得其他人看到�\n"
 
-#: g10/revoke.c:786
+#: g10/revoke.c:787
 msgid "Please select the reason for the revocation:\n"
 msgstr "请选择�销的原因：\n"
 
-#: g10/revoke.c:796
+#: g10/revoke.c:797
 msgid "Cancel"
 msgstr "�消"
 
-#: g10/revoke.c:798
+#: g10/revoke.c:799
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "（也许您会想�在这里选择 %d）\n"
 
-#: g10/revoke.c:839
+#: g10/revoke.c:843
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "请输入�述（�选）；以空白行结�：\n"
 
-#: g10/revoke.c:867
+#: g10/revoke.c:871
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "�销原因：%s\n"
 
-#: g10/revoke.c:869
+#: g10/revoke.c:873
 msgid "(No description given)\n"
 msgstr "（未给定�述）\n"
 
-#: g10/revoke.c:874
+#: g10/revoke.c:878
 msgid "Is this okay? (y/N) "
 msgstr "这样�以�？ (y/N) "
 
@@ -7019,22 +7028,22 @@ msgstr "正在签�："
 msgid "%s.%s encryption will be used\n"
 msgstr "%s.%s 加密将被采用\n"
 
-#: g10/skclist.c:172 g10/skclist.c:253
+#: g10/skclist.c:173 g10/skclist.c:254
 #, c-format
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr "密钥未被标示为�安全- �能与�的�机数�生器共�使用�\n"
 
-#: g10/skclist.c:204
+#: g10/skclist.c:205
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "“%s� 已跳过：��\n"
 
-#: g10/skclist.c:223
+#: g10/skclist.c:224
 #, c-format
 msgid "skipped: secret key already present\n"
 msgstr "已跳过：�钥已存在\n"
 
-#: g10/skclist.c:242
+#: g10/skclist.c:243
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr "这是一个由 PGP 生�的 ElGamal 密钥，其用于签�时�安全�"
 
@@ -7254,10 +7263,10 @@ msgstr "�支�的 TOFU 数�库版本： %s\n"
 msgid "TOFU DB error"
 msgstr "TOFU DB 错误"
 
-#: g10/tofu.c:687 g10/tofu.c:2073 g10/tofu.c:2354 g10/tofu.c:2373
-#: g10/tofu.c:2386 g10/tofu.c:2398 g10/tofu.c:2413 g10/tofu.c:2425
-#: g10/tofu.c:3021 g10/tofu.c:3038 g10/tofu.c:3075 g10/tofu.c:3092
-#: g10/tofu.c:3404
+#: g10/tofu.c:687 g10/tofu.c:2077 g10/tofu.c:2358 g10/tofu.c:2377
+#: g10/tofu.c:2390 g10/tofu.c:2402 g10/tofu.c:2417 g10/tofu.c:2429
+#: g10/tofu.c:3025 g10/tofu.c:3042 g10/tofu.c:3079 g10/tofu.c:3096
+#: g10/tofu.c:3408
 #, c-format
 msgid "error reading TOFU database: %s\n"
 msgstr "读� TOFU 数�库时出现错误：%s\n"
@@ -7277,7 +7286,7 @@ msgstr "�始化 TOFU 数�库时出现错误：%s\n"
 msgid "error opening TOFU database '%s': %s\n"
 msgstr "打开 TOFU 数�库’%s’时出现错误：%s\n"
 
-#: g10/tofu.c:1148 g10/tofu.c:3458 g10/tofu.c:3604
+#: g10/tofu.c:1148 g10/tofu.c:3462 g10/tofu.c:3608
 #, c-format
 msgid "error updating TOFU database: %s\n"
 msgstr "更新 TOFU 数�库时出现错误：%s\n"
@@ -7286,7 +7295,7 @@ msgstr "更新 TOFU 数�库时出现错误：%s\n"
 #, c-format
 msgid ""
 "This is the first time the email address \"%s\" is being used with key %s."
-msgstr "这是电�邮件地� “%s� 第一次被用于密钥 %s。"
+msgstr "此电�邮件地� “%s� 是第一次被用于密钥 %s。"
 
 #: g10/tofu.c:1336
 #, c-format
@@ -7315,97 +7324,97 @@ msgstr "获�其他用户标识时出现错误：%s\n"
 msgid "This key's user IDs:\n"
 msgstr "此密钥的用户标识：\n"
 
-#: g10/tofu.c:1634 g10/tofu.c:1799
+#: g10/tofu.c:1634 g10/tofu.c:1801
 #, c-format
 msgid "policy: %s"
 msgstr "策略：%s"
 
-#: g10/tofu.c:1725
+#: g10/tofu.c:1727
 #, c-format
 msgid "error gathering signature stats: %s\n"
 msgstr "获�签�状�时出现错误：%s\n"
 
-#: g10/tofu.c:1729
+#: g10/tofu.c:1731
 #, c-format
 msgid "The email address \"%s\" is associated with %d key:\n"
 msgid_plural "The email address \"%s\" is associated with %d keys:\n"
 msgstr[0] "电�邮件地� “%s� 被关�到了 %d  把密钥：\n"
 
-#: g10/tofu.c:1747
+#: g10/tofu.c:1749
 #, c-format
 msgid "Statistics for keys with the email address \"%s\":\n"
 msgstr "具有电�邮件地� “%s� 的密钥的统计信�：\n"
 
-#: g10/tofu.c:1797
+#: g10/tofu.c:1799
 msgid "this key"
 msgstr "此密钥"
 
-#: g10/tofu.c:1823
+#: g10/tofu.c:1825
 #, c-format
 msgid "Verified %d message."
 msgid_plural "Verified %d messages."
 msgstr[0] "已验� %d �消�。"
 
-#: g10/tofu.c:1827
+#: g10/tofu.c:1829
 #, c-format
 msgid "Encrypted %d message."
 msgid_plural "Encrypted %d messages."
 msgstr[0] "已加密 %d �消�。"
 
-#: g10/tofu.c:1834
+#: g10/tofu.c:1836
 #, c-format
 msgid "Verified %d message in the future."
 msgid_plural "Verified %d messages in the future."
 msgstr[0] "已验� %d �将�的消�。"
 
-#: g10/tofu.c:1838
+#: g10/tofu.c:1840
 #, c-format
 msgid "Encrypted %d message in the future."
 msgid_plural "Encrypted %d messages in the future."
 msgstr[0] "已加密 %d �将�的消�。"
 
-#: g10/tofu.c:1852
+#: g10/tofu.c:1854
 #, c-format
 msgid "Messages verified over the past %d day: %d."
 msgid_plural "Messages verified over the past %d days: %d."
 msgstr[0] "在过去的 %d 天被验�的消�数目：%d。"
 
-#: g10/tofu.c:1858
+#: g10/tofu.c:1860
 #, c-format
 msgid "Messages encrypted over the past %d day: %d."
 msgid_plural "Messages encrypted over the past %d days: %d."
 msgstr[0] "在过去的 %d 天被加密的消�数目：%d。"
 
-#: g10/tofu.c:1868
+#: g10/tofu.c:1870
 #, c-format
 msgid "Messages verified over the past %d month: %d."
 msgid_plural "Messages verified over the past %d months: %d."
 msgstr[0] "在过去的 %d 个月被验�的消�数目：%d。"
 
-#: g10/tofu.c:1874
+#: g10/tofu.c:1876
 #, c-format
 msgid "Messages encrypted over the past %d month: %d."
 msgid_plural "Messages encrypted over the past %d months: %d."
 msgstr[0] "在过去的 %d 个月被加密的消�数目：%d。"
 
-#: g10/tofu.c:1884
+#: g10/tofu.c:1886
 #, c-format
 msgid "Messages verified over the past %d year: %d."
 msgid_plural "Messages verified over the past %d years: %d."
 msgstr[0] "在过去的 %d 年被验�的消�数目：%d。"
 
-#: g10/tofu.c:1890
+#: g10/tofu.c:1892
 #, c-format
 msgid "Messages encrypted over the past %d year: %d."
 msgid_plural "Messages encrypted over the past %d years: %d."
 msgstr[0] "在过去的 %d 年被加密的消�数目：%d。"
 
-#: g10/tofu.c:1898
+#: g10/tofu.c:1900
 #, c-format
 msgid "Messages verified in the past: %d."
 msgstr "过去被验�的消�：%d."
 
-#: g10/tofu.c:1902
+#: g10/tofu.c:1904
 #, c-format
 msgid "Messages encrypted in the past: %d."
 msgstr "过去被加密的消�： %d。"
@@ -7413,119 +7422,119 @@ msgstr "过去被加密的消�： %d。"
 #. TRANSLATORS: Please translate the text found in the source
 #. * file below.  We don't directly internationalize that text so
 #. * that we can tweak it without breaking translations.
-#: g10/tofu.c:1919
+#: g10/tofu.c:1921
 msgid "TOFU detected a binding conflict"
 msgstr "TOFU 检测到了一个绑定冲�"
 
 #. TRANSLATORS: Two letters (normally the lower and upper case
 #. * version of the hotkey) for each of the five choices.  If
 #. * there is only one choice in your language, repeat it.
-#: g10/tofu.c:1961
+#: g10/tofu.c:1963
 msgid "gGaAuUrRbB"
 msgstr "gGaAuUrRbB"
 
-#: g10/tofu.c:1967
+#: g10/tofu.c:1969
 msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr "良好（G），接�一次（A），未知（U），拒�一次（R），��（B） ？ "
 
-#: g10/tofu.c:1975
+#: g10/tofu.c:1978
 msgid "Defaulting to unknown.\n"
 msgstr "默认为未知。\n"
 
-#: g10/tofu.c:2093 g10/tofu.c:2228
+#: g10/tofu.c:2097 g10/tofu.c:2232
 #, c-format
 msgid "TOFU db corruption detected.\n"
 msgstr "检测到 TOFU 数�库出错。\n"
 
-#: g10/tofu.c:2829
+#: g10/tofu.c:2833
 #, c-format
 msgid "error changing TOFU policy: %s\n"
 msgstr "�更 TOFU 策略时出现错误：%s\n"
 
-#: g10/tofu.c:2880
+#: g10/tofu.c:2884
 #, c-format
 msgid "%lld~year"
 msgid_plural "%lld~years"
 msgstr[0] "%lld~å¹´"
 
-#: g10/tofu.c:2885
+#: g10/tofu.c:2889
 #, c-format
 msgid "%lld~month"
 msgid_plural "%lld~months"
 msgstr[0] "%lld~月"
 
-#: g10/tofu.c:2890
+#: g10/tofu.c:2894
 #, c-format
 msgid "%lld~week"
 msgid_plural "%lld~weeks"
 msgstr[0] "%lld~周"
 
-#: g10/tofu.c:2895
+#: g10/tofu.c:2899
 #, c-format
 msgid "%lld~day"
 msgid_plural "%lld~days"
 msgstr[0] "%lld~天"
 
-#: g10/tofu.c:2900
+#: g10/tofu.c:2904
 #, c-format
 msgid "%lld~hour"
 msgid_plural "%lld~hours"
 msgstr[0] "%lld~�时"
 
-#: g10/tofu.c:2905
+#: g10/tofu.c:2909
 #, c-format
 msgid "%lld~minute"
 msgid_plural "%lld~minutes"
 msgstr[0] "%lld~分钟"
 
-#: g10/tofu.c:2907
+#: g10/tofu.c:2911
 #, c-format
 msgid "%lld~second"
 msgid_plural "%lld~seconds"
 msgstr[0] "%lld~秒"
 
-#: g10/tofu.c:3145
+#: g10/tofu.c:3149
 #, c-format
 msgid "%s: Verified 0~signatures and encrypted 0~messages."
 msgstr "%s： 已验� 0~签�并加密 0~消�。"
 
-#: g10/tofu.c:3151
+#: g10/tofu.c:3155
 #, c-format
 msgid "%s: Verified 0 signatures."
 msgstr "%s：已验� 0 签�。"
 
-#: g10/tofu.c:3165
+#: g10/tofu.c:3169
 msgid "Encrypted 0 messages."
 msgstr "已加密 0 信�。"
 
-#: g10/tofu.c:3181
+#: g10/tofu.c:3185
 #, c-format
 msgid "(policy: %s)"
 msgstr "（策略： %s）"
 
-#: g10/tofu.c:3215
+#: g10/tofu.c:3219
 #, c-format
 msgid ""
 "Warning: we have yet to see a message signed using this key and user id!\n"
 msgstr "警告：我们此�还没有�过一�使用此密钥和用户标识签�的消��\n"
 
-#: g10/tofu.c:3218
+#: g10/tofu.c:3222
 #, c-format
 msgid ""
 "Warning: we've only seen one message signed using this key and user id!\n"
 msgstr "警告：我们此���过一�使用此密钥和用户标识签�的消��\n"
 
-#: g10/tofu.c:3222
+#: g10/tofu.c:3226
 #, c-format
 msgid "Warning: you have yet to encrypt a message to this key!\n"
 msgstr "警告：您之�没有�此密钥加密过消��\n"
 
-#: g10/tofu.c:3225
+#: g10/tofu.c:3229
 #, c-format
 msgid "Warning: you have only encrypted one message to this key!\n"
 msgstr "警告：您之���此密钥加密过一�消��\n"
 
-#: g10/tofu.c:3254
+#: g10/tofu.c:3258
 #, c-format
 msgid ""
 "Warning: if you think you've seen more signatures by this key and user id, "
@@ -7545,13 +7554,13 @@ msgstr[0] ""
 "  %s\n"
 "以将其标记为�的。\n"
 
-#: g10/tofu.c:3339 g10/tofu.c:3502 g10/tofu.c:3708 g10/tofu.c:3761
-#: g10/tofu.c:3902 g10/tofu.c:3979 g10/tofu.c:4017
+#: g10/tofu.c:3343 g10/tofu.c:3506 g10/tofu.c:3712 g10/tofu.c:3765
+#: g10/tofu.c:3906 g10/tofu.c:3983 g10/tofu.c:4021
 #, c-format
 msgid "error opening TOFU database: %s\n"
 msgstr "打开 TOFU 数�库时出现错误：%s\n"
 
-#: g10/tofu.c:3535
+#: g10/tofu.c:3539
 #, c-format
 msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
 msgstr "警告：正在加密给 %s，其�具有���销的用户标识。\n"
@@ -7616,7 +7625,7 @@ msgstr "使用 %s 信任模型\n"
 msgid "no need for a trustdb check\n"
 msgstr "�需�检查信任度数�库\n"
 
-#: g10/trustdb.c:601 g10/trustdb.c:2272
+#: g10/trustdb.c:601 g10/trustdb.c:2273
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "下次信任度数�库检查将于 %s 进行\n"
@@ -7646,57 +7655,57 @@ msgstr "请执行一次 --check-trustdb\n"
 msgid "checking the trustdb\n"
 msgstr "正在检查信任度数�库\n"
 
-#: g10/trustdb.c:1993
+#: g10/trustdb.c:1994
 #, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr[0] "已处� %d 把密钥"
 
-#: g10/trustdb.c:1996
+#: g10/trustdb.c:1997
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] " （%d 个有效计数已被清除）\n"
 
-#: g10/trustdb.c:2066
+#: g10/trustdb.c:2067
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "未找到任何�对信任的密钥\n"
 
-#: g10/trustdb.c:2080
+#: g10/trustdb.c:2081
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "�对信任密钥 %s 的公钥未找到\n"
 
-#: g10/trustdb.c:2198
+#: g10/trustdb.c:2199
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 "深度：%d  有效性：%3d  已签�：%3d  信任度：%d-，%dq，%dn，%dm，%df，%du\n"
 
-#: g10/trustdb.c:2279
+#: g10/trustdb.c:2280
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "无法更新信任度数�库版本记录：写入失败：%s\n"
 
-#: g10/trust.c:125
+#: g10/trust.c:114
 msgid "undefined"
 msgstr "未定义"
 
-#: g10/trust.c:126
+#: g10/trust.c:115
 msgid "never"
 msgstr "永�"
 
-#: g10/trust.c:127
+#: g10/trust.c:116
 msgid "marginal"
 msgstr "勉强"
 
-#: g10/trust.c:128
+#: g10/trust.c:117
 msgid "full"
 msgstr "完全"
 
-#: g10/trust.c:129
+#: g10/trust.c:118
 msgid "ultimate"
 msgstr "�对"
 
@@ -7708,39 +7717,39 @@ msgstr "�对"
 #. It gets passed to atoi() so everything after the number is
 #. essentially a comment and need not be translated.  Either key and
 #. uid are both NULL, or neither are NULL.
-#: g10/trust.c:166
+#: g10/trust.c:155
 msgid "10 translator see trust.c:uid_trust_string_fixed"
 msgstr "8 translator see trustdb.c:uid_trust_string_fixed"
 
-#: g10/trust.c:169
+#: g10/trust.c:158
 msgid "[ revoked]"
 msgstr "[ �销 ]"
 
-#: g10/trust.c:171 g10/trust.c:177
+#: g10/trust.c:160 g10/trust.c:166
 msgid "[ expired]"
 msgstr "[ 过期 ]"
 
-#: g10/trust.c:176
+#: g10/trust.c:165
 msgid "[ unknown]"
 msgstr "[ 未知 ]"
 
-#: g10/trust.c:178
+#: g10/trust.c:167
 msgid "[  undef ]"
 msgstr "[ 未定 ]"
 
-#: g10/trust.c:179
+#: g10/trust.c:168
 msgid "[  never ]"
 msgstr "[ 永� ]"
 
-#: g10/trust.c:180
+#: g10/trust.c:169
 msgid "[marginal]"
 msgstr "[ 勉强 ]"
 
-#: g10/trust.c:181
+#: g10/trust.c:170
 msgid "[  full  ]"
 msgstr "[ 完全 ]"
 
-#: g10/trust.c:182
+#: g10/trust.c:171
 msgid "[ultimate]"
 msgstr "[ �对 ]"
 
@@ -7798,16 +7807,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:4937 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2386
+#: scd/app-piv.c:1770 scd/app-p15.c:5035 scd/app-nks.c:1530
+#: scd/app-openpgp.c:2387
 #, 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:4956 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2402
+#: scd/app-piv.c:1787 scd/app-p15.c:5054 scd/app-nks.c:1549
+#: scd/app-openpgp.c:2403
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr "剩余�试：%d"
@@ -7836,10 +7845,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:2669
-#: scd/app-openpgp.c:2693 scd/app-openpgp.c:2871 scd/app-openpgp.c:2893
-#: scd/app-openpgp.c:3074 scd/app-openpgp.c:3361 scd/app-openpgp.c:3408
-#: scd/app-openpgp.c:3545 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2670
+#: scd/app-openpgp.c:2694 scd/app-openpgp.c:2872 scd/app-openpgp.c:2894
+#: scd/app-openpgp.c:3075 scd/app-openpgp.c:3362 scd/app-openpgp.c:3409
+#: scd/app-openpgp.c:3547 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN 回调返回错误：%s\n"
@@ -7859,91 +7868,91 @@ 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:3616
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3618
 #, c-format
 msgid "key already exists\n"
 msgstr "密钥已存在\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3620
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3622
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "现有的密钥将被替�\n"
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3622
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3624
 #, c-format
 msgid "generating new key\n"
 msgstr "生�新密钥\n"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3624
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3626
 #, c-format
 msgid "writing new key\n"
 msgstr "正在写入新密钥\n"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4484 scd/app-openpgp.c:4767
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4486 scd/app-openpgp.c:4761
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "存储密钥失败：%s\n"
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1615
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1616
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr "�应�包� RSA 余数\n"
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1622
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1623
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr "�应�包� RSA 公钥指数\n"
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1732
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1733
 #, c-format
 msgid "response does not contain the EC public key\n"
 msgstr "�应�包� EC 公钥\n"
 
-#: scd/app-piv.c:3279 scd/app-openpgp.c:4943
+#: scd/app-piv.c:3279 scd/app-openpgp.c:4937
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr "请等待密钥生�…\n"
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4951
+#: scd/app-piv.c:3294 scd/app-openpgp.c:4945
 #, c-format
 msgid "generating key failed\n"
 msgstr "生�密钥失败\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4957
+#: scd/app-piv.c:3300 scd/app-openpgp.c:4951
 #, 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:1842 scd/app-openpgp.c:4966
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1843 scd/app-openpgp.c:4960
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr "�应�包�公钥数�\n"
 
-#: scd/app-p15.c:5035 scd/app-nks.c:2038
+#: scd/app-p15.c:5133 scd/app-nks.c:2038
 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:5038 scd/app-openpgp.c:2818
+#: scd/app-p15.c:5136 scd/app-openpgp.c:2819
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|请输入管�员 PIN"
 
-#: scd/app-p15.c:5040 scd/app-nks.c:2028
+#: scd/app-p15.c:5138 scd/app-nks.c:2028
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "|NP|请输入标准密钥的 PIN 解��（PUK）。"
 
-#: scd/app-p15.c:5043 scd/app-nks.c:2019
+#: scd/app-p15.c:5141 scd/app-nks.c:2019
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||请输入标准密钥的 PIN。"
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4321
+#: scd/app-nks.c:1468 scd/app-openpgp.c:4323
 #, 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:4333
+#: scd/app-nks.c:1476 scd/app-openpgp.c:4335
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "RSA 公钥指数缺失或长于 %d �\n"
@@ -7981,27 +7990,27 @@ msgid ""
 "qualified signatures."
 msgstr "|P|请为这个密钥输入 PIN 解��（PUK）以创建�格的签�。"
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3442 scd/app-dinsig.c:534
+#: scd/app-nks.c:2221 scd/app-openpgp.c:3443 scd/app-dinsig.c:534
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "获�新 PIN 时出现错误：%s\n"
 
-#: scd/app-openpgp.c:943
+#: scd/app-openpgp.c:944
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "存储指纹失败：%s\n"
 
-#: scd/app-openpgp.c:956
+#: scd/app-openpgp.c:957
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "存储创建日期失败：%s\n"
 
-#: scd/app-openpgp.c:1427 scd/app-openpgp.c:3389 scd/app-openpgp.c:5715
+#: scd/app-openpgp.c:1428 scd/app-openpgp.c:3390 scd/app-openpgp.c:5709
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "从�片中拉� CHV 状�时出现错误\n"
 
-#: scd/app-openpgp.c:1949
+#: scd/app-openpgp.c:1950
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "读�公钥失败：%s\n"
@@ -8009,62 +8018,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:2373
+#: scd/app-openpgp.c:2374
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr "%s数字: %s%%0A�有者: %s%%0A计数: %lu%s"
 
-#: scd/app-openpgp.c:2621
+#: scd/app-openpgp.c:2622
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "使用默认 PIN 作为 %s\n"
 
-#: scd/app-openpgp.c:2628
+#: scd/app-openpgp.c:2629
 #, 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:2641
+#: scd/app-openpgp.c:2642
 msgid "||Please unlock the card"
 msgstr "||请解��片"
 
-#: scd/app-openpgp.c:2700 scd/app-openpgp.c:2900 scd/app-openpgp.c:3368
+#: scd/app-openpgp.c:2701 scd/app-openpgp.c:2901 scd/app-openpgp.c:3369
 #, 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:2717 scd/app-openpgp.c:2760 scd/app-openpgp.c:2917
-#: scd/app-openpgp.c:5325
+#: scd/app-openpgp.c:2718 scd/app-openpgp.c:2761 scd/app-openpgp.c:2918
+#: scd/app-openpgp.c:5319
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "验� CHV%d 失败：%s\n"
 
-#: scd/app-openpgp.c:2804 scd/app-openpgp.c:5724
+#: scd/app-openpgp.c:2805 scd/app-openpgp.c:5718
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "�片被永久�定�\n"
 
-#: scd/app-openpgp.c:2808
+#: scd/app-openpgp.c:2809
 #, 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:2841
+#: scd/app-openpgp.c:2842
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr "未�置到管�员命令的访问\n"
 
-#: scd/app-openpgp.c:3355
+#: scd/app-openpgp.c:3356
 msgid "||Please enter the PIN"
 msgstr "||请输入 PIN"
 
-#: scd/app-openpgp.c:3404
+#: scd/app-openpgp.c:3405
 msgid "||Please enter the Reset Code for the card"
 msgstr "||请输入�片的�置�"
 
-#: scd/app-openpgp.c:3414 scd/app-openpgp.c:3481
+#: scd/app-openpgp.c:3415 scd/app-openpgp.c:3484
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "�置�太短；最�长度为 %d\n"
@@ -8072,78 +8081,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:3437
+#: scd/app-openpgp.c:3438
 msgid "|RN|New Reset Code"
 msgstr "|RN|新的�置�"
 
-#: scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3439
 msgid "|AN|New Admin PIN"
 msgstr "|AN|新的管�员 PIN"
 
-#: scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3439
 msgid "|N|New PIN"
 msgstr "|N|æ–°çš„ PIN"
 
-#: scd/app-openpgp.c:3541
+#: scd/app-openpgp.c:3543
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "||请输入原管�员 PIN 和新管�员 PIN"
 
-#: scd/app-openpgp.c:3542
+#: scd/app-openpgp.c:3544
 msgid "||Please enter the PIN and New PIN"
 msgstr "||请输入原 PIN 和新 PIN"
 
-#: scd/app-openpgp.c:3600 scd/app-openpgp.c:5026
+#: scd/app-openpgp.c:3602 scd/app-openpgp.c:5020
 #, c-format
 msgid "error reading application data\n"
 msgstr "读�应用程�数�时出错\n"
 
-#: scd/app-openpgp.c:3606 scd/app-openpgp.c:5033
+#: scd/app-openpgp.c:3608 scd/app-openpgp.c:5027
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "读�指纹 DO 时出现错误\n"
 
-#: scd/app-openpgp.c:4302 scd/app-openpgp.c:4657
+#: scd/app-openpgp.c:4304 scd/app-openpgp.c:4653
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "缺少创建时间戳\n"
 
-#: scd/app-openpgp.c:4343 scd/app-openpgp.c:4351
+#: scd/app-openpgp.c:4345 scd/app-openpgp.c:4353
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA 质数 %s 缺失或者�是 %d �长\n"
 
-#: scd/app-openpgp.c:4651
+#: scd/app-openpgp.c:4647
 #, c-format
 msgid "unsupported curve\n"
 msgstr "�支�的曲线\n"
 
-#: scd/app-openpgp.c:4991
+#: scd/app-openpgp.c:4985
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "无效的 OpenPGP �结构（DO 0x93）\n"
 
-#: scd/app-openpgp.c:5041
+#: scd/app-openpgp.c:5035
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr "�片上的指纹与请求的�匹�\n"
 
-#: scd/app-openpgp.c:5240
+#: scd/app-openpgp.c:5234
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "�片�支�摘�算法 %s\n"
 
-#: scd/app-openpgp.c:5298
+#: scd/app-openpgp.c:5292
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "目�已创建的签�：%lu\n"
 
-#: scd/app-openpgp.c:5729
+#: scd/app-openpgp.c:5723
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr "目��止通过此命令验�管�员 PIN\n"
 
-#: scd/app-openpgp.c:6241 scd/app-openpgp.c:6252
+#: scd/app-openpgp.c:6250 scd/app-openpgp.c:6261
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "�能访问 %s - 无效的 OpenPGP �？\n"
@@ -8163,7 +8172,7 @@ msgstr "|N|�始化新 PIN"
 msgid "run in multi server mode (foreground)"
 msgstr "正在以多�务器模��行（��）"
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:274 dirmngr/dirmngr.c:198
+#: scd/scdaemon.c:136 sm/gpgsm.c:274 dirmngr/dirmngr.c:199
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LEVEL|设置调试级别至 LEVEL"
 
@@ -8224,12 +8233,12 @@ msgstr ""
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr "请使用‘--daemon’选项以在���行此程�\n"
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2104
+#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2143
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "fd %d 的�柄已�动\n"
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2112
+#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2151
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "fd %d 的�柄已关闭\n"
@@ -8239,11 +8248,11 @@ msgstr "fd %d 的�柄已关闭\n"
 msgid "validation model requested by certificate: %s"
 msgstr "�书所请求的验�模型：%s"
 
-#: sm/certchain.c:199 sm/certchain.c:2172
+#: sm/certchain.c:199 sm/certchain.c:2174
 msgid "chain"
 msgstr "链"
 
-#: sm/certchain.c:200 sm/certchain.c:2172
+#: sm/certchain.c:200 sm/certchain.c:2174
 msgid "shell"
 msgstr "外壳"
 
@@ -8276,224 +8285,224 @@ msgstr "注�：�紧急认�策略�被�许"
 msgid "certificate policy not allowed"
 msgstr "�书策略�被�许"
 
-#: sm/certchain.c:595 sm/keydb.c:1891 sm/keydb.c:1980
+#: sm/certchain.c:596 sm/keydb.c:1913 sm/keydb.c:2002
 #, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "获�指纹失败\n"
 
-#: sm/certchain.c:624
+#: sm/certchain.c:625
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr "在外部�置查找签�者\n"
 
-#: sm/certchain.c:644
+#: sm/certchain.c:645
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "匹�的签�者数目：%d\n"
 
-#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#: sm/certchain.c:724 dirmngr/ocsp.c:683
 #, c-format
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "无法获� authorityInfoAccess：%s\n"
 
-#: sm/certchain.c:791
+#: sm/certchain.c:792
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr "在 Dirmngr 缓存中查找签�者\n"
 
-#: sm/certchain.c:816
+#: sm/certchain.c:817
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "匹�的�书数：%d\n"
 
-#: sm/certchain.c:819
+#: sm/certchain.c:820
 #, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "dirmngr 仅缓存的密钥查找失败：%s\n"
 
-#: sm/certchain.c:1046 sm/certchain.c:1561 sm/certchain.c:2200 sm/decrypt.c:643
-#: sm/encrypt.c:620 sm/import.c:414 sm/keydb.c:1898 sm/keydb.c:1987
-#: sm/sign.c:428 sm/verify.c:117
+#: sm/certchain.c:1047 sm/certchain.c:1562 sm/certchain.c:2202
+#: sm/decrypt.c:1084 sm/encrypt.c:621 sm/import.c:414 sm/keydb.c:1920
+#: sm/keydb.c:2009 sm/sign.c:428 sm/verify.c:117
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "分� keyDB �柄时失败\n"
 
-#: sm/certchain.c:1232
+#: sm/certchain.c:1233
 msgid "certificate has been revoked"
 msgstr "�书已被�销"
 
-#: sm/certchain.c:1247
+#: sm/certchain.c:1248
 msgid "the status of the certificate is unknown"
 msgstr "�书的状�未知"
 
-#: sm/certchain.c:1254
+#: sm/certchain.c:1255
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr "请确定“dirmngr�被正确安装\n"
 
-#: sm/certchain.c:1260
+#: sm/certchain.c:1261
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "检查 CRL 时失败：%s"
 
-#: sm/certchain.c:1289 sm/certchain.c:1357 dirmngr/validate.c:497
+#: sm/certchain.c:1290 sm/certchain.c:1358 dirmngr/validate.c:497
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "�书的有效期无效：%s"
 
-#: sm/certchain.c:1304 sm/certchain.c:1389 dirmngr/validate.c:515
+#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:515
 #, c-format
 msgid "certificate not yet valid"
 msgstr "�书尚未验�"
 
-#: sm/certchain.c:1305 sm/certchain.c:1390
+#: sm/certchain.c:1306 sm/certchain.c:1391
 msgid "root certificate not yet valid"
 msgstr "根�书尚未验�"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1307 sm/certchain.c:1392
 msgid "intermediate certificate not yet valid"
 msgstr "中间�书尚未验�"
 
-#: sm/certchain.c:1319 dirmngr/validate.c:526
+#: sm/certchain.c:1320 dirmngr/validate.c:526
 #, c-format
 msgid "certificate has expired"
 msgstr "�书已过期"
 
-#: sm/certchain.c:1320
+#: sm/certchain.c:1321
 msgid "root certificate has expired"
 msgstr "根�书已过期"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1322
 msgid "intermediate certificate has expired"
 msgstr "中间�书已过期"
 
-#: sm/certchain.c:1363
+#: sm/certchain.c:1364
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr "请求的�书属性缺失：%s%s%s"
 
-#: sm/certchain.c:1372
+#: sm/certchain.c:1373
 msgid "certificate with invalid validity"
 msgstr "�书有效期无效"
 
-#: sm/certchain.c:1409
+#: sm/certchain.c:1410
 msgid "signature not created during lifetime of certificate"
 msgstr "签��是在�书的有效期内被创建的"
 
-#: sm/certchain.c:1411
+#: sm/certchain.c:1412
 msgid "certificate not created during lifetime of issuer"
 msgstr "签��是在签�者的有效期内被创建的"
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1413
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr "中间�书�是在签�者的有效期内被创建的"
 
-#: sm/certchain.c:1416
+#: sm/certchain.c:1417
 #, c-format
 msgid "  (  signature created at "
 msgstr "  （  签�创建于 "
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1418
 #, c-format
 msgid "  (certificate created at "
 msgstr "  （�书创建于 "
 
-#: sm/certchain.c:1420
+#: sm/certchain.c:1421
 #, c-format
 msgid "  (certificate valid from "
 msgstr "  （�书有效期从 "
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1422
 #, c-format
 msgid "  (     issuer valid from "
 msgstr "  （    签�者有效期从 "
 
-#: sm/certchain.c:1451 dirmngr/validate.c:577
+#: sm/certchain.c:1452 dirmngr/validate.c:577
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "指纹 = %s\n"
 
-#: sm/certchain.c:1460
+#: sm/certchain.c:1461
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr "根�书现已被标记为信任\n"
 
-#: sm/certchain.c:1473
+#: sm/certchain.c:1474
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr "交互�标记为信任未在 gpg-agent 中开�\n"
 
-#: sm/certchain.c:1479
+#: sm/certchain.c:1480
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr "交互�标记为信任在此会�中被关闭\n"
 
-#: sm/certchain.c:1538
+#: sm/certchain.c:1539
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr "警告：签�的创建时间未知 - 猜测为当�时间"
 
-#: sm/certchain.c:1602
+#: sm/certchain.c:1603
 msgid "no issuer found in certificate"
 msgstr "�书中没有找到签�者"
 
-#: sm/certchain.c:1680
+#: sm/certchain.c:1681
 msgid "self-signed certificate has a BAD signature"
 msgstr "自签��书具有��的签�"
 
-#: sm/certchain.c:1749 dirmngr/validate.c:575
+#: sm/certchain.c:1750 dirmngr/validate.c:575
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "根�书未被标记为信任"
 
-#: sm/certchain.c:1765
+#: sm/certchain.c:1766
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "检查信任列表时失败：%s\n"
 
-#: sm/certchain.c:1796 sm/import.c:175 dirmngr/validate.c:630
+#: sm/certchain.c:1797 sm/import.c:175 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "�书链过长\n"
 
-#: sm/certchain.c:1808 dirmngr/validate.c:642
+#: sm/certchain.c:1809 dirmngr/validate.c:642
 #, c-format
 msgid "issuer certificate not found"
 msgstr "签�者�书未找到"
 
-#: sm/certchain.c:1842 dirmngr/validate.c:668
+#: sm/certchain.c:1844 dirmngr/validate.c:668
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr "�书具有��的签�"
 
-#: sm/certchain.c:1874 dirmngr/validate.c:692
+#: sm/certchain.c:1876 dirmngr/validate.c:692
 msgid "found another possible matching CA certificate - trying again"
 msgstr "找到�一个�能匹�的 CA �书 - 正在�试"
 
-#: sm/certchain.c:1933 dirmngr/validate.c:717
+#: sm/certchain.c:1935 dirmngr/validate.c:717
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "�书链长于 CA �许的长度（%d）"
 
-#: sm/certchain.c:1975 sm/certchain.c:2275 dirmngr/validate.c:747
+#: sm/certchain.c:1977 sm/certchain.c:2278 dirmngr/validate.c:747
 #, c-format
 msgid "certificate is good\n"
 msgstr "�书有效\n"
 
-#: sm/certchain.c:1976
+#: sm/certchain.c:1978
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "中间�书有效\n"
 
-#: sm/certchain.c:1977
+#: sm/certchain.c:1979
 #, c-format
 msgid "root certificate is good\n"
 msgstr "根�书良好\n"
 
-#: sm/certchain.c:2159
+#: sm/certchain.c:2161
 msgid "switching to chain model"
 msgstr "正在切�为链模型"
 
-#: sm/certchain.c:2168
+#: sm/certchain.c:2170
 #, c-format
 msgid "validation model used: %s"
 msgstr "使用的验�模型：%s"
@@ -8504,18 +8513,18 @@ 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:1372 dirmngr/validate.c:903
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1411 dirmngr/validate.c:903
 #: dirmngr/validate.c:927
 #, c-format
 msgid "out of core\n"
 msgstr "内存�足\n"
 
-#: sm/certcheck.c:389 sm/verify.c:212
+#: sm/certcheck.c:388 sm/verify.c:212
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "（这是 MD2 算法）\n"
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:793
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:794
 msgid "none"
 msgstr "none"
 
@@ -8800,17 +8809,17 @@ msgstr "就绪。您现在应该将此请求��给您的 CA。\n"
 msgid "resource problem: out of core\n"
 msgstr "资�问题：内存�足\n"
 
-#: sm/decrypt.c:719
+#: sm/decrypt.c:1159
 #, c-format
 msgid "(this is the RC2 algorithm)\n"
 msgstr "（此为 RC2 算法）\n"
 
-#: sm/decrypt.c:721
+#: sm/decrypt.c:1161
 #, c-format
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr "（这看起���是一�被加密的消�）\n"
 
-#: sm/decrypt.c:868
+#: sm/decrypt.c:1318
 #, c-format
 msgid "encrypted to %s key %s\n"
 msgstr "由 %s 密钥 %s 加密\n"
@@ -8820,7 +8829,7 @@ msgstr "由 %s 密钥 %s 加密\n"
 msgid "certificate '%s' not found: %s\n"
 msgstr "�书‘%s’未找到：%s\n"
 
-#: sm/delete.c:120 sm/keydb.c:1999 sm/keydb.c:2098
+#: sm/delete.c:120 sm/keydb.c:2021 sm/keydb.c:2120
 #, c-format
 msgid "error locking keybox: %s\n"
 msgstr "�定钥匙箱时出现错误：%s\n"
@@ -8840,7 +8849,7 @@ msgstr "�书‘%s’已被删除\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "删除�书 “%s� 时失败：%s\n"
 
-#: sm/encrypt.c:606
+#: sm/encrypt.c:607
 #, c-format
 msgid "no valid recipients given\n"
 msgstr "未指定有效的接收者\n"
@@ -8909,63 +8918,63 @@ msgstr "|USER-ID|使用 USER-ID 作为默认的�钥"
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|FILE|添加钥匙环到钥匙环列表"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:352 dirmngr/dirmngr.c:265
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|SPEC|使用此公钥�务器�查找密钥"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:363
 msgid "fetch missing issuer certificates"
 msgstr "获�缺失的签�者�书"
 
-#: sm/gpgsm.c:364
+#: sm/gpgsm.c:365
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NAME|对 PKCS#12 密�使用�为 NAME 的编�"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:386
 msgid "never consult a CRL"
 msgstr "从�查询 CRL"
 
-#: sm/gpgsm.c:389
+#: sm/gpgsm.c:390
 msgid "do not check CRLs for root certificates"
 msgstr "�对根�书检查 CRLs"
 
-#: sm/gpgsm.c:393
+#: sm/gpgsm.c:394
 msgid "check validity using OCSP"
 msgstr "使用 OCSP 检查有效性"
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:396
 msgid "do not check certificate policies"
 msgstr "�检查�书策略"
 
-#: sm/gpgsm.c:398
+#: sm/gpgsm.c:399
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|使用�称为 NAME 的密文算法"
 
-#: sm/gpgsm.c:400
+#: sm/gpgsm.c:401
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|使用以 NAME 命�的信�摘�算法"
 
-#: sm/gpgsm.c:410
+#: sm/gpgsm.c:411
 msgid "batch mode: never ask"
 msgstr "批处�模�：永�询问"
 
-#: sm/gpgsm.c:412
+#: sm/gpgsm.c:413
 msgid "assume yes on most questions"
 msgstr "在多数问题上�定回答为是"
 
-#: sm/gpgsm.c:413
+#: sm/gpgsm.c:414
 msgid "assume no on most questions"
 msgstr "在多数问题上�定回答为�"
 
-#: sm/gpgsm.c:430
+#: sm/gpgsm.c:431
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FILE|将审计日志写入 FILE"
 
-#: sm/gpgsm.c:615
+#: sm/gpgsm.c:616
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "用法：@GPGSM@ [选项] [文件] (-h 获�帮助)"
 
-#: sm/gpgsm.c:618
+#: sm/gpgsm.c:619
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -8975,52 +8984,27 @@ msgstr ""
 "使用 S/MIME �议以签��检查�加密或者解密\n"
 "默认�作�决于输入的数�\n"
 
-#: sm/gpgsm.c:826
+#: sm/gpgsm.c:827
 #, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "注�：将�加密给‘%s’：%s\n"
 
-#: sm/gpgsm.c:837
+#: sm/gpgsm.c:838
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "未知的验�模型‘%s’\n"
 
-#: sm/gpgsm.c:896 dirmngr/ldapserver.c:89
-#, c-format
-msgid "%s:%u: no hostname given\n"
-msgstr "%s:%u: 未指定主机�\n"
-
-#: sm/gpgsm.c:915 dirmngr/ldapserver.c:108
-#, c-format
-msgid "%s:%u: password given without user\n"
-msgstr "%s:%u: 给定密�但未给定用户\n"
-
-#: sm/gpgsm.c:946 dirmngr/ldapserver.c:139
-#, c-format
-msgid "%s:%u: ignoring unknown flag '%s'\n"
-msgstr "%s:%u：忽略未知的标志 ‘%s’\n"
-
-#: sm/gpgsm.c:962 dirmngr/ldapserver.c:155
-#, c-format
-msgid "%s:%u: skipping this line\n"
-msgstr "%s:%u: 正在跳过此行\n"
-
-#: sm/gpgsm.c:1550
-#, c-format
-msgid "could not parse keyserver\n"
-msgstr "无法解�公钥�务器\n"
-
-#: sm/gpgsm.c:1858
+#: sm/gpgsm.c:1711
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "正在导入通用�书‘%s’\n"
 
-#: sm/gpgsm.c:1904
+#: sm/gpgsm.c:1757
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "无法使用‘%s’签�：%s\n"
 
-#: sm/gpgsm.c:2273
+#: sm/gpgsm.c:2129
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "无效的命令（�存在��的命令）\n"
@@ -9040,52 +9024,52 @@ msgstr "存储�书时出现错误\n"
 msgid "basic certificate checks failed - not imported\n"
 msgstr "基本�书检查失败 - 未被导入\n"
 
-#: sm/import.c:471 sm/keydb.c:2018 sm/keydb.c:2111
+#: sm/import.c:472 sm/keydb.c:2040 sm/keydb.c:2133
 #, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "获�存储选项时出现错误：%s\n"
 
-#: sm/import.c:530 sm/import.c:562
+#: sm/import.c:531 sm/import.c:563
 #, c-format
 msgid "error importing certificate: %s\n"
 msgstr "导入�书时出现错误：%s\n"
 
-#: sm/import.c:751 tools/gpg-connect-agent.c:1475
+#: sm/import.c:752 tools/gpg-connect-agent.c:1475
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "读�输入时出现错误：%s\n"
 
-#: sm/keydb.c:503
+#: sm/keydb.c:508
 #, c-format
 msgid "no keyboxd running in this session\n"
 msgstr "此会�中没有正在�行的 keyboxd\n"
 
-#: sm/keydb.c:595
+#: sm/keydb.c:600
 #, c-format
 msgid "error opening key DB: %s\n"
 msgstr "打开密钥数�库时出现错误：%s\n"
 
-#: sm/keydb.c:1936
+#: sm/keydb.c:1958
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr "查找现存�书时出现问题：%s\n"
 
-#: sm/keydb.c:1948
+#: sm/keydb.c:1970
 #, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "寻找�写入的 keyDB 时出现错误：%s\n"
 
-#: sm/keydb.c:1956
+#: sm/keydb.c:1978
 #, c-format
 msgid "error storing certificate: %s\n"
 msgstr "存储�书时出现错误：%s\n"
 
-#: sm/keydb.c:2009
+#: sm/keydb.c:2031
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "�新�索�书时出现问题：%s\n"
 
-#: sm/keydb.c:2030 sm/keydb.c:2122
+#: sm/keydb.c:2052 sm/keydb.c:2144
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr "存储选项时出现错误：%s\n"
@@ -9262,57 +9246,57 @@ msgstr "  主题 ="
 msgid "error loading certificate '%s': %s\n"
 msgstr "加载�书‘%s’时出现错误：%s\n"
 
-#: dirmngr/certcache.c:819
+#: dirmngr/certcache.c:820
 #, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "永久载入的�书： %u\n"
 
-#: dirmngr/certcache.c:821
+#: dirmngr/certcache.c:822
 #, c-format
 msgid "    runtime cached certificates: %u\n"
 msgstr "    �行时缓存的�书： %u\n"
 
-#: dirmngr/certcache.c:823
+#: dirmngr/certcache.c:824
 #, c-format
 msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "           信任的�书： %u (%u,%u,%u,%u)\n"
 
-#: dirmngr/certcache.c:851 dirmngr/dirmngr-client.c:392
+#: dirmngr/certcache.c:852 dirmngr/dirmngr-client.c:392
 #, c-format
 msgid "certificate already cached\n"
 msgstr "�书已被缓存。\n"
 
-#: dirmngr/certcache.c:853
+#: dirmngr/certcache.c:854
 #, c-format
 msgid "certificate cached\n"
 msgstr "�书已缓存\n"
 
-#: dirmngr/certcache.c:855 dirmngr/certcache.c:875 dirmngr/dirmngr-client.c:396
+#: dirmngr/certcache.c:856 dirmngr/certcache.c:876 dirmngr/dirmngr-client.c:396
 #, c-format
 msgid "error caching certificate: %s\n"
 msgstr "缓存�书时出现错误：%s\n"
 
-#: dirmngr/certcache.c:938
+#: dirmngr/certcache.c:939
 #, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "无效的 SHA1 指纹字串 '%s'\n"
 
-#: dirmngr/certcache.c:1384 dirmngr/certcache.c:1393
+#: dirmngr/certcache.c:1385 dirmngr/certcache.c:1394
 #, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "通过 S/N 获��书时出现错误：%s\n"
 
-#: dirmngr/certcache.c:1579 dirmngr/certcache.c:1588
+#: dirmngr/certcache.c:1580 dirmngr/certcache.c:1589
 #, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "通过主题获��书时出现错误：%s\n"
 
-#: dirmngr/certcache.c:1694 dirmngr/validate.c:483
+#: dirmngr/certcache.c:1695 dirmngr/validate.c:483
 #, c-format
 msgid "no issuer found in certificate\n"
 msgstr "没有找到�书的签�者\n"
 
-#: dirmngr/certcache.c:1704
+#: dirmngr/certcache.c:1705
 #, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "获� authorityKeyIdentifier 时出现错误：%s\n"
@@ -9347,7 +9331,7 @@ msgstr "正在移除缓存文件‘%s’\n"
 msgid "not removing file '%s'\n"
 msgstr "未能移除文件‘%s’\n"
 
-#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2380
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2383
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr "关闭缓存文件时出现错误：%s\n"
@@ -9584,13 +9568,13 @@ msgid "error getting data from cache file: %s\n"
 msgstr "从缓存文件中获�数�时出现错误：%s\n"
 
 #: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1672 dirmngr/crlcache.c:1697
-#: dirmngr/crlcache.c:1763
+#: dirmngr/crlcache.c:1766
 #, c-format
 msgid "got an invalid S-expression from libksba\n"
 msgstr "从  libksba 获得了无效的 S 表达�\n"
 
 #: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1679 dirmngr/crlcache.c:1705
-#: dirmngr/crlcache.c:1770 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1773 dirmngr/misc.c:176
 #, c-format
 msgid "converting S-expression failed: %s\n"
 msgstr "转� S 表达�时失败：%s\n"
@@ -9605,197 +9589,197 @@ msgstr "未知的散列算法‘%s’\n"
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr "算法 %d 的 gcry_md_open 方法失败：%s\n"
 
-#: dirmngr/crlcache.c:1797 dirmngr/ocsp.c:478
+#: dirmngr/crlcache.c:1800 dirmngr/ocsp.c:478
 #, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "创建 S 表达�时失败：%s\n"
 
-#: dirmngr/crlcache.c:1871
+#: dirmngr/crlcache.c:1874
 #, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "ksba_crl_parse 方法失败：%s\n"
 
-#: dirmngr/crlcache.c:1886
+#: dirmngr/crlcache.c:1889
 #, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "从 CRL 获�更新次数时出现错误：%s\n"
 
-#: dirmngr/crlcache.c:1893
+#: dirmngr/crlcache.c:1896
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr "此 CRL 的更新时间：本次=%s 下次=%s\n"
 
-#: dirmngr/crlcache.c:1897
+#: dirmngr/crlcache.c:1900
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr "nextUpdate �数未被指定；�设有效期为一天\n"
 
-#: dirmngr/crlcache.c:1917
+#: dirmngr/crlcache.c:1920
 #, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "获� CRL 项目时出现错误：%s\n"
 
-#: dirmngr/crlcache.c:1932
+#: dirmngr/crlcache.c:1935
 #, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "�临时缓存文件中�入项目时出现错误：%s\n"
 
-#: dirmngr/crlcache.c:1959
+#: dirmngr/crlcache.c:1962
 #, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "没有在 CRL 中找到 CRL 签�者： %s\n"
 
-#: dirmngr/crlcache.c:1974
+#: dirmngr/crlcache.c:1977
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr "正在通过 authorityKeyIdentifier 定� CRL 签�者\n"
 
-#: dirmngr/crlcache.c:2020
+#: dirmngr/crlcache.c:2023
 #, c-format
 msgid "CRL signature verification failed: %s\n"
 msgstr "CRL 签�验�失败：%s\n"
 
-#: dirmngr/crlcache.c:2032
+#: dirmngr/crlcache.c:2035
 #, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "检查 CRL 签署者�书的有效性时出现错误：%s\n"
 
-#: dirmngr/crlcache.c:2174
+#: dirmngr/crlcache.c:2177
 #, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "ksba_crl_new 方法失败：%s\n"
 
-#: dirmngr/crlcache.c:2181
+#: dirmngr/crlcache.c:2184
 #, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "ksba_crl_set_reader 方法失败：%s\n"
 
-#: dirmngr/crlcache.c:2215
+#: dirmngr/crlcache.c:2218
 #, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "移除过期的缓存文件‘%s’\n"
 
-#: dirmngr/crlcache.c:2219
+#: dirmngr/crlcache.c:2222
 #, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "移除过期的缓存文件‘%s’时出现问题：%s\n"
 
-#: dirmngr/crlcache.c:2229
+#: dirmngr/crlcache.c:2232
 #, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "创建临时缓存文件‘%s’时出现错误：%s\n"
 
-#: dirmngr/crlcache.c:2239
+#: dirmngr/crlcache.c:2242
 #, c-format
 msgid "crl_parse_insert failed: %s\n"
 msgstr "crl_parse_insert 方法失败：%s\n"
 
-#: dirmngr/crlcache.c:2249
+#: dirmngr/crlcache.c:2252
 #, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "完�临时缓存文件时出现错误‘%s’：%s\n"
 
-#: dirmngr/crlcache.c:2256
+#: dirmngr/crlcache.c:2259
 #, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "关闭临时缓存文件时出现错误‘%s’：%s\n"
 
-#: dirmngr/crlcache.c:2281
+#: dirmngr/crlcache.c:2284
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr "警告：新的 CRL �然太旧；其已在 %s 过期 - 无论如何先加载\n"
 
-#: dirmngr/crlcache.c:2285
+#: dirmngr/crlcache.c:2288
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr "新的 CRL �然太旧；其已在 %s 过期\n"
 
-#: dirmngr/crlcache.c:2301
+#: dirmngr/crlcache.c:2304
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr "未知的紧急 CRL 扩展 %s\n"
 
-#: dirmngr/crlcache.c:2311
+#: dirmngr/crlcache.c:2314
 #, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "读� CRL 扩展时出现错误：%s\n"
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2365
 #, c-format
 msgid "creating cache file '%s'\n"
 msgstr "正在创建缓存文件‘%s’\n"
 
-#: dirmngr/crlcache.c:2394
+#: dirmngr/crlcache.c:2397
 #, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "将‘%s’�命�为‘%s’时出现问题：%s\n"
 
-#: dirmngr/crlcache.c:2408
+#: dirmngr/crlcache.c:2411
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
 "program start\n"
 msgstr "更新 DIR 文件时失败 - 缓存�目将会在下次程��动时丢失\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2448
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr "开始 CRL 导出（已通过 %s �回）\n"
 
-#: dirmngr/crlcache.c:2468
+#: dirmngr/crlcache.c:2471
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 msgstr " 错误：此 CRL 将�会被使用，因为它在一次更新之��然太旧�\n"
 
-#: dirmngr/crlcache.c:2471
+#: dirmngr/crlcache.c:2474
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr " 错误：此 CRL 将�会被使用，因为一个未知的紧急扩展�\n"
 
-#: dirmngr/crlcache.c:2474
+#: dirmngr/crlcache.c:2477
 msgid " ERROR: The CRL will not be used\n"
 msgstr " 错误：此 CRL 将�会被使用\n"
 
-#: dirmngr/crlcache.c:2481
+#: dirmngr/crlcache.c:2484
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr " 错误：此缓存的 CRL �能已�被篡改�\n"
 
-#: dirmngr/crlcache.c:2499
+#: dirmngr/crlcache.c:2502
 #, c-format
 msgid " WARNING: invalid cache record length\n"
 msgstr " 警告： 无效的缓存记录长度\n"
 
-#: dirmngr/crlcache.c:2506
+#: dirmngr/crlcache.c:2509
 #, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "读�缓存记录时出现问题：%s\n"
 
-#: dirmngr/crlcache.c:2517
+#: dirmngr/crlcache.c:2520
 #, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "读�缓存的密钥时出现问题：%s\n"
 
-#: dirmngr/crlcache.c:2548
+#: dirmngr/crlcache.c:2551
 #, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "从数�库读�缓存项目时出现错误：%s\n"
 
-#: dirmngr/crlcache.c:2551
+#: dirmngr/crlcache.c:2554
 msgid "End CRL dump\n"
 msgstr "结� CRL 导出\n"
 
-#: dirmngr/crlcache.c:2672
+#: dirmngr/crlcache.c:2675
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "通过 DP 的 crl_fetch 方法失败：%s\n"
 
-#: dirmngr/crlcache.c:2683
+#: dirmngr/crlcache.c:2686
 #, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "通过 DP 进行 crl_cache_insert 失败：%s\n"
 
-#: dirmngr/crlcache.c:2743
+#: dirmngr/crlcache.c:2746
 #, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "通过�布者进行 crl_cache_insert 失败：%s\n"
@@ -9816,7 +9800,7 @@ msgstr "�能进行 CRL 访问，因为 %s 已�用\n"
 msgid "error retrieving '%s': %s\n"
 msgstr "拉�‘%s’时出现错误：%s\n"
 
-#: dirmngr/crlfetch.c:218 dirmngr/ldap-wrapper.c:881 dirmngr/misc.c:573
+#: dirmngr/crlfetch.c:218 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
 #, c-format
 msgid "error initializing reader object: %s\n"
 msgstr "�始化读�对象时出现错误：%s\n"
@@ -9972,131 +9956,131 @@ msgstr "需��对文件�\n"
 msgid "looking up '%s'\n"
 msgstr "正在查找‘%s’\n"
 
-#: dirmngr/dirmngr.c:175
+#: dirmngr/dirmngr.c:176
 msgid "list the contents of the CRL cache"
 msgstr "列出 CRL 缓存的内容"
 
-#: dirmngr/dirmngr.c:176
+#: dirmngr/dirmngr.c:177
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|FILE|从 FILE 中加载 CRL 到缓存"
 
-#: dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr.c:178
 msgid "|URL|fetch a CRL from URL"
 msgstr "|URL|从 URL 处获� CRL"
 
-#: dirmngr/dirmngr.c:178
+#: dirmngr/dirmngr.c:179
 msgid "shutdown the dirmngr"
 msgstr "关闭 dirmngr"
 
-#: dirmngr/dirmngr.c:179
+#: dirmngr/dirmngr.c:180
 msgid "flush the cache"
 msgstr "刷新缓存"
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:213
 msgid "allow online software version check"
 msgstr "�许在线软件版本检查"
 
-#: dirmngr/dirmngr.c:215
+#: dirmngr/dirmngr.c:216
 msgid "|N|do not return more than N items in one query"
 msgstr "|N|在一次查询中最多返回 N 个项目"
 
-#: dirmngr/dirmngr.c:221
+#: dirmngr/dirmngr.c:222
 msgid "Network related options"
 msgstr "网络相关选项"
 
-#: dirmngr/dirmngr.c:223
+#: dirmngr/dirmngr.c:224
 msgid "route all network traffic via Tor"
 msgstr "通过 Tor 转�所有网络��"
 
-#: dirmngr/dirmngr.c:235
+#: dirmngr/dirmngr.c:236
 msgid "Configuration for Keyservers"
 msgstr "公钥�务器的�置"
 
-#: dirmngr/dirmngr.c:238
+#: dirmngr/dirmngr.c:239
 msgid "|URL|use keyserver at URL"
 msgstr "|URL|使用 URL 处的密钥�务器"
 
-#: dirmngr/dirmngr.c:240
+#: dirmngr/dirmngr.c:241
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr "|FILE|为承载 HKP 的 TLS 使用 FILE 中的 CA �书"
 
-#: dirmngr/dirmngr.c:242
+#: dirmngr/dirmngr.c:243
 msgid "Configuration for HTTP servers"
 msgstr "对 HTTP �务器的�置"
 
-#: dirmngr/dirmngr.c:244
+#: dirmngr/dirmngr.c:245
 msgid "inhibit the use of HTTP"
-msgstr "抑制 HTTP 的使用"
+msgstr "�止使用 HTTP �议"
 
-#: dirmngr/dirmngr.c:246
+#: dirmngr/dirmngr.c:247
 msgid "ignore HTTP CRL distribution points"
 msgstr "忽略 HTTP CRL 分�点"
 
-#: dirmngr/dirmngr.c:248
+#: dirmngr/dirmngr.c:249
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr "|URL|�定� HTTP 请求到 URL"
 
-#: dirmngr/dirmngr.c:250
+#: dirmngr/dirmngr.c:251
 msgid "use system's HTTP proxy setting"
 msgstr "使用系统的 HTTP 代�设置"
 
-#: dirmngr/dirmngr.c:254
+#: dirmngr/dirmngr.c:255
 msgid "Configuration of LDAP servers to use"
 msgstr "对�使用的 LDAP �务器的�置"
 
-#: dirmngr/dirmngr.c:256
+#: dirmngr/dirmngr.c:257
 msgid "inhibit the use of LDAP"
-msgstr "抑制 LDAP 的使用"
+msgstr "�止 LDAP 的使用"
 
-#: dirmngr/dirmngr.c:258
+#: dirmngr/dirmngr.c:259
 msgid "ignore LDAP CRL distribution points"
 msgstr "忽略 LDAP CRL 分�点"
 
-#: dirmngr/dirmngr.c:260
+#: dirmngr/dirmngr.c:261
 msgid "|HOST|use HOST for LDAP queries"
 msgstr "|HOST|使用 HOST 进行 LDAP 查询"
 
-#: dirmngr/dirmngr.c:262
+#: dirmngr/dirmngr.c:263
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr "使用 --ldap-proxy 选项以�使用回退主机"
 
-#: dirmngr/dirmngr.c:264
+#: dirmngr/dirmngr.c:267
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FILE|从 FILE 中读� LDAP �务器列表"
 
-#: dirmngr/dirmngr.c:266
+#: dirmngr/dirmngr.c:269
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr "添加从 CRL 分�点�现的新�务器到�务器列表"
 
-#: dirmngr/dirmngr.c:269 dirmngr/dirmngr_ldap.c:104
+#: dirmngr/dirmngr.c:272
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|设置 LDAP 超时时间为 N 秒"
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:275
 msgid "Configuration for OCSP"
 msgstr "对于 OCSP 的�置"
 
-#: dirmngr/dirmngr.c:274
+#: dirmngr/dirmngr.c:277
 msgid "allow sending OCSP requests"
 msgstr "�许�� OCSP 请求"
 
-#: dirmngr/dirmngr.c:276
+#: dirmngr/dirmngr.c:279
 msgid "ignore certificate contained OCSP service URLs"
 msgstr "忽略�书包�的 OCSP �务 URLs"
 
-#: dirmngr/dirmngr.c:278
+#: dirmngr/dirmngr.c:281
 msgid "|URL|use OCSP responder at URL"
 msgstr "|URL|使用 URL 处的 OCSP �应者"
 
-#: dirmngr/dirmngr.c:280
+#: dirmngr/dirmngr.c:283
 msgid "|FPR|OCSP response signed by FPR"
 msgstr "|FPR|OCSP �应由 FPR 签�"
 
-#: dirmngr/dirmngr.c:288
+#: dirmngr/dirmngr.c:291
 msgid "force loading of outdated CRLs"
 msgstr "强制载入过期的 CRLs"
 
-#: dirmngr/dirmngr.c:299
+#: dirmngr/dirmngr.c:302
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
@@ -10105,11 +10089,11 @@ msgstr ""
 "@\n"
 "(�阅 \"info\" 手册以获�一份所有命令�选项的完整列表)\n"
 
-#: dirmngr/dirmngr.c:441
+#: dirmngr/dirmngr.c:449
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "用法：@DIRMNGR@ [选项] (-h 获�帮助)"
 
-#: dirmngr/dirmngr.c:443
+#: dirmngr/dirmngr.c:451
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@ -10117,283 +10101,103 @@ msgstr ""
 "语法：@DIRMNGR@ [选项] [命令 [�数]]\n"
 "@GNUPG@ 的公钥�务器�CRL 和 OCSP 访问\n"
 
-#: dirmngr/dirmngr.c:523
+#: dirmngr/dirmngr.c:531
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr "有效的调试等级为：%s\n"
 
-#: dirmngr/dirmngr.c:609 tools/gpgconf.c:667 tools/gpgconf.c:702
-#: tools/gpgconf.c:802
+#: dirmngr/dirmngr.c:617 tools/gpgconf.c:701 tools/gpgconf.c:736
+#: tools/gpgconf.c:836
 #, c-format
 msgid "usage: %s [options] "
 msgstr "用法：%s [选项] "
 
-#: dirmngr/dirmngr.c:1260
+#: dirmngr/dirmngr.c:1299
 #, c-format
 msgid "colons are not allowed in the socket name\n"
 msgstr "套接字�称中��许使用冒�\n"
 
-#: dirmngr/dirmngr.c:1495 dirmngr/server.c:1824
+#: dirmngr/dirmngr.c:1534 dirmngr/server.c:1878
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "从‘%s’处获� CRL 时失败：%s\n"
 
-#: dirmngr/dirmngr.c:1501 dirmngr/server.c:1830
+#: dirmngr/dirmngr.c:1540 dirmngr/server.c:1884
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "从‘%s’处处� CRL 时失败：%s\n"
 
-#: dirmngr/dirmngr.c:1643
+#: dirmngr/dirmngr.c:1682
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: 行太长 - 跳过\n"
 
-#: dirmngr/dirmngr.c:1698 dirmngr/dirmngr.c:1782
+#: dirmngr/dirmngr.c:1737 dirmngr/dirmngr.c:1821
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: 检测到无效指纹\n"
 
-#: dirmngr/dirmngr.c:1734 dirmngr/dirmngr.c:1760 tools/gpgconf-comp.c:3539
+#: dirmngr/dirmngr.c:1773 dirmngr/dirmngr.c:1799 tools/gpgconf-comp.c:3549
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: 读�错误：%s\n"
 
-#: dirmngr/dirmngr.c:1789
+#: dirmngr/dirmngr.c:1828
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr "%s:%u: 已忽略行尾部的垃圾数�\n"
 
-#: dirmngr/dirmngr.c:1876
+#: dirmngr/dirmngr.c:1915
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr "接收到 SIGHUP 信� -正在�新读��置文件并刷新缓存\n"
 
-#: dirmngr/dirmngr.c:1917
+#: dirmngr/dirmngr.c:1956
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "接收到 SIGUSR2 信� - 未定义�进行的�作\n"
 
-#: dirmngr/dirmngr.c:1922
+#: dirmngr/dirmngr.c:1961
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "接收到 SIGTERM 信� - 正在关闭...\n"
 
-#: dirmngr/dirmngr.c:1924
+#: dirmngr/dirmngr.c:1963
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "接收到 SIGTERM 信� - �然有 %d 个活动的连接\n"
 
-#: dirmngr/dirmngr.c:1929
+#: dirmngr/dirmngr.c:1968
 #, c-format
 msgid "shutdown forced\n"
 msgstr "强制关闭\n"
 
-#: dirmngr/dirmngr.c:1937
+#: dirmngr/dirmngr.c:1976
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "收到 SIGINT 信� - 立�关闭\n"
 
-#: dirmngr/dirmngr.c:1944
+#: dirmngr/dirmngr.c:1983
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "收到 %d 信� - 未定义�进行的�作\n"
 
-#: dirmngr/dirmngr_ldap.c:105
-msgid "return all values in a record oriented format"
-msgstr "以记录导�的格�返回所有值"
-
-#: dirmngr/dirmngr_ldap.c:108
-msgid "|NAME|ignore host part and connect through NAME"
-msgstr "|NAME|忽略主机部分并通过 NAME 进行连接"
-
-#: dirmngr/dirmngr_ldap.c:109
-msgid "force a TLS connection"
-msgstr "强制 TLS 连接"
-
-#: dirmngr/dirmngr_ldap.c:110
-msgid "|NAME|connect to host NAME"
-msgstr "|NAME|连接到以 NAME 命�的主机"
-
-#: dirmngr/dirmngr_ldap.c:111
-msgid "|N|connect to port N"
-msgstr "|N|连接到端� N"
-
-#: dirmngr/dirmngr_ldap.c:112
-msgid "|NAME|use user NAME for authentication"
-msgstr "|NAME|使用用户�称 NAME 进行身份验�"
-
-#: dirmngr/dirmngr_ldap.c:113
-msgid "|PASS|use password PASS for authentication"
-msgstr "|PASS|使用密� PASS 进行身份验�"
-
-#: dirmngr/dirmngr_ldap.c:115
-msgid "take password from $DIRMNGR_LDAP_PASS"
-msgstr "从 $DIRMNGR_LDAP_PASS �得密�"
-
-#: dirmngr/dirmngr_ldap.c:116
-msgid "|STRING|query DN STRING"
-msgstr "|STRING|查询 DN STRING"
-
-#: dirmngr/dirmngr_ldap.c:117
-msgid "|STRING|use STRING as filter expression"
-msgstr "|STRING|使用 STRING 作为过滤器扩展"
-
-#: dirmngr/dirmngr_ldap.c:118
-msgid "|STRING|return the attribute STRING"
-msgstr "|STRING|返回属性 STRING"
-
-#: dirmngr/dirmngr_ldap.c:179
-msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
-msgstr "用法： dirmngr_ldap [选项] [URL链接] （-h 获�帮助）\n"
-
-#: dirmngr/dirmngr_ldap.c:182
-msgid ""
-"Syntax: dirmngr_ldap [options] [URL]\n"
-"Internal LDAP helper for Dirmngr\n"
-"Interface and options may change without notice\n"
-msgstr ""
-"语法：dirmngr_ldap [选项] [URL链接]\n"
-"Dirmngr 的内部 LDAP 助手\n"
-"接�和选项�能在没有通知的情况下改�\n"
-
-#: dirmngr/dirmngr_ldap.c:291
-#, c-format
-msgid "invalid port number %d\n"
-msgstr "无效的端�� %d\n"
-
-#: dirmngr/dirmngr_ldap.c:400
-#, c-format
-msgid "scanning result for attribute '%s'\n"
-msgstr "为属性‘%s’�索结果\n"
-
-#: dirmngr/dirmngr_ldap.c:407 dirmngr/dirmngr_ldap.c:490
-#: dirmngr/dirmngr_ldap.c:514 dirmngr/dirmngr_ldap.c:526
-#: dirmngr/dirmngr_ldap.c:722
-#, c-format
-msgid "error writing to stdout: %s\n"
-msgstr "写入到标准输出（stdout）时出现错误：%s\n"
-
-#: dirmngr/dirmngr_ldap.c:424
-#, c-format
-msgid "          available attribute '%s'\n"
-msgstr "          �用属性‘%s’\n"
-
-#: dirmngr/dirmngr_ldap.c:462
-#, c-format
-msgid "attribute '%s' not found\n"
-msgstr "属性‘%s’未找到\n"
-
-#: dirmngr/dirmngr_ldap.c:469
-#, c-format
-msgid "found attribute '%s'\n"
-msgstr "找到属性‘%s’\n"
-
-#: dirmngr/dirmngr_ldap.c:581
-#, c-format
-msgid "processing url '%s'\n"
-msgstr "正在处� URL ‘%s’\n"
-
-#: dirmngr/dirmngr_ldap.c:588
-#, c-format
-msgid "          user '%s'\n"
-msgstr "          用户‘%s’\n"
-
-#: dirmngr/dirmngr_ldap.c:590
-#, c-format
-msgid "          pass '%s'\n"
-msgstr "          密�‘%s’\n"
-
-#: dirmngr/dirmngr_ldap.c:592
-#, c-format
-msgid "          host '%s'\n"
-msgstr "          主机‘%s’\n"
-
-#: dirmngr/dirmngr_ldap.c:593
-#, c-format
-msgid "          port %d\n"
-msgstr "          端� %d\n"
-
-#: dirmngr/dirmngr_ldap.c:595
-#, c-format
-msgid "            DN '%s'\n"
-msgstr "            DN ‘%s’\n"
-
-#: dirmngr/dirmngr_ldap.c:597
-#, c-format
-msgid "        filter '%s'\n"
-msgstr "        过滤器 ‘%s’\n"
-
-#: dirmngr/dirmngr_ldap.c:602 dirmngr/dirmngr_ldap.c:605
-#, c-format
-msgid "          attr '%s'\n"
-msgstr "          属性 ‘%s’\n"
-
-#: dirmngr/dirmngr_ldap.c:611
-#, c-format
-msgid "no host name in '%s'\n"
-msgstr "‘%s’中没有主机�\n"
-
-#: dirmngr/dirmngr_ldap.c:616
-#, c-format
-msgid "no attribute given for query '%s'\n"
-msgstr "未指定查询‘%s’的属性\n"
-
-#: dirmngr/dirmngr_ldap.c:622
-#, c-format
-msgid "WARNING: using first attribute only\n"
-msgstr "警告：仅使用第一个属性\n"
-
-#: dirmngr/dirmngr_ldap.c:637 dirmngr/dirmngr_ldap.c:678
-#, c-format
-msgid "LDAP init to '%s:%d' failed: %s\n"
-msgstr "LDAP �始化至 ‘%s:%d’ 时失败：%s\n"
-
-#: dirmngr/dirmngr_ldap.c:659
-#, c-format
-msgid "LDAP init to '%s' failed: %s\n"
-msgstr "LDAP �始化至 ‘%s’ 失败：%s\n"
-
-#: dirmngr/dirmngr_ldap.c:665
-#, c-format
-msgid "LDAP init to '%s' done\n"
-msgstr "LDAP �始化至 ‘%s’ 完�\n"
-
-#: dirmngr/dirmngr_ldap.c:704
-#, c-format
-msgid "binding to '%s:%d' failed: %s\n"
-msgstr "绑定至‘%s:%d’时失败：%s\n"
-
-#: dirmngr/dirmngr_ldap.c:728
-#, c-format
-msgid "searching '%s' failed: %s\n"
-msgstr "�索‘%s’时失败：%s\n"
-
-#: dirmngr/dirmngr_ldap.c:759
-#, c-format
-msgid "'%s' is not an LDAP URL\n"
-msgstr "‘%s’�是一个 LDAP URL\n"
-
-#: dirmngr/dirmngr_ldap.c:765
-#, c-format
-msgid "'%s' is an invalid LDAP URL\n"
-msgstr "‘%s’是一个无效的 LDAP URL\n"
-
-#: dirmngr/http.c:1989 dirmngr/ocsp.c:255
+#: dirmngr/http.c:1998 dirmngr/ocsp.c:255
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "访问‘%s’时出现错误：http 状�� %u\n"
 
-#: dirmngr/http.c:3630 dirmngr/ocsp.c:229
+#: dirmngr/http.c:3652 dirmngr/ocsp.c:229
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr "URL '%s' �定�到 '%s' (%u)\n"
 
-#: dirmngr/http.c:3636 dirmngr/ocsp.c:246
+#: dirmngr/http.c:3658 dirmngr/ocsp.c:246
 #, c-format
 msgid "too many redirections\n"
 msgstr "过多�定�\n"
 
-#: dirmngr/http.c:3748
+#: dirmngr/http.c:3768
 #, c-format
 msgid "redirection changed to '%s'\n"
 msgstr "�定�更改到 “%s�\n"
@@ -10433,31 +10237,51 @@ msgstr "等待 ldap wrapper %d 时失败：%s\n"
 msgid "ldap wrapper %d stalled - killing\n"
 msgstr "ldap wrapper %d 已挂起 - 正在关闭\n"
 
-#: dirmngr/ldap.c:91
+#: dirmngr/ldap.c:92
 #, c-format
 msgid "invalid char 0x%02x in host name - not added\n"
 msgstr "主机�中存在无效字符 0x%02x - 未被添加\n"
 
-#: dirmngr/ldap.c:95
+#: dirmngr/ldap.c:96
 #, c-format
 msgid "adding '%s:%d' to the ldap server list\n"
 msgstr "正在将‘%s:%d’添加至 ldap �务器列表\n"
 
-#: dirmngr/ldap.c:98 dirmngr/misc.c:512
+#: dirmngr/ldap.c:99 dirmngr/misc.c:512
 #, c-format
 msgid "malloc failed: %s\n"
 msgstr "malloc 方法失败：%s\n"
 
-#: dirmngr/ldap.c:634
+#: dirmngr/ldap.c:221
+#, c-format
+msgid "'%s' is not an LDAP URL\n"
+msgstr "‘%s’�是一个 LDAP URL\n"
+
+#: dirmngr/ldap.c:227 dirmngr/ldap.c:233
 #, c-format
-msgid "start_cert_fetch: invalid pattern '%s'\n"
-msgstr "start_cert_fetch：无效的模�‘%s’\n"
+msgid "'%s' is an invalid LDAP URL\n"
+msgstr "‘%s’是一个无效的 LDAP URL\n"
 
-#: dirmngr/ldap.c:846
+#: dirmngr/ldap.c:968
 #, c-format
 msgid "ldap_search hit the size limit of the server\n"
 msgstr "ldap_search 方法触��务器的大��制\n"
 
+#: dirmngr/ldapserver.c:119
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr "%s:%u: 给定密�但未给定用户\n"
+
+#: dirmngr/ldapserver.c:181
+#, c-format
+msgid "%s:%u: ignoring unknown flag '%s'\n"
+msgstr "%s:%u：忽略未知的标志 ‘%s’\n"
+
+#: dirmngr/ldapserver.c:203
+#, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr "%s:%u: 正在跳过此行\n"
+
 #: dirmngr/misc.c:172
 #, c-format
 msgid "invalid canonical S-expression found\n"
@@ -10548,86 +10372,86 @@ msgstr "并�由一个默认的 OCSP 签�者的�书签�"
 msgid "allocating list item failed: %s\n"
 msgstr "分�列表项时失败：%s\n"
 
-#: dirmngr/ocsp.c:537 dirmngr/ocsp.c:724
+#: dirmngr/ocsp.c:538 dirmngr/ocsp.c:725
 #, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "获��应者 ID 时出现错误：%s\n"
 
-#: dirmngr/ocsp.c:584
+#: dirmngr/ocsp.c:585
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr "未找到�适的�书�验� OCSP 请求\n"
 
-#: dirmngr/ocsp.c:623 dirmngr/validate.c:648
+#: dirmngr/ocsp.c:624 dirmngr/validate.c:648
 #, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "未找到签�者�书：%s\n"
 
-#: dirmngr/ocsp.c:633
+#: dirmngr/ocsp.c:634
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr "调用者没有返回目标�书\n"
 
-#: dirmngr/ocsp.c:640
+#: dirmngr/ocsp.c:641
 #, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "调用者没有返回签�的�书\n"
 
-#: dirmngr/ocsp.c:650
+#: dirmngr/ocsp.c:651
 #, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "分� OCSP 上下文时失败：%s\n"
 
-#: dirmngr/ocsp.c:689
+#: dirmngr/ocsp.c:690
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr "未定义默认的 OCSP �应者\n"
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:696
 #, c-format
 msgid "no default OCSP signer defined\n"
 msgstr "未定义默认的 OCSP 签�者\n"
 
-#: dirmngr/ocsp.c:702
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr "正在使用默认的 OCSP �应者‘%s’\n"
 
-#: dirmngr/ocsp.c:707
+#: dirmngr/ocsp.c:708
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "正在使用 OCSP �应者‘%s’\n"
 
-#: dirmngr/ocsp.c:764
+#: dirmngr/ocsp.c:765
 #, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "获�目标�书的 OCSP 状�时出现错误：%s\n"
 
-#: dirmngr/ocsp.c:789
+#: dirmngr/ocsp.c:790
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr "�书状�：%s  (当�=%s  下一个=%s)\n"
 
-#: dirmngr/ocsp.c:790
+#: dirmngr/ocsp.c:791
 msgid "good"
 msgstr "良好"
 
-#: dirmngr/ocsp.c:796
+#: dirmngr/ocsp.c:797
 #, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "�书已�被�销于： %s 原因是： %s\n"
 
-#: dirmngr/ocsp.c:831
+#: dirmngr/ocsp.c:832
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr "OCSP �应者返回了将�的状�\n"
 
-#: dirmngr/ocsp.c:843
+#: dirmngr/ocsp.c:844
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr "OCSP �应者返回了一个�当�的状�\n"
 
-#: dirmngr/ocsp.c:858
+#: dirmngr/ocsp.c:859
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr "OCSP 返回了一个太以�的状�\n"
@@ -10637,71 +10461,67 @@ msgstr "OCSP 返回了一个太以�的状�\n"
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "assuan_inquire(%s) 方法失败：%s\n"
 
-#: dirmngr/server.c:1158
-msgid "ldapserver missing"
-msgstr "ldapserver 缺失"
-
-#: dirmngr/server.c:1224
+#: dirmngr/server.c:1277
 msgid "serialno missing in cert ID"
 msgstr "�书 ID 中的�列�缺失"
 
-#: dirmngr/server.c:1387 dirmngr/server.c:1473 dirmngr/server.c:1909
-#: dirmngr/server.c:1980 dirmngr/server.c:2556 dirmngr/server.c:2571
+#: dirmngr/server.c:1440 dirmngr/server.c:1526 dirmngr/server.c:1963
+#: dirmngr/server.c:2034 dirmngr/server.c:2662 dirmngr/server.c:2677
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "assuan_inquire 方法失败：%s\n"
 
-#: dirmngr/server.c:1516
+#: dirmngr/server.c:1569
 #, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "fetch_cert_by_url 方法失败：%s\n"
 
-#: dirmngr/server.c:1528 dirmngr/server.c:1559 dirmngr/server.c:1718
+#: dirmngr/server.c:1581 dirmngr/server.c:1612 dirmngr/server.c:1772
 #, c-format
 msgid "error sending data: %s\n"
 msgstr "��数�时出现错误：%s\n"
 
-#: dirmngr/server.c:1666
+#: dirmngr/server.c:1720
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "start_cert_fetch 方法失败：%s\n"
 
-#: dirmngr/server.c:1699
+#: dirmngr/server.c:1753
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "fetch_next_cert 方法失败：%s\n"
 
-#: dirmngr/server.c:1726
+#: dirmngr/server.c:1780
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr "超过设置的 max_replies %d\n"
 
-#: dirmngr/server.c:2860
+#: dirmngr/server.c:2966
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "无法分�控制结构：%s\n"
 
-#: dirmngr/server.c:2871
+#: dirmngr/server.c:2977
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "分� assuan 上下文时失败：%s\n"
 
-#: dirmngr/server.c:2892
+#: dirmngr/server.c:2998
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "�始化�务器时失败：%s\n"
 
-#: dirmngr/server.c:2900
+#: dirmngr/server.c:3006
 #, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "� Assuan 注册命令时失败：%s\n"
 
-#: dirmngr/server.c:2933
+#: dirmngr/server.c:3039
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "Assuan 接�出现问题：%s\n"
 
-#: dirmngr/server.c:2952
+#: dirmngr/server.c:3058
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "Assuan 处�时失败：%s\n"
@@ -10846,67 +10666,67 @@ msgstr "此会�中没有正在�行的 keybox 守护进程\n"
 msgid "error sending standard options: %s\n"
 msgstr "��标准选项时出现错误：%s\n"
 
-#: tools/gpgconf-comp.c:649
+#: tools/gpgconf-comp.c:655
 msgid "OpenPGP"
 msgstr "OpenPGP"
 
-#: tools/gpgconf-comp.c:653
+#: tools/gpgconf-comp.c:659
 msgid "S/MIME"
 msgstr "S/MIME"
 
-#: tools/gpgconf-comp.c:657
+#: tools/gpgconf-comp.c:663
 msgid "Public Keys"
 msgstr "公钥"
 
-#: tools/gpgconf-comp.c:661
+#: tools/gpgconf-comp.c:667
 msgid "Private Keys"
 msgstr "�钥"
 
-#: tools/gpgconf-comp.c:665
+#: tools/gpgconf-comp.c:671
 msgid "Smartcards"
 msgstr "智能�"
 
-#: tools/gpgconf-comp.c:669
+#: tools/gpgconf-comp.c:676
 msgid "TPM"
-msgstr ""
+msgstr "TPM"
 
-#: tools/gpgconf-comp.c:673
+#: tools/gpgconf-comp.c:681
 msgid "Network"
 msgstr "网络"
 
-#: tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:685
 msgid "Passphrase Entry"
 msgstr "密��目"
 
-#: tools/gpgconf-comp.c:941
+#: tools/gpgconf-comp.c:951
 msgid "Component not suitable for launching"
 msgstr "组件�适��动"
 
-#: tools/gpgconf-comp.c:947
+#: tools/gpgconf-comp.c:957
 #, c-format
 msgid "Configuration file of component %s is broken\n"
 msgstr "组件 %s 的�置文件已��\n"
 
-#: tools/gpgconf-comp.c:950
+#: tools/gpgconf-comp.c:960
 #, c-format
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr "注�：使用命令 “%s%s� 获�详情。\n"
 
-#: tools/gpgconf-comp.c:2816
+#: tools/gpgconf-comp.c:2826
 #, c-format
 msgid "External verification of component %s failed"
 msgstr "组件 %s 的外部验�失败"
 
-#: tools/gpgconf-comp.c:2946
+#: tools/gpgconf-comp.c:2956
 msgid "Note that group specifications are ignored\n"
 msgstr "注�，群组规范已被忽略\n"
 
-#: tools/gpgconf-comp.c:3543
+#: tools/gpgconf-comp.c:3553
 #, c-format
 msgid "error closing '%s'\n"
 msgstr "关闭‘%s’时出现错误\n"
 
-#: tools/gpgconf-comp.c:3545
+#: tools/gpgconf-comp.c:3555
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr "处�‘%s’时出现错误\n"
@@ -10987,15 +10807,15 @@ msgstr ""
 "语法 @GPGCONF@ [选项]\n"
 "管� @GNUPG@ 系统的工具的�置选项 \n"
 
-#: tools/gpgconf.c:669 tools/gpgconf.c:704
+#: tools/gpgconf.c:703 tools/gpgconf.c:738
 msgid "Need one component argument"
 msgstr "需�一个组件�数"
 
-#: tools/gpgconf.c:678 tools/gpgconf.c:728 tools/gpgconf.c:778
+#: tools/gpgconf.c:712 tools/gpgconf.c:762 tools/gpgconf.c:812
 msgid "Component not found"
 msgstr "组件未找到"
 
-#: tools/gpgconf.c:804
+#: tools/gpgconf.c:838
 msgid "No argument allowed"
 msgstr "没有�数被�许"
 
@@ -11011,33 +10831,33 @@ msgstr ""
 "语法：gpg-check-pattern [选项] patternfile\n"
 "按照 patternfile 检查一个由标准输入（stdin）给定的密�\n"
 
-#: tools/gpg-card.c:2390
+#: tools/gpg-card.c:2407
 #, c-format
 msgid "Note: key %s is already stored on the card!\n"
 msgstr "注�： 已有�钥 %s 被存储于�片上�\n"
 
-#: tools/gpg-card.c:2393
+#: tools/gpg-card.c:2410
 #, c-format
 msgid "Note: Keys are already stored on the card!\n"
 msgstr "注�： 已有�钥被存储于�片上�\n"
 
-#: tools/gpg-card.c:2396
+#: tools/gpg-card.c:2413
 #, c-format
 msgid "Replace existing key %s ? (y/N) "
 msgstr "替�现有密钥 %s ？(y/N) "
 
-#: tools/gpg-card.c:2549 tools/gpg-card.c:2712 tools/gpg-card.c:2935
-#: tools/gpg-card.c:3044
+#: tools/gpg-card.c:2566 tools/gpg-card.c:2729 tools/gpg-card.c:2952
+#: tools/gpg-card.c:3061
 #, c-format
 msgid "%s card no. %s detected\n"
 msgstr "检测到 %s �片 编� %s\n"
 
-#: tools/gpg-card.c:3396
+#: tools/gpg-card.c:3413
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr "用户交互标志设置为“%s�——无法更改\n"
 
-#: tools/gpg-card.c:3406 tools/gpg-card.c:3420
+#: tools/gpg-card.c:3423 tools/gpg-card.c:3437
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
@@ -11046,47 +10866,173 @@ msgstr ""
 "警告：正在将用户交互标志设置为“%s�\n"
 "      �能使用出厂�置还原�\n"
 
-#: tools/gpg-card.c:3423
+#: tools/gpg-card.c:3440
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr "请使用“uif --yes %d %s�\n"
 
-#: tools/gpg-card.c:3669
+#: tools/gpg-card.c:3686
 msgid "authenticate to the card"
 msgstr "验��片"
 
-#: tools/gpg-card.c:3671
+#: tools/gpg-card.c:3688
 msgid "send a reset to the card daemon"
 msgstr "��片守护进程���置"
 
-#: tools/gpg-card.c:3673
+#: tools/gpg-card.c:3690
 msgid "setup KDF for PIN authentication"
 msgstr "针对 PIN 身份验�设置 KDF"
 
-#: tools/gpg-card.c:3675
+#: tools/gpg-card.c:3692
 msgid "change a private data object"
 msgstr "更改�有数�对象"
 
-#: tools/gpg-card.c:3676
+#: tools/gpg-card.c:3693
 msgid "read a certificate from a data object"
 msgstr "从数�对象中读��书"
 
-#: tools/gpg-card.c:3677
+#: tools/gpg-card.c:3694
 msgid "store a certificate to a data object"
 msgstr "储存一个�书到数�对象"
 
-#: tools/gpg-card.c:3678
+#: tools/gpg-card.c:3695
 msgid "store a private key to a data object"
 msgstr "储存�钥到数�对象"
 
-#: tools/gpg-card.c:3679
+#: tools/gpg-card.c:3696
 msgid "Yubikey management commands"
 msgstr "Yubikey 管�命令"
 
-#: tools/gpg-card.c:3681
+#: tools/gpg-card.c:3698
 msgid "manage the command history"
 msgstr "管�命令历�记录"
 
+#~ msgid "requesting key %s from %s server %s\n"
+#~ msgstr "正在请求密钥 %s 从 %s �务器 %s\n"
+
+#~ msgid "%s:%u: no hostname given\n"
+#~ msgstr "%s:%u: 未指定主机�\n"
+
+#~ msgid "could not parse keyserver\n"
+#~ msgstr "无法解�公钥�务器\n"
+
+#~ msgid "return all values in a record oriented format"
+#~ msgstr "以记录导�的格�返回所有值"
+
+#~ msgid "|NAME|ignore host part and connect through NAME"
+#~ msgstr "|NAME|忽略主机部分并通过 NAME 进行连接"
+
+#~ msgid "force a TLS connection"
+#~ msgstr "强制 TLS 连接"
+
+#~ msgid "|NAME|connect to host NAME"
+#~ msgstr "|NAME|连接到以 NAME 命�的主机"
+
+#~ msgid "|N|connect to port N"
+#~ msgstr "|N|连接到端� N"
+
+#~ msgid "|NAME|use user NAME for authentication"
+#~ msgstr "|NAME|使用用户�称 NAME 进行身份验�"
+
+#~ msgid "|PASS|use password PASS for authentication"
+#~ msgstr "|PASS|使用密� PASS 进行身份验�"
+
+#~ msgid "take password from $DIRMNGR_LDAP_PASS"
+#~ msgstr "从 $DIRMNGR_LDAP_PASS �得密�"
+
+#~ msgid "|STRING|query DN STRING"
+#~ msgstr "|STRING|查询 DN STRING"
+
+#~ msgid "|STRING|use STRING as filter expression"
+#~ msgstr "|STRING|使用 STRING 作为过滤器扩展"
+
+#~ msgid "|STRING|return the attribute STRING"
+#~ msgstr "|STRING|返回属性 STRING"
+
+#~ msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
+#~ msgstr "用法： dirmngr_ldap [选项] [URL链接] （-h 获�帮助）\n"
+
+#~ msgid ""
+#~ "Syntax: dirmngr_ldap [options] [URL]\n"
+#~ "Internal LDAP helper for Dirmngr\n"
+#~ "Interface and options may change without notice\n"
+#~ msgstr ""
+#~ "语法：dirmngr_ldap [选项] [URL链接]\n"
+#~ "Dirmngr 的内部 LDAP 助手\n"
+#~ "接�和选项�能在没有通知的情况下改�\n"
+
+#~ msgid "invalid port number %d\n"
+#~ msgstr "无效的端�� %d\n"
+
+#~ msgid "scanning result for attribute '%s'\n"
+#~ msgstr "为属性‘%s’�索结果\n"
+
+#~ msgid "error writing to stdout: %s\n"
+#~ msgstr "写入到标准输出（stdout）时出现错误：%s\n"
+
+#~ msgid "          available attribute '%s'\n"
+#~ msgstr "          �用属性‘%s’\n"
+
+#~ msgid "attribute '%s' not found\n"
+#~ msgstr "属性‘%s’未找到\n"
+
+#~ msgid "found attribute '%s'\n"
+#~ msgstr "找到属性‘%s’\n"
+
+#~ msgid "processing url '%s'\n"
+#~ msgstr "正在处� URL ‘%s’\n"
+
+#~ msgid "          user '%s'\n"
+#~ msgstr "          用户‘%s’\n"
+
+#~ msgid "          pass '%s'\n"
+#~ msgstr "          密�‘%s’\n"
+
+#~ msgid "          host '%s'\n"
+#~ msgstr "          主机‘%s’\n"
+
+#~ msgid "          port %d\n"
+#~ msgstr "          端� %d\n"
+
+#~ msgid "            DN '%s'\n"
+#~ msgstr "            DN ‘%s’\n"
+
+#~ msgid "        filter '%s'\n"
+#~ msgstr "        过滤器 ‘%s’\n"
+
+#~ msgid "          attr '%s'\n"
+#~ msgstr "          属性 ‘%s’\n"
+
+#~ msgid "no host name in '%s'\n"
+#~ msgstr "‘%s’中没有主机�\n"
+
+#~ msgid "no attribute given for query '%s'\n"
+#~ msgstr "未指定查询‘%s’的属性\n"
+
+#~ msgid "WARNING: using first attribute only\n"
+#~ msgstr "警告：仅使用第一个属性\n"
+
+#~ msgid "LDAP init to '%s:%d' failed: %s\n"
+#~ msgstr "LDAP �始化至 ‘%s:%d’ 时失败：%s\n"
+
+#~ msgid "LDAP init to '%s' failed: %s\n"
+#~ msgstr "LDAP �始化至 ‘%s’ 失败：%s\n"
+
+#~ msgid "LDAP init to '%s' done\n"
+#~ msgstr "LDAP �始化至 ‘%s’ 完�\n"
+
+#~ msgid "binding to '%s:%d' failed: %s\n"
+#~ msgstr "绑定至‘%s:%d’时失败：%s\n"
+
+#~ msgid "searching '%s' failed: %s\n"
+#~ msgstr "�索‘%s’时失败：%s\n"
+
+#~ msgid "start_cert_fetch: invalid pattern '%s'\n"
+#~ msgstr "start_cert_fetch：无效的模�‘%s’\n"
+
+#~ msgid "ldapserver missing"
+#~ msgstr "ldapserver 缺失"
+
 #~ msgid "detected card with S/N: %s\n"
 #~ msgstr "检测到的� S/N �为: %s\n"
 
diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo
index 13c307a..7a79c65 100644
--- a/po/zh_TW.gmo
+++ b/po/zh_TW.gmo
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 9e8e8e2..19c4820 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: 2021-04-20 12:38+0200\n"
+"POT-Creation-Date: 2021-08-24 18:50+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:328
+#: agent/call-pinentry.c:338
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "個人識別碼項目鎖定��失敗: %s\n"
@@ -32,55 +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:546
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_OK"
 msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:547
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_Cancel"
 msgstr "|pinentry-label|�消 (_C)"
 
-#: agent/call-pinentry.c:548
+#: agent/call-pinentry.c:558
 #, fuzzy
 #| msgid "|pinentry-label|_OK"
 msgid "|pinentry-label|_Yes"
 msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:549
+#: agent/call-pinentry.c:559
 #, fuzzy
 #| msgid "|pinentry-label|_OK"
 msgid "|pinentry-label|_No"
 msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:550
+#: agent/call-pinentry.c:560
 msgid "|pinentry-label|PIN:"
 msgstr "|pinentry-label|個人識別碼 (PIN):"
 
-#: agent/call-pinentry.c:551
+#: agent/call-pinentry.c:561
 #, fuzzy
 #| msgid "|pinentry-label|_Cancel"
 msgid "|pinentry-label|_Save in password manager"
 msgstr "|pinentry-label|�消 (_C)"
 
-#: agent/call-pinentry.c:552
+#: agent/call-pinentry.c:562
 #, 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:554
+#: agent/call-pinentry.c:564
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:555
+#: agent/call-pinentry.c:565
 #, fuzzy
 #| msgid "Enter new passphrase"
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "請輸入新密語"
 
+#: agent/call-pinentry.c:566
+msgid "Caps Lock is on"
+msgstr ""
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:944
+#: agent/call-pinentry.c:1022
 msgid "Suggest"
 msgstr ""
 
@@ -91,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:966
+#: agent/call-pinentry.c:1044
 #, fuzzy
 #| msgid "pinentry.qualitybar.tooltip"
 msgid "pinentry.genpin.tooltip"
@@ -99,9 +103,22 @@ msgstr ""
 "上列輸入文字的優劣程度.\n"
 "關於此�範的細節, 請洽你的系統管�者."
 
+#: agent/call-pinentry.c:1072
+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
+#, fuzzy
+#| msgid "Passphrase too long"
+msgid "Passphrase Not Allowed"
+msgstr "密語太長"
+
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:998
+#: agent/call-pinentry.c:1198
 msgid "Quality:"
 msgstr "優劣程度: %s"
 
@@ -111,94 +128,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:1019
+#: agent/call-pinentry.c:1219
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 "上列輸入文字的優劣程度.\n"
 "關於此�範的細節, 請洽你的系統管�者."
 
-#: agent/call-pinentry.c:1263
+#: agent/call-pinentry.c:1477
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr "請輸入你的個人識別碼 (PIN) 以便在此階段作業中解開�鑰"
 
-#: agent/call-pinentry.c:1266
+#: agent/call-pinentry.c:1480
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "請輸入你的密語以便在此階段作業中解開�鑰"
 
-#: agent/call-pinentry.c:1303 agent/call-pinentry.c:1506
+#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1303 agent/call-pinentry.c:1506
-#: agent/protect-tool.c:728
+#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/protect-tool.c:729
 msgid "Passphrase:"
 msgstr "密語:"
 
-#: agent/call-pinentry.c:1330 agent/call-pinentry.c:1580 agent/command.c:1799
-#: agent/command.c:1852 agent/command-ssh.c:3046 agent/genkey.c:398
+#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
+#: agent/command.c:1988 agent/command-ssh.c:3046 agent/genkey.c:442
 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:1351 agent/call-pinentry.c:1603
+#: agent/call-pinentry.c:1566 agent/call-pinentry.c:1830
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (第 %d 次嘗試, 最多 %d 次)"
 
-#: agent/call-pinentry.c:1362 agent/call-pinentry.c:1614
+#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
 msgid "Repeat:"
 msgstr "�複:"
 
-#: agent/call-pinentry.c:1372 agent/call-pinentry.c:1384
-#: agent/call-pinentry.c:1624 agent/call-pinentry.c:1636
+#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
+#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
 msgid "PIN too long"
 msgstr "個人識別碼 (PIN) 太長"
 
-#: agent/call-pinentry.c:1373 agent/call-pinentry.c:1625
+#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
 msgid "Passphrase too long"
 msgstr "密語太長"
 
-#: agent/call-pinentry.c:1381 agent/call-pinentry.c:1633
+#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
 msgid "Invalid characters in PIN"
 msgstr "個人識別碼 (PIN) �有無效的字符"
 
-#: agent/call-pinentry.c:1386 agent/call-pinentry.c:1638
+#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
 msgid "PIN too short"
 msgstr "個人識別碼 (PIN) 太短"
 
-#: agent/call-pinentry.c:1405 agent/call-pinentry.c:1656
+#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
 msgid "Bad PIN"
 msgstr "�良的個人識別碼 (PIN)"
 
-#: agent/call-pinentry.c:1405 agent/call-pinentry.c:1656
+#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
 msgid "Bad Passphrase"
 msgstr "�良的密語"
 
-#: agent/command.c:697
+#: agent/command.c:823
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:698
+#: agent/command.c:824
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1106 g10/card-util.c:708 g10/card-util.c:729
+#: agent/command.c:1235 g10/card-util.c:713 g10/card-util.c:734
 #, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "�得此�片�號時出錯: %s\n"
 
-#: agent/command.c:1634 agent/command.c:1791 agent/command-ssh.c:2974
-#: agent/genkey.c:333
+#: agent/command.c:1756 agent/command.c:1921 agent/command-ssh.c:2974
+#: agent/genkey.c:377
 msgid "Please re-enter this passphrase"
 msgstr "請�次輸入密語"
 
-#: agent/command.c:2567
+#: agent/command.c:2703
 #, fuzzy, c-format
 #| msgid ""
 #| "Please enter the passphrase to protect the imported object within the "
@@ -208,7 +225,7 @@ msgid ""
 "system."
 msgstr "請輸入密語以�護匯入至 GnuPG 系統內的物件."
 
-#: agent/command.c:2697
+#: agent/command.c:2833
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -219,25 +236,25 @@ msgstr ""
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "未支�大於 %d �元的 ssh 金鑰\n"
 
-#: agent/command-ssh.c:872 common/dotlock.c:852 g10/card-util.c:953
-#: g10/export.c:1329 g10/gpg.c:1431 g10/keygen.c:5347 g10/keyring.c:1319
-#: g10/keyring.c:1632 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
+#: agent/command-ssh.c:872 common/dotlock.c:852 g10/card-util.c:963
+#: g10/export.c:1329 g10/gpg.c:1431 g10/keygen.c:5377 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
 #: g10/sign.c:1106 g10/sign.c:1443 g10/tdbio.c:753 tools/gpg-card.c:479
 #, c-format
 msgid "can't create '%s': %s\n"
 msgstr "無法建立 '%s': %s\n"
 
-#: agent/command-ssh.c:884 common/helpfile.c:57 g10/card-util.c:910
+#: agent/command-ssh.c:884 common/helpfile.c:57 g10/card-util.c:920
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
 #: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:721 g10/gpg.c:1432
-#: g10/import.c:371 g10/import.c:558 g10/import.c:793 g10/keygen.c:4322
-#: g10/keyring.c:1658 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
+#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4326
+#: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
 #: g10/plaintext.c:610 g10/sign.c:1086 g10/sign.c:1311 g10/sign.c:1424
 #: g10/sign.c:1596 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2380
-#: sm/gpgsm.c:2410 sm/gpgsm.c:2448 sm/keylist.c:1737 sm/qualified.c:65
+#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2236
+#: sm/gpgsm.c:2266 sm/gpgsm.c:2304 sm/keylist.c:1775 sm/qualified.c:65
 #: dirmngr/certcache.c:396 dirmngr/certcache.c:476 dirmngr/certcache.c:478
-#: dirmngr/crlcache.c:2588 dirmngr/dirmngr.c:1720 tools/gpg-card.c:408
+#: dirmngr/crlcache.c:2591 dirmngr/dirmngr.c:1759 tools/gpg-card.c:408
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "無法開啟 '%s': %s\n"
@@ -344,27 +361,27 @@ msgstr "�後兩次輸入的個人識別碼 (PIN) �一致; 請�試一次"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "請輸入個人識別碼 (PIN)%s%s%s 以解開�片"
 
-#: agent/genkey.c:109 sm/certreqgen-ui.c:433
+#: agent/genkey.c:142 sm/certreqgen-ui.c:433
 #, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "建立暫存檔時出錯: %s\n"
 
-#: agent/genkey.c:116
+#: agent/genkey.c:150
 #, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "寫入暫存檔時出錯: %s\n"
 
-#: agent/genkey.c:154
+#: agent/genkey.c:191
 msgid "Enter new passphrase"
 msgstr "請輸入新密語"
 
-#: agent/genkey.c:184
+#: agent/genkey.c:227
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr "你還沒有輸入密語!%0A空密語是�行的."
 
-#: agent/genkey.c:186
+#: agent/genkey.c:229
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -373,266 +390,265 @@ msgstr ""
 "你還沒有輸入密語 - 通常這��是個好主�!%0A請確�你�想��你的金鑰�任何�"
 "è­·."
 
-#: agent/genkey.c:198
+#: agent/genkey.c:241
 msgid "Yes, protection is not needed"
 msgstr "是, �需�任何�護"
 
-#: agent/genkey.c:215
+#: agent/genkey.c:258
 #, 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:234
+#: agent/genkey.c:277
 #, 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:260
+#: agent/genkey.c:304
 #, 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:275
+#: agent/genkey.c:319
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "警告: 你輸入了�安全的密語."
 
-#: agent/genkey.c:296
+#: agent/genkey.c:340
 msgid "Take this one anyway"
 msgstr "無論如何還是�用這個"
 
-#: agent/genkey.c:464
+#: agent/genkey.c:508
 #, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "請輸入密語至%0A以�護你的新金鑰"
 
-#: agent/genkey.c:590
+#: agent/genkey.c:637
 msgid "Please enter the new passphrase"
 msgstr "請輸入新的密語"
 
-#: agent/gpg-agent.c:162 scd/scdaemon.c:115 dirmngr/dirmngr.c:182
+#: agent/gpg-agent.c:164 scd/scdaemon.c:115 dirmngr/dirmngr.c:183
 #, fuzzy
 #| msgid "Options useful for debugging"
 msgid "Options used for startup"
 msgstr "�除錯有幫助的�項"
 
-#: agent/gpg-agent.c:164 scd/scdaemon.c:120 dirmngr/dirmngr.c:171
+#: agent/gpg-agent.c:166 scd/scdaemon.c:120 dirmngr/dirmngr.c:172
 msgid "run in daemon mode (background)"
 msgstr "以�務模�執行 (背景)"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:117 dirmngr/dirmngr.c:170
+#: agent/gpg-agent.c:167 scd/scdaemon.c:117 dirmngr/dirmngr.c:171
 msgid "run in server mode (foreground)"
 msgstr "以伺�器模�執行 (�景)"
 
-#: agent/gpg-agent.c:167 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:169 dirmngr/dirmngr.c:174
 #, fuzzy
 #| msgid "run in server mode"
 msgid "run in supervised mode"
 msgstr "以伺�器模�執行"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:121 dirmngr/dirmngr.c:184
+#: agent/gpg-agent.c:171 scd/scdaemon.c:121 dirmngr/dirmngr.c:185
 msgid "do not detach from the console"
 msgstr "��從 console 分離"
 
-#: agent/gpg-agent.c:170 scd/scdaemon.c:122 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:172 scd/scdaemon.c:122 dirmngr/dirmngr.c:186
 msgid "sh-style command output"
 msgstr "sh 樣�的指令輸出"
 
-#: agent/gpg-agent.c:171 scd/scdaemon.c:123 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:173 scd/scdaemon.c:123 dirmngr/dirmngr.c:187
 msgid "csh-style command output"
 msgstr "csh 樣�的指令輸出"
 
-#: agent/gpg-agent.c:179 g10/gpg.c:589 scd/scdaemon.c:125 sm/gpgsm.c:422
-#: dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:181 g10/gpg.c:589 scd/scdaemon.c:125 sm/gpgsm.c:423
+#: dirmngr/dirmngr.c:189
 msgid "|FILE|read options from FILE"
 msgstr "|檔案|從指定檔案中讀��項"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:574 scd/scdaemon.c:129 sm/gpgsm.c:265
-#: dirmngr/dirmngr.c:192
+#: agent/gpg-agent.c:185 g10/gpg.c:574 scd/scdaemon.c:129 sm/gpgsm.c:265
+#: dirmngr/dirmngr.c:193
 msgid "Options controlling the diagnostic output"
 msgstr "控制著診斷性輸出的�項"
 
-#: agent/gpg-agent.c:185 g10/gpg.c:576 g10/gpgv.c:78 kbx/kbxutil.c:89
+#: agent/gpg-agent.c:187 g10/gpg.c:576 g10/gpgv.c:78 kbx/kbxutil.c:89
 #: scd/scdaemon.c:131 sm/gpgsm.c:267 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:194 dirmngr/dirmngr_ldap.c:102
-#: tools/gpg-connect-agent.c:85 tools/gpgconf.c:111
+#: dirmngr/dirmngr.c:195 tools/gpg-connect-agent.c:85 tools/gpgconf.c:111
 msgid "verbose"
 msgstr "囉唆模�"
 
-#: agent/gpg-agent.c:186 g10/gpg.c:578 g10/gpgv.c:79 kbx/kbxutil.c:90
+#: agent/gpg-agent.c:188 g10/gpg.c:578 g10/gpgv.c:79 kbx/kbxutil.c:90
 #: scd/scdaemon.c:132 sm/gpgsm.c:269 dirmngr/dirmngr-client.c:70
-#: dirmngr/dirmngr.c:195 dirmngr/dirmngr_ldap.c:103
+#: dirmngr/dirmngr.c:196
 msgid "be somewhat more quiet"
 msgstr "盡�安�些"
 
-#: agent/gpg-agent.c:194 g10/gpg.c:593 sm/gpgsm.c:283 dirmngr/dirmngr.c:205
+#: agent/gpg-agent.c:196 g10/gpg.c:593 sm/gpgsm.c:283 dirmngr/dirmngr.c:206
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|檔案|將伺�器模�日誌寫入至指定檔案"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 scd/scdaemon.c:146 sm/gpgsm.c:290
-#: dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:599 scd/scdaemon.c:146 sm/gpgsm.c:290
+#: dirmngr/dirmngr.c:210
 msgid "Options controlling the configuration"
 msgstr "控制著組態的�項"
 
-#: agent/gpg-agent.c:201
+#: agent/gpg-agent.c:203
 msgid "do not use the SCdaemon"
 msgstr "��使用 SCdaemon"
 
-#: agent/gpg-agent.c:203
+#: agent/gpg-agent.c:205
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|使用 PGM �為 SCdaemon 程�"
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 #, 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:209
+#: agent/gpg-agent.c:211
 #, fuzzy
 #| msgid "|NAME|connect to host NAME"
 msgid "|NAME|accept some commands via NAME"
 msgstr "|�稱|連線至�於指定�稱的主機"
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 msgid "ignore requests to change the TTY"
 msgstr "忽略變更 TTY 的�求"
 
-#: agent/gpg-agent.c:215
+#: agent/gpg-agent.c:217
 msgid "ignore requests to change the X display"
 msgstr "忽略變更 X display 的�求"
 
-#: agent/gpg-agent.c:216
+#: agent/gpg-agent.c:218
 msgid "enable ssh support"
 msgstr "啟用 ssh 支�"
 
-#: agent/gpg-agent.c:218
+#: agent/gpg-agent.c:220
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:221
+#: agent/gpg-agent.c:223
 msgid "enable putty support"
 msgstr "啟用 putty 支�"
 
-#: agent/gpg-agent.c:233 g10/gpg.c:844 scd/scdaemon.c:176 sm/gpgsm.c:382
+#: agent/gpg-agent.c:235 g10/gpg.c:844 scd/scdaemon.c:176 sm/gpgsm.c:383
 msgid "Options controlling the security"
 msgstr "控制著安全性的�項"
 
-#: agent/gpg-agent.c:236
+#: agent/gpg-agent.c:238
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|讓快��的個人識別碼 (PIN) 在 N 秒後到期"
 
-#: agent/gpg-agent.c:238
+#: agent/gpg-agent.c:240
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|在 N 秒之後讓 SSH 金鑰�期"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:242
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|把個人識別碼 (PIN) 快�最大生存時間設� N 秒"
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:244
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr "|N|把 SSH 金鑰最大生存時間設� N 秒"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:246
 msgid "do not use the PIN cache when signing"
 msgstr "簽署時��使用個人識別碼 (PIN) 快�"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:248
 #, fuzzy
 #| msgid "do not allow the reuse of old passphrases"
 msgid "disallow the use of an external password cache"
 msgstr "��許�複使用舊密語"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:250
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "��許用戶端將金鑰標記為 \"已信任\""
 
-#: agent/gpg-agent.c:251
+#: agent/gpg-agent.c:253
 msgid "allow presetting passphrase"
 msgstr "�許�先設定密語"
 
-#: agent/gpg-agent.c:256
+#: agent/gpg-agent.c:258
 msgid "Options enforcing a passphrase policy"
 msgstr "強制執行密語原則的�項"
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:261
 msgid "do not allow bypassing the passphrase policy"
 msgstr "��許略�密語原則"
 
-#: agent/gpg-agent.c:261
+#: agent/gpg-agent.c:263
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr "|N|把新密語所需的最短長度設� N"
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:265
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr "|N|新密語至少�有 N 個�字�的字符"
 
-#: agent/gpg-agent.c:266
+#: agent/gpg-agent.c:268
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr "|檔案|用指定檔案中的樣�來檢查新密語"
 
-#: agent/gpg-agent.c:268
+#: agent/gpg-agent.c:272
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|在 N 天之後讓密語�期"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:274
 msgid "do not allow the reuse of old passphrases"
 msgstr "��許�複使用舊密語"
 
-#: agent/gpg-agent.c:273
+#: agent/gpg-agent.c:277
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the PIN-Entry"
 msgstr "控制著安全性的�項"
 
-#: agent/gpg-agent.c:275
+#: agent/gpg-agent.c:279
 msgid "never use the PIN-entry"
 msgstr ""
 
-#: agent/gpg-agent.c:277
+#: agent/gpg-agent.c:281
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:283
 #, fuzzy
 #| msgid "do not grab keyboard and mouse"
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr "��奪��盤�滑鼠"
 
-#: agent/gpg-agent.c:282
+#: agent/gpg-agent.c:286
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|使用 PGM �為 PIN-Entry 程�"
 
-#: agent/gpg-agent.c:286
+#: agent/gpg-agent.c:290
 #, 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:288
+#: agent/gpg-agent.c:294
 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:551 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: agent/gpg-agent.c:557 agent/preset-passphrase.c:99 agent/protect-tool.c:154
 #: g10/gpg.c:1132 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:612 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:438
-#: dirmngr/dirmngr_ldap.c:175 tools/gpg-connect-agent.c:220 tools/gpgconf.c:151
+#: sm/gpgsm.c:613 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:446
+#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:151
 #: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "翻譯瑕疵請回報給 <Jedi@Jedi.org>, 程�瑕疵則請回報給 <@EMAIL@>.\n"
 
-#: agent/gpg-agent.c:560
+#: agent/gpg-agent.c:566
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "用法: @GPG_AGENT@ [�項] (或用 -h 求助)"
 
-#: agent/gpg-agent.c:562
+#: agent/gpg-agent.c:568
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -640,132 +656,132 @@ msgstr ""
 "語法: @GPG_AGENT@ [�項] [指令 [引數]]\n"
 "@GNUPG@ �鑰管�\n"
 
-#: agent/gpg-agent.c:607 g10/gpg.c:1337 scd/scdaemon.c:384 sm/gpgsm.c:760
-#: dirmngr/dirmngr.c:522
+#: agent/gpg-agent.c:613 g10/gpg.c:1337 scd/scdaemon.c:384 sm/gpgsm.c:761
+#: dirmngr/dirmngr.c:530
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "給定的除錯等級 '%s' 無效\n"
 
-#: agent/gpg-agent.c:972 g10/gpg.c:3910 g10/gpg.c:3934 sm/gpgsm.c:1769
-#: sm/gpgsm.c:1775
+#: agent/gpg-agent.c:986 g10/gpg.c:3907 g10/gpg.c:3931 sm/gpgsm.c:1622
+#: sm/gpgsm.c:1628
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "所�的摘�演算法無效\n"
 
-#: agent/gpg-agent.c:1196 agent/gpg-agent.c:2019 common/comopt.c:93
-#: g10/gpg.c:2591 scd/scdaemon.c:549 sm/gpgsm.c:1155 dirmngr/dirmngr.c:989
-#: dirmngr/dirmngr.c:1840
+#: agent/gpg-agent.c:1210 agent/gpg-agent.c:2035 common/comopt.c:93
+#: g10/gpg.c:2594 scd/scdaemon.c:549 sm/gpgsm.c:1028 dirmngr/dirmngr.c:1029
+#: dirmngr/dirmngr.c:1879
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "從 '%s' 讀��項中\n"
 
-#: agent/gpg-agent.c:1335 g10/gpg.c:3861 scd/scdaemon.c:687 sm/gpgsm.c:1709
-#: dirmngr/dirmngr.c:1108 tools/gpg-connect-agent.c:1270 tools/gpgconf.c:634
+#: agent/gpg-agent.c:1349 g10/gpg.c:3858 scd/scdaemon.c:687 sm/gpgsm.c:1562
+#: dirmngr/dirmngr.c:1145 tools/gpg-connect-agent.c:1270 tools/gpgconf.c:668
 #, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr "請注�: '%s' 並�當��項\n"
 
-#: agent/gpg-agent.c:2172 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1267
+#: agent/gpg-agent.c:2188 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1306
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "無法建立 socket: %s\n"
 
-#: agent/gpg-agent.c:2189 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1280
+#: agent/gpg-agent.c:2205 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1319
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "socket �稱 '%s' 太長\n"
 
-#: agent/gpg-agent.c:2228
+#: agent/gpg-agent.c:2244
 #, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "已經有一份 gpg-agent 在執行了 - �會�啟動一份新的\n"
 
-#: agent/gpg-agent.c:2239 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1312
+#: agent/gpg-agent.c:2255 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1351
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "為 socket �得 nonce 時出錯\n"
 
-#: agent/gpg-agent.c:2244 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1315
+#: agent/gpg-agent.c:2260 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1354
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "�定 socket 至 '%s' 時出錯: %s\n"
 
-#: agent/gpg-agent.c:2255 agent/gpg-agent.c:2295 agent/gpg-agent.c:2304
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1324
+#: agent/gpg-agent.c:2271 agent/gpg-agent.c:2311 agent/gpg-agent.c:2320
+#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1363
 #, 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:2269 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1336
+#: agent/gpg-agent.c:2285 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1375
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "正在候� socket '%s'\n"
 
-#: agent/gpg-agent.c:2289 agent/gpg-agent.c:2342 common/homedir.c:517
+#: agent/gpg-agent.c:2305 agent/gpg-agent.c:2358 common/homedir.c:537
 #: 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:2292 agent/gpg-agent.c:2347 common/homedir.c:520
+#: agent/gpg-agent.c:2308 agent/gpg-agent.c:2363 common/homedir.c:540
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "目錄 '%s' 已建立\n"
 
-#: agent/gpg-agent.c:2353
+#: agent/gpg-agent.c:2369
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "'%s' 的 stat() 失敗: %s\n"
 
-#: agent/gpg-agent.c:2357
+#: agent/gpg-agent.c:2373
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "無法使用 '%s' �為家目錄\n"
 
-#: agent/gpg-agent.c:2512 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2069
+#: agent/gpg-agent.c:2528 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2108
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "於 fd %d 讀� nonce 時出錯: %s\n"
 
-#: agent/gpg-agent.c:2719
+#: agent/gpg-agent.c:2735
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "經手程� 0x%lx (用於 fd %d) 已啟動\n"
 
-#: agent/gpg-agent.c:2724
+#: agent/gpg-agent.c:2740
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "經手程� 0x%lx (用於 fd %d) 已終止\n"
 
-#: agent/gpg-agent.c:2799
+#: agent/gpg-agent.c:2815
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "ssh 經手程� 0x%lx (用於 fd %d) 已啟動\n"
 
-#: agent/gpg-agent.c:2804
+#: agent/gpg-agent.c:2820
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "ssh 經手程� 0x%lx (用於 fd %d) 已終止\n"
 
-#: agent/gpg-agent.c:3026 scd/scdaemon.c:1374 dirmngr/dirmngr.c:2283
+#: agent/gpg-agent.c:3042 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2322
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "npth_select 失敗: %s - 等 1 秒�\n"
 
-#: agent/gpg-agent.c:3114 scd/scdaemon.c:1439
+#: agent/gpg-agent.c:3130 scd/scdaemon.c:1441
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s 已�止\n"
 
-#: agent/gpg-agent.c:3252 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3271 common/simple-pwquery.c:247 g10/call-agent.c:260
 #: sm/call-agent.c:131 tools/gpg-connect-agent.c:2319 tools/card-call-scd.c:311
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "在此階段中沒有執行中的 gpg-agent\n"
 
-#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:70
+#: agent/preset-passphrase.c:74 tools/gpg-check-pattern.c:66
 msgid ""
 "@Options:\n"
 " "
@@ -786,7 +802,7 @@ msgstr ""
 "密碼快�維護\n"
 
 #: agent/protect-tool.c:107 g10/gpg.c:448 kbx/kbxutil.c:72 sm/gpgsm.c:215
-#: dirmngr/dirmngr.c:168 tools/gpgconf.c:81
+#: dirmngr/dirmngr.c:169 tools/gpgconf.c:81
 msgid ""
 "@Commands:\n"
 " "
@@ -817,21 +833,21 @@ msgstr ""
 "語法: gpg-protect-tool [�項] [引數]\n"
 "�鑰維護工具\n"
 
-#: agent/protect-tool.c:707
+#: agent/protect-tool.c:708 sm/import.c:775
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "請輸入密語來�消 PKCS#12 物件的�護."
 
-#: agent/protect-tool.c:712
+#: agent/protect-tool.c:713 sm/export.c:727
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "請輸入密語來�護新的 PKCS#12 物件."
 
-#: agent/protect-tool.c:718
+#: agent/protect-tool.c:719
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr "請輸入密語以�護匯入至 GnuPG 系統內的物件."
 
-#: agent/protect-tool.c:723
+#: agent/protect-tool.c:724
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -839,17 +855,17 @@ msgstr ""
 "請輸入完�這項�作所需的\n"
 "密語或個人識別碼 (PIN)."
 
-#: agent/protect-tool.c:734
+#: agent/protect-tool.c:735
 #, c-format
 msgid "cancelled\n"
 msgstr "已�消\n"
 
-#: agent/protect-tool.c:736
+#: agent/protect-tool.c:737
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "詢�密語時出錯: %s\n"
 
-#: agent/trustlist.c:153 agent/trustlist.c:363 tools/gpgconf.c:424
+#: agent/trustlist.c:153 agent/trustlist.c:363 tools/gpgconf.c:458
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "開啟 '%s' 時出錯: %s\n"
@@ -1004,7 +1020,7 @@ msgstr "檢查已建立的簽章時出錯: %s\n"
 msgid "secret key parts are not available\n"
 msgstr "�鑰部分無法�用\n"
 
-#: agent/cvt-openpgp.c:343 g10/card-util.c:1562
+#: agent/cvt-openpgp.c:343 g10/card-util.c:1575
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr "公鑰演算法 %d (%s) 未支�\n"
@@ -1033,7 +1049,7 @@ msgid "error creating a stream for a pipe: %s\n"
 msgstr "建立管�串�時出錯: %s\n"
 
 #: common/exechelp-posix.c:505 common/exechelp-posix.c:580
-#: common/exechelp-posix.c:866 dirmngr/dirmngr.c:1354
+#: common/exechelp-posix.c:866 dirmngr/dirmngr.c:1393
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "�生執行程�時出錯: %s\n"
@@ -1107,7 +1123,7 @@ msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "把 '%s' �新新命� '%s' 時失敗: %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3082
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3099
 msgid "yes"
 msgstr "yes"
 
@@ -1161,7 +1177,7 @@ msgstr "在安全記憶體�置 %lu �元組時超出核心"
 msgid "out of core while allocating %lu bytes"
 msgstr "�置 %lu �元組時超出核心"
 
-#: common/miscellaneous.c:115 g10/card-util.c:917 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:927 tools/no-libgcrypt.c:30
 #: tools/gpg-card.c:416
 #, c-format
 msgid "error allocating enough memory: %s\n"
@@ -1239,7 +1255,7 @@ msgstr "建立鑰匙圈 '%s' 時出錯: %s\n"
 msgid "server '%s' is older than us (%s < %s)"
 msgstr ""
 
-#: common/asshelp.c:737 g10/call-dirmngr.c:408
+#: common/asshelp.c:737 g10/call-dirmngr.c:407
 #, fuzzy, c-format
 #| msgid "WARNING: %s overrides %s\n"
 msgid "WARNING: %s\n"
@@ -1324,7 +1340,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:4212
+#: scd/app-openpgp.c:4214
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "未支�的演算法: %s"
@@ -1399,11 +1415,11 @@ msgstr "憑證�有效"
 msgid "Root certificate trustworthy"
 msgstr "根憑證�信賴"
 
-#: common/audit.c:1112 sm/certchain.c:1242
+#: common/audit.c:1112 sm/certchain.c:1243
 msgid "no CRL found for certificate"
 msgstr "找�到用於憑證的 CRL"
 
-#: common/audit.c:1115 sm/certchain.c:1252
+#: common/audit.c:1115 sm/certchain.c:1253
 msgid "the available CRL is too old"
 msgstr "�用的 CRL 太舊了"
 
@@ -1449,22 +1465,22 @@ msgstr "[ ç„¡ ]"
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "已跳�無效的 radix64 字符 %02x\n"
 
-#: common/ttyio.c:433
+#: common/ttyio.c:447
 #, c-format
 msgid "Sorry, we are in batchmode - can't get input\n"
 msgstr ""
 
-#: common/ttyio.c:439
+#: common/ttyio.c:453
 #, c-format
 msgid "Sorry, no terminal at all requested - can't get input\n"
 msgstr ""
 
-#: common/ttyio.c:474 common/ttyio.c:484
+#: common/ttyio.c:488 common/ttyio.c:498
 #, c-format
 msgid "too many errors; giving up\n"
 msgstr ""
 
-#: common/ttyio.c:536
+#: common/ttyio.c:550
 #, c-format
 msgid "Control-D detected\n"
 msgstr ""
@@ -1518,8 +1534,7 @@ msgstr "未鎖定 '%s': %s\n"
 msgid "waiting for lock %s...\n"
 msgstr "正在等候 `%s' 鎖定...\n"
 
-#: common/init.c:191 sm/gpgsm.c:1036 dirmngr/dirmngr.c:895
-#: dirmngr/dirmngr.c:904
+#: common/init.c:191 sm/gpgsm.c:909 dirmngr/dirmngr.c:935 dirmngr/dirmngr.c:944
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s 太舊了 (需� %s, 但是祇有 %s)\n"
@@ -1672,7 +1687,7 @@ msgid "Enter passphrase: "
 msgstr "請輸入密語: "
 
 #: g10/call-agent.c:318 g10/encrypt.c:282 g10/encrypt.c:818 g10/sign.c:473
-#: sm/call-agent.c:180 sm/encrypt.c:701 sm/sign.c:436
+#: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
 #, fuzzy, c-format
 #| msgid "%s does not yet work with %s\n"
 msgid "%s is not compliant with %s mode\n"
@@ -1684,221 +1699,221 @@ msgstr "%s 還沒辦法跟 %s 一起�作\n"
 msgid "error from TPM: %s\n"
 msgstr "讀� %s 時出錯: %s\n"
 
-#: g10/call-agent.c:2123 g10/passphrase.c:225 g10/passphrase.c:258
-#: tools/card-call-scd.c:1751
+#: g10/call-agent.c:2135 g10/passphrase.c:233 g10/passphrase.c:266
+#: tools/card-call-scd.c:1755
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "代�程�的�題: %s\n"
 
-#: g10/call-dirmngr.c:179 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2316
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2316
 #, fuzzy, c-format
 #| msgid "no gpg-agent running in this session\n"
 msgid "no dirmngr running in this session\n"
 msgstr "在此階段中沒有執行中的 gpg-agent\n"
 
-#: g10/call-dirmngr.c:213
+#: g10/call-dirmngr.c:212
 #, fuzzy, c-format
 #| msgid "you may not use %s while in %s mode\n"
 msgid "keyserver option \"honor-keyserver-url\" may not be used in Tor mode\n"
 msgstr "你�能夠將 %s 用於 %s 模�中\n"
 
-#: g10/call-dirmngr.c:386
+#: g10/call-dirmngr.c:385
 msgid "WKD uses a cached result"
 msgstr ""
 
-#: g10/call-dirmngr.c:389
+#: g10/call-dirmngr.c:388
 msgid "Tor is not running"
 msgstr ""
 
-#: g10/call-dirmngr.c:391
+#: g10/call-dirmngr.c:390
 #, fuzzy
 #| msgid "\"%s\" is not a fingerprint\n"
 msgid "Tor is not properly configured"
 msgstr "\"%s\" �是指紋\n"
 
-#: g10/call-dirmngr.c:393
+#: g10/call-dirmngr.c:392
 #, fuzzy
 #| msgid "\"%s\" is not a fingerprint\n"
 msgid "DNS is not properly configured"
 msgstr "\"%s\" �是指紋\n"
 
-#: g10/call-dirmngr.c:395
+#: g10/call-dirmngr.c:394
 msgid "unacceptable HTTP redirect from server"
 msgstr ""
 
-#: g10/call-dirmngr.c:397
+#: g10/call-dirmngr.c:396
 msgid "unacceptable HTTP redirect from server was cleaned up"
 msgstr ""
 
-#: g10/call-dirmngr.c:399
+#: g10/call-dirmngr.c:398
 #, fuzzy
 #| msgid "generate a revocation certificate"
 msgid "server uses an invalid certificate"
 msgstr "產生撤銷憑證"
 
-#: g10/call-dirmngr.c:406 g10/gpg.c:4599
+#: g10/call-dirmngr.c:405 g10/gpg.c:4596
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
 msgstr "��: %s\n"
 
-#: g10/card-util.c:86 g10/card-util.c:369 g10/card-util.c:1924
-#: tools/gpg-card.c:3039
+#: g10/card-util.c:86 g10/card-util.c:374 g10/card-util.c:1937
+#: tools/gpg-card.c:3056
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "沒有�用的 OpenPGP �片: %s\n"
 
-#: g10/card-util.c:91 g10/card-util.c:1930
+#: g10/card-util.c:91 g10/card-util.c:1943
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "�測到 OpenPGP �片編號 %s\n"
 
-#: g10/card-util.c:97 g10/card-util.c:2309 g10/delkey.c:164 g10/keyedit.c:1428
-#: g10/keygen.c:4791 g10/revoke.c:214 g10/revoke.c:638
+#: g10/card-util.c:97 g10/card-util.c:2322 g10/delkey.c:164 g10/keyedit.c:1428
+#: g10/keygen.c:4795 g10/revoke.c:214 g10/revoke.c:639
 #, c-format
 msgid "can't do this in batch mode\n"
 msgstr "無法在批次模�中這樣�\n"
 
-#: g10/card-util.c:105 tools/gpg-card.c:2943
+#: g10/card-util.c:105 tools/gpg-card.c:2960
 #, c-format
 msgid "This command is only available for version 2 cards\n"
 msgstr "祇有第二版�片纔能用這個指令\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3398 tools/gpg-card.c:2948
+#: g10/card-util.c:107 scd/app-openpgp.c:3399 tools/gpg-card.c:2965
 #, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "(�也) 沒有�設碼\n"
 
-#: g10/card-util.c:140 g10/card-util.c:1448 g10/card-util.c:1710
-#: g10/card-util.c:1802 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1991 g10/keygen.c:2165 g10/keygen.c:2385 g10/keygen.c:2685
+#: g10/card-util.c:140 g10/card-util.c:1458 g10/card-util.c:1723
+#: g10/card-util.c:1815 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/keygen.c:1992 g10/keygen.c:2166 g10/keygen.c:2386 g10/keygen.c:2686
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
 #: tools/gpg-card.c:510
 msgid "Your selection? "
 msgstr "你��哪一個? "
 
-#: g10/card-util.c:262 g10/card-util.c:313 tools/gpg-card.c:596
+#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:596
 #: tools/gpg-card.c:636
 msgid "[not set]"
 msgstr "[未設定]"
 
-#: g10/card-util.c:558 tools/gpg-card.c:903
+#: g10/card-util.c:563 tools/gpg-card.c:905
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:559 tools/gpg-card.c:904
+#: g10/card-util.c:564 tools/gpg-card.c:906
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:586 tools/gpg-card.c:931
+#: g10/card-util.c:591 tools/gpg-card.c:933
 msgid "not forced"
 msgstr "�強迫使用"
 
-#: g10/card-util.c:586 tools/gpg-card.c:931
+#: g10/card-util.c:591 tools/gpg-card.c:933
 msgid "forced"
 msgstr "強迫使用"
 
-#: g10/card-util.c:768 tools/gpg-card.c:1468
+#: g10/card-util.c:773 tools/gpg-card.c:1484
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "錯誤: 目�祇�許使用單純的 ASCII 字符.\n"
 
-#: g10/card-util.c:770 tools/gpg-card.c:1470
+#: g10/card-util.c:775 tools/gpg-card.c:1486
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "錯誤: �能使用 \"<\" 字符.\n"
 
-#: g10/card-util.c:772 tools/gpg-card.c:1472
+#: g10/card-util.c:777 tools/gpg-card.c:1488
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "錯誤: 並��許使用連續兩個以上的空格.\n"
 
-#: g10/card-util.c:789 tools/gpg-card.c:1505
+#: g10/card-util.c:795 tools/gpg-card.c:1521
 msgid "Cardholder's surname: "
 msgstr "�片�有者的姓�: "
 
-#: g10/card-util.c:791 tools/gpg-card.c:1506
+#: g10/card-util.c:797 tools/gpg-card.c:1522
 msgid "Cardholder's given name: "
 msgstr "�片�有者的�字: "
 
-#: g10/card-util.c:809 tools/gpg-card.c:1523
+#: g10/card-util.c:816 tools/gpg-card.c:1539
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "錯誤: �併後的�字太長 (上�是 %d 個字符).\n"
 
-#: g10/card-util.c:830 tools/gpg-card.c:1561
+#: g10/card-util.c:840 tools/gpg-card.c:1577
 msgid "URL to retrieve public key: "
 msgstr "�回公鑰的 URL: "
 
-#: g10/card-util.c:926 g10/decrypt-data.c:495 g10/import.c:406 g10/import.c:756
-#: g10/import.c:815 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1666
-#: tools/gpgconf.c:437 tools/gpgconf.c:483 tools/gpg-card.c:426
+#: g10/card-util.c:936 g10/decrypt-data.c:495 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:1705
+#: tools/gpgconf.c:471 tools/gpgconf.c:517 tools/gpg-card.c:426
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "讀� '%s' 時出錯: %s\n"
 
-#: g10/card-util.c:959 g10/decrypt-data.c:498 g10/export.c:2496
+#: g10/card-util.c:969 g10/decrypt-data.c:498 g10/export.c:2496
 #: dirmngr/crlcache.c:925 tools/gpg-card.c:486 tools/gpg-card.c:493
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr "寫入 '%s' 時出錯: %s\n"
 
-#: g10/card-util.c:986 tools/gpg-card.c:1650
+#: g10/card-util.c:996 tools/gpg-card.c:1666
 msgid "Login data (account name): "
 msgstr "登入資料 (帳號�稱): "
 
-#: g10/card-util.c:1024 tools/gpg-card.c:1945
+#: g10/card-util.c:1034 tools/gpg-card.c:1962
 msgid "Private DO data: "
 msgstr "�人的 DO 資料: "
 
-#: g10/card-util.c:1109 tools/gpg-card.c:1699
+#: g10/card-util.c:1119 tools/gpg-card.c:1715
 msgid "Language preferences: "
 msgstr "介�語言�好設定: "
 
-#: g10/card-util.c:1117 tools/gpg-card.c:1710
+#: g10/card-util.c:1127 tools/gpg-card.c:1726
 #, c-format
 msgid "Error: invalid length of preference string.\n"
 msgstr "錯誤: 無效的�好設定字串長度\n"
 
-#: g10/card-util.c:1126 tools/gpg-card.c:1719
+#: g10/card-util.c:1136 tools/gpg-card.c:1735
 #, c-format
 msgid "Error: invalid characters in preference string.\n"
 msgstr "錯誤: �好設定字串中�有無效的字符\n"
 
-#: g10/card-util.c:1148 tools/gpg-card.c:1753
+#: g10/card-util.c:1158 tools/gpg-card.c:1769
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1162 tools/gpg-card.c:1770
+#: g10/card-util.c:1172 tools/gpg-card.c:1786
 msgid "Error: invalid response.\n"
 msgstr "錯誤: 無效的回應.\n"
 
-#: g10/card-util.c:1185 tools/gpg-card.c:1835
+#: g10/card-util.c:1195 tools/gpg-card.c:1852
 msgid "CA fingerprint: "
 msgstr "憑證中心 (CA) 指紋: "
 
-#: g10/card-util.c:1209 tools/gpg-card.c:1861
+#: g10/card-util.c:1219 tools/gpg-card.c:1878
 #, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "錯誤: 無效的格�化指紋.\n"
 
-#: g10/card-util.c:1259
+#: g10/card-util.c:1269
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "��能進行金鑰�作: %s\n"
 
-#: g10/card-util.c:1260
+#: g10/card-util.c:1270
 msgid "not an OpenPGP card"
 msgstr "這�是 OpenPGP �片"
 
-#: g10/card-util.c:1273 g10/keygen.c:4811 g10/keygen.c:5972
+#: g10/card-util.c:1283 g10/keygen.c:4815 g10/keygen.c:6003
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "�得�用金鑰資訊時出錯: %s\n"
 
-#: g10/card-util.c:1358
+#: g10/card-util.c:1368
 msgid "Replace existing key? (y/N) "
 msgstr "是���代既有的金鑰? (y/N) "
 
-#: g10/card-util.c:1375 tools/gpg-card.c:3328
+#: g10/card-util.c:1385 tools/gpg-card.c:3345
 #, fuzzy
 #| msgid ""
 #| "Note: There is no guarantee that the card supports the requested size.\n"
@@ -1914,110 +1929,110 @@ msgstr ""
 "      如果金鑰產生失敗了, 煩請查閱你�片上的文件,\n"
 "      看看這張�片支�哪些尺寸.\n"
 
-#: g10/card-util.c:1396 g10/keygen.c:2570 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1406 g10/keygen.c:2571 sm/certreqgen-ui.c:180
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "你想�用多大的金鑰尺寸? (%u) "
 
-#: g10/card-util.c:1406 g10/keygen.c:2493 g10/keygen.c:2525
+#: g10/card-util.c:1416 g10/keygen.c:2494 g10/keygen.c:2526
 #: sm/certreqgen-ui.c:195
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "加大到 %u �元\n"
 
-#: g10/card-util.c:1414 g10/keygen.c:2578 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1424 g10/keygen.c:2579 sm/certreqgen-ui.c:185
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s 金鑰尺寸一定�介於 %u 到 %u 之間\n"
 
-#: g10/card-util.c:1433
+#: g10/card-util.c:1443
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1435
+#: g10/card-util.c:1445
 #, fuzzy
 #| msgid "   (1) Signature key\n"
 msgid "Signature key\n"
 msgstr "   (1) 簽署用金鑰\n"
 
-#: g10/card-util.c:1437
+#: g10/card-util.c:1447
 #, fuzzy
 #| msgid "   (2) Encryption key\n"
 msgid "Encryption key\n"
 msgstr "   (2) 加密用金鑰\n"
 
-#: g10/card-util.c:1439
+#: g10/card-util.c:1449
 #, fuzzy
 #| msgid "   (3) Authentication key\n"
 msgid "Authentication key\n"
 msgstr "   (3) 憑證用金鑰\n"
 
-#: g10/card-util.c:1441 g10/keygen.c:2112 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1451 g10/keygen.c:2113 sm/certreqgen-ui.c:158
 msgid "Please select what kind of key you want:\n"
 msgstr "請�擇你�使用的金鑰種類:\n"
 
-#: g10/card-util.c:1442 sm/certreqgen-ui.c:159
+#: g10/card-util.c:1452 sm/certreqgen-ui.c:159
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1443
+#: g10/card-util.c:1453
 #, fuzzy, c-format
 #| msgid "   (%d) ECC and ECC\n"
 msgid "   (%d) ECC\n"
 msgstr "   (%d) ECC 和 ECC\n"
 
-#: g10/card-util.c:1455 g10/card-util.c:1722 g10/card-util.c:1822
-#: g10/keyedit.c:900 g10/keygen.c:2017 g10/keygen.c:2045 g10/keygen.c:2172
-#: g10/keygen.c:2425 g10/keygen.c:2713 g10/revoke.c:836
+#: g10/card-util.c:1468 g10/card-util.c:1735 g10/card-util.c:1835
+#: g10/keyedit.c:900 g10/keygen.c:2018 g10/keygen.c:2046 g10/keygen.c:2173
+#: g10/keygen.c:2426 g10/keygen.c:2714 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "無效的�擇.\n"
 
-#: g10/card-util.c:1528
+#: g10/card-util.c:1541
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr "這張�片將�新加以組態, 以便產生 %u �元的金鑰\n"
 
-#: g10/card-util.c:1533
+#: g10/card-util.c:1546
 #, fuzzy, c-format
 #| msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr "這張�片將�新加以組態, 以便產生 %u �元的金鑰\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1582
 #, fuzzy, c-format
 #| msgid "error changing size of key %d to %u bits: %s\n"
 msgid "error changing key attribute for key %d: %s\n"
 msgstr "將金鑰 %d 尺寸變更至 %u �元時出錯: %s\n"
 
-#: g10/card-util.c:1585 g10/card-util.c:2106 g10/card-util.c:2162
+#: g10/card-util.c:1598 g10/card-util.c:2119 g10/card-util.c:2175
 #, fuzzy, c-format
 #| msgid "error getting current key info: %s\n"
 msgid "error getting card info: %s\n"
 msgstr "�得�用金鑰資訊時出錯: %s\n"
 
-#: g10/card-util.c:1591 g10/card-util.c:1936 g10/card-util.c:2112
-#: g10/card-util.c:2171 tools/gpg-card.c:3057 tools/gpg-card.c:3296
-#: tools/gpg-card.c:3354
+#: g10/card-util.c:1604 g10/card-util.c:1949 g10/card-util.c:2125
+#: g10/card-util.c:2184 tools/gpg-card.c:3074 tools/gpg-card.c:3313
+#: tools/gpg-card.c:3371
 #, fuzzy, c-format
 #| msgid "This command is not allowed while in %s mode.\n"
 msgid "This command is not supported by this card\n"
 msgstr "在 %s 模�中��許使用這個指令.\n"
 
-#: g10/card-util.c:1637 tools/gpg-card.c:2426
+#: g10/card-util.c:1650 tools/gpg-card.c:2443
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "是��為加密用金鑰建立�外備份? (Y/n) "
 
-#: g10/card-util.c:1651
+#: g10/card-util.c:1664
 #, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "請注�: 金鑰已經存放在�片上了!\n"
 
-#: g10/card-util.c:1654 tools/gpg-card.c:2398
+#: g10/card-util.c:1667 tools/gpg-card.c:2415
 msgid "Replace existing keys? (y/N) "
 msgstr "是���代既有的金鑰? (y/N) "
 
-#: g10/card-util.c:1666 tools/gpg-card.c:2457
+#: g10/card-util.c:1679 tools/gpg-card.c:2474
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2028,165 +2043,165 @@ msgstr ""
 "   PIN = '%s'     管�者 PIN = '%s'\n"
 "你應該用 --change-pin 指令來加以變更\n"
 
-#: g10/card-util.c:1701
+#: g10/card-util.c:1714
 msgid "Please select the type of key to generate:\n"
 msgstr "請�擇你�產生的金鑰種類:\n"
 
-#: g10/card-util.c:1703 g10/card-util.c:1793
+#: g10/card-util.c:1716 g10/card-util.c:1806
 msgid "   (1) Signature key\n"
 msgstr "   (1) 簽署用金鑰\n"
 
-#: g10/card-util.c:1704 g10/card-util.c:1795
+#: g10/card-util.c:1717 g10/card-util.c:1808
 msgid "   (2) Encryption key\n"
 msgstr "   (2) 加密用金鑰\n"
 
-#: g10/card-util.c:1705 g10/card-util.c:1797
+#: g10/card-util.c:1718 g10/card-util.c:1810
 msgid "   (3) Authentication key\n"
 msgstr "   (3) 憑證用金鑰\n"
 
-#: g10/card-util.c:1790
+#: g10/card-util.c:1803
 msgid "Please select where to store the key:\n"
 msgstr "請�擇�把金鑰存放在哪裡:\n"
 
-#: g10/card-util.c:1836
+#: g10/card-util.c:1849
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "KEYTOCARD 失敗: %s\n"
 
-#: g10/card-util.c:1941 tools/gpg-card.c:3065
+#: g10/card-util.c:1954 tools/gpg-card.c:3082
 #, fuzzy, c-format
 #| msgid "Note: keys are already stored on the card!\n"
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr "請注�: 金鑰已經存放在�片上了!\n"
 
-#: g10/card-util.c:1944 tools/gpg-card.c:3068 tools/gpg-card.c:3409
+#: g10/card-util.c:1957 tools/gpg-card.c:3085 tools/gpg-card.c:3426
 #, fuzzy
 #| msgid "Continue? (Y/n) "
 msgid "Continue? (y/N) "
 msgstr "是�繼續? (Y/n) "
 
-#: g10/card-util.c:1949 tools/gpg-card.c:3079
+#: g10/card-util.c:1962 tools/gpg-card.c:3096
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2142
+#: g10/card-util.c:2155
 #, fuzzy, c-format
 #| msgid "error closing %s: %s\n"
 msgid "error for setup KDF: %s\n"
 msgstr "關閉 %s 時出錯: %s\n"
 
-#: g10/card-util.c:2188
+#: g10/card-util.c:2201
 #, fuzzy, c-format
 #| msgid "error closing %s: %s\n"
 msgid "error for setup UIF: %s\n"
 msgstr "關閉 %s 時出錯: %s\n"
 
-#: g10/card-util.c:2212 g10/keyedit.c:1263 tools/gpg-card.c:3649
+#: g10/card-util.c:2225 g10/keyedit.c:1263 tools/gpg-card.c:3666
 msgid "quit this menu"
 msgstr "離開這個�單"
 
-#: g10/card-util.c:2214
+#: g10/card-util.c:2227
 msgid "show admin commands"
 msgstr "顯示管�者指令"
 
-#: g10/card-util.c:2215 g10/keyedit.c:1266 tools/gpg-card.c:3652
+#: g10/card-util.c:2228 g10/keyedit.c:1266 tools/gpg-card.c:3669
 msgid "show this help"
 msgstr "顯示這份線上說明"
 
-#: g10/card-util.c:2217 tools/gpg-card.c:3654
+#: g10/card-util.c:2230 tools/gpg-card.c:3671
 msgid "list all available data"
 msgstr "列出所有�用的資料"
 
-#: g10/card-util.c:2220 tools/gpg-card.c:3656
+#: g10/card-util.c:2233 tools/gpg-card.c:3673
 msgid "change card holder's name"
 msgstr "變更�片�有人的�字"
 
-#: g10/card-util.c:2221 tools/gpg-card.c:3657
+#: g10/card-util.c:2234 tools/gpg-card.c:3674
 msgid "change URL to retrieve key"
 msgstr "變更�回金鑰的 URL"
 
-#: g10/card-util.c:2222 tools/gpg-card.c:3658
+#: g10/card-util.c:2235 tools/gpg-card.c:3675
 msgid "fetch the key specified in the card URL"
 msgstr "從�片 URL �回指定的金鑰"
 
-#: g10/card-util.c:2223 tools/gpg-card.c:3659
+#: g10/card-util.c:2236 tools/gpg-card.c:3676
 msgid "change the login name"
 msgstr "變更登入�稱"
 
-#: g10/card-util.c:2224 tools/gpg-card.c:3660
+#: g10/card-util.c:2237 tools/gpg-card.c:3677
 msgid "change the language preferences"
 msgstr "變更介�語言�好設定"
 
-#: g10/card-util.c:2225 tools/gpg-card.c:3661
+#: g10/card-util.c:2238 tools/gpg-card.c:3678
 #, fuzzy
 #| msgid "change card holder's sex"
 msgid "change card holder's salutation"
 msgstr "變更�片�有者的性別"
 
-#: g10/card-util.c:2227 tools/gpg-card.c:3663
+#: g10/card-util.c:2240 tools/gpg-card.c:3680
 msgid "change a CA fingerprint"
 msgstr "變更�個憑證中心 (CA) 的指紋"
 
-#: g10/card-util.c:2228 tools/gpg-card.c:3664
+#: g10/card-util.c:2241 tools/gpg-card.c:3681
 msgid "toggle the signature force PIN flag"
 msgstr "切�簽章是�強制使用個人識別碼 (PIN) 的旗標"
 
-#: g10/card-util.c:2229 tools/gpg-card.c:3665
+#: g10/card-util.c:2242 tools/gpg-card.c:3682
 msgid "generate new keys"
 msgstr "產生新的金鑰"
 
-#: g10/card-util.c:2230 tools/gpg-card.c:3666
+#: g10/card-util.c:2243 tools/gpg-card.c:3683
 msgid "menu to change or unblock the PIN"
 msgstr "變更或�設個人識別碼 (PIN) 的�單"
 
-#: g10/card-util.c:2231 tools/gpg-card.c:3667
+#: g10/card-util.c:2244 tools/gpg-card.c:3684
 msgid "verify the PIN and list all data"
 msgstr "驗證個人識別碼 (PIN) 並列出所有的資料"
 
-#: g10/card-util.c:2232 tools/gpg-card.c:3668
+#: g10/card-util.c:2245 tools/gpg-card.c:3685
 msgid "unblock the PIN using a Reset Code"
 msgstr "用�設碼來解�個人識別碼 (PIN)"
 
-#: g10/card-util.c:2233 tools/gpg-card.c:3672
+#: g10/card-util.c:2246 tools/gpg-card.c:3689
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2235
+#: g10/card-util.c:2248
 #, fuzzy
 #| msgid "|NAME|use user NAME for authentication"
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr "|�字|使用指定�字�為�證用的使用者�稱"
 
-#: g10/card-util.c:2236
+#: g10/card-util.c:2249
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "更改主觀信任"
 
-#: g10/card-util.c:2237 tools/gpg-card.c:3674
+#: g10/card-util.c:2250 tools/gpg-card.c:3691
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the User Interaction Flag"
 msgstr "更改主觀信任"
 
-#: g10/card-util.c:2361 tools/gpg-card.c:3924
+#: g10/card-util.c:2374 tools/gpg-card.c:3941
 msgid "gpg/card> "
 msgstr "gpg/�片> "
 
-#: g10/card-util.c:2402
+#: g10/card-util.c:2415
 msgid "Admin-only command\n"
 msgstr "�管�者使用的指令\n"
 
-#: g10/card-util.c:2433
+#: g10/card-util.c:2446
 msgid "Admin commands are allowed\n"
 msgstr "�許使用管�者指令\n"
 
-#: g10/card-util.c:2435
+#: g10/card-util.c:2448
 msgid "Admin commands are not allowed\n"
 msgstr "未�許使用管�者指令\n"
 
-#: g10/card-util.c:2546 g10/keyedit.c:2275 tools/gpg-card.c:3814
-#: tools/gpg-card.c:4072
+#: g10/card-util.c:2559 g10/keyedit.c:2275 tools/gpg-card.c:3831
+#: tools/gpg-card.c:4089
 #, c-format
 msgid "Invalid command  (try \"help\")\n"
 msgstr "無效的指令  (試試看 \"help\")\n"
@@ -2196,22 +2211,22 @@ msgstr "無效的指令  (試試看 \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output 在這個指令中沒有作用\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5293 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:247 g10/gpg.c:5292 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:1934 g10/export.c:2342 g10/export.c:2463
-#: g10/getkey.c:1907 g10/gpg.c:5238 g10/keyedit.c:1450 g10/keyedit.c:2382
-#: g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:703 g10/keyserver.c:1240
-#: g10/revoke.c:230 g10/tofu.c:2168
+#: g10/getkey.c:2032 g10/gpg.c:5237 g10/keyedit.c:1450 g10/keyedit.c:2382
+#: g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:703 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:2002 g10/getkey.c:1915 g10/getkey.c:4330
-#: g10/gpg.c:5247 g10/keyedit.c:2354 g10/keyserver.c:1258 g10/revoke.c:236
-#: g10/revoke.c:665 g10/tofu.c:2176
+#: g10/delkey.c:90 g10/export.c:2002 g10/getkey.c:2040 g10/getkey.c:4455
+#: g10/gpg.c:5246 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"
 msgstr "讀�金鑰�塊時出錯: %s\n"
@@ -2333,15 +2348,15 @@ msgstr "你�該將 '%s' 編密演算法用於 %s 模�\n"
 msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:555 g10/encrypt.c:808 g10/decrypt-data.c:261 g10/gpg.c:4083
-#: g10/gpg.c:4130 sm/decrypt.c:742 sm/encrypt.c:691 sm/gpgsm.c:1793
+#: g10/encrypt.c:555 g10/encrypt.c:808 g10/decrypt-data.c:261 g10/gpg.c:4080
+#: g10/gpg.c:4127 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1646
 #, 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:564 g10/gpg.c:4095 g10/gpg.c:4142 g10/sig-check.c:155
-#: g10/sign.c:452 sm/gpgsm.c:1803 sm/gpgsm.c:1813 sm/sign.c:596 sm/verify.c:510
+#: g10/encrypt.c:564 g10/gpg.c:4092 g10/gpg.c:4139 g10/sig-check.c:155
+#: g10/sign.c:452 sm/gpgsm.c:1656 sm/gpgsm.c:1666 sm/sign.c:596 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"
@@ -2358,7 +2373,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "警告: 強迫使用 %s (%d) �稱�編密法會��收件者�好設定\n"
 
-#: g10/encrypt.c:838 sm/encrypt.c:766
+#: g10/encrypt.c:838 sm/encrypt.c:767
 #, fuzzy, c-format
 #| msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
@@ -2388,7 +2403,7 @@ msgstr "%s/%s 已加密給: \"%s\"\n"
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "你�能夠將 %s 用於 %s 模�中\n"
 
-#: g10/decrypt-data.c:239 g10/mainproc.c:380 sm/decrypt.c:494
+#: g10/decrypt-data.c:239 g10/mainproc.c:380 sm/decrypt.c:892
 #, fuzzy, c-format
 #| msgid "%s encrypted data\n"
 msgid "%s.%s encrypted data\n"
@@ -2399,7 +2414,7 @@ msgstr "%s 已加密的資料\n"
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "以 %d 未知演算法所加密\n"
 
-#: g10/decrypt-data.c:361 g10/decrypt-data.c:414 sm/decrypt.c:508
+#: g10/decrypt-data.c:361 g10/decrypt-data.c:414 sm/decrypt.c:906
 #, c-format
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -2438,7 +2453,7 @@ msgstr ""
 msgid " - skipped"
 msgstr " - 已跳�"
 
-#: g10/export.c:1333 g10/import.c:2124 g10/openfile.c:202 g10/openfile.c:296
+#: g10/export.c:1333 g10/import.c:2132 g10/openfile.c:202 g10/openfile.c:296
 #: g10/sign.c:1110 g10/sign.c:1447
 #, c-format
 msgid "writing to '%s'\n"
@@ -2474,64 +2489,64 @@ msgstr "建立 '%s' 時出錯: %s\n"
 msgid "[User ID not found]"
 msgstr "[找�到使用者 ID]"
 
-#: g10/getkey.c:1199
+#: g10/getkey.c:1324
 #, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "已自動�回 '%s' (經由 %s )\n"
 
-#: g10/getkey.c:1205
+#: g10/getkey.c:1330
 #, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "�得 '%s' (經由 %s ) 時出錯: %s\n"
 
-#: g10/getkey.c:1207
+#: g10/getkey.c:1332
 msgid "No fingerprint"
 msgstr "沒有指紋"
 
-#: g10/getkey.c:1449
+#: g10/getkey.c:1574
 #, c-format
 msgid "checking for a fresh copy of an expired key via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1884 g10/revoke.c:657 g10/revoke.c:718
+#: g10/getkey.c:2009 g10/revoke.c:658 g10/revoke.c:719
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "找�到�鑰 \"%s\": %s\n"
 
-#: g10/getkey.c:1887 g10/pkclist.c:1012
+#: g10/getkey.c:2012 g10/pkclist.c:1012
 #, fuzzy, c-format
 #| msgid "missing argument for option \"%.50s\"\n"
 msgid "(check argument of option '%s')\n"
 msgstr "\"%.50s\" �項�失了引數\n"
 
-#: g10/getkey.c:1965
+#: g10/getkey.c:2090
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "|�字|使用指定�字�為�設�鑰"
 
-#: g10/getkey.c:1973
+#: g10/getkey.c:2098
 #, fuzzy, c-format
 #| msgid "|NAME|use NAME as default secret key"
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "|�字|使用指定�字�為�設�鑰"
 
-#: g10/getkey.c:1980
+#: g10/getkey.c:2105
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr ""
 
-#: g10/getkey.c:2837
+#: g10/getkey.c:2962
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "無效的金鑰 %s �以藉由 --allow-non-selfsigned-uid 而生效\n"
 
-#: g10/getkey.c:3703
+#: g10/getkey.c:3828
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "使用�鑰 %s 來替�主鑰 %s\n"
 
-#: g10/getkey.c:4259 g10/gpg.c:2167
+#: g10/getkey.c:4384 g10/gpg.c:2168
 #, fuzzy, c-format
 #| msgid "invalid argument for option \"%.50s\"\n"
 msgid "valid values for option '%s':\n"
@@ -2725,7 +2740,7 @@ msgstr "|SPEC|設定電�郵件別�"
 msgid "use strict OpenPGP behavior"
 msgstr "使用嚴謹的 OpenPGP 行為"
 
-#: g10/gpg.c:651 kbx/kbxutil.c:91 sm/gpgsm.c:424 tools/gpgconf.c:113
+#: g10/gpg.c:651 kbx/kbxutil.c:91 sm/gpgsm.c:425 tools/gpgconf.c:113
 msgid "do not make any changes"
 msgstr "���任何改變"
 
@@ -2761,7 +2776,7 @@ msgstr "使用標準的文字模�"
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|設定壓縮等級為 N (0 表示�壓縮)"
 
-#: g10/gpg.c:762 sm/gpgsm.c:357
+#: g10/gpg.c:762 sm/gpgsm.c:358
 #, fuzzy
 #| msgid "Options controlling the interactivity and enforcement"
 msgid "Options controlling key import and export"
@@ -2783,11 +2798,11 @@ msgstr "從金鑰伺�器匯入金鑰"
 msgid "include the public key in signatures"
 msgstr "列出並檢查金鑰簽章"
 
-#: g10/gpg.c:776 sm/gpgsm.c:360
+#: g10/gpg.c:776 sm/gpgsm.c:361
 msgid "disable all access to the dirmngr"
 msgstr "�用所有的 dirmngr 存�"
 
-#: g10/gpg.c:788 sm/gpgsm.c:367
+#: g10/gpg.c:788 sm/gpgsm.c:368
 #, fuzzy
 #| msgid "Options controlling the configuration"
 msgid "Options controlling key listings"
@@ -2807,15 +2822,15 @@ msgstr "|使用者-ID|以指定使用者 ID 作為加密�象"
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|使用者-ID|拿指定使用者 ID 來簽署或解密"
 
-#: g10/gpg.c:876 sm/gpgsm.c:408
+#: g10/gpg.c:876 sm/gpgsm.c:409
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:895 sm/gpgsm.c:420 dirmngr/dirmngr.c:286
+#: g10/gpg.c:895 sm/gpgsm.c:421 dirmngr/dirmngr.c:289
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:966 sm/gpgsm.c:453
+#: g10/gpg.c:966 sm/gpgsm.c:454
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2867,7 +2882,7 @@ msgstr ""
 "簽署, 檢查, 加密, 解密\n"
 "�設的�作會�輸入資料而定\n"
 
-#: g10/gpg.c:1168 sm/gpgsm.c:636
+#: g10/gpg.c:1168 sm/gpgsm.c:637
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2891,12 +2906,12 @@ msgstr "雜湊: "
 msgid "Compression: "
 msgstr "壓縮: "
 
-#: g10/gpg.c:1274 sm/gpgsm.c:710
+#: g10/gpg.c:1274 sm/gpgsm.c:711
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "用法: %s [�項] %s\n"
 
-#: g10/gpg.c:1467 sm/gpgsm.c:803
+#: g10/gpg.c:1467 sm/gpgsm.c:804
 #, c-format
 msgid "conflicting commands\n"
 msgstr "指令彼此矛盾\n"
@@ -2906,531 +2921,531 @@ msgstr "指令彼此矛盾\n"
 msgid "no = sign found in group definition '%s'\n"
 msgstr "在群組定義 '%s' 裡找�到 = 記號\n"
 
-#: g10/gpg.c:1683
+#: g10/gpg.c:1684
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "警告: 家目錄 '%s' 的所有權並�安全\n"
 
-#: g10/gpg.c:1686
+#: g10/gpg.c:1687
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "警告: 組態檔案 '%s' 的所有權並�安全\n"
 
-#: g10/gpg.c:1689
+#: g10/gpg.c:1690
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "警告: 延伸模組 '%s' 的所有權並�安全\n"
 
-#: g10/gpg.c:1695
+#: g10/gpg.c:1696
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "警告: 家目錄 '%s' 的權�並�安全\n"
 
-#: g10/gpg.c:1698
+#: g10/gpg.c:1699
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "警告: 組態檔案 '%s' 的權�並�安全\n"
 
-#: g10/gpg.c:1701
+#: g10/gpg.c:1702
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "警告: 延伸模組 '%s' 的權�並�安全\n"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1708
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "警告: 家目錄 '%s' 的�入目錄所有權並�安全\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1711
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr "警告: 組態檔案 '%s' 的�入目錄所有權並�安全\n"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1714
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr "警告: 延伸模組 '%s' 的�入目錄所有權並�安全\n"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1720
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr "警告: 家目錄 '%s' 的�入目錄權�並�安全\n"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1723
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 msgstr "警告: 組態檔案 '%s' 的�入目錄權�並�安全\n"
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1726
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr "警告: 延伸模組 '%s' 的�入目錄權�並�安全\n"
 
-#: g10/gpg.c:1941
+#: g10/gpg.c:1942
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "未知的組態項目 '%s'\n"
 
-#: g10/gpg.c:2037
+#: g10/gpg.c:2038
 msgid "display photo IDs during key listings"
 msgstr "列出金鑰時顯示照片 ID"
 
-#: g10/gpg.c:2039
+#: g10/gpg.c:2040
 msgid "show key usage information during key listings"
 msgstr "列出金鑰時顯示金鑰用途資訊"
 
-#: g10/gpg.c:2041
+#: g10/gpg.c:2042
 msgid "show policy URLs during signature listings"
 msgstr "列出簽章時顯示原則 URL"
 
-#: g10/gpg.c:2043
+#: g10/gpg.c:2044
 msgid "show all notations during signature listings"
 msgstr "列出簽章時顯示所有的註記"
 
-#: g10/gpg.c:2045
+#: g10/gpg.c:2046
 msgid "show IETF standard notations during signature listings"
 msgstr "列出簽章時顯示 IETF 標準註記"
 
-#: g10/gpg.c:2049
+#: g10/gpg.c:2050
 msgid "show user-supplied notations during signature listings"
 msgstr "列出簽章時顯示使用者�供的註記"
 
-#: g10/gpg.c:2051
+#: g10/gpg.c:2052
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "列出簽章時顯示�好的金鑰伺�器 URL"
 
-#: g10/gpg.c:2053
+#: g10/gpg.c:2054
 msgid "show user ID validity during key listings"
 msgstr "列出金鑰時顯示使用者 ID 有效性"
 
-#: g10/gpg.c:2055
+#: g10/gpg.c:2056
 msgid "show revoked and expired user IDs in key listings"
 msgstr "列出金鑰時顯示已撤銷或�期的使用者 ID"
 
-#: g10/gpg.c:2057
+#: g10/gpg.c:2058
 msgid "show revoked and expired subkeys in key listings"
 msgstr "列出金鑰時顯示已撤銷或�期的�鑰"
 
-#: g10/gpg.c:2059
+#: g10/gpg.c:2060
 msgid "show the keyring name in key listings"
 msgstr "在金鑰清單中顯示鑰匙圈�稱"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2062
 msgid "show expiration dates during signature listings"
 msgstr "列出簽章時顯示有效期�"
 
-#: g10/gpg.c:2178
+#: g10/gpg.c:2179
 #, fuzzy, c-format
 #| msgid "unknown option '%s'\n"
 msgid "unknown TOFU policy '%s'\n"
 msgstr "未知的�項 '%s'\n"
 
-#: g10/gpg.c:2180
+#: g10/gpg.c:2181
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2975 g10/gpg.c:3828 g10/gpg.c:3840
+#: g10/gpg.c:2978 g10/gpg.c:3825 g10/gpg.c:3837
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "請注�: 一般情�下�採用 %s!\n"
 
-#: g10/gpg.c:3151 g10/gpg.c:3163
+#: g10/gpg.c:3154 g10/gpg.c:3166
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "'%s' �是有效的簽章使用期�\n"
 
-#: g10/gpg.c:3185
+#: g10/gpg.c:3188
 #, 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:3217 sm/gpgsm.c:1270
+#: g10/gpg.c:3220 sm/gpgsm.c:1143
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "無效的個人識別碼項目模� '%s'\n"
 
-#: g10/gpg.c:3223 sm/gpgsm.c:1276
+#: g10/gpg.c:3226 sm/gpgsm.c:1149
 #, fuzzy, c-format
 #| msgid "invalid argument for option \"%.50s\"\n"
 msgid "invalid request origin '%s'\n"
 msgstr "�項 \"%.50s\" 的引數無效\n"
 
-#: g10/gpg.c:3280
+#: g10/gpg.c:3283
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "'%s' �是有效的字元集\n"
 
-#: g10/gpg.c:3302 g10/gpg.c:3511 g10/keyedit.c:5319
+#: g10/gpg.c:3305 g10/gpg.c:3514 g10/keyedit.c:5322
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "無法剖�金鑰伺�器 URL\n"
 
-#: g10/gpg.c:3320
+#: g10/gpg.c:3323
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: 無效的金鑰伺�器�項\n"
 
-#: g10/gpg.c:3323
+#: g10/gpg.c:3326
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "無效的金鑰伺�器�項\n"
 
-#: g10/gpg.c:3330
+#: g10/gpg.c:3333
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: 無效的匯入�項\n"
 
-#: g10/gpg.c:3333
+#: g10/gpg.c:3336
 #, c-format
 msgid "invalid import options\n"
 msgstr "無效的匯入�項\n"
 
-#: g10/gpg.c:3339 g10/gpg.c:3354
+#: g10/gpg.c:3342 g10/gpg.c:3357
 #, fuzzy, c-format
 #| msgid "invalid list options\n"
 msgid "invalid filter option: %s\n"
 msgstr "無效的清單�項\n"
 
-#: g10/gpg.c:3345
+#: g10/gpg.c:3348
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: 無效的匯出�項\n"
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3351
 #, c-format
 msgid "invalid export options\n"
 msgstr "無效的匯出�項\n"
 
-#: g10/gpg.c:3360
+#: g10/gpg.c:3363
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: 無效的清單�項\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3366
 #, c-format
 msgid "invalid list options\n"
 msgstr "無效的清單�項\n"
 
-#: g10/gpg.c:3371
+#: g10/gpg.c:3374
 msgid "display photo IDs during signature verification"
 msgstr "驗證簽章時顯示照片 ID"
 
-#: g10/gpg.c:3373
+#: g10/gpg.c:3376
 msgid "show policy URLs during signature verification"
 msgstr "驗證簽章時顯示原則 URL"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3378
 msgid "show all notations during signature verification"
 msgstr "驗證簽章時顯示所有的註記"
 
-#: g10/gpg.c:3377
+#: g10/gpg.c:3380
 msgid "show IETF standard notations during signature verification"
 msgstr "驗證簽章時顯示 IETF 標準註記"
 
-#: g10/gpg.c:3381
+#: g10/gpg.c:3384
 msgid "show user-supplied notations during signature verification"
 msgstr "驗證簽章時顯示使用者�供的註記"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3386
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "驗證簽章時顯示�好的金鑰伺�器 URL"
 
-#: g10/gpg.c:3385
+#: g10/gpg.c:3388
 msgid "show user ID validity during signature verification"
 msgstr "驗證簽章時顯示使用者 ID 有效性"
 
-#: g10/gpg.c:3387
+#: g10/gpg.c:3390
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "驗證簽章時顯示已撤銷或�期的使用者 ID"
 
-#: g10/gpg.c:3389
+#: g10/gpg.c:3392
 msgid "show only the primary user ID in signature verification"
 msgstr "驗證簽章時祇顯示主�的使用者 ID"
 
-#: g10/gpg.c:3396
+#: g10/gpg.c:3399
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: 無效的驗證�項\n"
 
-#: g10/gpg.c:3399
+#: g10/gpg.c:3402
 #, c-format
 msgid "invalid verify options\n"
 msgstr "無效的驗證�項\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3409
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "無法把執行檔路徑設� %s\n"
 
-#: g10/gpg.c:3613
+#: g10/gpg.c:3616
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: 無效的自動金鑰定�清單\n"
 
-#: g10/gpg.c:3616
+#: g10/gpg.c:3619
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "無效的自動金鑰定�清單\n"
 
-#: g10/gpg.c:3625
+#: g10/gpg.c:3628
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "�項 \"%.50s\" 的引數無效\n"
 
-#: g10/gpg.c:3807 sm/gpgsm.c:1675
+#: g10/gpg.c:3804 sm/gpgsm.c:1528
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告: 程��能會傾�出核心檔!\n"
 
-#: g10/gpg.c:3821
+#: g10/gpg.c:3818
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "警告: %s 會推翻 %s\n"
 
-#: g10/gpg.c:3830
+#: g10/gpg.c:3827
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ��許跟 %s 併用!\n"
 
-#: g10/gpg.c:3833
+#: g10/gpg.c:3830
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s 跟 %s 放在一起沒有�義!\n"
 
-#: g10/gpg.c:3848 sm/gpgsm.c:1696 dirmngr/dirmngr.c:1123
+#: g10/gpg.c:3845 sm/gpgsm.c:1549 dirmngr/dirmngr.c:1160
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "警告: 正在�造的系統時間中執行: "
 
-#: g10/gpg.c:3869
+#: g10/gpg.c:3866
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "因為 %s 而�會在�安全的記憶體中執行\n"
 
-#: g10/gpg.c:3897 g10/gpg.c:3928 sm/gpgsm.c:1763
+#: g10/gpg.c:3894 g10/gpg.c:3925 sm/gpgsm.c:1616
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所�的編密演算法無效\n"
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3901
 #, fuzzy, c-format
 #| msgid "selected digest algorithm is invalid\n"
 msgid "selected AEAD algorithm is invalid\n"
 msgstr "所�的摘�演算法無效\n"
 
-#: g10/gpg.c:3916
+#: g10/gpg.c:3913
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "所�的壓縮演算法無效\n"
 
-#: g10/gpg.c:3922
+#: g10/gpg.c:3919
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "所�的憑證摘�演算法無效\n"
 
-#: g10/gpg.c:3937
+#: g10/gpg.c:3934
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed 一定�大於 0\n"
 
-#: g10/gpg.c:3939
+#: g10/gpg.c:3936
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed 一定�大於 1\n"
 
-#: g10/gpg.c:3941
+#: g10/gpg.c:3938
 #, 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:3943
+#: g10/gpg.c:3940
 #, 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:3945
+#: g10/gpg.c:3942
 #, 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:3949
+#: g10/gpg.c:3946
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "請注�: 強烈�建議使用單純 S2K 模� (0)\n"
 
-#: g10/gpg.c:3953
+#: g10/gpg.c:3950
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "無效的 S2K 模�; 一定�是 0, 1 或 3\n"
 
-#: g10/gpg.c:3960
+#: g10/gpg.c:3957
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "無效的�設�好\n"
 
-#: g10/gpg.c:3964
+#: g10/gpg.c:3961
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "無效的個人編密法�好\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3964
 #, fuzzy, c-format
 #| msgid "invalid personal cipher preferences\n"
 msgid "invalid personal AEAD preferences\n"
 msgstr "無效的個人編密法�好\n"
 
-#: g10/gpg.c:3971
+#: g10/gpg.c:3968
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "無效的個人摘��好\n"
 
-#: g10/gpg.c:3975
+#: g10/gpg.c:3972
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "無效的個人壓縮�好\n"
 
-#: g10/gpg.c:3984 g10/gpg.c:3989
+#: g10/gpg.c:3981 g10/gpg.c:3986
 #, fuzzy, c-format
 #| msgid "keysize invalid; using %u bits\n"
 msgid "chunk size invalid - using %d\n"
 msgstr "金鑰尺寸無效; 改用 %u �元\n"
 
-#: g10/gpg.c:4026
+#: g10/gpg.c:4023
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s 還沒辦法跟 %s 一起�作\n"
 
-#: g10/gpg.c:4089
+#: g10/gpg.c:4086
 #, 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:4101
+#: g10/gpg.c:4098
 #, 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:4256
+#: g10/gpg.c:4253
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "信任資料庫啟始失敗: %s\n"
 
-#: g10/gpg.c:4268
+#: g10/gpg.c:4265
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "警告: 給定的收件者 (-r) 未使用公鑰加密\n"
 
-#: g10/gpg.c:4340
+#: g10/gpg.c:4337
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "'%s' �稱�加密失敗: %s\n"
 
-#: g10/gpg.c:4369
+#: g10/gpg.c:4366
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "你�能在 --s2k-mode 0 中使用 --symmetric --encrypt\n"
 
-#: g10/gpg.c:4372
+#: g10/gpg.c:4369
 #, 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:4430
+#: g10/gpg.c:4427
 #, 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:4433
+#: g10/gpg.c:4430
 #, 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:4821 g10/keyserver.c:1870
+#: g10/gpg.c:4818 g10/keyserver.c:1629
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "�至金鑰伺�器失敗: %s\n"
 
-#: g10/gpg.c:4826
+#: g10/gpg.c:4823
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "從金鑰伺�器接收失敗: %s\n"
 
-#: g10/gpg.c:4832
+#: g10/gpg.c:4829
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "金鑰匯出失敗: %s\n"
 
-#: g10/gpg.c:4845
+#: g10/gpg.c:4842
 #, fuzzy, c-format
 #| msgid "key export failed: %s\n"
 msgid "export as ssh key failed: %s\n"
 msgstr "金鑰匯出失敗: %s\n"
 
-#: g10/gpg.c:4857
+#: g10/gpg.c:4854
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "用金鑰伺�器�尋失敗: %s\n"
 
-#: g10/gpg.c:4870
+#: g10/gpg.c:4867
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "從金鑰伺�器更新失敗: %s\n"
 
-#: g10/gpg.c:4937
+#: g10/gpg.c:4936
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "解開��失敗: %s\n"
 
-#: g10/gpg.c:4948
+#: g10/gpg.c:4947
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "進行��失敗: %s\n"
 
-#: g10/gpg.c:5053
+#: g10/gpg.c:5052
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "無效的雜湊演算法 '%s'\n"
 
-#: g10/gpg.c:5205 g10/tofu.c:2156
+#: g10/gpg.c:5204 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:5216
+#: g10/gpg.c:5215
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5272
+#: g10/gpg.c:5271
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5283
+#: g10/gpg.c:5282
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "請開始輸入你的訊� ...\n"
 
-#: g10/gpg.c:5630
+#: g10/gpg.c:5629
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "給定的的憑證原則 URL 無效\n"
 
-#: g10/gpg.c:5632
+#: g10/gpg.c:5631
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "給定的簽章原則 URL 無效\n"
 
-#: g10/gpg.c:5665
+#: g10/gpg.c:5664
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "給定的�好金鑰伺�器 URL 無效\n"
@@ -3443,7 +3458,7 @@ msgstr "|檔案|從指定鑰匙圈檔案裡�用金鑰"
 msgid "make timestamp conflicts only a warning"
 msgstr "僅把時間戳�矛盾視為警告"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:414 tools/gpgconf.c:116 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:415 tools/gpgconf.c:116 tools/gpg-card.c:95
 msgid "|FD|write status info to this FD"
 msgstr "|檔案�述|把狀態資訊寫入此指定檔案�述"
 
@@ -3540,270 +3555,270 @@ msgstr "�設輸入的是二進制格�"
 msgid "repair keys on import"
 msgstr "顯示金鑰指紋"
 
-#: g10/import.c:399 g10/import.c:721
+#: g10/import.c:407 g10/import.c:729
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "正在跳� %d 型態的�塊\n"
 
-#: g10/import.c:738
+#: g10/import.c:746
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "目�已處� %lu 把金鑰\n"
 
-#: g10/import.c:831
+#: g10/import.c:839
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "處�總�: %lu\n"
 
-#: g10/import.c:834
+#: g10/import.c:842
 #, fuzzy, c-format
 #| msgid "      skipped new keys: %lu\n"
 msgid "    skipped PGP-2 keys: %lu\n"
 msgstr "        已跳�的新金鑰: %lu\n"
 
-#: g10/import.c:836
+#: g10/import.c:844
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "        已跳�的新金鑰: %lu\n"
 
-#: g10/import.c:839
+#: g10/import.c:847
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "       沒有使用者的 ID: %lu\n"
 
-#: g10/import.c:842 sm/import.c:129
+#: g10/import.c:850 sm/import.c:129
 #, c-format
 msgid "              imported: %lu"
 msgstr "                已匯入: %lu"
 
-#: g10/import.c:846 sm/import.c:133
+#: g10/import.c:854 sm/import.c:133
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "              未改變的: %lu\n"
 
-#: g10/import.c:848
+#: g10/import.c:856
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "         新的使用者 ID: %lu\n"
 
-#: g10/import.c:850
+#: g10/import.c:858
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "              新的�鑰: %lu\n"
 
-#: g10/import.c:852
+#: g10/import.c:860
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "              新的簽章: %lu\n"
 
-#: g10/import.c:854
+#: g10/import.c:862
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "          新的金鑰撤銷: %lu\n"
 
-#: g10/import.c:856 sm/import.c:135
+#: g10/import.c:864 sm/import.c:135
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "          已讀�的�鑰: %lu\n"
 
-#: g10/import.c:858 sm/import.c:137
+#: g10/import.c:866 sm/import.c:137
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "          已匯入的�鑰: %lu\n"
 
-#: g10/import.c:860 sm/import.c:139
+#: g10/import.c:868 sm/import.c:139
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "          未改變的�鑰: %lu\n"
 
-#: g10/import.c:862 sm/import.c:141
+#: g10/import.c:870 sm/import.c:141
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "              未被匯入: %lu\n"
 
-#: g10/import.c:864
+#: g10/import.c:872
 #, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "      已清除的簽章: %lu\n"
 
-#: g10/import.c:866
+#: g10/import.c:874
 #, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr " 已清除的使用者 ID: %lu\n"
 
-#: g10/import.c:1291
+#: g10/import.c:1299
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr "警告: 金鑰 %s 的�好設定�有這些使用者 ID 無法使用的演算法:\n"
 
-#: g10/import.c:1333
+#: g10/import.c:1341
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": 編密演算法 %s 的�好設定\n"
 
-#: g10/import.c:1351
+#: g10/import.c:1359
 #, fuzzy, c-format
 #| msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgid "         \"%s\": preference for AEAD algorithm %s\n"
 msgstr "         \"%s\": 編密演算法 %s 的�好設定\n"
 
-#: g10/import.c:1366
+#: g10/import.c:1374
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": 摘�演算法 %s 的�好設定\n"
 
-#: g10/import.c:1378
+#: g10/import.c:1386
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": 壓縮演算法 %s 的�好設定\n"
 
-#: g10/import.c:1391
+#: g10/import.c:1399
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "我們強烈建議你更新�好設定, 並�新\n"
 
-#: g10/import.c:1393
+#: g10/import.c:1401
 #, c-format
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr "散佈此金鑰, 以��潛在的演算法�一致�題.\n"
 
-#: g10/import.c:1418
+#: g10/import.c:1426
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "你�以�這樣來更新�好設定: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:1932 g10/import.c:3053
+#: g10/import.c:1940 g10/import.c:3061
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "金鑰 %s: 沒有使用者 ID\n"
 
-#: g10/import.c:1938
+#: g10/import.c:1946
 #, c-format
 msgid "key %s: %s\n"
 msgstr "金鑰 %s: %s\n"
 
-#: g10/import.c:1939 g10/import.c:3025
+#: g10/import.c:1947 g10/import.c:3033
 msgid "rejected by import screener"
 msgstr "�到匯入篩�程��回"
 
-#: g10/import.c:1988
+#: g10/import.c:1996
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "金鑰 %s: PKS �鑰的訛誤已被修復\n"
 
-#: g10/import.c:2009
+#: g10/import.c:2017
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "金鑰 %s: 已接��自我簽署的使用者 ID \"%s\"\n"
 
-#: g10/import.c:2020 g10/import.c:2051
+#: g10/import.c:2028 g10/import.c:2059
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "金鑰 %s: 沒有有效的使用者 ID\n"
 
-#: g10/import.c:2022
+#: g10/import.c:2030
 #, c-format
 msgid "this may be caused by a missing self-signature\n"
 msgstr "這�能肇因於�失自我簽章所致\n"
 
-#: g10/import.c:2101 g10/import.c:3439
+#: g10/import.c:2109 g10/import.c:3447
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "金鑰 %s: 找�到公鑰: %s\n"
 
-#: g10/import.c:2107
+#: g10/import.c:2115
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "金鑰 %s: 新的金鑰 - 已跳�\n"
 
-#: g10/import.c:2119
+#: g10/import.c:2127
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "找�到�寫入的鑰匙圈: %s\n"
 
-#: g10/import.c:2151 g10/import.c:2253 g10/import.c:3514
+#: g10/import.c:2159 g10/import.c:2261 g10/import.c:3522
 #, c-format
 msgid "error writing keyring '%s': %s\n"
 msgstr "寫入鑰匙圈 '%s' 時出錯: %s\n"
 
-#: g10/import.c:2174
+#: g10/import.c:2182
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "金鑰 %s: 公鑰 \"%s\" 已匯入\n"
 
-#: g10/import.c:2201
+#: g10/import.c:2209
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "金鑰 %s: 跟我們的副本���\n"
 
-#: g10/import.c:2269
+#: g10/import.c:2277
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "金鑰 %s: \"%s\" 1 個新的使用者 ID\n"
 
-#: g10/import.c:2272
+#: g10/import.c:2280
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "金鑰 %s: \"%s\" %d 個新的使用者 ID\n"
 
-#: g10/import.c:2275
+#: g10/import.c:2283
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "金鑰 %s: \"%s\" 1 份新的簽章\n"
 
-#: g10/import.c:2278
+#: g10/import.c:2286
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "金鑰 %s: \"%s\" %d 份新的簽章\n"
 
-#: g10/import.c:2281
+#: g10/import.c:2289
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "金鑰 %s: \"%s\" 1 把新的�鑰\n"
 
-#: g10/import.c:2284
+#: g10/import.c:2292
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "金鑰 %s: \"%s\" %d 把新的�鑰\n"
 
-#: g10/import.c:2287
+#: g10/import.c:2295
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "金鑰 %s: \"%s\" 已清除 %d 份簽章\n"
 
-#: g10/import.c:2290
+#: g10/import.c:2298
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "金鑰 %s: \"%s\" 已清除 %d 份簽章\n"
 
-#: g10/import.c:2293
+#: g10/import.c:2301
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "金鑰 %s: \"%s\" 已清除 %d 個使用者 ID\n"
 
-#: g10/import.c:2296
+#: g10/import.c:2304
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "金鑰 %s: \"%s\" 已清除 %d 個使用者 ID\n"
 
-#: g10/import.c:2332
+#: g10/import.c:2340
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "金鑰 %s: \"%s\" 未改變\n"
 
-#: g10/import.c:2692 g10/import.c:2887
+#: g10/import.c:2700 g10/import.c:2895
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "金鑰 %s: �鑰已匯入\n"
 
-#: g10/import.c:2700
+#: g10/import.c:2708
 #, c-format
 msgid "key %s: secret key already exists\n"
 msgstr "金鑰 %s: �鑰已存在\n"
 
-#: g10/import.c:2708
+#: g10/import.c:2716
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "金鑰 %s: �至代�程�時出錯: %s\n"
@@ -3816,142 +3831,142 @@ msgstr "金鑰 %s: �至代�程�時出錯: %s\n"
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2877
+#: g10/import.c:2885
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:3024
+#: g10/import.c:3032
 #, c-format
 msgid "secret key %s: %s\n"
 msgstr "�鑰 %s: %s\n"
 
-#: g10/import.c:3045 g10/import.c:3084
+#: g10/import.c:3053 g10/import.c:3092
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "未�許匯入�鑰\n"
 
-#: g10/import.c:3072
+#: g10/import.c:3080
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "金鑰 %s: �鑰使用了無效的 %d 編密法 - 已跳�\n"
 
-#: g10/import.c:3234 g10/pkclist.c:75 g10/revoke.c:774
+#: g10/import.c:3242 g10/pkclist.c:75 g10/revoke.c:775
 msgid "No reason specified"
 msgstr "未指定原因"
 
-#: g10/import.c:3235 g10/pkclist.c:77 g10/revoke.c:776
+#: g10/import.c:3243 g10/pkclist.c:77 g10/revoke.c:777
 msgid "Key is superseded"
 msgstr "金鑰被代�了"
 
-#: g10/import.c:3236 g10/pkclist.c:79 g10/revoke.c:775
+#: g10/import.c:3244 g10/pkclist.c:79 g10/revoke.c:776
 msgid "Key has been compromised"
 msgstr "金鑰已經被洩�了"
 
-#: g10/import.c:3237 g10/pkclist.c:81 g10/revoke.c:777
+#: g10/import.c:3245 g10/pkclist.c:81 g10/revoke.c:778
 msgid "Key is no longer used"
 msgstr "金鑰��被使用了"
 
-#: g10/import.c:3238 g10/pkclist.c:83 g10/revoke.c:778
+#: g10/import.c:3246 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "使用者 ID ��有效了"
 
-#: g10/import.c:3363 g10/keylist.c:1105 g10/pkclist.c:87
+#: g10/import.c:3371 g10/keylist.c:1105 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "撤銷原因: "
 
-#: g10/import.c:3382 g10/keylist.c:1124 g10/pkclist.c:103
+#: g10/import.c:3390 g10/keylist.c:1124 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "撤銷註釋: "
 
-#: g10/import.c:3432
+#: g10/import.c:3440
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "金鑰 %s: 沒有公鑰 - 無法套用撤銷憑證\n"
 
-#: g10/import.c:3461
+#: g10/import.c:3469
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "金鑰 %s: 無法定�原始的金鑰�塊: %s\n"
 
-#: g10/import.c:3468
+#: g10/import.c:3476
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "金鑰 %s: 無法讀�原始的金鑰�塊: %s\n"
 
-#: g10/import.c:3488
+#: g10/import.c:3496
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "金鑰 %s: 無效的撤銷憑證: %s - 已�回\n"
 
-#: g10/import.c:3523
+#: g10/import.c:3531
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "金鑰 %s: \"%s\" 撤銷憑證已匯入\n"
 
-#: g10/import.c:3609
+#: g10/import.c:3617
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "金鑰 %s: 簽章沒有使用者 ID\n"
 
-#: g10/import.c:3626
+#: g10/import.c:3634
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "金鑰 %s: 使用者 ID \"%s\" 用了未支�的公鑰演算法\n"
 
-#: g10/import.c:3628
+#: g10/import.c:3636
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "金鑰 %s: 使用者 ID \"%s\" 的自我簽章無效\n"
 
-#: g10/import.c:3645 g10/import.c:3673 g10/import.c:3729
+#: g10/import.c:3653 g10/import.c:3681 g10/import.c:3737
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "金鑰 %s: 未支�的公鑰演算法\n"
 
-#: g10/import.c:3646
+#: g10/import.c:3654
 #, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "金鑰 %s: 無效的直接金鑰簽章\n"
 
-#: g10/import.c:3660
+#: g10/import.c:3668
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "金鑰 %s: 沒有�供附帶的�鑰\n"
 
-#: g10/import.c:3675
+#: g10/import.c:3683
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "金鑰 %s: 無效的附帶�鑰\n"
 
-#: g10/import.c:3694
+#: g10/import.c:3702
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "金鑰 %s: 多�附帶�鑰已移除\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3726
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "金鑰 %s: 沒有�鑰�供金鑰撤銷\n"
 
-#: g10/import.c:3731
+#: g10/import.c:3739
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "金鑰 %s: 無效的�鑰撤銷\n"
 
-#: g10/import.c:3746
+#: g10/import.c:3754
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "金鑰 %s: 多��鑰撤銷已移除\n"
 
-#: g10/import.c:3790
+#: g10/import.c:3798
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "金鑰 %s: 使用者 ID \"%s\" 已跳�\n"
 
-#: g10/import.c:3817
+#: g10/import.c:3825
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "金鑰 %s: �鑰已跳�\n"
@@ -3960,64 +3975,63 @@ msgstr "金鑰 %s: �鑰已跳�\n"
 #  * to import non-exportable signature when we have the
 #  * the secret key used to create this signature - it
 #  * seems that this makes sense
-#: g10/import.c:3849
+#: g10/import.c:3857
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "金鑰 %s: ��匯出的簽章 (等級 0x%02X) - 已跳�\n"
 
-#: g10/import.c:3860
+#: g10/import.c:3868
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "金鑰 %s: 撤銷憑證在錯誤的地方 - 已跳�\n"
 
-#: g10/import.c:3878
+#: g10/import.c:3886
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "金鑰 %s: 無效的撤銷憑證: %s - 已跳�\n"
 
-#: g10/import.c:3892
+#: g10/import.c:3900
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "金鑰 %s: �鑰簽章在錯誤的地方 - 已跳�\n"
 
-#: g10/import.c:3900
+#: g10/import.c:3908
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "金鑰 %s: ��期的簽章等級 (0x%02X) - 已跳�\n"
 
-#: g10/import.c:4073
+#: g10/import.c:4081
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "金鑰 %s: �測到�複的使用者 ID - 已�併\n"
 
-#: g10/import.c:4180
+#: g10/import.c:4188
 #, fuzzy, c-format
 #| msgid "key %s: duplicated user ID detected - merged\n"
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr "金鑰 %s: �測到�複的使用者 ID - 已�併\n"
 
-#: g10/import.c:4245
+#: g10/import.c:4253
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "警告: 金鑰 %s �能被撤銷了: 正在�回撤銷金鑰 %s\n"
 
-#: g10/import.c:4261
+#: g10/import.c:4269
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "警告: 金鑰 %s �能被撤銷了: 撤銷金鑰 %s 未出�.\n"
 
-#: g10/import.c:4327
+#: g10/import.c:4335
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "金鑰 %s: 已新增 \"%s\" 撤銷憑證\n"
 
-#: g10/import.c:4365
+#: g10/import.c:4373
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "金鑰 %s: 已新增直接金鑰簽章\n"
 
-#: g10/key-check.c:133 dirmngr/dirmngr_ldap.c:650 dirmngr/ldap-wrapper.c:835
-#: dirmngr/ldap-wrapper.c:852
+#: g10/key-check.c:133 dirmngr/ldap-wrapper.c:835 dirmngr/ldap-wrapper.c:852
 #, c-format
 msgid "error allocating memory: %s\n"
 msgstr "�置記憶體時出錯: %s\n"
@@ -4082,7 +4096,7 @@ msgid ""
 "all signatures.\n"
 msgstr ""
 
-#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:284 sm/keydb.c:297
+#: g10/keydb.c:349 g10/keydb.c:376 sm/keydb.c:289 sm/keydb.c:302
 #, c-format
 msgid "error creating keybox '%s': %s\n"
 msgstr "建立金鑰鑰匙盒 '%s' 時出錯: %s\n"
@@ -4092,7 +4106,7 @@ msgstr "建立金鑰鑰匙盒 '%s' 時出錯: %s\n"
 msgid "error creating keyring '%s': %s\n"
 msgstr "建立鑰匙圈 '%s' 時出錯: %s\n"
 
-#: g10/keydb.c:388 sm/keydb.c:303
+#: g10/keydb.c:388 sm/keydb.c:308
 #, c-format
 msgid "keybox '%s' created\n"
 msgstr "鑰匙盒 '%s' 已建立\n"
@@ -4342,8 +4356,8 @@ msgstr "我�常�心地檢查�這把金鑰了.\n"
 msgid "Really sign? (y/N) "
 msgstr "真的�簽署嗎? (y/N)"
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6192 g10/keyedit.c:6275 g10/keyedit.c:6404
-#: g10/keyedit.c:6466 g10/sign.c:528
+#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
+#: g10/keyedit.c:6474 g10/sign.c:528
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "簽署時失敗: %s\n"
@@ -4716,7 +4730,7 @@ msgstr "沒有相符的使用者 ID."
 msgid "Nothing to sign.\n"
 msgstr "沒有�西�以簽署.\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6057
+#: g10/keyedit.c:2973 g10/keyedit.c:6065
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "並�由你所簽署.\n"
@@ -4787,7 +4801,7 @@ msgstr "這把金鑰�能被 %s 金鑰 %s 所撤銷"
 msgid "(sensitive)"
 msgstr "(機密)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:525
+#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "建立: %s"
@@ -4805,7 +4819,7 @@ msgstr "�期: %s"
 
 #  of subkey
 #: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2262
-#: g10/keyserver.c:531
+#: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "到期: %s"
@@ -4841,13 +4855,13 @@ msgstr ""
 "請注�顯示出來的金鑰有效性�需�更正,\n"
 "除�你�新執行程�.\n"
 
-#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:535
-#: g10/mainproc.c:2280 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
+#: g10/mainproc.c:2282 g10/tofu.c:1789 g10/trust.c:426 dirmngr/ocsp.c:792
 msgid "revoked"
 msgstr "已撤銷"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:539
-#: g10/mainproc.c:2282 g10/tofu.c:1792 g10/trust.c:124
+#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
+#: g10/mainproc.c:2284 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "已�期"
 
@@ -4887,7 +4901,7 @@ msgstr "你確定�然想�增加嗎? (y/N) "
 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:3107
+#: g10/keyedit.c:4273 g10/keygen.c:3111
 msgid "Such a user ID already exists on this key!\n"
 msgstr "這把金鑰上已經有這樣�的使用者 ID 了!\n"
 
@@ -5036,7 +5050,7 @@ msgstr "�鑰 %s ��簽署之用, 因此無須交�驗證\n"
 msgid "Please select exactly one user ID.\n"
 msgstr "請祇�擇一個使用者 ID.\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5357 g10/keyedit.c:5495
+#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "正在跳�使用者 ID \"%s\" 的 v3 自我簽章\n"
@@ -5045,129 +5059,129 @@ msgstr "正在跳�使用者 ID \"%s\" 的 v3 自我簽章\n"
 msgid "Enter your preferred keyserver URL: "
 msgstr "請輸入你的�好金鑰伺�器 URL: "
 
-#: g10/keyedit.c:5380
+#: g10/keyedit.c:5383
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "你確定��代它嗎？ (y/N) "
 
-#: g10/keyedit.c:5381
+#: g10/keyedit.c:5384
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "你確定�刪除它嗎？ (y/N) "
 
-#: g10/keyedit.c:5441
+#: g10/keyedit.c:5449
 msgid "Enter the notation: "
 msgstr "請輸入註記: "
 
-#: g10/keyedit.c:5588
+#: g10/keyedit.c:5596
 msgid "Proceed? (y/N) "
 msgstr "是�繼續? (y/N) "
 
-#: g10/keyedit.c:5658
+#: g10/keyedit.c:5666
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "索引 %d 沒有�應到使用者 ID\n"
 
-#: g10/keyedit.c:5720
+#: g10/keyedit.c:5728
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "雜湊 %s 沒有�應到使用者 ID\n"
 
-#: g10/keyedit.c:5821
+#: g10/keyedit.c:5829
 #, fuzzy, c-format
 #| msgid "No subkey with index %d\n"
 msgid "No subkey with key ID '%s'.\n"
 msgstr "索引 %d 沒有�應到�鑰\n"
 
-#: g10/keyedit.c:5843
+#: g10/keyedit.c:5851
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "索引 %d 沒有�應到�鑰\n"
 
-#: g10/keyedit.c:5984
+#: g10/keyedit.c:5992
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "使用者 ID: \"%s\"\n"
 
-#: g10/keyedit.c:5987 g10/keyedit.c:6089 g10/keyedit.c:6137
+#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "已被你的金鑰 %s 於 %s%s%s 所簽署\n"
 
-#: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
+#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
 msgid " (non-exportable)"
 msgstr " (��匯出)"
 
-#: g10/keyedit.c:5993
+#: g10/keyedit.c:6001
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "這份簽章已經在 %s �期了.\n"
 
-#: g10/keyedit.c:5998
+#: g10/keyedit.c:6006
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "你確定�然想�撤銷它嗎? (y/N) "
 
-#: g10/keyedit.c:6003
+#: g10/keyedit.c:6011
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "�為這份簽章建立一份撤銷憑證嗎? (y/N) "
 
-#: g10/keyedit.c:6063
+#: g10/keyedit.c:6071
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "你已經簽署了金鑰 %s 上的這些使用者 ID:\n"
 
-#: g10/keyedit.c:6092
+#: g10/keyedit.c:6100
 msgid " (non-revocable)"
 msgstr " (��撤銷)"
 
-#: g10/keyedit.c:6099
+#: g10/keyedit.c:6107
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "被你的金鑰 %s 於 %s 所撤銷了\n"
 
-#: g10/keyedit.c:6124
+#: g10/keyedit.c:6132
 msgid "You are about to revoke these signatures:\n"
 msgstr "你正�撤銷這些簽章:\n"
 
-#: g10/keyedit.c:6147
+#: g10/keyedit.c:6155
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "真的�建立撤銷憑證嗎? (y/N) "
 
-#: g10/keyedit.c:6180
+#: g10/keyedit.c:6188
 #, c-format
 msgid "no secret key\n"
 msgstr "沒有�鑰\n"
 
-#: g10/keyedit.c:6228
+#: g10/keyedit.c:6236
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6238
+#: g10/keyedit.c:6246
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "使用者 ID \"%s\" 已撤銷\n"
 
-#: g10/keyedit.c:6255
+#: g10/keyedit.c:6263
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "警告: 有一份使用者 ID 的簽章日期為 %d 秒後的未來\n"
 
-#: g10/keyedit.c:6351
+#: g10/keyedit.c:6359
 #, 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:6389
+#: g10/keyedit.c:6397
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "金鑰 %s 已撤銷.\n"
 
-#: g10/keyedit.c:6451
+#: g10/keyedit.c:6459
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "�鑰 %s 已撤銷.\n"
 
-#: g10/keyedit.c:6548
+#: g10/keyedit.c:6556
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "正在顯示 %s 照片 ID, 其尺寸為 %ld, 屬於金鑰 %s (uid %d) 的照片\n"
@@ -5178,82 +5192,82 @@ msgstr "正在顯示 %s 照片 ID, 其尺寸為 %ld, 屬於金鑰 %s (uid %d) çš
 msgid "invalid value for option '%s'\n"
 msgstr "�項 \"%.50s\" 的引數無效\n"
 
-#: g10/keygen.c:338
+#: g10/keygen.c:339
 #, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "�好設定 '%s' �複了\n"
 
-#: g10/keygen.c:345
+#: g10/keygen.c:346
 #, c-format
 msgid "too many cipher preferences\n"
 msgstr "編密�好�多\n"
 
-#: g10/keygen.c:347
+#: g10/keygen.c:348
 #, c-format
 msgid "too many digest preferences\n"
 msgstr "摘��好�多\n"
 
-#: g10/keygen.c:349
+#: g10/keygen.c:350
 #, c-format
 msgid "too many compression preferences\n"
 msgstr "壓縮�好�多\n"
 
-#: g10/keygen.c:351
+#: g10/keygen.c:352
 #, fuzzy, c-format
 #| msgid "too many cipher preferences\n"
 msgid "too many AEAD preferences\n"
 msgstr "編密�好�多\n"
 
-#: g10/keygen.c:521
+#: g10/keygen.c:522
 #, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "�好字串中�有無效的項目 '%s'\n"
 
-#: g10/keygen.c:1130
+#: g10/keygen.c:1131
 #, c-format
 msgid "writing direct signature\n"
 msgstr "寫入直接簽章中\n"
 
-#: g10/keygen.c:1176
+#: g10/keygen.c:1177
 #, c-format
 msgid "writing self signature\n"
 msgstr "寫入自我簽章中\n"
 
-#: g10/keygen.c:1233
+#: g10/keygen.c:1234
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "寫入附鑰簽章中\n"
 
-#: g10/keygen.c:1598 g10/keygen.c:1603 g10/keygen.c:1655 g10/keygen.c:1660
-#: g10/keygen.c:1832 g10/keygen.c:1837
+#: g10/keygen.c:1599 g10/keygen.c:1604 g10/keygen.c:1656 g10/keygen.c:1661
+#: g10/keygen.c:1833 g10/keygen.c:1838
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "金鑰尺寸無效; 改用 %u �元\n"
 
-#: g10/keygen.c:1609 g10/keygen.c:1666 g10/keygen.c:1674 g10/keygen.c:1843
+#: g10/keygen.c:1610 g10/keygen.c:1667 g10/keygen.c:1675 g10/keygen.c:1844
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "金鑰尺寸增大到 %u �元\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1701
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr "警告: �些 OpenPGP 程�無法處�具有此摘�尺寸的 DSA 金鑰\n"
 
-#: g10/keygen.c:1899
+#: g10/keygen.c:1900
 msgid "Sign"
 msgstr "簽署"
 
-#: g10/keygen.c:1902
+#: g10/keygen.c:1903
 msgid "Certify"
 msgstr "�證"
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1906
 msgid "Encrypt"
 msgstr "加密"
 
-#: g10/keygen.c:1908
+#: g10/keygen.c:1909
 msgid "Authenticate"
 msgstr "鑑定"
 
@@ -5267,180 +5281,180 @@ msgstr "鑑定"
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1929
+#: g10/keygen.c:1930
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1967
 #, fuzzy, c-format
 #| msgid "Possible actions for a %s key: "
 msgid "Possible actions for this %s key: "
 msgstr "%s 金鑰�能的動作: "
 
-#: g10/keygen.c:1973
+#: g10/keygen.c:1974
 msgid "Current allowed actions: "
 msgstr "目��進行的動作: "
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1979
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) 切�簽署性能\n"
 
-#: g10/keygen.c:1981
+#: g10/keygen.c:1982
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) 切�加密性能\n"
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1985
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) 切�鑑定性能\n"
 
-#: g10/keygen.c:1987
+#: g10/keygen.c:1988
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) 已完�\n"
 
-#: g10/keygen.c:2116
+#: g10/keygen.c:2117
 #, fuzzy, c-format
 #| msgid "   (%d) RSA and RSA (default)\n"
 msgid "   (%d) RSA and RSA%s\n"
 msgstr "   (%d) RSA 和 RSA (�設)\n"
 
-#: g10/keygen.c:2120
+#: g10/keygen.c:2121
 #, fuzzy, c-format
 #| msgid "   (%d) DSA and Elgamal\n"
 msgid "   (%d) DSA and Elgamal%s\n"
 msgstr "   (%d) DSA 和 Elgamal\n"
 
-#: g10/keygen.c:2123
+#: g10/keygen.c:2124
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "   (%d) DSA (sign only)%s\n"
 msgstr "   (%d) DSA (僅能用於簽署)\n"
 
-#: g10/keygen.c:2125
+#: g10/keygen.c:2126
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (sign only)\n"
 msgid "   (%d) RSA (sign only)%s\n"
 msgstr "   (%d) RSA (僅能用於簽署)\n"
 
-#: g10/keygen.c:2131
+#: g10/keygen.c:2132
 #, fuzzy, c-format
 #| msgid "   (%d) Elgamal (encrypt only)\n"
 msgid "   (%d) Elgamal (encrypt only)%s\n"
 msgstr "   (%d) Elgamal (僅能用於加密)\n"
 
-#: g10/keygen.c:2133
+#: g10/keygen.c:2134
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (encrypt only)\n"
 msgid "   (%d) RSA (encrypt only)%s\n"
 msgstr "   (%d) RSA (僅能用於加密)\n"
 
-#: g10/keygen.c:2139
+#: g10/keygen.c:2140
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (set your own capabilities)\n"
 msgid "   (%d) DSA (set your own capabilities)%s\n"
 msgstr "   (%d) DSA (你能自己設定性能)\n"
 
-#: g10/keygen.c:2141
+#: g10/keygen.c:2142
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (set your own capabilities)\n"
 msgid "   (%d) RSA (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (你能自己設定性能)\n"
 
-#: g10/keygen.c:2147
+#: g10/keygen.c:2148
 #, fuzzy, c-format
 #| msgid "   (%d) sign, encrypt\n"
 msgid "   (%d) ECC (sign and encrypt)%s\n"
 msgstr "   (%d) 簽署, 加密\n"
 
-#: g10/keygen.c:2147 g10/keygen.c:2678
+#: g10/keygen.c:2148 g10/keygen.c:2679
 msgid " *default*"
 msgstr ""
 
-#: g10/keygen.c:2148
+#: g10/keygen.c:2149
 #, c-format
 msgid "  (%d) ECC (sign only)\n"
 msgstr "   (%d) ECC (僅能用於簽署)\n"
 
-#: g10/keygen.c:2150
+#: g10/keygen.c:2151
 #, fuzzy, c-format
 #| msgid "  (%d) ECC (set your own capabilities)\n"
 msgid "  (%d) ECC (set your own capabilities)%s\n"
 msgstr "   (%d) ECC (你能自己設定性能)\n"
 
-#: g10/keygen.c:2152
+#: g10/keygen.c:2153
 #, fuzzy, c-format
 #| msgid "  (%d) ECC (encrypt only)\n"
 msgid "  (%d) ECC (encrypt only)%s\n"
 msgstr "   (%d) ECC (僅能用於加密)\n"
 
-#: g10/keygen.c:2156
+#: g10/keygen.c:2157
 #, fuzzy, c-format
 #| msgid "  (%d) Existing key\n"
 msgid "  (%d) Existing key%s\n"
 msgstr "   (%d) �有的金鑰\n"
 
-#: g10/keygen.c:2158
+#: g10/keygen.c:2159
 #, fuzzy, c-format
 #| msgid "   (%d) Existing key from card\n"
 msgid "  (%d) Existing key from card%s\n"
 msgstr "   (%d) �片上�存的金鑰\n"
 
-#: g10/keygen.c:2254 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2255 sm/certreqgen-ui.c:203
 msgid "Enter the keygrip: "
 msgstr "請輸入金鑰鑰柄: "
 
-#: g10/keygen.c:2267 sm/certreqgen-ui.c:211 tools/gpg-card.c:2280
+#: g10/keygen.c:2268 sm/certreqgen-ui.c:211 tools/gpg-card.c:2297
 #, c-format
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr "�是有效的金鑰鑰柄 (應該�是 40 ��六進制數值)\n"
 
-#: g10/keygen.c:2269 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2270 sm/certreqgen-ui.c:213
 msgid "No key with this keygrip\n"
 msgstr "沒有金鑰有此金鑰鑰柄\n"
 
-#: g10/keygen.c:2288 g10/keygen.c:2298 g10/keygen.c:3440 g10/keygen.c:3451
+#: g10/keygen.c:2289 g10/keygen.c:2299 g10/keygen.c:3444 g10/keygen.c:3455
 #: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
 #, c-format
 msgid "error reading the card: %s\n"
 msgstr "讀��片時出錯: %s\n"
 
-#: g10/keygen.c:2292 g10/keygen.c:3444 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2293 g10/keygen.c:3448 sm/certreqgen-ui.c:234
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "�片�號: %s\n"
 
-#: g10/keygen.c:2311 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2312 sm/certreqgen-ui.c:246
 msgid "Available keys:\n"
 msgstr "�用金鑰:\n"
 
-#: g10/keygen.c:2504 g10/keygen.c:2518
+#: g10/keygen.c:2505 g10/keygen.c:2519
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr "加大到 %u �元\n"
 
-#: g10/keygen.c:2559
+#: g10/keygen.c:2560
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s 金鑰的長度�能介於 %u �元和 %u �元之間.\n"
 
-#: g10/keygen.c:2567
+#: g10/keygen.c:2568
 #, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "你的�鑰想�用多大的金鑰尺寸? (%u) "
 
-#: g10/keygen.c:2584 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2585 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "你所�求的金鑰尺寸是 %u �元\n"
 
-#: g10/keygen.c:2630
+#: g10/keygen.c:2631
 msgid "Please select which elliptic curve you want:\n"
 msgstr "請�擇你�使用的橢圓曲線:\n"
 
-#: g10/keygen.c:2819
+#: g10/keygen.c:2820
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5456,7 +5470,7 @@ msgstr ""
 "      <n>m = 金鑰在 n 月後會到期\n"
 "      <n>y = 金鑰在 n 年後會到期\n"
 
-#: g10/keygen.c:2830
+#: g10/keygen.c:2831
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5472,38 +5486,38 @@ msgstr ""
 "      <n>m = 簽章在 n 月後會到期\n"
 "      <n>y = 簽章在 n 年後會到期\n"
 
-#: g10/keygen.c:2853
+#: g10/keygen.c:2854
 msgid "Key is valid for? (0) "
 msgstr "金鑰的有效期�是多久? (0) "
 
-#: g10/keygen.c:2858
+#: g10/keygen.c:2859
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "簽章的有效期�是多久? (%s) "
 
-#: g10/keygen.c:2871 g10/keygen.c:2896
+#: g10/keygen.c:2875 g10/keygen.c:2900
 msgid "invalid value\n"
 msgstr "無效的數值\n"
 
-#: g10/keygen.c:2878
+#: g10/keygen.c:2882
 msgid "Key does not expire at all\n"
 msgstr "金鑰完全�會�期\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2883
 msgid "Signature does not expire at all\n"
 msgstr "簽章完全�會�期\n"
 
-#: g10/keygen.c:2884
+#: g10/keygen.c:2888
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "金鑰將會在 %s 到期\n"
 
-#: g10/keygen.c:2885
+#: g10/keygen.c:2889
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "簽章將會在 %s 到期.\n"
 
-#: g10/keygen.c:2889
+#: g10/keygen.c:2893
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5511,11 +5525,11 @@ msgstr ""
 "你的系統無法顯示 2038 年以後的日期.\n"
 "��, 它�以正確處�直到 2106 年之�的年份.\n"
 
-#: g10/keygen.c:2902
+#: g10/keygen.c:2906
 msgid "Is this correct? (y/N) "
 msgstr "以上正確嗎? (y/N) "
 
-#: g10/keygen.c:2970
+#: g10/keygen.c:2974
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5529,7 +5543,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2985
+#: g10/keygen.c:2989
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5544,49 +5558,49 @@ msgstr ""
 "    \"Ke-Huan Lin (Jedi) <Jedi@Jedi.org>\"\n"
 "\n"
 
-#: g10/keygen.c:3004
+#: g10/keygen.c:3008
 msgid "Real name: "
 msgstr "真實姓�: "
 
-#: g10/keygen.c:3013
+#: g10/keygen.c:3017
 msgid "Invalid character in name\n"
 msgstr "姓��有無效的字符\n"
 
-#: g10/keygen.c:3014
+#: g10/keygen.c:3018
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:3018
+#: g10/keygen.c:3022
 msgid "Name may not start with a digit\n"
 msgstr "姓���以用數字開頭\n"
 
-#: g10/keygen.c:3021
+#: g10/keygen.c:3025
 msgid "Name must be at least 5 characters long\n"
 msgstr "姓�至少�有五個字符長\n"
 
-#: g10/keygen.c:3031
+#: g10/keygen.c:3035
 msgid "Email address: "
 msgstr "電�郵件地�: "
 
-#: g10/keygen.c:3037
+#: g10/keygen.c:3041
 msgid "Not a valid email address\n"
 msgstr "�是有效的電�郵件地�\n"
 
-#: g10/keygen.c:3046
+#: g10/keygen.c:3050
 msgid "Comment: "
 msgstr "註釋: "
 
-#: g10/keygen.c:3052
+#: g10/keygen.c:3056
 msgid "Invalid character in comment\n"
 msgstr "註釋�有無效的字符\n"
 
-#: g10/keygen.c:3088
+#: g10/keygen.c:3092
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr "你正在使用 '%s' 字元集.\n"
 
-#: g10/keygen.c:3094
+#: g10/keygen.c:3098
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5597,7 +5611,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3099
+#: g10/keygen.c:3103
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "請��把電�郵件地�放進你的真實姓�或註釋裡\n"
 
@@ -5612,31 +5626,31 @@ msgstr "請��把電�郵件地�放進你的真實姓�或註釋裡\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3124
+#: g10/keygen.c:3128
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:3134
+#: g10/keygen.c:3138
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "變更姓�(N), 註釋(C), 電�郵件地�(E)或退出(Q)? "
 
-#: g10/keygen.c:3135
+#: g10/keygen.c:3139
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "變更姓�(N), 註釋(C), 電�郵件地�(E)或確定(O)/退出(Q)? "
 
-#: g10/keygen.c:3140
+#: g10/keygen.c:3144
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "變更姓�(N), 電�郵件地�(E)或退出(Q)? "
 
-#: g10/keygen.c:3141
+#: g10/keygen.c:3145
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "變更姓�(N), 電�郵件地�(E)或確定(O)/退出(Q)? "
 
-#: g10/keygen.c:3160
+#: g10/keygen.c:3164
 msgid "Please correct the error first\n"
 msgstr "請先訂正錯誤\n"
 
-#: g10/keygen.c:3206
+#: g10/keygen.c:3210
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -5647,18 +5661,18 @@ msgstr ""
 "(�是敲打�盤, 移動滑鼠, 讀寫硬碟之類的)\n"
 "這會讓隨機數字產生器有更多的機會�得夠多的亂數.\n"
 
-#: g10/keygen.c:3591
+#: g10/keygen.c:3595
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4590 g10/keygen.c:4663 g10/keygen.c:4681 g10/keygen.c:4710
-#: g10/keygen.c:5086 g10/keygen.c:5632 g10/keygen.c:5943 g10/keygen.c:6050
+#: g10/keygen.c:4594 g10/keygen.c:4667 g10/keygen.c:4685 g10/keygen.c:4714
+#: g10/keygen.c:5113 g10/keygen.c:5663 g10/keygen.c:5974 g10/keygen.c:6081
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "產生金鑰失敗: %s\n"
 
-#: g10/keygen.c:4599
+#: g10/keygen.c:4603
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5669,64 +5683,64 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:4601
+#: g10/keygen.c:4605
 msgid "Continue? (Y/n) "
 msgstr "是�繼續? (Y/n) "
 
-#: g10/keygen.c:4622
+#: g10/keygen.c:4626
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "\"%s\" 的金鑰已存在\n"
 
-#: g10/keygen.c:4627
+#: g10/keygen.c:4631
 msgid "Create anyway? (y/N) "
 msgstr "無論如何還是�建立嗎? (y/N) "
 
-#: g10/keygen.c:4633
+#: g10/keygen.c:4637
 #, c-format
 msgid "creating anyway\n"
 msgstr "總之還是在建立\n"
 
-#: g10/keygen.c:5069
+#: g10/keygen.c:5096
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr "請注�: 如需全能金鑰產生�話框請用  \"%s %s\".\n"
 
-#: g10/keygen.c:5118
+#: g10/keygen.c:5145
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "金鑰產生已�消.\n"
 
-#: g10/keygen.c:5178
+#: g10/keygen.c:5205
 #, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "無法建立備份檔案 '%s': %s\n"
 
-#: g10/keygen.c:5198
+#: g10/keygen.c:5225
 #, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "請注�: �片金鑰的備份已儲存至 '%s'\n"
 
-#: g10/keygen.c:5359 g10/keygen.c:5561
+#: g10/keygen.c:5389 g10/keygen.c:5591
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr "正在寫入公鑰至 '%s'\n"
 
-#: g10/keygen.c:5555
+#: g10/keygen.c:5585
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "找�到�寫入的公鑰鑰匙圈: %s\n"
 
-#: g10/keygen.c:5569
+#: g10/keygen.c:5599
 #, c-format
 msgid "error writing public keyring '%s': %s\n"
 msgstr "寫入公鑰鑰匙圈 '%s' 時出錯: %s\n"
 
-#: g10/keygen.c:5603
+#: g10/keygen.c:5634
 msgid "public and secret key created and signed.\n"
 msgstr "公鑰和�鑰已建立�簽署.\n"
 
-#: g10/keygen.c:5619
+#: g10/keygen.c:5650
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -5734,34 +5748,34 @@ msgstr ""
 "請注�這把金鑰�能用於加密.  也許你會想藉由 \"--edit-key\" 指令\n"
 "來產生加密用的�鑰.\n"
 
-#: g10/keygen.c:5801 g10/keygen.c:6000
+#: g10/keygen.c:5832 g10/keygen.c:6031
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "金鑰已經在 %lu 秒後的未來製妥 (�能是因為時光旅行或時�的�題)\n"
 
-#: g10/keygen.c:5803 g10/keygen.c:6002
+#: g10/keygen.c:5834 g10/keygen.c:6033
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "金鑰已經在 %lu 秒後的未來製妥 (�能是因為時光旅行或時�的�題)\n"
 
-#: g10/keygen.c:5814 g10/keygen.c:6013
+#: g10/keygen.c:5845 g10/keygen.c:6044
 #, c-format
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "請注�: � v3 金鑰製造�鑰�符� OpenPGP �範\n"
 
-#: g10/keygen.c:5826 g10/keygen.c:5828
+#: g10/keygen.c:5857 g10/keygen.c:5859
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "主鑰的�鑰部分無法�用.\n"
 
-#: g10/keygen.c:5835 g10/keygen.c:5837
+#: g10/keygen.c:5866 g10/keygen.c:5868
 #, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "主鑰的�鑰部分存放於�上.\n"
 
-#: g10/keygen.c:5857 g10/keygen.c:6027
+#: g10/keygen.c:5888 g10/keygen.c:6058
 msgid "Really create? (y/N) "
 msgstr "真的�建立嗎? (y/N) "
 
@@ -5841,33 +5855,33 @@ msgstr "      金鑰指紋 ="
 msgid "      Card serial no. ="
 msgstr "      �片�號 ="
 
-#: g10/keyring.c:1467
+#: g10/keyring.c:1477
 #, c-format
 msgid "caching keyring '%s'\n"
 msgstr "快�鑰匙圈 '%s' 中\n"
 
-#: g10/keyring.c:1541
+#: g10/keyring.c:1551
 #, fuzzy, c-format
 #| msgid "%lu keys cached so far (%lu signatures)\n"
 msgid "%lu keys cached so far (%lu signature)\n"
 msgid_plural "%lu keys cached so far (%lu signatures)\n"
 msgstr[0] "目�已檢查 %lu 把金鑰 (共 %lu 份簽章)\n"
 
-#: g10/keyring.c:1557
+#: g10/keyring.c:1567
 #, fuzzy, c-format
 #| msgid "flush the cache"
 msgid "%lu key cached"
 msgid_plural "%lu keys cached"
 msgstr[0] "清除快�"
 
-#: g10/keyring.c:1559
+#: g10/keyring.c:1569
 #, fuzzy, c-format
 #| msgid "1 bad signature\n"
 msgid " (%lu signature)\n"
 msgid_plural " (%lu signatures)\n"
 msgstr[0] "1 份�壞的簽章\n"
 
-#: g10/keyring.c:1636
+#: g10/keyring.c:1646
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: 鑰匙圈已建立\n"
@@ -5896,78 +5910,73 @@ msgstr "驗證簽章時自動�回金鑰"
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "尊�金鑰上所設定的�好金鑰伺�器 URL"
 
-#: g10/keyserver.c:537
+#: g10/keyserver.c:360
 msgid "disabled"
 msgstr "已�用"
 
-#: g10/keyserver.c:740
+#: g10/keyserver.c:563
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "請輸入數字, N)下一�, 或 Q)離開 > "
 
-#: g10/keyserver.c:846
+#: g10/keyserver.c:669
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "無效的金鑰伺�器�定 (我們用 %d!=經手程� %d)\n"
 
-#: g10/keyserver.c:986 g10/keyserver.c:1096
+#: g10/keyserver.c:809 g10/keyserver.c:919
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" 並�金鑰 ID: 跳�中\n"
 
-#: g10/keyserver.c:1420 g10/keyserver.c:1453
+#: g10/keyserver.c:1217 g10/keyserver.c:1250
 #, 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:1427
+#: g10/keyserver.c:1224
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "警告: 無法更新金鑰 %s 於 %s: %s\n"
 
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1316
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "在金鑰伺�器上找�到金鑰 \"%s\"\n"
 
-#: g10/keyserver.c:1534
+#: g10/keyserver.c:1319
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "在金鑰伺�器上找�到金鑰\n"
 
-#: g10/keyserver.c:1722
-#, c-format
-msgid "requesting key %s from %s server %s\n"
-msgstr "正在請求金鑰 %s 自 %s 伺�器 %s\n"
-
-#: g10/keyserver.c:1726
+#: g10/keyserver.c:1481
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "正在請求金鑰 %s 自 %s\n"
 
-#: g10/keyserver.c:1841 g10/keyserver.c:2020
+#: g10/keyserver.c:1600 g10/keyserver.c:1793
 #, fuzzy, c-format
 #| msgid "invalid keyserver options\n"
 msgid "no keyserver known\n"
 msgstr "無效的金鑰伺�器�項\n"
 
-#: g10/keyserver.c:1856 g10/skclist.c:213 g10/skclist.c:241
+#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "已跳� \"%s\": %s\n"
 
-#: g10/keyserver.c:1860
+#: g10/keyserver.c:1619
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "��金鑰 %s 至 %s\n"
 
-#: g10/keyserver.c:1901
+#: g10/keyserver.c:1662
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr "正在� '%s' 請求金鑰\n"
 
-#: g10/keyserver.c:1917
+#: g10/keyserver.c:1680
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "警告: 無法抓� URI %s: %s\n"
@@ -5994,249 +6003,249 @@ msgstr "以 %d 未知演算法所加密\n"
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "密語係以未知的 %d 摘�演算法所產生\n"
 
-#: g10/mainproc.c:472
+#: g10/mainproc.c:473
 #, c-format
 msgid "public key is %s\n"
 msgstr "公鑰為 %s\n"
 
-#: g10/mainproc.c:524
+#: g10/mainproc.c:525
 #, 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:528 g10/pkclist.c:231
+#: g10/mainproc.c:529 g10/pkclist.c:231
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:532
+#: g10/mainproc.c:533
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "已用 %s 金鑰, ID %s 所加密\n"
 
-#: g10/mainproc.c:552 g10/mainproc.c:935
+#: g10/mainproc.c:553 g10/mainproc.c:937
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "警告: 看到了多份明文\n"
 
-#: g10/mainproc.c:560
+#: g10/mainproc.c:561
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "已用 %lu 個密語加密了\n"
 
-#: g10/mainproc.c:562
+#: g10/mainproc.c:563
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "已用 1 個密語加密了\n"
 
-#: g10/mainproc.c:577 g10/mainproc.c:602
+#: g10/mainproc.c:578 g10/mainproc.c:603
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "公鑰解密失敗: %s\n"
 
-#: g10/mainproc.c:613
+#: g10/mainproc.c:614
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "公鑰加密�的資料: 完好的 DEK\n"
 
-#: g10/mainproc.c:642 g10/mainproc.c:663
+#: g10/mainproc.c:643 g10/mainproc.c:664
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "�定 %s 為加密�的資料\n"
 
-#: g10/mainproc.c:649
+#: g10/mainproc.c:650
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA 編密法��用, 我們樂觀地試著改以 %s 代替\n"
 
-#: g10/mainproc.c:742 g10/mainproc.c:780
+#: g10/mainproc.c:744 g10/mainproc.c:782
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "警告: 訊�未�到完整的�護\n"
 
-#: g10/mainproc.c:753
+#: g10/mainproc.c:755
 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:756
+#: g10/mainproc.c:758
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:761
+#: g10/mainproc.c:763
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "解密失敗: %s\n"
 
-#: g10/mainproc.c:773
+#: g10/mainproc.c:775
 #, c-format
 msgid "decryption okay\n"
 msgstr "解密�功\n"
 
-#: g10/mainproc.c:786
+#: g10/mainproc.c:788
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "警告: 加密�的訊�已經被變造了!\n"
 
-#: g10/mainproc.c:804
+#: g10/mainproc.c:806
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "解密失敗: %s\n"
 
-#: g10/mainproc.c:851
+#: g10/mainproc.c:853
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "請注�: 寄件者�求了 \"�准你用眼�看\"\n"
 
-#: g10/mainproc.c:858
+#: g10/mainproc.c:860
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "原始的檔� ='%.*s'\n"
 
-#: g10/mainproc.c:1135
+#: g10/mainproc.c:1137
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "�立撤銷 - 請用 \"gpg --import\" 來套用\n"
 
-#: g10/mainproc.c:1440 g10/mainproc.c:1483
+#: g10/mainproc.c:1442 g10/mainproc.c:1485
 #, c-format
 msgid "no signature found\n"
 msgstr "找�到簽章\n"
 
-#: g10/mainproc.c:1763
+#: g10/mainproc.c:1765
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "*�壞* 的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1767
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "�期的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1767
+#: g10/mainproc.c:1769
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "完好的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1789
+#: g10/mainproc.c:1791
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "簽章驗證已抑制\n"
 
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1905
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "無法處�這個�明確的簽章資料\n"
 
-#: g10/mainproc.c:1919 g10/mainproc.c:1926
+#: g10/mainproc.c:1921 g10/mainproc.c:1928
 #, c-format
 msgid "Signature made %s\n"
 msgstr "由 %s 建立的簽章\n"
 
-#: g10/mainproc.c:1920 g10/mainproc.c:1927 sm/verify.c:480
+#: g10/mainproc.c:1922 g10/mainproc.c:1929 sm/verify.c:480
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               使用 %s 金鑰 %s\n"
 
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1933
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "由 %s 建立的簽章, 使用 %s 金鑰 ID %s\n"
 
-#: g10/mainproc.c:1937
+#: g10/mainproc.c:1939
 #, fuzzy, c-format
 #| msgid "                aka \"%s\""
 msgid "               issuer \"%s\"\n"
 msgstr "                亦� \"%s\""
 
-#: g10/mainproc.c:1992
+#: g10/mainproc.c:1994
 #, c-format
 msgid "Key available at: "
 msgstr "�用的金鑰於: "
 
-#: g10/mainproc.c:2034
+#: g10/mainproc.c:2036
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2234
+#: g10/mainproc.c:2236
 msgid "[uncertain]"
 msgstr "[ �確定 ]"
 
-#: g10/mainproc.c:2272
+#: g10/mainproc.c:2274
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                亦� \"%s\""
 
-#: g10/mainproc.c:2347
+#: g10/mainproc.c:2349
 #, 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:2363
+#: g10/mainproc.c:2365
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "這份簽署已經在 %s �期了\n"
 
-#: g10/mainproc.c:2368
+#: g10/mainproc.c:2370
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "這份簽署將在 %s 到期\n"
 
-#: g10/mainproc.c:2379
+#: g10/mainproc.c:2381
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s 簽章, 摘�演算法 %s%s%s\n"
 
-#: g10/mainproc.c:2380
+#: g10/mainproc.c:2382
 msgid "binary"
 msgstr "二進制"
 
-#: g10/mainproc.c:2381
+#: g10/mainproc.c:2383
 msgid "textmode"
 msgstr "文字模�"
 
-#: g10/mainproc.c:2381 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2383 g10/trust.c:112 dirmngr/ocsp.c:793
 msgid "unknown"
 msgstr "未知"
 
-#: g10/mainproc.c:2383
+#: g10/mainproc.c:2385
 msgid ", key algorithm "
 msgstr ", 金鑰演算法 "
 
-#: g10/mainproc.c:2418
+#: g10/mainproc.c:2420
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2457
+#: g10/mainproc.c:2459
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "無法檢查簽章: %s\n"
 
-#: g10/mainproc.c:2553 g10/mainproc.c:2572 g10/mainproc.c:2696
+#: g10/mainproc.c:2555 g10/mainproc.c:2574 g10/mainproc.c:2698
 #, c-format
 msgid "not a detached signature\n"
 msgstr "�是一份分離的簽章\n"
 
-#: g10/mainproc.c:2606
+#: g10/mainproc.c:2608
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "警告: �測到多�簽章. 祇有第一個簽章纔會被核�.\n"
 
-#: g10/mainproc.c:2615
+#: g10/mainproc.c:2617
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "等級 0x%02x 的�立簽章\n"
 
-#: g10/mainproc.c:2700
+#: g10/mainproc.c:2702
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "舊型 (PGP 2.x) 簽章\n"
@@ -6419,45 +6428,51 @@ msgstr "關�簽章註記: "
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d 類別的��包設定了關��元\n"
 
-#: g10/passphrase.c:208
+#: g10/passphrase.c:201 sm/decrypt.c:669
+#, fuzzy
+#| msgid "Please enter the new passphrase"
+msgid "Please enter the passphrase for decryption."
+msgstr "請輸入新的密語"
+
+#: g10/passphrase.c:203
 msgid "Enter passphrase\n"
 msgstr "請輸入密語\n"
 
-#: g10/passphrase.c:219
+#: g10/passphrase.c:227
 #, c-format
 msgid "cancelled by user\n"
 msgstr "由使用者所�消\n"
 
-#: g10/passphrase.c:460
+#: g10/passphrase.c:472
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (主�金鑰 ID %s)"
 
-#: g10/passphrase.c:467
+#: g10/passphrase.c:479
 msgid "Please enter the passphrase to unlock the OpenPGP secret key:"
 msgstr "請輸入密語來解鎖 OpenPGP �鑰:"
 
-#: g10/passphrase.c:471
+#: g10/passphrase.c:483
 msgid "Please enter the passphrase to import the OpenPGP secret key:"
 msgstr "請輸入密語來匯入 OpenPGP �鑰:"
 
-#: g10/passphrase.c:476
+#: g10/passphrase.c:488
 msgid "Please enter the passphrase to export the OpenPGP secret subkey:"
 msgstr "請輸入密語來匯出 OpenPGP ��鑰:"
 
-#: g10/passphrase.c:479
+#: g10/passphrase.c:491
 msgid "Please enter the passphrase to export the OpenPGP secret key:"
 msgstr "請輸入密語來匯出 OpenPGP �鑰:"
 
-#: g10/passphrase.c:484
+#: g10/passphrase.c:496
 msgid "Do you really want to permanently delete the OpenPGP secret subkey key:"
 msgstr "你是�真的想�永久刪除 OpenPGP �鑰�鑰:"
 
-#: g10/passphrase.c:487
+#: g10/passphrase.c:499
 msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgstr "你是�真的想�永久刪除 OpenPGP �鑰:"
 
-#: g10/passphrase.c:496
+#: g10/passphrase.c:508
 #, c-format
 msgid ""
 "%s\n"
@@ -6624,7 +6639,7 @@ msgstr ""
 "這把金鑰的最�信任等級為: %s\n"
 "\n"
 
-#: g10/pkclist.c:313 g10/revoke.c:803
+#: g10/pkclist.c:313 g10/revoke.c:804
 msgid "Your decision? "
 msgstr "你的決定是甚麼? "
 
@@ -6922,7 +6937,7 @@ msgstr "無法開啟被簽署�的資料 '%s'\n"
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "無法開啟被簽署�的資料 fd=%d: %s\n"
 
-#: g10/pubkey-enc.c:99 sm/decrypt.c:879
+#: g10/pubkey-enc.c:99 sm/decrypt.c:1329
 #, fuzzy, c-format
 #| msgid "certificate is not usable for encryption\n"
 msgid "key %s is not suitable for decryption in %s mode\n"
@@ -6970,7 +6985,7 @@ msgid "Note: key has been revoked"
 msgstr "請注�: 金鑰已撤銷"
 
 #: g10/revoke.c:100 g10/revoke.c:126 g10/revoke.c:172 g10/revoke.c:184
-#: g10/revoke.c:502
+#: g10/revoke.c:503
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet 失敗: %s\n"
@@ -6998,11 +7013,11 @@ msgstr "�鑰�用.\n"
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "�為這把金鑰建立一份指定撤銷憑證嗎? (y/N) "
 
-#: g10/revoke.c:334 g10/revoke.c:744
+#: g10/revoke.c:334 g10/revoke.c:745
 msgid "ASCII armored output forced.\n"
 msgstr "已強迫使用 ASCII ���的輸出.\n"
 
-#: g10/revoke.c:350 g10/revoke.c:481
+#: g10/revoke.c:350 g10/revoke.c:482
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet 失敗: %s\n"
@@ -7016,18 +7031,18 @@ msgstr "已建立撤銷憑證.\n"
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "沒有找到 \"%s\" 用的撤銷金鑰\n"
 
-#: g10/revoke.c:567
+#: g10/revoke.c:568
 msgid "This is a revocation certificate for the OpenPGP key:"
 msgstr "這把 OpenPGP 金鑰有一份撤銷憑證."
 
-#: g10/revoke.c:583
+#: g10/revoke.c:584
 msgid ""
 "A revocation certificate is a kind of \"kill switch\" to publicly\n"
 "declare that a key shall not anymore be used.  It is not possible\n"
 "to retract such a revocation certificate once it has been published."
 msgstr ""
 
-#: g10/revoke.c:586
+#: g10/revoke.c:587
 #, fuzzy
 #| msgid ""
 #| "Use it to revoke this key in case of a compromise or loss of\n"
@@ -7046,7 +7061,7 @@ msgstr ""
 "辦法是產生一份新的撤銷憑證, 並且指明撤銷\n"
 "的�由."
 
-#: g10/revoke.c:592
+#: g10/revoke.c:593
 #, fuzzy
 #| msgid ""
 #| "To avoid an accidental use of this file, a colon has been inserted\n"
@@ -7061,13 +7076,13 @@ msgstr ""
 "真的�使用這份撤銷憑證�, 請先用文字編輯器把那個冒號移除,\n"
 "撤銷憑證�能使用."
 
-#: g10/revoke.c:611
+#: g10/revoke.c:612
 #, fuzzy, c-format
 #| msgid "Revocation certificate created.\n"
 msgid "revocation certificate stored as '%s.rev'\n"
 msgstr "已建立撤銷憑證.\n"
 
-#: g10/revoke.c:655
+#: g10/revoke.c:656
 #, fuzzy, c-format
 #| msgid "secret key \"%s\" not found: %s\n"
 msgid "secret key \"%s\" not found\n"
@@ -7076,22 +7091,22 @@ msgstr "找�到�鑰 \"%s\": %s\n"
 #. TRANSLATORS: The %s prints a key specification which
 #. for example has been given at the command line.  Several lines
 #. lines with secret key infos are printed after this message.
-#: g10/revoke.c:680
+#: g10/revoke.c:681
 #, c-format
 msgid "'%s' matches multiple secret keys:\n"
 msgstr ""
 
-#: g10/revoke.c:705
+#: g10/revoke.c:706
 #, fuzzy, c-format
 #| msgid "error creating keyring '%s': %s\n"
 msgid "error searching the keyring: %s\n"
 msgstr "建立鑰匙圈 '%s' 時出錯: %s\n"
 
-#: g10/revoke.c:728
+#: g10/revoke.c:729
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "�為這把金鑰建立一份撤銷憑證嗎? (y/N) "
 
-#: g10/revoke.c:752
+#: g10/revoke.c:753
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -7110,33 +7125,33 @@ msgstr ""
 "但是���心: 你的機器上的列�系統�能會在列��\n"
 "程中把這些資料暫存在�個其他人也能夠看得到的地方!\n"
 
-#: g10/revoke.c:786
+#: g10/revoke.c:787
 msgid "Please select the reason for the revocation:\n"
 msgstr "請�擇撤銷的原因:\n"
 
-#: g10/revoke.c:796
+#: g10/revoke.c:797
 msgid "Cancel"
 msgstr "�消"
 
-#: g10/revoke.c:798
+#: g10/revoke.c:799
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(也許你會想�在這裡�擇 %d)\n"
 
-#: g10/revoke.c:839
+#: g10/revoke.c:843
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "請輸入�用的�述; 以空白列��:\n"
 
-#: g10/revoke.c:867
+#: g10/revoke.c:871
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "撤銷原因: %s\n"
 
-#: g10/revoke.c:869
+#: g10/revoke.c:873
 msgid "(No description given)\n"
 msgstr "(沒有給定�述)\n"
 
-#: g10/revoke.c:874
+#: g10/revoke.c:878
 msgid "Is this okay? (y/N) "
 msgstr "這樣�以嗎? (y/N) "
 
@@ -7298,22 +7313,22 @@ msgstr "簽署:"
 msgid "%s.%s encryption will be used\n"
 msgstr "%s 加密將被採用\n"
 
-#: g10/skclist.c:172 g10/skclist.c:253
+#: g10/skclist.c:173 g10/skclist.c:254
 #, c-format
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr "金鑰未被標示為�安全 - �能夠拿來跟�的隨機數字產生器併用!\n"
 
-#: g10/skclist.c:204
+#: g10/skclist.c:205
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "已跳� \"%s\": �複了\n"
 
-#: g10/skclist.c:223
+#: g10/skclist.c:224
 #, c-format
 msgid "skipped: secret key already present\n"
 msgstr "已跳�: �鑰已經存在\n"
 
-#: g10/skclist.c:242
+#: g10/skclist.c:243
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr "這是由 PGP 產生的 ElGamal 金鑰, 用於簽章並�安全!"
 
@@ -7535,10 +7550,10 @@ msgstr "未支�的演算法: %s"
 msgid "TOFU DB error"
 msgstr ""
 
-#: g10/tofu.c:687 g10/tofu.c:2073 g10/tofu.c:2354 g10/tofu.c:2373
-#: g10/tofu.c:2386 g10/tofu.c:2398 g10/tofu.c:2413 g10/tofu.c:2425
-#: g10/tofu.c:3021 g10/tofu.c:3038 g10/tofu.c:3075 g10/tofu.c:3092
-#: g10/tofu.c:3404
+#: g10/tofu.c:687 g10/tofu.c:2077 g10/tofu.c:2358 g10/tofu.c:2377
+#: g10/tofu.c:2390 g10/tofu.c:2402 g10/tofu.c:2417 g10/tofu.c:2429
+#: g10/tofu.c:3025 g10/tofu.c:3042 g10/tofu.c:3079 g10/tofu.c:3096
+#: g10/tofu.c:3408
 #, fuzzy, c-format
 #| msgid "error sending data: %s\n"
 msgid "error reading TOFU database: %s\n"
@@ -7562,7 +7577,7 @@ msgstr "啟始讀�程�物件時出錯: %s\n"
 msgid "error opening TOFU database '%s': %s\n"
 msgstr "開啟 '%s' 時出錯: %s\n"
 
-#: g10/tofu.c:1148 g10/tofu.c:3458 g10/tofu.c:3604
+#: g10/tofu.c:1148 g10/tofu.c:3462 g10/tofu.c:3608
 #, fuzzy, c-format
 #| msgid "error sending data: %s\n"
 msgid "error updating TOFU database: %s\n"
@@ -7603,105 +7618,105 @@ msgstr "�得回應程� ID 時出錯: %s\n"
 msgid "This key's user IDs:\n"
 msgstr "列出金鑰和使用者 ID"
 
-#: g10/tofu.c:1634 g10/tofu.c:1799
+#: g10/tofu.c:1634 g10/tofu.c:1801
 #, fuzzy, c-format
 #| msgid "validity: %s"
 msgid "policy: %s"
 msgstr "有效性: %s"
 
-#: g10/tofu.c:1725
+#: g10/tofu.c:1727
 #, fuzzy, c-format
 #| msgid "error getting stored flags: %s\n"
 msgid "error gathering signature stats: %s\n"
 msgstr "�得已存放的旗標時出錯: %s\n"
 
-#: g10/tofu.c:1729
+#: g10/tofu.c:1731
 #, c-format
 msgid "The email address \"%s\" is associated with %d key:\n"
 msgid_plural "The email address \"%s\" is associated with %d keys:\n"
 msgstr[0] ""
 
-#: g10/tofu.c:1747
+#: g10/tofu.c:1749
 #, c-format
 msgid "Statistics for keys with the email address \"%s\":\n"
 msgstr ""
 
-#: g10/tofu.c:1797
+#: g10/tofu.c:1799
 #, fuzzy
 #| msgid "list keys"
 msgid "this key"
 msgstr "列出金鑰"
 
-#: g10/tofu.c:1823
+#: g10/tofu.c:1825
 #, fuzzy, c-format
 #| msgid "print message digests"
 msgid "Verified %d message."
 msgid_plural "Verified %d messages."
 msgstr[0] "�出訊�摘�"
 
-#: g10/tofu.c:1827
+#: g10/tofu.c:1829
 #, fuzzy, c-format
 #| msgid "encrypted with %lu passphrases\n"
 msgid "Encrypted %d message."
 msgid_plural "Encrypted %d messages."
 msgstr[0] "已用 %lu 個密語加密了\n"
 
-#: g10/tofu.c:1834
+#: g10/tofu.c:1836
 #, fuzzy, c-format
 #| msgid "print message digests"
 msgid "Verified %d message in the future."
 msgid_plural "Verified %d messages in the future."
 msgstr[0] "�出訊�摘�"
 
-#: g10/tofu.c:1838
+#: g10/tofu.c:1840
 #, fuzzy, c-format
 #| msgid "print message digests"
 msgid "Encrypted %d message in the future."
 msgid_plural "Encrypted %d messages in the future."
 msgstr[0] "�出訊�摘�"
 
-#: g10/tofu.c:1852
+#: g10/tofu.c:1854
 #, c-format
 msgid "Messages verified over the past %d day: %d."
 msgid_plural "Messages verified over the past %d days: %d."
 msgstr[0] ""
 
-#: g10/tofu.c:1858
+#: g10/tofu.c:1860
 #, c-format
 msgid "Messages encrypted over the past %d day: %d."
 msgid_plural "Messages encrypted over the past %d days: %d."
 msgstr[0] ""
 
-#: g10/tofu.c:1868
+#: g10/tofu.c:1870
 #, c-format
 msgid "Messages verified over the past %d month: %d."
 msgid_plural "Messages verified over the past %d months: %d."
 msgstr[0] ""
 
-#: g10/tofu.c:1874
+#: g10/tofu.c:1876
 #, c-format
 msgid "Messages encrypted over the past %d month: %d."
 msgid_plural "Messages encrypted over the past %d months: %d."
 msgstr[0] ""
 
-#: g10/tofu.c:1884
+#: g10/tofu.c:1886
 #, c-format
 msgid "Messages verified over the past %d year: %d."
 msgid_plural "Messages verified over the past %d years: %d."
 msgstr[0] ""
 
-#: g10/tofu.c:1890
+#: g10/tofu.c:1892
 #, c-format
 msgid "Messages encrypted over the past %d year: %d."
 msgid_plural "Messages encrypted over the past %d years: %d."
 msgstr[0] ""
 
-#: g10/tofu.c:1898
+#: g10/tofu.c:1900
 #, c-format
 msgid "Messages verified in the past: %d."
 msgstr ""
 
-#: g10/tofu.c:1902
+#: g10/tofu.c:1904
 #, fuzzy, c-format
 #| msgid "print message digests"
 msgid "Messages encrypted in the past: %d."
@@ -7710,124 +7725,124 @@ msgstr "�出訊�摘�"
 #. TRANSLATORS: Please translate the text found in the source
 #. * file below.  We don't directly internationalize that text so
 #. * that we can tweak it without breaking translations.
-#: g10/tofu.c:1919
+#: g10/tofu.c:1921
 msgid "TOFU detected a binding conflict"
 msgstr ""
 
 #. TRANSLATORS: Two letters (normally the lower and upper case
 #. * version of the hotkey) for each of the five choices.  If
 #. * there is only one choice in your language, repeat it.
-#: g10/tofu.c:1961
+#: g10/tofu.c:1963
 msgid "gGaAuUrRbB"
 msgstr ""
 
-#: g10/tofu.c:1967
+#: g10/tofu.c:1969
 msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
 msgstr ""
 
-#: g10/tofu.c:1975
+#: g10/tofu.c:1978
 msgid "Defaulting to unknown.\n"
 msgstr ""
 
-#: g10/tofu.c:2093 g10/tofu.c:2228
+#: g10/tofu.c:2097 g10/tofu.c:2232
 #, c-format
 msgid "TOFU db corruption detected.\n"
 msgstr ""
 
-#: g10/tofu.c:2829
+#: g10/tofu.c:2833
 #, fuzzy, c-format
 #| msgid "error creating a pipe: %s\n"
 msgid "error changing TOFU policy: %s\n"
 msgstr "建立管�時出錯: %s\n"
 
-#: g10/tofu.c:2880
+#: g10/tofu.c:2884
 #, c-format
 msgid "%lld~year"
 msgid_plural "%lld~years"
 msgstr[0] ""
 
-#: g10/tofu.c:2885
+#: g10/tofu.c:2889
 #, c-format
 msgid "%lld~month"
 msgid_plural "%lld~months"
 msgstr[0] ""
 
-#: g10/tofu.c:2890
+#: g10/tofu.c:2894
 #, c-format
 msgid "%lld~week"
 msgid_plural "%lld~weeks"
 msgstr[0] ""
 
-#: g10/tofu.c:2895
+#: g10/tofu.c:2899
 #, c-format
 msgid "%lld~day"
 msgid_plural "%lld~days"
 msgstr[0] ""
 
-#: g10/tofu.c:2900
+#: g10/tofu.c:2904
 #, c-format
 msgid "%lld~hour"
 msgid_plural "%lld~hours"
 msgstr[0] ""
 
-#: g10/tofu.c:2905
+#: g10/tofu.c:2909
 #, c-format
 msgid "%lld~minute"
 msgid_plural "%lld~minutes"
 msgstr[0] ""
 
-#: g10/tofu.c:2907
+#: g10/tofu.c:2911
 #, c-format
 msgid "%lld~second"
 msgid_plural "%lld~seconds"
 msgstr[0] ""
 
-#: g10/tofu.c:3145
+#: g10/tofu.c:3149
 #, c-format
 msgid "%s: Verified 0~signatures and encrypted 0~messages."
 msgstr ""
 
-#: g10/tofu.c:3151
+#: g10/tofu.c:3155
 #, fuzzy, c-format
 #| msgid "Deleted %d signatures.\n"
 msgid "%s: Verified 0 signatures."
 msgstr "已經刪除了 %d 份簽章.\n"
 
-#: g10/tofu.c:3165
+#: g10/tofu.c:3169
 #, fuzzy
 #| msgid "encrypted with %lu passphrases\n"
 msgid "Encrypted 0 messages."
 msgstr "已用 %lu 個密語加密了\n"
 
-#: g10/tofu.c:3181
+#: g10/tofu.c:3185
 #, fuzzy, c-format
 #| msgid "validity: %s"
 msgid "(policy: %s)"
 msgstr "有效性: %s"
 
-#: g10/tofu.c:3215
+#: g10/tofu.c:3219
 #, c-format
 msgid ""
 "Warning: we have yet to see a message signed using this key and user id!\n"
 msgstr ""
 
-#: g10/tofu.c:3218
+#: g10/tofu.c:3222
 #, c-format
 msgid ""
 "Warning: we've only seen one message signed using this key and user id!\n"
 msgstr ""
 
-#: g10/tofu.c:3222
+#: g10/tofu.c:3226
 #, c-format
 msgid "Warning: you have yet to encrypt a message to this key!\n"
 msgstr ""
 
-#: g10/tofu.c:3225
+#: g10/tofu.c:3229
 #, c-format
 msgid "Warning: you have only encrypted one message to this key!\n"
 msgstr ""
 
-#: g10/tofu.c:3254
+#: g10/tofu.c:3258
 #, c-format
 msgid ""
 "Warning: if you think you've seen more signatures by this key and user id, "
@@ -7843,14 +7858,14 @@ msgid_plural ""
 "to mark it as being bad.\n"
 msgstr[0] ""
 
-#: g10/tofu.c:3339 g10/tofu.c:3502 g10/tofu.c:3708 g10/tofu.c:3761
-#: g10/tofu.c:3902 g10/tofu.c:3979 g10/tofu.c:4017
+#: g10/tofu.c:3343 g10/tofu.c:3506 g10/tofu.c:3712 g10/tofu.c:3765
+#: g10/tofu.c:3906 g10/tofu.c:3983 g10/tofu.c:4021
 #, fuzzy, c-format
 #| msgid "error sending data: %s\n"
 msgid "error opening TOFU database: %s\n"
 msgstr "�出資料時出錯: %s\n"
 
-#: g10/tofu.c:3535
+#: g10/tofu.c:3539
 #, c-format
 msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n"
 msgstr ""
@@ -7915,7 +7930,7 @@ msgstr "正在使用 %s 信任模型\n"
 msgid "no need for a trustdb check\n"
 msgstr "�需�檢查信任資料庫\n"
 
-#: g10/trustdb.c:601 g10/trustdb.c:2272
+#: g10/trustdb.c:601 g10/trustdb.c:2273
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "下次信任資料庫檢查將於 %s 進行\n"
@@ -7945,60 +7960,60 @@ msgstr "請�一次 --check-trustdb\n"
 msgid "checking the trustdb\n"
 msgstr "正在檢查信任資料庫\n"
 
-#: g10/trustdb.c:1993
+#: g10/trustdb.c:1994
 #, fuzzy, c-format
 #| msgid "%lu keys processed so far\n"
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr[0] "目�已處� %lu 把金鑰\n"
 
-#: g10/trustdb.c:1996
+#: g10/trustdb.c:1997
 #, fuzzy, c-format
 #| msgid "%d keys processed (%d validity counts cleared)\n"
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] "已經處�了 %d 把金鑰 (共計已解決了 %d 份有效性)\n"
 
-#: g10/trustdb.c:2066
+#: g10/trustdb.c:2067
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "沒有找到任何徹底信任的金鑰\n"
 
-#: g10/trustdb.c:2080
+#: g10/trustdb.c:2081
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "找�到徹底信任金鑰 %s 的公鑰\n"
 
-#: g10/trustdb.c:2198
+#: g10/trustdb.c:2199
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr "深度: %d  有效: %3d  已簽署: %3d  信任: %d-, %dq, %dn, %dm, %df, %du\n"
 
-#: g10/trustdb.c:2279
+#: g10/trustdb.c:2280
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "無法更新信任資料庫版本記錄: 寫入失敗: %s\n"
 
-#: g10/trust.c:125
+#: g10/trust.c:114
 msgid "undefined"
 msgstr ""
 
-#: g10/trust.c:126
+#: g10/trust.c:115
 #, fuzzy
 #| msgid "never     "
 msgid "never"
 msgstr "永���期"
 
-#: g10/trust.c:127
+#: g10/trust.c:116
 msgid "marginal"
 msgstr ""
 
-#: g10/trust.c:128
+#: g10/trust.c:117
 msgid "full"
 msgstr ""
 
-#: g10/trust.c:129
+#: g10/trust.c:118
 msgid "ultimate"
 msgstr ""
 
@@ -8010,47 +8025,47 @@ msgstr ""
 #. It gets passed to atoi() so everything after the number is
 #. essentially a comment and need not be translated.  Either key and
 #. uid are both NULL, or neither are NULL.
-#: g10/trust.c:166
+#: g10/trust.c:155
 msgid "10 translator see trust.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trust.c:169
+#: g10/trust.c:158
 #, fuzzy
 #| msgid "revoked"
 msgid "[ revoked]"
 msgstr "已撤銷"
 
-#: g10/trust.c:171 g10/trust.c:177
+#: g10/trust.c:160 g10/trust.c:166
 #, fuzzy
 #| msgid "expired"
 msgid "[ expired]"
 msgstr "已�期"
 
-#: g10/trust.c:176
+#: g10/trust.c:165
 #, fuzzy
 #| msgid "unknown"
 msgid "[ unknown]"
 msgstr "未知"
 
-#: g10/trust.c:178
+#: g10/trust.c:167
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trust.c:179
+#: g10/trust.c:168
 #, fuzzy
 #| msgid "never     "
 msgid "[  never ]"
 msgstr "永���期"
 
-#: g10/trust.c:180
+#: g10/trust.c:169
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trust.c:181
+#: g10/trust.c:170
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trust.c:182
+#: g10/trust.c:171
 msgid "[ultimate]"
 msgstr ""
 
@@ -8110,16 +8125,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:4937 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2386
+#: scd/app-piv.c:1770 scd/app-p15.c:5035 scd/app-nks.c:1530
+#: scd/app-openpgp.c:2387
 #, 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:4956 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2402
+#: scd/app-piv.c:1787 scd/app-p15.c:5054 scd/app-nks.c:1549
+#: scd/app-openpgp.c:2403
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
@@ -8160,10 +8175,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:2669
-#: scd/app-openpgp.c:2693 scd/app-openpgp.c:2871 scd/app-openpgp.c:2893
-#: scd/app-openpgp.c:3074 scd/app-openpgp.c:3361 scd/app-openpgp.c:3408
-#: scd/app-openpgp.c:3545 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2670
+#: scd/app-openpgp.c:2694 scd/app-openpgp.c:2872 scd/app-openpgp.c:2894
+#: scd/app-openpgp.c:3075 scd/app-openpgp.c:3362 scd/app-openpgp.c:3409
+#: scd/app-openpgp.c:3547 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "收回個人識別碼 (PIN) 時傳回錯誤: %s\n"
@@ -8185,93 +8200,93 @@ 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:3616
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3618
 #, c-format
 msgid "key already exists\n"
 msgstr "金鑰已存在\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3620
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3622
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "既有的金鑰將被�代\n"
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3622
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3624
 #, c-format
 msgid "generating new key\n"
 msgstr "正在產生新的金鑰\n"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3624
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3626
 #, c-format
 msgid "writing new key\n"
 msgstr "正在寫入新的金鑰\n"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4484 scd/app-openpgp.c:4767
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4486 scd/app-openpgp.c:4761
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "存放金鑰失敗: %s\n"
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1615
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1616
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr "回應中未包� RSA 系數\n"
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1622
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1623
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr "回應中未包� RSA 公用指數\n"
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1732
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1733
 #, 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:4943
+#: scd/app-piv.c:3279 scd/app-openpgp.c:4937
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr "正在產生金鑰中, 請�候 ...\n"
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4951
+#: scd/app-piv.c:3294 scd/app-openpgp.c:4945
 #, c-format
 msgid "generating key failed\n"
 msgstr "產生金鑰時失敗\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4957
+#: scd/app-piv.c:3300 scd/app-openpgp.c:4951
 #, 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:1842 scd/app-openpgp.c:4966
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1843 scd/app-openpgp.c:4960
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr "回應中未包�公鑰資料\n"
 
-#: scd/app-p15.c:5035 scd/app-nks.c:2038
+#: scd/app-p15.c:5133 scd/app-nks.c:2038
 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:5038 scd/app-openpgp.c:2818
+#: scd/app-p15.c:5136 scd/app-openpgp.c:2819
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|請輸入管�者 PIN"
 
-#: scd/app-p15.c:5040 scd/app-nks.c:2028
+#: scd/app-p15.c:5138 scd/app-nks.c:2028
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "|P|請輸入標準金鑰的 PIN �設碼 (PUK)."
 
-#: scd/app-p15.c:5043 scd/app-nks.c:2019
+#: scd/app-p15.c:5141 scd/app-nks.c:2019
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||請輸入標準金鑰的個人識別碼 (PIN)."
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4321
+#: scd/app-nks.c:1468 scd/app-openpgp.c:4323
 #, 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:4333
+#: scd/app-nks.c:1476 scd/app-openpgp.c:4335
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "RSA 公用指數缺�或者大於 %d �元\n"
@@ -8311,27 +8326,27 @@ msgid ""
 "qualified signatures."
 msgstr "|P|請輸入金鑰的 PIN �設碼 (PUK) 以建立完善的簽章."
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3442 scd/app-dinsig.c:534
+#: scd/app-nks.c:2221 scd/app-openpgp.c:3443 scd/app-dinsig.c:534
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "�得新的個人識別碼 (PIN) 時出錯: %s\n"
 
-#: scd/app-openpgp.c:943
+#: scd/app-openpgp.c:944
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "存放指紋失敗: %s\n"
 
-#: scd/app-openpgp.c:956
+#: scd/app-openpgp.c:957
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "存放創生日期失敗: %s\n"
 
-#: scd/app-openpgp.c:1427 scd/app-openpgp.c:3389 scd/app-openpgp.c:5715
+#: scd/app-openpgp.c:1428 scd/app-openpgp.c:3390 scd/app-openpgp.c:5709
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "從�片�回 CHV 狀態時出錯\n"
 
-#: scd/app-openpgp.c:1949
+#: scd/app-openpgp.c:1950
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "讀�公鑰時失敗: %s\n"
@@ -8339,44 +8354,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:2373
+#: scd/app-openpgp.c:2374
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2621
+#: scd/app-openpgp.c:2622
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "以 %s �為�設 PIN\n"
 
-#: scd/app-openpgp.c:2628
+#: scd/app-openpgp.c:2629
 #, 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:2641
+#: scd/app-openpgp.c:2642
 #, fuzzy
 #| msgid "||Please enter the PIN"
 msgid "||Please unlock the card"
 msgstr "||請輸入個人識別碼 (PIN)"
 
-#: scd/app-openpgp.c:2700 scd/app-openpgp.c:2900 scd/app-openpgp.c:3368
+#: scd/app-openpgp.c:2701 scd/app-openpgp.c:2901 scd/app-openpgp.c:3369
 #, 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:2717 scd/app-openpgp.c:2760 scd/app-openpgp.c:2917
-#: scd/app-openpgp.c:5325
+#: scd/app-openpgp.c:2718 scd/app-openpgp.c:2761 scd/app-openpgp.c:2918
+#: scd/app-openpgp.c:5319
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "驗證 CHV%d 失敗: %s\n"
 
-#: scd/app-openpgp.c:2804 scd/app-openpgp.c:5724
+#: scd/app-openpgp.c:2805 scd/app-openpgp.c:5718
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "�片永久鎖定了!!\n"
 
-#: scd/app-openpgp.c:2808
+#: scd/app-openpgp.c:2809
 #, 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"
@@ -8384,20 +8399,20 @@ msgid_plural ""
 "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr[0] "%d 管�者個人識別碼 (PIN) 試圖在�片永久鎖定��留下來\n"
 
-#: scd/app-openpgp.c:2841
+#: scd/app-openpgp.c:2842
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr "管�者指令存�權�尚未組態\n"
 
-#: scd/app-openpgp.c:3355
+#: scd/app-openpgp.c:3356
 msgid "||Please enter the PIN"
 msgstr "||請輸入個人識別碼 (PIN)"
 
-#: scd/app-openpgp.c:3404
+#: scd/app-openpgp.c:3405
 msgid "||Please enter the Reset Code for the card"
 msgstr "||請輸入�片的�設碼"
 
-#: scd/app-openpgp.c:3414 scd/app-openpgp.c:3481
+#: scd/app-openpgp.c:3415 scd/app-openpgp.c:3484
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "�設碼太短; 長度最少�有 %d\n"
@@ -8405,79 +8420,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:3437
+#: scd/app-openpgp.c:3438
 msgid "|RN|New Reset Code"
 msgstr "|RN|新增�設碼"
 
-#: scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3439
 msgid "|AN|New Admin PIN"
 msgstr "|AN|新增管�者個人識別碼 (PIN)"
 
-#: scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3439
 msgid "|N|New PIN"
 msgstr "|N|新增個人識別碼 (PIN)"
 
-#: scd/app-openpgp.c:3541
+#: scd/app-openpgp.c:3543
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "||請輸入管�者 PIN �新的管�者 PIN"
 
-#: scd/app-openpgp.c:3542
+#: scd/app-openpgp.c:3544
 msgid "||Please enter the PIN and New PIN"
 msgstr "||請輸入個人識別碼�新的個人識別碼 (PIN)"
 
-#: scd/app-openpgp.c:3600 scd/app-openpgp.c:5026
+#: scd/app-openpgp.c:3602 scd/app-openpgp.c:5020
 #, c-format
 msgid "error reading application data\n"
 msgstr "讀�應用程�資料時出錯\n"
 
-#: scd/app-openpgp.c:3606 scd/app-openpgp.c:5033
+#: scd/app-openpgp.c:3608 scd/app-openpgp.c:5027
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "讀�指紋 DO 時出錯\n"
 
-#: scd/app-openpgp.c:4302 scd/app-openpgp.c:4657
+#: scd/app-openpgp.c:4304 scd/app-openpgp.c:4653
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "缺�創生時間戳�\n"
 
-#: scd/app-openpgp.c:4343 scd/app-openpgp.c:4351
+#: scd/app-openpgp.c:4345 scd/app-openpgp.c:4353
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA 質數 %s 缺�或者並� %d �元大\n"
 
-#: scd/app-openpgp.c:4651
+#: scd/app-openpgp.c:4647
 #, fuzzy, c-format
 #| msgid "unsupported inquiry '%s'\n"
 msgid "unsupported curve\n"
 msgstr "未支�的查詢 '%s'\n"
 
-#: scd/app-openpgp.c:4991
+#: scd/app-openpgp.c:4985
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "無效的 OpenPGP �片�構 (DO 0x93)\n"
 
-#: scd/app-openpgp.c:5041
+#: scd/app-openpgp.c:5035
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr "�片上的指紋與所�求的那個並���\n"
 
-#: scd/app-openpgp.c:5240
+#: scd/app-openpgp.c:5234
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "�片�支� %s 摘�演算法\n"
 
-#: scd/app-openpgp.c:5298
+#: scd/app-openpgp.c:5292
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "目�建立的簽章: %lu\n"
 
-#: scd/app-openpgp.c:5729
+#: scd/app-openpgp.c:5723
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr "目�在此指令中的管�者 PIN 驗證被�止了\n"
 
-#: scd/app-openpgp.c:6241 scd/app-openpgp.c:6252
+#: scd/app-openpgp.c:6250 scd/app-openpgp.c:6261
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "無法存� %s - 無效的 OpenPGP �片?\n"
@@ -8497,7 +8512,7 @@ msgstr "|N|開始新增個人識別碼 (PIN)"
 msgid "run in multi server mode (foreground)"
 msgstr "以多�伺�器模�執行 (�景)"
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:274 dirmngr/dirmngr.c:198
+#: scd/scdaemon.c:136 sm/gpgsm.c:274 dirmngr/dirmngr.c:199
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|等級|設定除錯等級為指定等級"
 
@@ -8558,12 +8573,12 @@ msgstr ""
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr "請使用 '--daemon' �項來將此程�執行於背景\n"
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2104
+#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2143
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "用於 fd %d 的經手程�已啟動\n"
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2112
+#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2151
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "用於 fd %d 的經手程�已終止\n"
@@ -8573,11 +8588,11 @@ msgstr "用於 fd %d 的經手程�已終止\n"
 msgid "validation model requested by certificate: %s"
 msgstr "憑證所�求的驗證模型: %s"
 
-#: sm/certchain.c:199 sm/certchain.c:2172
+#: sm/certchain.c:199 sm/certchain.c:2174
 msgid "chain"
 msgstr "chain"
 
-#: sm/certchain.c:200 sm/certchain.c:2172
+#: sm/certchain.c:200 sm/certchain.c:2174
 msgid "shell"
 msgstr "shell"
 
@@ -8610,224 +8625,224 @@ msgstr "請注�: ��許�關�的憑證原則"
 msgid "certificate policy not allowed"
 msgstr "未�許憑證原則"
 
-#: sm/certchain.c:595 sm/keydb.c:1891 sm/keydb.c:1980
+#: sm/certchain.c:596 sm/keydb.c:1913 sm/keydb.c:2002
 #, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "�得指紋失敗\n"
 
-#: sm/certchain.c:624
+#: sm/certchain.c:625
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr "從外部�置尋找發行者\n"
 
-#: sm/certchain.c:644
+#: sm/certchain.c:645
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "��的發行者數�: %d\n"
 
-#: sm/certchain.c:723 dirmngr/ocsp.c:682
+#: sm/certchain.c:724 dirmngr/ocsp.c:683
 #, c-format
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "無法�得 authorityInfoAccess: %s\n"
 
-#: sm/certchain.c:791
+#: sm/certchain.c:792
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr "從 Dirmngr 快�尋找發行者\n"
 
-#: sm/certchain.c:816
+#: sm/certchain.c:817
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "��的憑證數�: %d\n"
 
-#: sm/certchain.c:819
+#: sm/certchain.c:820
 #, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "尋找�於 dirmngr 快�的金鑰時失敗: %s\n"
 
-#: sm/certchain.c:1046 sm/certchain.c:1561 sm/certchain.c:2200 sm/decrypt.c:643
-#: sm/encrypt.c:620 sm/import.c:414 sm/keydb.c:1898 sm/keydb.c:1987
-#: sm/sign.c:428 sm/verify.c:117
+#: sm/certchain.c:1047 sm/certchain.c:1562 sm/certchain.c:2202
+#: sm/decrypt.c:1084 sm/encrypt.c:621 sm/import.c:414 sm/keydb.c:1920
+#: sm/keydb.c:2009 sm/sign.c:428 sm/verify.c:117
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "�置 keyDB 代號失敗\n"
 
-#: sm/certchain.c:1232
+#: sm/certchain.c:1233
 msgid "certificate has been revoked"
 msgstr "憑證已撤銷"
 
-#: sm/certchain.c:1247
+#: sm/certchain.c:1248
 msgid "the status of the certificate is unknown"
 msgstr "憑證的狀態未知"
 
-#: sm/certchain.c:1254
+#: sm/certchain.c:1255
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr "請確� \"dirmngr\" 已安�妥善\n"
 
-#: sm/certchain.c:1260
+#: sm/certchain.c:1261
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "檢查 CRL 時失敗: %s"
 
-#: sm/certchain.c:1289 sm/certchain.c:1357 dirmngr/validate.c:497
+#: sm/certchain.c:1290 sm/certchain.c:1358 dirmngr/validate.c:497
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "有效性無效的憑證: %s"
 
-#: sm/certchain.c:1304 sm/certchain.c:1389 dirmngr/validate.c:515
+#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:515
 #, c-format
 msgid "certificate not yet valid"
 msgstr "憑證尚未生效"
 
-#: sm/certchain.c:1305 sm/certchain.c:1390
+#: sm/certchain.c:1306 sm/certchain.c:1391
 msgid "root certificate not yet valid"
 msgstr "根憑證尚未生效"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1307 sm/certchain.c:1392
 msgid "intermediate certificate not yet valid"
 msgstr "媒介憑證尚未生效"
 
-#: sm/certchain.c:1319 dirmngr/validate.c:526
+#: sm/certchain.c:1320 dirmngr/validate.c:526
 #, c-format
 msgid "certificate has expired"
 msgstr "憑證已�期"
 
-#: sm/certchain.c:1320
+#: sm/certchain.c:1321
 msgid "root certificate has expired"
 msgstr "根憑證已�期"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1322
 msgid "intermediate certificate has expired"
 msgstr "媒介憑證已�期"
 
-#: sm/certchain.c:1363
+#: sm/certchain.c:1364
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr "�失所需的憑證屬性: %s%s%s"
 
-#: sm/certchain.c:1372
+#: sm/certchain.c:1373
 msgid "certificate with invalid validity"
 msgstr "有效性無效的憑證"
 
-#: sm/certchain.c:1409
+#: sm/certchain.c:1410
 msgid "signature not created during lifetime of certificate"
 msgstr "簽章並�在憑證生存時間內所造"
 
-#: sm/certchain.c:1411
+#: sm/certchain.c:1412
 msgid "certificate not created during lifetime of issuer"
 msgstr "憑證並�在發行者生存時間內所造"
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1413
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr "媒介憑證並�在發行者生存時間內所造"
 
-#: sm/certchain.c:1416
+#: sm/certchain.c:1417
 #, c-format
 msgid "  (  signature created at "
 msgstr "  (            簽章建立於 "
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1418
 #, c-format
 msgid "  (certificate created at "
 msgstr "  (            憑證建立於 "
 
-#: sm/certchain.c:1420
+#: sm/certchain.c:1421
 #, c-format
 msgid "  (certificate valid from "
 msgstr "  (憑證有效自 "
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1422
 #, c-format
 msgid "  (     issuer valid from "
 msgstr "  (        發行者有效自 "
 
-#: sm/certchain.c:1451 dirmngr/validate.c:577
+#: sm/certchain.c:1452 dirmngr/validate.c:577
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "指紋=%s\n"
 
-#: sm/certchain.c:1460
+#: sm/certchain.c:1461
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr "根憑證�在已標記為已信任\n"
 
-#: sm/certchain.c:1473
+#: sm/certchain.c:1474
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr "在 gpg-agent 中未啟用互動�標記為已信任\n"
 
-#: sm/certchain.c:1479
+#: sm/certchain.c:1480
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr "互動�標記為已信任在此作業階段中已�用\n"
 
-#: sm/certchain.c:1538
+#: sm/certchain.c:1539
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr "警告: 簽章創造時間未知 - �設為此刻"
 
-#: sm/certchain.c:1602
+#: sm/certchain.c:1603
 msgid "no issuer found in certificate"
 msgstr "憑證中找�到發行者"
 
-#: sm/certchain.c:1680
+#: sm/certchain.c:1681
 msgid "self-signed certificate has a BAD signature"
 msgstr "自簽憑證有 �良 簽章"
 
-#: sm/certchain.c:1749 dirmngr/validate.c:575
+#: sm/certchain.c:1750 dirmngr/validate.c:575
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "根憑證未標記為已信任"
 
-#: sm/certchain.c:1765
+#: sm/certchain.c:1766
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "檢查信任清單時失敗: %s\n"
 
-#: sm/certchain.c:1796 sm/import.c:175 dirmngr/validate.c:630
+#: sm/certchain.c:1797 sm/import.c:175 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "憑證�太長\n"
 
-#: sm/certchain.c:1808 dirmngr/validate.c:642
+#: sm/certchain.c:1809 dirmngr/validate.c:642
 #, c-format
 msgid "issuer certificate not found"
 msgstr "找�到發行者憑證"
 
-#: sm/certchain.c:1842 dirmngr/validate.c:668
+#: sm/certchain.c:1844 dirmngr/validate.c:668
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr "憑證有 �良 簽章"
 
-#: sm/certchain.c:1874 dirmngr/validate.c:692
+#: sm/certchain.c:1876 dirmngr/validate.c:692
 msgid "found another possible matching CA certificate - trying again"
 msgstr "找到了�一個�能��的 CA 憑證 - 正�試一次"
 
-#: sm/certchain.c:1933 dirmngr/validate.c:717
+#: sm/certchain.c:1935 dirmngr/validate.c:717
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "憑證�比 CA 所�許的 (%d) 還長"
 
-#: sm/certchain.c:1975 sm/certchain.c:2275 dirmngr/validate.c:747
+#: sm/certchain.c:1977 sm/certchain.c:2278 dirmngr/validate.c:747
 #, c-format
 msgid "certificate is good\n"
 msgstr "憑證完好\n"
 
-#: sm/certchain.c:1976
+#: sm/certchain.c:1978
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "媒介憑證良好\n"
 
-#: sm/certchain.c:1977
+#: sm/certchain.c:1979
 #, c-format
 msgid "root certificate is good\n"
 msgstr "根憑證完好\n"
 
-#: sm/certchain.c:2159
+#: sm/certchain.c:2161
 msgid "switching to chain model"
 msgstr "切�至�模型"
 
-#: sm/certchain.c:2168
+#: sm/certchain.c:2170
 #, c-format
 msgid "validation model used: %s"
 msgstr "已使用的驗證模型: %s"
@@ -8838,18 +8853,18 @@ 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:1372 dirmngr/validate.c:903
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1411 dirmngr/validate.c:903
 #: dirmngr/validate.c:927
 #, c-format
 msgid "out of core\n"
 msgstr "超出核心\n"
 
-#: sm/certcheck.c:389 sm/verify.c:212
+#: sm/certcheck.c:388 sm/verify.c:212
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(這是 MD2 演算法)\n"
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:793
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:794
 msgid "none"
 msgstr "ç„¡"
 
@@ -9135,17 +9150,17 @@ msgstr "準備好了.  你�在就該把此請求�到你的 CA.\n"
 msgid "resource problem: out of core\n"
 msgstr "資��題: 超出核心\n"
 
-#: sm/decrypt.c:719
+#: sm/decrypt.c:1159
 #, c-format
 msgid "(this is the RC2 algorithm)\n"
 msgstr "(這是 RC2 演算法)\n"
 
-#: sm/decrypt.c:721
+#: sm/decrypt.c:1161
 #, c-format
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr "(這看起來��是個加密�的訊�)\n"
 
-#: sm/decrypt.c:868
+#: sm/decrypt.c:1318
 #, fuzzy, c-format
 #| msgid "encrypted with %s key, ID %s\n"
 msgid "encrypted to %s key %s\n"
@@ -9156,7 +9171,7 @@ msgstr "已用 %s 金鑰, ID %s 所加密\n"
 msgid "certificate '%s' not found: %s\n"
 msgstr "找�到憑證 '%s': %s\n"
 
-#: sm/delete.c:120 sm/keydb.c:1999 sm/keydb.c:2098
+#: sm/delete.c:120 sm/keydb.c:2021 sm/keydb.c:2120
 #, c-format
 msgid "error locking keybox: %s\n"
 msgstr "鎖�金鑰鑰匙盒時出錯: %s\n"
@@ -9176,7 +9191,7 @@ msgstr "憑證 '%s' 已刪除\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "刪除憑證 \"%s\" 時失敗: %s\n"
 
-#: sm/encrypt.c:606
+#: sm/encrypt.c:607
 #, c-format
 msgid "no valid recipients given\n"
 msgstr "沒有給定有效的收件者\n"
@@ -9245,63 +9260,63 @@ msgstr "|使用者-ID|使用指定使用者 ID �為�設�鑰"
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|檔案|將此金鑰鑰匙圈加到指定金鑰鑰匙圈清單檔案中"
 
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:352 dirmngr/dirmngr.c:265
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|SPEC|使用此金鑰伺�器來查找金鑰"
 
-#: sm/gpgsm.c:362
+#: sm/gpgsm.c:363
 msgid "fetch missing issuer certificates"
 msgstr "�回�失的發行者憑證"
 
-#: sm/gpgsm.c:364
+#: sm/gpgsm.c:365
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|�稱|將指定�稱的編碼用於 PKCS#12 密語"
 
-#: sm/gpgsm.c:385
+#: sm/gpgsm.c:386
 msgid "never consult a CRL"
 msgstr "永���查閱 CRL"
 
-#: sm/gpgsm.c:389
+#: sm/gpgsm.c:390
 msgid "do not check CRLs for root certificates"
 msgstr "��為根憑證檢查 CRL"
 
-#: sm/gpgsm.c:393
+#: sm/gpgsm.c:394
 msgid "check validity using OCSP"
 msgstr "用 OCSP 檢查有效性"
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:396
 msgid "do not check certificate policies"
 msgstr "��檢查憑證原則"
 
-#: sm/gpgsm.c:398
+#: sm/gpgsm.c:399
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|�稱|使用指定�稱的編密演算法"
 
-#: sm/gpgsm.c:400
+#: sm/gpgsm.c:401
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|�稱|使用指定�稱的訊�摘�演算法"
 
-#: sm/gpgsm.c:410
+#: sm/gpgsm.c:411
 msgid "batch mode: never ask"
 msgstr "批次模�: 永��詢�"
 
-#: sm/gpgsm.c:412
+#: sm/gpgsm.c:413
 msgid "assume yes on most questions"
 msgstr "�設大部分的�題都回答是"
 
-#: sm/gpgsm.c:413
+#: sm/gpgsm.c:414
 msgid "assume no on most questions"
 msgstr "�設大部分的�題都回答�"
 
-#: sm/gpgsm.c:430
+#: sm/gpgsm.c:431
 msgid "|FILE|write an audit log to FILE"
 msgstr "|檔案|將稽核日誌寫入至指定檔案"
 
-#: sm/gpgsm.c:615
+#: sm/gpgsm.c:616
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "用法: @GPGSM@ [�項] [檔案] (或用 -h 求助)"
 
-#: sm/gpgsm.c:618
+#: sm/gpgsm.c:619
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -9311,52 +9326,27 @@ msgstr ""
 "用 S/MIME �定來簽署, 檢查, 加密, 解密\n"
 "�設的�作會�輸入資料而定\n"
 
-#: sm/gpgsm.c:826
+#: sm/gpgsm.c:827
 #, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "請注�: 將無法加密為 '%s': %s\n"
 
-#: sm/gpgsm.c:837
+#: sm/gpgsm.c:838
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "未知的驗證模型 '%s'\n"
 
-#: sm/gpgsm.c:896 dirmngr/ldapserver.c:89
-#, c-format
-msgid "%s:%u: no hostname given\n"
-msgstr "%s:%u: 沒有給定主機�稱\n"
-
-#: sm/gpgsm.c:915 dirmngr/ldapserver.c:108
-#, c-format
-msgid "%s:%u: password given without user\n"
-msgstr "%s:%u: 給定的密碼沒有使用者\n"
-
-#: sm/gpgsm.c:946 dirmngr/ldapserver.c:139
-#, c-format
-msgid "%s:%u: ignoring unknown flag '%s'\n"
-msgstr ""
-
-#: sm/gpgsm.c:962 dirmngr/ldapserver.c:155
-#, c-format
-msgid "%s:%u: skipping this line\n"
-msgstr "%s:%u: 正在跳�這一列\n"
-
-#: sm/gpgsm.c:1550
-#, c-format
-msgid "could not parse keyserver\n"
-msgstr "無法剖�金鑰伺�器\n"
-
-#: sm/gpgsm.c:1858
+#: sm/gpgsm.c:1711
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "正在匯入通用憑證 '%s'\n"
 
-#: sm/gpgsm.c:1904
+#: sm/gpgsm.c:1757
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "無法用 '%s' 來簽署: %s\n"
 
-#: sm/gpgsm.c:2273
+#: sm/gpgsm.c:2129
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "無效的指令 (沒有這樣的指令)\n"
@@ -9376,54 +9366,54 @@ msgstr "存放憑證時出錯\n"
 msgid "basic certificate checks failed - not imported\n"
 msgstr "基本的憑證檢查失敗了 - 未匯入\n"
 
-#: sm/import.c:471 sm/keydb.c:2018 sm/keydb.c:2111
+#: sm/import.c:472 sm/keydb.c:2040 sm/keydb.c:2133
 #, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "�得已存放的旗標時出錯: %s\n"
 
-#: sm/import.c:530 sm/import.c:562
+#: sm/import.c:531 sm/import.c:563
 #, c-format
 msgid "error importing certificate: %s\n"
 msgstr "匯入憑證時出錯: %s\n"
 
-#: sm/import.c:751 tools/gpg-connect-agent.c:1475
+#: sm/import.c:752 tools/gpg-connect-agent.c:1475
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "讀�輸入時出錯: %s\n"
 
-#: sm/keydb.c:503
+#: sm/keydb.c:508
 #, fuzzy, c-format
 #| msgid "no gpg-agent running in this session\n"
 msgid "no keyboxd running in this session\n"
 msgstr "在此階段中沒有執行中的 gpg-agent\n"
 
-#: sm/keydb.c:595
+#: sm/keydb.c:600
 #, fuzzy, c-format
 #| msgid "error opening '%s': %s\n"
 msgid "error opening key DB: %s\n"
 msgstr "開啟 '%s' 時出錯: %s\n"
 
-#: sm/keydb.c:1936
+#: sm/keydb.c:1958
 #, c-format
 msgid "problem looking for existing certificate: %s\n"
 msgstr "查找既有憑證的�題: %s\n"
 
-#: sm/keydb.c:1948
+#: sm/keydb.c:1970
 #, c-format
 msgid "error finding writable keyDB: %s\n"
 msgstr "尋找�寫入的 keyDB 時出錯: %s\n"
 
-#: sm/keydb.c:1956
+#: sm/keydb.c:1978
 #, c-format
 msgid "error storing certificate: %s\n"
 msgstr "存放憑證時出錯: %s\n"
 
-#: sm/keydb.c:2009
+#: sm/keydb.c:2031
 #, c-format
 msgid "problem re-searching certificate: %s\n"
 msgstr "�新�尋憑證的�題: %s\n"
 
-#: sm/keydb.c:2030 sm/keydb.c:2122
+#: sm/keydb.c:2052 sm/keydb.c:2144
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr "存放旗標時出錯: %s\n"
@@ -9602,58 +9592,58 @@ msgstr "  主旨 ="
 msgid "error loading certificate '%s': %s\n"
 msgstr "載入憑證 '%s' 時出錯: %s\n"
 
-#: dirmngr/certcache.c:819
+#: dirmngr/certcache.c:820
 #, c-format
 msgid "permanently loaded certificates: %u\n"
 msgstr "固定載入的憑證: %u\n"
 
-#: dirmngr/certcache.c:821
+#: dirmngr/certcache.c:822
 #, c-format
 msgid "    runtime cached certificates: %u\n"
 msgstr "    執行時期快�的憑證: %u\n"
 
-#: dirmngr/certcache.c:823
+#: dirmngr/certcache.c:824
 #, fuzzy, c-format
 #| msgid "    runtime cached certificates: %u\n"
 msgid "           trusted certificates: %u (%u,%u,%u,%u)\n"
 msgstr "    執行時期快�的憑證: %u\n"
 
-#: dirmngr/certcache.c:851 dirmngr/dirmngr-client.c:392
+#: dirmngr/certcache.c:852 dirmngr/dirmngr-client.c:392
 #, c-format
 msgid "certificate already cached\n"
 msgstr "憑證早已快�\n"
 
-#: dirmngr/certcache.c:853
+#: dirmngr/certcache.c:854
 #, c-format
 msgid "certificate cached\n"
 msgstr "憑證已快�\n"
 
-#: dirmngr/certcache.c:855 dirmngr/certcache.c:875 dirmngr/dirmngr-client.c:396
+#: dirmngr/certcache.c:856 dirmngr/certcache.c:876 dirmngr/dirmngr-client.c:396
 #, c-format
 msgid "error caching certificate: %s\n"
 msgstr "快�憑證時出錯: %s\n"
 
-#: dirmngr/certcache.c:938
+#: dirmngr/certcache.c:939
 #, c-format
 msgid "invalid SHA1 fingerprint string '%s'\n"
 msgstr "無效的 SHA1 指紋字串 '%s'\n"
 
-#: dirmngr/certcache.c:1384 dirmngr/certcache.c:1393
+#: dirmngr/certcache.c:1385 dirmngr/certcache.c:1394
 #, c-format
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "以�號�得憑證時出錯: %s\n"
 
-#: dirmngr/certcache.c:1579 dirmngr/certcache.c:1588
+#: dirmngr/certcache.c:1580 dirmngr/certcache.c:1589
 #, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "以主旨�得憑證時出錯: %s\n"
 
-#: dirmngr/certcache.c:1694 dirmngr/validate.c:483
+#: dirmngr/certcache.c:1695 dirmngr/validate.c:483
 #, c-format
 msgid "no issuer found in certificate\n"
 msgstr "憑證中找�到發行者\n"
 
-#: dirmngr/certcache.c:1704
+#: dirmngr/certcache.c:1705
 #, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "�得 authorityKeyIdentifier 時出錯: %s\n"
@@ -9688,7 +9678,7 @@ msgstr "正在移除快�檔案 '%s'\n"
 msgid "not removing file '%s'\n"
 msgstr "�移除檔案 '%s'\n"
 
-#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2380
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2383
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr "關閉快�檔案時出錯: %s\n"
@@ -9916,13 +9906,13 @@ msgid "error getting data from cache file: %s\n"
 msgstr "從快�檔案�得資料時出錯: %s\n"
 
 #: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1672 dirmngr/crlcache.c:1697
-#: dirmngr/crlcache.c:1763
+#: dirmngr/crlcache.c:1766
 #, c-format
 msgid "got an invalid S-expression from libksba\n"
 msgstr "從 libksba 得到無效的 S-表示�\n"
 
 #: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1679 dirmngr/crlcache.c:1705
-#: dirmngr/crlcache.c:1770 dirmngr/misc.c:176
+#: dirmngr/crlcache.c:1773 dirmngr/misc.c:176
 #, c-format
 msgid "converting S-expression failed: %s\n"
 msgstr "轉� S-表示�時失敗: %s\n"
@@ -9937,197 +9927,197 @@ msgstr "未知的雜湊演算法 '%s'\n"
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr "演算法 %d 的 gcry_md_open 失敗: %s\n"
 
-#: dirmngr/crlcache.c:1797 dirmngr/ocsp.c:478
+#: dirmngr/crlcache.c:1800 dirmngr/ocsp.c:478
 #, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "建立 S-表示�時失敗: %s\n"
 
-#: dirmngr/crlcache.c:1871
+#: dirmngr/crlcache.c:1874
 #, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "ksba_crl_parse 失敗: %s\n"
 
-#: dirmngr/crlcache.c:1886
+#: dirmngr/crlcache.c:1889
 #, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "�得 CRL 更新時間時出錯: %s\n"
 
-#: dirmngr/crlcache.c:1893
+#: dirmngr/crlcache.c:1896
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr "此 CRL 的更新時間: 本次=%s 下次=%s\n"
 
-#: dirmngr/crlcache.c:1897
+#: dirmngr/crlcache.c:1900
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr "無給定 nextUpdate; 先�設有效期是一天\n"
 
-#: dirmngr/crlcache.c:1917
+#: dirmngr/crlcache.c:1920
 #, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "�得 CRL 項目時出錯: %s\n"
 
-#: dirmngr/crlcache.c:1932
+#: dirmngr/crlcache.c:1935
 #, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "安�項目至暫存快�檔案時出錯: %s\n"
 
-#: dirmngr/crlcache.c:1959
+#: dirmngr/crlcache.c:1962
 #, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "CRL 中找�到 CRL 發行者: %s\n"
 
-#: dirmngr/crlcache.c:1974
+#: dirmngr/crlcache.c:1977
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr "正在以 authorityKeyIdentifier 找出 CRL 發行者憑證�置\n"
 
-#: dirmngr/crlcache.c:2020
+#: dirmngr/crlcache.c:2023
 #, c-format
 msgid "CRL signature verification failed: %s\n"
 msgstr "CRL 簽章驗證失敗: %s\n"
 
-#: dirmngr/crlcache.c:2032
+#: dirmngr/crlcache.c:2035
 #, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "檢查 CRL 發行者憑證有效性時出錯: %s\n"
 
-#: dirmngr/crlcache.c:2174
+#: dirmngr/crlcache.c:2177
 #, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "ksba_crl_new 失敗: %s\n"
 
-#: dirmngr/crlcache.c:2181
+#: dirmngr/crlcache.c:2184
 #, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "ksba_crl_set_reader 失敗: %s\n"
 
-#: dirmngr/crlcache.c:2215
+#: dirmngr/crlcache.c:2218
 #, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "已移除陳舊的暫存快�檔案 '%s'\n"
 
-#: dirmngr/crlcache.c:2219
+#: dirmngr/crlcache.c:2222
 #, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "移除陳舊的暫存快�檔案 '%s' 時發生�題: %s\n"
 
-#: dirmngr/crlcache.c:2229
+#: dirmngr/crlcache.c:2232
 #, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "建立暫存快�檔案 '%s' 時出錯: %s\n"
 
-#: dirmngr/crlcache.c:2239
+#: dirmngr/crlcache.c:2242
 #, c-format
 msgid "crl_parse_insert failed: %s\n"
 msgstr "crl_parse_insert 失敗: %s\n"
 
-#: dirmngr/crlcache.c:2249
+#: dirmngr/crlcache.c:2252
 #, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "完�暫存快�檔案 '%s' 時出錯: %s\n"
 
-#: dirmngr/crlcache.c:2256
+#: dirmngr/crlcache.c:2259
 #, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "關閉暫存快�檔案 '%s' 時出錯: %s\n"
 
-#: dirmngr/crlcache.c:2281
+#: dirmngr/crlcache.c:2284
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr "警告: 新的 CRL �然太�舊; 早已在 %s 逾期 - ��還是載入\n"
 
-#: dirmngr/crlcache.c:2285
+#: dirmngr/crlcache.c:2288
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr "新的 CRL �然太�舊; 早已在 %s 逾期\n"
 
-#: dirmngr/crlcache.c:2301
+#: dirmngr/crlcache.c:2304
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr "未知的關� CRL 擴充欄� %s\n"
 
-#: dirmngr/crlcache.c:2311
+#: dirmngr/crlcache.c:2314
 #, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "讀� CRL 擴充欄�時出錯: %s\n"
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2365
 #, c-format
 msgid "creating cache file '%s'\n"
 msgstr "建立快�檔案 '%s' 時出錯\n"
 
-#: dirmngr/crlcache.c:2394
+#: dirmngr/crlcache.c:2397
 #, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "把 '%s' �新新命� '%s' 時發生�題: %s\n"
 
-#: dirmngr/crlcache.c:2408
+#: dirmngr/crlcache.c:2411
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
 "program start\n"
 msgstr "更新 DIR 檔案時失敗 - 下次程�啟動時將失去快�項目\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2448
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr "開始 CRL 傾� (經由 %s �得)\n"
 
-#: dirmngr/crlcache.c:2468
+#: dirmngr/crlcache.c:2471
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 msgstr " 錯誤: 將�採用此 CRL, 因為更新之後�然太��舊!\n"
 
-#: dirmngr/crlcache.c:2471
+#: dirmngr/crlcache.c:2474
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr " 錯誤: 將�採用此 CRL, 因為有未知的關�擴充欄�!\n"
 
-#: dirmngr/crlcache.c:2474
+#: dirmngr/crlcache.c:2477
 msgid " ERROR: The CRL will not be used\n"
 msgstr " 錯誤: 將�採用此 CRL\n"
 
-#: dirmngr/crlcache.c:2481
+#: dirmngr/crlcache.c:2484
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr " 錯誤: 這個快�中的 CRL �能已�竄改!\n"
 
-#: dirmngr/crlcache.c:2499
+#: dirmngr/crlcache.c:2502
 #, c-format
 msgid " WARNING: invalid cache record length\n"
 msgstr " 警告: 無效的快�記錄長度\n"
 
-#: dirmngr/crlcache.c:2506
+#: dirmngr/crlcache.c:2509
 #, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "讀�快�記錄時發生�題: %s\n"
 
-#: dirmngr/crlcache.c:2517
+#: dirmngr/crlcache.c:2520
 #, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "讀�快�金鑰時發生�題: %s\n"
 
-#: dirmngr/crlcache.c:2548
+#: dirmngr/crlcache.c:2551
 #, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "從資料庫讀�快�項目時出錯: %s\n"
 
-#: dirmngr/crlcache.c:2551
+#: dirmngr/crlcache.c:2554
 msgid "End CRL dump\n"
 msgstr "CRL 傾���\n"
 
-#: dirmngr/crlcache.c:2672
+#: dirmngr/crlcache.c:2675
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "經由 DP 的 crl_fetch 失敗: %s\n"
 
-#: dirmngr/crlcache.c:2683
+#: dirmngr/crlcache.c:2686
 #, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "經由 DP 的 crl_cache_insert 失敗: %s\n"
 
-#: dirmngr/crlcache.c:2743
+#: dirmngr/crlcache.c:2746
 #, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "經由發行者的 crl_cache_insert 失敗: %s\n"
@@ -10148,7 +10138,7 @@ msgstr "��能存� CRL 因已�用 %s\n"
 msgid "error retrieving '%s': %s\n"
 msgstr "�回 '%s' 時出錯: %s\n"
 
-#: dirmngr/crlfetch.c:218 dirmngr/ldap-wrapper.c:881 dirmngr/misc.c:573
+#: dirmngr/crlfetch.c:218 dirmngr/ldap-wrapper.c:882 dirmngr/misc.c:573
 #, c-format
 msgid "error initializing reader object: %s\n"
 msgstr "啟始讀�程�物件時出錯: %s\n"
@@ -10305,131 +10295,131 @@ msgstr "應該�有絕�檔�\n"
 msgid "looking up '%s'\n"
 msgstr "正在查找 '%s'\n"
 
-#: dirmngr/dirmngr.c:175
+#: dirmngr/dirmngr.c:176
 msgid "list the contents of the CRL cache"
 msgstr "列出 CRL 快�的內容"
 
-#: dirmngr/dirmngr.c:176
+#: dirmngr/dirmngr.c:177
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|檔案|從指定檔案載入 CRL 至快�"
 
-#: dirmngr/dirmngr.c:177
+#: dirmngr/dirmngr.c:178
 msgid "|URL|fetch a CRL from URL"
 msgstr "|網�|從指定網��得 CRL"
 
-#: dirmngr/dirmngr.c:178
+#: dirmngr/dirmngr.c:179
 msgid "shutdown the dirmngr"
 msgstr "關閉 dirmngr"
 
-#: dirmngr/dirmngr.c:179
+#: dirmngr/dirmngr.c:180
 msgid "flush the cache"
 msgstr "清除快�"
 
-#: dirmngr/dirmngr.c:212
+#: dirmngr/dirmngr.c:213
 msgid "allow online software version check"
 msgstr ""
 
-#: dirmngr/dirmngr.c:215
+#: dirmngr/dirmngr.c:216
 msgid "|N|do not return more than N items in one query"
 msgstr "|N|單次查詢��傳回超� N 筆項目"
 
-#: dirmngr/dirmngr.c:221
+#: dirmngr/dirmngr.c:222
 msgid "Network related options"
 msgstr ""
 
-#: dirmngr/dirmngr.c:223
+#: dirmngr/dirmngr.c:224
 msgid "route all network traffic via Tor"
 msgstr ""
 
-#: dirmngr/dirmngr.c:235
+#: dirmngr/dirmngr.c:236
 msgid "Configuration for Keyservers"
 msgstr "金鑰伺�器組態"
 
-#: dirmngr/dirmngr.c:238
+#: dirmngr/dirmngr.c:239
 msgid "|URL|use keyserver at URL"
 msgstr "|URL|使用�於 URL 的金鑰伺�器"
 
-#: dirmngr/dirmngr.c:240
+#: dirmngr/dirmngr.c:241
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr "|檔案|在 HKP over TLS 的指定檔案中使用 CA 憑證"
 
-#: dirmngr/dirmngr.c:242
+#: dirmngr/dirmngr.c:243
 msgid "Configuration for HTTP servers"
 msgstr "HTTP 伺�器組態"
 
-#: dirmngr/dirmngr.c:244
+#: dirmngr/dirmngr.c:245
 msgid "inhibit the use of HTTP"
 msgstr "��使用 HTTP"
 
-#: dirmngr/dirmngr.c:246
+#: dirmngr/dirmngr.c:247
 msgid "ignore HTTP CRL distribution points"
 msgstr "忽略 HTTP CRL 分布點"
 
-#: dirmngr/dirmngr.c:248
+#: dirmngr/dirmngr.c:249
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr "|網�|�新導�所有�指定網��出的 HTTP 請求"
 
-#: dirmngr/dirmngr.c:250
+#: dirmngr/dirmngr.c:251
 msgid "use system's HTTP proxy setting"
 msgstr "使用系統的 HTTP 代�伺�器設定"
 
-#: dirmngr/dirmngr.c:254
+#: dirmngr/dirmngr.c:255
 msgid "Configuration of LDAP servers to use"
 msgstr "�用的 LDAP 伺�器組態"
 
-#: dirmngr/dirmngr.c:256
+#: dirmngr/dirmngr.c:257
 msgid "inhibit the use of LDAP"
 msgstr "��使用 LDAP"
 
-#: dirmngr/dirmngr.c:258
+#: dirmngr/dirmngr.c:259
 msgid "ignore LDAP CRL distribution points"
 msgstr "忽略 LDAP CRL 分布點"
 
-#: dirmngr/dirmngr.c:260
+#: dirmngr/dirmngr.c:261
 msgid "|HOST|use HOST for LDAP queries"
 msgstr "|主機|指定 LDAP 查詢主機"
 
-#: dirmngr/dirmngr.c:262
+#: dirmngr/dirmngr.c:263
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr "��將主機備案與 --ldap-proxy 並用"
 
-#: dirmngr/dirmngr.c:264
+#: dirmngr/dirmngr.c:267
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|檔案|從指定檔案讀� LDAP 伺�器清單"
 
-#: dirmngr/dirmngr.c:266
+#: dirmngr/dirmngr.c:269
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr "將從 CRL 分布點發�的新伺�器加入至伺�器清單"
 
-#: dirmngr/dirmngr.c:269 dirmngr/dirmngr_ldap.c:104
+#: dirmngr/dirmngr.c:272
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|把 LDAP 逾時設� N 秒"
 
-#: dirmngr/dirmngr.c:272
+#: dirmngr/dirmngr.c:275
 msgid "Configuration for OCSP"
 msgstr "OCSP 組態"
 
-#: dirmngr/dirmngr.c:274
+#: dirmngr/dirmngr.c:277
 msgid "allow sending OCSP requests"
 msgstr "�許�出 OCSP 請求"
 
-#: dirmngr/dirmngr.c:276
+#: dirmngr/dirmngr.c:279
 msgid "ignore certificate contained OCSP service URLs"
 msgstr "忽略�有 OCSP 伺�器網�的憑證"
 
-#: dirmngr/dirmngr.c:278
+#: dirmngr/dirmngr.c:281
 msgid "|URL|use OCSP responder at URL"
 msgstr "|網�|使用�於指定網�的 OCSP 回應程�"
 
-#: dirmngr/dirmngr.c:280
+#: dirmngr/dirmngr.c:283
 msgid "|FPR|OCSP response signed by FPR"
 msgstr "|FPR|由 FPR 簽署的 OCSP 回應"
 
-#: dirmngr/dirmngr.c:288
+#: dirmngr/dirmngr.c:291
 msgid "force loading of outdated CRLs"
 msgstr "強迫載入�時的 CRL"
 
-#: dirmngr/dirmngr.c:299
+#: dirmngr/dirmngr.c:302
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
@@ -10438,11 +10428,11 @@ msgstr ""
 "@\n"
 "(請�照「資訊�手冊來�得所有命令和�項的完整清單)\n"
 
-#: dirmngr/dirmngr.c:441
+#: dirmngr/dirmngr.c:449
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "用法: @DIRMNGR@ [�項] (或用 -h 求助)"
 
-#: dirmngr/dirmngr.c:443
+#: dirmngr/dirmngr.c:451
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@ -10450,285 +10440,103 @@ msgstr ""
 "語法: @DIRMNGR@ [�項] [指令 [引數]]\n"
 "@GNUPG@ 的金鑰伺�器, CRL, OCSP 存�\n"
 
-#: dirmngr/dirmngr.c:523
+#: dirmngr/dirmngr.c:531
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr "有效的除錯等級為: %s\n"
 
-#: dirmngr/dirmngr.c:609 tools/gpgconf.c:667 tools/gpgconf.c:702
-#: tools/gpgconf.c:802
+#: dirmngr/dirmngr.c:617 tools/gpgconf.c:701 tools/gpgconf.c:736
+#: tools/gpgconf.c:836
 #, c-format
 msgid "usage: %s [options] "
 msgstr "用法: %s [�項] "
 
-#: dirmngr/dirmngr.c:1260
+#: dirmngr/dirmngr.c:1299
 #, c-format
 msgid "colons are not allowed in the socket name\n"
 msgstr "socket �稱內��許使用冒號\n"
 
-#: dirmngr/dirmngr.c:1495 dirmngr/server.c:1824
+#: dirmngr/dirmngr.c:1534 dirmngr/server.c:1878
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "從 '%s' �回 CRL 時失敗: %s\n"
 
-#: dirmngr/dirmngr.c:1501 dirmngr/server.c:1830
+#: dirmngr/dirmngr.c:1540 dirmngr/server.c:1884
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "從 '%s' 處� CRL 時失敗: %s\n"
 
-#: dirmngr/dirmngr.c:1643
+#: dirmngr/dirmngr.c:1682
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: 列太長 - 已跳�\n"
 
-#: dirmngr/dirmngr.c:1698 dirmngr/dirmngr.c:1782
+#: dirmngr/dirmngr.c:1737 dirmngr/dirmngr.c:1821
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: �測到無效的指紋\n"
 
-#: dirmngr/dirmngr.c:1734 dirmngr/dirmngr.c:1760 tools/gpgconf-comp.c:3539
+#: dirmngr/dirmngr.c:1773 dirmngr/dirmngr.c:1799 tools/gpgconf-comp.c:3549
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: 讀�錯誤: %s\n"
 
-#: dirmngr/dirmngr.c:1789
+#: dirmngr/dirmngr.c:1828
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr "%s:%u: 列尾的垃圾已忽略\n"
 
-#: dirmngr/dirmngr.c:1876
+#: dirmngr/dirmngr.c:1915
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr "收到 SIGHUP - 正在�新讀�組態並清除快�\n"
 
-#: dirmngr/dirmngr.c:1917
+#: dirmngr/dirmngr.c:1956
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "收到 SIGUSR2 - 無定義行動\n"
 
-#: dirmngr/dirmngr.c:1922
+#: dirmngr/dirmngr.c:1961
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "收到 SIGTERM - 正在關閉 ...\n"
 
-#: dirmngr/dirmngr.c:1924
+#: dirmngr/dirmngr.c:1963
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "收到 SIGTERM - 還有 %d 個使用中的連線\n"
 
-#: dirmngr/dirmngr.c:1929
+#: dirmngr/dirmngr.c:1968
 #, c-format
 msgid "shutdown forced\n"
 msgstr "已強迫關閉\n"
 
-#: dirmngr/dirmngr.c:1937
+#: dirmngr/dirmngr.c:1976
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "收到 SIGINT - 立�關閉\n"
 
-#: dirmngr/dirmngr.c:1944
+#: dirmngr/dirmngr.c:1983
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "收到訊號 %d - 無定義行動\n"
 
-#: dirmngr/dirmngr_ldap.c:105
-msgid "return all values in a record oriented format"
-msgstr "以記錄導�格�傳回所有數值"
-
-#: dirmngr/dirmngr_ldap.c:108
-msgid "|NAME|ignore host part and connect through NAME"
-msgstr "|�稱|忽略主機的部份並改以指定�稱連線"
-
-#: dirmngr/dirmngr_ldap.c:109
-msgid "force a TLS connection"
-msgstr ""
-
-#: dirmngr/dirmngr_ldap.c:110
-msgid "|NAME|connect to host NAME"
-msgstr "|�稱|連線至�於指定�稱的主機"
-
-#: dirmngr/dirmngr_ldap.c:111
-msgid "|N|connect to port N"
-msgstr "|N|連線至 N 連接埠"
-
-#: dirmngr/dirmngr_ldap.c:112
-msgid "|NAME|use user NAME for authentication"
-msgstr "|�字|使用指定�字�為�證用的使用者�稱"
-
-#: dirmngr/dirmngr_ldap.c:113
-msgid "|PASS|use password PASS for authentication"
-msgstr "|密碼|使用指定密碼作為�證"
-
-#: dirmngr/dirmngr_ldap.c:115
-msgid "take password from $DIRMNGR_LDAP_PASS"
-msgstr "從 $DIRMNGR_LDAP_PASS �得密碼使用"
-
-#: dirmngr/dirmngr_ldap.c:116
-msgid "|STRING|query DN STRING"
-msgstr "|字串|以�指定字串查詢 DN"
-
-#: dirmngr/dirmngr_ldap.c:117
-msgid "|STRING|use STRING as filter expression"
-msgstr "|字串|以指定字串作為�濾器表示�"
-
-#: dirmngr/dirmngr_ldap.c:118
-msgid "|STRING|return the attribute STRING"
-msgstr "|字串|以指定字串傳回屬性"
-
-#: dirmngr/dirmngr_ldap.c:179
-msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
-msgstr "用法: dirmngr_ldap [�項] [網�] (或用 -h 求助)\n"
-
-#: dirmngr/dirmngr_ldap.c:182
-msgid ""
-"Syntax: dirmngr_ldap [options] [URL]\n"
-"Internal LDAP helper for Dirmngr\n"
-"Interface and options may change without notice\n"
-msgstr ""
-"語法: dirmngr_ldap [�項] [網�]\n"
-"Dirmngr 的內部 LDAP �助程�\n"
-"介���項��能未經通知�變更\n"
-
-#: dirmngr/dirmngr_ldap.c:291
-#, c-format
-msgid "invalid port number %d\n"
-msgstr "無效的連接埠號碼 %d\n"
-
-#: dirmngr/dirmngr_ldap.c:400
-#, c-format
-msgid "scanning result for attribute '%s'\n"
-msgstr "正在掃�屬性 '%s' 之�果\n"
-
-#: dirmngr/dirmngr_ldap.c:407 dirmngr/dirmngr_ldap.c:490
-#: dirmngr/dirmngr_ldap.c:514 dirmngr/dirmngr_ldap.c:526
-#: dirmngr/dirmngr_ldap.c:722
-#, c-format
-msgid "error writing to stdout: %s\n"
-msgstr "寫入標準輸出時出錯: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:424
-#, c-format
-msgid "          available attribute '%s'\n"
-msgstr "          �用屬性 '%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:462
-#, c-format
-msgid "attribute '%s' not found\n"
-msgstr "找�到屬性 '%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:469
-#, c-format
-msgid "found attribute '%s'\n"
-msgstr "找到屬性 '%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:581
-#, c-format
-msgid "processing url '%s'\n"
-msgstr "正在處�網� '%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:588
-#, c-format
-msgid "          user '%s'\n"
-msgstr "          使用者 '%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:590
-#, c-format
-msgid "          pass '%s'\n"
-msgstr "          密碼 '%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:592
-#, c-format
-msgid "          host '%s'\n"
-msgstr "          主機 '%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:593
-#, c-format
-msgid "          port %d\n"
-msgstr "          連接埠 %d\n"
-
-#: dirmngr/dirmngr_ldap.c:595
-#, c-format
-msgid "            DN '%s'\n"
-msgstr "            域� '%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:597
-#, c-format
-msgid "        filter '%s'\n"
-msgstr "        �濾器 '%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:602 dirmngr/dirmngr_ldap.c:605
-#, c-format
-msgid "          attr '%s'\n"
-msgstr "          屬性 '%s'\n"
-
-#: dirmngr/dirmngr_ldap.c:611
-#, c-format
-msgid "no host name in '%s'\n"
-msgstr "'%s' 中沒有主機�稱\n"
-
-#: dirmngr/dirmngr_ldap.c:616
-#, c-format
-msgid "no attribute given for query '%s'\n"
-msgstr "查詢 '%s' 無給定屬性\n"
-
-#: dirmngr/dirmngr_ldap.c:622
-#, c-format
-msgid "WARNING: using first attribute only\n"
-msgstr "警告: 僅使用第一個屬性\n"
-
-#: dirmngr/dirmngr_ldap.c:637 dirmngr/dirmngr_ldap.c:678
-#, c-format
-msgid "LDAP init to '%s:%d' failed: %s\n"
-msgstr "LDAP �始至 '%s:%d' 失敗: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:659
-#, fuzzy, c-format
-#| msgid "LDAP init to '%s:%d' failed: %s\n"
-msgid "LDAP init to '%s' failed: %s\n"
-msgstr "LDAP �始至 '%s:%d' 失敗: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:665
-#, fuzzy, c-format
-#| msgid "LDAP init to '%s:%d' failed: %s\n"
-msgid "LDAP init to '%s' done\n"
-msgstr "LDAP �始至 '%s:%d' 失敗: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:704
-#, c-format
-msgid "binding to '%s:%d' failed: %s\n"
-msgstr "�定至 '%s:%d' 時失敗: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:728
-#, c-format
-msgid "searching '%s' failed: %s\n"
-msgstr "�尋 '%s' 時失敗: %s\n"
-
-#: dirmngr/dirmngr_ldap.c:759
-#, c-format
-msgid "'%s' is not an LDAP URL\n"
-msgstr "'%s' �是一個 LDAP ��\n"
-
-#: dirmngr/dirmngr_ldap.c:765
-#, c-format
-msgid "'%s' is an invalid LDAP URL\n"
-msgstr "'%s' 是無效的 LDAP 網�\n"
-
-#: dirmngr/http.c:1989 dirmngr/ocsp.c:255
+#: dirmngr/http.c:1998 dirmngr/ocsp.c:255
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "存� '%s' 時出錯: http 狀態 %u\n"
 
-#: dirmngr/http.c:3630 dirmngr/ocsp.c:229
+#: dirmngr/http.c:3652 dirmngr/ocsp.c:229
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr "網� '%s' �新轉�至 '%s' (%u)\n"
 
-#: dirmngr/http.c:3636 dirmngr/ocsp.c:246
+#: dirmngr/http.c:3658 dirmngr/ocsp.c:246
 #, c-format
 msgid "too many redirections\n"
 msgstr "太多�新導�\n"
 
-#: dirmngr/http.c:3748
+#: dirmngr/http.c:3768
 #, fuzzy, c-format
 #| msgid "writing to '%s'\n"
 msgid "redirection changed to '%s'\n"
@@ -10769,31 +10577,51 @@ msgstr "等候 ldap ��程� %d 時失敗: %s\n"
 msgid "ldap wrapper %d stalled - killing\n"
 msgstr "ldap ��程� %d 已�� - 正在中止\n"
 
-#: dirmngr/ldap.c:91
+#: dirmngr/ldap.c:92
 #, c-format
 msgid "invalid char 0x%02x in host name - not added\n"
 msgstr "主機�稱中有無效的字符 0x%02x - �予加入\n"
 
-#: dirmngr/ldap.c:95
+#: dirmngr/ldap.c:96
 #, c-format
 msgid "adding '%s:%d' to the ldap server list\n"
 msgstr "正在加入 '%s:%d' 至 ldap 伺�器清單\n"
 
-#: dirmngr/ldap.c:98 dirmngr/misc.c:512
+#: dirmngr/ldap.c:99 dirmngr/misc.c:512
 #, c-format
 msgid "malloc failed: %s\n"
 msgstr "動態記憶體�置失敗: %s\n"
 
-#: dirmngr/ldap.c:634
+#: dirmngr/ldap.c:221
 #, c-format
-msgid "start_cert_fetch: invalid pattern '%s'\n"
-msgstr "start_cert_fetch: 無效的模� '%s'\n"
+msgid "'%s' is not an LDAP URL\n"
+msgstr "'%s' �是一個 LDAP ��\n"
 
-#: dirmngr/ldap.c:846
+#: dirmngr/ldap.c:227 dirmngr/ldap.c:233
+#, c-format
+msgid "'%s' is an invalid LDAP URL\n"
+msgstr "'%s' 是無效的 LDAP 網�\n"
+
+#: dirmngr/ldap.c:968
 #, c-format
 msgid "ldap_search hit the size limit of the server\n"
 msgstr "ldap_search �到伺�器的尺寸�制\n"
 
+#: dirmngr/ldapserver.c:119
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr "%s:%u: 給定的密碼沒有使用者\n"
+
+#: dirmngr/ldapserver.c:181
+#, c-format
+msgid "%s:%u: ignoring unknown flag '%s'\n"
+msgstr ""
+
+#: dirmngr/ldapserver.c:203
+#, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr "%s:%u: 正在跳�這一列\n"
+
 #: dirmngr/misc.c:172
 #, c-format
 msgid "invalid canonical S-expression found\n"
@@ -10885,86 +10713,86 @@ msgstr "並未由�設 OCSP 簽署者的憑證所簽署"
 msgid "allocating list item failed: %s\n"
 msgstr "�置清單項目時失敗: %s\n"
 
-#: dirmngr/ocsp.c:537 dirmngr/ocsp.c:724
+#: dirmngr/ocsp.c:538 dirmngr/ocsp.c:725
 #, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "�得回應程� ID 時出錯: %s\n"
 
-#: dirmngr/ocsp.c:584
+#: dirmngr/ocsp.c:585
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr "找�到��用來驗證 OCSP 回應的憑證\n"
 
-#: dirmngr/ocsp.c:623 dirmngr/validate.c:648
+#: dirmngr/ocsp.c:624 dirmngr/validate.c:648
 #, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "找�到發行者憑證: %s\n"
 
-#: dirmngr/ocsp.c:633
+#: dirmngr/ocsp.c:634
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr "�用者未傳為目標憑證\n"
 
-#: dirmngr/ocsp.c:640
+#: dirmngr/ocsp.c:641
 #, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "�用者未傳回發行的憑證\n"
 
-#: dirmngr/ocsp.c:650
+#: dirmngr/ocsp.c:651
 #, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "�置 OCSP 脈絡失敗: %s\n"
 
-#: dirmngr/ocsp.c:689
+#: dirmngr/ocsp.c:690
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr "無定義�設 OCSP 回應程�\n"
 
-#: dirmngr/ocsp.c:695
+#: dirmngr/ocsp.c:696
 #, c-format
 msgid "no default OCSP signer defined\n"
 msgstr "未定義�設的 OCSP 簽署程�\n"
 
-#: dirmngr/ocsp.c:702
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr "正在使用�設的 OCSP 回應程� '%s'\n"
 
-#: dirmngr/ocsp.c:707
+#: dirmngr/ocsp.c:708
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "正在使用 %s OCSP 回應程�\n"
 
-#: dirmngr/ocsp.c:764
+#: dirmngr/ocsp.c:765
 #, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "�得目標憑證 OCSP 狀態時出錯: %s\n"
 
-#: dirmngr/ocsp.c:789
+#: dirmngr/ocsp.c:790
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr "憑證狀態為: %s  (本次=%s  下次=%s)\n"
 
-#: dirmngr/ocsp.c:790
+#: dirmngr/ocsp.c:791
 msgid "good"
 msgstr "良好"
 
-#: dirmngr/ocsp.c:796
+#: dirmngr/ocsp.c:797
 #, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "憑證已撤銷於 %s 因: %s\n"
 
-#: dirmngr/ocsp.c:831
+#: dirmngr/ocsp.c:832
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr "OCSP 回應程�傳回未來的狀態\n"
 
-#: dirmngr/ocsp.c:843
+#: dirmngr/ocsp.c:844
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr "OCSP 回應程�傳回�當下的狀態\n"
 
-#: dirmngr/ocsp.c:858
+#: dirmngr/ocsp.c:859
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr "OCSP 回應程�傳回�舊的狀態\n"
@@ -10974,71 +10802,67 @@ msgstr "OCSP 回應程�傳回�舊的狀態\n"
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "assuan_inquire(%s) 失敗: %s\n"
 
-#: dirmngr/server.c:1158
-msgid "ldapserver missing"
-msgstr "�失 ldapserver"
-
-#: dirmngr/server.c:1224
+#: dirmngr/server.c:1277
 msgid "serialno missing in cert ID"
 msgstr "憑證 ID 中�失 serialno"
 
-#: dirmngr/server.c:1387 dirmngr/server.c:1473 dirmngr/server.c:1909
-#: dirmngr/server.c:1980 dirmngr/server.c:2556 dirmngr/server.c:2571
+#: dirmngr/server.c:1440 dirmngr/server.c:1526 dirmngr/server.c:1963
+#: dirmngr/server.c:2034 dirmngr/server.c:2662 dirmngr/server.c:2677
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "assuan_inquire 失敗: %s\n"
 
-#: dirmngr/server.c:1516
+#: dirmngr/server.c:1569
 #, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "fetch_cert_by_url 失敗: %s\n"
 
-#: dirmngr/server.c:1528 dirmngr/server.c:1559 dirmngr/server.c:1718
+#: dirmngr/server.c:1581 dirmngr/server.c:1612 dirmngr/server.c:1772
 #, c-format
 msgid "error sending data: %s\n"
 msgstr "�出資料時出錯: %s\n"
 
-#: dirmngr/server.c:1666
+#: dirmngr/server.c:1720
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "start_cert_fetch 失敗: %s\n"
 
-#: dirmngr/server.c:1699
+#: dirmngr/server.c:1753
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "fetch_next_cert 失敗: %s\n"
 
-#: dirmngr/server.c:1726
+#: dirmngr/server.c:1780
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr "max_replies %d 已超出\n"
 
-#: dirmngr/server.c:2860
+#: dirmngr/server.c:2966
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "無法�置控制�構: %s\n"
 
-#: dirmngr/server.c:2871
+#: dirmngr/server.c:2977
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "�置 assuan 脈絡失敗: %s\n"
 
-#: dirmngr/server.c:2892
+#: dirmngr/server.c:2998
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "伺�器啟始失敗: %s\n"
 
-#: dirmngr/server.c:2900
+#: dirmngr/server.c:3006
 #, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "� Assuan 註冊指令時失敗: %s\n"
 
-#: dirmngr/server.c:2933
+#: dirmngr/server.c:3039
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "Assuan 接��題: %s\n"
 
-#: dirmngr/server.c:2952
+#: dirmngr/server.c:3058
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "Assuan 處�時失敗: %s\n"
@@ -11186,80 +11010,80 @@ msgstr "在此階段中沒有執行中的 gpg-agent\n"
 msgid "error sending standard options: %s\n"
 msgstr "�出標準�項時出錯: %s\n"
 
-#: tools/gpgconf-comp.c:649
+#: tools/gpgconf-comp.c:655
 #, fuzzy
 #| msgid "GPG for OpenPGP"
 msgid "OpenPGP"
 msgstr "OpenPGP 版 GPG"
 
-#: tools/gpgconf-comp.c:653
+#: tools/gpgconf-comp.c:659
 #, fuzzy
 #| msgid "GPG for S/MIME"
 msgid "S/MIME"
 msgstr "S/MIME 版 GPG"
 
-#: tools/gpgconf-comp.c:657
+#: tools/gpgconf-comp.c:663
 #, fuzzy
 #| msgid "public key is %s\n"
 msgid "Public Keys"
 msgstr "公鑰為 %s\n"
 
-#: tools/gpgconf-comp.c:661
+#: tools/gpgconf-comp.c:667
 msgid "Private Keys"
 msgstr ""
 
-#: tools/gpgconf-comp.c:665
+#: tools/gpgconf-comp.c:671
 #, fuzzy
 #| msgid "Smartcard Daemon"
 msgid "Smartcards"
 msgstr "智慧��務"
 
-#: tools/gpgconf-comp.c:669
+#: tools/gpgconf-comp.c:676
 msgid "TPM"
 msgstr ""
 
-#: tools/gpgconf-comp.c:673
+#: tools/gpgconf-comp.c:681
 msgid "Network"
 msgstr ""
 
-#: tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:685
 #, fuzzy
 #| msgid "PIN and Passphrase Entry"
 msgid "Passphrase Entry"
 msgstr "個人識別碼�密語項目"
 
-#: tools/gpgconf-comp.c:941
+#: tools/gpgconf-comp.c:951
 msgid "Component not suitable for launching"
 msgstr "元件���啟動"
 
-#: tools/gpgconf-comp.c:947
+#: tools/gpgconf-comp.c:957
 #, fuzzy, c-format
 #| msgid "External verification of component %s failed"
 msgid "Configuration file of component %s is broken\n"
 msgstr "元件 %s 的外部驗證失敗"
 
-#: tools/gpgconf-comp.c:950
+#: tools/gpgconf-comp.c:960
 #, fuzzy, c-format
 #| msgid "Please use the command \"toggle\" first.\n"
 msgid "Note: Use the command \"%s%s\" to get details.\n"
 msgstr "請先使用 \"toggle\" 指令.\n"
 
-#: tools/gpgconf-comp.c:2816
+#: tools/gpgconf-comp.c:2826
 #, c-format
 msgid "External verification of component %s failed"
 msgstr "元件 %s 的外部驗證失敗"
 
-#: tools/gpgconf-comp.c:2946
+#: tools/gpgconf-comp.c:2956
 msgid "Note that group specifications are ignored\n"
 msgstr "請注�群組�格已忽略\n"
 
-#: tools/gpgconf-comp.c:3543
+#: tools/gpgconf-comp.c:3553
 #, fuzzy, c-format
 #| msgid "error closing '%s': %s\n"
 msgid "error closing '%s'\n"
 msgstr "關閉 '%s' 時出錯: %s\n"
 
-#: tools/gpgconf-comp.c:3545
+#: tools/gpgconf-comp.c:3555
 #, fuzzy, c-format
 #| msgid "error hashing '%s': %s\n"
 msgid "error parsing '%s'\n"
@@ -11345,15 +11169,15 @@ msgstr ""
 "語法: @GPGCONF@ [�項]\n"
 "管� @GNUPG@ 系統工具的組態�項\n"
 
-#: tools/gpgconf.c:669 tools/gpgconf.c:704
+#: tools/gpgconf.c:703 tools/gpgconf.c:738
 msgid "Need one component argument"
 msgstr "需�一個元件引數"
 
-#: tools/gpgconf.c:678 tools/gpgconf.c:728 tools/gpgconf.c:778
+#: tools/gpgconf.c:712 tools/gpgconf.c:762 tools/gpgconf.c:812
 msgid "Component not found"
 msgstr "找�到元件"
 
-#: tools/gpgconf.c:804
+#: tools/gpgconf.c:838
 msgid "No argument allowed"
 msgstr "未�許使用引數"
 
@@ -11369,92 +11193,219 @@ msgstr ""
 "語法: gpg-check-pattern [�項] 樣�檔案\n"
 "用樣�檔案來檢查由標準輸入給定的密語\n"
 
-#: tools/gpg-card.c:2390
+#: tools/gpg-card.c:2407
 #, fuzzy, c-format
 #| msgid "Note: keys are already stored on the card!\n"
 msgid "Note: key %s is already stored on the card!\n"
 msgstr "請注�: 金鑰已經存放在�片上了!\n"
 
-#: tools/gpg-card.c:2393
+#: tools/gpg-card.c:2410
 #, fuzzy, c-format
 #| msgid "Note: keys are already stored on the card!\n"
 msgid "Note: Keys are already stored on the card!\n"
 msgstr "請注�: 金鑰已經存放在�片上了!\n"
 
-#: tools/gpg-card.c:2396
+#: tools/gpg-card.c:2413
 #, fuzzy, c-format
 #| msgid "Replace existing keys? (y/N) "
 msgid "Replace existing key %s ? (y/N) "
 msgstr "是���代既有的金鑰? (y/N) "
 
-#: tools/gpg-card.c:2549 tools/gpg-card.c:2712 tools/gpg-card.c:2935
-#: tools/gpg-card.c:3044
+#: tools/gpg-card.c:2566 tools/gpg-card.c:2729 tools/gpg-card.c:2952
+#: tools/gpg-card.c:3061
 #, fuzzy, c-format
 #| msgid "OpenPGP card no. %s detected\n"
 msgid "%s card no. %s detected\n"
 msgstr "�測到 OpenPGP �片編號 %s\n"
 
-#: tools/gpg-card.c:3396
+#: tools/gpg-card.c:3413
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3406 tools/gpg-card.c:3420
+#: tools/gpg-card.c:3423 tools/gpg-card.c:3437
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
 "         can only be reverted using a factory reset!\n"
 msgstr ""
 
-#: tools/gpg-card.c:3423
+#: tools/gpg-card.c:3440
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3669
+#: tools/gpg-card.c:3686
 #, fuzzy
 #| msgid "add a certificate to the cache"
 msgid "authenticate to the card"
 msgstr "加入憑證至快�"
 
-#: tools/gpg-card.c:3671
+#: tools/gpg-card.c:3688
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3673
+#: tools/gpg-card.c:3690
 #, fuzzy
 #| msgid "|NAME|use user NAME for authentication"
 msgid "setup KDF for PIN authentication"
 msgstr "|�字|使用指定�字�為�證用的使用者�稱"
 
-#: tools/gpg-card.c:3675
+#: tools/gpg-card.c:3692
 msgid "change a private data object"
 msgstr ""
 
-#: tools/gpg-card.c:3676
+#: tools/gpg-card.c:3693
 #, fuzzy
 #| msgid "add a certificate to the cache"
 msgid "read a certificate from a data object"
 msgstr "加入憑證至快�"
 
-#: tools/gpg-card.c:3677
+#: tools/gpg-card.c:3694
 #, fuzzy
 #| msgid "add a certificate to the cache"
 msgid "store a certificate to a data object"
 msgstr "加入憑證至快�"
 
-#: tools/gpg-card.c:3678
+#: tools/gpg-card.c:3695
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3679
+#: tools/gpg-card.c:3696
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3681
+#: tools/gpg-card.c:3698
 msgid "manage the command history"
 msgstr ""
 
+#~ msgid "requesting key %s from %s server %s\n"
+#~ msgstr "正在請求金鑰 %s 自 %s 伺�器 %s\n"
+
+#~ msgid "%s:%u: no hostname given\n"
+#~ msgstr "%s:%u: 沒有給定主機�稱\n"
+
+#~ msgid "could not parse keyserver\n"
+#~ msgstr "無法剖�金鑰伺�器\n"
+
+#~ msgid "return all values in a record oriented format"
+#~ msgstr "以記錄導�格�傳回所有數值"
+
+#~ msgid "|NAME|ignore host part and connect through NAME"
+#~ msgstr "|�稱|忽略主機的部份並改以指定�稱連線"
+
+#~ msgid "|NAME|connect to host NAME"
+#~ msgstr "|�稱|連線至�於指定�稱的主機"
+
+#~ msgid "|N|connect to port N"
+#~ msgstr "|N|連線至 N 連接埠"
+
+#~ msgid "|NAME|use user NAME for authentication"
+#~ msgstr "|�字|使用指定�字�為�證用的使用者�稱"
+
+#~ msgid "|PASS|use password PASS for authentication"
+#~ msgstr "|密碼|使用指定密碼作為�證"
+
+#~ msgid "take password from $DIRMNGR_LDAP_PASS"
+#~ msgstr "從 $DIRMNGR_LDAP_PASS �得密碼使用"
+
+#~ msgid "|STRING|query DN STRING"
+#~ msgstr "|字串|以�指定字串查詢 DN"
+
+#~ msgid "|STRING|use STRING as filter expression"
+#~ msgstr "|字串|以指定字串作為�濾器表示�"
+
+#~ msgid "|STRING|return the attribute STRING"
+#~ msgstr "|字串|以指定字串傳回屬性"
+
+#~ msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
+#~ msgstr "用法: dirmngr_ldap [�項] [網�] (或用 -h 求助)\n"
+
+#~ msgid ""
+#~ "Syntax: dirmngr_ldap [options] [URL]\n"
+#~ "Internal LDAP helper for Dirmngr\n"
+#~ "Interface and options may change without notice\n"
+#~ msgstr ""
+#~ "語法: dirmngr_ldap [�項] [網�]\n"
+#~ "Dirmngr 的內部 LDAP �助程�\n"
+#~ "介���項��能未經通知�變更\n"
+
+#~ msgid "invalid port number %d\n"
+#~ msgstr "無效的連接埠號碼 %d\n"
+
+#~ msgid "scanning result for attribute '%s'\n"
+#~ msgstr "正在掃�屬性 '%s' 之�果\n"
+
+#~ msgid "error writing to stdout: %s\n"
+#~ msgstr "寫入標準輸出時出錯: %s\n"
+
+#~ msgid "          available attribute '%s'\n"
+#~ msgstr "          �用屬性 '%s'\n"
+
+#~ msgid "attribute '%s' not found\n"
+#~ msgstr "找�到屬性 '%s'\n"
+
+#~ msgid "found attribute '%s'\n"
+#~ msgstr "找到屬性 '%s'\n"
+
+#~ msgid "processing url '%s'\n"
+#~ msgstr "正在處�網� '%s'\n"
+
+#~ msgid "          user '%s'\n"
+#~ msgstr "          使用者 '%s'\n"
+
+#~ msgid "          pass '%s'\n"
+#~ msgstr "          密碼 '%s'\n"
+
+#~ msgid "          host '%s'\n"
+#~ msgstr "          主機 '%s'\n"
+
+#~ msgid "          port %d\n"
+#~ msgstr "          連接埠 %d\n"
+
+#~ msgid "            DN '%s'\n"
+#~ msgstr "            域� '%s'\n"
+
+#~ msgid "        filter '%s'\n"
+#~ msgstr "        �濾器 '%s'\n"
+
+#~ msgid "          attr '%s'\n"
+#~ msgstr "          屬性 '%s'\n"
+
+#~ msgid "no host name in '%s'\n"
+#~ msgstr "'%s' 中沒有主機�稱\n"
+
+#~ msgid "no attribute given for query '%s'\n"
+#~ msgstr "查詢 '%s' 無給定屬性\n"
+
+#~ msgid "WARNING: using first attribute only\n"
+#~ msgstr "警告: 僅使用第一個屬性\n"
+
+#~ msgid "LDAP init to '%s:%d' failed: %s\n"
+#~ msgstr "LDAP �始至 '%s:%d' 失敗: %s\n"
+
+#, fuzzy
+#~| msgid "LDAP init to '%s:%d' failed: %s\n"
+#~ msgid "LDAP init to '%s' failed: %s\n"
+#~ msgstr "LDAP �始至 '%s:%d' 失敗: %s\n"
+
+#, fuzzy
+#~| msgid "LDAP init to '%s:%d' failed: %s\n"
+#~ msgid "LDAP init to '%s' done\n"
+#~ msgstr "LDAP �始至 '%s:%d' 失敗: %s\n"
+
+#~ msgid "binding to '%s:%d' failed: %s\n"
+#~ msgstr "�定至 '%s:%d' 時失敗: %s\n"
+
+#~ msgid "searching '%s' failed: %s\n"
+#~ msgstr "�尋 '%s' 時失敗: %s\n"
+
+#~ msgid "start_cert_fetch: invalid pattern '%s'\n"
+#~ msgstr "start_cert_fetch: 無效的模� '%s'\n"
+
+#~ msgid "ldapserver missing"
+#~ msgstr "�失 ldapserver"
+
 #, fuzzy
 #~| msgid "change a passphrase"
 #~ msgid "Suggest a random passphrase."
diff --git a/scd/apdu.c b/scd/apdu.c
index 1065710..04bd3e2 100644
--- a/scd/apdu.c
+++ b/scd/apdu.c
@@ -302,6 +302,7 @@ long (* DLSTDCALL pcsc_establish_context) (pcsc_dword_t scope,
                                            const void *reserved2,
                                            HANDLE *r_context);
 long (* DLSTDCALL pcsc_release_context) (HANDLE context);
+long (* DLSTDCALL pcsc_cancel) (HANDLE context);
 long (* DLSTDCALL pcsc_list_readers) (HANDLE context,
                                       const char *groups,
                                       char *readers, pcsc_dword_t*readerslen);
@@ -327,10 +328,10 @@ long (* DLSTDCALL pcsc_status) (HANDLE card,
                                 pcsc_dword_t *r_state,
                                 pcsc_dword_t *r_protocol,
                                 unsigned char *atr, pcsc_dword_t *atrlen);
-long (* DLSTDCALL pcsc_begin_transaction) (long card);
+long (* DLSTDCALL pcsc_begin_transaction) (HANDLE card);
 long (* DLSTDCALL pcsc_end_transaction) (HANDLE card,
                                          pcsc_dword_t disposition);
-long (* DLSTDCALL pcsc_transmit) (long card,
+long (* DLSTDCALL pcsc_transmit) (HANDLE card,
                                   const pcsc_io_request_t send_pci,
                                   const unsigned char *send_buffer,
                                   pcsc_dword_t send_len,
@@ -625,6 +626,7 @@ pcsc_error_string (long err)
     case 0x001c: s = "card unsupported"; break;
     case 0x001d: s = "no service"; break;
     case 0x001e: s = "service stopped"; break;
+    case 0x002e: s = "no readers available"; break;
     default:     s = "unknown PC/SC error code"; break;
     }
   return s;
@@ -824,20 +826,23 @@ control_pcsc (int slot, pcsc_dword_t ioctl_code,
 }
 
 
+static void
+release_pcsc_context (void)
+{
+  /*log_debug ("%s: releasing context\n", __func__);*/
+  log_assert (pcsc.context != 0);
+  pcsc_release_context (pcsc.context);
+  pcsc.context = 0;
+}
+
 static int
 close_pcsc_reader (int slot)
 {
+  /*log_debug ("%s: count=%d (ctx=%x)\n", __func__, pcsc.count, pcsc.context);*/
   (void)slot;
-  if (--pcsc.count == 0 && npth_mutex_trylock (&reader_table_lock) == 0)
-    {
-      int i;
-
-      pcsc_release_context (pcsc.context);
-      pcsc.context = 0;
-      for (i = 0; i < MAX_READER; i++)
-        pcsc.rdrname[i] = NULL;
-      npth_mutex_unlock (&reader_table_lock);
-    }
+  log_assert (pcsc.count > 0);
+  if (!--pcsc.count)
+    release_pcsc_context ();
   return 0;
 }
 
@@ -868,6 +873,15 @@ connect_pcsc_card (int slot)
       if (err != PCSC_E_NO_SMARTCARD)
         log_error ("pcsc_connect failed: %s (0x%lx)\n",
                    pcsc_error_string (err), err);
+      if (err == PCSC_W_REMOVED_CARD && pcsc_cancel)
+        {
+          long err2;
+          if ((err2=pcsc_cancel (pcsc.context)))
+            log_error ("pcsc_cancel failed: %s (0x%lx)\n",
+                       pcsc_error_string (err2), err2);
+          else if (opt.verbose)
+            log_error ("pcsc_cancel succeeded\n");
+        }
     }
   else
     {
@@ -1131,6 +1145,7 @@ pcsc_init (void)
 
       pcsc_establish_context = dlsym (handle, "SCardEstablishContext");
       pcsc_release_context   = dlsym (handle, "SCardReleaseContext");
+      pcsc_cancel            = dlsym (handle, "SCardCancel");
       pcsc_list_readers      = dlsym (handle, "SCardListReaders");
 #if defined(_WIN32) || defined(__CYGWIN__)
       if (!pcsc_list_readers)
@@ -1223,11 +1238,12 @@ open_pcsc_reader (const char *rdrname)
   if (slot == -1)
     return -1;
 
+  pcsc.count++;
   reader_table[slot].rdrname = xtrystrdup (rdrname);
   if (!reader_table[slot].rdrname)
     {
       log_error ("error allocating memory for reader name\n");
-      close_pcsc_reader (0);
+      close_pcsc_reader (slot);
       reader_table[slot].used = 0;
       unlock_slot (slot);
       return -1;
@@ -1244,7 +1260,6 @@ open_pcsc_reader (const char *rdrname)
   reader_table[slot].send_apdu_reader = pcsc_send_apdu;
   reader_table[slot].dump_status_reader = dump_pcsc_reader_status;
 
-  pcsc.count++;
   dump_reader_status (slot);
   unlock_slot (slot);
   return slot;
@@ -1977,8 +1992,6 @@ apdu_dev_list_start (const char *portstr, struct dev_list **l_p)
   dl->idx = 0;
   dl->idx_max = 0;
 
-  npth_mutex_lock (&reader_table_lock);
-
 #ifdef HAVE_LIBUSB
   if (!opt.disable_ccid)
     {
@@ -1986,7 +1999,6 @@ apdu_dev_list_start (const char *portstr, struct dev_list **l_p)
       if (err)
         {
           xfree (dl);
-          npth_mutex_unlock (&reader_table_lock);
           return err;
         }
 
@@ -1996,7 +2008,6 @@ apdu_dev_list_start (const char *portstr, struct dev_list **l_p)
             log_debug ("leave: apdu_open_reader => slot=-1 (no ccid)\n");
 
           xfree (dl);
-          npth_mutex_unlock (&reader_table_lock);
           return gpg_error (GPG_ERR_ENODEV);
         }
     }
@@ -2008,12 +2019,14 @@ apdu_dev_list_start (const char *portstr, struct dev_list **l_p)
       char *p = NULL;
 
       if (!pcsc.context)
-        if (pcsc_init () < 0)
-          {
-            xfree (dl);
-            npth_mutex_unlock (&reader_table_lock);
-            return gpg_error (GPG_ERR_NO_SERVICE);
-          }
+        {
+          /* log_debug ("%s: No context - calling init\n", __func__); */
+          if (pcsc_init () < 0)
+            {
+              xfree (dl);
+              return gpg_error (GPG_ERR_NO_SERVICE);
+            }
+        }
 
       r = pcsc_list_readers (pcsc.context, NULL, NULL, &nreader);
       if (!r)
@@ -2024,9 +2037,9 @@ apdu_dev_list_start (const char *portstr, struct dev_list **l_p)
               err = gpg_error_from_syserror ();
 
               log_error ("error allocating memory for reader list\n");
-              close_pcsc_reader (0);
+              if (pcsc.count == 0)
+                release_pcsc_context ();
               xfree (dl);
-              npth_mutex_unlock (&reader_table_lock);
               return err;
             }
           r = pcsc_list_readers (pcsc.context, NULL, p, &nreader);
@@ -2036,9 +2049,9 @@ apdu_dev_list_start (const char *portstr, struct dev_list **l_p)
           log_error ("pcsc_list_readers failed: %s (0x%lx)\n",
                      pcsc_error_string (r), r);
           xfree (p);
-          close_pcsc_reader (0);
+          if (pcsc.count == 0)
+            release_pcsc_context ();
           xfree (dl);
-          npth_mutex_unlock (&reader_table_lock);
           return iso7816_map_sw (pcsc_error_to_sw (r));
         }
 
@@ -2074,6 +2087,13 @@ apdu_dev_list_start (const char *portstr, struct dev_list **l_p)
               break;
             }
         }
+
+      /*
+       * Increment PCSC.COUNT artificially, so that PCSC.CONTEXT can
+       * be kept (not released) until apdu_dev_list_finish will be
+       * called.
+       */
+      pcsc.count++;
     }
 
   *l_p = dl;
@@ -2098,14 +2118,12 @@ apdu_dev_list_finish (struct dev_list *dl)
       for (i = 0; i < MAX_READER; i++)
         pcsc.rdrname[i] = NULL;
 
-      if (pcsc.count == 0)
-        {
-          pcsc_release_context (pcsc.context);
-          pcsc.context = 0;
-        }
+      npth_mutex_lock (&reader_table_lock);
+      if (--pcsc.count == 0)
+        release_pcsc_context ();
+      npth_mutex_unlock (&reader_table_lock);
     }
   xfree (dl);
-  npth_mutex_unlock (&reader_table_lock);
 }
 
 
@@ -2118,22 +2136,42 @@ apdu_open_reader (struct dev_list *dl)
   if (!dl->table)
     return -1;
 
+#ifdef HAVE_LIBUSB
   /* See whether we want to use the reader ID string or a reader
      number. A readerno of -1 indicates that the reader ID string is
      to be used. */
-  if (dl->portstr && strchr (dl->portstr, ':'))
-    readerno = -1; /* We want to use the readerid.  */
-  else if (dl->portstr)
+  if (dl->portstr)
     {
-      readerno = atoi (dl->portstr);
-      if (readerno < 0 || readerno >= dl->idx_max)
-        return -1;
+      if (!opt.disable_ccid || strchr (dl->portstr, ':'))
+        readerno = -1; /* We want to use the readerid.  */
+      else
+        {
+          readerno = atoi (dl->portstr);
+          if (readerno < 0 || readerno >= dl->idx_max)
+            return -1;
 
-      dl->idx = readerno;
-      dl->portstr = NULL;
+          npth_mutex_lock (&reader_table_lock);
+          /* If already opened HANDLE, return -1.  */
+          for (slot = 0; slot < MAX_READER; slot++)
+            if (reader_table[slot].used)
+              {
+                npth_mutex_unlock (&reader_table_lock);
+                return -1;
+              }
+          npth_mutex_unlock (&reader_table_lock);
+
+          dl->idx = readerno;
+          dl->portstr = NULL;
+        }
     }
   else
     readerno = 0;  /* Default. */
+#else
+  if (dl->portstr)
+    readerno = -1; /* We want to use the readerid.  */
+  else
+    readerno = 0;  /* Default. */
+#endif
 
 #ifdef HAVE_LIBUSB
   if (!opt.disable_ccid)
@@ -2148,6 +2186,7 @@ apdu_open_reader (struct dev_list *dl)
           return slot;
         }
 
+      npth_mutex_lock (&reader_table_lock);
       while (dl->idx < dl->idx_max)
         {
           unsigned int bai = ccid_get_BAI (dl->idx, dl->table);
@@ -2171,7 +2210,10 @@ apdu_open_reader (struct dev_list *dl)
 
               dl->idx++;
               if (slot >= 0)
-                return slot;
+                {
+                  npth_mutex_unlock (&reader_table_lock);
+                  return slot;
+                }
               else
                 {
                   /* Skip this reader.  */
@@ -2187,6 +2229,7 @@ apdu_open_reader (struct dev_list *dl)
           else
             dl->idx++;
         }
+      npth_mutex_unlock (&reader_table_lock);
 
       /* Not found.  */
       slot = -1;
@@ -2202,6 +2245,7 @@ apdu_open_reader (struct dev_list *dl)
           return slot;
         }
 
+      npth_mutex_lock (&reader_table_lock);
       while (dl->idx < dl->idx_max)
         {
           const char *rdrname = pcsc.rdrname[dl->idx];
@@ -2221,14 +2265,18 @@ apdu_open_reader (struct dev_list *dl)
                 log_debug ("apdu_open_reader: new device=%s\n", rdrname);
 
               /* When reader string is specified, check if it is the one.  */
-              if (readerno < 0 && strcmp (rdrname, dl->portstr) != 0)
+              if (readerno < 0
+                  && strncmp (rdrname, dl->portstr, strlen (dl->portstr)) != 0)
                 continue;
 
               slot = open_pcsc_reader (rdrname);
 
               dl->idx++;
               if (slot >= 0)
-                return slot;
+                {
+                  npth_mutex_unlock (&reader_table_lock);
+                  return slot;
+                }
               else
                 {
                   /* Skip this reader.  */
@@ -2240,6 +2288,7 @@ apdu_open_reader (struct dev_list *dl)
             dl->idx++;
         }
 
+      npth_mutex_unlock (&reader_table_lock);
       /* Not found.  */
       slot = -1;
     }
@@ -2319,15 +2368,21 @@ apdu_close_reader (int slot)
     }
   if (reader_table[slot].close_reader)
     {
+      npth_mutex_lock (&reader_table_lock);
       sw = reader_table[slot].close_reader (slot);
+      xfree (reader_table[slot].rdrname);
+      reader_table[slot].rdrname = NULL;
       reader_table[slot].used = 0;
+      npth_mutex_unlock (&reader_table_lock);
       if (DBG_READER)
         log_debug ("leave: apdu_close_reader => 0x%x (close_reader)\n", sw);
       return sw;
     }
+  npth_mutex_lock (&reader_table_lock);
   xfree (reader_table[slot].rdrname);
   reader_table[slot].rdrname = NULL;
   reader_table[slot].used = 0;
+  npth_mutex_unlock (&reader_table_lock);
   if (DBG_READER)
     log_debug ("leave: apdu_close_reader => SW_HOST_NOT_SUPPORTED\n");
   return SW_HOST_NOT_SUPPORTED;
@@ -2566,19 +2621,16 @@ apdu_get_atr (int slot, size_t *atrlen)
 {
   unsigned char *buf;
 
-  if (DBG_READER)
-    log_debug ("enter: apdu_get_atr: slot=%d\n", slot);
-
   if (slot < 0 || slot >= MAX_READER || !reader_table[slot].used )
     {
       if (DBG_READER)
-        log_debug ("leave: apdu_get_atr => NULL (bad slot)\n");
+        log_debug ("apdu_get_atr => NULL (bad slot)\n");
       return NULL;
     }
   if (!reader_table[slot].atrlen)
     {
       if (DBG_READER)
-        log_debug ("leave: apdu_get_atr => NULL (no ATR)\n");
+        log_debug ("apdu_get_atr => NULL (no ATR)\n");
       return NULL;
     }
 
@@ -2586,13 +2638,11 @@ apdu_get_atr (int slot, size_t *atrlen)
   if (!buf)
     {
       if (DBG_READER)
-        log_debug ("leave: apdu_get_atr => NULL (out of core)\n");
+        log_debug ("apdu_get_atr => NULL (out of core)\n");
       return NULL;
     }
   memcpy (buf, reader_table[slot].atr, reader_table[slot].atrlen);
   *atrlen = reader_table[slot].atrlen;
-  if (DBG_READER)
-    log_debug ("leave: apdu_get_atr => atrlen=%zu\n", *atrlen);
   return buf;
 }
 
diff --git a/scd/app-common.h b/scd/app-common.h
index f194828..2eeffbe 100644
--- a/scd/app-common.h
+++ b/scd/app-common.h
@@ -45,7 +45,7 @@
 /* Flags used by the app_write_learn_status.  */
 #define APP_LEARN_FLAG_KEYPAIRINFO  1 /* Return only keypair infos.  */
 #define APP_LEARN_FLAG_MULTI        2 /* Return info for all apps.  */
-#define APP_LEARN_FLAG_REREAD       4 /* Re-read ifnos from the token.  */
+#define APP_LEARN_FLAG_REREAD       4 /* Re-read infos from the token.  */
 
 
 /* List of supported card types.  Generic is the usual ISO7817-4
@@ -194,6 +194,8 @@ struct app_ctx_s {
                       void *pincb_arg);
     gpg_error_t (*with_keygrip) (app_t app, ctrl_t ctrl, int action,
                                  const char *keygrip_str, int capability);
+    gpg_error_t (*check_aid) (app_t app, ctrl_t ctrl,
+                              const unsigned char *aid, size_t aidlen);
   } fnc;
 };
 
@@ -253,11 +255,12 @@ void application_notify_card_reset (int slot);
 gpg_error_t check_application_conflict (card_t card, const char *name,
                                         const unsigned char *serialno_bin,
                                         size_t serialno_bin_len);
-gpg_error_t card_reset (card_t card, ctrl_t ctrl, int send_reset);
-gpg_error_t select_application (ctrl_t ctrl, const char *name, card_t *r_app,
+gpg_error_t card_reset (card_t card);
+gpg_error_t select_application (ctrl_t ctrl, const char *name,
                                 int scan, const unsigned char *serialno_bin,
                                 size_t serialno_bin_len);
-gpg_error_t select_additional_application (ctrl_t ctrl, const char *name);
+gpg_error_t select_additional_application (card_t card,
+                                           ctrl_t ctrl, const char *name);
 
 gpg_error_t app_switch_current_card (ctrl_t ctrl,
                                      const unsigned char *serialno,
@@ -267,8 +270,8 @@ gpg_error_t app_switch_active_app (card_t card, ctrl_t ctrl,
 
 char *get_supported_applications (void);
 
-card_t card_ref (card_t card);
-void   card_unref (card_t card);
+card_t card_get (ctrl_t ctrl, const char *keygrip);
+void card_put (card_t card);
 void   card_unref_locked (card_t card);
 
 gpg_error_t app_munge_serialno (card_t card);
diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c
index 5508ec6..425adfb 100644
--- a/scd/app-openpgp.c
+++ b/scd/app-openpgp.c
@@ -316,6 +316,7 @@ get_manufacturer (unsigned int no)
     case 0x1337: return "Warsaw Hackerspace";
     case 0x2342: return "warpzone"; /* hackerspace Muenster.  */
     case 0x4354: return "Confidential Technologies";   /* cotech.de */
+    case 0x5343: return "SSE Carte à puce";
     case 0x5443: return "TIF-IT e.V.";
     case 0x63AF: return "Trustica";
     case 0xBA53: return "c-base e.V.";
@@ -3454,7 +3455,7 @@ do_change_pin (app_t app, ctrl_t ctrl,  const char *chvnostr,
 
       rc = pin2hash_if_kdf (app, 0, resetcode, &result1, &resultlen1);
       if (!rc)
-        rc = pin2hash_if_kdf (app, 0, pinvalue, &result2, &resultlen2);
+        rc = pin2hash_if_kdf (app, 1, pinvalue, &result2, &resultlen2);
       if (!rc)
         {
           bufferlen = resultlen1 + resultlen2;
@@ -3476,7 +3477,9 @@ do_change_pin (app_t app, ctrl_t ctrl,  const char *chvnostr,
     }
   else if (set_resetcode)
     {
-      if (strlen (pinvalue) < 8)
+      size_t bufferlen = strlen (pinvalue);
+
+      if (bufferlen != 0 && bufferlen < 8)
         {
           log_error (_("Reset Code is too short; minimum length is %d\n"), 8);
           rc = gpg_error (GPG_ERR_BAD_PIN);
@@ -3484,7 +3487,6 @@ do_change_pin (app_t app, ctrl_t ctrl,  const char *chvnostr,
       else
         {
           char *buffer = NULL;
-          size_t bufferlen;
 
           rc = pin2hash_if_kdf (app, 0, pinvalue, &buffer, &bufferlen);
           if (!rc)
@@ -4577,12 +4579,11 @@ ecc_writekey (app_t app, ctrl_t ctrl,
         {
           const unsigned char **buf2;
           size_t *buf2len;
-          int native = flag_djb_tweak;
 
           switch (*tok)
             {
             case 'q': buf2 = &ecc_q; buf2len = &ecc_q_len; break;
-            case 'd': buf2 = &ecc_d; buf2len = &ecc_d_len; native = 0; break;
+            case 'd': buf2 = &ecc_d; buf2len = &ecc_d_len; break;
             default: buf2 = NULL;  buf2len = NULL; break;
             }
           if (buf2 && *buf2)
@@ -4594,11 +4595,6 @@ ecc_writekey (app_t app, ctrl_t ctrl,
             goto leave;
           if (tok && buf2)
             {
-              if (!native)
-                /* Strip off leading zero bytes and save. */
-                for (;toklen && !*tok; toklen--, tok++)
-                  ;
-
               *buf2 = tok;
               *buf2len = toklen;
             }
@@ -4658,11 +4654,9 @@ ecc_writekey (app_t app, ctrl_t ctrl,
       err = gpg_error (GPG_ERR_INV_VALUE);
       goto leave;
     }
-  if (flag_djb_tweak && keyno != 1)
-    algo = PUBKEY_ALGO_EDDSA;
-  else if (keyno == 1)
+  if (keyno == 1)
     algo = PUBKEY_ALGO_ECDH;
-  else if (!strcmp (curve, "Ed448"))
+  else if (!strcmp (curve, "Ed25519") || !strcmp (curve, "Ed448"))
     algo = PUBKEY_ALGO_EDDSA;
   else
     algo = PUBKEY_ALGO_ECDSA;
@@ -6140,6 +6134,21 @@ do_reselect (app_t app, ctrl_t ctrl)
 }
 
 
+/* Check if AID is the correct one.  */
+static gpg_error_t
+do_check_aid (app_t app, ctrl_t ctrl, const unsigned char *aid, size_t aidlen)
+{
+  (void)app;
+  (void)ctrl;
+
+  if (aidlen >= sizeof openpgp_aid
+      && memcmp (aid, openpgp_aid, sizeof openpgp_aid) == 0)
+    return 0;
+
+  return gpg_error (GPG_ERR_WRONG_CARD);
+}
+
+
 /* Select the OpenPGP application on the card in SLOT.  This function
    must be used before any other OpenPGP application functions. */
 gpg_error_t
@@ -6328,6 +6337,7 @@ app_select_openpgp (app_t app)
       app->fnc.change_pin = do_change_pin;
       app->fnc.check_pin = do_check_pin;
       app->fnc.with_keygrip = do_with_keygrip;
+      app->fnc.check_aid = do_check_aid;
    }
 
 leave:
diff --git a/scd/app-p15.c b/scd/app-p15.c
index 0782c25..db45236 100644
--- a/scd/app-p15.c
+++ b/scd/app-p15.c
@@ -74,6 +74,7 @@ typedef enum
     CARD_TYPE_MICARDO,
     CARD_TYPE_CARDOS_50,
     CARD_TYPE_CARDOS_53,
+    CARD_TYPE_AET,     /* A.E.T. Europe JCOP card.  */
     CARD_TYPE_BELPIC   /* Belgian eID card specs. */
   }
 card_type_t;
@@ -120,6 +121,9 @@ static struct
     CARD_TYPE_CARDOS_50 }, /* CardOS 5.0 */
   { 11, X("\x3b\xd2\x18\x00\x81\x31\xfe\x58\xc9\x03\x16"),
     CARD_TYPE_CARDOS_53 }, /* CardOS 5.3 */
+  { 24, X("\x3b\xfe\x18\x00\x00\x80\x31\xfe\x45\x53\x43\x45"
+          "\x36\x30\x2d\x43\x44\x30\x38\x31\x2d\x6e\x46\xa9"),
+    CARD_TYPE_AET },
   { 0 }
 };
 #undef X
@@ -152,6 +156,14 @@ typedef enum
     PIN_TYPE_ISO9564_1 = 4
   } pin_type_t;
 
+/* The AuthenticationTypes as defined in pkcs#15 v1.1 (6.8.1) */
+typedef enum
+  {
+    AUTH_TYPE_PIN = -1,
+    AUTH_TYPE_BIOMETRIC = 0,
+    AUTH_TYPE_AUTHKEY = 1,
+    AUTH_TYPE_EXTERNAL = 2,
+  } auth_type_t;
 
 /* A bit array with for the key usage flags from the
    commonKeyAttributes. */
@@ -372,6 +384,11 @@ struct aodf_object_s
   /* The file ID of this AODF.  */
   unsigned short fid;
 
+  /* The type of this authentication object.  */
+  auth_type_t auth_type;
+
+  /* Info used for AUTH_TYPE_PIN: */
+
   /* The PIN Flags. */
   struct
   {
@@ -419,6 +436,9 @@ struct aodf_object_s
      may be NULL.  Malloced.*/
   size_t pathlen;
   unsigned short *path;
+
+  /* Info used for AUTH_TYPE_AUTHKEY: */
+
 };
 typedef struct aodf_object_s *aodf_object_t;
 
@@ -436,11 +456,14 @@ struct app_local_s
   /* The vendor's product.  */
   card_product_t card_product;
 
+  /* Flag indicating that extedned_mode is not supported.  */
+  unsigned int no_extended_mode : 1;
+
   /* Flag indicating whether we may use direct path selection. */
-  int direct_path_selection;
+  unsigned int direct_path_selection : 1;
 
   /* Flag indicating whether the card has any key with a gpgusage set.  */
-  int any_gpgusage;
+  unsigned int any_gpgusage : 1;
 
   /* Structure with the EFIDs of the objects described in the ODF
      file. */
@@ -512,6 +535,7 @@ cardtype2str (card_type_t cardtype)
     case CARD_TYPE_CARDOS_50: return "CardOS 5.0";
     case CARD_TYPE_CARDOS_53: return "CardOS 5.3";
     case CARD_TYPE_BELPIC:    return "Belgian eID";
+    case CARD_TYPE_AET:       return "AET";
     }
   return "";
 }
@@ -522,7 +546,7 @@ cardproduct2str (card_product_t cardproduct)
   switch (cardproduct)
     {
     case CARD_PRODUCT_UNKNOWN: return "";
-    case CARD_PRODUCT_RSCS:    return "RSCS";
+    case CARD_PRODUCT_RSCS:    return "R&S";
     case CARD_PRODUCT_DTRUST:  return "D-Trust";
     }
   return "";
@@ -763,6 +787,27 @@ select_ef_by_path (app_t app, const unsigned short *path, size_t pathlen)
           goto err_print_path;
         }
     }
+  else if (pathlen > 1 && path[0] == 0x3fff)
+    {
+      err = iso7816_select_file (app_get_slot (app), 0x3f00, 0);
+      if (err)
+        {
+          log_error ("p15: error selecting part %d from path ", 0);
+          goto err_print_path;
+        }
+      path++;
+      pathlen--;
+      for (i=0; i < pathlen; i++)
+        {
+          err = iso7816_select_file (app_get_slot (app),
+                                     path[i], (i+1 == pathlen)? 2 : 1);
+          if (err)
+            {
+              log_error ("p15: error selecting part %d from path ", i);
+              goto err_print_path;
+            }
+        }
+    }
   else
     {
       if (pathlen && *path != 0x3f00 )
@@ -1861,10 +1906,12 @@ read_ef_prkdf (app_t app, unsigned short fid, prkdf_object_t *result)
       if (err)
         goto parse_error;
 
-      /* Make sure that the next element is a non zero path and of
-         even length (FID are two bytes each). */
+      /* Make sure that the next element has a path of even length
+       * (FIDs are two bytes each).  We should check that the path
+       * length is non-zero but some cards return a zero length path
+       * nevertheless (e.g. A.E.T. Europe Java applets). */
       if (class != CLASS_UNIVERSAL || tag != TAG_OCTET_STRING
-          ||  !objlen || (objlen & 1) )
+          || (objlen & 1) )
         {
           errstr = "invalid path reference";
           goto parse_error;
@@ -2165,10 +2212,10 @@ read_ef_pukdf (app_t app, unsigned short fid, pukdf_object_t *result)
       if (err)
         goto parse_error;
 
-      /* Make sure that the next element is a non zero path and of
-         even length (FID are two bytes each). */
+      /* Make sure that the next element has a path of even length
+       * (FIDs are two bytes each).  */
       if (class != CLASS_UNIVERSAL || tag != TAG_OCTET_STRING
-          ||  !objlen || (objlen & 1) )
+          ||  (objlen & 1) )
         {
           errstr = "invalid path reference";
           goto parse_error;
@@ -2460,10 +2507,10 @@ read_ef_cdf (app_t app, unsigned short fid, int cdftype, cdf_object_t *result)
       if (err)
         goto parse_error;
 
-      /* Make sure that the next element is a non zero path and of
-         even length (FID are two bytes each). */
+      /* Make sure that the next element has a path of even length
+       * (FIDs are two bytes each).  */
       if (class != CLASS_UNIVERSAL || tag != TAG_OCTET_STRING
-          ||  !objlen || (objlen & 1) )
+          || (objlen & 1) )
         {
           errstr = "invalid path reference";
           goto parse_error;
@@ -2609,37 +2656,46 @@ read_ef_cdf (app_t app, unsigned short fid, int cdftype, cdf_object_t *result)
 
 
 /*
-SEQUENCE {
-  SEQUENCE { -- CommonObjectAttributes
-    UTF8String 'specific PIN for DS'
-    BIT STRING 0 unused bits
-      '00000011'B
-    }
-  SEQUENCE { -- CommonAuthenticationObjectAttributes
-    OCTET STRING
-      07    -- iD
-    }
-
-  [1] { -- typeAttributes
-    SEQUENCE { -- PinAttributes
-      BIT STRING 0 unused bits
-        '0000100000110010'B  -- local,initialized,needs-padding
-                             -- exchangeRefData
-      ENUMERATED 1           -- ascii-numeric
-      INTEGER 6              -- minLength
-      INTEGER 6              -- storedLength
-      INTEGER 8              -- maxLength
-      [0]
-        02                   -- pinReference
-      GeneralizedTime 19/04/2002 12:12 GMT  -- lastPinChange
-      SEQUENCE {
-        OCTET STRING
-          3F 00 40 16        -- path to DF of PIN
-        }
-      }
-    }
-  }
-
+ * SEQUENCE {
+ *   SEQUENCE { -- CommonObjectAttributes
+ *     UTF8String 'specific PIN for DS'
+ *     BIT STRING 0 unused bits
+ *       '00000011'B
+ *     }
+ *   SEQUENCE { -- CommonAuthenticationObjectAttributes
+ *     OCTET STRING
+ *       07    -- iD
+ *     }
+ *
+ *   [1] { -- typeAttributes
+ *     SEQUENCE { -- PinAttributes
+ *       BIT STRING 0 unused bits
+ *         '0000100000110010'B  -- local,initialized,needs-padding
+ *                              -- exchangeRefData
+ *       ENUMERATED 1           -- ascii-numeric
+ *       INTEGER 6              -- minLength
+ *       INTEGER 6              -- storedLength
+ *       INTEGER 8              -- maxLength
+ *       [0]
+ *         02                   -- pinReference
+ *       GeneralizedTime 19/04/2002 12:12 GMT  -- lastPinChange
+ *       SEQUENCE {
+ *         OCTET STRING
+ *           3F 00 40 16        -- path to DF of PIN
+ *         }
+ *       }
+ *     }
+ *   }
+ *
+ * Or for an authKey:
+ *
+ *   [1] { -- typeAttributes
+ *     SEQUENCE { -- AuthKeyAttributes
+ *       BOOLEAN TRUE    -- derivedKey
+ *       OCTET STRING 02 -- authKeyId
+ *       }
+ *     }
+ *   }
 */
 /* Read and parse an Authentication Object Directory File identified
    by FID.  On success a newlist of AODF objects gets stored at RESULT
@@ -2676,6 +2732,7 @@ read_ef_aodf (app_t app, unsigned short fid, aodf_object_t *result)
       size_t nn;
       int where;
       const char *errstr = NULL;
+      auth_type_t auth_type;
       aodf_object_t aodf = NULL;
       unsigned long ul;
       const char *s;
@@ -2688,16 +2745,19 @@ read_ef_aodf (app_t app, unsigned short fid, aodf_object_t *result)
       else if (objlen > n)
         err = gpg_error (GPG_ERR_INV_OBJ);
       else if (class == CLASS_UNIVERSAL && tag == TAG_SEQUENCE)
-        ; /* PinAttributes */
+        auth_type = AUTH_TYPE_PIN;    /* PinAttributes */
+      else if (class == CLASS_CONTEXT && tag == 1 )
+        auth_type = AUTH_TYPE_AUTHKEY; /* AuthKeyAttributes */
       else if (class == CLASS_CONTEXT)
         {
           switch (tag)
             {
             case 0: errstr = "biometric auth types are not supported"; break;
-            case 1: errstr = "authKey auth types are not supported"; break;
             case 2: errstr = "external auth type are not supported"; break;
             default: errstr = "unknown privateKeyObject"; break;
             }
+          p += objlen;
+          n -= objlen;
           goto parse_error;
         }
       else
@@ -2706,7 +2766,6 @@ read_ef_aodf (app_t app, unsigned short fid, aodf_object_t *result)
           goto parse_error;
         }
 
-
       if (err)
         {
           log_error ("p15: error parsing AODF record: %s\n",
@@ -2723,6 +2782,7 @@ read_ef_aodf (app_t app, unsigned short fid, aodf_object_t *result)
       if (!aodf)
         goto no_core;
       aodf->fid = fid;
+      aodf->auth_type = auth_type;
 
       /* Parse the commonObjectAttributes.  */
       where = __LINE__;
@@ -2781,7 +2841,7 @@ read_ef_aodf (app_t app, unsigned short fid, aodf_object_t *result)
       else if (!err && objlen > nn)
         err = gpg_error (GPG_ERR_INV_OBJ);
       else if (class == CLASS_UNIVERSAL && tag == TAG_SEQUENCE)
-        ; /* A typeAttribute always starts with a sequence */
+        ; /* Okay */
       else
         err = gpg_error (GPG_ERR_INV_OBJ);
       if (err)
@@ -2789,240 +2849,147 @@ read_ef_aodf (app_t app, unsigned short fid, aodf_object_t *result)
 
       nn = objlen;
 
-      /* PinFlags */
-      where = __LINE__;
-      err = parse_ber_header (&pp, &nn, &class, &tag, &constructed,
-                              &ndef, &objlen, &hdrlen);
-      if (!err && (objlen > nn || !objlen
-                   || class != CLASS_UNIVERSAL || tag != TAG_BIT_STRING))
-        err = gpg_error (GPG_ERR_INV_OBJ);
-      if (err)
-        goto parse_error;
-
-      {
-        unsigned int bits, mask;
-        int unused, full;
-
-        unused = *pp++; nn--; objlen--;
-        if ((!objlen && unused) || unused/8 > objlen)
-          {
-            err = gpg_error (GPG_ERR_ENCODING_PROBLEM);
+      if (auth_type == AUTH_TYPE_PIN)
+        {
+          /* PinFlags */
+          where = __LINE__;
+          err = parse_ber_header (&pp, &nn, &class, &tag, &constructed,
+                                  &ndef, &objlen, &hdrlen);
+          if (!err && (objlen > nn || !objlen
+                       || class != CLASS_UNIVERSAL || tag != TAG_BIT_STRING))
+            err = gpg_error (GPG_ERR_INV_OBJ);
+          if (err)
             goto parse_error;
-          }
-        full = objlen - (unused+7)/8;
-        unused %= 8;
-        mask = 0;
-        for (i=1; unused; i <<= 1, unused--)
-          mask |= i;
-
-        /* The first octet */
-        bits = 0;
-        if (objlen)
+
           {
-            bits = *pp++; nn--; objlen--;
-            if (full)
-              full--;
-            else
+            unsigned int bits, mask;
+            int unused, full;
+
+            unused = *pp++; nn--; objlen--;
+            if ((!objlen && unused) || unused/8 > objlen)
               {
-                bits &= ~mask;
-                mask = 0;
+                err = gpg_error (GPG_ERR_ENCODING_PROBLEM);
+                goto parse_error;
               }
-          }
-        if ((bits & 0x80)) /* ASN.1 bit 0. */
-          aodf->pinflags.case_sensitive = 1;
-        if ((bits & 0x40)) /* ASN.1 bit 1. */
-          aodf->pinflags.local = 1;
-        if ((bits & 0x20))
-          aodf->pinflags.change_disabled = 1;
-        if ((bits & 0x10))
-          aodf->pinflags.unblock_disabled = 1;
-        if ((bits & 0x08))
-          aodf->pinflags.initialized = 1;
-        if ((bits & 0x04))
-          aodf->pinflags.needs_padding = 1;
-        if ((bits & 0x02))
-          aodf->pinflags.unblocking_pin = 1;
-        if ((bits & 0x01))
-          aodf->pinflags.so_pin = 1;
-        /* The second octet. */
-        bits = 0;
-        if (objlen)
-          {
-            bits = *pp++; nn--; objlen--;
-            if (full)
-              full--;
-            else
+            full = objlen - (unused+7)/8;
+            unused %= 8;
+            mask = 0;
+            for (i=1; unused; i <<= 1, unused--)
+              mask |= i;
+
+            /* The first octet */
+            bits = 0;
+            if (objlen)
+              {
+                bits = *pp++; nn--; objlen--;
+                if (full)
+                  full--;
+                else
+                  {
+                    bits &= ~mask;
+                    mask = 0;
+                  }
+              }
+            if ((bits & 0x80)) /* ASN.1 bit 0. */
+              aodf->pinflags.case_sensitive = 1;
+            if ((bits & 0x40)) /* ASN.1 bit 1. */
+              aodf->pinflags.local = 1;
+            if ((bits & 0x20))
+              aodf->pinflags.change_disabled = 1;
+            if ((bits & 0x10))
+              aodf->pinflags.unblock_disabled = 1;
+            if ((bits & 0x08))
+              aodf->pinflags.initialized = 1;
+            if ((bits & 0x04))
+              aodf->pinflags.needs_padding = 1;
+            if ((bits & 0x02))
+              aodf->pinflags.unblocking_pin = 1;
+            if ((bits & 0x01))
+              aodf->pinflags.so_pin = 1;
+            /* The second octet. */
+            bits = 0;
+            if (objlen)
               {
-                bits &= ~mask;
+                bits = *pp++; nn--; objlen--;
+                if (full)
+                  full--;
+                else
+                  {
+                    bits &= ~mask;
+                  }
               }
+            if ((bits & 0x80))
+              aodf->pinflags.disable_allowed = 1;
+            if ((bits & 0x40))
+              aodf->pinflags.integrity_protected = 1;
+            if ((bits & 0x20))
+              aodf->pinflags.confidentiality_protected = 1;
+            if ((bits & 0x10))
+              aodf->pinflags.exchange_ref_data = 1;
+            /* Skip remaining bits. */
+            pp += objlen;
+            nn -= objlen;
           }
-        if ((bits & 0x80))
-          aodf->pinflags.disable_allowed = 1;
-        if ((bits & 0x40))
-          aodf->pinflags.integrity_protected = 1;
-        if ((bits & 0x20))
-          aodf->pinflags.confidentiality_protected = 1;
-        if ((bits & 0x10))
-          aodf->pinflags.exchange_ref_data = 1;
-        /* Skip remaining bits. */
-        pp += objlen;
-        nn -= objlen;
-      }
-
-
-      /* PinType */
-      where = __LINE__;
-      err = parse_ber_header (&pp, &nn, &class, &tag, &constructed,
-                              &ndef, &objlen, &hdrlen);
-      if (!err && (objlen > nn
-                   || class != CLASS_UNIVERSAL || tag != TAG_ENUMERATED))
-        err = gpg_error (GPG_ERR_INV_OBJ);
-      if (!err && objlen > sizeof (ul))
-        err = gpg_error (GPG_ERR_UNSUPPORTED_ENCODING);
-      if (err)
-        goto parse_error;
-
-      for (ul=0; objlen; objlen--)
-        {
-          ul <<= 8;
-          ul |= (*pp++) & 0xff;
-          nn--;
-        }
-      aodf->pintype = ul;
-
-
-      /* minLength */
-      where = __LINE__;
-      err = parse_ber_header (&pp, &nn, &class, &tag, &constructed,
-                              &ndef, &objlen, &hdrlen);
-      if (!err && (objlen > nn
-                   || class != CLASS_UNIVERSAL || tag != TAG_INTEGER))
-        err = gpg_error (GPG_ERR_INV_OBJ);
-      if (!err && objlen > sizeof (ul))
-        err = gpg_error (GPG_ERR_UNSUPPORTED_ENCODING);
-      if (err)
-        goto parse_error;
-      for (ul=0; objlen; objlen--)
-        {
-          ul <<= 8;
-          ul |= (*pp++) & 0xff;
-          nn--;
-        }
-      aodf->min_length = ul;
-
-
-      /* storedLength */
-      where = __LINE__;
-      err = parse_ber_header (&pp, &nn, &class, &tag, &constructed,
-                              &ndef, &objlen, &hdrlen);
-      if (!err && (objlen > nn
-                   || class != CLASS_UNIVERSAL || tag != TAG_INTEGER))
-        err = gpg_error (GPG_ERR_INV_OBJ);
-      if (!err && objlen > sizeof (ul))
-        err = gpg_error (GPG_ERR_UNSUPPORTED_ENCODING);
-      if (err)
-        goto parse_error;
-      for (ul=0; objlen; objlen--)
-        {
-          ul <<= 8;
-          ul |= (*pp++) & 0xff;
-          nn--;
-        }
-      aodf->stored_length = ul;
-
-      /* optional maxLength */
-      where = __LINE__;
-      err = parse_ber_header (&pp, &nn, &class, &tag, &constructed,
-                              &ndef, &objlen, &hdrlen);
-      if (gpg_err_code (err) == GPG_ERR_EOF)
-        goto ready;
-      if (!err && objlen > nn)
-        err = gpg_error (GPG_ERR_INV_OBJ);
-      if (err)
-        goto parse_error;
-      if (class == CLASS_UNIVERSAL && tag == TAG_INTEGER)
-        {
-          if (objlen > sizeof (ul))
-            {
-              err = gpg_error (GPG_ERR_UNSUPPORTED_ENCODING);
-              goto parse_error;
-            }
-          for (ul=0; objlen; objlen--)
-            {
-              ul <<= 8;
-              ul |= (*pp++) & 0xff;
-              nn--;
-            }
-          aodf->max_length = ul;
-          aodf->max_length_valid = 1;
 
+          /* PinType */
           where = __LINE__;
           err = parse_ber_header (&pp, &nn, &class, &tag, &constructed,
                                   &ndef, &objlen, &hdrlen);
-          if (gpg_err_code (err) == GPG_ERR_EOF)
-            goto ready;
-          if (!err && objlen > nn)
+          if (!err && (objlen > nn
+                       || class != CLASS_UNIVERSAL || tag != TAG_ENUMERATED))
             err = gpg_error (GPG_ERR_INV_OBJ);
+          if (!err && objlen > sizeof (ul))
+            err = gpg_error (GPG_ERR_UNSUPPORTED_ENCODING);
           if (err)
             goto parse_error;
-        }
 
-      /* Optional pinReference. */
-      if (class == CLASS_CONTEXT && tag == 0)
-        {
-          if (objlen > sizeof (ul))
-            {
-              err = gpg_error (GPG_ERR_UNSUPPORTED_ENCODING);
-              goto parse_error;
-            }
           for (ul=0; objlen; objlen--)
             {
               ul <<= 8;
               ul |= (*pp++) & 0xff;
               nn--;
             }
-          aodf->pin_reference = ul;
-          aodf->pin_reference_valid = 1;
+          aodf->pintype = ul;
 
+          /* minLength */
           where = __LINE__;
           err = parse_ber_header (&pp, &nn, &class, &tag, &constructed,
                                   &ndef, &objlen, &hdrlen);
-          if (gpg_err_code (err) == GPG_ERR_EOF)
-            goto ready;
-          if (!err && objlen > nn)
+          if (!err && (objlen > nn
+                       || class != CLASS_UNIVERSAL || tag != TAG_INTEGER))
             err = gpg_error (GPG_ERR_INV_OBJ);
+          if (!err && objlen > sizeof (ul))
+            err = gpg_error (GPG_ERR_UNSUPPORTED_ENCODING);
           if (err)
             goto parse_error;
-        }
-
-      /* Optional padChar. */
-      if (class == CLASS_UNIVERSAL && tag == TAG_OCTET_STRING)
-        {
-          if (objlen != 1)
+          for (ul=0; objlen; objlen--)
             {
-              errstr = "padChar is not of size(1)";
-              goto parse_error;
+              ul <<= 8;
+              ul |= (*pp++) & 0xff;
+              nn--;
             }
-          aodf->pad_char = *pp++; nn--;
-          aodf->pad_char_valid = 1;
+          aodf->min_length = ul;
 
+          /* storedLength */
           where = __LINE__;
           err = parse_ber_header (&pp, &nn, &class, &tag, &constructed,
                                   &ndef, &objlen, &hdrlen);
-          if (gpg_err_code (err) == GPG_ERR_EOF)
-            goto ready;
-          if (!err && objlen > nn)
+          if (!err && (objlen > nn
+                       || class != CLASS_UNIVERSAL || tag != TAG_INTEGER))
             err = gpg_error (GPG_ERR_INV_OBJ);
+          if (!err && objlen > sizeof (ul))
+            err = gpg_error (GPG_ERR_UNSUPPORTED_ENCODING);
           if (err)
             goto parse_error;
-        }
-
-      /* Skip optional lastPinChange. */
-      if (class == CLASS_UNIVERSAL && tag == TAG_GENERALIZED_TIME)
-        {
-          pp += objlen;
-          nn -= objlen;
+          for (ul=0; objlen; objlen--)
+            {
+              ul <<= 8;
+              ul |= (*pp++) & 0xff;
+              nn--;
+            }
+          aodf->stored_length = ul;
 
+          /* optional maxLength */
           where = __LINE__;
           err = parse_ber_header (&pp, &nn, &class, &tag, &constructed,
                                   &ndef, &objlen, &hdrlen);
@@ -3032,80 +2999,180 @@ read_ef_aodf (app_t app, unsigned short fid, aodf_object_t *result)
             err = gpg_error (GPG_ERR_INV_OBJ);
           if (err)
             goto parse_error;
-        }
+          if (class == CLASS_UNIVERSAL && tag == TAG_INTEGER)
+            {
+              if (objlen > sizeof (ul))
+                {
+                  err = gpg_error (GPG_ERR_UNSUPPORTED_ENCODING);
+                  goto parse_error;
+                }
+              for (ul=0; objlen; objlen--)
+                {
+                  ul <<= 8;
+                  ul |= (*pp++) & 0xff;
+                  nn--;
+                }
+              aodf->max_length = ul;
+              aodf->max_length_valid = 1;
 
-      /* Optional Path object.  */
-      if (class == CLASS_UNIVERSAL || tag == TAG_SEQUENCE)
-        {
-          const unsigned char *ppp = pp;
-          size_t nnn = objlen;
+              where = __LINE__;
+              err = parse_ber_header (&pp, &nn, &class, &tag, &constructed,
+                                      &ndef, &objlen, &hdrlen);
+              if (gpg_err_code (err) == GPG_ERR_EOF)
+                goto ready;
+              if (!err && objlen > nn)
+                err = gpg_error (GPG_ERR_INV_OBJ);
+              if (err)
+                goto parse_error;
+            }
 
-          pp += objlen;
-          nn -= objlen;
+          /* Optional pinReference. */
+          if (class == CLASS_CONTEXT && tag == 0)
+            {
+              if (objlen > sizeof (ul))
+                {
+                  err = gpg_error (GPG_ERR_UNSUPPORTED_ENCODING);
+                  goto parse_error;
+                }
+              for (ul=0; objlen; objlen--)
+                {
+                  ul <<= 8;
+                  ul |= (*pp++) & 0xff;
+                  nn--;
+                }
+              aodf->pin_reference = ul;
+              aodf->pin_reference_valid = 1;
 
-          where = __LINE__;
-          err = parse_ber_header (&ppp, &nnn, &class, &tag, &constructed,
-                                  &ndef, &objlen, &hdrlen);
-          if (!err && objlen > nnn)
-            err = gpg_error (GPG_ERR_INV_OBJ);
-          if (err)
-            goto parse_error;
+              where = __LINE__;
+              err = parse_ber_header (&pp, &nn, &class, &tag, &constructed,
+                                      &ndef, &objlen, &hdrlen);
+              if (gpg_err_code (err) == GPG_ERR_EOF)
+                goto ready;
+              if (!err && objlen > nn)
+                err = gpg_error (GPG_ERR_INV_OBJ);
+              if (err)
+                goto parse_error;
+            }
 
-          /* Make sure that the next element is a non zero FID and of
-             even length (FID are two bytes each). */
-          if (class != CLASS_UNIVERSAL || tag != TAG_OCTET_STRING
-              ||  !objlen || (objlen & 1) )
+          /* Optional padChar. */
+          if (class == CLASS_UNIVERSAL && tag == TAG_OCTET_STRING)
             {
-              errstr = "invalid path reference";
-              goto parse_error;
-            }
+              if (objlen != 1)
+                {
+                  errstr = "padChar is not of size(1)";
+                  goto parse_error;
+                }
+              aodf->pad_char = *pp++; nn--;
+              aodf->pad_char_valid = 1;
 
-          aodf->pathlen = objlen/2;
-          aodf->path = xtrycalloc (aodf->pathlen, sizeof *aodf->path);
-          if (!aodf->path)
-            goto no_core;
-          for (i=0; i < aodf->pathlen; i++, ppp += 2, nnn -= 2)
-            aodf->path[i] = ((ppp[0] << 8) | ppp[1]);
+              where = __LINE__;
+              err = parse_ber_header (&pp, &nn, &class, &tag, &constructed,
+                                      &ndef, &objlen, &hdrlen);
+              if (gpg_err_code (err) == GPG_ERR_EOF)
+                goto ready;
+              if (!err && objlen > nn)
+                err = gpg_error (GPG_ERR_INV_OBJ);
+              if (err)
+                goto parse_error;
+            }
 
-          if (nnn)
+          /* Skip optional lastPinChange. */
+          if (class == CLASS_UNIVERSAL && tag == TAG_GENERALIZED_TIME)
             {
-              /* An index and length follows. */
-              aodf->have_off = 1;
+              pp += objlen;
+              nn -= objlen;
+
               where = __LINE__;
-              err = parse_ber_header (&ppp, &nnn, &class, &tag, &constructed,
+              err = parse_ber_header (&pp, &nn, &class, &tag, &constructed,
                                       &ndef, &objlen, &hdrlen);
-              if (!err && (objlen > nnn
-                       || class != CLASS_UNIVERSAL || tag != TAG_INTEGER))
+              if (gpg_err_code (err) == GPG_ERR_EOF)
+                goto ready;
+              if (!err && objlen > nn)
                 err = gpg_error (GPG_ERR_INV_OBJ);
               if (err)
                 goto parse_error;
+            }
 
-              for (ul=0; objlen; objlen--)
-                {
-                  ul <<= 8;
-                  ul |= (*ppp++) & 0xff;
-                  nnn--;
-                }
-              aodf->off = ul;
+          /* Optional Path object.  */
+          if (class == CLASS_UNIVERSAL || tag == TAG_SEQUENCE)
+            {
+              const unsigned char *ppp = pp;
+              size_t nnn = objlen;
+
+              pp += objlen;
+              nn -= objlen;
 
               where = __LINE__;
               err = parse_ber_header (&ppp, &nnn, &class, &tag, &constructed,
                                       &ndef, &objlen, &hdrlen);
-              if (!err && (objlen > nnn
-                           || class != CLASS_CONTEXT || tag != 0))
+              if (!err && objlen > nnn)
                 err = gpg_error (GPG_ERR_INV_OBJ);
               if (err)
                 goto parse_error;
 
-              for (ul=0; objlen; objlen--)
+              /* Make sure that the next element has a path of even
+               * length (FIDs are two bytes each).  */
+              if (class != CLASS_UNIVERSAL || tag != TAG_OCTET_STRING
+                  || (objlen & 1) )
                 {
-                  ul <<= 8;
-                  ul |= (*ppp++) & 0xff;
-                  nnn--;
+                  errstr = "invalid path reference";
+                  goto parse_error;
+                }
+
+              aodf->pathlen = objlen/2;
+              aodf->path = xtrycalloc (aodf->pathlen, sizeof *aodf->path);
+              if (!aodf->path)
+                goto no_core;
+              for (i=0; i < aodf->pathlen; i++, ppp += 2, nnn -= 2)
+                aodf->path[i] = ((ppp[0] << 8) | ppp[1]);
+
+              if (nnn)
+                {
+                  /* An index and length follows. */
+                  aodf->have_off = 1;
+                  where = __LINE__;
+                  err = parse_ber_header (&ppp, &nnn, &class, &tag,
+                                          &constructed,
+                                          &ndef, &objlen, &hdrlen);
+                  if (!err && (objlen > nnn
+                               || class != CLASS_UNIVERSAL
+                               || tag != TAG_INTEGER))
+                    err = gpg_error (GPG_ERR_INV_OBJ);
+                  if (err)
+                    goto parse_error;
+
+                  for (ul=0; objlen; objlen--)
+                    {
+                      ul <<= 8;
+                      ul |= (*ppp++) & 0xff;
+                      nnn--;
+                    }
+                  aodf->off = ul;
+
+                  where = __LINE__;
+                  err = parse_ber_header (&ppp, &nnn, &class, &tag,
+                                          &constructed,
+                                          &ndef, &objlen, &hdrlen);
+                  if (!err && (objlen > nnn
+                               || class != CLASS_CONTEXT || tag != 0))
+                    err = gpg_error (GPG_ERR_INV_OBJ);
+                  if (err)
+                    goto parse_error;
+
+                  for (ul=0; objlen; objlen--)
+                    {
+                      ul <<= 8;
+                      ul |= (*ppp++) & 0xff;
+                      nnn--;
+                    }
+                  aodf->len = ul;
                 }
-              aodf->len = ul;
             }
         }
+      else if (auth_type == AUTH_TYPE_AUTHKEY)
+        {
+
+        }
 
       /* Ignore further objects which might be there due to future
          extensions of pkcs#15. */
@@ -3121,6 +3188,9 @@ read_ef_aodf (app_t app, unsigned short fid, aodf_object_t *result)
           if (aodf->label)
             log_printf (" (%s)", aodf->label);
           log_info ("p15:            ");
+          log_printf (" %s",
+                      aodf->auth_type == AUTH_TYPE_PIN? "pin" :
+                      aodf->auth_type == AUTH_TYPE_AUTHKEY? "authkey" : "?");
           if (aodf->pathlen)
             {
               log_printf (" path=");
@@ -3135,58 +3205,64 @@ read_ef_aodf (app_t app, unsigned short fid, aodf_object_t *result)
               for (i=0; i < aodf->authidlen; i++)
                 log_printf ("%02X", aodf->authid[i]);
             }
-          if (aodf->pin_reference_valid)
-            log_printf (" pinref=0x%02lX", aodf->pin_reference);
-          log_printf (" min=%lu", aodf->min_length);
-          log_printf (" stored=%lu", aodf->stored_length);
-          if (aodf->max_length_valid)
-            log_printf (" max=%lu", aodf->max_length);
-          if (aodf->pad_char_valid)
-            log_printf (" pad=0x%02x", aodf->pad_char);
-
-          log_info ("p15:             flags=");
-          s = "";
-          if (aodf->pinflags.case_sensitive)
-            log_printf ("%scase_sensitive", s), s = ",";
-          if (aodf->pinflags.local)
-            log_printf ("%slocal", s), s = ",";
-          if (aodf->pinflags.change_disabled)
-            log_printf ("%schange_disabled", s), s = ",";
-          if (aodf->pinflags.unblock_disabled)
-            log_printf ("%sunblock_disabled", s), s = ",";
-          if (aodf->pinflags.initialized)
-            log_printf ("%sinitialized", s), s = ",";
-          if (aodf->pinflags.needs_padding)
-            log_printf ("%sneeds_padding", s), s = ",";
-          if (aodf->pinflags.unblocking_pin)
-            log_printf ("%sunblocking_pin", s), s = ",";
-          if (aodf->pinflags.so_pin)
-            log_printf ("%sso_pin", s), s = ",";
-          if (aodf->pinflags.disable_allowed)
-            log_printf ("%sdisable_allowed", s), s = ",";
-          if (aodf->pinflags.integrity_protected)
-            log_printf ("%sintegrity_protected", s), s = ",";
-          if (aodf->pinflags.confidentiality_protected)
-            log_printf ("%sconfidentiality_protected", s), s = ",";
-          if (aodf->pinflags.exchange_ref_data)
-            log_printf ("%sexchange_ref_data", s), s = ",";
-          {
-            char numbuf[50];
-            const char *s2;
-
-            switch (aodf->pintype)
+          if (aodf->auth_type == AUTH_TYPE_PIN)
+            {
+              if (aodf->pin_reference_valid)
+                log_printf (" pinref=0x%02lX", aodf->pin_reference);
+              log_printf (" min=%lu", aodf->min_length);
+              log_printf (" stored=%lu", aodf->stored_length);
+              if (aodf->max_length_valid)
+                log_printf (" max=%lu", aodf->max_length);
+              if (aodf->pad_char_valid)
+                log_printf (" pad=0x%02x", aodf->pad_char);
+
+              log_info ("p15:             flags=");
+              s = "";
+              if (aodf->pinflags.case_sensitive)
+                log_printf ("%scase_sensitive", s), s = ",";
+              if (aodf->pinflags.local)
+                log_printf ("%slocal", s), s = ",";
+              if (aodf->pinflags.change_disabled)
+                log_printf ("%schange_disabled", s), s = ",";
+              if (aodf->pinflags.unblock_disabled)
+                log_printf ("%sunblock_disabled", s), s = ",";
+              if (aodf->pinflags.initialized)
+                log_printf ("%sinitialized", s), s = ",";
+              if (aodf->pinflags.needs_padding)
+                log_printf ("%sneeds_padding", s), s = ",";
+              if (aodf->pinflags.unblocking_pin)
+                log_printf ("%sunblocking_pin", s), s = ",";
+              if (aodf->pinflags.so_pin)
+                log_printf ("%sso_pin", s), s = ",";
+              if (aodf->pinflags.disable_allowed)
+                log_printf ("%sdisable_allowed", s), s = ",";
+              if (aodf->pinflags.integrity_protected)
+                log_printf ("%sintegrity_protected", s), s = ",";
+              if (aodf->pinflags.confidentiality_protected)
+                log_printf ("%sconfidentiality_protected", s), s = ",";
+              if (aodf->pinflags.exchange_ref_data)
+                log_printf ("%sexchange_ref_data", s), s = ",";
               {
-              case PIN_TYPE_BCD: s2 = "bcd"; break;
-              case PIN_TYPE_ASCII_NUMERIC: s2 = "ascii-numeric"; break;
-              case PIN_TYPE_UTF8: s2 = "utf8"; break;
-              case PIN_TYPE_HALF_NIBBLE_BCD: s2 = "half-nibble-bcd"; break;
-              case PIN_TYPE_ISO9564_1: s2 = "iso9564-1"; break;
-              default:
-                sprintf (numbuf, "%lu", (unsigned long)aodf->pintype);
-                s2 = numbuf;
+                char numbuf[50];
+                const char *s2;
+
+                switch (aodf->pintype)
+                  {
+                  case PIN_TYPE_BCD: s2 = "bcd"; break;
+                  case PIN_TYPE_ASCII_NUMERIC: s2 = "ascii-numeric"; break;
+                  case PIN_TYPE_UTF8: s2 = "utf8"; break;
+                  case PIN_TYPE_HALF_NIBBLE_BCD: s2 = "half-nibble-bcd"; break;
+                  case PIN_TYPE_ISO9564_1: s2 = "iso9564-1"; break;
+                  default:
+                    sprintf (numbuf, "%lu", (unsigned long)aodf->pintype);
+                    s2 = numbuf;
+                  }
+                log_printf ("%stype=%s", s, s2); s = ",";
               }
-            log_printf ("%stype=%s", s, s2); s = ",";
-          }
+            }
+          else if (aodf->auth_type == AUTH_TYPE_AUTHKEY)
+            {
+            }
           log_printf ("\n");
         }
 
@@ -3703,7 +3779,7 @@ read_p15_info (app_t app)
     }
   if (!app->app_local->card_product
       && app->app_local->token_label
-      && !strcmp (app->app_local->token_label, "D-TRUST Card V3")
+      && !strncmp (app->app_local->token_label, "D-TRUST Card V3", 15)
       && app->app_local->card_type == CARD_TYPE_CARDOS_50)
     {
       app->app_local->card_product = CARD_PRODUCT_DTRUST;
@@ -3791,8 +3867,8 @@ read_p15_info (app_t app)
           log_printf ("\n");
         }
 
-      log_info ("p15:  atr ..........: ");
       atr = apdu_get_atr (app_get_slot (app), &atrlen);
+      log_info ("p15:  atr ..........: ");
       if (!atr)
         log_printf ("[error]\n");
       else
@@ -3851,6 +3927,7 @@ send_certinfo (app_t app, ctrl_t ctrl, const char *certtype,
                         labelbuf, strlen (labelbuf),
                         NULL, (size_t)0);
       xfree (buf);
+      xfree (labelbuf);
     }
   return 0;
 }
@@ -4208,8 +4285,12 @@ readcert_by_cdf (app_t app, cdf_object_t cdf,
   if (err)
     goto leave;
 
-  err = iso7816_read_binary_ext (app_get_slot (app), 1, cdf->off, cdf->len,
-                                 &buffer, &buflen, NULL);
+  if (app->app_local->no_extended_mode)
+    err = iso7816_read_binary_ext (app_get_slot (app), 0, cdf->off, 0,
+                                   &buffer, &buflen, NULL);
+  else
+    err = iso7816_read_binary_ext (app_get_slot (app), 1, cdf->off, cdf->len,
+                                   &buffer, &buflen, NULL);
   if (!err && (!buflen || *buffer == 0xff))
     err = gpg_error (GPG_ERR_NOT_FOUND);
   if (err)
@@ -4546,6 +4627,8 @@ do_getattr (app_t app, ctrl_t ctrl, const char *name)
         }
       else
         {
+          char *sn;
+
           /* We use the first private key object which has a serial
            * number set.  If none was found, we parse the first
            * object and see whether this has then a serial number.  */
@@ -4560,11 +4643,12 @@ do_getattr (app_t app, ctrl_t ctrl, const char *name)
               if (!prkdf->serial_number)
                 prkdf = NULL;
             }
-          if (prkdf)
+          sn = get_dispserialno (app, prkdf);
+          /* Unless there is a bogus S/N in the cert, or the product
+           * has a different strategy for the display-s/n, we should
+           * have a suitable one from the cert now.  */
+          if (sn)
             {
-              char *sn = get_dispserialno (app, prkdf);
-              /* Unless there is a bogus S/N in the cert we should
-               * have a suitable one from the cert here now.  */
               err = send_status_printf (ctrl, name, "%s", sn);
               xfree (sn);
               return err;
@@ -4574,7 +4658,13 @@ do_getattr (app_t app, ctrl_t ctrl, const char *name)
     }
   else if (!strcmp (name, "MANUFACTURER"))
     {
-      if (app->app_local->manufacturer_id)
+      if (app->app_local->manufacturer_id
+          && !strchr (app->app_local->manufacturer_id, '[')
+          && app->app_local->card_product)
+        return send_status_printf (ctrl, "MANUFACTURER", "0 %s [%s]",
+                              app->app_local->manufacturer_id,
+                              cardproduct2str (app->app_local->card_product));
+      else if (app->app_local->manufacturer_id)
         return send_status_printf (ctrl, "MANUFACTURER", "0 %s",
                                    app->app_local->manufacturer_id);
       else
@@ -4895,11 +4985,19 @@ static char *
 get_dispserialno (app_t app, prkdf_object_t prkdf)
 {
   char *serial;
+  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.  */
-  if (prkdf && prkdf->serial_number && *prkdf->serial_number
+  if (app->app_local->card_product == CARD_PRODUCT_RSCS)
+    {
+      /* We use only the right 8 hex digits.  */
+      serial = app_get_serialno (app);
+      if (serial && (n=strlen (serial)) > 8)
+        memmove (serial, serial + n - 8, 9);
+    }
+  else if (prkdf && prkdf->serial_number && *prkdf->serial_number
       && !strchr (prkdf->serial_number, '%')
       && !any_control_or_space (prkdf->serial_number))
     {
@@ -5090,7 +5188,6 @@ verify_pin (app_t app,
   switch (aodf->pintype)
     {
     case PIN_TYPE_BCD:
-    case PIN_TYPE_ASCII_NUMERIC:
       for (s=pinvalue; digitp (s); s++)
         ;
       if (*s)
@@ -5099,6 +5196,15 @@ verify_pin (app_t app,
           err = gpg_error (GPG_ERR_BAD_PIN);
         }
       break;
+    case PIN_TYPE_ASCII_NUMERIC:
+      for (s=pinvalue; *s && !(*s & 0x80); s++)
+        ;
+      if (*s)
+        {
+          errstr = "Non-ascii characters found in PIN";
+          err = gpg_error (GPG_ERR_BAD_PIN);
+        }
+      break;
     case PIN_TYPE_UTF8:
       break;
     case PIN_TYPE_HALF_NIBBLE_BCD:
@@ -5444,7 +5550,7 @@ do_sign (app_t app, ctrl_t ctrl, const char *keyidstr, int hashalgo,
   if (err)
     {
       log_error ("p15: MSE failed: %s\n", gpg_strerror (err));
-      return err;
+      goto leave;
     }
 
   /* Now that we have all the information available run the actual PIN
@@ -5483,7 +5589,7 @@ do_sign (app_t app, ctrl_t ctrl, const char *keyidstr, int hashalgo,
   if (err)
     {
       log_error ("p15: MSE failed: %s\n", gpg_strerror (err));
-      return err;
+      goto leave;
     }
 
   if (prkdf->keyalgo == GCRY_PK_RSA && prkdf->keynbits > 2048)
@@ -6022,7 +6128,12 @@ app_select_p15 (app_t app)
           if (s && n == 2)
             def_home_df = buf16_to_ushort (s);
           else
-            log_error ("p15: select(AID) did not return the DF\n");
+            {
+              if (fcilen)
+                log_printhex (fci, fcilen, "fci:");
+              log_info ("p15: select did not return the DF - using default\n");
+              def_home_df = DEFAULT_HOME_DF;
+            }
         }
       app->app_local->home_df = def_home_df;
 
@@ -6039,6 +6150,9 @@ app_select_p15 (app_t app)
         case CARD_TYPE_CARDOS_53:
           direct = 1;
           break;
+        case CARD_TYPE_AET:
+          app->app_local->no_extended_mode = 1;
+          break;
         default:
           /* Use whatever has been determined above.  */
           break;
diff --git a/scd/app-piv.c b/scd/app-piv.c
index ead1b19..33b0150 100644
--- a/scd/app-piv.c
+++ b/scd/app-piv.c
@@ -2175,7 +2175,7 @@ do_sign (app_t app, ctrl_t ctrl, const char *keyidstr, int hashalgo,
   unsigned char oidbuf[64];
   size_t oidbuflen;
   unsigned char *outdata = NULL;
-  size_t outdatalen;
+  size_t outdatalen = 0;
   const unsigned char *s;
   size_t n;
   int keyref, mechanism;
@@ -2357,7 +2357,7 @@ do_sign (app_t app, ctrl_t ctrl, const char *keyidstr, int hashalgo,
   /* Now verify the Application PIN.  */
   err = verify_chv (app, ctrl, 0x80, force_verify, pincb, pincb_arg);
   if (err)
-    return err;
+    goto leave;
 
   /* Build the Dynamic Authentication Template.  */
   err = concat_tlv_list (0, &apdudata, &apdudatalen,
@@ -2403,7 +2403,7 @@ do_sign (app_t app, ctrl_t ctrl, const char *keyidstr, int hashalgo,
             goto bad_der;
           log_assert (n >= (rval-s)+rlen);
           sval = find_tlv (rval+rlen, n-((rval-s)+rlen), 0x02, &slen);
-          if (!rval)
+          if (!sval)
             goto bad_der;
           rlenx = slenx = 0;
           if (rlen > slen)
@@ -3609,6 +3609,21 @@ do_reselect (app_t app, ctrl_t ctrl)
 }
 
 
+/* Check if AID is the correct one.  */
+static gpg_error_t
+do_check_aid (app_t app, ctrl_t ctrl, const unsigned char *aid, size_t aidlen)
+{
+  (void)app;
+  (void)ctrl;
+
+  if (aidlen >= sizeof piv_aid
+      && memcmp (aid, piv_aid, sizeof piv_aid) == 0)
+    return 0;
+
+  return gpg_error (GPG_ERR_WRONG_CARD);
+}
+
+
 /* Select the PIV application on the card in SLOT.  This function must
  * be used before any other PIV application functions. */
 gpg_error_t
@@ -3713,6 +3728,7 @@ app_select_piv (app_t app)
   app->fnc.change_pin = do_change_chv;
   app->fnc.check_pin = do_check_chv;
   app->fnc.with_keygrip = do_with_keygrip;
+  app->fnc.check_aid = do_check_aid;
 
 
 leave:
diff --git a/scd/app.c b/scd/app.c
index d0e990e..678d058 100644
--- a/scd/app.c
+++ b/scd/app.c
@@ -39,9 +39,40 @@ static gpg_error_t
 send_serialno_and_app_status (card_t card, int with_apps, ctrl_t ctrl);
 static gpg_error_t run_reselect (ctrl_t ctrl, card_t c, app_t a, app_t a_prev);
 
-/* Lock to protect the list of cards and its associated
- * applications.  */
-static npth_mutex_t card_list_lock;
+/*
+ * Multiple readers, single writer (MRSW) lock.
+ */
+struct mrsw_lock
+{
+  npth_mutex_t lock;
+  npth_cond_t cond;
+  int num_readers_active;
+  int num_writers_waiting;
+  int writer_active;
+};
+
+#define CARD_LIST_LOCK_WAIT     0
+#define CARD_LIST_LOCK_UPDATE   1
+
+/* MRSW lock to protect the list of cards.
+ *
+ * This structure is used for serializing access to the list of cards
+ * (by CARD_TOP).  While allowing multiple accesses by different
+ * connections as "r" access (for a CARD in the list), "w" access to
+ * update the list is only possible with a single thread.
+ *
+ * Each use of a CARD (in the list) does "r" access.
+ *
+ * For "w" access, the app_wait function, which waits on any change of
+ * the list, it uses CARD_LIST_LOCK_WAIT.  For other cases of "w"
+ * access (opening new card or removal of card), CARD_LIST_LOCK_UPDATE
+ * is used.
+ *
+ * Note that for serializing access to each CARD (and its associated
+ * applications) itself, it is done separately by another mutex with
+ * lock_card/unlock_card.
+ */
+static struct mrsw_lock card_list_lock;
 
 /* Notification to threads which keep watching the status change.  */
 static npth_cond_t notify_cond;
@@ -293,6 +324,56 @@ unlock_card (card_t card)
 }
 
 
+static void
+lock_r_card_list (void)
+{
+  npth_mutex_lock (&card_list_lock.lock);
+  while (card_list_lock.num_writers_waiting
+         || card_list_lock.writer_active)
+    npth_cond_wait (&card_list_lock.cond, &card_list_lock.lock);
+  card_list_lock.num_readers_active++;
+  npth_mutex_unlock (&card_list_lock.lock);
+}
+
+static void
+unlock_r_card_list (void)
+{
+  npth_mutex_lock (&card_list_lock.lock);
+  if (--card_list_lock.num_readers_active == 0)
+    npth_cond_broadcast (&card_list_lock.cond);
+  npth_mutex_unlock (&card_list_lock.lock);
+}
+
+
+static void
+lock_w_card_list (int for_update)
+{
+  npth_mutex_lock (&card_list_lock.lock);
+  card_list_lock.num_writers_waiting++;
+  while (card_list_lock.num_readers_active
+         || card_list_lock.writer_active)
+    npth_cond_wait (&card_list_lock.cond, &card_list_lock.lock);
+  card_list_lock.num_writers_waiting--;
+  if (for_update)
+    {
+      card_list_lock.writer_active++;
+      npth_mutex_unlock (&card_list_lock.lock);
+    }
+}
+
+static void
+unlock_w_card_list (int for_update)
+{
+  if (for_update)
+    {
+      npth_mutex_lock (&card_list_lock.lock);
+      card_list_lock.writer_active--;
+    }
+  npth_cond_broadcast (&card_list_lock.cond);
+  npth_mutex_unlock (&card_list_lock.lock);
+}
+
+
 /* This function may be called to print information pertaining to the
  * current state of this module to the log. */
 void
@@ -301,7 +382,7 @@ app_dump_state (void)
   card_t c;
   app_t a;
 
-  npth_mutex_lock (&card_list_lock);
+  lock_r_card_list ();
   for (c = card_top; c; c = c->next)
     {
       log_info ("app_dump_state: card=%p slot=%d type=%s refcount=%u\n",
@@ -311,7 +392,7 @@ app_dump_state (void)
         log_info ("app_dump_state:   app=%p type='%s'\n",
                   a, strapptype (a->apptype));
     }
-  npth_mutex_unlock (&card_list_lock);
+  unlock_r_card_list ();
 }
 
 
@@ -324,7 +405,7 @@ app_send_devinfo (ctrl_t ctrl)
 
   send_status_direct (ctrl, "DEVINFO_START", "");
 
-  npth_mutex_lock (&card_list_lock);
+  lock_r_card_list ();
   no_device = (card_top == NULL);
   for (c = card_top; c; c = c->next)
     {
@@ -339,7 +420,7 @@ app_send_devinfo (ctrl_t ctrl)
       for (a = c->app; a; a = a->next)
         send_status_direct (ctrl, card_info, strapptype (a->apptype));
     }
-  npth_mutex_unlock (&card_list_lock);
+  unlock_r_card_list ();
 
   send_status_direct (ctrl, "DEVINFO_END", "");
 
@@ -422,31 +503,18 @@ check_application_conflict (card_t card, const char *name,
 
 
 gpg_error_t
-card_reset (card_t card, ctrl_t ctrl, int send_reset)
+card_reset (card_t card)
 {
   gpg_error_t err = 0;
+  int sw;
 
-  if (send_reset)
-    {
-      int sw;
-
-      lock_card (card, ctrl);
-      sw = apdu_reset (card->slot);
-      if (sw)
-        err = gpg_error (GPG_ERR_CARD_RESET);
-
-      card->reset_requested = 1;
-      unlock_card (card);
+  sw = apdu_reset (card->slot);
+  if (sw)
+    err = gpg_error (GPG_ERR_CARD_RESET);
 
-      scd_kick_the_loop ();
-      gnupg_sleep (1);
-    }
-  else
-    {
-      ctrl->card_ctx = NULL;
-      ctrl->current_apptype = APPTYPE_NONE;
-      card_unref (card);
-    }
+  card->reset_requested = 1;
+  scd_kick_the_loop ();
+  gnupg_sleep (1);
 
   return err;
 }
@@ -532,17 +600,18 @@ app_new_register (int slot, ctrl_t ctrl, const char *name,
                   formfactor = (s0 && n == 1)? *s0 : 0;
 
                   s0 = find_tlv (buf+1, buflen-1, 0x02, &n);  /* Serial */
-                  if (s0 && n >= 4)
+                  if (s0 && n <= 4)
                     {
-                      card->serialno = xtrymalloc (3 + 1 + n);
+                      card->serialno = xtrymalloc (3 + 1 + 4);
                       if (card->serialno)
                         {
-                          card->serialnolen = 3 + 1 + n;
+                          card->serialnolen = 3 + 1 + 4;
                           card->serialno[0] = 0xff;
                           card->serialno[1] = 0x02;
                           card->serialno[2] = 0x0;
                           card->serialno[3] = formfactor;
-                          memcpy (card->serialno + 4, s0, n);
+                          memset (card->serialno + 4, 0, 4 - n);
+                          memcpy (card->serialno + 4 + 4 - n, s0, n);
                           err = app_munge_serialno (card);
                         }
                     }
@@ -698,16 +767,16 @@ app_new_register (int slot, ctrl_t ctrl, const char *name,
  * NAME and return its card context.  Returns an error code and stores
  * NULL at R_CARD if no application was found or no card is present.  */
 gpg_error_t
-select_application (ctrl_t ctrl, const char *name, card_t *r_card,
+select_application (ctrl_t ctrl, const char *name,
                     int scan, const unsigned char *serialno_bin,
                     size_t serialno_bin_len)
 {
   gpg_error_t err = 0;
   card_t card, card_prev = NULL;
 
-  *r_card = NULL;
+  lock_w_card_list (CARD_LIST_LOCK_UPDATE);
 
-  npth_mutex_lock (&card_list_lock);
+  ctrl->card_ctx = NULL;
 
   if (scan || !card_top)
     {
@@ -718,7 +787,7 @@ select_application (ctrl_t ctrl, const char *name, card_t *r_card,
       err = apdu_dev_list_start (opt.reader_port, &l);
       if (err)
         {
-          npth_mutex_unlock (&card_list_lock);
+          unlock_w_card_list (CARD_LIST_LOCK_UPDATE);
           return err;
         }
 
@@ -791,9 +860,8 @@ select_application (ctrl_t ctrl, const char *name, card_t *r_card,
 
       if (!err)
         {
-          /* Note: We do not use card_ref as we are already locked.  */
           card->ref_count++;
-          *r_card = card;
+          ctrl->card_ctx = card;
           if (card_prev)
             {
               card_prev->next = card->next;
@@ -806,7 +874,7 @@ select_application (ctrl_t ctrl, const char *name, card_t *r_card,
   else
     err = gpg_error (GPG_ERR_ENODEV);
 
-  npth_mutex_unlock (&card_list_lock);
+  unlock_w_card_list (CARD_LIST_LOCK_UPDATE);
 
   return err;
 }
@@ -822,9 +890,10 @@ app_switch_current_card (ctrl_t ctrl,
   gpg_error_t err;
   card_t card, cardtmp;
 
-  npth_mutex_lock (&card_list_lock);
+  lock_r_card_list ();
 
-  if (!ctrl->card_ctx)
+  cardtmp = ctrl->card_ctx;
+  if (!cardtmp)
     {
       err = gpg_error (GPG_ERR_CARD_NOT_INITIALIZED);
       goto leave;
@@ -844,10 +913,10 @@ app_switch_current_card (ctrl_t ctrl,
           goto leave;
         }
 
-      /* Note: We do not use card_ref here because we only swap the
-       * context of the current session and there is no chance of a
-       * context switch.  This also works if the card stays the same. */
-      cardtmp = ctrl->card_ctx;
+      /* Note: We do not lock CARD and CARDTMP here because we only
+       * swap the context of the current session and there is no
+       * chance of a context switch.  This also works if the card
+       * stays the same.  */
       ctrl->card_ctx = card;
       card->ref_count++;
       card_unref_locked (cardtmp);
@@ -857,7 +926,7 @@ app_switch_current_card (ctrl_t ctrl,
   err = send_serialno_and_app_status (ctrl->card_ctx, 0, ctrl);
 
  leave:
-  npth_mutex_unlock (&card_list_lock);
+  unlock_r_card_list ();
   return err;
 }
 
@@ -1006,11 +1075,10 @@ select_all_additional_applications_internal (ctrl_t ctrl, card_t card)
  * active application.  On error no new application is allocated.
  * Selecting an already selected application has no effect. */
 gpg_error_t
-select_additional_application (ctrl_t ctrl, const char *name)
+select_additional_application (card_t card, ctrl_t ctrl, const char *name)
 {
   gpg_error_t err = 0;
   apptype_t req_apptype;
-  card_t card;
 
   if (!name)
     req_apptype = 0;
@@ -1021,14 +1089,6 @@ select_additional_application (ctrl_t ctrl, const char *name)
         return gpg_error (GPG_ERR_NOT_FOUND);
     }
 
-  card = ctrl->card_ctx;
-  if (!card)
-    return gpg_error (GPG_ERR_CARD_NOT_INITIALIZED);
-
-  err = lock_card (card, ctrl);
-  if (err)
-    return err;
-
   if (req_apptype)
     {
       err = select_additional_application_internal (card, req_apptype);
@@ -1044,7 +1104,6 @@ select_additional_application (ctrl_t ctrl, const char *name)
       err = select_all_additional_applications_internal (ctrl, card);
     }
 
-  unlock_card (card);
   return err;
 }
 
@@ -1112,35 +1171,104 @@ deallocate_card (card_t card)
 }
 
 
-/* Increment the reference counter of CARD.  Returns CARD.  */
+static card_t
+do_with_keygrip (ctrl_t ctrl, int action, const char *keygrip_str,
+                 int capability)
+{
+  int locked = 0;
+  card_t c;
+  app_t a, a_prev;
+
+  for (c = card_top; c; c = c->next)
+    {
+      if (lock_card (c, ctrl))
+        {
+          c = NULL;
+          goto leave_the_loop;
+        }
+      locked = 1;
+      a_prev = NULL;
+      for (a = c->app; a; a = a->next)
+        {
+          if (!a->fnc.with_keygrip || a->need_reset)
+            continue;
+
+          /* Note that we need to do a re-select even for the current
+           * app because the last selected application (e.g. after
+           * init) might be a different one and we do not run
+           * maybe_switch_app here.  Of course we we do this only iff
+           * we have an additional app. */
+          if (c->app->next)
+            {
+              if (run_reselect (ctrl, c, a, a_prev))
+                continue;
+            }
+          a_prev = a;
+
+          if (DBG_APP)
+            log_debug ("slot %d, app %s: calling with_keygrip(%s)\n",
+                       c->slot, xstrapptype (a),
+                       action == KEYGRIP_ACTION_SEND_DATA? "send_data":
+                       action == KEYGRIP_ACTION_WRITE_STATUS? "status":
+                       action == KEYGRIP_ACTION_LOOKUP? "lookup":"?");
+          if (!a->fnc.with_keygrip (a, ctrl, action, keygrip_str, capability))
+            goto leave_the_loop; /* ACTION_LOOKUP succeeded.  */
+        }
+
+      /* Select the first app again.  */
+      if (c->app->next)
+        run_reselect (ctrl, c, c->app, a_prev);
+
+      unlock_card (c);
+      locked = 0;
+    }
+
+ leave_the_loop:
+  /* Force switching of the app if the selected one is not the current
+   * one.  Changing the current apptype is sufficient to do this.  */
+  if (c && c->app && c->app->apptype != a->apptype)
+    ctrl->current_apptype = a->apptype;
+
+  if (locked && c)
+    {
+      unlock_card (c);
+      locked = 0;
+    }
+  return c;
+}
+
+
+/* Locking access to the card-list and CARD, returns CARD.  */
 card_t
-card_ref (card_t card)
+card_get (ctrl_t ctrl, const char *keygrip)
 {
+  card_t card;
+
+  lock_r_card_list ();
+  if (keygrip)
+    card = do_with_keygrip (ctrl, KEYGRIP_ACTION_LOOKUP, keygrip, 0);
+  else
+    card = ctrl->card_ctx;
+  if (!card)
+    {
+      unlock_r_card_list ();
+      return NULL;
+    }
+
   lock_card (card, NULL);
-  ++card->ref_count;
-  unlock_card (card);
   return card;
 }
 
-
-/* Decrement the reference counter for CARD.  Note that we are using
- * reference counting to track the users of the card's application and
- * are deferring the actual deallocation to allow for a later reuse by
- * a new connection.  Using NULL for CARD is a no-op. */
+/* Release the lock of CARD and the card-list.  */
 void
-card_unref (card_t card)
+card_put (card_t card)
 {
-  if (!card)
-    return;
-
   /* We don't deallocate CARD here.  Instead, we keep it.  This is
      useful so that a card does not get reset even if only one session
      is using the card - this way the PIN cache and other cached data
      are preserved.  */
-
-  lock_card (card, NULL);
-  card_unref_locked (card);
   unlock_card (card);
+  unlock_r_card_list ();
 }
 
 
@@ -1434,6 +1562,46 @@ run_reselect (ctrl_t ctrl, card_t c, app_t a, app_t a_prev)
 }
 
 
+/*
+ * Check external interference before each use of the application on
+ * card.  Returns -1 when detecting some external interference.
+ * Returns 0 if not.
+ *
+ * Note: This kind of detection can't be perfect.  At most, it may be
+ * possibly useful kludge, in some limited situations.
+ */
+static int
+check_external_interference (app_t app, ctrl_t ctrl)
+{
+  /*
+   * Only when a user is using Yubikey with pcsc-shared configuration,
+   * we need this detection.  Otherwise, the card/token is under full
+   * control of scdaemon, there's no problem at all.
+   */
+  if (!opt.pcsc_shared || app->card->cardtype != CARDTYPE_YUBIKEY)
+    return 0;
+
+  if (app->fnc.check_aid)
+    {
+      unsigned char *aid;
+      size_t aidlen;
+      gpg_error_t err;
+      int slot = app_get_slot (app);
+
+      err = iso7816_get_data (slot, 0, 0x004F, &aid, &aidlen);
+      if (err)
+        return -1;
+
+      err = app->fnc.check_aid (app, ctrl, aid, aidlen);
+      xfree (aid);
+      if (err)
+        return -1;
+    }
+
+  return 0;
+}
+
+
 /* Check that the card has been initialized and whether we need to
  * switch to another application on the same card.  Switching means
  * that the new active app will be moved to the head of the list at
@@ -1446,7 +1614,7 @@ maybe_switch_app (ctrl_t ctrl, card_t card, const char *keyref)
   app_t app_prev = NULL;
   apptype_t apptype;
 
-  if (!card->ref_count || !card->app)
+  if (!card->app)
     return gpg_error (GPG_ERR_CARD_NOT_INITIALIZED);
   if (!ctrl->current_apptype)
     {
@@ -1489,7 +1657,8 @@ maybe_switch_app (ctrl_t ctrl, card_t card, const char *keyref)
             if (app->apptype == apptype)
               break;
           if (!app_prev && ctrl->current_apptype == card->app->apptype)
-            return 0;  /* Already the first app - no need to switch.  */
+            if (check_external_interference (app, ctrl) == 0)
+              return 0;  /* Already the first app - no need to switch.  */
         }
       else if (strlen (keyref) == 40)
         {
@@ -1502,7 +1671,8 @@ maybe_switch_app (ctrl_t ctrl, card_t card, const char *keyref)
                                            KEYGRIP_ACTION_LOOKUP, keyref, 0))
               break;
           if (!app_prev && ctrl->current_apptype == card->app->apptype)
-            return 0;   /* Already the first app - no need to switch.  */
+            if (check_external_interference (app, ctrl) == 0)
+              return 0;   /* Already the first app - no need to switch.  */
         }
     }
 
@@ -1585,13 +1755,6 @@ app_write_learn_status (card_t card, ctrl_t ctrl, unsigned int flags)
   app_t app, last_app;
   int any_reselect = 0;
 
-  if (!card)
-    return gpg_error (GPG_ERR_INV_VALUE);
-
-  err = lock_card (card, ctrl);
-  if (err)
-    return err;
-
   /* Always make sure that the current app for this connection has
    * been selected and is at the top of the list.  */
   if ((err = maybe_switch_app (ctrl, card, NULL)))
@@ -1653,7 +1816,6 @@ app_write_learn_status (card_t card, ctrl_t ctrl, unsigned int flags)
         }
     }
 
-  unlock_card (card);
   return err;
 }
 
@@ -1668,12 +1830,6 @@ app_readcert (card_t card, ctrl_t ctrl, const char *certid,
 {
   gpg_error_t err;
 
-  if (!card)
-    return gpg_error (GPG_ERR_INV_VALUE);
-  err = lock_card (card, ctrl);
-  if (err)
-    return err;
-
   if ((err = maybe_switch_app (ctrl, card, certid)))
     ;
   else if (!card->app->fnc.readcert)
@@ -1689,7 +1845,6 @@ app_readcert (card_t card, ctrl_t ctrl, const char *certid,
         err = card->app->fnc.readcert (card->app, certid, cert, certlen);
     }
 
-  unlock_card (card);
   return err;
 }
 
@@ -1713,11 +1868,8 @@ app_readkey (card_t card, ctrl_t ctrl, const char *keyid, unsigned int flags,
   if (pklen)
     *pklen = 0;
 
-  if (!card || !keyid)
+  if (!keyid)
     return gpg_error (GPG_ERR_INV_VALUE);
-  err = lock_card (card, ctrl);
-  if (err)
-    return err;
 
   if ((err = maybe_switch_app (ctrl, card, keyid)))
     ;
@@ -1734,7 +1886,6 @@ app_readkey (card_t card, ctrl_t ctrl, const char *keyid, unsigned int flags,
         err = card->app->fnc.readkey (card->app, ctrl, keyid, flags, pk, pklen);
     }
 
-  unlock_card (card);
   return err;
 }
 
@@ -1745,11 +1896,8 @@ app_getattr (card_t card, ctrl_t ctrl, const char *name)
 {
   gpg_error_t err;
 
-  if (!card || !name || !*name)
+  if (!name || !*name)
     return gpg_error (GPG_ERR_INV_VALUE);
-  err = lock_card (card, ctrl);
-  if (err)
-    return err;
 
   if ((err = maybe_switch_app (ctrl, card, NULL)))
     ;
@@ -1787,7 +1935,6 @@ app_getattr (card_t card, ctrl_t ctrl, const char *name)
         err = card->app->fnc.getattr (card->app, ctrl, name);
     }
 
-  unlock_card (card);
   return err;
 }
 
@@ -1801,11 +1948,8 @@ app_setattr (card_t card, ctrl_t ctrl, const char *name,
 {
   gpg_error_t err;
 
-  if (!card || !name || !*name || !value)
+  if (!name || !*name || !value)
     return gpg_error (GPG_ERR_INV_VALUE);
-  err = lock_card (card, ctrl);
-  if (err)
-    return err;
 
   if ((err = maybe_switch_app (ctrl, card, NULL)))
     ;
@@ -1823,7 +1967,6 @@ app_setattr (card_t card, ctrl_t ctrl, const char *name,
                                       value, valuelen);
     }
 
-  unlock_card (card);
   return err;
 }
 
@@ -1840,11 +1983,8 @@ app_sign (card_t card, ctrl_t ctrl, const char *keyidstr, int hashalgo,
 {
   gpg_error_t err;
 
-  if (!card || !indata || !indatalen || !outdata || !outdatalen || !pincb)
+  if (!indata || !indatalen || !outdata || !outdatalen || !pincb)
     return gpg_error (GPG_ERR_INV_VALUE);
-  err = lock_card (card, ctrl);
-  if (err)
-    return err;
 
   if ((err = maybe_switch_app (ctrl, card, keyidstr)))
     ;
@@ -1864,7 +2004,6 @@ app_sign (card_t card, ctrl_t ctrl, const char *keyidstr, int hashalgo,
                                    outdata, outdatalen);
     }
 
-  unlock_card (card);
   if (opt.verbose)
     log_info ("operation sign result: %s\n", gpg_strerror (err));
   return err;
@@ -1884,11 +2023,8 @@ app_auth (card_t card, ctrl_t ctrl, const char *keyidstr,
 {
   gpg_error_t err;
 
-  if (!card || !indata || !indatalen || !outdata || !outdatalen || !pincb)
+  if (!indata || !indatalen || !outdata || !outdatalen || !pincb)
     return gpg_error (GPG_ERR_INV_VALUE);
-  err = lock_card (card, ctrl);
-  if (err)
-    return err;
 
   if ((err = maybe_switch_app (ctrl, card, keyidstr)))
     ;
@@ -1908,7 +2044,6 @@ app_auth (card_t card, ctrl_t ctrl, const char *keyidstr,
                                    outdata, outdatalen);
     }
 
-  unlock_card (card);
   if (opt.verbose)
     log_info ("operation auth result: %s\n", gpg_strerror (err));
   return err;
@@ -1930,11 +2065,8 @@ app_decipher (card_t card, ctrl_t ctrl, const char *keyidstr,
 
   *r_info = 0;
 
-  if (!card || !indata || !indatalen || !outdata || !outdatalen || !pincb)
+  if (!indata || !indatalen || !outdata || !outdatalen || !pincb)
     return gpg_error (GPG_ERR_INV_VALUE);
-  err = lock_card (card, ctrl);
-  if (err)
-    return err;
 
   if ((err = maybe_switch_app (ctrl, card, keyidstr)))
     ;
@@ -1955,7 +2087,6 @@ app_decipher (card_t card, ctrl_t ctrl, const char *keyidstr,
                                        r_info);
     }
 
-  unlock_card (card);
   if (opt.verbose)
     log_info ("operation decipher result: %s\n", gpg_strerror (err));
   return err;
@@ -1972,11 +2103,8 @@ app_writecert (card_t card, ctrl_t ctrl,
 {
   gpg_error_t err;
 
-  if (!card || !certidstr || !*certidstr || !pincb)
+  if (!certidstr || !*certidstr || !pincb)
     return gpg_error (GPG_ERR_INV_VALUE);
-  err = lock_card (card, ctrl);
-  if (err)
-    return err;
 
   if ((err = maybe_switch_app (ctrl, card, certidstr)))
     ;
@@ -1994,7 +2122,6 @@ app_writecert (card_t card, ctrl_t ctrl,
                                         pincb, pincb_arg, data, datalen);
     }
 
-  unlock_card (card);
   if (opt.verbose)
     log_info ("operation writecert result: %s\n", gpg_strerror (err));
   return err;
@@ -2011,11 +2138,8 @@ app_writekey (card_t card, ctrl_t ctrl,
 {
   gpg_error_t err;
 
-  if (!card || !keyidstr || !*keyidstr || !pincb)
+  if (!keyidstr || !*keyidstr || !pincb)
     return gpg_error (GPG_ERR_INV_VALUE);
-  err = lock_card (card, ctrl);
-  if (err)
-    return err;
 
   if ((err = maybe_switch_app (ctrl, card, keyidstr)))
     ;
@@ -2033,7 +2157,6 @@ app_writekey (card_t card, ctrl_t ctrl,
                                        pincb, pincb_arg, keydata, keydatalen);
     }
 
-  unlock_card (card);
   if (opt.verbose)
     log_info ("operation writekey result: %s\n", gpg_strerror (err));
   return err;
@@ -2049,11 +2172,8 @@ app_genkey (card_t card, ctrl_t ctrl, const char *keynostr,
 {
   gpg_error_t err;
 
-  if (!card || !keynostr || !*keynostr || !pincb)
+  if (!keynostr || !*keynostr || !pincb)
     return gpg_error (GPG_ERR_INV_VALUE);
-  err = lock_card (card, ctrl);
-  if (err)
-    return err;
 
   if ((err = maybe_switch_app (ctrl, card, keynostr)))
     ;
@@ -2071,7 +2191,6 @@ app_genkey (card_t card, ctrl_t ctrl, const char *keynostr,
                                      createtime, pincb, pincb_arg);
     }
 
-  unlock_card (card);
   if (opt.verbose)
     log_info ("operation genkey result: %s\n", gpg_strerror (err));
   return err;
@@ -2085,21 +2204,11 @@ gpg_error_t
 app_get_challenge (card_t card, ctrl_t ctrl,
                    size_t nbytes, unsigned char *buffer)
 {
-  gpg_error_t err;
-
-  if (!card || !nbytes || !buffer)
+  (void)ctrl;
+  if (!nbytes || !buffer)
     return gpg_error (GPG_ERR_INV_VALUE);
-  err = lock_card (card, ctrl);
-  if (err)
-    return err;
 
-  if (!card->ref_count)
-    err = gpg_error (GPG_ERR_CARD_NOT_INITIALIZED);
-  else
-    err = iso7816_get_challenge (card->slot, nbytes, buffer);
-
-  unlock_card (card);
-  return err;
+  return iso7816_get_challenge (card->slot, nbytes, buffer);
 }
 
 
@@ -2112,11 +2221,8 @@ app_change_pin (card_t card, ctrl_t ctrl, const char *chvnostr,
 {
   gpg_error_t err;
 
-  if (!card || !chvnostr || !*chvnostr || !pincb)
+  if (!chvnostr || !*chvnostr || !pincb)
     return gpg_error (GPG_ERR_INV_VALUE);
-  err = lock_card (card, ctrl);
-  if (err)
-    return err;
 
   if ((err = maybe_switch_app (ctrl, card, NULL)))
     ;
@@ -2134,7 +2240,6 @@ app_change_pin (card_t card, ctrl_t ctrl, const char *chvnostr,
                                          chvnostr, flags, pincb, pincb_arg);
     }
 
-  unlock_card (card);
   if (opt.verbose)
     log_info ("operation change_pin result: %s\n", gpg_strerror (err));
   return err;
@@ -2151,11 +2256,8 @@ app_check_pin (card_t card, ctrl_t ctrl, const char *keyidstr,
 {
   gpg_error_t err;
 
-  if (!card || !keyidstr || !*keyidstr || !pincb)
+  if (!keyidstr || !*keyidstr || !pincb)
     return gpg_error (GPG_ERR_INV_VALUE);
-  err = lock_card (card, ctrl);
-  if (err)
-    return err;
 
   if ((err = maybe_switch_app (ctrl, card, NULL)))
     ;
@@ -2173,7 +2275,6 @@ app_check_pin (card_t card, ctrl_t ctrl, const char *keyidstr,
                                         pincb, pincb_arg);
     }
 
-  unlock_card (card);
   if (opt.verbose)
     log_info ("operation check_pin result: %s\n", gpg_strerror (err));
   return err;
@@ -2247,7 +2348,7 @@ scd_update_reader_status_file (void)
   int periodical_check_needed = 0;
   int reported = 0;
 
-  npth_mutex_lock (&card_list_lock);
+  lock_w_card_list (CARD_LIST_LOCK_UPDATE);
   for (card = card_top; card; card = card_next)
     {
       int sw;
@@ -2257,7 +2358,11 @@ scd_update_reader_status_file (void)
       card_next = card->next;
 
       if (card->reset_requested)
-        status = 0;
+        {
+          /* Here is the post-processing of RESET request.  */
+          status = 0;
+          card->reset_requested = 0;
+        }
       else
         {
           sw = apdu_get_status (card->slot, 0, &status);
@@ -2309,7 +2414,7 @@ scd_update_reader_status_file (void)
   if (reported)
     npth_cond_broadcast (&notify_cond);
 
-  npth_mutex_unlock (&card_list_lock);
+  unlock_w_card_list (CARD_LIST_LOCK_UPDATE);
 
   return periodical_check_needed;
 }
@@ -2323,13 +2428,25 @@ initialize_module_command (void)
 {
   gpg_error_t err;
 
-  if (npth_mutex_init (&card_list_lock, NULL))
+  card_list_lock.num_readers_active = 0;
+  card_list_lock.num_writers_waiting = 0;
+  card_list_lock.writer_active = 0;
+
+  if (npth_mutex_init (&card_list_lock.lock, NULL))
     {
       err = gpg_error_from_syserror ();
       log_error ("app: error initializing mutex: %s\n", gpg_strerror (err));
       return err;
     }
 
+  err = npth_cond_init (&card_list_lock.cond, NULL);
+  if (err)
+    {
+      err = gpg_error_from_syserror ();
+      log_error ("npth_cond_init failed: %s\n", gpg_strerror (err));
+      return err;
+    }
+
   err = npth_cond_init (&notify_cond, NULL);
   if (err)
     {
@@ -2425,7 +2542,7 @@ send_card_and_app_list (ctrl_t ctrl, card_t wantcard, int with_apps)
   card_t *cardlist = NULL;
   int n, ncardlist;
 
-  npth_mutex_lock (&card_list_lock);
+  lock_r_card_list ();
   for (n=0, c = card_top; c; c = c->next)
     n++;
   if (!n)
@@ -2455,7 +2572,7 @@ send_card_and_app_list (ctrl_t ctrl, card_t wantcard, int with_apps)
   err = 0;
 
  leave:
-  npth_mutex_unlock (&card_list_lock);
+  unlock_r_card_list ();
   xfree (cardlist);
   return err;
 }
@@ -2487,12 +2604,6 @@ app_switch_active_app (card_t card, ctrl_t ctrl, const char *appname)
   gpg_error_t err;
   apptype_t apptype;
 
-  if (!card)
-    return gpg_error (GPG_ERR_INV_VALUE);
-  err = lock_card (card, ctrl);
-  if (err)
-    return err;
-
   /* Note that in case the additional applications have not yet been
    * added to the card context (which is commonly done by means of
    * "SERIALNO --all", we do that here.  */
@@ -2519,7 +2630,6 @@ app_switch_active_app (card_t card, ctrl_t ctrl, const char *appname)
   err = send_serialno_and_app_status (card, 1, ctrl);
 
  leave:
-  unlock_card (card);
   return err;
 }
 
@@ -2553,75 +2663,18 @@ card_t
 app_do_with_keygrip (ctrl_t ctrl, int action, const char *keygrip_str,
                      int capability)
 {
-  int locked = 0;
-  card_t c;
-  app_t a, a_prev;
-
-  npth_mutex_lock (&card_list_lock);
-
-  for (c = card_top; c; c = c->next)
-    {
-      if (lock_card (c, ctrl))
-        {
-          c = NULL;
-          goto leave_the_loop;
-        }
-      locked = 1;
-      a_prev = NULL;
-      for (a = c->app; a; a = a->next)
-        {
-          if (!a->fnc.with_keygrip || a->need_reset)
-            continue;
-
-          /* Note that we need to do a re-select even for the current
-           * app because the last selected application (e.g. after
-           * init) might be a different one and we do not run
-           * maybe_switch_app here.  Of course we we do this only iff
-           * we have an additional app. */
-          if (c->app->next)
-            {
-              if (run_reselect (ctrl, c, a, a_prev))
-                continue;
-            }
-          a_prev = a;
-
-          if (DBG_APP)
-            log_debug ("slot %d, app %s: calling with_keygrip(%s)\n",
-                       c->slot, xstrapptype (a),
-                       action == KEYGRIP_ACTION_SEND_DATA? "send_data":
-                       action == KEYGRIP_ACTION_WRITE_STATUS? "status":
-                       action == KEYGRIP_ACTION_LOOKUP? "lookup":"?");
-          if (!a->fnc.with_keygrip (a, ctrl, action, keygrip_str, capability))
-            goto leave_the_loop; /* ACTION_LOOKUP succeeded.  */
-        }
-
-      /* Select the first app again.  */
-      if (c->app->next)
-        run_reselect (ctrl, c, c->app, a_prev);
-
-      unlock_card (c);
-      locked = 0;
-    }
-
- leave_the_loop:
-  /* Force switching of the app if the selected one is not the current
-   * one.  Changing the current apptype is sufficient to do this.  */
-  if (c && c->app && c->app->apptype != a->apptype)
-    ctrl->current_apptype = a->apptype;
+  card_t card;
 
-  if (locked && c)
-    {
-      unlock_card (c);
-      locked = 0;
-    }
-  npth_mutex_unlock (&card_list_lock);
-  return c;
+  lock_r_card_list ();
+  card = do_with_keygrip (ctrl, action, keygrip_str, capability);
+  unlock_r_card_list ();
+  return card;
 }
 
 void
 app_wait (void)
 {
-  npth_mutex_lock (&card_list_lock);
-  npth_cond_wait (&notify_cond, &card_list_lock);
-  npth_mutex_unlock (&card_list_lock);
+  lock_w_card_list (CARD_LIST_LOCK_WAIT);
+  npth_cond_wait (&notify_cond, &card_list_lock.lock);
+  unlock_w_card_list (CARD_LIST_LOCK_WAIT);
 }
diff --git a/scd/ccid-driver.c b/scd/ccid-driver.c
index ca900bf..9d0d6eb 100644
--- a/scd/ccid-driver.c
+++ b/scd/ccid-driver.c
@@ -1577,6 +1577,11 @@ intr_cb (struct libusb_transfer *transfer)
     }
   else if (transfer->status == LIBUSB_TRANSFER_CANCELLED)
     handle->powered_off = 1;
+  else if (transfer->status == LIBUSB_TRANSFER_OVERFLOW)
+    {
+      /* Something goes wrong.  Ignore.  */
+      DEBUGOUT ("CCID: interrupt transfer overflow\n");
+    }
   else
     {
     device_removed:
diff --git a/scd/command.c b/scd/command.c
index 11d6164..0819318 100644
--- a/scd/command.c
+++ b/scd/command.c
@@ -154,10 +154,20 @@ hex_to_buffer (const char *string, size_t *r_length)
 static void
 do_reset (ctrl_t ctrl, int send_reset, int keep_lock)
 {
-  card_t card = ctrl->card_ctx;
+  card_t card = card_get (ctrl, NULL);
 
   if (card)
-    card_reset (card, ctrl, IS_LOCKED (ctrl)? 0: send_reset);
+    {
+      if (!IS_LOCKED (ctrl) && send_reset)
+        card_reset (card);
+      else
+        {
+          ctrl->card_ctx = NULL;
+          ctrl->current_apptype = APPTYPE_NONE;
+          card_unref_locked (card);
+        }
+      card_put (card);
+    }
 
   /* If we hold a lock, unlock now. */
   if (!keep_lock && locked_session && ctrl->server_local == locked_session)
@@ -223,20 +233,20 @@ open_card (ctrl_t ctrl)
   if (ctrl->card_ctx)
     return 0;
 
-  return select_application (ctrl, NULL, &ctrl->card_ctx, 0, NULL, 0);
+  return select_application (ctrl, NULL, 0, NULL, 0);
 }
 
 /* Explicitly open a card for a specific use of APPTYPE or SERIALNO.
  * If OPT_ALL is set also add all possible additional apps. */
 static gpg_error_t
-open_card_with_request (ctrl_t ctrl,
+open_card_with_request (card_t *card_p, ctrl_t ctrl,
                         const char *apptypestr, const char *serialno,
                         int opt_all)
 {
   gpg_error_t err;
   unsigned char *serialno_bin = NULL;
   size_t serialno_bin_len = 0;
-  card_t card = ctrl->card_ctx;
+  card_t card = card_get (ctrl, NULL);
 
   if (serialno)
     serialno_bin = hex_to_buffer (serialno, &serialno_bin_len);
@@ -244,30 +254,45 @@ open_card_with_request (ctrl_t ctrl,
   /* If we are already initialized for one specific application we
      need to check that the client didn't requested a specific
      application different from the one in use before we continue. */
-  if (apptypestr && ctrl->card_ctx)
+  if (apptypestr && card)
     {
-      err = check_application_conflict (ctrl->card_ctx, apptypestr,
+      err = check_application_conflict (card, apptypestr,
                                         serialno_bin, serialno_bin_len);
       if (gpg_err_code (err) == GPG_ERR_FALSE)
         {
           /* Different application but switching is supported.  */
-          err = select_additional_application (ctrl, apptypestr);
+          err = select_additional_application (card, ctrl, apptypestr);
         }
+      if (err)
+	card_put (card);
       goto leave;
     }
 
   /* Re-scan USB devices.  Release CARD, before the scan.  */
-  /* FIXME: Is a card_unref sufficient or do we need to deallocate?  */
-  ctrl->card_ctx = NULL;
-  ctrl->current_apptype = APPTYPE_NONE;
-  card_unref (card);
+  if (card)
+    {
+      ctrl->card_ctx = NULL;
+      ctrl->current_apptype = APPTYPE_NONE;
+      card_unref_locked (card);
+      card_put (card);
+    }
 
-  err = select_application (ctrl, apptypestr, &ctrl->card_ctx, 1,
+  err = select_application (ctrl, apptypestr, 1,
                             serialno_bin, serialno_bin_len);
+  card = card_get (ctrl, NULL);
   if (!err && opt_all)
-    err = select_additional_application (ctrl, NULL);
+    {
+      if (card)
+        {
+          err = select_additional_application (card, ctrl, NULL);
+	  if (err)
+	    card_put (card);
+        }
+    }
 
  leave:
+  if (!err)
+    *card_p = card;
   xfree (serialno_bin);
   return err;
 }
@@ -302,10 +327,11 @@ cmd_serialno (assuan_context_t ctx, char *line)
 {
   ctrl_t ctrl = assuan_get_pointer (ctx);
   struct server_local_s *sl;
-  int rc = 0;
+  gpg_error_t err = 0;
   char *serial;
   const char *demand;
   int opt_all = has_option (line, "--all");
+  card_t card = NULL;
   int thisslot;
 
   if ( IS_LOCKED (ctrl) )
@@ -328,30 +354,31 @@ cmd_serialno (assuan_context_t ctx, char *line)
 
   /* Clear the remove flag so that the open_card is able to reread it.  */
   ctrl->server_local->card_removed = 0;
-  rc = open_card_with_request (ctrl, *line? line:NULL, demand, opt_all);
+  err = open_card_with_request (&card, ctrl, *line? line:NULL, demand, opt_all);
   /* Now clear or set the card_removed flag for all sessions using the
    * current slot.  In the error case make sure that the flag is set
    * for the current session. */
-  thisslot = ctrl->card_ctx? ctrl->card_ctx->slot : -1;
+  thisslot = card? card->slot : -1;
   for (sl=session_list; sl; sl = sl->next_session)
     {
       ctrl_t c = sl->ctrl_backlink;
       if (c && c->card_ctx && c->card_ctx->slot == thisslot)
-        c->server_local->card_removed = rc? 1 : 0;
+        c->server_local->card_removed = err? 1 : 0;
     }
-  if (rc)
+  if (err)
     {
       ctrl->server_local->card_removed = 1;
-      return rc;
+      return err;
     }
 
-  serial = card_get_serialno (ctrl->card_ctx);
+  serial = card_get_serialno (card);
+  card_put (card);
   if (!serial)
     return gpg_error (GPG_ERR_INV_VALUE);
 
-  rc = assuan_write_status (ctx, "SERIALNO", serial);
+  err = assuan_write_status (ctx, "SERIALNO", serial);
   xfree (serial);
-  return rc;
+  return err;
 }
 
 
@@ -410,12 +437,22 @@ cmd_switchapp (assuan_context_t ctx, char *line)
 {
   ctrl_t ctrl = assuan_get_pointer (ctx);
   gpg_error_t err = 0;
+  card_t card;
 
   if ((err = open_card (ctrl)))
     return err;
 
   line = skip_options (line);
-  return app_switch_active_app (ctrl->card_ctx, ctrl, line);
+  card = card_get (ctrl, NULL);
+  if (card)
+    {
+      err = app_switch_active_app (card, ctrl, line);
+      card_put (card);
+    }
+  else
+    err = gpg_error (GPG_ERR_CARD_NOT_PRESENT);
+
+  return err;
 }
 
 
@@ -501,10 +538,15 @@ cmd_learn (assuan_context_t ctx, char *line)
   int opt_multi = has_option (line, "--multi");
   int opt_reread = has_option (line, "--reread");
   unsigned int flags;
+  card_t card;
 
   if ((rc = open_card (ctrl)))
     return rc;
 
+  card = card_get (ctrl, NULL);
+  if (!card)
+    return gpg_error (GPG_ERR_CARD_NOT_PRESENT);
+
   /* Unless the force option is used we try a shortcut by identifying
      the card using a serial number and inquiring the client with
      that. The client may choose to cancel the operation if he already
@@ -513,25 +555,28 @@ cmd_learn (assuan_context_t ctx, char *line)
     {
       const char *reader;
       char *serial;
-      card_t card = ctrl->card_ctx;
-
-      if (!card)
-        return gpg_error (GPG_ERR_CARD_NOT_PRESENT);
 
       reader = apdu_get_reader_name (card->slot);
       if (!reader)
-        return out_of_core ();
+        {
+          card_put (card);
+          return out_of_core ();
+        }
       send_status_direct (ctrl, "READER", reader);
       /* No need to free the string of READER.  */
 
-      serial = card_get_serialno (ctrl->card_ctx);
+      serial = card_get_serialno (card);
       if (!serial)
-        return gpg_error (GPG_ERR_INV_VALUE);
+        {
+          card_put (card);
+          return gpg_error (GPG_ERR_INV_VALUE);
+        }
 
       rc = assuan_write_status (ctx, "SERIALNO", serial);
       if (rc < 0)
         {
           xfree (serial);
+          card_put (card);
           return out_of_core ();
         }
 
@@ -543,6 +588,7 @@ cmd_learn (assuan_context_t ctx, char *line)
           if (rc < 0)
             {
               xfree (serial);
+              card_put (card);
               return out_of_core ();
             }
           rc = assuan_inquire (ctx, command, NULL, NULL, 0);
@@ -553,6 +599,7 @@ cmd_learn (assuan_context_t ctx, char *line)
                 log_error ("inquire KNOWNCARDP failed: %s\n",
                            gpg_strerror (rc));
               xfree (serial);
+              card_put (card);
               return rc;
             }
           /* Not canceled, so we have to proceed.  */
@@ -571,8 +618,9 @@ cmd_learn (assuan_context_t ctx, char *line)
     flags |= APP_LEARN_FLAG_REREAD;
 
   if (!rc)
-    rc = app_write_learn_status (ctrl->card_ctx, ctrl, flags);
+    rc = app_write_learn_status (card, ctrl, flags);
 
+  card_put (card);
   return rc;
 }
 
@@ -589,6 +637,7 @@ cmd_readcert (assuan_context_t ctx, char *line)
   int rc;
   unsigned char *cert;
   size_t ncert;
+  card_t card;
 
   if ((rc = open_card (ctrl)))
     return rc;
@@ -597,9 +646,17 @@ cmd_readcert (assuan_context_t ctx, char *line)
   if (!line)
     return gpg_error_from_syserror ();
 
-  rc = app_readcert (ctrl->card_ctx, ctrl, line, &cert, &ncert);
+  card = card_get (ctrl, NULL);
+  if (!card)
+    {
+      xfree (line);
+      return gpg_error (GPG_ERR_CARD_NOT_PRESENT);
+    }
+
+  rc = app_readcert (card, ctrl, line, &cert, &ncert);
   if (rc)
     log_error ("app_readcert failed: %s\n", gpg_strerror (rc));
+  card_put (card);
   xfree (line);
   line = NULL;
   if (!rc)
@@ -699,7 +756,7 @@ cmd_readkey (assuan_context_t ctx, char *line)
   unsigned char *pk = NULL;
   size_t pklen;
   card_t card;
-  int direct = 0;
+  const char *keygrip = NULL;
 
   if ((rc = open_card (ctrl)))
     return rc;
@@ -718,22 +775,13 @@ cmd_readkey (assuan_context_t ctx, char *line)
     return gpg_error_from_syserror ();
 
   if (strlen (line) == 40)
-    {
-      card = app_do_with_keygrip (ctrl, KEYGRIP_ACTION_LOOKUP, line, 0);
-      direct = 1;
-    }
-  else
-    card = ctrl->card_ctx;
+    keygrip = line;
 
+  card = card_get (ctrl, keygrip);
   if (card)
     {
-      if (direct)
-        card_ref (card);
-
       rc = do_readkey (card, ctrl, line, opt_info, &pk, &pklen);
-
-      if (direct)
-        card_unref (card);
+      card_put (card);
     }
   else
     rc = gpg_error (GPG_ERR_NO_SECKEY);
@@ -914,7 +962,7 @@ cmd_pksign (assuan_context_t ctx, char *line)
   char *keyidstr;
   int hash_algo;
   card_t card;
-  int direct = 0;
+  const char *keygrip = NULL;
 
   if (has_option (line, "--hash=rmd160"))
     hash_algo = GCRY_MD_RMD160;
@@ -952,24 +1000,17 @@ cmd_pksign (assuan_context_t ctx, char *line)
   /* When it's a keygrip, we directly use the card, with no change of
      ctrl->card_ctx. */
   if (strlen (keyidstr) == 40)
-    {
-      card = app_do_with_keygrip (ctrl, KEYGRIP_ACTION_LOOKUP, keyidstr, 0);
-      direct = 1;
-    }
-  else
-    card = ctrl->card_ctx;
+    keygrip = keyidstr;
 
+  card = card_get (ctrl, keygrip);
   if (card)
     {
-      if (direct)
-        card_ref (card);
       rc = app_sign (card, ctrl,
                      keyidstr, hash_algo,
                      pin_cb, ctx,
                      ctrl->in_data.value, ctrl->in_data.valuelen,
                      &outdata, &outdatalen);
-      if (direct)
-        card_unref (card);
+      card_put (card);
     }
   else
     rc = gpg_error (GPG_ERR_NO_SECKEY);
@@ -1002,14 +1043,11 @@ cmd_pkauth (assuan_context_t ctx, char *line)
   size_t outdatalen;
   char *keyidstr;
   card_t card;
-  int direct = 0;
+  const char *keygrip = NULL;
 
   if ((rc = open_card (ctrl)))
     return rc;
 
-  if (!ctrl->card_ctx)
-    return gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);
-
  /* We have to use a copy of the key ID because the function may use
      the pin_cb which in turn uses the assuan line buffer and thus
      overwriting the original line with the keyid */
@@ -1020,25 +1058,18 @@ cmd_pkauth (assuan_context_t ctx, char *line)
   /* When it's a keygrip, we directly use CARD, with no change of
      ctrl->card_ctx. */
   if (strlen (keyidstr) == 40)
-    {
-      card = app_do_with_keygrip (ctrl, KEYGRIP_ACTION_LOOKUP, keyidstr, 0);
-      direct = 1;
-    }
-  else
-    card = ctrl->card_ctx;
+    keygrip = keyidstr;
 
+  card = card_get (ctrl, keygrip);
   if (card)
     {
-      if (direct)
-        card_ref (card);
       rc = app_auth (card, ctrl, keyidstr, pin_cb, ctx,
                      ctrl->in_data.value, ctrl->in_data.valuelen,
                      &outdata, &outdatalen);
-      if (direct)
-        card_unref (card);
+      card_put (card);
     }
   else
-    rc = gpg_error (GPG_ERR_NO_SECKEY);
+    rc = gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);
 
   xfree (keyidstr);
   if (rc)
@@ -1069,7 +1100,7 @@ cmd_pkdecrypt (assuan_context_t ctx, char *line)
   char *keyidstr;
   unsigned int infoflags;
   card_t card;
-  int direct = 0;
+  const char *keygrip = NULL;
 
   if ((rc = open_card (ctrl)))
     return rc;
@@ -1081,22 +1112,15 @@ cmd_pkdecrypt (assuan_context_t ctx, char *line)
   /* When it's a keygrip, we directly use CARD, with no change of
      ctrl->card_ctx. */
   if (strlen (keyidstr) == 40)
-    {
-      card = app_do_with_keygrip (ctrl, KEYGRIP_ACTION_LOOKUP, keyidstr, 0);
-      direct = 1;
-    }
-  else
-    card = ctrl->card_ctx;
+    keygrip = keyidstr;
 
+  card = card_get (ctrl, keygrip);
   if (card)
     {
-      if (direct)
-        card_ref (card);
       rc = app_decipher (card, ctrl, keyidstr, pin_cb, ctx,
                          ctrl->in_data.value, ctrl->in_data.valuelen,
                          &outdata, &outdatalen, &infoflags);
-      if (direct)
-        card_unref (card);
+      card_put (card);
     }
   else
     rc = gpg_error (GPG_ERR_NO_SECKEY);
@@ -1145,7 +1169,7 @@ cmd_getattr (assuan_context_t ctx, char *line)
   int rc;
   const char *keyword;
   card_t card;
-  int direct = 0;
+  const char *keygrip = NULL;
 
   if ((rc = open_card (ctrl)))
     return rc;
@@ -1157,24 +1181,15 @@ cmd_getattr (assuan_context_t ctx, char *line)
     *line++ = 0;
 
   if (strlen (line) == 40)
-    {
-      card = app_do_with_keygrip (ctrl, KEYGRIP_ACTION_LOOKUP, line, 0);
-      direct = 1;
-    }
-  else
-    card = ctrl->card_ctx;
+    keygrip = line;
 
+  card = card_get (ctrl, keygrip);
   if (card)
     {
-      if (direct)
-        card_ref (card);
-
       /* FIXME: Applications should not return sensitive data if the card
          is locked.  */
       rc = app_getattr (card, ctrl, keyword);
-
-      if (direct)
-        card_unref (card);
+      card_put (card);
     }
   else
     rc = gpg_error (GPG_ERR_NO_SECKEY);
@@ -1210,6 +1225,7 @@ cmd_setattr (assuan_context_t ctx, char *orig_line)
   size_t nbytes;
   char *line, *linebuf;
   int opt_inquire;
+  card_t card;
 
   opt_inquire = has_option (orig_line, "--inquire");
   orig_line = skip_options (orig_line);
@@ -1223,6 +1239,13 @@ cmd_setattr (assuan_context_t ctx, char *orig_line)
   if (!line)
     return out_of_core ();
 
+  card = card_get (ctrl, NULL);
+  if (!card)
+    {
+      xfree (linebuf);
+      return gpg_error (GPG_ERR_CARD_NOT_PRESENT);
+    }
+
   keyword = line;
   for (keywordlen=0; *line && !spacep (line); line++, keywordlen++)
     ;
@@ -1239,7 +1262,7 @@ cmd_setattr (assuan_context_t ctx, char *orig_line)
       assuan_end_confidential (ctx);
       if (!err)
         {
-          err = app_setattr (ctrl->card_ctx, ctrl, keyword, pin_cb, ctx,
+          err = app_setattr (card, ctrl, keyword, pin_cb, ctx,
                              value, nbytes);
           wipememory (value, nbytes);
           xfree (value);
@@ -1249,10 +1272,11 @@ cmd_setattr (assuan_context_t ctx, char *orig_line)
   else
     {
       nbytes = percent_plus_unescape_inplace (line, 0);
-      err = app_setattr (ctrl->card_ctx, ctrl, keyword, pin_cb, ctx,
+      err = app_setattr (card, ctrl, keyword, pin_cb, ctx,
                          (const unsigned char*)line, nbytes);
     }
 
+  card_put (card);
   xfree (linebuf);
   return err;
 }
@@ -1277,6 +1301,7 @@ cmd_writecert (assuan_context_t ctx, char *line)
   char *certid;
   unsigned char *certdata;
   size_t certdatalen;
+  card_t card;
 
   line = skip_options (line);
 
@@ -1290,25 +1315,31 @@ cmd_writecert (assuan_context_t ctx, char *line)
   if ((rc = open_card (ctrl)))
     return rc;
 
-  if (!ctrl->card_ctx)
+  card = card_get (ctrl, NULL);
+  if (!card)
     return gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);
 
   certid = xtrystrdup (certid);
   if (!certid)
-    return out_of_core ();
+    {
+      card_put (card);
+      return out_of_core ();
+    }
 
   /* Now get the actual keydata. */
   rc = assuan_inquire (ctx, "CERTDATA",
                        &certdata, &certdatalen, MAXLEN_CERTDATA);
   if (rc)
     {
+      card_put (card);
       xfree (certid);
       return rc;
     }
 
   /* Write the certificate to the card. */
-  rc = app_writecert (ctrl->card_ctx, ctrl, certid,
+  rc = app_writecert (card, ctrl, certid,
                       pin_cb, ctx, certdata, certdatalen);
+  card_put (card);
   xfree (certid);
   xfree (certdata);
 
@@ -1339,6 +1370,7 @@ cmd_writekey (assuan_context_t ctx, char *line)
   int force = has_option (line, "--force");
   unsigned char *keydata;
   size_t keydatalen;
+  card_t card;
 
   line = skip_options (line);
 
@@ -1352,12 +1384,16 @@ cmd_writekey (assuan_context_t ctx, char *line)
   if ((rc = open_card (ctrl)))
     return rc;
 
-  if (!ctrl->card_ctx)
+  card = card_get (ctrl, NULL);
+  if (!card)
     return gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);
 
   keyid = xtrystrdup (keyid);
   if (!keyid)
-    return out_of_core ();
+    {
+      card_put (card);
+      return out_of_core ();
+    }
 
   /* Now get the actual keydata. */
   assuan_begin_confidential (ctx);
@@ -1370,8 +1406,9 @@ cmd_writekey (assuan_context_t ctx, char *line)
     }
 
   /* Write the key to the card. */
-  rc = app_writekey (ctrl->card_ctx, ctrl, keyid, force? 1:0,
+  rc = app_writekey (card, ctrl, keyid, force? 1:0,
                      pin_cb, ctx, keydata, keydatalen);
+  card_put (card);
   xfree (keyid);
   xfree (keydata);
 
@@ -1418,6 +1455,7 @@ cmd_genkey (assuan_context_t ctx, char *line)
   const char *s;
   char *opt_algo = NULL;
   time_t timestamp;
+  card_t card;
 
   force = has_option (line, "--force");
 
@@ -1438,7 +1476,10 @@ cmd_genkey (assuan_context_t ctx, char *line)
 
   line = skip_options (line);
   if (!*line)
-    return set_error (GPG_ERR_ASS_PARAMETER, "no key number given");
+    {
+      err = set_error (GPG_ERR_ASS_PARAMETER, "no key number given");
+      goto leave;
+    }
   keyref = line;
   while (*line && !spacep (line))
     line++;
@@ -1447,18 +1488,24 @@ cmd_genkey (assuan_context_t ctx, char *line)
   if ((err = open_card (ctrl)))
     goto leave;
 
-  if (!ctrl->card_ctx)
-    return gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);
+  card = card_get (ctrl, NULL);
+  if (!card)
+    {
+      err = gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);
+      goto leave;
+    }
 
   keyref = keyref_buffer = xtrystrdup (keyref);
   if (!keyref)
     {
       err = gpg_error_from_syserror ();
+      card_put (card);
       goto leave;
     }
-  err = app_genkey (ctrl->card_ctx, ctrl, keyref, opt_algo,
+  err = app_genkey (card, ctrl, keyref, opt_algo,
                     force? APP_GENKEY_FLAG_FORCE : 0,
                     timestamp, pin_cb, ctx);
+  card_put (card);
 
  leave:
   xfree (keyref_buffer);
@@ -1482,6 +1529,7 @@ cmd_random (assuan_context_t ctx, char *line)
   int rc;
   size_t nbytes;
   unsigned char *buffer;
+  card_t card;
 
   if (!*line)
     return set_error (GPG_ERR_ASS_PARAMETER,
@@ -1491,14 +1539,19 @@ cmd_random (assuan_context_t ctx, char *line)
   if ((rc = open_card (ctrl)))
     return rc;
 
-  if (!ctrl->card_ctx)
+  card = card_get (ctrl, NULL);
+  if (!card)
     return gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);
 
   buffer = xtrymalloc (nbytes);
   if (!buffer)
-    return out_of_core ();
+    {
+      card_put (card);
+      return out_of_core ();
+    }
 
-  rc = app_get_challenge (ctrl->card_ctx, ctrl, nbytes, buffer);
+  rc = app_get_challenge (card, ctrl, nbytes, buffer);
+  card_put (card);
   if (!rc)
     {
       rc = assuan_send_data (ctx, buffer, nbytes);
@@ -1527,6 +1580,7 @@ cmd_passwd (assuan_context_t ctx, char *line)
   int rc;
   char *chvnostr;
   unsigned int flags = 0;
+  card_t card;
 
   if (has_option (line, "--reset"))
     flags |= APP_CHANGE_FLAG_RESET;
@@ -1552,13 +1606,18 @@ cmd_passwd (assuan_context_t ctx, char *line)
   if ((rc = open_card (ctrl)))
     return rc;
 
-  if (!ctrl->card_ctx)
+  card = card_get (ctrl, NULL);
+  if (!card)
     return gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);
 
   chvnostr = xtrystrdup (chvnostr);
   if (!chvnostr)
-    return out_of_core ();
-  rc = app_change_pin (ctrl->card_ctx, ctrl, chvnostr, flags, pin_cb, ctx);
+    {
+      card_put (card);
+      return out_of_core ();
+    }
+  rc = app_change_pin (card, ctrl, chvnostr, flags, pin_cb, ctx);
+  card_put (card);
   if (rc)
     log_error ("command passwd failed: %s\n", gpg_strerror (rc));
   xfree (chvnostr);
@@ -1607,13 +1666,15 @@ static gpg_error_t
 cmd_checkpin (assuan_context_t ctx, char *line)
 {
   ctrl_t ctrl = assuan_get_pointer (ctx);
-  int rc;
+  gpg_error_t err;
   char *idstr;
+  card_t card;
 
-  if ((rc = open_card (ctrl)))
-    return rc;
+  if ((err = open_card (ctrl)))
+    return err;
 
-  if (!ctrl->card_ctx)
+  card = card_get (ctrl, NULL);
+  if (!card)
     return gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);
 
   /* We have to use a copy of the key ID because the function may use
@@ -1621,14 +1682,18 @@ cmd_checkpin (assuan_context_t ctx, char *line)
      overwriting the original line with the keyid. */
   idstr = xtrystrdup (line);
   if (!idstr)
-    return out_of_core ();
+    {
+      card_put (card);
+      return out_of_core ();
+    }
 
-  rc = app_check_pin (ctrl->card_ctx, ctrl, idstr, pin_cb, ctx);
+  err = app_check_pin (card, ctrl, idstr, pin_cb, ctx);
+  card_put (card);
   xfree (idstr);
-  if (rc)
-    log_error ("app_check_pin failed: %s\n", gpg_strerror (rc));
+  if (err)
+    log_error ("app_check_pin failed: %s\n", gpg_strerror (err));
 
-  return rc;
+  return err;
 }
 
 
@@ -1848,10 +1913,15 @@ cmd_getinfo (assuan_context_t ctx, char *line)
   else if (!strcmp (line, "active_apps"))
     {
       ctrl_t ctrl = assuan_get_pointer (ctx);
-      if (!ctrl->card_ctx)
+      card_t card = card_get (ctrl, NULL);
+
+      if (!card)
         rc = 0; /* No current card - no active apps.  */
       else
-        rc = app_send_active_apps (ctrl->card_ctx, ctrl);
+        {
+          rc = app_send_active_apps (card, ctrl);
+          card_put (card);
+        }
     }
   else if (!strcmp (line, "all_active_apps"))
     {
@@ -1884,7 +1954,7 @@ static gpg_error_t
 cmd_restart (assuan_context_t ctx, char *line)
 {
   ctrl_t ctrl = assuan_get_pointer (ctx);
-  card_t card = ctrl->card_ctx;
+  card_t card = card_get (ctrl, NULL);
 
   (void)line;
 
@@ -1892,7 +1962,8 @@ cmd_restart (assuan_context_t ctx, char *line)
     {
       ctrl->card_ctx = NULL;
       ctrl->current_apptype = APPTYPE_NONE;
-      card_unref (card);
+      card_unref_locked (card);
+      card_put (card);
     }
   if (locked_session && ctrl->server_local == locked_session)
     {
@@ -1911,14 +1982,19 @@ static gpg_error_t
 cmd_disconnect (assuan_context_t ctx, char *line)
 {
   ctrl_t ctrl = assuan_get_pointer (ctx);
+  card_t card;
 
   (void)line;
 
-  if (!ctrl->card_ctx)
+  card = card_get (ctrl, NULL);
+  if (card)
+    {
+      apdu_disconnect (card->slot);
+      card_put (card);
+      return 0;
+    }
+  else
     return gpg_error (GPG_ERR_UNSUPPORTED_OPERATION);
-
-  apdu_disconnect (ctrl->card_ctx->slot);
-  return 0;
 }
 
 
@@ -1978,7 +2054,7 @@ cmd_apdu (assuan_context_t ctx, char *line)
   if ((rc = open_card (ctrl)))
     return rc;
 
-  card = ctrl->card_ctx;
+  card = card_get (ctrl, NULL);
   if (!card)
     return gpg_error (GPG_ERR_CARD_NOT_PRESENT);
 
@@ -2059,6 +2135,7 @@ cmd_apdu (assuan_context_t ctx, char *line)
   xfree (apdu);
 
  leave:
+  card_put (card);
   return rc;
 }
 
@@ -2193,6 +2270,7 @@ cmd_devinfo (assuan_context_t ctx, char *line)
   ctrl_t ctrl = assuan_get_pointer (ctx);
   gpg_error_t err = 0;
   int watch = 0;
+  card_t card;
 
   if (has_option (line, "--watch"))
     {
@@ -2222,10 +2300,15 @@ cmd_devinfo (assuan_context_t ctx, char *line)
 
   err = 0;
 
-  /* Remove reference(s) to the card.  */
-  ctrl->card_ctx = NULL;
-  ctrl->current_apptype = APPTYPE_NONE;
-  card_unref (ctrl->card_ctx);
+  card = card_get (ctrl, NULL);
+  if (card)
+    {
+      /* If any, remove reference to the card in CTRL.  */
+      ctrl->card_ctx = NULL;
+      ctrl->current_apptype = APPTYPE_NONE;
+      card_unref_locked (card);
+      card_put (card);
+    }
 
   /* Then, keep watching the status change.  */
   while (!err)
@@ -2768,8 +2851,16 @@ popup_prompt (void *opaque, int on)
 }
 
 
-/* Helper to send the clients a status change notification.  Note that
- * this function assumes that APP is already locked.  */
+/*
+ * Helper to send the clients a status change notification.
+ *
+ * When it's removal of card, this function also clean up all
+ * references by ctrl->card_ctx of all sessions.
+ *
+ * Note that this function assumes that all accesses to cards and
+ * applications are locked.  By the mrsw-lock, it is guaranteed that
+ * no card/app is accessed, when this function is called..
+ */
 void
 send_client_notifications (card_t card, int removal)
 {
diff --git a/scd/iso7816.c b/scd/iso7816.c
index e8ee58d..47e1605 100644
--- a/scd/iso7816.c
+++ b/scd/iso7816.c
@@ -769,6 +769,7 @@ iso7816_pso_csv (int slot, int extended_mode,
 {
   int sw;
   unsigned char *buf;
+  unsigned int nbuf;
 
   if (!data || !datalen || !result || !resultlen)
     return gpg_error (GPG_ERR_INV_VALUE);
@@ -780,16 +781,29 @@ iso7816_pso_csv (int slot, int extended_mode,
   else if (le >= 0 && le < 256)
     le = 256;
 
-  /* Data needds to be TLV format. */
-  buf = xtrymalloc (datalen + 2);
+  /* Data needs to be in BER-TLV format. */
+  buf = xtrymalloc (datalen + 4);
   if (!buf)
     return gpg_error_from_syserror ();
-  buf[0] = 0x9c;
-  buf[1] = datalen;
-  memcpy (buf+2, data, datalen);
+  nbuf = 0;
+  buf[nbuf++] = 0x9c;
+  if (datalen < 128)
+    buf[nbuf++] = datalen;
+  else if (datalen < 256)
+    {
+      buf[nbuf++] = 0x81;
+      buf[nbuf++] = datalen;
+    }
+  else
+    {
+      buf[nbuf++] = 0x82;
+      buf[nbuf++] = datalen << 8;
+      buf[nbuf++] = datalen;
+    }
+  memcpy (buf+nbuf, data, datalen);
   sw = apdu_send_le (slot, extended_mode,
                      0x00, CMD_PSO, 0x80, 0xa6,
-                     datalen+2, (const char *)buf, le,
+                     datalen+nbuf, (const char *)buf, le,
                      result, resultlen);
   xfree (buf);
   if (sw != SW_SUCCESS)
@@ -1020,7 +1034,7 @@ iso7816_read_binary_ext (int slot, int extended_mode,
       if (r_sw)
         *r_sw = sw;
 
-      if (*result && sw == SW_BAD_P0_P1)
+      if (*result && (sw == SW_BAD_P0_P1 || sw == SW_INCORRECT_P0_P1))
         {
           /* Bad Parameter means that the offset is outside of the
              EF. When reading all data we take this as an indication
diff --git a/scd/scdaemon.c b/scd/scdaemon.c
index 60d68c2..da1f21d 100644
--- a/scd/scdaemon.c
+++ b/scd/scdaemon.c
@@ -1231,7 +1231,7 @@ scd_kick_the_loop (void)
 #else
   int ret = kill (main_thread_pid, SIGCONT);
   if (ret < 0)
-    log_error ("SetEvent for scd_kick_the_loop failed: %s\n",
+    log_error ("sending signal for scd_kick_the_loop failed: %s\n",
                gpg_strerror (gpg_error_from_syserror ()));
 #endif
 }
@@ -1287,6 +1287,8 @@ handle_connections (int listen_fd)
 
     events[0] = the_event = INVALID_HANDLE_VALUE;
     events[1] = INVALID_HANDLE_VALUE;
+    /* Create event for manual reset, initially non-signaled.  Make it
+     * waitable and inheritable.  */
     h = CreateEvent (&sa, TRUE, FALSE, NULL);
     if (!h)
       log_error ("can't create scd event: %s\n", w32_strerror (-1) );
diff --git a/sm/call-dirmngr.c b/sm/call-dirmngr.c
index 8222d99..709f317 100644
--- a/sm/call-dirmngr.c
+++ b/sm/call-dirmngr.c
@@ -167,7 +167,7 @@ warn_version_mismatch (ctrl_t ctrl, assuan_context_t ctx,
 static void
 prepare_dirmngr (ctrl_t ctrl, assuan_context_t ctx, gpg_error_t err)
 {
-  struct keyserver_spec *server;
+  strlist_t server;
 
   if (!err)
     err = warn_version_mismatch (ctrl, ctx, DIRMNGR_NAME, 0);
@@ -188,13 +188,13 @@ prepare_dirmngr (ctrl_t ctrl, assuan_context_t ctx, gpg_error_t err)
   while (server)
     {
       char line[ASSUAN_LINELENGTH];
-      char *user = server->user ? server->user : "";
-      char *pass = server->pass ? server->pass : "";
-      char *base = server->base ? server->base : "";
 
-      snprintf (line, DIM (line), "LDAPSERVER %s:%i:%s:%s:%s:%s",
-		server->host, server->port, user, pass, base,
-                server->use_ldaps? "ldaps":"");
+      /* If the host is "ldap" we prefix the entire line with "ldap:"
+       * to avoid an ambiguity on the server due to the introduction
+       * of this optional prefix.  */
+      snprintf (line, DIM (line), "LDAPSERVER %s%s",
+                !strncmp (server->d, "ldap:", 5)? "ldap:":"",
+                server->d);
 
       assuan_transact (ctx, line, NULL, NULL, NULL, NULL, NULL, NULL);
       /* The code below is not required because we don't return an error.  */
diff --git a/sm/certchain.c b/sm/certchain.c
index e23a1c4..ee17599 100644
--- a/sm/certchain.c
+++ b/sm/certchain.c
@@ -459,7 +459,8 @@ find_up_search_by_keyid (ctrl_t ctrl, KEYDB_HANDLE kh,
       rc = keydb_get_cert (kh, &cert);
       if (rc)
         {
-          log_error ("keydb_get_cert() failed: rc=%d\n", rc);
+          log_error ("keydb_get_cert failed in %s: %s <%s>\n",
+                     __func__, gpg_strerror (rc), gpg_strsource (rc));
           rc = gpg_error (GPG_ERR_NOT_FOUND);
           goto leave;
         }
@@ -1084,8 +1085,8 @@ gpgsm_walk_cert_chain (ctrl_t ctrl, ksba_cert_t start, ksba_cert_t *r_next)
   err = keydb_get_cert (kh, r_next);
   if (err)
     {
-      log_error ("keydb_get_cert() failed: %s <%s>\n",
-                 gpg_strerror (err), gpg_strsource (err));
+      log_error ("keydb_get_cert failed in %s: %s <%s>\n",
+                 __func__, gpg_strerror (err), gpg_strsource (err));
       err = gpg_error (GPG_ERR_GENERAL);
     }
 
@@ -1824,7 +1825,8 @@ do_validate_chain (ctrl_t ctrl, ksba_cert_t cert, ksba_isotime_t checktime_arg,
       rc = keydb_get_cert (kh, &issuer_cert);
       if (rc)
         {
-          log_error ("keydb_get_cert() failed: rc=%d\n", rc);
+          log_error ("keydb_get_cert failed in %s: %s <%s>\n",
+                     __func__, gpg_strerror (rc), gpg_strsource (rc));
           rc = gpg_error (GPG_ERR_GENERAL);
           goto leave;
         }
@@ -2253,7 +2255,8 @@ gpgsm_basic_cert_check (ctrl_t ctrl, ksba_cert_t cert)
       rc = keydb_get_cert (kh, &issuer_cert);
       if (rc)
         {
-          log_error ("keydb_get_cert() failed: rc=%d\n", rc);
+          log_error ("keydb_get_cert failed in %s: %s <%s>\n",
+                     __func__, gpg_strerror (rc), gpg_strsource (rc));
           rc = gpg_error (GPG_ERR_GENERAL);
           goto leave;
         }
diff --git a/sm/certcheck.c b/sm/certcheck.c
index fca4575..f4db858 100644
--- a/sm/certcheck.c
+++ b/sm/certcheck.c
@@ -294,7 +294,6 @@ extract_pss_params (gcry_sexp_t s_sig, int *r_algo, unsigned int *r_saltlen)
   if (*r_saltlen < 20)
     {
       log_error ("length of PSS salt too short\n");
-      gcry_sexp_release (s_sig);
       return gpg_error (GPG_ERR_DIGEST_ALGO);
     }
   if (!*r_algo)
diff --git a/sm/decrypt.c b/sm/decrypt.c
index aa91b37..1fe2522 100644
--- a/sm/decrypt.c
+++ b/sm/decrypt.c
@@ -1,7 +1,7 @@
 /* decrypt.c - Decrypt a message
  * Copyright (C) 2001, 2003, 2010 Free Software Foundation, Inc.
  * Copyright (C) 2001-2019 Werner Koch
- * Copyright (C) 2015-2020 g10 Code GmbH
+ * Copyright (C) 2015-2021 g10 Code GmbH
  *
  * This file is part of GnuPG.
  *
@@ -37,6 +37,15 @@
 #include "../common/tlv.h"
 #include "../common/compliance.h"
 
+/* We can provide an enum value which is only availabale with KSBA
+ * 1.6.0 so that we can compile even against older versions.  Some
+ * calls will of course return an error in this case.  This value is
+ * currently not used because the cipher mode is sufficient here.  */
+/* #if KSBA_VERSION_NUMBER < 0x010600  /\* 1.6.0 *\/ */
+/* # define KSBA_CT_AUTHENVELOPED_DATA 10 */
+/* #endif */
+
+
 struct decrypt_filter_parm_s
 {
   int algo;
@@ -51,6 +60,7 @@ struct decrypt_filter_parm_s
   char helpblock[16];  /* needed because there is no block buffering in
                           libgcrypt (yet) */
   int  helpblocklen;
+  int is_de_vs;        /* Helper to track CO_DE_VS state.  */
 };
 
 
@@ -400,6 +410,367 @@ ecdh_decrypt (unsigned char *secret, size_t secretlen,
 }
 
 
+/* Helper for pwri_decrypt to parse the derive info.
+ * Example data for (DER,DERLEN):
+ * SEQUENCE {
+ *   OCTET STRING
+ *     60 76 4B E9 5E DF 3C F8 B2 F9 B6 C2 7D 5A FB 90
+ *     23 B6 47 DF
+ *   INTEGER 10000
+ *   SEQUENCE {
+ *     OBJECT IDENTIFIER
+ *       hmacWithSHA512 (1 2 840 113549 2 11)
+ *     NULL
+ *     }
+ *   }
+ */
+static gpg_error_t
+pwri_parse_pbkdf2 (const unsigned char *der, size_t derlen,
+                   unsigned char const **r_salt, unsigned int *r_saltlen,
+                   unsigned long *r_iterations,
+                   int *r_digest)
+{
+  gpg_error_t err;
+  size_t objlen, hdrlen;
+  int class, tag, constructed, ndef;
+  char *oidstr;
+
+  err = parse_ber_header (&der, &derlen, &class, &tag, &constructed,
+                          &ndef, &objlen, &hdrlen);
+  if (!err && (objlen > derlen || tag != TAG_SEQUENCE
+               || !constructed || ndef))
+    err = gpg_error (GPG_ERR_INV_OBJ);
+  if (err)
+    return err;
+  derlen = objlen;
+
+  err = parse_ber_header (&der, &derlen, &class, &tag, &constructed,
+                          &ndef, &objlen, &hdrlen);
+  if (!err && (objlen > derlen || tag != TAG_OCTET_STRING
+               || constructed || ndef))
+    err = gpg_error (GPG_ERR_INV_OBJ);
+  if (err)
+    return err;
+  *r_salt = der;
+  *r_saltlen = objlen;
+  der += objlen;
+  derlen -= objlen;
+
+  err = parse_ber_header (&der, &derlen, &class, &tag, &constructed,
+                          &ndef, &objlen, &hdrlen);
+  if (!err && (objlen > derlen || tag != TAG_INTEGER
+               || constructed || ndef))
+    err = gpg_error (GPG_ERR_INV_OBJ);
+  if (err)
+    return err;
+  *r_iterations = 0;
+  for (; objlen; objlen--)
+    {
+      *r_iterations <<= 8;
+      *r_iterations |= (*der++) & 0xff;
+      derlen--;
+    }
+
+  err = parse_ber_header (&der, &derlen, &class, &tag, &constructed,
+                          &ndef, &objlen, &hdrlen);
+  if (!err && (objlen > derlen || tag != TAG_SEQUENCE
+               || !constructed || ndef))
+    err = gpg_error (GPG_ERR_INV_OBJ);
+  if (err)
+    return err;
+  derlen = objlen;
+
+  err = parse_ber_header (&der, &derlen, &class, &tag, &constructed,
+                          &ndef, &objlen, &hdrlen);
+  if (!err && (objlen > derlen || tag != TAG_OBJECT_ID
+               || constructed || ndef))
+    err = gpg_error (GPG_ERR_INV_OBJ);
+  if (err)
+    return err;
+
+  oidstr = ksba_oid_to_str (der, objlen);
+  if (!oidstr)
+    return gpg_error_from_syserror ();
+  *r_digest = gcry_md_map_name (oidstr);
+  if (*r_digest)
+    ;
+  else if (!strcmp (oidstr, "1.2.840.113549.2.7"))
+    *r_digest = GCRY_MD_SHA1;
+  else if (!strcmp (oidstr, "1.2.840.113549.2.8"))
+    *r_digest = GCRY_MD_SHA224;
+  else if (!strcmp (oidstr, "1.2.840.113549.2.9"))
+    *r_digest = GCRY_MD_SHA256;
+  else if (!strcmp (oidstr, "1.2.840.113549.2.10"))
+    *r_digest = GCRY_MD_SHA384;
+  else if (!strcmp (oidstr, "1.2.840.113549.2.11"))
+    *r_digest = GCRY_MD_SHA512;
+  else
+    err = gpg_error (GPG_ERR_DIGEST_ALGO);
+  ksba_free (oidstr);
+
+  return err;
+}
+
+
+/* Password based decryption.
+ * ENC_VAL has the form:
+ *  (enc-val
+ *    (pwri
+ *      (derive-algo <oid>) --| both are optional
+ *      (derive-parm <der>) --|
+ *      (encr-algo <oid>)
+ *      (encr-parm <iv>)
+ *      (encr-key <key>)))  -- this is the encrypted session key
+ *
+ */
+static gpg_error_t
+pwri_decrypt (ctrl_t ctrl, gcry_sexp_t enc_val,
+              unsigned char **r_result, unsigned int *r_resultlen,
+              struct decrypt_filter_parm_s *parm)
+{
+  gpg_error_t err;
+  gcry_buffer_t ioarray[5] = { {0} };
+  char *derive_algo_str = NULL;
+  char *encr_algo_str = NULL;
+  const unsigned char *dparm;  /* Alias for ioarray[1].  */
+  unsigned int dparmlen;
+  const unsigned char *eparm;  /* Alias for ioarray[3].  */
+  unsigned int eparmlen;
+  const unsigned char *ekey;   /* Alias for ioarray[4].  */
+  unsigned int ekeylen;
+  unsigned char kek[32];
+  unsigned int keklen;
+  int encr_algo;
+  enum gcry_cipher_modes encr_mode;
+  gcry_cipher_hd_t encr_hd = NULL;
+  unsigned char *result = NULL;
+  unsigned int resultlen;
+  unsigned int blklen;
+  const unsigned char *salt;   /* Points int dparm. */
+  unsigned int saltlen;
+  unsigned long iterations;
+  int digest_algo;
+  char *passphrase = NULL;
+
+
+  *r_resultlen = 0;
+  *r_result = NULL;
+
+  err = gcry_sexp_extract_param (enc_val, "enc-val!pwri",
+                                 "&'derive-algo'?'derive-parm'?"
+                                 "'encr-algo''encr-parm''encr-key'",
+                                 ioarray+0, ioarray+1,
+                                 ioarray+2, ioarray+3, ioarray+4, NULL);
+  if (err)
+    {
+      /* If this is not pwri element, it is likly a kekri element
+       * which we do not yet support.  Change the error back to the
+       * original as returned by ksba_cms_get_issuer.  */
+      if (gpg_err_code (err) == GPG_ERR_NOT_FOUND)
+        err = gpg_error (GPG_ERR_UNSUPPORTED_CMS_OBJ);
+      else
+        log_error ("extracting PWRI parameter failed: %s\n",
+                   gpg_strerror (err));
+      goto leave;
+    }
+
+  if (ioarray[0].data)
+    {
+      derive_algo_str = string_from_gcry_buffer (ioarray+0);
+      if (!derive_algo_str)
+        {
+          err = gpg_error_from_syserror ();
+          goto leave;
+        }
+    }
+  dparm    = ioarray[1].data;
+  dparmlen = ioarray[1].len;
+  encr_algo_str = string_from_gcry_buffer (ioarray+2);
+  if (!encr_algo_str)
+    {
+      err = gpg_error_from_syserror ();
+      goto leave;
+    }
+  eparm    = ioarray[3].data;
+  eparmlen = ioarray[3].len;
+  ekey     = ioarray[4].data;
+  ekeylen  = ioarray[4].len;
+
+  /* Check parameters.  */
+  if (DBG_CRYPTO)
+    {
+      if (derive_algo_str)
+        {
+          log_debug ("derive algo: %s\n", derive_algo_str);
+          log_printhex (dparm, dparmlen, "derive parm:");
+        }
+      log_debug ("encr algo .: %s\n", encr_algo_str);
+      log_printhex (eparm, eparmlen, "encr parm .:");
+      log_printhex (ekey, ekeylen,   "encr key  .:");
+    }
+
+  if (!derive_algo_str)
+    {
+      err = gpg_error (GPG_ERR_NOT_SUPPORTED);
+      log_info ("PWRI with no key derivation detected\n");
+      goto leave;
+    }
+  if (strcmp (derive_algo_str, "1.2.840.113549.1.5.12"))
+    {
+      err = gpg_error (GPG_ERR_NOT_SUPPORTED);
+      log_info ("PWRI does not use PBKDF2 (but %s)\n", derive_algo_str);
+      goto leave;
+    }
+
+  digest_algo = 0;  /*(silence cc warning)*/
+  err = pwri_parse_pbkdf2 (dparm, dparmlen,
+                           &salt, &saltlen, &iterations, &digest_algo);
+  if (err)
+    {
+      log_error ("parsing PWRI parameter failed: %s\n", gpg_strerror (err));
+      goto leave;
+    }
+
+  parm->is_de_vs = (parm->is_de_vs
+                    && gnupg_digest_is_compliant (CO_DE_VS, digest_algo));
+
+
+  encr_algo = gcry_cipher_map_name (encr_algo_str);
+  encr_mode = gcry_cipher_mode_from_oid (encr_algo_str);
+  if (!encr_algo || !encr_mode)
+    {
+      log_error ("PWRI uses unknown algorithm %s\n", encr_algo_str);
+      err = gpg_error (GPG_ERR_CIPHER_ALGO);
+      goto leave;
+    }
+
+  parm->is_de_vs =
+    (parm->is_de_vs
+     && gnupg_cipher_is_compliant (CO_DE_VS, encr_algo, encr_mode));
+
+  keklen = gcry_cipher_get_algo_keylen (encr_algo);
+  blklen = gcry_cipher_get_algo_blklen (encr_algo);
+  if (!keklen || keklen > sizeof kek || blklen != 16 )
+    {
+      log_error ("PWRI algorithm %s cannot be used\n", encr_algo_str);
+      err = gpg_error (GPG_ERR_INV_KEYLEN);
+      goto leave;
+    }
+  if ((ekeylen % blklen) || (ekeylen / blklen < 2))
+    {
+      /* Note that we need at least two full blocks.  */
+      log_error ("PWRI uses a wrong length of encrypted key\n");
+      err = gpg_error (GPG_ERR_INV_KEYLEN);
+      goto leave;
+    }
+
+  err = gpgsm_agent_ask_passphrase
+    (ctrl,
+     i18n_utf8 (N_("Please enter the passphrase for decryption.")),
+     0, &passphrase);
+  if (err)
+    goto leave;
+
+  err = gcry_kdf_derive (passphrase, strlen (passphrase),
+                         GCRY_KDF_PBKDF2, digest_algo,
+                         salt, saltlen, iterations,
+                         keklen, kek);
+  if (passphrase)
+    {
+      wipememory (passphrase, strlen (passphrase));
+      xfree (passphrase);
+      passphrase = NULL;
+    }
+  if (err)
+    {
+      log_error ("deriving key from passphrase failed: %s\n",
+                 gpg_strerror (err));
+      goto leave;
+    }
+
+  if (DBG_CRYPTO)
+    log_printhex (kek, keklen, "KEK .......:");
+
+  /* Unwrap the key.  */
+  resultlen = ekeylen;
+  result = xtrymalloc_secure (resultlen);
+  if (!result)
+    {
+      err = gpg_error_from_syserror ();
+      goto leave;
+    }
+
+  err = gcry_cipher_open (&encr_hd, encr_algo, encr_mode, 0);
+  if (err)
+    {
+      log_error ("PWRI failed to open cipher: %s\n", gpg_strerror (err));
+      goto leave;
+    }
+
+  err = gcry_cipher_setkey (encr_hd, kek, keklen);
+  wipememory (kek, sizeof kek);
+  if (!err)
+    err = gcry_cipher_setiv (encr_hd, ekey + ekeylen - 2 * blklen, blklen);
+  if (!err)
+    err = gcry_cipher_decrypt (encr_hd, result + ekeylen - blklen, blklen,
+                               ekey + ekeylen - blklen, blklen);
+  if (!err)
+    err = gcry_cipher_setiv (encr_hd, result + ekeylen - blklen, blklen);
+  if (!err)
+    err = gcry_cipher_decrypt (encr_hd, result, ekeylen - blklen,
+                               ekey, ekeylen - blklen);
+  /* (We assume that that eparm is the octet string with the IV)  */
+  if (!err)
+    err = gcry_cipher_setiv (encr_hd, eparm, eparmlen);
+  if (!err)
+    err = gcry_cipher_decrypt (encr_hd, result, resultlen, NULL, 0);
+
+  if (err)
+    {
+      log_error ("KEK decryption failed for PWRI: %s\n", gpg_strerror (err));
+      goto leave;
+    }
+
+  if (DBG_CRYPTO)
+    log_printhex (result, resultlen, "Frame .....:");
+
+  if (result[0] < 8                /* At least 64 bits */
+      || (result[0] % 8)           /* Multiple of 64 bits */
+      || result[0] > resultlen - 4 /* Not more than the size of the input */
+      || ( (result[1] ^ result[4]) /* Matching check bytes.  */
+           & (result[2] ^ result[5])
+           & (result[3] ^ result[6]) ) != 0xff)
+    {
+      err = gpg_error (GPG_ERR_BAD_PASSPHRASE);
+      goto leave;
+    }
+
+  *r_resultlen = result[0];
+  *r_result = memmove (result, result + 4, result[0]);
+  result = NULL;
+
+ leave:
+  if (result)
+    {
+      wipememory (result, resultlen);
+      xfree (result);
+    }
+  if (passphrase)
+    {
+      wipememory (passphrase, strlen (passphrase));
+      xfree (passphrase);
+    }
+  gcry_cipher_close (encr_hd);
+  xfree (derive_algo_str);
+  xfree (encr_algo_str);
+  xfree (ioarray[0].data);
+  xfree (ioarray[1].data);
+  xfree (ioarray[2].data);
+  xfree (ioarray[3].data);
+  xfree (ioarray[4].data);
+  return err;
+}
+
 
 /* Decrypt the session key and fill in the parm structure.  The
    algo and the IV is expected to be already in PARM. */
@@ -411,23 +782,47 @@ prepare_decryption (ctrl_t ctrl, const char *hexkeygrip,
 {
   char *seskey = NULL;
   size_t n, seskeylen;
+  int pwri = !hexkeygrip && !pk_algo;
   int rc;
 
   if (DBG_CRYPTO)
     log_printcanon ("decrypting:", enc_val, 0);
-  rc = gpgsm_agent_pkdecrypt (ctrl, hexkeygrip, desc, enc_val,
-                              &seskey, &seskeylen);
-  if (rc)
+
+  if (!pwri)
     {
-      log_error ("error decrypting session key: %s\n", gpg_strerror (rc));
-      goto leave;
-    }
+      rc = gpgsm_agent_pkdecrypt (ctrl, hexkeygrip, desc, enc_val,
+                                  &seskey, &seskeylen);
+      if (rc)
+        {
+          log_error ("error decrypting session key: %s\n", gpg_strerror (rc));
+          goto leave;
+        }
 
-  if (DBG_CRYPTO)
-    log_printhex (seskey, seskeylen, "DEK frame:");
+      if (DBG_CRYPTO)
+        log_printhex (seskey, seskeylen, "DEK frame:");
+    }
 
   n=0;
-  if (pk_algo == GCRY_PK_ECC)
+  if (pwri) /* Password based encryption.  */
+    {
+      gcry_sexp_t s_enc_val;
+      unsigned char *decrypted;
+      unsigned int decryptedlen;
+
+      rc = gcry_sexp_sscan (&s_enc_val, NULL, enc_val,
+                            gcry_sexp_canon_len (enc_val, 0, NULL, NULL));
+      if (rc)
+        goto leave;
+
+      rc = pwri_decrypt (ctrl, s_enc_val, &decrypted, &decryptedlen, parm);
+      gcry_sexp_release (s_enc_val);
+      if (rc)
+        goto leave;
+      xfree (seskey);
+      seskey = decrypted;
+      seskeylen = decryptedlen;
+    }
+  else if (pk_algo == GCRY_PK_ECC)
     {
       gcry_sexp_t s_enc_val;
       unsigned char *decrypted;
@@ -488,7 +883,10 @@ prepare_decryption (ctrl_t ctrl, const char *hexkeygrip,
     }
 
   if (DBG_CRYPTO)
-    log_printhex (seskey+n, seskeylen-n, "CEK .....:");
+    {
+      log_printhex (seskey+n, seskeylen-n, "CEK .......:");
+      log_printhex (parm->iv, parm->ivlen, "IV ........:");
+    }
 
   if (opt.verbose)
     log_info (_("%s.%s encrypted data\n"),
@@ -515,7 +913,20 @@ prepare_decryption (ctrl_t ctrl, const char *hexkeygrip,
       goto leave;
     }
 
-  gcry_cipher_setiv (parm->hd, parm->iv, parm->ivlen);
+  rc = gcry_cipher_setiv (parm->hd, parm->iv, parm->ivlen);
+  if (rc)
+    {
+      log_error("IV setup failed: %s\n", gpg_strerror(rc) );
+      goto leave;
+    }
+
+  if (parm->mode == GCRY_CIPHER_MODE_GCM)
+    {
+      /* GCM mode really sucks in CMS.  We need to know the AAD before
+       * we start decrypting but CMS puts the AAD after the content.
+       * Thus temporary files are required.  Let's hope that no real
+       * messages with actual AAD are ever used.  OCB Rules! */
+    }
 
  leave:
   xfree (seskey);
@@ -616,6 +1027,36 @@ decrypt_filter (void *arg,
 }
 
 
+/* This is the GCM version of decrypt_filter.  */
+static gpg_error_t
+decrypt_gcm_filter (void *arg,
+                    const void *inbuf, size_t inlen, size_t *inused,
+                    void *outbuf, size_t maxoutlen, size_t *outlen)
+{
+  struct decrypt_filter_parm_s *parm = arg;
+
+  if (!inlen)
+    return gpg_error (GPG_ERR_BUG);
+
+  if (maxoutlen < parm->blklen)
+    return gpg_error (GPG_ERR_BUG);
+
+  if (inlen > maxoutlen)
+    inlen = maxoutlen;
+
+  *inused = inlen;
+  if (inlen)
+    {
+      gcry_cipher_decrypt (parm->hd, outbuf, inlen, inbuf, inlen);
+      *outlen = inlen;
+      parm->any_data = 1;
+    }
+  else
+    *outlen = 0;
+  return 0;
+}
+
+
 
 /* Perform a decrypt operation.  */
 int
@@ -704,7 +1145,6 @@ gpgsm_decrypt (ctrl_t ctrl, int in_fd, estream_t out_fp)
           int algo, mode;
           const char *algoid;
           int any_key = 0;
-          int is_de_vs;	/* Computed compliance with CO_DE_VS.  */
 
           audit_log (ctrl->audit, AUDIT_GOT_DATA);
 
@@ -748,14 +1188,17 @@ gpgsm_decrypt (ctrl_t ctrl, int in_fd, estream_t out_fp)
             }
 
           /* For CMS, CO_DE_VS demands CBC mode.  */
-          is_de_vs = gnupg_cipher_is_compliant (CO_DE_VS, algo, mode);
+          dfparm.is_de_vs = gnupg_cipher_is_compliant (CO_DE_VS, algo, mode);
 
           audit_log_i (ctrl->audit, AUDIT_DATA_CIPHER_ALGO, algo);
           dfparm.algo = algo;
           dfparm.mode = mode;
           dfparm.blklen = gcry_cipher_get_algo_blklen (algo);
           if (dfparm.blklen > sizeof (dfparm.helpblock))
-            return gpg_error (GPG_ERR_BUG);
+            {
+              rc = gpg_error (GPG_ERR_BUG);
+              goto leave;
+            }
 
           rc = ksba_cms_get_content_enc_iv (cms,
                                             dfparm.iv,
@@ -781,6 +1224,7 @@ gpgsm_decrypt (ctrl_t ctrl, int in_fd, estream_t out_fp)
               ksba_cert_t cert = NULL;
               unsigned int nbits;
               int pk_algo = 0;
+              int maybe_pwri = 0;
 
               *kidbuf = 0;
 
@@ -788,9 +1232,15 @@ gpgsm_decrypt (ctrl_t ctrl, int in_fd, estream_t out_fp)
               if (tmp_rc == -1 && recp)
                 break; /* no more recipients */
               audit_log_i (ctrl->audit, AUDIT_NEW_RECP, recp);
-              if (tmp_rc)
-                log_error ("recp %d - error getting info: %s\n",
-                           recp, gpg_strerror (tmp_rc));
+              if (gpg_err_code (tmp_rc) == GPG_ERR_UNSUPPORTED_CMS_OBJ)
+                {
+                  maybe_pwri = 1;
+                }
+              else if (tmp_rc)
+                {
+                  log_error ("recp %d - error getting info: %s\n",
+                             recp, gpg_strerror (tmp_rc));
+                }
               else
                 {
                   if (opt.verbose)
@@ -885,29 +1335,37 @@ gpgsm_decrypt (ctrl_t ctrl, int in_fd, estream_t out_fp)
                     }
 
                   /* Check that all certs are compliant with CO_DE_VS.  */
-                  is_de_vs = (is_de_vs
-                              && gnupg_pk_is_compliant (CO_DE_VS, pk_algo, 0,
-                                                        NULL, nbits, NULL));
+                  dfparm.is_de_vs =
+                    (dfparm.is_de_vs
+                     && gnupg_pk_is_compliant (CO_DE_VS, pk_algo, 0,
+                                               NULL, nbits, NULL));
 
                 oops:
                   if (rc)
                     {
                       /* We cannot check compliance of certs that we
                        * don't have.  */
-                      is_de_vs = 0;
+                      dfparm.is_de_vs = 0;
                     }
                   xfree (issuer);
                   xfree (serial);
                   ksba_cert_release (cert);
                 }
 
-              if (!hexkeygrip || !pk_algo)
+              if ((!hexkeygrip || !pk_algo) && !maybe_pwri)
                 ;
               else if (!(enc_val = ksba_cms_get_enc_val (cms, recp)))
-                log_error ("recp %d - error getting encrypted session key\n",
-                           recp);
+                {
+                  log_error ("recp %d - error getting encrypted session key\n",
+                             recp);
+                  if (maybe_pwri)
+                    log_info ("(possibly unsupported KEK info)\n");
+                }
               else
                 {
+                  if (maybe_pwri && opt.verbose)
+                    log_info ("recp %d - KEKRI or PWRI\n", recp);
+
                   rc = prepare_decryption (ctrl, hexkeygrip, pk_algo, nbits,
                                            desc, enc_val, &dfparm);
                   xfree (enc_val);
@@ -921,11 +1379,14 @@ gpgsm_decrypt (ctrl_t ctrl, int in_fd, estream_t out_fp)
                   else
                     { /* setup the bulk decrypter */
                       any_key = 1;
-                      ksba_writer_set_filter (writer,
-                                              decrypt_filter,
-                                              &dfparm);
-
-                      if (is_de_vs && gnupg_gcrypt_is_compliant (CO_DE_VS))
+                      ksba_writer_set_filter
+                        (writer,
+                         dfparm.mode == GCRY_CIPHER_MODE_GCM?
+                         decrypt_gcm_filter : decrypt_filter,
+                         &dfparm);
+
+                      if (dfparm.is_de_vs
+                          && gnupg_gcrypt_is_compliant (CO_DE_VS))
                         gpgsm_status (ctrl, STATUS_DECRYPTION_COMPLIANCE_MODE,
                                       gnupg_status_compliance_flag (CO_DE_VS));
 
@@ -977,7 +1438,11 @@ gpgsm_decrypt (ctrl_t ctrl, int in_fd, estream_t out_fp)
       else if (stopreason == KSBA_SR_END_DATA)
         {
           ksba_writer_set_filter (writer, NULL, NULL);
-          if (dfparm.any_data)
+          if (dfparm.mode == GCRY_CIPHER_MODE_GCM)
+            {
+              /* Nothing yet to do.  We wait for the ready event.  */
+            }
+          else if (dfparm.any_data )
             { /* write the last block with padding removed */
               int i, npadding = dfparm.lastblock[dfparm.blklen-1];
               if (!npadding || npadding > dfparm.blklen)
@@ -1003,7 +1468,28 @@ gpgsm_decrypt (ctrl_t ctrl, int in_fd, estream_t out_fp)
                 }
             }
         }
+      else if (stopreason == KSBA_SR_READY)
+        {
+          if (dfparm.mode == GCRY_CIPHER_MODE_GCM)
+            {
+              char *authtag;
+              size_t authtaglen;
 
+              rc = ksba_cms_get_message_digest (cms, 0, &authtag, &authtaglen);
+              if (rc)
+                {
+                  log_error ("error getting authtag: %s\n", gpg_strerror (rc));
+                  goto leave;
+                }
+              if (DBG_CRYPTO)
+                log_printhex (authtag, authtaglen, "Authtag ...:");
+              rc = gcry_cipher_checktag (dfparm.hd, authtag, authtaglen);
+              xfree (authtag);
+              if (rc)
+                log_error ("data is not authentic: %s\n", gpg_strerror (rc));
+              goto leave;
+            }
+        }
     }
   while (stopreason != KSBA_SR_READY);
 
diff --git a/sm/encrypt.c b/sm/encrypt.c
index 92ca341..ba2428e 100644
--- a/sm/encrypt.c
+++ b/sm/encrypt.c
@@ -473,6 +473,7 @@ encrypt_dek (const DEK dek, ksba_cert_t cert, int pk_algo,
       rc = encode_session_key (dek, &s_data);
       if (rc)
         {
+          gcry_sexp_release (s_pkey);
           log_error ("encode_session_key failed: %s\n", gpg_strerror (rc));
           return rc;
         }
diff --git a/sm/export.c b/sm/export.c
index 32f0456..54893b5 100644
--- a/sm/export.c
+++ b/sm/export.c
@@ -724,8 +724,8 @@ export_p12 (ctrl_t ctrl, const unsigned char *certimg, size_t certimglen,
     {
       err = gpgsm_agent_ask_passphrase
         (ctrl,
-         i18n_utf8 ("Please enter the passphrase to protect the "
-                    "new PKCS#12 object."),
+         i18n_utf8 (N_("Please enter the passphrase to protect the "
+                       "new PKCS#12 object.")),
          1, &passphrase);
       if (err)
         goto leave;
diff --git a/sm/gpgsm.c b/sm/gpgsm.c
index ca30358..67cfe24 100644
--- a/sm/gpgsm.c
+++ b/sm/gpgsm.c
@@ -348,8 +348,9 @@ static gpgrt_opt_t opts[] = {
   ARGPARSE_s_s (oKeyring, "keyring",
                 N_("|FILE|add keyring to the list of keyrings")),
   ARGPARSE_s_n (oNoDefKeyring, "no-default-keyring", "@"),
-  ARGPARSE_s_s (oKeyServer, "keyserver",
+  ARGPARSE_s_s (oKeyServer, "ldapserver",
                 N_("|SPEC|use this keyserver to lookup keys")),
+  ARGPARSE_s_s (oKeyServer, "keyserver", "@"),
   ARGPARSE_s_n (oUseKeyboxd,    "use-keyboxd", "@"),
 
 
@@ -840,133 +841,6 @@ parse_validation_model (const char *model)
 }
 
 
-/* Release the list of SERVERS.  As usual it is okay to call this
-   function with SERVERS passed as NULL.  */
-void
-keyserver_list_free (struct keyserver_spec *servers)
-{
-  while (servers)
-    {
-      struct keyserver_spec *tmp = servers->next;
-      xfree (servers->host);
-      xfree (servers->user);
-      if (servers->pass)
-        memset (servers->pass, 0, strlen (servers->pass));
-      xfree (servers->pass);
-      xfree (servers->base);
-      xfree (servers);
-      servers = tmp;
-    }
-}
-
-/* See also dirmngr ldapserver_parse_one().  */
-struct keyserver_spec *
-parse_keyserver_line (char *line,
-		      const char *filename, unsigned int lineno)
-{
-  char *p;
-  char *endp;
-  const char *s;
-  struct keyserver_spec *server;
-  int fieldno;
-  int fail = 0;
-  int i;
-
-  if (!filename)
-    {
-      filename = "[cmd]";
-      lineno = 0;
-    }
-
-  /* Parse the colon separated fields.  */
-  server = xcalloc (1, sizeof *server);
-  for (fieldno = 1, p = line; p; p = endp, fieldno++ )
-    {
-      endp = strchr (p, ':');
-      if (endp)
-	*endp++ = '\0';
-      trim_spaces (p);
-      switch (fieldno)
-	{
-	case 1:
-	  if (*p)
-            server->host = xstrdup (p);
-	  else
-	    {
-	      log_error (_("%s:%u: no hostname given\n"),
-			 filename, lineno);
-	      fail = 1;
-	    }
-	  break;
-
-	case 2:
-	  if (*p)
-	    server->port = atoi (p);
-	  break;
-
-	case 3:
-	  if (*p)
-	    server->user = xstrdup (p);
-	  break;
-
-	case 4:
-	  if (*p && !server->user)
-	    {
-	      log_error (_("%s:%u: password given without user\n"),
-			 filename, lineno);
-	      fail = 1;
-	    }
-	  else if (*p)
-	    server->pass = xstrdup (p);
-	  break;
-
-	case 5:
-	  if (*p)
-	    server->base = xstrdup (p);
-	  break;
-
-        case 6:
-          {
-            char **flags = NULL;
-
-            flags = strtokenize (p, ",");
-            if (!flags)
-              log_fatal ("strtokenize failed: %s\n",
-                         gpg_strerror (gpg_error_from_syserror ()));
-
-            for (i=0; (s = flags[i]); i++)
-              {
-                if (!*s)
-                  ;
-                else if (!ascii_strcasecmp (s, "ldaps"))
-                  server->use_ldaps = 1;
-                else if (!ascii_strcasecmp (s, "ldap"))
-                  server->use_ldaps = 0;
-                else
-                  log_info (_("%s:%u: ignoring unknown flag '%s'\n"),
-                            filename, lineno, s);
-              }
-
-            xfree (flags);
-          }
-          break;
-
-	default:
-	  /* (We silently ignore extra fields.) */
-	  break;
-	}
-    }
-
-  if (fail)
-    {
-      log_info (_("%s:%u: skipping this line\n"), filename, lineno);
-      keyserver_list_free (server);
-      server = NULL;
-    }
-
-  return server;
-}
-
 
 int
 main ( int argc, char **argv)
@@ -1008,7 +882,6 @@ main ( int argc, char **argv)
   estream_t htmlauditfp = NULL;
   struct assuan_malloc_hooks malloc_hooks;
   int pwfd = -1;
-  int no_logfile = 0;
 
   static const char *homedirvalue;
   static const char *changeuser;
@@ -1359,7 +1232,7 @@ main ( int argc, char **argv)
           break;
 
         case oLogFile: logfile = pargs.r.ret_str; break;
-        case oNoLogFile: logfile = NULL; no_logfile = 1; break;
+        case oNoLogFile: logfile = NULL; break;
 
         case oAuditLog: auditlog = pargs.r.ret_str; break;
         case oHtmlAuditLog: htmlauditlog = pargs.r.ret_str; break;
@@ -1542,21 +1415,7 @@ main ( int argc, char **argv)
         case oValidationModel: parse_validation_model (pargs.r.ret_str); break;
 
 	case oKeyServer:
-	  {
-	    struct keyserver_spec *keyserver;
-	    keyserver = parse_keyserver_line (pargs.r.ret_str,
-					      configname, pargs.lineno);
-	    if (! keyserver)
-	      log_error (_("could not parse keyserver\n"));
-	    else
-	      {
-		/* FIXME: Keep last next pointer.  */
-		struct keyserver_spec **next_p = &opt.keyserver;
-		while (*next_p)
-		  next_p = &(*next_p)->next;
-		*next_p = keyserver;
-	      }
-	  }
+          append_to_strlist (&opt.keyserver, pargs.r.ret_str);
 	  break;
 
         case oIgnoreCertExtension:
@@ -1626,12 +1485,6 @@ main ( int argc, char **argv)
       gpgsm_exit(2);
     }
 
-  if (!logfile && !no_logfile)
-    {
-      logfile = comopt.logfile;
-      comopt.logfile = NULL;
-    }
-
   if (opt.use_keyboxd)
     log_info ("Note: Please move option \"%s\" to \"common.conf\"\n",
               "use-keyboxd");
@@ -2072,13 +1925,16 @@ main ( int argc, char **argv)
 
         set_binary (stdin);
         if (!argc)
-          gpgsm_decrypt (&ctrl, 0, fp); /* from stdin */
+          err = gpgsm_decrypt (&ctrl, 0, fp); /* from stdin */
         else if (argc == 1)
-          gpgsm_decrypt (&ctrl, open_read (*argv), fp); /* from file */
+          err = gpgsm_decrypt (&ctrl, open_read (*argv), fp); /* from file */
         else
           wrong_args ("--decrypt [filename]");
 
-        es_fclose (fp);
+        if (err)
+          gpgrt_fcancel (fp);
+        else
+          es_fclose (fp);
       }
       break;
 
@@ -2289,7 +2145,7 @@ main ( int argc, char **argv)
 
   /* cleanup */
   gpgsm_deinit_default_ctrl (&ctrl);
-  keyserver_list_free (opt.keyserver);
+  free_strlist (opt.keyserver);
   opt.keyserver = NULL;
   gpgsm_release_certlist (recplist);
   gpgsm_release_certlist (signerlist);
diff --git a/sm/gpgsm.h b/sm/gpgsm.h
index 7c27c58..acf8cae 100644
--- a/sm/gpgsm.h
+++ b/sm/gpgsm.h
@@ -45,19 +45,6 @@
 #define MAX_DIGEST_LEN 64     /* Fits for SHA-512 */
 
 
-struct keyserver_spec
-{
-  struct keyserver_spec *next;
-
-  char *host;
-  int port;
-  char *user;
-  char *pass;
-  char *base;
-  unsigned int use_ldaps:1;
-};
-
-
 /* A large struct named "opt" to keep global flags. */
 EXTERN_UNLESS_MAIN_MODULE
 struct
@@ -155,7 +142,7 @@ struct
                                the integrity of the software at
                                runtime. */
 
-  struct keyserver_spec *keyserver;
+  strlist_t keyserver;
 
   /* A list of certificate extension OIDs which are ignored so that
      one can claim that a critical extension has been handled.  One
diff --git a/sm/import.c b/sm/import.c
index 3d08254..d506913 100644
--- a/sm/import.c
+++ b/sm/import.c
@@ -459,7 +459,8 @@ reimport_one (ctrl_t ctrl, struct stats_s *stats, int in_fd)
       err = keydb_get_cert (kh, &cert);
       if (err)
         {
-          log_error ("keydb_get_cert() failed: %s\n", gpg_strerror (err));
+          log_error ("keydb_get_cert failed in %s: %s <%s>\n",
+                     __func__, gpg_strerror (err), gpg_strsource (err));
           print_import_problem (ctrl, NULL, 1);
           stats->not_imported++;
           continue;
@@ -771,7 +772,7 @@ parse_p12 (ctrl_t ctrl, ksba_reader_t reader, struct stats_s *stats)
 
   err = gpgsm_agent_ask_passphrase
     (ctrl,
-     i18n_utf8 ("Please enter the passphrase to unprotect the PKCS#12 object."),
+     i18n_utf8 (N_("Please enter the passphrase to unprotect the PKCS#12 object.")),
      0, &passphrase);
   if (err)
     goto leave;
diff --git a/sm/keydb.c b/sm/keydb.c
index e092e4a..5b28df7 100644
--- a/sm/keydb.c
+++ b/sm/keydb.c
@@ -72,6 +72,11 @@ struct keydb_local_s
     char *buf;
     size_t len;
   } search_result;
+  /* The "stack" used by keydb_push_found_state.  */
+  struct {
+    char *buf;
+    size_t len;
+  } saved_search_result;
 
   /* This flag set while an operation is running on this context.  */
   unsigned int is_active : 1;
@@ -268,7 +273,7 @@ maybe_create_keybox (char *filename, int force, int *r_created)
     }
 
   /* Now the real test while we are locked. */
-  if (!access(filename, F_OK))
+  if (!gnupg_access(filename, F_OK))
     {
       rc = 0;  /* Okay, we may access the file now.  */
       goto leave;
@@ -855,7 +860,7 @@ unlock_all (KEYDB_HANDLE hd)
 
 
 
-/* Push the last found state if any.  */
+/* Push the last found state if any.   Only one state is saved.  */
 void
 keydb_push_found_state (KEYDB_HANDLE hd)
 {
@@ -863,25 +868,33 @@ keydb_push_found_state (KEYDB_HANDLE hd)
     return;
 
   if (hd->use_keyboxd)
-    return; /* FIXME: Do we need this? */
-
-  if (hd->found < 0 || hd->found >= hd->used)
     {
-      hd->saved_found = -1;
-      return;
+      xfree (hd->kbl->saved_search_result.buf);
+      hd->kbl->saved_search_result.buf = hd->kbl->search_result.buf;
+      hd->kbl->saved_search_result.len = hd->kbl->search_result.len;
+      hd->kbl->search_result.buf = NULL;
+      hd->kbl->search_result.len = 0;
     }
-
-  switch (hd->active[hd->found].type)
+  else
     {
-    case KEYDB_RESOURCE_TYPE_NONE:
-      break;
-    case KEYDB_RESOURCE_TYPE_KEYBOX:
-      keybox_push_found_state (hd->active[hd->found].u.kr);
-      break;
+      if (hd->found < 0 || hd->found >= hd->used)
+        hd->saved_found = -1;
+      else
+        {
+          switch (hd->active[hd->found].type)
+            {
+            case KEYDB_RESOURCE_TYPE_NONE:
+              break;
+            case KEYDB_RESOURCE_TYPE_KEYBOX:
+              keybox_push_found_state (hd->active[hd->found].u.kr);
+              break;
+            }
+
+          hd->saved_found = hd->found;
+          hd->found = -1;
+        }
     }
 
-  hd->saved_found = hd->found;
-  hd->found = -1;
   if (DBG_CLOCK)
     log_clock ("%s: done (hd=%p)\n", __func__, hd);
 }
@@ -895,21 +908,32 @@ keydb_pop_found_state (KEYDB_HANDLE hd)
     return;
 
   if (hd->use_keyboxd)
-    return; /* FIXME: Do we need this? */
-
-  hd->found = hd->saved_found;
-  hd->saved_found = -1;
-  if (hd->found < 0 || hd->found >= hd->used)
-    return;
-
-  switch (hd->active[hd->found].type)
     {
-    case KEYDB_RESOURCE_TYPE_NONE:
-      break;
-    case KEYDB_RESOURCE_TYPE_KEYBOX:
-      keybox_pop_found_state (hd->active[hd->found].u.kr);
-      break;
+      xfree (hd->kbl->search_result.buf);
+      hd->kbl->search_result.buf = hd->kbl->saved_search_result.buf;
+      hd->kbl->search_result.len = hd->kbl->saved_search_result.len;
+      hd->kbl->saved_search_result.buf = NULL;
+      hd->kbl->saved_search_result.len = 0;
+    }
+  else
+    {
+      hd->found = hd->saved_found;
+      hd->saved_found = -1;
+      if (hd->found < 0 || hd->found >= hd->used)
+        ;
+      else
+        {
+          switch (hd->active[hd->found].type)
+            {
+            case KEYDB_RESOURCE_TYPE_NONE:
+              break;
+            case KEYDB_RESOURCE_TYPE_KEYBOX:
+              keybox_pop_found_state (hd->active[hd->found].u.kr);
+              break;
+            }
+        }
     }
+
   if (DBG_CLOCK)
     log_clock ("%s: done (hd=%p)\n", __func__, hd);
 }
@@ -955,9 +979,6 @@ keydb_get_cert (KEYDB_HANDLE hd, ksba_cert_t *r_cert)
           ksba_cert_release (cert);
           goto leave;
         }
-      xfree (hd->kbl->search_result.buf);
-      hd->kbl->search_result.buf = NULL;
-      hd->kbl->search_result.len = 0;
       *r_cert = cert;
       goto leave;
     }
@@ -1617,7 +1638,8 @@ keydb_search (ctrl_t ctrl, KEYDB_HANDLE hd,
           break;
 
         case KEYDB_SEARCH_MODE_MAIL:
-          snprintf (line, sizeof line, "SEARCH --x509 <%s", desc[0].u.name);
+          snprintf (line, sizeof line, "SEARCH --x509 <%s",
+                    desc[0].u.name + (desc[0].u.name[0] == '<'));
           break;
 
         case KEYDB_SEARCH_MODE_MAILSUB:
diff --git a/sm/keylist.c b/sm/keylist.c
index 3c9e10c..f571ee2 100644
--- a/sm/keylist.c
+++ b/sm/keylist.c
@@ -792,6 +792,8 @@ list_cert_raw (ctrl_t ctrl, KEYDB_HANDLE hd,
   ksba_name_t name, name2;
   unsigned int reason;
   const unsigned char *cert_der = NULL;
+  char *algostr;
+  int algoid;
 
   (void)have_secret;
 
@@ -845,6 +847,47 @@ list_cert_raw (ctrl_t ctrl, KEYDB_HANDLE hd,
   es_fprintf (fp, "      md5_fpr: %s\n", dn?dn:"error");
   xfree (dn);
 
+  algoid = 0;
+  algostr = gpgsm_pubkey_algo_string (cert, &algoid);
+
+  /* For RSA we support printing an OpenPGP v4 fingerprint under the
+   * assumption that the not-before date would be used as the OpenPGP
+   * key creation date.  */
+  if (algoid == GCRY_PK_RSA)
+    {
+      ksba_sexp_t pk;
+      size_t pklen;
+      const unsigned char *m, *e;
+      size_t mlen, elen;
+      unsigned char fpr20[20];
+      time_t tmpt;
+      unsigned long keytime;
+
+      pk = ksba_cert_get_public_key (cert);
+      if (pk)
+        {
+          ksba_cert_get_validity (cert, 0, t);
+          tmpt = isotime2epoch (t);
+          keytime = (tmpt == (time_t)(-1))? 0 : (u32)tmpt;
+
+          pklen = gcry_sexp_canon_len (pk, 0, NULL, NULL);
+          if (!pklen)
+            log_error ("libksba did not return a proper S-Exp\n");
+          else if (!get_rsa_pk_from_canon_sexp (pk, pklen,
+                                                &m, &mlen, &e, &elen)
+                   && !compute_openpgp_fpr_rsa (4,
+                                                keytime,
+                                                m, mlen, e, elen,
+                                                fpr20, NULL))
+            {
+              char *fpr = bin2hex (fpr20, 20, NULL);
+              es_fprintf (fp, "      pgp_fpr: %s\n", fpr);
+              xfree (fpr);
+            }
+          ksba_free (pk);
+        }
+    }
+
   dn = gpgsm_get_certid (cert);
   es_fprintf (fp, "       certid: %s\n", dn?dn:"error");
   xfree (dn);
@@ -866,13 +909,7 @@ list_cert_raw (ctrl_t ctrl, KEYDB_HANDLE hd,
   s = get_oid_desc (oid, 0, NULL);
   es_fprintf (fp, "     hashAlgo: %s%s%s%s\n", oid, s?" (":"",s?s:"",s?")":"");
 
-  {
-    char *algostr;
-
-    algostr = gpgsm_pubkey_algo_string (cert, NULL);
-    es_fprintf (fp, "      keyType: %s\n", algostr? algostr : "[error]");
-    xfree (algostr);
-  }
+  es_fprintf (fp, "      keyType: %s\n", algostr? algostr : "[error]");
 
   /* subjectKeyIdentifier */
   es_fputs ("    subjKeyId: ", fp);
@@ -1154,6 +1191,7 @@ list_cert_raw (ctrl_t ctrl, KEYDB_HANDLE hd,
         es_fprintf (fp, "  [stored as ephemeral]\n");
     }
 
+  xfree (algostr);
 }
 
 
diff --git a/sm/server.c b/sm/server.c
index 874f0db..2a6d7c3 100644
--- a/sm/server.c
+++ b/sm/server.c
@@ -724,8 +724,13 @@ cmd_export (assuan_context_t ctx, char *line)
 
   if (opt_secret)
     {
-      if (!list || !*list->d)
+      if (!list)
         return set_error (GPG_ERR_NO_DATA, "No key given");
+      if (!*list->d)
+        {
+          free_strlist (list);
+          return set_error (GPG_ERR_NO_DATA, "No key given");
+        }
       if (list->next)
         return set_error (GPG_ERR_TOO_MANY, "Only one key allowed");
   }
@@ -1014,17 +1019,27 @@ do_listkeys (assuan_context_t ctx, char *line, int mode)
       int outfd = translate_sys2libc_fd (assuan_get_output_fd (ctx), 1);
 
       if ( outfd == -1 )
-        return set_error (GPG_ERR_ASS_NO_OUTPUT, NULL);
+        {
+          free_strlist (list);
+          return set_error (GPG_ERR_ASS_NO_OUTPUT, NULL);
+        }
       fp = es_fdopen_nc (outfd, "w");
       if (!fp)
-        return set_error (gpg_err_code_from_syserror (), "es_fdopen() failed");
+        {
+          free_strlist (list);
+          return set_error (gpg_err_code_from_syserror (),
+                            "es_fdopen() failed");
+        }
     }
   else
     {
       fp = es_fopencookie (ctx, "w", data_line_cookie_functions);
       if (!fp)
-        return set_error (GPG_ERR_ASS_GENERAL,
-                          "error setting up a data stream");
+        {
+          free_strlist (list);
+          return set_error (GPG_ERR_ASS_GENERAL,
+                            "error setting up a data stream");
+        }
     }
 
   ctrl->with_colons = 1;
@@ -1034,6 +1049,7 @@ do_listkeys (assuan_context_t ctx, char *line, int mode)
   if (ctrl->server_local->list_external)
     listmode |= (1<<7);
   err = gpgsm_list_keys (assuan_get_pointer (ctx), list, fp, listmode);
+
   free_strlist (list);
   es_fclose (fp);
   if (ctrl->server_local->list_to_output)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 624334c..f29b68a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -24,60 +24,23 @@ else
 tpm2dtests =
 endif
 
-SUBDIRS = gpgscm openpgp migrations gpgsm gpgme pkits $(tpm2dtests) .
+SUBDIRS = gpgscm openpgp cms migrations gpgme pkits $(tpm2dtests) .
 
 GPGSM = ../sm/gpgsm
 
-# Note that we need to use /bin/pwd so that we don't get into trouble
-# if the shell used for inittests would uses an internal version of
-# pwd which handles symlinks differently.
-TESTS_ENVIRONMENT = GNUPGHOME=`/bin/pwd` GPG_AGENT_INFO= LC_ALL=C \
-                    GPGSM="$(GPGSM)" "$(srcdir)/runtest"
 
-testscripts = sm-sign+verify sm-verify
-
-EXTRA_DIST = runtest inittests $(testscripts) ChangeLog-2011 \
-	     text-1.txt text-2.txt text-3.txt \
-	     text-1.osig.pem text-1.dsig.pem text-1.osig-bad.pem \
-	     text-2.osig.pem text-2.osig-bad.pem \
+EXTRA_DIST = run-tests.scm \
              fake-pinentries/README.txt        \
              fake-pinentries/fake-pinentry.php \
              fake-pinentries/fake-pinentry.pl  \
              fake-pinentries/fake-pinentry.py  \
              fake-pinentries/fake-pinentry.sh  \
-	     samplekeys/steed-self-signing-nonthority.pem \
-	     samplekeys/68A638998DFABAC510EA645CE34F9686B2EDF7EA.key \
-             samplekeys/32100C27173EF6E9C4E9A25D3D69F86D37A4F939.key \
-             samplekeys/cert_g10code_pete1.pem \
-             samplekeys/cert_g10code_test1.pem \
-             samplekeys/cert_g10code_theo1.pem \
-	     run-tests.scm
-
-# We used to run $(testscripts) here but these asschk scripts are not
-# completely reliable in all environments and thus we better disable
-# them.  The tests are anyway way too minimal.  We will eventually
-# write new tests based on gpg-connect-agent which has a full fledged
-# script language and thus makes it far easier to write tests than to
-# use that low-level asschk stuff.
-TESTS =
+	     ChangeLog-2011
 
-CLEANFILES = inittests.stamp x y y z out err \
-	     *.lock .\#lk*
-
-DISTCLEANFILES = pubring.kbx~ random_seed
+CLEANFILES =  x y z out err
 
 if !HAVE_W32_SYSTEM
 noinst_PROGRAMS = asschk
 endif
 
 asschk_SOURCES = asschk.c
-
-
-all-local: inittests.stamp
-
-clean-local:
-	srcdir=$(srcdir) $(TESTS_ENVIRONMENT) $(srcdir)/inittests --clean
-
-inittests.stamp: inittests
-	srcdir=$(srcdir) $(TESTS_ENVIRONMENT) $(srcdir)/inittests
-	echo timestamp >./inittests.stamp
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 9e3e4ed..6caa41f 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -106,7 +106,6 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-TESTS =
 @HAVE_W32_SYSTEM_FALSE@noinst_PROGRAMS = asschk$(EXEEXT)
 subdir = tests
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -205,30 +204,7 @@ am__define_uniq_tagged_files = \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
-am__tty_colors_dummy = \
-  mgn= red= grn= lgn= blu= brg= std=; \
-  am__color_tests=no
-am__tty_colors = { \
-  $(am__tty_colors_dummy); \
-  if test "X$(AM_COLOR_TESTS)" = Xno; then \
-    am__color_tests=no; \
-  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
-    am__color_tests=yes; \
-  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
-    am__color_tests=yes; \
-  fi; \
-  if test $$am__color_tests = yes; then \
-    red=''; \
-    grn=''; \
-    lgn=''; \
-    blu=''; \
-    mgn=''; \
-    brg=''; \
-    std=''; \
-  fi; \
-}
-DIST_SUBDIRS = gpgscm openpgp migrations gpgsm gpgme pkits tpm2dtests \
-	.
+DIST_SUBDIRS = gpgscm openpgp cms migrations gpgme pkits tpm2dtests .
 am__DIST_COMMON = $(srcdir)/Makefile.in \
 	$(top_srcdir)/build-aux/depcomp \
 	$(top_srcdir)/build-aux/mkinstalldirs
@@ -452,37 +428,17 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 @TEST_LIBTSS_FALSE@tpm2dtests = 
 @TEST_LIBTSS_TRUE@tpm2dtests = tpm2dtests
-SUBDIRS = gpgscm openpgp migrations gpgsm gpgme pkits $(tpm2dtests) .
+SUBDIRS = gpgscm openpgp cms migrations gpgme pkits $(tpm2dtests) .
 GPGSM = ../sm/gpgsm
-
-# Note that we need to use /bin/pwd so that we don't get into trouble
-# if the shell used for inittests would uses an internal version of
-# pwd which handles symlinks differently.
-TESTS_ENVIRONMENT = GNUPGHOME=`/bin/pwd` GPG_AGENT_INFO= LC_ALL=C \
-                    GPGSM="$(GPGSM)" "$(srcdir)/runtest"
-
-testscripts = sm-sign+verify sm-verify
-EXTRA_DIST = runtest inittests $(testscripts) ChangeLog-2011 \
-	     text-1.txt text-2.txt text-3.txt \
-	     text-1.osig.pem text-1.dsig.pem text-1.osig-bad.pem \
-	     text-2.osig.pem text-2.osig-bad.pem \
+EXTRA_DIST = run-tests.scm \
              fake-pinentries/README.txt        \
              fake-pinentries/fake-pinentry.php \
              fake-pinentries/fake-pinentry.pl  \
              fake-pinentries/fake-pinentry.py  \
              fake-pinentries/fake-pinentry.sh  \
-	     samplekeys/steed-self-signing-nonthority.pem \
-	     samplekeys/68A638998DFABAC510EA645CE34F9686B2EDF7EA.key \
-             samplekeys/32100C27173EF6E9C4E9A25D3D69F86D37A4F939.key \
-             samplekeys/cert_g10code_pete1.pem \
-             samplekeys/cert_g10code_test1.pem \
-             samplekeys/cert_g10code_theo1.pem \
-	     run-tests.scm
-
-CLEANFILES = inittests.stamp x y y z out err \
-	     *.lock .\#lk*
-
-DISTCLEANFILES = pubring.kbx~ random_seed
+	     ChangeLog-2011
+
+CLEANFILES = x y z out err
 asschk_SOURCES = asschk.c
 all: all-recursive
 
@@ -652,99 +608,6 @@ cscopelist-am: $(am__tagged_files)
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
-check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
-	srcdir=$(srcdir); export srcdir; \
-	list=' $(TESTS) '; \
-	$(am__tty_colors); \
-	if test -n "$$list"; then \
-	  for tst in $$list; do \
-	    if test -f ./$$tst; then dir=./; \
-	    elif test -f $$tst; then dir=; \
-	    else dir="$(srcdir)/"; fi; \
-	    if $(TESTS_ENVIRONMENT) $${dir}$$tst $(AM_TESTS_FD_REDIRECT); then \
-	      all=`expr $$all + 1`; \
-	      case " $(XFAIL_TESTS) " in \
-	      *[\ \	]$$tst[\ \	]*) \
-		xpass=`expr $$xpass + 1`; \
-		failed=`expr $$failed + 1`; \
-		col=$$red; res=XPASS; \
-	      ;; \
-	      *) \
-		col=$$grn; res=PASS; \
-	      ;; \
-	      esac; \
-	    elif test $$? -ne 77; then \
-	      all=`expr $$all + 1`; \
-	      case " $(XFAIL_TESTS) " in \
-	      *[\ \	]$$tst[\ \	]*) \
-		xfail=`expr $$xfail + 1`; \
-		col=$$lgn; res=XFAIL; \
-	      ;; \
-	      *) \
-		failed=`expr $$failed + 1`; \
-		col=$$red; res=FAIL; \
-	      ;; \
-	      esac; \
-	    else \
-	      skip=`expr $$skip + 1`; \
-	      col=$$blu; res=SKIP; \
-	    fi; \
-	    echo "$${col}$$res$${std}: $$tst"; \
-	  done; \
-	  if test "$$all" -eq 1; then \
-	    tests="test"; \
-	    All=""; \
-	  else \
-	    tests="tests"; \
-	    All="All "; \
-	  fi; \
-	  if test "$$failed" -eq 0; then \
-	    if test "$$xfail" -eq 0; then \
-	      banner="$$All$$all $$tests passed"; \
-	    else \
-	      if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-	      banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
-	    fi; \
-	  else \
-	    if test "$$xpass" -eq 0; then \
-	      banner="$$failed of $$all $$tests failed"; \
-	    else \
-	      if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-	      banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
-	    fi; \
-	  fi; \
-	  dashes="$$banner"; \
-	  skipped=""; \
-	  if test "$$skip" -ne 0; then \
-	    if test "$$skip" -eq 1; then \
-	      skipped="($$skip test was not run)"; \
-	    else \
-	      skipped="($$skip tests were not run)"; \
-	    fi; \
-	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
-	      dashes="$$skipped"; \
-	  fi; \
-	  report=""; \
-	  if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
-	    report="Please report to $(PACKAGE_BUGREPORT)"; \
-	    test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
-	      dashes="$$report"; \
-	  fi; \
-	  dashes=`echo "$$dashes" | sed s/./=/g`; \
-	  if test "$$failed" -eq 0; then \
-	    col="$$grn"; \
-	  else \
-	    col="$$red"; \
-	  fi; \
-	  echo "$${col}$$dashes$${std}"; \
-	  echo "$${col}$$banner$${std}"; \
-	  test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
-	  test -z "$$report" || echo "$${col}$$report$${std}"; \
-	  echo "$${col}$$dashes$${std}"; \
-	  test "$$failed" -eq 0; \
-	else :; fi
-
 distdir: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
@@ -804,9 +667,8 @@ distdir-am: $(DISTFILES)
 	  fi; \
 	done
 check-am: all-am
-	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
 check: check-recursive
-all-am: Makefile $(PROGRAMS) all-local
+all-am: Makefile $(PROGRAMS)
 installdirs: installdirs-recursive
 installdirs-am:
 install: install-recursive
@@ -836,15 +698,13 @@ clean-generic:
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-recursive
 
-clean-am: clean-generic clean-local clean-noinstPROGRAMS \
-	mostlyclean-am
+clean-am: clean-generic clean-noinstPROGRAMS mostlyclean-am
 
 distclean: distclean-recursive
 		-rm -f ./$(DEPDIR)/asschk.Po
@@ -911,34 +771,25 @@ ps-am:
 
 uninstall-am:
 
-.MAKE: $(am__recursive_targets) check-am install-am install-strip
-
-.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am all-local \
-	am--depfiles check check-TESTS check-am clean clean-generic \
-	clean-local clean-noinstPROGRAMS cscopelist-am ctags ctags-am \
-	distclean distclean-compile distclean-generic distclean-tags \
-	distdir dvi dvi-am html html-am info info-am install \
-	install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
-	ps ps-am tags tags-am uninstall uninstall-am
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+	am--depfiles check check-am clean clean-generic \
+	clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \
+	distclean-compile distclean-generic distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
 
 .PRECIOUS: Makefile
 
 
-all-local: inittests.stamp
-
-clean-local:
-	srcdir=$(srcdir) $(TESTS_ENVIRONMENT) $(srcdir)/inittests --clean
-
-inittests.stamp: inittests
-	srcdir=$(srcdir) $(TESTS_ENVIRONMENT) $(srcdir)/inittests
-	echo timestamp >./inittests.stamp
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/tests/gpgsm/32100C27173EF6E9C4E9A25D3D69F86D37A4F939 b/tests/cms/32100C27173EF6E9C4E9A25D3D69F86D37A4F939
index 7aa9bfd..7aa9bfd 100644
--- a/tests/gpgsm/32100C27173EF6E9C4E9A25D3D69F86D37A4F939
+++ b/tests/cms/32100C27173EF6E9C4E9A25D3D69F86D37A4F939
diff --git a/tests/gpgsm/Makefile.am b/tests/cms/Makefile.am
index e784a31..bc86acb 100644
--- a/tests/gpgsm/Makefile.am
+++ b/tests/cms/Makefile.am
@@ -28,6 +28,12 @@ include $(top_srcdir)/am/cmacros.am
 
 AM_CFLAGS =
 
+# Note that we need to use /bin/pwd so that we don't get into trouble
+# if the shell used for inittests would uses an internal version of
+# pwd which handles symlinks differently.
+OLD_TESTS_ENVIRONMENT = GNUPGHOME=`/bin/pwd` GPG_AGENT_INFO= LC_ALL=C \
+	                GPGSM="$(GPGSM)" "$(srcdir)/runtest"
+
 TESTS_ENVIRONMENT = LC_ALL=C \
 	EXEEXT=$(EXEEXT) \
 	PATH="../gpgscm:$(PATH)" \
@@ -65,11 +71,42 @@ TEST_FILES = plain-1.cms.asc \
 	plain-3.cms.asc \
 	plain-large.cms.asc
 
+# We used to run $(testscripts) here but these asschk scripts are not
+# completely reliable in all environments and thus we better disable
+# them.  The tests are anyway way too minimal.  We will eventually
+# write new tests based on gpg-connect-agent which has a full fledged
+# script language and thus makes it far easier to write tests than to
+# use that low-level asschk stuff.
+testscripts = sm-sign+verify sm-verify
+
 EXTRA_DIST = $(XTESTS) $(KEYS) $(CERTS) $(TEST_FILES) \
-	gpgsm-defs.scm run-tests.scm setup.scm all-tests.scm
+	     samplekeys/steed-self-signing-nonthority.pem \
+	     samplekeys/68A638998DFABAC510EA645CE34F9686B2EDF7EA.key \
+             samplekeys/32100C27173EF6E9C4E9A25D3D69F86D37A4F939.key \
+             samplekeys/cert_g10code_pete1.pem \
+             samplekeys/cert_g10code_test1.pem \
+             samplekeys/cert_g10code_theo1.pem \
+             samplemsgs/README \
+             samplemsgs/pwri-sample.cbc.p7m \
+             samplemsgs/pwri-sample.cbc-2.p7m \
+             samplemsgs/pwri-sample.gcm.p7m \
+	     text-1.txt text-2.txt text-3.txt \
+	     text-1.osig.pem text-1.dsig.pem text-1.osig-bad.pem \
+	     text-2.osig.pem text-2.osig-bad.pem \
+             runtest inittests $(testscripts) \
+	     gpgsm-defs.scm run-tests.scm setup.scm all-tests.scm
+
+CLEANFILES = inittests.stamp *.lock *.log report.xml .\#lk*
 
-CLEANFILES = *.log report.xml
+DISTCLEANFILES = pubring.kbx~ random_seed
 
 # We need to depend on a couple of programs so that the tests don't
 # start before all programs are built.
-all-local: $(required_pgms)
+all-local: $(required_pgms) inittests.stamp
+
+clean-local:
+	srcdir=$(srcdir) $(OLD_TESTS_ENVIRONMENT) $(srcdir)/inittests --clean
+
+inittests.stamp: inittests
+	srcdir=$(srcdir) $(OLD_TESTS_ENVIRONMENT) $(srcdir)/inittests
+	echo timestamp >./inittests.stamp
diff --git a/tests/gpgsm/Makefile.in b/tests/cms/Makefile.in
index c149dbc..26ff0c4 100644
--- a/tests/gpgsm/Makefile.in
+++ b/tests/cms/Makefile.in
@@ -142,7 +142,7 @@ host_triplet = @host@
 @GNUPG_DIRMNGR_PGM_TRUE@am__append_6 = -DGNUPG_DEFAULT_DIRMNGR="\"@GNUPG_DIRMNGR_PGM@\""
 @GNUPG_PROTECT_TOOL_PGM_TRUE@am__append_7 = -DGNUPG_DEFAULT_PROTECT_TOOL="\"@GNUPG_PROTECT_TOOL_PGM@\""
 @GNUPG_DIRMNGR_LDAP_PGM_TRUE@am__append_8 = -DGNUPG_DEFAULT_DIRMNGR_LDAP="\"@GNUPG_DIRMNGR_LDAP_PGM@\""
-subdir = tests/gpgsm
+subdir = tests/cms
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/autobuild.m4 \
 	$(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/gettext.m4 \
@@ -410,6 +410,13 @@ libcommonpth = ../common/libcommonpth.a
 libcommontls = ../common/libcommontls.a
 libcommontlsnpth = ../common/libcommontlsnpth.a
 AM_CFLAGS = 
+
+# Note that we need to use /bin/pwd so that we don't get into trouble
+# if the shell used for inittests would uses an internal version of
+# pwd which handles symlinks differently.
+OLD_TESTS_ENVIRONMENT = GNUPGHOME=`/bin/pwd` GPG_AGENT_INFO= LC_ALL=C \
+	                GPGSM="$(GPGSM)" "$(srcdir)/runtest"
+
 TESTS_ENVIRONMENT = LC_ALL=C \
 	EXEEXT=$(EXEEXT) \
 	PATH="../gpgscm:$(PATH)" \
@@ -435,10 +442,33 @@ TEST_FILES = plain-1.cms.asc \
 	plain-3.cms.asc \
 	plain-large.cms.asc
 
-EXTRA_DIST = $(XTESTS) $(KEYS) $(CERTS) $(TEST_FILES) \
-	gpgsm-defs.scm run-tests.scm setup.scm all-tests.scm
 
-CLEANFILES = *.log report.xml
+# We used to run $(testscripts) here but these asschk scripts are not
+# completely reliable in all environments and thus we better disable
+# them.  The tests are anyway way too minimal.  We will eventually
+# write new tests based on gpg-connect-agent which has a full fledged
+# script language and thus makes it far easier to write tests than to
+# use that low-level asschk stuff.
+testscripts = sm-sign+verify sm-verify
+EXTRA_DIST = $(XTESTS) $(KEYS) $(CERTS) $(TEST_FILES) \
+	     samplekeys/steed-self-signing-nonthority.pem \
+	     samplekeys/68A638998DFABAC510EA645CE34F9686B2EDF7EA.key \
+             samplekeys/32100C27173EF6E9C4E9A25D3D69F86D37A4F939.key \
+             samplekeys/cert_g10code_pete1.pem \
+             samplekeys/cert_g10code_test1.pem \
+             samplekeys/cert_g10code_theo1.pem \
+             samplemsgs/README \
+             samplemsgs/pwri-sample.cbc.p7m \
+             samplemsgs/pwri-sample.cbc-2.p7m \
+             samplemsgs/pwri-sample.gcm.p7m \
+	     text-1.txt text-2.txt text-3.txt \
+	     text-1.osig.pem text-1.dsig.pem text-1.osig-bad.pem \
+	     text-2.osig.pem text-2.osig-bad.pem \
+             runtest inittests $(testscripts) \
+	     gpgsm-defs.scm run-tests.scm setup.scm all-tests.scm
+
+CLEANFILES = inittests.stamp *.lock *.log report.xml .\#lk*
+DISTCLEANFILES = pubring.kbx~ random_seed
 all: all-am
 
 .SUFFIXES:
@@ -452,9 +482,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/gpgsm/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/cms/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu tests/gpgsm/Makefile
+	  $(AUTOMAKE) --gnu tests/cms/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -544,13 +574,14 @@ clean-generic:
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
-clean-am: clean-generic mostlyclean-am
+clean-am: clean-generic clean-local mostlyclean-am
 
 distclean: distclean-am
 	-rm -f Makefile
@@ -617,15 +648,16 @@ uninstall-am:
 .MAKE: install-am install-strip
 
 .PHONY: all all-am all-local check check-am clean clean-generic \
-	cscopelist-am ctags-am distclean distclean-generic distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am tags-am uninstall uninstall-am
+	clean-local cscopelist-am ctags-am distclean distclean-generic \
+	distdir dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-am
 
 .PRECIOUS: Makefile
 
@@ -648,7 +680,14 @@ xcheck:
 
 # We need to depend on a couple of programs so that the tests don't
 # start before all programs are built.
-all-local: $(required_pgms)
+all-local: $(required_pgms) inittests.stamp
+
+clean-local:
+	srcdir=$(srcdir) $(OLD_TESTS_ENVIRONMENT) $(srcdir)/inittests --clean
+
+inittests.stamp: inittests
+	srcdir=$(srcdir) $(OLD_TESTS_ENVIRONMENT) $(srcdir)/inittests
+	echo timestamp >./inittests.stamp
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/tests/gpgsm/all-tests.scm b/tests/cms/all-tests.scm
index 1baa924..78ad006 100644
--- a/tests/gpgsm/all-tests.scm
+++ b/tests/cms/all-tests.scm
@@ -30,14 +30,14 @@
    (make-environment-cache
     (test::scm
      #f
-     (path-join "tests" "gpgsm" "setup.scm")
-     (in-srcdir "tests" "gpgsm" "setup.scm")
+     (path-join "tests" "cms" "setup.scm")
+     (in-srcdir "tests" "cms" "setup.scm")
      "--" "tests" "gpg")))
 
  (map (lambda (name)
 	(test::scm setup
-		   (path-join "tests" "gpgsm" name)
-		   (in-srcdir "tests" "gpgsm" name)))
-      (parse-makefile-expand (in-srcdir "tests" "gpgsm" "Makefile.am")
+		   (path-join "tests" "cms" name)
+		   (in-srcdir "tests" "cms" name)))
+      (parse-makefile-expand (in-srcdir "tests" "cms" "Makefile.am")
 			     (lambda (filename port key) (parse-makefile port key))
 			     "XTESTS")))
diff --git a/tests/gpgsm/cert_dfn_pca01.der b/tests/cms/cert_dfn_pca01.der
index 4c8593c..4c8593c 100644
--- a/tests/gpgsm/cert_dfn_pca01.der
+++ b/tests/cms/cert_dfn_pca01.der
diff --git a/tests/gpgsm/cert_dfn_pca15.der b/tests/cms/cert_dfn_pca15.der
index c28f137..c28f137 100644
--- a/tests/gpgsm/cert_dfn_pca15.der
+++ b/tests/cms/cert_dfn_pca15.der
diff --git a/tests/gpgsm/cert_g10code_test1.der b/tests/cms/cert_g10code_test1.der
index 67c7db6..67c7db6 100644
--- a/tests/gpgsm/cert_g10code_test1.der
+++ b/tests/cms/cert_g10code_test1.der
diff --git a/tests/gpgsm/decrypt.scm b/tests/cms/decrypt.scm
index c328ba8..16bded6 100644
--- a/tests/gpgsm/decrypt.scm
+++ b/tests/cms/decrypt.scm
@@ -17,14 +17,14 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program; if not, see <http://www.gnu.org/licenses/>.
 
-(load (in-srcdir "tests" "gpgsm" "gpgsm-defs.scm"))
+(load (in-srcdir "tests" "cms" "gpgsm-defs.scm"))
 (setup-gpgsm-environment)
 
 (for-each-p
  "Checking decryption of supplied files."
  (lambda (name)
    (tr:do
-    (tr:open (in-srcdir "tests" "gpgsm" (string-append name ".cms.asc")))
+    (tr:open (in-srcdir "tests" "cms" (string-append name ".cms.asc")))
     (tr:gpgsm "" '(--decrypt))
     (tr:assert-identity name)))
  plain-files)
diff --git a/tests/gpgsm/encrypt.scm b/tests/cms/encrypt.scm
index bb90c8e..5e679d9 100644
--- a/tests/gpgsm/encrypt.scm
+++ b/tests/cms/encrypt.scm
@@ -17,7 +17,7 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program; if not, see <http://www.gnu.org/licenses/>.
 
-(load (in-srcdir "tests" "gpgsm" "gpgsm-defs.scm"))
+(load (in-srcdir "tests" "cms" "gpgsm-defs.scm"))
 (setup-gpgsm-environment)
 
 (for-each-p
diff --git a/tests/gpgsm/export.scm b/tests/cms/export.scm
index 4a8108b..1100f24 100644
--- a/tests/gpgsm/export.scm
+++ b/tests/cms/export.scm
@@ -17,7 +17,7 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program; if not, see <http://www.gnu.org/licenses/>.
 
-(load (in-srcdir "tests" "gpgsm" "gpgsm-defs.scm"))
+(load (in-srcdir "tests" "cms" "gpgsm-defs.scm"))
 (setup-gpgsm-environment)
 
 (for-each-p'
diff --git a/tests/gpgsm/gpgsm-defs.scm b/tests/cms/gpgsm-defs.scm
index 848bc75..f643afa 100644
--- a/tests/gpgsm/gpgsm-defs.scm
+++ b/tests/cms/gpgsm-defs.scm
@@ -78,13 +78,14 @@
   (log "Storing private keys")
   (for-each
    (lambda (name)
-     (file-copy (in-srcdir "tests" "gpgsm" name)
+     (file-copy (in-srcdir "tests" "cms" name)
 		(path-join "private-keys-v1.d"
 			   (string-append name ".key"))))
    '("32100C27173EF6E9C4E9A25D3D69F86D37A4F939"))
 
   (log "Importing public demo and test keys")
-  (call-check `(,@gpgsm --import ,(in-srcdir "tests" "gpgsm" "cert_g10code_test1.der")))
+  (call-check `(,@gpgsm --import ,(in-srcdir "tests" "cms"
+                                             "cert_g10code_test1.der")))
 
   (create-sample-files)
   (stop-agent))
diff --git a/tests/gpgsm/import.scm b/tests/cms/import.scm
index be555da..4c85ae4 100644
--- a/tests/gpgsm/import.scm
+++ b/tests/cms/import.scm
@@ -17,7 +17,7 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program; if not, see <http://www.gnu.org/licenses/>.
 
-(load (in-srcdir "tests" "gpgsm" "gpgsm-defs.scm"))
+(load (in-srcdir "tests" "cms" "gpgsm-defs.scm"))
 (setup-gpgsm-environment)
 
 (define certs-for-import
@@ -47,7 +47,7 @@
  "Checking certificate import."
  (lambda (test)
    (assert (not (sm-have-public-key? (:cert test))))
-   (call-check `(,@gpgsm --import ,(in-srcdir "tests" "gpgsm" (:name test))))
+   (call-check `(,@gpgsm --import ,(in-srcdir "tests" "cms" (:name test))))
    (assert (sm-have-public-key? (:cert test))))
  (lambda (test) (:name test))
  certs-for-import)
diff --git a/tests/inittests b/tests/cms/inittests
index 9090674..296bf14 100755
--- a/tests/inittests
+++ b/tests/cms/inittests
@@ -28,10 +28,10 @@ msg msg.sig msg.unsig
 
 
 [ -z "$srcdir" ] && srcdir=.
-[ -z "$GPGSM" ] && GPGSM=../sm/gpgsm
+[ -z "$GPGSM" ] && GPGSM=../../sm/gpgsm
 
 if [ -d $srcdir/samplekeys ] \
-   && grep TESTS_ENVIRONMENT Makefile >/dev/null 2>&1; then
+   && grep OLD_TESTS_ENVIRONMENT Makefile >/dev/null 2>&1; then
  :
 else
    # During make distclean the Makefile has already been removed,
diff --git a/tests/gpgsm/plain-1.cms.asc b/tests/cms/plain-1.cms.asc
index cb1a4db..cb1a4db 100644
--- a/tests/gpgsm/plain-1.cms.asc
+++ b/tests/cms/plain-1.cms.asc
diff --git a/tests/gpgsm/plain-2.cms.asc b/tests/cms/plain-2.cms.asc
index 1ff0a8f..1ff0a8f 100644
--- a/tests/gpgsm/plain-2.cms.asc
+++ b/tests/cms/plain-2.cms.asc
diff --git a/tests/gpgsm/plain-3.cms.asc b/tests/cms/plain-3.cms.asc
index 5c6331c..5c6331c 100644
--- a/tests/gpgsm/plain-3.cms.asc
+++ b/tests/cms/plain-3.cms.asc
diff --git a/tests/gpgsm/plain-large.cms.asc b/tests/cms/plain-large.cms.asc
index f8fc90f..f8fc90f 100644
--- a/tests/gpgsm/plain-large.cms.asc
+++ b/tests/cms/plain-large.cms.asc
diff --git a/tests/gpgsm/run-tests.scm b/tests/cms/run-tests.scm
index 6b460b1..caae86d 100644
--- a/tests/gpgsm/run-tests.scm
+++ b/tests/cms/run-tests.scm
@@ -20,7 +20,7 @@
 (if (string=? "" (getenv "abs_top_srcdir"))
     (begin
       (echo "Environment variable 'abs_top_srcdir' not set.  Please point it to"
-	    "tests/gpgsm.")
+	    "tests/cms.")
       (exit 2)))
 
 (define tests (filter (lambda (arg) (not (string-prefix? arg "--"))) *args*))
@@ -28,12 +28,12 @@
 (define setup
   (make-environment-cache (test::scm
 			   #f
-			   (path-join "tests" "gpgsm" "setup.scm")
-			   (in-srcdir "tests" "gpgsm" "setup.scm"))))
+			   (path-join "tests" "cms" "setup.scm")
+			   (in-srcdir "tests" "cms" "setup.scm"))))
 
 (run-tests (if (null? tests)
-	       (load-tests "tests" "gpgsm")
+	       (load-tests "tests" "cms")
 	       (map (lambda (name)
 		      (test::scm setup
-				 (path-join "tests" "gpgsm" name)
-				 (in-srcdir "tests" "gpgsm" name))) tests)))
+				 (path-join "tests" "cms" name)
+				 (in-srcdir "tests" "cms" name))) tests)))
diff --git a/tests/runtest b/tests/cms/runtest
index 5c832bd..5c832bd 100755
--- a/tests/runtest
+++ b/tests/cms/runtest
diff --git a/tests/samplekeys/32100C27173EF6E9C4E9A25D3D69F86D37A4F939.key b/tests/cms/samplekeys/32100C27173EF6E9C4E9A25D3D69F86D37A4F939.key
index cf0535f..cf0535f 100644
--- a/tests/samplekeys/32100C27173EF6E9C4E9A25D3D69F86D37A4F939.key
+++ b/tests/cms/samplekeys/32100C27173EF6E9C4E9A25D3D69F86D37A4F939.key
diff --git a/tests/samplekeys/68A638998DFABAC510EA645CE34F9686B2EDF7EA.key b/tests/cms/samplekeys/68A638998DFABAC510EA645CE34F9686B2EDF7EA.key
index 8236349..8236349 100644
--- a/tests/samplekeys/68A638998DFABAC510EA645CE34F9686B2EDF7EA.key
+++ b/tests/cms/samplekeys/68A638998DFABAC510EA645CE34F9686B2EDF7EA.key
diff --git a/tests/samplekeys/cert_g10code_pete1.pem b/tests/cms/samplekeys/cert_g10code_pete1.pem
index c6f778a..c6f778a 100644
--- a/tests/samplekeys/cert_g10code_pete1.pem
+++ b/tests/cms/samplekeys/cert_g10code_pete1.pem
diff --git a/tests/samplekeys/cert_g10code_test1.pem b/tests/cms/samplekeys/cert_g10code_test1.pem
index 61d1f98..61d1f98 100644
--- a/tests/samplekeys/cert_g10code_test1.pem
+++ b/tests/cms/samplekeys/cert_g10code_test1.pem
diff --git a/tests/samplekeys/cert_g10code_theo1.pem b/tests/cms/samplekeys/cert_g10code_theo1.pem
index a7685c4..a7685c4 100644
--- a/tests/samplekeys/cert_g10code_theo1.pem
+++ b/tests/cms/samplekeys/cert_g10code_theo1.pem
diff --git a/tests/samplekeys/steed-self-signing-nonthority.pem b/tests/cms/samplekeys/steed-self-signing-nonthority.pem
index c6a9c54..c6a9c54 100644
--- a/tests/samplekeys/steed-self-signing-nonthority.pem
+++ b/tests/cms/samplekeys/steed-self-signing-nonthority.pem
diff --git a/tests/cms/samplemsgs/README b/tests/cms/samplemsgs/README
new file mode 100644
index 0000000..db1d8b1
--- /dev/null
+++ b/tests/cms/samplemsgs/README
@@ -0,0 +1,6 @@
+Sample messages for CMS symmetric encryption.
+Password is "abc".
+
+pwri-sample.cbc.p7m      - Using CBC Mode
+pwri-sample.cbc-2.p7m    - Using CBC with a different iteration count
+pwri-sample.gcm.p7m      - Using GCM
diff --git a/tests/cms/samplemsgs/pwri-sample.cbc-2.p7m b/tests/cms/samplemsgs/pwri-sample.cbc-2.p7m
new file mode 100644
index 0000000..a417b7a
--- /dev/null
+++ b/tests/cms/samplemsgs/pwri-sample.cbc-2.p7m
diff --git a/tests/cms/samplemsgs/pwri-sample.cbc.p7m b/tests/cms/samplemsgs/pwri-sample.cbc.p7m
new file mode 100644
index 0000000..ba208d2
--- /dev/null
+++ b/tests/cms/samplemsgs/pwri-sample.cbc.p7m
diff --git a/tests/cms/samplemsgs/pwri-sample.gcm.p7m b/tests/cms/samplemsgs/pwri-sample.gcm.p7m
new file mode 100644
index 0000000..3a59470
--- /dev/null
+++ b/tests/cms/samplemsgs/pwri-sample.gcm.p7m
diff --git a/tests/gpgsm/setup.scm b/tests/cms/setup.scm
index c241b38..577b26f 100644
--- a/tests/gpgsm/setup.scm
+++ b/tests/cms/setup.scm
@@ -17,7 +17,7 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program; if not, see <http://www.gnu.org/licenses/>.
 
-(load (in-srcdir "tests" "gpgsm" "gpgsm-defs.scm"))
+(load (in-srcdir "tests" "cms" "gpgsm-defs.scm"))
 
 (define tarball (flag "--create-tarball" *args*))
 (unless (and tarball (not (null? tarball)))
diff --git a/tests/gpgsm/sign.scm b/tests/cms/sign.scm
index 48b7b06..0c11852 100644
--- a/tests/gpgsm/sign.scm
+++ b/tests/cms/sign.scm
@@ -17,7 +17,7 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program; if not, see <http://www.gnu.org/licenses/>.
 
-(load (in-srcdir "tests" "gpgsm" "gpgsm-defs.scm"))
+(load (in-srcdir "tests" "cms" "gpgsm-defs.scm"))
 (setup-gpgsm-environment)
 
 (for-each-p
diff --git a/tests/sm-sign+verify b/tests/cms/sm-sign+verify
index 1c3ae7d..1c3ae7d 100644
--- a/tests/sm-sign+verify
+++ b/tests/cms/sm-sign+verify
diff --git a/tests/sm-verify b/tests/cms/sm-verify
index fa09323..fa09323 100644
--- a/tests/sm-verify
+++ b/tests/cms/sm-verify
diff --git a/tests/text-1.dsig.pem b/tests/cms/text-1.dsig.pem
index a031ec2..a031ec2 100644
--- a/tests/text-1.dsig.pem
+++ b/tests/cms/text-1.dsig.pem
diff --git a/tests/text-1.osig-bad.pem b/tests/cms/text-1.osig-bad.pem
index 0b5f4a4..0b5f4a4 100644
--- a/tests/text-1.osig-bad.pem
+++ b/tests/cms/text-1.osig-bad.pem
diff --git a/tests/text-1.osig.pem b/tests/cms/text-1.osig.pem
index 7317350..7317350 100644
--- a/tests/text-1.osig.pem
+++ b/tests/cms/text-1.osig.pem
diff --git a/tests/text-1.txt b/tests/cms/text-1.txt
index b14c1a2..b14c1a2 100644
--- a/tests/text-1.txt
+++ b/tests/cms/text-1.txt
diff --git a/tests/text-2.osig-bad.pem b/tests/cms/text-2.osig-bad.pem
index 5558448..5558448 100644
--- a/tests/text-2.osig-bad.pem
+++ b/tests/cms/text-2.osig-bad.pem
diff --git a/tests/text-2.osig.pem b/tests/cms/text-2.osig.pem
index 57b5da9..57b5da9 100644
--- a/tests/text-2.osig.pem
+++ b/tests/cms/text-2.osig.pem
diff --git a/tests/text-2.txt b/tests/cms/text-2.txt
index 314c7a4..314c7a4 100644
--- a/tests/text-2.txt
+++ b/tests/cms/text-2.txt
diff --git a/tests/text-3.txt b/tests/cms/text-3.txt
index 9345b55..9345b55 100644
--- a/tests/text-3.txt
+++ b/tests/cms/text-3.txt
diff --git a/tests/gpgsm/verify.scm b/tests/cms/verify.scm
index 40dbd48..531a8f1 100644
--- a/tests/gpgsm/verify.scm
+++ b/tests/cms/verify.scm
@@ -17,7 +17,7 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program; if not, see <http://www.gnu.org/licenses/>.
 
-(load (in-srcdir "tests" "gpgsm" "gpgsm-defs.scm"))
+(load (in-srcdir "tests" "cms" "gpgsm-defs.scm"))
 (setup-gpgsm-environment)
 
 ;;
diff --git a/tests/openpgp/defs.scm b/tests/openpgp/defs.scm
index 768d479..86d312f 100644
--- a/tests/openpgp/defs.scm
+++ b/tests/openpgp/defs.scm
@@ -338,6 +338,7 @@
   (create-file "common.conf"
 	       (if (flag "--use-keyboxd" *args*)
 		   "use-keyboxd" "#use-keyboxd")
+	       (string-append "keyboxd-program " (tool 'keyboxd))
 	       )
 
   (create-file "gpg.conf"
diff --git a/tests/run-tests.scm b/tests/run-tests.scm
index d3ebba0..bb9ade5 100644
--- a/tests/run-tests.scm
+++ b/tests/run-tests.scm
@@ -34,8 +34,8 @@
 		  (load-tests-with-log "g13")
 		  (load-tests-with-log "agent")
 		  (load-tests-with-log "tests" "openpgp")
+		  (load-tests-with-log "tests" "cms")
 		  (load-tests-with-log "tests" "migrations")
-		  (load-tests-with-log "tests" "gpgsm")
 		  (load-tests-with-log "tests" "gpgme"))))
   (run-tests (if prefix
 		 (filter
diff --git a/tools/card-call-scd.c b/tools/card-call-scd.c
index 086503b..27d8ad9 100644
--- a/tools/card-call-scd.c
+++ b/tools/card-call-scd.c
@@ -1511,9 +1511,10 @@ scd_readcert (const char *certidstr, void **r_buf, size_t *r_buflen)
 
 
 /* Send a READKEY command to the SCdaemon.  On success a new
- * s-expression is stored at R_RESULT.  */
+ * s-expression is stored at R_RESULT.  If CREATE_SHADOW is set stub
+ * keys will be created if they do not exist. */
 gpg_error_t
-scd_readkey (const char *keyrefstr, gcry_sexp_t *r_result)
+scd_readkey (const char *keyrefstr, int create_shadow, gcry_sexp_t *r_result)
 {
   gpg_error_t err;
   char line[ASSUAN_LINELENGTH];
@@ -1527,7 +1528,10 @@ scd_readkey (const char *keyrefstr, gcry_sexp_t *r_result)
     return err;
 
   init_membuf (&data, 1024);
-  snprintf (line, DIM(line), "SCD READKEY %s", keyrefstr);
+  if (create_shadow)
+    snprintf (line, DIM(line), "READKEY --card -- %s", keyrefstr);
+  else
+    snprintf (line, DIM(line), "SCD READKEY %s", keyrefstr);
   err = assuan_transact (agent_ctx, line,
                          put_membuf_cb, &data,
                          NULL, NULL,
diff --git a/tools/ccidmon.c b/tools/ccidmon.c
index 4e99da5..595a8b2 100644
--- a/tools/ccidmon.c
+++ b/tools/ccidmon.c
@@ -1,5 +1,7 @@
 /* ccidmon.c - CCID monitor for use with the Linux usbmon facility.
- *	Copyright (C) 2009 Free Software Foundation, Inc.
+ * Copyright (C) 2009, 2016, 2019 Werner Koch
+ * Copyright (C) 2021 g10 Code GmbH
+ * Copyright (C) 2009 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -15,6 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 
@@ -188,6 +191,85 @@ print_pr_data (const unsigned char *data, size_t datalen, size_t off)
 
 
 static void
+print_as_ascii (const unsigned char *buf, unsigned int buflen,unsigned int fill)
+{
+  unsigned int n;
+
+  if (!buflen)
+    return;
+  if (buflen > 16)
+    buflen = 16;
+
+  for (n = buflen; n < fill; n++)
+    fputs ("   ", stdout);
+  fputs ("  |", stdout);
+  for (n = 0; n < buflen; n++, buf++)
+    if (*buf >= 32 && *buf < 127 && *buf != '|')
+      putchar (*buf);
+    else
+      putchar ('.');
+  putchar ('|');
+}
+
+
+static void
+print_t1_block (const unsigned char *msg, size_t msglen, int to_rdr)
+{
+  unsigned int count, len;
+  unsigned char buf[16];
+
+  if (msglen < 4)
+    {
+      printf ("  T=1 ..: invalid block\n");
+      return;
+    }
+  printf ("  T=1 ..: NAD=%02x", msg[0]);
+  if (!(msg[1] & 0x80))
+    {
+      printf (" I-block seq=%d%s\n",
+              !!(msg[1] & 0x40), (msg[1] & 0x20)? " chaining":"");
+      len = msg[2];
+      msg += 3;
+      msglen -= 3;
+
+      printf ("  APDU-%c:", to_rdr? 's':'r');
+      count = 0;
+      while (msglen > 1 && len)
+        {
+          if (count == 16)
+            {
+              print_as_ascii (buf, count, count);
+              printf ("\n         ");
+              count = 0;
+            }
+          buf[count] = msg[0];
+          printf (" %02X", msg[0]);
+          msg++;
+          msglen--;
+          len--;
+          count++;
+        }
+      print_as_ascii (buf, count, 16);
+      putchar ('\n');
+    }
+  else if (!(msg[1] & 0x40))
+    printf (" R-block seq=%d%s\n",
+            !!(msg[1] & 0x10),
+            (msg[1] & 0x0f) == 0 ? "":
+            (msg[1] & 0x0f) == 1 ? "EDC error":
+            (msg[1] & 0x0f) == 2 ? "other error": "?");
+  else
+    printf (" S-block %s %s\n",
+            (msg[1] & 0x1f) == 0 ? "resync":
+            (msg[1] & 0x1f) == 1 ? "info_field_size":
+            (msg[1] & 0x1f) == 2 ? "abort":
+            (msg[1] & 0x1f) == 2 ? "BWT_extension":
+            (msg[1] & 0x1f) == 2 ? "VPP_error": "?",
+            (msg[1] & 0x20)? "response":"request");
+}
+
+
+static void
 print_p2r_header (const char *name, const unsigned char *msg, size_t msglen)
 {
   printf ("%s:\n", name);
@@ -246,6 +328,11 @@ print_p2r_xfrblock (const unsigned char *msg, size_t msglen)
           val == 3? " (continues+continued)":
           val == 16? " (DataBlock-expected)":"");
   print_pr_data (msg, msglen, 10);
+  if (msglen < 10)
+    return;
+  msg += 10;
+  msglen -= 10;
+  print_t1_block (msg, msglen, 1);
 }
 
 
@@ -454,6 +541,11 @@ print_r2p_datablock (const unsigned char *msg, size_t msglen)
             msg[9] == 3? " (continues+continued)":
             msg[9] == 16? " (XferBlock-expected)":"");
   print_pr_data (msg, msglen, 10);
+  if (msglen < 10)
+    return;
+  msg += 10;
+  msglen -= 10;
+  print_t1_block (msg, msglen, 0);
 }
 
 
diff --git a/tools/gpg-card.c b/tools/gpg-card.c
index 07e9232..9c83f55 100644
--- a/tools/gpg-card.c
+++ b/tools/gpg-card.c
@@ -1,5 +1,5 @@
 /* gpg-card.c - An interactive tool to work with cards.
- * Copyright (C) 2019, 2020 g10 Code GmbH
+ * Copyright (C) 2019, 2020, 2021 g10 Code GmbH
  *
  * This file is part of GnuPG.
  *
@@ -177,7 +177,7 @@ my_strusage( int level )
     case 41:
       p = ("Syntax: gpg-card"
            " [options] [command [args] {-- command [args]}]\n\n"
-           "Tool to manage cards and tokens.  With a command an interactive\n"
+           "Tool to manage cards and tokens.  Without a command an interactive\n"
            "mode is used.  Use command \"help\" to list all commands.");
       break;
 
@@ -657,7 +657,8 @@ mem_is_zero (const char *mem, unsigned int memlen)
  * reference if no info is available; it may be NULL.  */
 static void
 list_one_kinfo (card_info_t info, key_info_t kinfo,
-                const char *label_keyref, estream_t fp, int no_key_lookup)
+                const char *label_keyref, estream_t fp, int no_key_lookup,
+                int create_shadow)
 {
   gpg_error_t err;
   key_info_t firstkinfo = info->kinfo;
@@ -705,7 +706,7 @@ list_one_kinfo (card_info_t info, key_info_t kinfo,
       if (kinfo->label)
         tty_fprintf (fp, "      label ......: %s\n", kinfo->label);
 
-      if (!(err = scd_readkey (kinfo->keyref, &s_pkey)))
+      if (!(err = scd_readkey (kinfo->keyref, create_shadow, &s_pkey)))
         {
           char *tmp = pubkey_algo_string (s_pkey, NULL);
           tty_fprintf (fp, "      algorithm ..: %s\n", nullnone (tmp));
@@ -813,7 +814,7 @@ list_one_kinfo (card_info_t info, key_info_t kinfo,
 /* List all keyinfo in INFO using the list of LABELS.  */
 static void
 list_all_kinfo (card_info_t info, keyinfolabel_t labels, estream_t fp,
-                int no_key_lookup)
+                int no_key_lookup, int create_shadow)
 {
   key_info_t kinfo;
   int idx, i, j;
@@ -829,7 +830,7 @@ list_all_kinfo (card_info_t info, keyinfolabel_t labels, estream_t fp,
           tty_fprintf (fp, "%s", labels[idx].label);
           kinfo = find_kinfo (info, labels[idx].keyref);
           list_one_kinfo (info, kinfo, labels[idx].keyref,
-                          fp, no_key_lookup);
+                          fp, no_key_lookup, create_shadow);
           if (kinfo)
             kinfo->xflag = 1;
         }
@@ -842,7 +843,7 @@ list_all_kinfo (card_info_t info, keyinfolabel_t labels, estream_t fp,
       for (i=4+strlen (kinfo->keyref), j=0; i < 18; i++, j=1)
         tty_fprintf (fp, j? ".":" ");
       tty_fprintf (fp, ":");
-      list_one_kinfo (info, kinfo, NULL, fp, no_key_lookup);
+      list_one_kinfo (info, kinfo, NULL, fp, no_key_lookup, create_shadow);
     }
 }
 
@@ -880,7 +881,8 @@ list_retry_counter (card_info_t info, estream_t fp)
 
 /* List OpenPGP card specific data.  */
 static void
-list_openpgp (card_info_t info, estream_t fp, int no_key_lookup)
+list_openpgp (card_info_t info, estream_t fp,
+              int no_key_lookup, int create_shadow)
 {
   static struct keyinfolabel_s keyinfolabels[] = {
     { "Signature key ....:", "OPENPGP.1" },
@@ -958,14 +960,14 @@ list_openpgp (card_info_t info, estream_t fp, int no_key_lookup)
                    info->uif[2] ? (info->uif[0]==2? "permanent": "on") : "off");
     }
 
-  list_all_kinfo (info, keyinfolabels, fp, no_key_lookup);
+  list_all_kinfo (info, keyinfolabels, fp, no_key_lookup, create_shadow);
 
 }
 
 
 /* List PIV card specific data.  */
 static void
-list_piv (card_info_t info, estream_t fp, int no_key_lookup)
+list_piv (card_info_t info, estream_t fp, int no_key_lookup, int create_shadow)
 {
   static struct keyinfolabel_s keyinfolabels[] = {
     { "PIV authentication:", "PIV.9A" },
@@ -998,33 +1000,33 @@ list_piv (card_info_t info, estream_t fp, int no_key_lookup)
     }
 
   list_retry_counter (info, fp);
-  list_all_kinfo (info, keyinfolabels, fp, no_key_lookup);
+  list_all_kinfo (info, keyinfolabels, fp, no_key_lookup, create_shadow);
 }
 
 
 /* List Netkey card specific data.  */
 static void
-list_nks (card_info_t info, estream_t fp, int no_key_lookup)
+list_nks (card_info_t info, estream_t fp, int no_key_lookup, int create_shadow)
 {
   static struct keyinfolabel_s keyinfolabels[] = {
     { NULL, NULL }
   };
 
   list_retry_counter (info, fp);
-  list_all_kinfo (info, keyinfolabels, fp, no_key_lookup);
+  list_all_kinfo (info, keyinfolabels, fp, no_key_lookup, create_shadow);
 }
 
 
 /* List PKCS#15 card specific data.  */
 static void
-list_p15 (card_info_t info, estream_t fp, int no_key_lookup)
+list_p15 (card_info_t info, estream_t fp, int no_key_lookup, int create_shadow)
 {
   static struct keyinfolabel_s keyinfolabels[] = {
     { NULL, NULL }
   };
 
   list_retry_counter (info, fp);
-  list_all_kinfo (info, keyinfolabels, fp, no_key_lookup);
+  list_all_kinfo (info, keyinfolabels, fp, no_key_lookup, create_shadow);
 }
 
 
@@ -1052,7 +1054,7 @@ print_a_version (estream_t fp, const char *prefix, unsigned int value)
  * NO_KEY_LOOKUP the sometimes expensive listing of all matching
  * OpenPGP and X.509 keys is not done */
 static void
-list_card (card_info_t info, int no_key_lookup)
+list_card (card_info_t info, int no_key_lookup, int create_shadow)
 {
   estream_t fp = opt.interactive? NULL : es_stdout;
 
@@ -1084,10 +1086,18 @@ list_card (card_info_t info, int no_key_lookup)
 
   switch (info->apptype)
     {
-    case APP_TYPE_OPENPGP: list_openpgp (info, fp, no_key_lookup); break;
-    case APP_TYPE_PIV:     list_piv (info, fp, no_key_lookup); break;
-    case APP_TYPE_NKS:     list_nks (info, fp, no_key_lookup); break;
-    case APP_TYPE_P15:     list_p15 (info, fp, no_key_lookup); break;
+    case APP_TYPE_OPENPGP:
+      list_openpgp (info, fp, no_key_lookup, create_shadow);
+      break;
+    case APP_TYPE_PIV:
+      list_piv (info, fp, no_key_lookup, create_shadow);
+      break;
+    case APP_TYPE_NKS:
+      list_nks (info, fp, no_key_lookup, create_shadow);
+      break;
+    case APP_TYPE_P15:
+      list_p15 (info, fp, no_key_lookup, create_shadow);
+      break;
     default: break;
     }
 }
@@ -1131,6 +1141,7 @@ cmd_list (card_info_t info, char *argstr)
 {
   gpg_error_t err;
   int opt_cards, opt_apps, opt_info, opt_reread, opt_no_key_lookup;
+  int opt_shadow;
   strlist_t cards = NULL;
   strlist_t sl;
   estream_t fp = opt.interactive? NULL : es_stdout;
@@ -1141,27 +1152,32 @@ cmd_list (card_info_t info, char *argstr)
 
   if (!info)
     return print_help
-      ("LIST [--cards] [--apps] [--info] [--reread]"
+      ("LIST [--cards] [--apps] [--info] [--reread] [--shadow]"
        " [--no-key-lookup] [N] [APP]\n\n"
        "Show the content of the current card.\n"
        "With N given select and list the N-th card;\n"
        "with APP also given select that application.\n"
        "To select an APP on the current card use '-' for N.\n"
        "The S/N of the card may be used instead of N.\n"
-       "  --cards   lists available cards\n"
-       "  --apps    lists additional card applications\n"
-       "  --info    selects a card and prints its s/n\n"
+       "  --cards   list available cards\n"
+       "  --apps    list additional card applications\n"
+       "  --info    select a card and prints its s/n\n"
        "  --reread  read infos from PCKS#15 cards again\n"
-       "  --no-key-lookup does not list matching OpenPGP or X.509 keys\n"
+       "  --shadow  create shadow keys for all card keys\n"
+       "  --no-key-lookup do not list matching OpenPGP or X.509 keys\n"
        , 0);
 
   opt_cards = has_leading_option (argstr, "--cards");
   opt_apps = has_leading_option (argstr, "--apps");
   opt_info = has_leading_option (argstr, "--info");
   opt_reread = has_leading_option (argstr, "--reread");
+  opt_shadow = has_leading_option (argstr, "--shadow");
   opt_no_key_lookup = has_leading_option (argstr, "--no-key-lookup");
   argstr = skip_options (argstr);
 
+  if (opt_shadow)
+    opt_no_key_lookup = 1;
+
   if (opt.no_key_lookup)
     opt_no_key_lookup = 1;
 
@@ -1332,7 +1348,7 @@ cmd_list (card_info_t info, char *argstr)
               goto leave;
             }
 
-          list_card (info, opt_no_key_lookup);
+          list_card (info, opt_no_key_lookup, opt_shadow);
         }
     }
 
@@ -1769,6 +1785,7 @@ cmd_salut (card_info_t info, const char *argstr)
         {
           tty_printf (_("Error: invalid response.\n"));
           xfree (data);
+          data = NULL;
           goto again;
         }
     }
diff --git a/tools/gpg-card.h b/tools/gpg-card.h
index 0407da1..86b63cd 100644
--- a/tools/gpg-card.h
+++ b/tools/gpg-card.h
@@ -240,7 +240,8 @@ gpg_error_t scd_serialno (char **r_serialno, const char *demand);
 
 gpg_error_t scd_readcert (const char *certidstr,
                           void **r_buf, size_t *r_buflen);
-gpg_error_t scd_readkey (const char *keyrefstr, gcry_sexp_t *r_result);
+gpg_error_t scd_readkey (const char *keyrefstr, int create_shadow,
+                         gcry_sexp_t *r_result);
 gpg_error_t scd_cardlist (strlist_t *result);
 gpg_error_t scd_applist (strlist_t *result, int all);
 gpg_error_t scd_change_pin (const char *pinref, int reset_mode, int nullpin);
diff --git a/tools/gpg-check-pattern.c b/tools/gpg-check-pattern.c
index d798dbe..d7481ff 100644
--- a/tools/gpg-check-pattern.c
+++ b/tools/gpg-check-pattern.c
@@ -1,4 +1,5 @@
 /* gpg-check-pattern.c - A tool to check passphrases against pattern.
+ * Copyright (C) 2021 g10 Code GmbH
  * Copyright (C) 2007 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
@@ -26,7 +27,6 @@
 #include <stdarg.h>
 #include <string.h>
 #include <errno.h>
-#include <assert.h>
 #ifdef HAVE_LOCALE_H
 # include <locale.h>
 #endif
@@ -50,11 +50,7 @@
 enum cmd_and_opt_values
 { aNull = 0,
   oVerbose	  = 'v',
-  oArmor          = 'a',
-  oPassphrase     = 'P',
 
-  oProtect        = 'p',
-  oUnprotect      = 'u',
   oNull           = '0',
 
   oNoVerbose = 500,
@@ -101,6 +97,10 @@ struct pattern_s
 {
   int type;
   unsigned int lineno;     /* Line number of the pattern file.  */
+  unsigned int newblock;   /* First pattern in a new block.     */
+  unsigned int icase:1;    /* Case insensitive match.  */
+  unsigned int accept:1;   /* In accept mode. */
+  unsigned int reverse:1;  /* Reverse the outcome of a regexp match.  */
   union {
     struct {
       const char *string;  /* Pointer to the actual string (nul termnated).  */
@@ -200,7 +200,7 @@ main (int argc, char **argv )
     gpgrt_usage (1);
 
   /* We read the entire pattern file into our memory and parse it
-     using a separate function.  This allows us to eventual do the
+     using a separate function.  This allows us to eventually do the
      reading while running setuid so that the pattern file can be
      hidden from regular users.  I am not sure whether this makes
      sense, but lets be prepared for it.  */
@@ -219,7 +219,7 @@ main (int argc, char **argv )
 #endif
   process (stdin, patternarray);
 
-  return log_get_errorcount(0)? 1 : 0;
+  return 4; /*NOTREACHED*/
 }
 
 
@@ -310,6 +310,7 @@ get_regerror (int errcode, regex_t *compiled)
   return buffer;
 }
 
+
 /* Parse the pattern given in the memory aread DATA/DATALEN and return
    a new pattern array.  The end of the array is indicated by a NULL
    entry.  On error an error message is printed and the function
@@ -324,6 +325,9 @@ parse_pattern_file (char *data, size_t datalen)
   pattern_t *array;
   size_t arraysize, arrayidx;
   unsigned int lineno = 0;
+  unsigned int icase_mode = 1;
+  unsigned int accept_mode = 0;
+  unsigned int newblock = 1;  /* The first implict block.  */
 
   /* Estimate the number of entries by counting the non-comment lines.  */
   arraysize = 0;
@@ -349,7 +353,7 @@ parse_pattern_file (char *data, size_t datalen)
         }
       else
         p2 = p + datalen;
-      assert (!*p2);
+      log_assert (!*p2);
       p2--;
       while (isascii (*p) && isspace (*p))
         p++;
@@ -359,23 +363,57 @@ parse_pattern_file (char *data, size_t datalen)
         *p2-- = 0;
       if (!*p)
         continue;
-      assert (arrayidx < arraysize);
+      if (!strcmp (p, "[case]"))
+        {
+          icase_mode = 0;
+          continue;
+        }
+      if (!strcmp (p, "[icase]"))
+        {
+          icase_mode = 1;
+          continue;
+        }
+      if (!strcmp (p, "[accept]"))
+        {
+          accept_mode = 1;
+          newblock = 1;
+          continue;
+        }
+      if (!strcmp (p, "[reject]"))
+        {
+          accept_mode = 0;
+          newblock = 1;
+          continue;
+        }
+
+      log_assert (arrayidx < arraysize);
       array[arrayidx].lineno = lineno;
-      if (*p == '/')
+      array[arrayidx].icase = icase_mode;
+      array[arrayidx].accept = accept_mode;
+      array[arrayidx].reverse = 0;
+      array[arrayidx].newblock = newblock;
+      newblock = 0;
+
+      if (*p == '/' || (*p == '!' && p[1] == '/'))
         {
           int rerr;
+          int reverse;
 
+          reverse = (*p == '!');
           p++;
+          if (reverse)
+            p++;
           array[arrayidx].type = PAT_REGEX;
           if (*p && p[strlen(p)-1] == '/')
             p[strlen(p)-1] = 0;  /* Remove optional delimiter.  */
           array[arrayidx].u.r.regex = xcalloc (1, sizeof (regex_t));
+          array[arrayidx].reverse = reverse;
           rerr = regcomp (array[arrayidx].u.r.regex, p,
-                          REG_ICASE|REG_EXTENDED);
+                          (array[arrayidx].icase? REG_ICASE:0)|REG_EXTENDED);
           if (rerr)
             {
               char *rerrbuf = get_regerror (rerr, array[arrayidx].u.r.regex);
-              log_error ("invalid r.e. at line %u: %s\n", lineno, rerrbuf);
+              log_error ("invalid regexp at line %u: %s\n", lineno, rerrbuf);
               xfree (rerrbuf);
               if (!opt.checkonly)
                 exit (1);
@@ -383,25 +421,44 @@ parse_pattern_file (char *data, size_t datalen)
         }
       else
         {
+          if (*p == '[')
+            {
+              static int shown;
+
+              if (!shown)
+                {
+                  log_info ("future warning: do no start a string with '['"
+                            " but use a regexp (line %u)\n", lineno);
+                  shown = 1;
+                }
+            }
           array[arrayidx].type = PAT_STRING;
           array[arrayidx].u.s.string = p;
           array[arrayidx].u.s.length = strlen (p);
         }
+
       arrayidx++;
     }
-  assert (arrayidx < arraysize);
+  log_assert (arrayidx < arraysize);
   array[arrayidx].type = PAT_NULL;
 
+  if (lineno && newblock)
+    log_info ("warning: pattern list ends with a singleton"
+              " accept or reject tag\n");
+
   return array;
 }
 
 
-/* Check whether string macthes any of the pattern in PATARRAY and
+/* Check whether string matches any of the pattern in PATARRAY and
    returns the matching pattern item or NULL.  */
 static pattern_t *
 match_p (const char *string, pattern_t *patarray)
 {
   pattern_t *pat;
+  int match;
+  int accept_match;  /* Tracks matchinf state in an accept block.  */
+  int accept_skip;   /* Skip remaining patterns in an accept block.  */
 
   if (!*string)
     {
@@ -410,30 +467,84 @@ match_p (const char *string, pattern_t *patarray)
       return NULL;
     }
 
+  accept_match = 0;
+  accept_skip = 0;
   for (pat = patarray; pat->type != PAT_NULL; pat++)
     {
+      match = 0;
+      if (pat->newblock)
+        accept_match = accept_skip = 0;
+
       if (pat->type == PAT_STRING)
         {
-          if (!strcasecmp (pat->u.s.string, string))
-            return pat;
+          if (pat->icase)
+            {
+              if (!strcasecmp (pat->u.s.string, string))
+                match = 1;
+            }
+          else
+            {
+              if (!strcmp (pat->u.s.string, string))
+                match = 1;
+            }
         }
       else if (pat->type == PAT_REGEX)
         {
           int rerr;
 
           rerr = regexec (pat->u.r.regex, string, 0, NULL, 0);
+          if (pat->reverse)
+            {
+              if (!rerr)
+                rerr = REG_NOMATCH;
+              else if (rerr == REG_NOMATCH)
+                rerr = 0;
+            }
+
           if (!rerr)
-            return pat;
+            match = 1;
           else if (rerr != REG_NOMATCH)
             {
               char *rerrbuf = get_regerror (rerr, pat->u.r.regex);
-              log_error ("matching r.e. failed: %s\n", rerrbuf);
+              log_error ("matching regexp failed: %s\n", rerrbuf);
               xfree (rerrbuf);
-              return pat;  /* Better indicate a match on error.  */
+              if (pat->accept)
+                match = 0;  /* Better indicate no match on error.  */
+              else
+                match = 1;  /* Better indicate a match on error.  */
             }
         }
       else
         BUG ();
+
+      if (pat->accept)
+        {
+          /* Accept mode: all patterns in the accept block must match.
+           * Thus we need to check whether the next pattern has a
+           * transition and act only then. */
+          if (match && !accept_skip)
+            accept_match = 1;
+          else
+            {
+              accept_match = 0;
+              accept_skip = 1;
+            }
+
+          if (pat[1].type == PAT_NULL || pat[1].newblock)
+            {
+              /* Transition detected.  Note that this also handles the
+               * end of pattern loop case.  */
+              if (accept_match)
+                return pat;
+              /* The next is not really but we do it for clarity.  */
+              accept_match = accept_skip = 0;
+            }
+        }
+      else  /* Reject mode: Return true on the first match.  */
+        {
+          if (match)
+            return pat;
+        }
     }
   return NULL;
 }
@@ -449,6 +560,7 @@ process (FILE *fp, pattern_t *patarray)
   int c;
   unsigned long lineno = 0;
   pattern_t *pat;
+  int last_is_accept;
 
   idx = 0;
   c = 0;
@@ -468,17 +580,28 @@ process (FILE *fp, pattern_t *patarray)
           pat = match_p (buffer, patarray);
           if (pat)
             {
+              /* Note that the accept mode works correctly only with
+               * one input line.  */
               if (opt.verbose)
-                log_error ("input line %lu matches pattern at line %u"
-                           " - rejected\n",
-                           lineno, pat->lineno);
-              exit (1);
+                log_info ("input line %lu matches pattern at line %u"
+                          " - %s\n",
+                          lineno, pat->lineno,
+                          pat->accept? "accepted":"rejected");
             }
           idx = 0;
+          wipememory (buffer, sizeof buffer);
+          if (pat)
+            {
+              if (pat->accept)
+                exit (0);
+              else
+                exit (1);
+            }
         }
       else
         idx++;
     }
+  wipememory (buffer, sizeof buffer);
   if (c != EOF)
     {
       log_error ("input line %lu too long - rejected\n", lineno+1);
@@ -490,6 +613,20 @@ process (FILE *fp, pattern_t *patarray)
                  lineno+1, strerror (errno));
       exit (1);
     }
+
+  /* Check last pattern to see whether we are in accept mode.  */
+  last_is_accept = 0;
+  for (pat = patarray; pat->type != PAT_NULL; pat++)
+    last_is_accept = pat->accept;
+
   if (opt.verbose)
-    log_info ("no input line matches the pattern - accepted\n");
+    log_info ("no input line matches the pattern - %s\n",
+              last_is_accept? "rejected":"accepted");
+
+  if (log_get_errorcount(0))
+    exit (2);  /* Ooops - reject.  */
+  else if (last_is_accept)
+    exit (1);  /* Reject */
+  else
+    exit (0);  /* Accept */
 }
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index 2a5087e..d8e7573 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -93,7 +93,9 @@ gc_error (int status, int errnum, const char *fmt, ...)
 /* Forward declaration.  */
 static void gpg_agent_runtime_change (int killflag);
 static void scdaemon_runtime_change (int killflag);
+#ifdef BUILD_WITH_TPM2D
 static void tpm2daemon_runtime_change (int killflag);
+#endif
 static void dirmngr_runtime_change (int killflag);
 static void keyboxd_runtime_change (int killflag);
 
@@ -349,6 +351,8 @@ static known_option_t known_options_gpg_agent[] =
    { "min-passphrase-nonalpha", GC_OPT_FLAG_RUNTIME, GC_LEVEL_EXPERT },
    { "check-passphrase-pattern", GC_OPT_FLAG_RUNTIME, GC_LEVEL_EXPERT,
      /**/                        GC_ARG_TYPE_FILENAME },
+   { "check-sym-passphrase-pattern", GC_OPT_FLAG_RUNTIME, GC_LEVEL_EXPERT,
+     /**/                        GC_ARG_TYPE_FILENAME },
    { "max-passphrase-days", GC_OPT_FLAG_RUNTIME, GC_LEVEL_EXPERT },
    { "enable-passphrase-history", GC_OPT_FLAG_RUNTIME, GC_LEVEL_EXPERT },
    { "pinentry-timeout", GC_OPT_FLAG_RUNTIME, GC_LEVEL_ADVANCED },
@@ -379,6 +383,7 @@ static known_option_t known_options_scdaemon[] =
    { NULL }
  };
 
+#ifdef BUILD_WITH_TPM2D
 /* The known options of the GC_COMPONENT_TPM2DAEMON component.  */
 static known_option_t known_options_tpm2daemon[] =
   {
@@ -393,6 +398,7 @@ static known_option_t known_options_tpm2daemon[] =
 
    { NULL }
  };
+#endif
 
 
 /* The known options of the GC_COMPONENT_GPG component.  */
@@ -666,9 +672,11 @@ static struct
      GNUPG_MODULE_NAME_SCDAEMON, SCDAEMON_NAME ".conf",
      known_options_scdaemon, NULL, scdaemon_runtime_change},
 
+#ifdef BUILD_WITH_TPM2D
    { TPM2DAEMON_NAME, TPM2DAEMON_DISP_NAME, "gnupg", N_("TPM"),
      GNUPG_MODULE_NAME_TPM2DAEMON, TPM2DAEMON_NAME ".conf",
      known_options_tpm2daemon, NULL, tpm2daemon_runtime_change},
+#endif
 
    { DIRMNGR_NAME, DIRMNGR_DISP_NAME, "gnupg",   N_("Network"),
      GNUPG_MODULE_NAME_DIRMNGR, DIRMNGR_NAME ".conf",
@@ -802,6 +810,7 @@ scdaemon_runtime_change (int killflag)
 }
 
 
+#ifdef BUILD_WITH_TPM2D
 static void
 tpm2daemon_runtime_change (int killflag)
 {
@@ -844,6 +853,7 @@ tpm2daemon_runtime_change (int killflag)
               pgmname, argv[cmdidx], gpg_strerror (err));
   gnupg_release_process (pid);
 }
+#endif
 
 
 static void
@@ -857,15 +867,15 @@ dirmngr_runtime_change (int killflag)
   int cmdidx;
 
   pgmname = gnupg_module_name (GNUPG_MODULE_NAME_CONNECT_AGENT);
-  argv[i++] = "--no-autostart";
-  argv[i++] = "--dirmngr";
-  cmdidx = i;
-  argv[i++] = killflag? "KILLDIRMNGR" : "RELOADDIRMNGR";
   if (!gnupg_default_homedir_p ())
     {
       argv[i++] = "--homedir";
       argv[i++] = gnupg_homedir ();
     }
+  argv[i++] = "--no-autostart";
+  argv[i++] = "--dirmngr";
+  cmdidx = i;
+  argv[i++] = killflag? "KILLDIRMNGR" : "RELOADDIRMNGR";
   argv[i] = NULL;
   log_assert (i < DIM(argv));
 
diff --git a/tools/gpgconf.c b/tools/gpgconf.c
index 63c3054..1a99c98 100644
--- a/tools/gpgconf.c
+++ b/tools/gpgconf.c
@@ -299,11 +299,45 @@ list_dirs (estream_t fp, char **names)
                                   "HomeDir");
   if (tmp)
     {
+      int hkcu = 0;
+      int hklm = 0;
+
+      xfree (tmp);
+      if ((tmp = read_w32_registry_string ("HKEY_CURRENT_USER",
+                                           GNUPG_REGISTRY_DIR,
+                                           "HomeDir")))
+        {
+          xfree (tmp);
+          hkcu = 1;
+        }
+      if ((tmp = read_w32_registry_string ("HKEY_LOCAL_MACHINE",
+                                           GNUPG_REGISTRY_DIR,
+                                           "HomeDir")))
+        {
+          xfree (tmp);
+          hklm = 1;
+        }
+
       es_fflush (fp);
-      log_info ("Warning: homedir taken from registry key (%s %s)\n",
-                GNUPG_REGISTRY_DIR, "HomeDir");
+      log_info ("Warning: homedir taken from registry key (%s:%s) in%s%s\n",
+                GNUPG_REGISTRY_DIR, "HomeDir",
+                hkcu?" HKCU":"",
+                hklm?" HKLM":"");
+
+
+
+    }
+  else if ((tmp = read_w32_registry_string (NULL,
+                                            GNUPG_REGISTRY_DIR,
+                                            NULL)))
+    {
       xfree (tmp);
+      es_fflush (fp);
+      log_info ("Warning: registry key (%s) without value in HKCU or HKLM\n",
+                GNUPG_REGISTRY_DIR);
     }
+
+
 #endif /*HAVE_W32_SYSTEM*/
 }
 
@@ -891,7 +925,7 @@ main (int argc, char **argv)
           log_info ("ignoring request to remove non /run/user socket dir\n");
         else if (opt.dry_run)
           ;
-        else if (rmdir (socketdir))
+        else if (gnupg_rmdir (socketdir))
           {
             /* If the director is not empty we first try to delete
              * socket files.  */
@@ -918,7 +952,7 @@ main (int argc, char **argv)
                       gnupg_remove (p);
                     xfree (p);
                   }
-                if (rmdir (socketdir))
+                if (gnupg_rmdir (socketdir))
                   gc_error (1, 0, "error removing '%s': %s",
                             socketdir, gpg_strerror (err));
               }
diff --git a/tools/gpgtar-create.c b/tools/gpgtar-create.c
index 6114d68..48c93da 100644
--- a/tools/gpgtar-create.c
+++ b/tools/gpgtar-create.c
@@ -148,7 +148,7 @@ fillup_entry_w32 (tar_header_t hdr)
 
   /* Only set the size for a regular file.  */
   if (hdr->typeflag == TF_REGULAR)
-    hdr->size = (fad.nFileSizeHigh * (unsigned long long)(MAXDWORD+1)
+    hdr->size = (fad.nFileSizeHigh * ((unsigned long long)MAXDWORD+1)
                  + fad.nFileSizeLow);
 
   hdr->mtime = (((unsigned long long)fad.ftLastWriteTime.dwHighDateTime << 32)
diff --git a/tools/make-dns-cert.c b/tools/make-dns-cert.c
index 9a7e20d..865364c 100644
--- a/tools/make-dns-cert.c
+++ b/tools/make-dns-cert.c
@@ -22,9 +22,6 @@
 #endif
 
 #include <unistd.h>
-#ifdef HAVE_GETOPT_H
-#include <getopt.h>
-#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/tools/wks-util.c b/tools/wks-util.c
index 516c7fe..cf07a0c 100644
--- a/tools/wks-util.c
+++ b/tools/wks-util.c
@@ -98,19 +98,28 @@ wks_write_status (int no, const char *format, ...)
 
 
 /* Append UID to LIST and return the new item.  On success LIST is
- * updated.  On error ERRNO is set and NULL returned. */
+ * updated.  C-style escaping is removed from UID.  On error ERRNO is
+ * set and NULL returned. */
 static uidinfo_list_t
 append_to_uidinfo_list (uidinfo_list_t *list, const char *uid, time_t created)
 {
   uidinfo_list_t r, sl;
+  char *plainuid;
 
-  sl = xtrymalloc (sizeof *sl + strlen (uid));
-  if (!sl)
+  plainuid = decode_c_string (uid);
+  if (!plainuid)
     return NULL;
 
-  strcpy (sl->uid, uid);
+  sl = xtrymalloc (sizeof *sl + strlen (plainuid));
+  if (!sl)
+    {
+      xfree (plainuid);
+      return NULL;
+    }
+
+  strcpy (sl->uid, plainuid);
   sl->created = created;
-  sl->mbox = mailbox_from_userid (uid, 0);
+  sl->mbox = mailbox_from_userid (plainuid, 0);
   sl->next = NULL;
   if (!*list)
     *list = sl;
@@ -120,6 +129,8 @@ append_to_uidinfo_list (uidinfo_list_t *list, const char *uid, time_t created)
         ;
       r->next = sl;
     }
+
+  xfree (plainuid);
   return sl;
 }
 
@@ -348,7 +359,7 @@ wks_list_key (estream_t key, char **r_fpr, uidinfo_list_t *r_mboxes)
       /* log_debug ("line '%s'\n", line); */
 
       xfree (fields);
-      fields = strtokenize (line, ":");
+      fields = strtokenize_nt (line, ":");
       if (!fields)
         {
           err = gpg_error_from_syserror ();
@@ -395,7 +406,6 @@ wks_list_key (estream_t key, char **r_fpr, uidinfo_list_t *r_mboxes)
         }
       else if (!strcmp (fields[0], "uid") && nfields > 9)
         {
-          /* Fixme: Unescape fields[9] */
           if (!append_to_uidinfo_list (&mboxes, fields[9],
                                        parse_timestamp (fields[5], NULL)))
             {
@@ -467,7 +477,7 @@ wks_filter_uid (estream_t *r_newkey, estream_t key, const char *uid,
     es_fputs ("Content-Type: application/pgp-keys\n"
               "\n", newkey);
 
-  filterexp = es_bsprintf ("keep-uid=uid= %s", uid);
+  filterexp = es_bsprintf ("keep-uid=-t uid= %s", uid);
   if (!filterexp)
     {
       err = gpg_error_from_syserror ();